Index: itignore
===================================================================
--- .gitignore	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,3 +1,0 @@
-/BOOK/render-output
-/render/
-*~
Index: OK/INSTALL
===================================================================
--- BOOK/INSTALL	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,49 +1,0 @@
-CLFS Book Conversion Tools Installation Instructions
-
-After downloading the SVN source, there are some things that need to be set up 
-on your computer if you want to convert the XML source into something easier to 
-read (e.g. HTML, TXT, or PDF). If you are interested in this, then keep 
-reading. If you are only interested in editing the XML source for re- 
-submission to the clfs-commits or clfs-dev mailing lists, then you do not need this 
-document.
-
--------------------------------------------------------------------------------
-
-If you want to convert the XML to HTML, install the following:
-
-* libxml2
-  - http://cblfs.clfs.org/index.php/LibXML2
-
-* libxslt
-  - http://cblfs.clfs.org/index.php/LibXSLT
-
-* DocBook DTD 
-  - http://cblfs.clfs.org/index.php/DocBook_XML_DTD-4.x
-
-* DocBook XSL Stylesheets 
-  - http://cblfs.clfs.org/index.php/DocBook_XSL_Stylesheets
-
-* HTMLTidy
-  - http://cblfs.clfs.org/index.php/Tidy
-
-* Which
-  - http://cblfs.clfs.org/index.php/Which
-
-------------------------------------------------------------------------------- 
-
-If you want to convert the XML to TXT, install the above items, and then install
-the following:
-
-* lynx
-  - http://cblfs.clfs.org/index.php/Lynx
-
-------------------------------------------------------------------------------- 
-
-If you want to convert the XML to PDF, install the items listed above (except
-lynx) and then install the following:
-
-* JDK
-  - http://cblfs.clfs.org/index.php/JDK
-
-* FOP and JAI
-  - http://cblfs.clfs.org/index.php/FOP
Index: OK/Makefile
===================================================================
--- BOOK/Makefile	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,242 +1,0 @@
-TOP		:= $(shell pwd)
-RENDERDIR	:= $(TOP)/../render
-
-VALIDATEDIR	:= $(RENDERDIR)/validate
-PROFILEDIR	:= $(RENDERDIR)/profile
-
-HTMLDIR		:= $(RENDERDIR)/html
-NOCHUNKDIR	:= $(RENDERDIR)/nochunk
-
-FODIR		:= $(RENDERDIR)/fo
-PDFDIR		:= $(RENDERDIR)/pdf
-
-TROUBLEDIR	:= $(RENDERDIR)/trouble
-DUMPDIR		:= $(RENDERDIR)/commands
-DLLISTDIR	:= $(RENDERDIR)/download-list
-
-CHUNK_QUIET	:= 1
-ROOT_ID		:=
-
-ARCHS		:= x86 x86_64 x86_64-64 \
-		   sparc sparc64 sparc64-64 \
-		   mips mips64 mips64-64 \
-		   ppc ppc64 ppc64-64
-
-ifdef V
-  Q =
-else
-  Q = @
-endif
-
-.PHONY: clfs lfs
-clfs lfs: html
-
-.PHONY: tidy tidy-f tidy-d
-ifeq ($(shell which tidy >/dev/null 2>&1 && echo yes),yes)
-tidy:
-	@$(MAKE) --no-print-directory tidy-d TIDY_DIR=$(HTMLDIR)
-
-tidy-f:
-	@echo "Running tidy on F:$(shell basename $(TIDY_FILE))"
-	@$(TOP)/tidy.sh "$(TIDY_FILE)"
-
-tidy-d:
-	@echo "Running tidy on D:$(shell basename $(TIDY_DIR))"
-	@$(TOP)/tidy.sh "$(TIDY_DIR)"
-else
-tidy tidy-f tidy-d:
-	@echo "Tidy is not installed on this system"
-endif
-
-.PHONY: titlepage
-titlepage:
-	@echo "Rendering the top-level index..."
-	$(Q)xsltproc --nonet --output $(HTMLDIR)/index.html \
-	  $(TOP)/stylesheets/top-index.xsl \
-	  $(TOP)/index.xml
-	@$(MAKE) --no-print-directory tidy-f TIDY_FILE=$(HTMLDIR)/index.html
-
-ARCHS_VD_XML := $(ARCHS:%=%-validate_dump-xml)
-.PHONY: $(ARCHS_VD_XML)
-$(ARCHS_VD_XML): override arch = $(@:%-validate_dump-xml=%)
-$(ARCHS_VD_XML):
-	@echo "Validating $(arch) book..."
-	$(Q)mkdir -p $(VALIDATEDIR)
-	$(Q)xmllint --nonet --noent --xinclude \
-	  --relaxng $(TOP)/schema/docbook/4.5/rng/docbook.rng \
-	  -o $(VALIDATEDIR)/$(arch)-full.xml \
-	  $(TOP)/$(arch)-index.xml
-
-ARCHS_P_XML := $(ARCHS:%=%-profiled-xml)
-.PHONY: $(ARCHS_P_XML)
-$(ARCHS_P_XML): override arch = $(@:%-profiled-xml=%)
-$(ARCHS_P_XML):
-	@$(MAKE) --no-print-directory $(arch)-validate_dump-xml
-	@echo "Generating profiled $(arch) book..."
-	$(Q)mkdir -p $(PROFILEDIR)
-	$(Q)xsltproc --nonet --stringparam profile.condition html \
-	  --output $(PROFILEDIR)/$(arch)-html.xml \
-	  $(TOP)/stylesheets/lfs-xsl/profile.xsl \
-	  $(VALIDATEDIR)/$(arch)-full.xml
-
-ARCHS_HTML := $(ARCHS:%=%-html)
-.PHONY: html render $(ARCHS_HTML)
-html render: $(ARCHS_HTML) titlepage
-$(ARCHS_HTML): override arch = $(@:%-html=%)
-$(ARCHS_HTML):
-	@$(MAKE) --no-print-directory $(arch)-profiled-xml
-
-	@echo "Rendering chunked XHTML of $(arch)..."
-	$(Q)mkdir -p $(HTMLDIR)/$(arch)
-	$(Q)xsltproc --nonet -stringparam chunk.quietly $(CHUNK_QUIET) \
-	  -stringparam rootid "$(ROOT_ID)" \
-	  -stringparam base.dir $(HTMLDIR)/$(arch)/ \
-	  $(TOP)/stylesheets/clfs-chunked.xsl \
-	  $(PROFILEDIR)/$(arch)-html.xml
-
-	@echo "Copying CSS code and images for $(arch)..."
-	$(Q)mkdir -p $(HTMLDIR)/$(arch)/stylesheets
-	$(Q)cp $(TOP)/stylesheets/lfs-xsl/*.css $(HTMLDIR)/$(arch)/stylesheets
-	$(Q)sed -i -e "s@../stylesheets@stylesheets@g" $(HTMLDIR)/$(arch)/*.html
-	$(Q)mkdir -p $(HTMLDIR)/$(arch)/images
-	$(Q)cp $(TOP)/images/*.png $(HTMLDIR)/$(arch)/images
-	$(Q)sed -i -e "s@../images@images@g" $(HTMLDIR)/$(arch)/*.html
-
-	@$(MAKE) --no-print-directory tidy-d TIDY_DIR=$(HTMLDIR)/$(arch)
-
-ARCHS_NOCHUNKS := $(ARCHS:%=%-nochunks)
-.PHONY: nochunks $(ARCHS_NOCHUNKS)
-nochunks: $(ARCHS_NOCHUNKS)
-$(ARCHS_NOCHUNKS): override arch = $(@:%-nochunks=%)
-$(ARCHS_NOCHUNKS):
-	@$(MAKE) --no-print-directory $(arch)-profiled-xml
-
-	@echo "Rendering Single File HTML of $(arch)..."
-	$(Q)mkdir -p $(NOCHUNKDIR)
-	$(Q)xsltproc --nonet -stringparam rootid "$(ROOT_ID)" \
-	  --output $(NOCHUNKDIR)/CLFS-$(arch).html \
-	  $(TOP)/stylesheets/clfs-nochunks.xsl \
-	  $(PROFILEDIR)/$(arch)-html.xml
-
-	@$(MAKE) --no-print-directory tidy-f TIDY_FILE=$(NOCHUNKDIR)/CLFS-$(arch).html
-
-ARCHS_FO := $(ARCHS:%=%-fo)
-.PHONY: fo $(ARCHS_FO)
-fo: $(ARCHS_FO)
-$(ARCHS_FO): override arch = $(@:%-fo=%)
-$(ARCHS_FO):
-	@$(MAKE) --no-print-directory $(arch)-profiled-xml
-
-	@echo "Generating FO file of $(arch)..."
-	@mkdir -p $(FODIR)
-	$(Q)xsltproc --nonet -stringparam rootid "$(ROOT_ID)" \
-	  --output $(FODIR)/$(arch).fo \
-	  $(TOP)/stylesheets/clfs-pdf.xsl \
-	  $(PROFILEDIR)/$(arch)-html.xml
-	$(Q)sed -i -e 's/span="inherit"/span="all"/' $(FODIR)/$(arch).fo
-
-ARCHS_PDF := $(ARCHS:%=%-pdf)
-.PHONY: pdf $(ARCHS_PDF)
-pdf: $(ARCHS_PDF)
-$(ARCHS_PDF): override arch = $(@:%-pdf=%)
-$(ARCHS_PDF):
-	@$(MAKE) --no-print-directory $(arch)-fo
-
-	@echo "Rendering PDF of $(arch)..."
-	$(Q)mkdir -p $(PDFDIR)
-	$(Q)fop $(FODIR)/$(arch).fo $(PDFDIR)/CLFS-$(arch).pdf
-
-ARCHS_VALIDATE := $(ARCHS:%=%-validate)
-.PHONY: validate $(ARCHS_VALIDATE)
-validate: $(ARCHS_VALIDATE)
-$(ARCHS_VALIDATE): override arch =  $(@:%-validate=%)
-$(ARCHS_VALIDATE):
-	@echo "Validating $(arch)..."
-	$(Q)xmllint --xinclude --noout --nonet \
-	  --relaxng $(TOP)/schema/docbook/4.5/rng/docbook.rng \
-	  $(TOP)/$(arch)-index.xml
-
-ARCHS_TROUBLE := $(ARCHS:%=%-trouble)
-.PHONY: trouble $(ARCHS_TROUBLE)
-trouble: $(ARCHS_TROUBLE)
-$(ARCHS_TROUBLE): override arch = $(@:%-trouble=%)
-$(ARCHS_TROUBLE):
-	@echo "Troubleshooting $(arch)..."
-	@mkdir -p $(TROUBLEDIR)
-	$(Q)xmllint --xinclude --nonet \
-	  --relaxng $(TOP)/schema/docbook/4.5/rng/docbook.rng \
-	  -o $(TROUBLEDIR)/dump-$(arch) \
-	  $(TOP)/$(arch)-index.xml
-	$(Q)xmllint --xinclude --noout --nonet \
-	  --relaxng $(TOP)/schema/docbook/4.5/rng/docbook.rng \
-	  $(TROUBLEDIR)/dump-$(arch)
-	@echo "You can now look at $(TROUBLEDIR)/dump-$(arch) to see the errors"
-
-ARCHS_DUMP := $(ARCHS:%=%-dump)
-.PHONY: dump-commands $(ARCHS_DUMP)
-dump-commands: $(ARCHS_DUMP)
-$(ARCHS_DUMP): override arch = $(@:%-dump=%)
-$(ARCHS_DUMP):
-	@echo "Extracting commands from $(arch)..."
-	$(Q)mkdir -p $(DUMPDIR)/$(arch)
-	$(Q)xsltproc --xinclude --nonet \
-	  --output $(DUMPDIR)/$(arch)/ \
-	  $(TOP)/stylesheets/dump-commands.xsl \
-	  $(TOP)/$(arch)-index.xml
-
-ARCHS_DLLIST := $(ARCHS:%=%-dllist)
-.PHONY: download-list $(ARCHS_DLLIST)
-download-list: $(ARCHS_DLLIST)
-$(ARCHS_DLLIST): override arch = $(@:%-dllist=%)
-$(ARCHS_DLLIST):
-	@echo "Creating download list for $(arch)..."
-	$(Q)mkdir -p $(DLLISTDIR)
-	$(Q)xsltproc --xinclude --nonet \
-	  --output $(DLLISTDIR)/$(arch).list \
-	  $(TOP)/stylesheets/wget.xsl \
-	  $(TOP)/$(arch)-index.xml
-
-ARCHS_MD5LIST := $(ARCHS:%=%-md5list)
-.PHONY: md5-list $(ARCHS_MD5LIST)
-md5-list: $(ARCHS_MD5LIST)
-$(ARCHS_MD5LIST): override arch = $(@:%-md5list=%)
-$(ARCHS_MD5LIST):
-	@echo "Creating md5 hash list for $(arch)..."
-	$(Q)mkdir -p $(DLLISTDIR)
-	$(Q)xsltproc --xinclude --nonet \
-	  --output $(DLLISTDIR)/$(arch).md5sum \
-	  $(TOP)/stylesheets/md5sum.xsl \
-	  $(TOP)/$(arch)-index.xml
-       
-FG_GREEN := $(shell echo -e '\e[0;32m')
-FG_BLUE := $(shell echo -e '\e[0;34m')
-FG_DEFAULT := $(shell echo -e '\e[0;0m')
-help:
-	@echo "Output: $(RENDERDIR)"
-	@echo
-	@echo "HTML Targets"
-	@echo "  $(FG_GREEN)clfs lfs tidy html render titlepage $(FG_BLUE)$(ARCHS_HTML)$(FG_DEFAULT)"
-	@echo
-	@echo "NoChunks Targets"
-	@echo "  $(FG_GREEN)nochunks tidy $(FG_BLUE)$(ARCHS_NOCHUNKS)$(FG_DEFAULT)"
-	@echo
-	@echo "FO Targets"
-	@echo "  $(FG_GREEN)fo $(FG_BLUE)$(ARCHS_FO)$(FG_DEFAULT)"
-	@echo
-	@echo "PDF Targets"
-	@echo "  $(FG_GREEN)pdf $(FG_BLUE)$(ARCHS_PDF)$(FG_DEFAULT)"
-	@echo
-	@echo "Validate Targets"
-	@echo "  $(FG_GREEN)validate $(FG_BLUE)$(ARCHS_VALIDATE)$(FG_DEFAULT)"
-	@echo
-	@echo "Trouble Targets"
-	@echo "  $(FG_GREEN)trouble $(FG_BLUE)$(ARCHS_TROUBLE)$(FG_DEFAULT)"
-	@echo
-	@echo "Dump-Commands Targets"
-	@echo "  $(FG_GREEN)dump-commands $(FG_BLUE)$(ARCHS_DUMP)$(FG_DEFAULT)"
-	@echo
-	@echo "Download-List Targets"
-	@echo "  $(FG_GREEN)download-list $(FG_BLUE)$(ARCHS_DLLIST)$(FG_DEFAULT)"
-	@echo
-	@echo "md5-List Targets"
-	@echo "  $(FG_GREEN)md5-list $(FG_BLUE)$(ARCHS_MD5LIST)$(FG_DEFAULT)"
Index: OK/README
===================================================================
--- BOOK/README	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,32 +1,0 @@
-CLFS Book README
-
-This document is meant to instruct the user on how to convert the book's XML 
-source to other formats (e.g. HTML, PDF, PS and TXT).  First, if you have not 
-already done so, please read the INSTALL file for instructions on how to install
-the required software.  If you have already completed the steps outlined in the
-INSTALL file, then continue reading for examples how to convert these files into
-various other formats.
-
-By default all books will be generated, to only generate the target your want
-you can specify ARCHS={target} to create a particular book to any of the command
-lines below. To get a list of targets use make help.
-
-XML to XHTML:
--------------
-make BASEDIR=/path/to/output/location
-
-
-XML to single file XHTML (nochunks):
-------------------------------------
-make BASEDIR=/path/to/output/location nochunks
-
-
-XML to TXT
-----------
-Follow the instructions for nochunks and then run:
-lynx -dump /path/to/nochunks >/path/to/output
-
-
-XML to PDF:
------------
-make BASEDIR=/path/to/output/location pdf
Index: OK/appendices/acronymlist.xml
===================================================================
--- BOOK/appendices/acronymlist.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,552 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<appendix id="appendixa" xreflabel="Appendix A">
-  <?dbhtml dir="appendices"?>
-  <?dbhtml filename="acronymlist.html"?>
-
-  <title>Acronyms and Terms</title>
-
-  <variablelist>
-    <?dbfo list-presentation="list"?>
-    <?dbhtml list-presentation="table"?>
-
-    <varlistentry>
-      <term><emphasis role="bold">ABI</emphasis></term>
-      <listitem>
-        <para>Application Binary Interface</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">API</emphasis></term>
-      <listitem>
-        <para>Application Programming Interface</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">ASCII</emphasis></term>
-      <listitem>
-        <para>American Standard Code for Information Interchange</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">ATA</emphasis></term>
-      <listitem>
-        <para>Advanced Technology Attachment (see IDE)</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">BIOS</emphasis></term>
-      <listitem>
-        <para>Basic Input/Output System</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">bless</emphasis></term>
-      <listitem>
-        <para>manipulate a filesystem so that OF will boot from it</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">BSD</emphasis></term>
-      <listitem>
-        <para>Berkeley Software Distribution</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">CBLFS</emphasis></term>
-      <listitem>
-        <para>Community Driven Beyond Linux From Scratch</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">chroot</emphasis></term>
-      <listitem>
-        <para>change root</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">CLFS</emphasis></term>
-      <listitem>
-        <para>Cross-Compiled Linux From Scratch</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">CMOS</emphasis></term>
-      <listitem>
-        <para>Complementary Metal Oxide Semiconductor</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">COS</emphasis></term>
-      <listitem>
-        <para>Class Of Service</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">CPU</emphasis></term>
-      <listitem>
-        <para>Central Processing Unit</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">CRC</emphasis></term>
-      <listitem>
-        <para>Cyclic Redundancy Check</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">DHCP</emphasis></term>
-      <listitem>
-        <para>Dynamic Host Configuration Protocol</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">DNS</emphasis></term>
-      <listitem>
-        <para>Domain Name Service</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">EGA</emphasis></term>
-      <listitem>
-        <para>Enhanced Graphics Adapter</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">ELF</emphasis></term>
-      <listitem>
-        <para>Executable and Linkable Format</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">EOF</emphasis></term>
-      <listitem>
-        <para>End of File</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">EQN</emphasis></term>
-      <listitem>
-        <para>equation</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">ext2</emphasis></term>
-      <listitem>
-        <para>second extended file system</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">ext3</emphasis></term>
-      <listitem>
-        <para>third extended file system</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">ext4</emphasis></term>
-      <listitem>
-        <para>fourth extended file system</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">FAQ</emphasis></term>
-      <listitem>
-        <para>Frequently Asked Questions</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">FHS</emphasis></term>
-      <listitem>
-        <para>Filesystem Hierarchy Standard</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">FIFO</emphasis></term>
-      <listitem>
-        <para>First-In, First Out</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">FQDN</emphasis></term>
-      <listitem>
-        <para>Fully Qualified Domain Name</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">FTP</emphasis></term>
-      <listitem>
-        <para>File Transfer Protocol</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">GB</emphasis></term>
-      <listitem>
-        <para>Gigabytes</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">GCC</emphasis></term>
-      <listitem>
-        <para>GNU Compiler Collection</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">GID</emphasis></term>
-      <listitem>
-        <para>Group Identifier</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">GMT</emphasis></term>
-      <listitem>
-        <para>Greenwich Mean Time</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">HTML</emphasis></term>
-      <listitem>
-        <para>Hypertext Markup Language</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">IDE</emphasis></term>
-      <listitem>
-        <para>Integrated Drive Electronics</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">IEEE</emphasis></term>
-      <listitem>
-        <para>Institute of Electrical and Electronic Engineers</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">IO</emphasis></term>
-      <listitem>
-        <para>Input/Output</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">IP</emphasis></term>
-      <listitem>
-        <para>Internet Protocol</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">IPC</emphasis></term>
-      <listitem>
-        <para>Inter-Process Communication</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">IRC</emphasis></term>
-      <listitem>
-        <para>Internet Relay Chat</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">ISO</emphasis></term>
-      <listitem>
-        <para>International Organization for Standardization</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">ISP</emphasis></term>
-      <listitem>
-        <para>Internet Service Provider</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">KB</emphasis></term>
-      <listitem>
-        <para>Kilobytes</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">LED</emphasis></term>
-      <listitem>
-        <para>Light Emitting Diode</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">LFS</emphasis></term>
-      <listitem>
-        <para>Linux From Scratch</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">LSB</emphasis></term>
-      <listitem>
-        <para>Linux Standard Base</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">MB</emphasis></term>
-      <listitem>
-        <para>Megabytes</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">MBR</emphasis></term>
-      <listitem>
-        <para>Master Boot Record</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">MD5</emphasis></term>
-      <listitem>
-        <para>Message Digest 5</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">NIC</emphasis></term>
-      <listitem>
-        <para>Network Interface Card</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">NLS</emphasis></term>
-      <listitem>
-        <para>Native Language Support</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">NPTL</emphasis></term>
-      <listitem>
-        <para>Native POSIX Threading Library</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">OF</emphasis></term>
-      <listitem>
-        <para>Open Firmware</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">OSS</emphasis></term>
-      <listitem>
-        <para>Open Sound System</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">PCH</emphasis></term>
-      <listitem>
-        <para>Pre-Compiled Headers</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">PID</emphasis></term>
-      <listitem>
-        <para>Process Identifier</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">PTY</emphasis></term>
-      <listitem>
-        <para>pseudo terminal</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">QA</emphasis></term>
-      <listitem>
-        <para>Quality Assurance</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">QOS</emphasis></term>
-      <listitem>
-        <para>Quality Of Service</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">RAM</emphasis></term>
-      <listitem>
-        <para>Random Access Memory</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">RPC</emphasis></term>
-      <listitem>
-        <para>Remote Procedure Call</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">RTC</emphasis></term>
-      <listitem>
-        <para>Real Time Clock</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">SCO</emphasis></term>
-      <listitem>
-        <para>The Santa Cruz Operation</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">SATA</emphasis></term>
-      <listitem>
-        <para>Serial ATA</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">SGR</emphasis></term>
-      <listitem>
-        <para>Select Graphic Rendition</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">SHA1</emphasis></term>
-      <listitem>
-        <para>Secure-Hash Algorithm 1</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">TLDP</emphasis></term>
-      <listitem>
-        <para>The Linux Documentation Project</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">TFTP</emphasis></term>
-      <listitem>
-        <para>Trivial File Transfer Protocol</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">TLS</emphasis></term>
-      <listitem>
-        <para>Thread-Local Storage</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">UID</emphasis></term>
-      <listitem>
-        <para>User Identifier</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">umask</emphasis></term>
-      <listitem>
-        <para>user file-creation mask</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">USB</emphasis></term>
-      <listitem>
-        <para>Universal Serial Bus</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">UTC</emphasis></term>
-      <listitem>
-        <para>Coordinated Universal Time</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">UUID</emphasis></term>
-      <listitem>
-        <para>Universally Unique Identifier</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">VC</emphasis></term>
-      <listitem>
-        <para>Virtual Console</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">VGA</emphasis></term>
-      <listitem>
-        <para>Video Graphics Array</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">VT</emphasis></term>
-      <listitem>
-        <para>Virtual Terminal</para>
-      </listitem>
-    </varlistentry>
-
-  </variablelist>
-
-</appendix>
Index: OK/appendices/dependencies/common.xml
===================================================================
--- BOOK/appendices/dependencies/common.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,2007 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<appendix id="appendixb" xreflabel="Appendix B">
-  <?dbhtml dir="appendixb"?>
-  <?dbhtml filename="dependencies.html"?>
-
-  <title>Dependencies</title>
-
-  <para>Every package built in CLFS relies on one or more other packages
-  in order to build and install properly. Some packages even participate
-  in circular dependencies, that is, the first package depends on the second
-  which in turn depends on the first. Because of these dependencies, the
-  order in which packages are built in CLFS is very important. The purpose
-  of this page is to document the dependencies of each package built in CLFS.</para>
-
-  <para>For each package we build, we have listed three types of dependencies.
-  The first lists what other packages need to be available in order to compile
-  and install the package in question. The second lists what packages, in
-  addition to those on the first list, need to be available in order to run the
-  test suites. The last list of dependencies are packages that require this
-  package to be built and installed in its final location before they are built
-  and installed. In most cases, this is because these packages will hardcode
-  paths to binaries within their scripts. If not built in a certain order,
-  this could result in paths of /tools/bin/[binary] being placed inside
-  scripts installed to the final system. This is obviously not desirable.
-  </para>
-
-<!-- Begin Acl dependency info -->
-  <bridgehead renderas="sect2" id="acl-dep">Acl</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Attr, Bash, Binutils, Coreutils, Glibc, GCC, Gettext, Grep,
-         Libtool, Make, Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No test suite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>Coreutils, Gettext, Libcap, Sed, Systemd, Tar, Vim</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Attr dependency info -->
-  <bridgehead renderas="sect2" id="attr-dep">Attr</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Gettext, Grep,
-         Libtool, Make, Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No test suite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>Acl, Coretutils, Gettext, Libcap, Sed, Systemd</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Autoconf dependency info -->
-  <bridgehead renderas="sect2" id="autoconf-dep">Autoconf</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-          <seg>Bash, Coreutils, Gawk, Grep, M4, Make, Perl, Sed, Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Automake, Binutils, Diffutils, Findutils, GCC, Libtool</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>Automake</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Automake dependency info -->
-  <bridgehead renderas="sect2" id="automake-dep">Automake</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-          <seg>Autoconf, Bash, Binutils, Coreutils, Gawk, Grep, M4, Make, Perl,
-          Sed, Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Bison, Bzip2, DejaGNU, Diffutils, Expect, Findutils,
-          Flex, GCC, Gettext, Gzip, Libtool, Tar, XZ Utils. Can also use several
-          other packages that are not installed in CLFS.</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Bash dependency info -->
-  <bridgehead renderas="sect2" id="bash-dep">Bash</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-          <seg>Bash, Bison, Coreutils, Diffutils, Glibc, Gawk, GCC, Grep, Make,
-          Ncurses, Patch, Readline, Sed, Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Bc dependency info -->
-  <bridgehead renderas="sect2" id="bc-dep">Bc</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-          <seg>Bash, Binutils, Bison, Coreutils, Glibc, GCC, Grep, Make,
-          Readline</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Gawk</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Binutils dependency info -->
-  <bridgehead renderas="sect2" id="binutils-dep">Binutils</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, File, Gawk, GCC,
-         Grep, Make, Perl, Sed, Texinfo, Zlib</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>DejaGNU, Expect</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Bison dependency info -->
-  <bridgehead renderas="sect2" id="bison-dep">Bison</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Glibc, Gawk, GCC,
-         Grep, M4, Make, Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Diffutils, Findutils, Gawk</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>Flex, Kbd, Tar</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Bzip2 dependency info -->
-  <bridgehead renderas="sect2" id="bzip2-dep">Bzip2</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Make</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Diffutils</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin CLFS-Boot-scripts dependency info -->
-  <bridgehead renderas="sect2" id="boot-scripts-dep">CLFS-Boot-scripts</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Coreutils, Make, Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Check dependency info -->
-  <bridgehead renderas="sect2" id="check-dep">Check</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>GCC, Grep, Make, Sed, Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Coreutils dependency info -->
-  <bridgehead renderas="sect2" id="coreutils-dep">Coreutils</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Acl, Attr, Bash, Binutils, Coreutils, Glibc, Gawk, GCC, GMP,
-         Grep, Libcap, Make, Patch, Perl, Sed, Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Diffutils, E2fsprogs, Findutils, Util-linux</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>Bash, Diffutils, Findutils, Man</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin D-Bus dependency info -->
-  <bridgehead renderas="sect2" id="dbus-dep">D-Bus</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Expat, Gawk, GCC,
-         Gettext, Grep, Make, Man, Pkg-config, Sed, Systemd, Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin DejaGNU dependency info -->
-  <bridgehead renderas="sect2" id="dejagnu-dep">DejaGNU</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Coreutils, Diffutils, GCC, Grep, Make, Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin DHCPCD dependency info -->
-  <bridgehead renderas="sect2" id="dhcpcd-dep">DHCPCD</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Coreutils, GCC, Make, Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No test suite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Diffutils dependency info -->
-  <bridgehead renderas="sect2" id="diffutils-dep">Diffutils</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep,
-         Make, Patch, Sed, Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No test suite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Eudev dependency info -->
-  <bridgehead renderas="sect2" id="eudev-dep">Eudev</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Binutils, Coreutils, Diffutils, Glibc, Gawk, GCC, Grep,
-         Make, Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No test suite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>Systemd</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Expat dependency info -->
-  <bridgehead renderas="sect2" id="expat-dep">Expat</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, GCC, Grep,
-         Make, Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>D-Bus, XML::Parser</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Expect dependency info -->
-  <bridgehead renderas="sect2" id="expect-dep">Expect</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, GCC, Grep, Make,
-         Patch, Sed, Tcl</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin E2fsprogs dependency info -->
-  <bridgehead renderas="sect2" id="e2fsprogs-dep">E2fsprogs</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Glibc, Gawk, GCC, Gettext, Grep, Gzip,
-         Make, Pkg-config-lite, Sed, Texinfo, Util-linux</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Bzip2, Diffutils</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin File dependency info -->
-  <bridgehead renderas="sect2" id="file-dep">File</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, Gawk, GCC, Grep,
-         Make, Sed, Zlib</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No test suite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Findutils dependency info -->
-  <bridgehead renderas="sect2" id="findutils-dep">Findutils</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep, Make,
-         Sed, Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>DejaGNU, Diffutils, Expect</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Flex dependency info -->
-  <bridgehead renderas="sect2" id="flex-dep">Flex</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep, M4, Make,
-         Sed, Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Bison, Diffutils, Gawk</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>IPRoute2, Kbd, Man</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Gawk dependency info -->
-  <bridgehead renderas="sect2" id="gawk-dep">Gawk</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-          <seg>Bash, Binutils, Coreutils, Glibc, GCC, GMP, Grep, Make, MPFR,
-         Readline Sed, Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Diffutils</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Gcc dependency info -->
-  <bridgehead renderas="sect2" id="gcc-dep">Gcc</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, Findutils, Gawk,
-         GCC, GMP, Grep, ISL, Make, MPFR, Patch, Perl, Sed, Tar, Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Check, DejaGNU, Expect</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin GDBM dependency info -->
-  <bridgehead renderas="sect2" id="gdbm">GDBM</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Grep, Make, Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Gettext dependency info -->
-  <bridgehead renderas="sect2" id="gettext-dep">Gettext</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, Findutils, Gawk,
-         GCC, Grep, Make, Sed, Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Tar, Tcl</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>Automake</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Glib dependency info -->
-<!--  <bridgehead renderas="sect2" id="glib-dep">Glib</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>bash, binutils, coreutils, gawk, gcc, gettext, make &amp; M4.</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Unknown</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>Pkg-config-lite</seg>
-        </seglistitem>
-      </segmentedlist> -->
-
-<!-- Begin Glibc dependency info -->
-  <bridgehead renderas="sect2" id="glibc-dep">Glibc</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Gettext,
-         Grep, Gzip, Linux Headers, Make, Perl, Sed, Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin GMP dependency info -->
-  <bridgehead renderas="sect2" id="gmp-dep">GMP</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, Gawk, GCC, Grep, M4, Make,
-         Sed, Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>MPFR, GCC</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Gperf dependency info -->
-  <bridgehead renderas="sect2" id="gperf-dep">Gperf</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep,
-         Make, Sed, Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Intltool</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>Systemd</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Grep dependency info -->
-  <bridgehead renderas="sect2" id="grep-dep">Grep</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep,
-         Make, Patch, Sed, Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Diffutils, Gawk</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>Man</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Groff dependency info -->
-  <bridgehead renderas="sect2" id="groff-dep">Groff</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Glibc, Gawk, GCC, Grep, Make, Perl
-         Sed, Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No test suite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>Man, Perl</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Gzip dependency info -->
-  <bridgehead renderas="sect2" id="gzip-dep">Gzip</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep, Make,
-         Sed, Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Diffutils</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>Man</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Iana-Etc dependency info -->
-  <bridgehead renderas="sect2" id="iana-etc-dep">Iana-Etc</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Coreutils, Gawk, Make</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No test suite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>Perl</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Intltool dependency info -->
-  <bridgehead renderas="sect2" id="intltool-dep">Intltool</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Binutils, Coreutils, Glibc, GCC, Make, Perl Sed, XML::Parser</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No test suite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin IProute2 dependency info -->
-  <bridgehead renderas="sect2" id="iproute2-dep">IProute2</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Bison, Coreutils, Glibc, Findutils, Flex, GCC,
-         Make, Linux Headers, Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No test suite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin IPutils dependency info -->
-  <bridgehead renderas="sect2" id="iputils-dep">IPutils</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Libcap, Make</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No test suite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin ISL dependency info -->
-  <bridgehead renderas="sect2" id="isl-dep">ISL</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, Gawk, GCC, Grep,
-         GMP, Make, MPC, MPFR, Sed, Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>GCC</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Kbd dependency info -->
-  <bridgehead renderas="sect2" id="kbd-dep">Kbd</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Check, Coreutils, Glibc, Gawk, GCC, Gzip, Make</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No test suite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin KMOD dependency info -->
-  <bridgehead renderas="sect2" id="kmod-dep">KMOD</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Bison, Coreutils, Glibc, Flex, Gawk, GCC,
-         Gettext, Gzip, Make, Pkg-config-lite, Sed, XZ Utils, Zlib.
-         </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No test suite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>Systemd</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Less dependency info -->
-  <bridgehead renderas="sect2" id="less-dep">Less</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep, Make,
-         Ncurses, Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No test suite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Libcap dependency info -->
-  <bridgehead renderas="sect2" id="libcap-dep">Libcap</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Attr, Bash, Binutils, Coreutils, Glibc, GCC, Grep, Make</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No test suite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>Coreutils, IPutils, Systemd</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Libpipeline dependency info -->
-  <bridgehead renderas="sect2" id="libpipeline-dep">Libpipeline</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep,
-         Make, Sed, Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Check</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>Man-DB</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Libtool dependency info -->
-  <bridgehead renderas="sect2" id="libtool-dep">Libtool</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, Findutils, Gawk,
-         GCC, Grep, Make, Sed, Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Autoconf</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Linux Headers dependency info -->
-  <bridgehead renderas="sect2" id="linux-headers-dep">Linux Headers</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Binutils, Coreutils, Findutils, GCC, Grep, Make, Perl, Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No test suite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Linux Kernel dependency info -->
-  <bridgehead renderas="sect2" id="linux-dep">Linux Kernel</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, Findutils, GCC, Grep,
-         Gzip, Make, KMOD, Ncurses, Perl, Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No test suite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin M4 dependency info -->
-  <bridgehead renderas="sect2" id="m4-dep">M4</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Glibc, Gawk, GCC, Grep, Make, Sed,
-         Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Diffutils</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>Autoconf, Bison</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Make dependency info -->
-  <bridgehead renderas="sect2" id="make-dep">Make</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep,
-         Make, Sed, Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Perl, Procps-ng</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Man-DB dependency info -->
-  <bridgehead renderas="sect2" id="man-db-dep">Man-DB</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Bzip2, Coreutils, Glibc, Gawk, GCC,
-         Grep, Groff, Gzip, Less, XZ Utils, Make, Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No test suite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>D-Bus</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Man-Pages dependency info -->
-  <bridgehead renderas="sect2" id="man-pages-dep">Man-Pages</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Coreutils, Make</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No test suite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin MPC dependency info -->
-  <bridgehead renderas="sect2" id="mpc-dep">MPC</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, Gawk, GCC, Grep, GMP,
-         Make, MPFR, Sed, Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>GCC</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin MPFR dependency info -->
-  <bridgehead renderas="sect2" id="mpfr-dep">MPFR</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, Gawk, GCC, Grep, GMP,
-         Make, Sed, Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>Gawk, GCC</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Ncurses dependency info -->
-  <bridgehead renderas="sect2" id="ncurses-dep">Ncurses</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, Gawk, GCC, Grep,
-         Make, Pkg-config-lite, Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No test suite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>Bash, GRUB, Inetutils, Less, Procps-ng, Psmisc, Readline, Texinfo,
-          Util-linux, Vim</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Patch dependency info -->
-  <bridgehead renderas="sect2" id="patch-dep">Patch</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep, Make, Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No test suite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Perl dependency info -->
-  <bridgehead renderas="sect2" id="perl-dep">Perl</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Bzip2, Coreutils, Glibc, Gawk, GCC, Grep,
-         Make, Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Gzip, Iana-Etc, Procps-ng, Tar</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>Autoconf</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Pkg-config-lite dependency info -->
-  <bridgehead renderas="sect2" id="pkg-config-lite-dep">Pkg-config-lite</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, Gawk, GCC, Grep,
-         Make, Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>E2fsprogs, Systemd, Util-linux</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Procps-ng dependency info -->
-  <bridgehead renderas="sect2" id="procps-ng-dep">Procps-ng</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Make, Ncurses</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No test suite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Psmisc dependency info -->
-  <bridgehead renderas="sect2" id="psmisc-dep">Psmisc</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep, Make, Ncurses
-        , Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No test suite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Readline dependency info -->
-  <bridgehead renderas="sect2" id="readline-dep">Readline</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep, Make, Ncurses,
-         Patch, Sed, Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No test suite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>Bash, Gawk</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Sed dependency info -->
-  <bridgehead renderas="sect2" id="sed-dep">Sed</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Acl, Attr, Bash, Binutils, Coreutils, Glibc, GCC, Grep, Make,
-         Sed, Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Diffutils, Gawk</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>E2fsprogs, File, Libtool, Shadow</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Shadow dependency info -->
-  <bridgehead renderas="sect2" id="shadow-dep">Shadow</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Acl, Attr, Bash, Binutils, Coreutils, Diffutils, Glibc,
-         Findutils, Gawk, GCC, Gettext, Grep, Make, Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No test suite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin systemd dependency info -->
-  <bridgehead renderas="sect2" id="systemd-dep">Systemd</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Acl, Attr, Bash, Binutils, Coreutils, E2fsprogs, Glibc,
-         Findutils, Gawk, GCC, GPerf, Grep, Intltool, Libcap, Make, Perl,
-         Pkg-config, Sed, Util-linux, XML::Parser</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No test suite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>D-Bus</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Tar dependency info -->
-  <bridgehead renderas="sect2" id="tar-dep">Tar</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Acl, Attr, Bash, Binutils, Bison, Coreutils, Glibc, GCC,
-         Grep, Make, Sed, Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Diffutils, Findutils, Gawk, Gzip</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Tcl dependency info -->
-  <bridgehead renderas="sect2" id="tcl-dep">Tcl</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, GCC, Grep,
-         Make, Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Texinfo dependency info -->
-  <bridgehead renderas="sect2" id="texinfo-dep">Texinfo</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Glibc, Gawk, GCC, Grep, Make,
-         Ncurses, Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Diffutils, Gzip</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Util-linux dependency info -->
-  <bridgehead renderas="sect2" id="util-linux-dep">Util-linux</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep,
-         Make, Ncurses, Pkg-config-lite, Sed, Texinfo, Zlib</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No test suite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>E2fsprogs, Systemd</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Vim dependency info -->
-  <bridgehead renderas="sect2" id="vim-dep">Vim</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Acl, Attr, Bash, Binutils, Coreutils, Diffutils, Glibc, Findutils, Gawk, GCC,
-         Gettext, Grep, Make, Ncurses, Perl, Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Gzip</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin XML::Parser dependency info -->
-  <bridgehead renderas="sect2" id="xml-parser-dep">XML::Parser</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Coreutils, Expat, Make, Perl</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>Intltool</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin XZ Utils dependency info -->
-  <bridgehead renderas="sect2" id="xz-utils-dep">XZ Utils</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, Findutils, Gawk, GCC,
-         Grep, Make, Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Zlib dependency info -->
-  <bridgehead renderas="sect2" id="zlib-dep">Zlib</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Make, Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>File, KMOD, Util-linux</seg>
-        </seglistitem>
-      </segmentedlist>
-
-</appendix>
Index: OK/appendices/dependencies/mips.xml
===================================================================
--- BOOK/appendices/dependencies/mips.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,97 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<appendix id="appendixc-mips" xreflabel="Appendix C">
-  <?dbhtml dir="appendixc"?>
-  <?dbhtml filename="mips-dependencies.html"?>
-
-  <title>Mips Dependencies</title>
-
-  <para>This page contains dependency information for packages specific to Mips.</para>
-
-<!-- Begin arcload dependency info -->
-  <bridgehead renderas="sect2" id="arcload-dep">Arcload</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Binutils, Coreutils, Dvhtool, GCC, Make, Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin colo dependency info -->
-  <bridgehead renderas="sect2" id="colo-dep">Colo</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Binutils, Coreutils, GCC, Gzip, Make</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin dvhtool dependency info -->
-  <bridgehead renderas="sect2" id="dvhtool-dep">Dvhtool</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Binutils, Coreutils, GCC, Make</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-</appendix>
Index: OK/appendices/dependencies/ppc.xml
===================================================================
--- BOOK/appendices/dependencies/ppc.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,124 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<appendix id="appendixc-ppc" xreflabel="Appendix C">
-  <?dbhtml dir="appendixc"?>
-  <?dbhtml filename="ppc-dependencies.html"?>
-
-  <title>PowerPC Dependencies</title>
-
-  <para>This page contains dependency information for packages specific to ppc.</para>
-
-<!-- Begin hfsutils dependency info -->
-  <bridgehead renderas="sect2" id="hfsutils-dep">hfsutils</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GCC, Make</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin parted dependency info -->
-  <bridgehead renderas="sect2" id="parted-dep">Parted</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, E2fsprogs, GCC, Make, Ncurses,
-         Readline</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin powerpc-utils dependency info -->
-  <bridgehead renderas="sect2" id="powerpc-utils-dep">Powerpc-Utils</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Binutils, GCC, Make, Patch</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin yaboot dependency info -->
-  <bridgehead renderas="sect2" id="yaboot-dep">Yaboot</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Binutils, Coreutils, GCC, Make, Mktemp, Patch, Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-</appendix>
Index: OK/appendices/dependencies/sparc.xml
===================================================================
--- BOOK/appendices/dependencies/sparc.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,71 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<appendix id="appendixc-sparc" xreflabel="Appendix C">
-  <?dbhtml dir="appendixc"?>
-  <?dbhtml filename="sparc-dependencies.html"?>
-
-  <title>Sparc Dependencies</title>
-
-  <para>This page contains dependency information for packages specific to Sparc.</para>
-
-<!-- Begin elftoaout dependency info -->
-  <bridgehead renderas="sect2" id="elftoaout-dep">Elftoaout</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Binutils, GCC, Make, Patch</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin silo dependency info -->
-  <bridgehead renderas="sect2" id="silo-dep">Silo</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Binutils, Coreutils, Glibc, Elftoaout, Gawk, GCC, Grep, Gzip,
-         Make, Patch, Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-</appendix>
Index: OK/appendices/dependencies/x86.xml
===================================================================
--- BOOK/appendices/dependencies/x86.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,44 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<appendix id="appendixc-x86" xreflabel="Appendix C">
-  <?dbhtml dir="appendixc"?>
-  <?dbhtml filename="x86-dependencies.html"?>
-
-  <title>x86 Dependencies</title>
-
-  <para>This page contains dependency information for packages specific to x86.</para>
-
-<!-- Begin GRUB2 dependency info -->
-  <bridgehead renderas="sect2" id="grub2-dep">GRUB2</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Bison Coreutils, Diffutils, Glibc, Gawk, GCC, Gettext,
-         Grep, Make, Ncurses, Sed, Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-</appendix>
Index: OK/appendices/dependencies/x86_64-64.xml
===================================================================
--- BOOK/appendices/dependencies/x86_64-64.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,16 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<appendix id="appendixc-x86_64-64" xreflabel="Appendix C">
-  <?dbhtml dir="appendixc"?>
-  <?dbhtml filename="x86_64-64-dependencies.html"?>
-
-  <title>x86 Dependencies</title>
-
-  <para>This page contains dependency information for packages specific to x86 Pure64.</para>
-
-</appendix>
Index: OK/appendices/license.xml
===================================================================
--- BOOK/appendices/license.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,188 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<appendix id="license" xreflabel="Open Publication License">
-  <?dbhtml dir="appendices"?>
-  <?dbhtml filename="license.html"?>
-
-  <title>Open Publication License</title>
-  <bridgehead renderas="sect3">v1.0, 8 June 1999</bridgehead>
-
-
-  <bridgehead renderas="sect2">I. REQUIREMENTS ON BOTH UNMODIFIED AND
-  MODIFIED VERSIONS</bridgehead>
-
-  <para>The Open Publication works may be reproduced and distributed in
-  whole or in part, in any medium physical or electronic, provided that
-  the terms of this license are adhered to, and that this license or an
-  incorporation of it by reference (with any options elected by the
-  author(s) and/or publisher) is displayed in the reproduction.</para>
-
-  <para>Proper form for an incorporation by reference is as follows:</para>
-
-  <blockquote>
-    <para>Copyright &copy; &lt;year&gt; by &lt;author's name or designee&gt;.
-    This material may be distributed only subject to the terms and conditions
-    set forth in the Open Publication License, vX.Y or later (the latest
-    version is presently available at <ulink
-    url="http://www.opencontent.org/openpub/"/>).</para>
-  </blockquote>
-
-  <para>The reference must be immediately followed with any options elected
-  by the author(s) and/or publisher of the document (see section VI).</para>
-
-  <para>Commercial redistribution of Open Publication-licensed material
-  is permitted.</para>
-
-  <para>Any publication in standard (paper) book form shall require the
-  citation of the original publisher and author. The publisher and
-  author's names shall appear on all outer surfaces of the book. On all
-  outer surfaces of the book the original publisher's name shall be as
-  large as the bridgehead of the work and cited as possessive with respect
-  to the bridgehead.</para>
-
-
-  <bridgehead renderas="sect2">II. COPYRIGHT</bridgehead>
-
-  <para>The copyright to each Open Publication is owned by its
-  author(s) or designee.</para>
-
-  <bridgehead renderas="sect2">III. SCOPE OF LICENSE</bridgehead>
-
-  <para>The following license terms apply to all Open Publication works,
-  unless otherwise explicitly stated in the document.</para>
-
-  <para>Mere aggregation of Open Publication works or a portion of an
-  Open Publication work with other works or programs on the same media
-  shall not cause this license to apply to those other works. The
-  aggregate work shall contain a notice specifying the inclusion of the
-  Open Publication material and appropriate copyright notice.</para>
-
-  <para>SEVERABILITY. If any part of this license is found to be
-  unenforceable in any jurisdiction, the remaining portions of the
-  license remain in force.</para>
-
-  <para>NO WARRANTY. Open Publication works are licensed and provided
-  "as is" without warranty of any kind, express or implied, including,
-  but not limited to, the implied warranties of merchantability and
-  fitness for a particular purpose or a warranty of non-infringement.</para>
-
-
-  <bridgehead renderas="sect2">IV. REQUIREMENTS ON MODIFIED WORKS</bridgehead>
-
-  <para>All modified versions of documents covered by this license,
-  including translations, anthologies, compilations and partial documents,
-  must meet the following requirements:</para>
-
-  <orderedlist>
-    <listitem>
-      <para>The modified version must be labeled as such.</para>
-    </listitem>
-    <listitem>
-      <para>The person making the modifications must be identified and
-      the modifications dated.</para>
-    </listitem>
-    <listitem>
-      <para>Acknowledgement of the original author and publisher if
-      applicable must be retained according to normal academic citation
-      practices.</para>
-    </listitem>
-    <listitem>
-      <para>The location of the original unmodified document must be
-      identified.</para>
-    </listitem>
-    <listitem>
-      <para>The original author's (or authors') name(s) may not be used
-      to assert or imply endorsement of the resulting document without
-      the original author's (or authors') permission.</para>
-    </listitem>
-  </orderedlist>
-
-
-  <bridgehead renderas="sect2">V. GOOD-PRACTICE RECOMMENDATIONS</bridgehead>
-
-  <para>In addition to the requirements of this license, it is requested
-  from and strongly recommended of redistributors that:</para>
-
-  <orderedlist>
-    <listitem>
-      <para>If you are distributing Open Publication works on hardcopy
-      or CD-ROM, you provide email notification to the authors of your
-      intent to redistribute at least thirty days before your manuscript
-      or media freeze, to give the authors time to provide updated
-      documents. This notification should describe modifications, if any,
-      made to the document.</para>
-    </listitem>
-    <listitem>
-      <para>All substantive modifications (including deletions) be either
-      clearly marked up in the document or else described in an attachment
-      to the document.</para>
-    </listitem>
-    <listitem>
-      <para>Finally, while it is not mandatory under this license, it is
-      considered good form to offer a free copy of any hardcopy and CD-ROM
-      expression of an Open Publication-licensed work to its author(s).</para>
-    </listitem>
-  </orderedlist>
-
-
-  <bridgehead renderas="sect2">VI. LICENSE OPTIONS</bridgehead>
-
-  <para>The author(s) and/or publisher of an Open Publication-licensed
-  document may elect certain options by appending language to the reference
-  to or copy of the license. These options are considered part of the
-  license instance and must be included with the license (or its
-  incorporation by reference) in derived works.</para>
-
-  <para>A. To prohibit distribution of substantively modified versions
-  without the explicit permission of the author(s). "Substantive modification"
-  is defined as a change to the semantic content of the document, and
-  excludes mere changes in format or typographical corrections.</para>
-
-  <para>To accomplish this, add the phrase `Distribution of substantively
-  modified versions of this document is prohibited without the explicit
-  permission of the copyright holder.' to the license reference or copy.</para>
-
-  <para>B. To prohibit any publication of this work or derivative works in
-  whole or in part in standard (paper) book form for commercial purposes
-  is prohibited unless prior permission is obtained from the copyright
-  holder.</para>
-
-  <para>To accomplish this, add the phrase 'Distribution of the work or
-  derivative of the work in any standard (paper) book form is prohibited
-  unless prior permission is obtained from the copyright holder.' to the
-  license reference or copy.</para>
-
-
-  <bridgehead renderas="sect2">OPEN PUBLICATION POLICY APPENDIX</bridgehead>
-
-  <para>(This is not considered part of the license.)</para>
-
-  <para>Open Publication works are available in source format via the Open
-  Publication home page at <ulink url="http://works.opencontent.org/"/>.</para>
-
-  <para>Open Publication authors who want to include their own license on
-  Open Publication works may do so, as long as their terms are not more
-  restrictive than the Open Publication license.</para>
-
-  <para>If you have questions about the Open Publication License, please
-  contact David Wiley at dw@opencontent.org, and/or the Open Publication
-  Authors' List at opal@opencontent.org, via email.</para>
-
-  <para>To <emphasis role="strong">subscribe</emphasis> to the Open Publication
-  Authors' List: Send E-mail to opal-request@opencontent.org with the word
-  "subscribe" in the body.</para>
-
-  <para>To <emphasis role="strong">post</emphasis> to the Open Publication
-  Authors' List: Send E-mail to opal@opencontent.org or simply reply to a
-  previous post.</para>
-
-  <para>To <emphasis role="strong">unsubscribe</emphasis> from the Open
-  Publication Authors' List: Send E-mail to opal-request@opencontent.org
-  with the word "unsubscribe" in the body.</para>
-
-</appendix>
Index: OK/appendices/ppc/macmiscellany.xml
===================================================================
--- BOOK/appendices/ppc/macmiscellany.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,144 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<appendix id="appendixe" xreflabel="Appendix E">
-  <?dbhtml dir="appendices"?>
-  <?dbhtml filename="macmiscellany.html"?>
-
-  <title>Open Firmware and Mac issues.</title>
-
-    <para>This appendix documents some of the features of ppc macintoshes,
-    and in particular the requirements of coexisting with Mac OS's (OSX or
-    the old OS9).  It is only relevant to NewWorld hardware.</para>
-
-  <variablelist>
-
-    <varlistentry>
-      <term><emphasis role="bold">Open Firmware and blessed partitions</emphasis></term>
-      <listitem>
-        <para>The Open Firmware (OF) is the code in ROM or nvram which controls
-        how the machine boots.  If booting automatically, it will boot from the
-        first valid blessed partition it finds (this is a simplification,
-        but it is adequate for normal purposes).</para>
-
-        <para>It can only read apple filesystems (hfs, hfs+, or hfsx depending
-        on the version of the firmware).  For disks under linux, the blessing
-        is done by ybin when it installs yaboot (the loader) and yaboot.conf.</para>
-
-        <para>Mac OS's have a tendency to look at other hfs{,+,x} filesystems
-        on the disk, and unbless them if they do not match their expectations.
-        Unblessing makes them unbootable. Fortunately, a filesystem of type
-        <literal>Apple_Bootstrap</literal> can be read as hfs by the OF, but will
-        be ignored by Mac OS.</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">Partitioning</emphasis></term>
-      <listitem>
-        <para>Macintoshes use their own partition format - this means that other
-        machines are unlikely to be able to read or write to macintosh partitions
-        (in particular, fdisk does not understand them). The format allows a large
-        number of individual partitions, and the native Mac tools had a tendency
-        to insert small "filler" partitions between the real partitions. Under
-        linux, using more than 15 partitions can be problematic (shortage of device
-        nodes), so the normal approach is to use the Mac tools to create an area
-        of freespace at the <emphasis>front</emphasis> of the disk, then put the
-        Mac OS partition(s) after it and (re-)install the Mac OS.  The
-        freespace can then be partitioned using <command>parted</command> or the
-        older <command>mac-fdisk</command>.  It seems that recent versions of the
-        Mac tools may no longer insert the filler partitions, so it may be
-        possible to do all the partitioning before installing OSX.</para>
-
-        <warning>
-        <para>The Macintosh resizing and partitioning tools are destructive and may
-        delete all data when a partition is resized, even on unaltered partitions.
-        </para>
-        </warning>
-
-        <para>For the Linux partitions, you will need a bootstrap partition - this
-        can normally be a mere 800KB in size (the smallest hfs partition available)
-        although the Fedora installer  has been known to insist on 800MB.  This has
-        to be in front of the Mac OS partition.  The bootstrap is
-        <emphasis>never</emphasis> mounted as a regular partition and should not
-        be confused with a <literal>/boot</literal> partition.  Other partitions
-        are as normal (at least one rootfs, perhaps swap, perhaps others).</para>
-
-        <para>According to the lfs-from-osx hint, the Mac partitioning tools
-        can create an apple_bootstrap partition and therefore there is no need
-        to use a Linux CD to create the desired partitions from freespace, but
-        using a Linux CD to create the partitions is a more widely tested approach.
-        </para>
-
-        <para>If you follow this approach, partition 1 will be the apple partition
-        map, partition 2 will be the bootstrap at the start of the disk, the
-        linux partitions will follow, and then the mac partition(s) - under OSX
-        the first mac partition will be number 3, under OS9 it would have a higher
-        number and there would be some apple driver partitions.</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">OSX or OF upgrades</emphasis></term>
-      <listitem>
-        <para>If the machine is dual-booted with OSX, the mac kernel or the OF
-        will probably be upgraded at some point.  This appears to either unbless
-        the bootstrap,        or else just point the OF boot device to the mac partition
-        - so, the linux system will no longer be bootable.</para>
-
-        <para>Therefore, you will need to know which partition contains the bootstrap
-        so that you can boot it from OF (on an apple keyboard, hold down
-        option-command-o-f (that is, alt-apple-o-f) while booting then enter a
-        command like:</para>
-
-<screen><userinput role="nodump">boot hd:2,yaboot</userinput></screen>
-
-        <para>This will allow you to select a linux boot, and from there you
-        will have to rerun <command>ybin</command>.</para>
-
-        <para>The "OS chooser" menu that yaboot typically loads is stored in the
-        OF and will not be available after a Mac kernel or firmware upgrade until
-        <command>ybin</command> has been rerun.</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">Yaboot's requirements</emphasis></term>
-      <listitem>
-        <para>Yaboot is the boot loader for linux, sometimes referred to as
-        the second stage loader.  It reads the yaboot.conf file on the bootstrap
-        partition to find which linux system(s) should be available, and
-        attempts to load the required kernel.</para>
-
-        <para>The bootstrap man page warns that the path to the kernel should
-        contain no more than one directory for reliability.</para>
-
-        <para>Yaboot has to be able to understand the filesystem, so that it
-        can find the kernel.  It understands hfs (not useful for linux, it is
-        not case-sensitive), ext2 (and therefore it can read ext3), reiser3,
-        and xfs.  If you want to use a different type of filesystem for '/'
-        you will have to create a separate boot partition with a supported
-        filesystem, and use that to hold the kernels.</para>
-
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">Requirements if starting from OSX</emphasis></term>
-      <listitem>
-        <para>Older versions of OSX (panther, leopard) can write to ext2
-        filesystems using version 1.3 of ext2fsx.  The upgrade to tiger broke
-        this, and version 1.4 of ext2fsx only supports reading.  Users of
-        current OSX will therefore have to find some other way of creating
-        a suitable filesystem and populating it, such as a Live CD or rescue CD.
-        </para>
-      </listitem>
-    </varlistentry>
-
-  </variablelist>
-
-</appendix>
Index: OK/appendices/rationale/common.xml
===================================================================
--- BOOK/appendices/rationale/common.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,445 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<appendix id="appendixd-common" xreflabel="Appendix D">
-  <?dbhtml dir="appendixd"?>
-  <?dbhtml filename="rationale-common.html"?>
-
-  <title>Package Rationale</title>
-
-  <para>CLFS includes many packages, a number of which might not necessarily
-  be required for a "minimal" system, but still considered very useful. The
-  purpose of this page is to list the reasoning for each package's inclusion
-  in the book.</para>
-
-  <itemizedlist>
-
-    <listitem>
-      <para>Acl</para>
-      <para>The Acl package allows usage and setting of POSIX Access Control
-      Lists. It can be used by several other packages in CLFS, such as Coreutils
-      and Systemd.</para>
-    </listitem>
-
-    <listitem>
-      <para>Attr</para>
-      <para>Attr allows setting and viewing extended attributes of filesystem
-      objects. It is required by Systemd.</para>
-    </listitem>
-
-    <listitem>
-      <para>Autoconf</para>
-      <para>The Autoconf package contains programs for producing shell scripts
-      that can automatically configure source code. This is useful for software
-      developers, as well as anyone who wants to install packages that don't
-      come with a configure script, such as some of the packages in CBLFS.</para>
-    </listitem>
-
-    <listitem>
-      <para>Automake</para>
-      <para>The Automake package contains programs for generating Makefiles
-      for use with Autoconf. This can be useful to software developers.</para>
-    </listitem>
-
-    <listitem>
-      <para>Bash</para>
-      <para>This package contains the Bourne-Again SHell. A shell is an
-      important component of a Linux system, as there must be some way of
-      allowing the users to enter commands.</para>
-    </listitem>
-
-    <listitem>
-      <para>Bc</para>
-      <para>This package contains a precision calculator. The Linux kernel
-      uses Bc to render the timeconst header.</para>
-    </listitem>
-
-
-    <listitem>
-      <para>Binutils</para>
-      <para>This package contains programs for handling object files. The
-      programs in this package are needed for compiling most of the packages
-      in CLFS.</para>
-    </listitem>
-
-    <listitem>
-      <para>Bison</para>
-      <para>This package contains programs that are required by several
-      packages in CLFS.</para>
-    </listitem>
-
-    <listitem>
-      <para>Bzip2</para>
-      <para>The programs in this package are useful for compressing files to
-      reduce size. They are also needed to uncompress tarballs for many
-      CLFS packages.</para>
-    </listitem>
-
-    <listitem>
-      <para>CLFS-Boot-scripts</para>
-      <para>This package contains a number of scripts that run at boottime,
-      performing essential tasks such as mounting/checking filesystems and
-      starting the network interface.</para>
-    </listitem>
-
-    <listitem>
-      <para>Check</para>
-      <para>This package contains a test harness for other programs. It is
-      used for some packages' test suites.</para>
-    </listitem>
-
-    <listitem>
-      <para>Coreutils</para>
-      <para>This package contains many basic command-line file-management
-      tools, required for installation of every package in CLFS.</para>
-    </listitem>
-
-    <listitem>
-      <para>D-Bus</para>
-      <para>D-Bus is a message bus system, which allows applications to
-      communicate to each other. It is used by Systemd.</para>
-    </listitem>
-
-    <listitem>
-      <para>DejaGNU</para>
-      <para>This package is needed for the test suites of several packages,
-      especially GCC and Binutils.</para>
-    </listitem>
-
-    <listitem>
-      <para>DHCPCD</para>
-      <para>This package allows for automatic configuration of network
-      interfaces from a DHCP server. It (or some other package providing a
-      DHCP client is needed to connect to a DHCP server.</para>
-    </listitem>
-
-    <listitem>
-      <para>Diffutils</para>
-      <para>This package contains programs to compare files, and can also
-      be used to create patches. It is required by the installation procedures
-      of many CLFS packages, and used by many packages' test suites.</para>
-    </listitem>
-
-    <listitem>
-      <para>Eudev</para>
-      <para>This is a package that allows for dynamic creation of device nodes.
-      It is a fork of Udev, which is now part of Systemd. It is still
-      used for the "Boot" method in the temp-system, as Systemd is not needed
-      there.</para>
-    </listitem>
-
-    <listitem>
-      <para>Expect</para>
-      <para>This package is needed for the test suites for several packages.</para>
-    </listitem>
-
-    <listitem>
-      <para>E2fsprogs</para>
-      <para>The programs in this package are used for the creation and
-      maintenance of ext2/3/4 filesystems.</para>
-    </listitem>
-
-    <listitem>
-      <para>File</para>
-      <para>This package contains a program that determines the type of
-      a given file. It is needed by some CLFS packages.</para>
-    </listitem>
-
-    <listitem>
-      <para>Findutils</para>
-      <para>This package contains programs for finding files based on certain
-      criteria, and optionally performing commands on them. These programs
-      are used by the installation procedures of many CLFS packages.</para>
-    </listitem>
-
-    <listitem>
-      <para>Flex</para>
-      <para>This package contains a tool for generating text scanners. It is
-      used by multiple packages in CLFS</para>
-    </listitem>
-
-    <listitem>
-      <para>Gawk</para>
-      <para>This package contains programs for manipulating text files, using
-      the AWK language. It is used by the installation procedures of many
-      packages in CLFS.</para>
-    </listitem>
-
-    <listitem>
-      <para>Gcc</para>
-      <para>This package contains a C compiler, which is required to compile
-      most of the packages in CLFS.</para>
-    </listitem>
-
-    <listitem>
-      <para>GDBM</para>
-      <para>This package contains the GNU Database Manager library. Man-DB
-      requires either GDBM or Berkeley DB, though it prefers GDBM.</para>
-    </listitem>
-
-    <listitem>
-      <para>Gettext</para>
-      <para>A tool that allows programmers to easily implement i18n
-      (internationalization) in their programs. It is a required dependency
-      for a number of packages</para>
-    </listitem>
-
-    <listitem>
-      <para>Glibc</para>
-      <para>Any dynamically-linked C program (nearly every package in CLFS
-      has these) needs a C library to compile and run.</para>
-    </listitem>
-
-    <listitem>
-      <para>GMP</para>
-      <para>This package is required by GCC.</para>
-    </listitem>
-
-    <listitem>
-      <para>Gperf</para>
-      <para>This package is required by Systemd.</para>
-    </listitem>
-
-    <listitem>
-      <para>Grep</para>
-      <para>This package contains programs for searching for text in files.
-      These programs are required by many packages in CLFS.</para>
-    </listitem>
-
-    <listitem>
-      <para>Groff</para>
-      <para>This package is required by Man-DB.</para>
-    </listitem>
-
-    <listitem>
-      <para>Gzip</para>
-      <para>Useful for compressing files to reduce size. It is also needed to
-      uncompress tarballs for many CLFS packages</para>
-    </listitem>
-
-    <listitem>
-      <para>Iana-Etc</para>
-      <para>This package provides the <filename>/etc/services</filename> and
-      <filename>/etc/protocols</filename> files. These files map port names to
-      port numbers as well as protocol names to their corresponding numbers.
-      These files are essential for many network based programs to work properly.</para>
-    </listitem>
-
-    <listitem>
-      <para>Intltool</para>
-      <para>This package is required by Systemd.</para>
-    </listitem>
-
-    <listitem>
-      <para>IProute2</para>
-      <para>This package contains programs for administering network
-      interfaces.</para>
-    </listitem>
-
-    <listitem>
-      <para>IPutils</para>
-      <para>This package contains several basic network-management tools.</para>
-    </listitem>
-
-    <listitem>
-      <para>ISL</para>
-      <para>This package is required by GCC for GRAPHITE optimizations.</para>
-    </listitem>
-
-    <listitem>
-      <para>Kbd</para>
-      <para>Contains keytable files and keyboard utilities compatible with the
-      Linux kernel. These can be used to change the display font and keyboard
-      layout.</para>
-    </listitem>
-
-    <listitem>
-      <para>Kmod</para>
-      <para>This package contains programs that assist in loading an unloading
-      kernel modules.</para>
-    </listitem>
-
-    <listitem>
-      <para>Less</para>
-      <para>A program that lets you view text files one page at a time.
-      It is also used by Man-DB for displaying manpages.</para>
-    </listitem>
-
-    <listitem>
-      <para>Libcap</para>
-      <para>This package is required by Systemd.</para>
-    </listitem>
-
-    <listitem>
-      <para>Libpipeline</para>
-      <para>The Libpipeline package contains a library for manipulating
-      pipelines of subprocesses in a flexible and convenient way. It is
-      required by the Man-DB package.</para>
-    </listitem>
-
-    <listitem>
-      <para>Libtool</para>
-      <para>The Libtool package contains the GNU generic library support
-      script. It is used by some CLFS packages.</para>
-    </listitem>
-
-    <listitem>
-      <para>Linux Headers</para>
-      <para>This package consists of santized headers from the Linux Kernel.
-      These headers are required for Glibc to compile.</para>
-    </listitem>
-
-    <listitem>
-      <para>Linux Kernel</para>
-      <para>The Linux operating system.</para>
-    </listitem>
-
-    <listitem>
-      <para>M4</para>
-      <para>This package contains a macro processor. It is required by several
-      CLFS packages, including Bison.</para>
-    </listitem>
-
-    <listitem>
-      <para>Make</para>
-      <para>This is required for installation of most CLFS packages</para>
-    </listitem>
-
-    <listitem>
-      <para>Man-DB</para>
-      <para>This package contains programs for finding and viewing man pages,
-      and has superior internationalization capabilities compared to the
-      <application>Man</application> package.</para>
-    </listitem>
-
-    <listitem>
-      <para>Man-Pages</para>
-      <para>A number of useful manpages, not supplied by other packages</para>
-    </listitem>
-
-    <listitem>
-      <para>MPC</para>
-      <para>This package is required by GCC.</para>
-    </listitem>
-
-    <listitem>
-      <para>MPFR</para>
-      <para>This package is required by GCC.</para>
-    </listitem>
-
-    <listitem>
-      <para>Ncurses</para>
-      <para>Needed by several packages in CLFS, such as Vim, Bash, and Less</para>
-    </listitem>
-
-    <listitem>
-      <para>Patch</para>
-      <para>Used for applying patches in several CLFS packages</para>
-    </listitem>
-
-    <listitem>
-      <para>Perl</para>
-      <para>The Perl package contains the Practical Extraction and Report
-      Language. It is required by several CLFS packages.</para>
-    </listitem>
-
-    <listitem>
-      <para>Pkg-config-lite</para>
-      <para>Several packages in CLFS, and many others outside of CLFS,
-      use <command>pkg-config</command> to locate dependencies.</para>
-    </listitem>
-
-    <listitem>
-      <para>Procps-ng</para>
-      <para>Provides a number of small, useful utilities that give information
-      about the <filename class="directory">/proc</filename> filesystem.</para>
-    </listitem>
-
-    <listitem>
-      <para>Psmisc</para>
-      <para>Provides more utilties that give information about the
-      <filename class="directory">/proc</filename> filesystem.</para>
-    </listitem>
-
-    <listitem>
-      <para>Readline</para>
-      <para>The Readline library provides a set of functions for use by
-      applications that allow users to edit command lines as they are typed
-      in. This is essential for input in programs like <command>bash</command>
-      to work properly.</para>
-    </listitem>
-
-    <listitem>
-      <para>Sed</para>
-      <para>This package contains a stream editor. It is used in the
-      installation procedures of most CLFS packages.</para>
-    </listitem>
-
-    <listitem>
-      <para>Shadow</para>
-      <para>This package contains programs that assist in the administration
-      of users and groups, and passwords.</para>
-    </listitem>
-
-    <listitem>
-      <para>Systemd</para>
-      <para>Systemd provides the init daemon for the system, as well as Udev,
-      which dynamically creates device nodes.</para>
-    </listitem>
-
-    <listitem>
-      <para>Tar</para>
-      <para>Required to unpack the tar archives in which all CLFS packages
-      are distributed</para>
-    </listitem>
-
-    <listitem>
-      <para>Tcl</para>
-      <para>Needed for the test suites of several packages</para>
-    </listitem>
-
-    <listitem>
-      <para>Texinfo</para>
-      <para>This package contains programs for viewing, installing and
-      converting info pages. It is used in the installation procedures
-      of many CLFS packages.</para>
-    </listitem>
-
-    <listitem>
-      <para>Util-linux</para>
-      <para>The Util-linux package contains miscellaneous utility programs.
-      Among them are utilities for handling file systems, consoles,
-      partitions, and messages. It also includes libraries that are required
-      by E2fsprogs.</para>
-    </listitem>
-
-    <listitem>
-      <para>Vim</para>
-      <para>The Vim package contains a text editor. Users may substitute Nano,
-      Joe, Emacs, or whatever other editor they prefer.</para>
-    </listitem>
-
-    <listitem>
-      <para>XML::Parser</para>
-      <para>This Perl module is required by Intltool.</para>
-    </listitem>
-
-    <listitem>
-      <para>XZ Utils</para>
-      <para>Useful for compressing files to reduce size. Also needed to
-      uncompress tarballs for many CLFS packages</para>
-    </listitem>
-
-    <listitem>
-      <para>Zlib</para>
-      <para>The Zlib package contains compression and decompression routines
-      used by some programs.</para>
-    </listitem>
-
-  </itemizedlist>
-
-</appendix>
Index: OK/appendices/rationale/mips.xml
===================================================================
--- BOOK/appendices/rationale/mips.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,36 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<appendix id="appendixd-mips" xreflabel="Appendix D">
-  <?dbhtml dir="appendixd"?>
-  <?dbhtml filename="rationale-mips.html"?>
-
-  <title>Package Rationale - MIPS</title>
-
-  <para>This is the explanation for the inclusion of MIPS-specific packages.</para>
-
-  <itemizedlist>
-
-    <listitem>
-      <para>ARCLoad</para>
-      <para>An SGI Multi-bootloader. Able to bootload many different SGI Systems.</para>
-    </listitem>
-
-    <listitem>
-      <para>Colo</para>
-      <para>A replacement bootloader for the Cobalt MIPS based Raq/Qube? servers.</para>
-    </listitem>
-
-    <listitem>
-      <para>DVHTool</para>
-      <para>Dvhtool is the tool responsible for writing MIPS kernel(s) into
-      the SGI volume header.</para>
-    </listitem>
-
-  </itemizedlist>
-
-</appendix>
Index: OK/appendices/rationale/sparc.xml
===================================================================
--- BOOK/appendices/rationale/sparc.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,31 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<appendix id="appendixd-sparc" xreflabel="Appendix D">
-  <?dbhtml dir="appendixd"?>
-  <?dbhtml filename="rationale-sparc.html"?>
-
-  <title>Package Rationale - Sparc</title>
-
-  <para>This is the explanation for the inclusion of Sparc-specific packages.</para>
-
-  <itemizedlist>
-
-    <listitem>
-      <para>ELFtoaout</para>
-      <para>A utility for converting ELF binaries to a.out binaries. Needed to
-      install Silo.</para>
-    </listitem>
-
-    <listitem>
-      <para>Silo</para>
-      <para>SPARC/UltraSPARC Improved Loader, a boot loader for Sparc.</para>
-    </listitem>
-
-  </itemizedlist>
-
-</appendix>
Index: OK/appendices/rationale/x86.xml
===================================================================
--- BOOK/appendices/rationale/x86.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,25 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<appendix id="appendixd-x86" xreflabel="Appendix D">
-  <?dbhtml dir="appendixd"?>
-  <?dbhtml filename="rationale-x86.html"?>
-
-  <title>Package Rationale - X86</title>
-
-  <para>This is the explanation for the inclusion of x86-specific packages.</para>
-
-  <itemizedlist>
-
-    <listitem>
-      <para>GRUB</para>
-      <para>The GRand Unified Bootloader.</para>
-    </listitem>
-
-  </itemizedlist>
-
-</appendix>
Index: OK/boot/64/flags.xml
===================================================================
--- BOOK/boot/64/flags.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,17 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-flags">
-  <?dbhtml filename="flags.html"?>
-
-  <title>Build Flags</title>
-
-  <para>We will need to copy our build variables into our new system:</para>
-
-<screen><userinput>echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ${CLFS}/root/.bash_profile</userinput></screen>
-
-</sect1>
Index: OK/boot/common/bc.xml
===================================================================
--- BOOK/boot/common/bc.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,65 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-bc">
-  <?dbhtml filename="bc.html"?>
-
-  <title>Bc-&bc-version;</title>
-
-  <indexterm zone="ch-boot-bc">
-    <primary sortas="a-Bc">Bc</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/bc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Bc</title>
-
-    <para>We will install a <command>bc</command> program that can run
-    on the host system, as this is needed to compile the kernel.</para>
-
-    <para>Prepare Bc for compilation:</para>
-
-<screen><userinput>CC=gcc \
-./configure \
-    --prefix=/cross-tools</userinput></screen>
-
-    <variablelist>
-      <title>The meaning of the configure option:</title>
-
-      <varlistentry>
-        <term><parameter>CC=gcc</parameter></term>
-        <listitem>
-          <para>This ensures that we use the host's compiler to build Bc,
-          since we need it to run on the host system.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para>Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-    <para>Install the package:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-bc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/common/boot-scripts.xml
===================================================================
--- BOOK/boot/common/boot-scripts.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,229 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-boot-scripts" role="wrap">
-  <?dbhtml filename="boot-scripts.html"?>
-
-  <title>Boot-scripts for CLFS &boot-scripts-clfs-version;</title>
-
-  <indexterm zone="ch-boot-boot-scripts">
-    <primary sortas="a-Boot-scripts">Boot-scripts</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Boot-scripts package contains a set of scripts to
-    start/stop the CLFS system at bootup/shutdown.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Boot-scripts</title>
-
-    <para os="a">Install the package:</para>
-
-<screen os="b"><userinput>make DESTDIR=/tools install-boot-scripts</userinput></screen>
-
-  <para os="c">The <command>setclock</command> script reads the time from the
-  hardware clock, also known as the BIOS or the Complementary Metal Oxide
-  Semiconductor (CMOS) clock. If the hardware clock is set to UTC, this
-  script will convert the hardware clock's time to the local time using
-  the <filename>/tools/etc/sysconfig/clock</filename> file (which tells the
-  <command>hwclock</command> program which timezone the user is in). There
-  is no way to detect whether or not the hardware clock is set to UTC, so
-  this needs to be configured manually.</para>
-
-
-
-  <para os="d">If you do not know whether or not the hardware clock is set to UTC,
-  you can find out after you have booted the new machine by running the
-  <userinput>hwclock --localtime  --show</userinput> command, and if
-  necessary editing the <filename>/tools/etc/sysconfig/clock</filename> file.
-  The worst that will happen if you make a wrong guess here is that the
-  time displayed will be wrong.</para>
-
-  <para os="e">Change the value of the <envar>UTC</envar> variable below
-  to a value of <option>0</option> (zero) if the hardware clock
-  is <emphasis>not</emphasis> set to UTC time.</para>
-
-<screen os="f"><userinput>cat &gt; /tools/etc/sysconfig/clock &lt;&lt; "EOF"
-<literal># Begin /tools/etc/sysconfig/clock
-
-UTC=1
-
-# End /tools/etc/sysconfig/clock</literal>
-EOF</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-boot-scripts" role="content">
-    <title>Contents of Boot-scripts</title>
-
-    <segmentedlist>
-      <segtitle>Installed scripts</segtitle>
-
-      <seglistitem>
-        <seg>checkfs, cleanfs, functions, halt, localnet, mountfs, mountkernfs,
-        rc, reboot, sendsignals, setclock, swap, and udev.</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="checkfs-boot-scripts">
-        <term><command>checkfs</command></term>
-        <listitem>
-          <para>Checks the integrity of the file systems before they are
-          mounted (with the exception of journal and network based file
-          systems)</para>
-          <indexterm zone="ch-boot-boot-scripts checkfs-boot-scripts">
-            <primary sortas="d-checkfs">checkfs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cleanfs-boot-scripts">
-        <term><command>cleanfs</command></term>
-        <listitem>
-          <para>Removes files that should not be preserved between reboots,
-          such as those in <filename class="directory">/run/</filename>
-          and <filename class="directory">/var/lock/</filename>; it re-creates
-          <filename>/run/utmp</filename> and removes the possibly present
-          <filename>/etc/nologin</filename>, <filename>/fastboot</filename>,
-          and <filename>/forcefsck</filename> files</para>
-          <indexterm zone="ch-boot-boot-scripts cleanfs-boot-scripts">
-            <primary sortas="d-cleanfs">cleanfs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="functions-boot-scripts">
-        <term><command>functions</command></term>
-        <listitem>
-          <para>Contains common functions, such as error and status checking,
-          that are used by several boot-scripts</para>
-          <indexterm zone="ch-boot-boot-scripts functions-boot-scripts">
-            <primary sortas="d-functions">functions</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="halt-boot-scripts">
-        <term><command>halt</command></term>
-        <listitem>
-          <para>Halts the system</para>
-          <indexterm zone="ch-boot-boot-scripts halt-boot-scripts">
-            <primary sortas="d-halt">halt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="localnet-boot-scripts">
-        <term><command>localnet</command></term>
-        <listitem>
-          <para>Sets up the system's hostname and local loopback device</para>
-          <indexterm zone="ch-boot-boot-scripts localnet-boot-scripts">
-            <primary sortas="d-localnet">localnet</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mountfs-boot-scripts">
-        <term><command>mountfs</command></term>
-        <listitem>
-          <para>Mounts all file systems, except ones that are marked
-          <emphasis>noauto</emphasis> or are network based</para>
-          <indexterm zone="ch-boot-boot-scripts mountfs-boot-scripts">
-            <primary sortas="d-mountfs">mountfs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mountkernfs-boot-scripts">
-        <term><command>mountkernfs</command></term>
-        <listitem>
-          <para>Mounts virtual kernel file systems, such as
-          <systemitem class="filesystem">proc</systemitem></para>
-          <indexterm zone="ch-boot-boot-scripts mountkernfs-boot-scripts">
-            <primary sortas="d-mountkernfs">mountkernfs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rc-boot-scripts">
-        <term><command>rc</command></term>
-        <listitem>
-          <para>The master run-level control script; it is responsible for
-          running all the other boot-scripts one-by-one, in a sequence
-          determined by the name of the symbolic links being processed</para>
-          <indexterm zone="ch-boot-boot-scripts rc-boot-scripts">
-            <primary sortas="d-rc">rc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="reboot-boot-scripts">
-        <term><command>reboot</command></term>
-        <listitem>
-          <para>Reboots the system</para>
-          <indexterm zone="ch-boot-boot-scripts reboot-boot-scripts">
-            <primary sortas="d-reboot">reboot</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sendsignals-boot-scripts">
-        <term><command>sendsignals</command></term>
-        <listitem>
-          <para>Makes sure every process is terminated before the system reboots
-          or halts</para>
-          <indexterm zone="ch-boot-boot-scripts sendsignals-boot-scripts">
-            <primary sortas="d-sendsignals">sendsignals</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="setclock-boot-scripts">
-        <term><command>setclock</command></term>
-        <listitem>
-          <para>Resets the kernel clock to local time in case the hardware clock
-          is not set to UTC time</para>
-          <indexterm zone="ch-boot-boot-scripts setclock-boot-scripts">
-            <primary sortas="d-setclock">setclock</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="swap-boot-scripts">
-        <term><command>swap</command></term>
-        <listitem>
-          <para>Enables and disables swap files and partitions</para>
-          <indexterm zone="ch-boot-boot-scripts swap-boot-scripts">
-            <primary sortas="d-swap">swap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="eudev-boot-scripts">
-        <term><command>udev</command></term>
-        <listitem>
-          <para>Starts and stops the Eudev daemon</para>
-          <indexterm zone="ch-boot-boot-scripts eudev-boot-scripts">
-            <primary sortas="d-eudev">udev</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/common/changingowner.xml
===================================================================
--- BOOK/boot/common/changingowner.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,39 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-changingowner">
-  <?dbhtml filename="changingowner.html"?>
-
-  <title>Changing Ownership</title>
-
-  <para os="a">Currently, the <filename class="directory">/tools</filename>
-  and <filename class="directory">/cross-tools</filename> directories
-  are owned by the user <emphasis>clfs</emphasis>, a user that
-  exists only on the host system. Although <filename
-  class="directory">/tools</filename> and <filename
-  class="directory">/cross-tools</filename> can be deleted once the CLFS
-  system has been finished, they can be retained to build
-  additional CLFS systems. If the <filename class="directory">/tools</filename>
-  and <filename class="directory">/cross-tools</filename> directories are
-  kept as is, the files are owned by a user ID without a corresponding
-  account. This is dangerous because a user account created later could
-  get this same user ID and would own these directories and all the files
-  therein, thus exposing those files to possible malicious manipulation.</para>
-
-  <para os="b">One possible fix for this issue might be to add the
-  <systemitem class="username">clfs</systemitem> user to the new CLFS system
-  later when creating the <filename>/etc/passwd</filename> file, taking care
-  to assign it the same user and group IDs as on the host system. Alternatively,
-  assign the contents of the <filename class="directory">/tools</filename>
-  and <filename class="directory">/cross-tools</filename> directories to
-  user <systemitem class="username">root</systemitem> by running the
-  following commands:</para>
-
-<screen os="c"><userinput>chown -Rv 0:0 ${CLFS}/tools
-chown -Rv 0:0 ${CLFS}/cross-tools</userinput></screen>
-
-</sect1>
Index: OK/boot/common/createfiles.xml
===================================================================
--- BOOK/boot/common/createfiles.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,151 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-createfiles">
-  <?dbhtml filename="createfiles.html"?>
-
-  <title>Creating Essential Symlinks</title>
-
-  <para os="a">Some programs use hard-wired paths to files which do not exist
-  yet. In order to satisfy these programs, create a number of symbolic
-  links which will be replaced by real files throughout the course of
-  the next chapter after the software has been installed.</para>
-
-<screen os="b"><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,login,pwd,stty} ${CLFS}/bin
-ln -sv /tools/bin/file ${CLFS}/usr/bin
-ln -sv /tools/lib/libgcc_s.so{,.1} ${CLFS}/usr/lib
-ln -sv /tools/lib/libstdc++.so{.6,} ${CLFS}/usr/lib
-sed -e 's/tools/usr/' /tools/lib/libstdc++.la &gt; ${CLFS}/usr/lib/libstdc++.la
-ln -sv bash ${CLFS}/bin/sh
-ln -sv /tools/sbin/init ${CLFS}/sbin
-ln -sv /tools/etc/{login.{access,defs},limits} ${CLFS}/etc</userinput></screen>
-
-  <variablelist os="c">
-    <title>The purpose of each link:</title>
-
-    <varlistentry os="c1">
-      <term><parameter><filename>/bin/bash</filename></parameter></term>
-      <listitem>
-        <para>Many <command>bash</command> scripts specify
-        <filename>/bin/bash</filename>.</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry os="c2">
-      <term><parameter><filename>/bin/cat</filename></parameter></term>
-      <listitem>
-        <para>This pathname is hard-coded into Glibc's configure script.</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry os="c3">
-      <term><parameter><filename>/bin/echo</filename></parameter></term>
-      <listitem>
-        <para>This is to satisfy one of the tests in Glibc's test suite, which
-        expects <filename>/bin/echo</filename>.</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry os="c4">
-      <term><parameter><filename>/bin/grep</filename></parameter></term>
-      <listitem>
-        <para>This to avoid a hard-coded
-        <filename class="directory">/tools</filename> reference in Libtool.</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry os="c5">
-      <term><parameter><filename>/bin/login</filename></parameter></term>
-      <listitem>
-        <para>The <command>agetty</command> program expects to find
-        <command>login</command> in <filename class="directory">/bin</filename>.</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry os="c6">
-      <term><parameter><filename>/bin/pwd</filename></parameter></term>
-      <listitem>
-        <para>Some <command>configure</command> scripts, particularly Glibc's,
-        have this pathname hard-coded.</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry os="c7">
-      <term><parameter><filename>/bin/stty</filename></parameter></term>
-      <listitem>
-        <para>This pathname is hard-coded into Expect, therefore it is needed
-        for Binutils and GCC test suites to pass.</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry os="c8">
-      <term><parameter><filename>/usr/bin/file</filename></parameter></term>
-      <listitem>
-        <para>Binutils' <command>configure</command> scripts specify this
-        command location.</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry os="c9">
-      <term><parameter><filename>/usr/lib/libgcc_s.so{,.1}</filename></parameter></term>
-      <listitem>
-        <para>Glibc needs this for the pthreads library to work.</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry os="c10">
-      <term><parameter><filename>/usr/lib/libstdc++{,.6}</filename></parameter></term>
-      <listitem>
-        <para>This is needed by several tests in Glibc's test suite, as well as
-        for C++ support in GMP.</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry os="c11">
-      <term><parameter><filename>/usr/lib/libstdc++.la</filename></parameter></term>
-      <listitem>
-        <para>This prevents a <filename class="directory">/tools</filename>
-        reference that would otherwise be in
-        <filename>/usr/lib/libstdc++.la</filename> after GCC is installed.</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry os="c12">
-      <term><parameter><filename>/bin/sh</filename></parameter></term>
-      <listitem>
-        <para>Many shell scripts hard-code <filename>/bin/sh</filename>.</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry os="c13">
-      <term><parameter><filename>/sbin/init</filename></parameter></term>
-      <listitem>
-        <para>This is where the kernel expects to find <command>init</command>.</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry os="c14">
-      <term><parameter><filename>/etc/{login.{access,defs},limits}</filename></parameter></term>
-      <listitem>
-        <para>These are configuration files used by Shadow and are expected to
-        be found in <filename class="directory">/etc</filename>, for programs
-        such as <command>login</command> and <command>su</command> to work.</para>
-      </listitem>
-    </varlistentry>
-
-  </variablelist>
-
-  <para os="d">Historically, Linux maintains a list of the mounted file systems
-  in the file <filename>/etc/mtab</filename>. Modern kernels maintain this list
-  internally and expose it to the user via the
-  <filename class="directory">/proc</filename> filesystem. To satisfy utilities
-  that expect the presence of <filename>/etc/mtab</filename>, create the
-  following symbolic link:</para>
-
-<screen os="e"><userinput>ln -sv /proc/self/mounts ${CLFS}/etc/mtab</userinput></screen>
-
-</sect1>
Index: OK/boot/common/creatingdirs.xml
===================================================================
--- BOOK/boot/common/creatingdirs.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,68 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-creatingdirs">
-  <?dbhtml filename="creatingdirs.html"?>
-
-  <title>Creating Directories</title>
-
-    <note os="a">
-      <para>The commands in the remainder of the book should be run as
-      the <systemitem class="username">root</systemitem> user. Check
-      that ${CLFS} is set in the
-      <systemitem class="username">root</systemitem> user&rsquo;s environment
-       before proceeding.</para>
-    </note>
-
-  <para os="b">It is time to create some structure in the CLFS file system. Create a
-  standard directory tree by issuing the following commands:</para>
-
-<screen os="c"><userinput>mkdir -pv ${CLFS}/{bin,boot,dev,{etc/,}opt,home,lib/firmware,mnt}
-mkdir -pv ${CLFS}/{proc,media/{floppy,cdrom},run/{,shm},sbin,srv,sys}
-mkdir -pv ${CLFS}/var/{lock,log,mail,spool}
-mkdir -pv ${CLFS}/var/{opt,cache,lib/{misc,locate},local}
-install -dv -m 0750 ${CLFS}/root
-install -dv -m 1777 ${CLFS}{/var,}/tmp
-ln -sv ../run ${CLFS}/var/run
-mkdir -pv ${CLFS}/usr/{,local/}{bin,include,lib,sbin,src}
-mkdir -pv ${CLFS}/usr/{,local/}share/{doc,info,locale,man}
-mkdir -pv ${CLFS}/usr/{,local/}share/{misc,terminfo,zoneinfo}
-mkdir -pv ${CLFS}/usr/{,local/}share/man/man{1,2,3,4,5,6,7,8}</userinput></screen>
-
-  <para os="d">Directories are, by default, created with permission mode 755,
-  but this is not desirable for all directories. In the commands above,
-  two changes are made&mdash;one to the home directory of user
-  <systemitem class="username">root</systemitem>, and another to the
-  directories for temporary files.</para>
-
-  <para os="e">The first mode change ensures that not just anybody can enter
-  the <filename class="directory">/root</filename> directory&mdash;the
-  same as a normal user would do with his or her home directory. The
-  second mode change makes sure that any user can write to the
-  <filename class="directory">/tmp</filename> and
-  <filename class="directory">/var/tmp</filename> directories, but
-  cannot remove another user's files from them. The latter is prohibited
-  by the so-called <quote>sticky bit,</quote> the highest bit (1) in the
-  1777 bit mask.</para>
-
-  <sect2 os="f">
-    <title>FHS Compliance Note</title>
-
-    <para>The directory tree is based on the Filesystem Hierarchy Standard
-    (FHS) (available at <ulink url="https://wiki.linuxfoundation.org/en/FHS"/>).
-    In addition to the tree created above, this standard stipulates the
-    existence of <filename class="directory">/usr/local/games</filename>
-    and <filename class="directory">/usr/share/games</filename>. The FHS
-    is not precise as to the structure of the <filename
-    class="directory">/usr/local/share</filename> subdirectory, so we
-    create only the directories that are needed. However, feel free to
-    create these directories if you prefer to conform more strictly to
-    the FHS.</para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/common/devices.xml
===================================================================
--- BOOK/boot/common/devices.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,36 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-devices">
-  <?dbhtml filename="devices.html"?>
-
-  <title>Populating /dev</title>
-
-  <indexterm zone="ch-boot-devices">
-    <primary sortas="e-/dev/*">/dev/*</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <sect2>
-    <title>Creating Initial Device Nodes</title>
-
-    <para os="b">When the kernel boots the system, it requires the presence
-    of a few device nodes, in particular the <filename
-    class="devicefile">console</filename> and <filename
-    class="devicefile">null</filename> devices. The device nodes will
-    be created on the hard disk so that they are available before
-    <command>udev</command> has been started, and additionally when Linux
-    is started in single user mode (hence the restrictive permissions on
-    <filename class="devicefile">console</filename>). Create these by running
-    the following commands:</para>
-
-<screen><userinput>mknod -m 0600 ${CLFS}/dev/console c 5 1
-mknod -m 0666 ${CLFS}/dev/null c 1 3</userinput></screen>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/common/e2fsprogs.xml
===================================================================
--- BOOK/boot/common/e2fsprogs.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,94 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-e2fsprogs" role="wrap">
-  <?dbhtml filename="e2fsprogs.html"?>
-
-  <title>E2fsprogs-&e2fsprogs-version;</title>
-
-  <indexterm zone="ch-boot-e2fsprogs">
-    <primary sortas="a-E2fsprogs">E2fsprogs</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/e2fsprogs.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of E2fsprogs</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="aa"><userinput>../configure \
-    --prefix=/tools \
-    --enable-elf-shlibs \
-    --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET} \
-    --disable-libblkid \
-    --disable-libuuid \
-    --disable-fsck \
-    --disable-uuidd</userinput></screen>
-
-    <variablelist os="e">
-      <title>The meaning of the configure options:</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../final-system/common/e2fsprogs.xml"
-      xpointer="xpointer(//*[@os='e2'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../final-system/common/e2fsprogs.xml"
-      xpointer="xpointer(//*[@os='e3'])"/>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-e2fsprogs" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/common/eudev.xml
===================================================================
--- BOOK/boot/common/eudev.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,311 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-eudev" role="wrap">
-  <?dbhtml filename="eudev.html"?>
-
-  <title>Eudev-&eudev-version;</title>
-
-  <indexterm zone="ch-boot-eudev">
-    <primary sortas="a-Eudev">Eudev</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Eudev package contains programs for dynamic creation of device
-    nodes.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Eudev</title>
-
-   <para os="a">Prepare Eudev for compilation:</para>
-
-<screen os="b"><userinput>./configure \
-    --prefix=/tools \
-    --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET} \
-    --disable-introspection \
-    --disable-gtk-doc-html \
-    --disable-gudev \
-    --disable-keymap \
-    --with-firmware-path=/tools/lib/firmware \
-    --enable-libkmod</userinput></screen>
-
-    <variablelist os="b1">
-      <title>The meaning of the new configure options:</title>
-
-      <varlistentry>
-        <term><parameter>--disable-introspection --disable-gtk-doc-html
-        --disable-gudev --disable-keymap</parameter></term>
-        <listitem>
-          <para>These switches disable several features which are not needed
-          for the temporary system and have additional dependencies.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--with-firmware-path=/tools/lib/firmware</parameter></term>
-        <listitem>
-          <para>This allows Eudev to load firmware from
-          <filename class="directory">/tools/lib/firmware</filename> instead of
-          the default location of <filename class="directory">/lib/firmware</filename>.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--enable-libkmod</parameter></term>
-        <listitem>
-          <para>Allows Eudev to load modules by using
-          <filename class="libraryfile">libkmod</filename> directly.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="g">Install the package:</para>
-
-<screen os="j"><userinput>make install</userinput></screen>
-
-    <para os="i">Create a directory for storing firmware that can be
-    loaded by <command>udev</command>:</para>
-
-<screen os="k"><userinput>install -dv /tools/lib/firmware</userinput></screen>
-
-    <para os="r1">Create a dummy rule so that Eudev will name ethernet devices properly for the system.</para>
-
-<screen os="r2"><userinput>echo "# dummy, so that network is once again on eth*" &gt; \
-    /tools/etc/udev/rules.d/80-net-name-slot.rules</userinput></screen>
-
- </sect2>
-
-  <sect2 id="contents-eudev" role="content">
-    <title>Contents of Eudev</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed library</segtitle>
-      <segtitle>Installed directories</segtitle>
-
-      <seglistitem>
-        <seg>ata_id, cdrom_id, collect, create_floppy_devices, edd_id,
-        firmware.sh, fstab_import, path_id, scsi_id, udevadm, udevd, usb_id,
-        v4l_id, write_cd_rules, write_net_rules</seg>
-        <seg>libudev</seg>
-        <seg>/tools/etc/udev, /tools/lib/firmware, /tools/lib/udev</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="udevadm-eudev">
-        <term><command>udevadm</command></term>
-        <listitem>
-        <para>Controls the runtime behavior of Eudev, requests kernel
-        events, manages the event queue, and provides simple debugging.</para>
-          <indexterm zone="ch-boot-eudev udevadm-eudev">
-            <primary sortas="b-udevadm-eudev">udevadm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="udevd">
-        <term><command>udevd</command></term>
-        <listitem>
-          <para>A daemon that reorders hotplug events before submitting them to
-          <command>udev</command>,
-          thus avoiding various race conditions</para>
-          <indexterm zone="ch-boot-eudev udevd">
-            <primary sortas="b-udevd">udevd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
- <!-- Start of Helpers -->
-      <varlistentry id="ata_id">
-        <term><command>ata_id</command></term>
-        <listitem>
-          <para>Provides Eudev with a unique string and additional
-          information (uuid, label) for an ATA drive</para>
-          <indexterm zone="ch-boot-eudev ata_id">
-            <primary sortas="b-ata_id">ata_id</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cdrom_id">
-        <term><command>cdrom_id</command></term>
-        <listitem>
-          <para>Prints the capabilities of a CDROM or DVDROM drive.</para>
-          <indexterm zone="ch-boot-eudev cdrom_id">
-            <primary sortas="b-cdrom_id">cdrom_id</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="collect">
-        <term><command>collect</command></term>
-        <listitem>
-          <para>Given an ID for the current uevent and a list of IDs
-(for all target uevents), registers the current ID and indicates whether
-all target IDs have been registered.</para>
-          <indexterm zone="ch-boot-eudev collect">
-            <primary sortas="b-collect">collect</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="create_floppy_devices">
-        <term><command>create_floppy_devices</command></term>
-        <listitem>
-          <para>Creates all possible floppy devices based on the CMOS type</para>
-          <indexterm zone="ch-boot-eudev create_floppy_devices">
-            <primary sortas="b-create_floppy_devices">create_floppy_devices</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="edd_id">
-        <term><command>edd_id</command></term>
-        <listitem>
-          <para>Identifies x86 disk drives from Enhanced Disk Drive calls</para>
-          <indexterm zone="ch-boot-eudev edd_id">
-            <primary sortas="b-edd_id">edd_id</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="firmware.sh">
-        <term><command>firmware.sh</command></term>
-        <listitem>
-          <para>Script to load firmware for a device</para>
-          <indexterm zone="ch-boot-eudev firmware.sh">
-            <primary sortas="b-firmware.sh">firmware.sh</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fstab_import">
-        <term><command>fstab_import</command></term>
-        <listitem>
-          <para>Finds an entry in <filename>/etc/fstab</filename> that matches
-the current device, and provides its information to Udev.</para>
-          <indexterm zone="ch-boot-eudev fstab_import">
-            <primary sortas="b-fstab_import">fstab_import</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="path_id">
-        <term><command>path_id</command></term>
-        <listitem>
-          <para>Provides the shortest possible unique hardware path to a
-          device</para>
-          <indexterm zone="ch-boot-eudev path_id">
-            <primary sortas="b-path_id">path_id</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="scsi_id">
-        <term><command>scsi_id</command></term>
-        <listitem>
-          <para>Retrieves or generates a unique SCSI identifier.</para>
-          <indexterm zone="ch-boot-eudev scsi_id">
-            <primary sortas="b-scsi_id">scsi_id</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="usb_id">
-        <term><command>usb_id</command></term>
-        <listitem>
-          <para>Identifies a USB block device.</para>
-          <indexterm zone="ch-boot-eudev usb_id">
-            <primary sortas="b-usb_id">usb_id</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="v4l_id">
-        <term><command>v4l_id</command></term>
-        <listitem>
-          <para>Determines V4L capabilities for a given device.</para>
-          <indexterm zone="ch-boot-eudev v4l_id">
-            <primary sortas="b-v4l_id">v4l_id</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="write_cd_rules">
-        <term><command>write_cd_rules</command></term>
-        <listitem>
-          <para>A script which generates Eudev rules to provide stable names
-for network interfaces.</para>
-          <indexterm zone="ch-boot-eudev write_cd_rules">
-            <primary sortas="b-write_cd_rules">write_cd_rules</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="write_net_rules">
-        <term><command>write_net_rules</command></term>
-        <listitem>
-          <para>A script which generates Eudev rules to provide stable names
-for network interfaces.</para>
-          <indexterm zone="ch-boot-eudev write_net_rules">
-            <primary sortas="b-write_net_rules">write_net_rules</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-<!-- End of Helpers -->
-
-      <varlistentry id="libudev-eudev">
-        <term><filename class="libraryfile">libudev</filename></term>
-        <listitem>
-          <para>A library interface to eudev device information.</para>
-          <indexterm zone="ch-boot-eudev libudev-eudev">
-            <primary sortas="c-libudev-eudev">libudev</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="etc-eudev">
-        <term><filename class="directory">/etc/udev</filename></term>
-        <listitem>
-          <para>Contains <command>udev</command> configuration files,
-          device permissions, and rules for device naming</para>
-          <indexterm zone="ch-boot-eudev etc-eudev">
-            <primary sortas="e-/etc/udev">/etc/udev</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lib-eudev">
-        <term><filename class="directory">/lib/udev</filename></term>
-        <listitem>
-          <para>Contains <command>udev</command> helper programs
-          and static devices which get copied to /dev when booted.</para>
-          <indexterm zone="ch-boot-eudev lib-eudev">
-            <primary sortas="e-/lib/udev">/lib/udev</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/common/fstab.xml
===================================================================
--- BOOK/boot/common/fstab.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,51 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-fstab">
-  <?dbhtml filename="fstab.html"?>
-
-  <title>Creating the /etc/fstab File</title>
-
-  <indexterm zone="ch-boot-fstab">
-    <primary sortas="e-/etc/fstab">/etc/fstab</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <para os="a">The <filename>/etc/fstab</filename> file is used by some
-  programs to determine where file systems are to be mounted by default,
-  which must be checked, and in which order. Create a new file systems
-  table like this:</para>
-
-<screen><userinput>cat &gt; ${CLFS}/etc/fstab &lt;&lt; "EOF"
-<literal># Begin /etc/fstab
-
-# file system  mount-point  type   options          dump  fsck
-#                                                         order
-
-/dev/<replaceable>[xxx]</replaceable>     /            <replaceable>[fff]</replaceable>  defaults         1     1
-/dev/<replaceable>[yyy]</replaceable>     swap         swap   pri=1            0     0
-devpts         /dev/pts     devpts gid=&gid-tty;,mode=620   0     0
-shm            /dev/shm     tmpfs  defaults         0     0
-
-# End /etc/fstab</literal>
-EOF</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../system-config/common/fstab.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
-  <para os="c">The <filename class="directory">/dev/shm</filename> mount point
-  for <systemitem class="filesystem">tmpfs</systemitem> is included to
-  allow enabling POSIX-shared memory. The kernel must have the required
-  support built into it for this to work (more about this is in the next
-  section). Please note that very little software currently uses
-  POSIX-shared memory.  Therefore, consider the <filename
-  class="directory">/dev/shm</filename> mount point optional. For more
-  information, see <filename>Documentation/filesystems/tmpfs.txt</filename>
-  in the kernel source tree.</para>
-
-</sect1>
Index: OK/boot/common/howtoview.xml
===================================================================
--- BOOK/boot/common/howtoview.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,46 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-how-to-view">
-  <?dbhtml filename="how-to-view.html"?>
-
-  <title>How to View the Book</title>
-
-  <para>Most likely, you have been using a web browser or PDF viewer to read
-  the CLFS book so far. However, the temporary system in
-  <filename class="directory">/tools</filename> does not have
-  any of these, so you will need to find a way to continue following the book
-  after booting into the temporary build environment. Possible solutions
-  include:</para>
-
-  <itemizedlist>
-
-    <listitem>
-      <para>Simply have the book open on another computer, or even read a
-      printed copy, though one downside to this is that you cannot
-      copy-and-paste commands.</para>
-    </listitem>
-
-    <listitem>
-      <para>Convert the CLFS book into plain text, thus allowing it to be
-      viewed with <command>more</command> or <command>view</command>, by using
-      a command such as the following:</para>
-
-<screen><userinput>lynx -dump /path/to/clfs/book.html &gt; ${CLFS}/root/CLFS-book.txt</userinput></screen>
-
-    </listitem>
-
-    <listitem>
-      <para>Cross-compile and install additional programs before booting,
-      such as Lynx or Links to view the book, or Dropbear to allow remote
-      login. See the CLFS Hints website at <ulink url="&hints-root;"/> for more
-      suggestions by other users.</para>
-    </listitem>
-
-  </itemizedlist>
-
-</sect1>
Index: OK/boot/common/introduction.xml
===================================================================
--- BOOK/boot/common/introduction.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,17 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-introduction">
-  <?dbhtml filename="introduction.html"?>
-
-  <title>Introduction</title>
-
-  <para>This chapter shows how to complete the build of temporary tools to
-  create a minimal system that will be used to boot the target machine and to
-  build the final system packages.</para>
-
-</sect1>
Index: OK/boot/common/kmod.xml
===================================================================
--- BOOK/boot/common/kmod.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,90 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-kmod" role="wrap">
-  <?dbhtml filename="kmod.html"?>
-
-  <title>Kmod-&kmod-version;</title>
-
-  <indexterm zone="ch-boot-kmod">
-    <primary sortas="a-Kmod">Kmod</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/kmod.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Kmod</title>
-
-    <para os="s1">The following <command>sed</command> changes Kmod's default
-    module search location to
-    <filename class="directory">/tools/lib/modules</filename>:</para>
-
-<screen os="s2"><userinput>cp -v libkmod/libkmod.c{,.orig}
-sed '/dirname_default_prefix /s@/lib/modules@/tools&amp;@' \
-    libkmod/libkmod.c.orig &gt; libkmod/libkmod.c</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/kmod.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>./configure \
-    --prefix=/tools \
-    --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET} \
-    --with-xz \
-    --with-zlib</userinput></screen>
-
-    <variablelist os="c">
-      <title>The meaning of the new configure options:</title>
-
-      <varlistentry>
-        <term><parameter>--with-zlib --with-xz</parameter></term>
-        <listitem>
-          <para>These allow the Kmod package to handle zlib and XZ
-            compressed kernel modules.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/kmod.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/kmod.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/kmod.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-<screen os="h"><userinput>make install</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/kmod.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-<screen os="j"><userinput>ln -sfv kmod /tools/bin/lsmod
-for tool in depmod insmod modprobe modinfo rmmod; do
-    ln -sv ../bin/kmod /tools/sbin/${tool}
-done</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-kmod" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/common/pwdgroup.xml
===================================================================
--- BOOK/boot/common/pwdgroup.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,177 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-pwdgroup">
-  <?dbhtml filename="pwdgroup.html"?>
-
-  <title>Creating the passwd and group Files</title>
-
-  <indexterm zone="ch-boot-pwdgroup">
-    <primary sortas="e-/etc/passwd">/etc/passwd</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <indexterm zone="ch-boot-pwdgroup">
-    <primary sortas="e-/etc/group">/etc/group</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <para os="a">In order for user <systemitem class="username">root</systemitem> to
-  be able to login and for the name <quote>root</quote> to be recognized,
-  there must be relevant entries in the <filename>/etc/passwd</filename>
-  and <filename>/etc/group</filename> files.</para>
-
-  <para>Create the <filename>${CLFS}/etc/passwd</filename> file by running
-  the following command:</para>
-
-<screen><userinput>cat &gt; ${CLFS}/etc/passwd &lt;&lt; "EOF"
-<literal>root::&uid-root;:&gid-root;:root:/root:/bin/bash</literal>
-<literal>bin:x:&uid-bin;:&gid-bin;:/bin:/bin/false</literal>
-<literal>daemon:x:&uid-daemon;:&gid-daemon;:/sbin:/bin/false</literal>
-<literal>messagebus:x:&uid-messagebus;:&gid-messagebus;:D-Bus Message Daemon User:/dev/null:/bin/false</literal>
-<literal>systemd-bus-proxy:x:&uid-systemd-bus-proxy;:&gid-systemd-bus-proxy;:systemd Bus Proxy:/:/bin/false</literal>
-<literal>systemd-journal-gateway:x:&uid-systemd-journal-gateway;:&gid-systemd-journal-gateway;:systemd Journal Gateway:/:/bin/false</literal>
-<literal>systemd-journal-remote:x:&uid-systemd-journal-remote;:&gid-systemd-journal-remote;:systemd Journal Remote:/:/bin/false</literal>
-<literal>systemd-journal-upload:x:&uid-systemd-journal-upload;:&gid-systemd-journal-upload;:systemd Journal Upload:/:/bin/false</literal>
-<literal>systemd-network:x:&uid-systemd-network;:&gid-systemd-network;:systemd Network Management:/:/bin/false</literal>
-<literal>systemd-resolve:x:&uid-systemd-resolve;:&gid-systemd-resolve;:systemd Resolver:/:/bin/false</literal>
-<literal>systemd-timesync:x:&uid-systemd-timesync;:&gid-systemd-timesync;:systemd Time Synchronization:/:/bin/false</literal>
-<literal>systemd-coredump:x:&uid-systemd-coredump;:&gid-systemd-coredump;:systemd Core Dumper:/:/bin/false</literal>
-<literal>nobody:x:&uid-nobody;:&gid-nogroup;:Unprivileged User:/dev/null:/bin/false</literal>
-EOF</userinput></screen>
-
-  <para os="b">The actual password for <systemitem class="username">root</systemitem>
-  (the <quote>::</quote> used here is just a placeholder and allows you to login
-  with no password) will be set later.</para>
-
-  <variablelist os="c">
-
-    <title>Additional users you may want to add if not already included:</title>
-
-    <varlistentry>
-      <term><literal>adm:x:&uid-adm;:&gid-adm;:adm:/var/adm:/bin/false</literal></term>
-      <listitem>
-        <para>Was used for programs that performed administrative tasks.</para>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
-      <term><literal>lp:x:&uid-lp;:&gid-lp;:lp:/var/spool/lp:/bin/false</literal></term>
-      <listitem>
-        <para>Used by programs for printing</para>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
-      <term><literal>mail:x:&uid-mail;:&gid-mail;:mail:/var/mail:/bin/false</literal></term>
-      <listitem>
-        <para>Often used by email programs</para>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
-      <term><literal>news:x:&uid-news;:&gid-news;:news:/var/spool/news:/bin/false</literal></term>
-      <listitem>
-        <para>Often used for network news servers</para>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
-      <term><literal>operator:x:&uid-operator;:&gid-root;:operator:/root:/bin/bash</literal></term>
-      <listitem>
-        <para>Often used to allow system operators to access the system</para>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
-      <term><literal>postmaster:x:&uid-postmaster;:&gid-mail;:postmaster:/var/spool/mail:/bin/false</literal></term>
-      <listitem>
-        <para>Generally used as an account that receives all the information of troubles with the mail server</para>
-      </listitem>
-    </varlistentry>
-  </variablelist>
-
-  <para>Create the <filename>${CLFS}/etc/group</filename> file by running
-  the following command:</para>
-
-<screen><userinput>cat &gt; ${CLFS}/etc/group &lt;&lt; "EOF"
-<literal>root:x:0:
-bin:x:&gid-bin;:
-sys:x:&gid-sys;:
-kmem:x:&gid-kmem;:
-tty:x:&gid-tty;:
-tape:x:&gid-tape;:
-daemon:x:&gid-daemon;:
-floppy:x:&gid-floppy;:
-disk:x:&gid-disk;:
-lp:x:&gid-lp;:
-dialout:x:&gid-dialout;:
-audio:x:&gid-audio;:
-video:x:&gid-video;:
-utmp:x:&gid-utmp;:
-usb:x:&gid-usb;:
-cdrom:x:&gid-cdrom;:
-adm:x:&gid-adm;:
-mail:x:&gid-mail;:
-messagebus:x:&gid-messagebus;:
-nogroup:x:&gid-nogroup;:
-systemd-bus-proxy:x:&gid-systemd-bus-proxy;:
-systemd-journal:x:&gid-systemd-journal;:
-systemd-journal-gateway:x:&gid-systemd-journal-gateway;:
-systemd-journal-remote:x:&gid-systemd-journal-remote;:
-systemd-journal-upload:x:&gid-systemd-journal-upload;:
-systemd-network:x:&gid-systemd-network;:
-systemd-resolve:x:&gid-systemd-resolve;:
-systemd-timesync:x:&gid-systemd-timesync;:
-systemd-coredump:x:&gid-systemd-coredump;:
-wheel:x:&gid-wheel;:</literal>
-EOF</userinput></screen>
-
-  <variablelist os="d">
-
-    <title>Additional groups you may want to add if not already included:</title>
-
-    <varlistentry>
-      <term><literal>console:x:&gid-console;:</literal></term>
-      <listitem>
-        <para>This group has direct access to the console</para>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
-      <term><literal>cdrw:x:&gid-cdrw;:</literal></term>
-      <listitem>
-        <para>This group is allowed to use the CDRW drive</para>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
-      <term><literal>news:x:&gid-news;:news</literal></term>
-      <listitem>
-        <para>Used by Network News Servers</para>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
-      <term><literal>users:x:&gid-users;:</literal></term>
-      <listitem>
-        <para>The default GID used by shadow for new users</para>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
-      <term><literal>nobody:x:&gid-nogroup;:</literal></term>
-      <listitem>
-        <para>This is used by NFS</para>
-      </listitem>
-    </varlistentry>
-  </variablelist>
-
-  <para os="e">The created groups are not part of any standard&mdash;they are
-  groups decided on in part by the requirements of the Systemd configuration
-  in the final system, and in part by common convention employed by a
-  number of existing Linux distributions. The Linux Standard Base (LSB,
-  available at
-  <ulink url="http://www.linuxfoundation.org/collaborate/workgroups/lsb"/>)
-  recommends only that, besides the group <quote>root</quote> with a Group ID
-  (GID) of 0, a group <quote>bin</quote> with a GID of 1 be present. All other
-  group names and GIDs can be chosen freely by the system administrator since
-  well-written programs do not depend on GID numbers, but rather use the
-  group's name.</para>
-
-</sect1>
Index: OK/boot/common/settingenviron.xml
===================================================================
--- BOOK/boot/common/settingenviron.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,41 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-settingenviron">
-  <?dbhtml filename="settingenvironment.html"?>
-
-  <title>Setting Up the Environment</title>
-
-  <para>The new instance of the shell that will start when the system is booted is a <emphasis>login</emphasis>
-  shell, which will read the <filename>.bash_profile</filename> file. Create
-  <filename>.bash_profile</filename> now:</para>
-
-<screen><userinput>cat &gt; ${CLFS}/root/.bash_profile &lt;&lt; "EOF"
-<literal>set +h
-PS1='\u:\w\$ '
-LC_ALL=POSIX
-PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin:/tools/sbin
-export LC_ALL PATH PS1</literal>
-EOF</userinput></screen>
-
-  <para>The <envar>LC_ALL</envar> variable controls the localization of
-  certain programs, making their messages follow the conventions of a
-  specified country.
-  Setting <envar>LC_ALL</envar> to <quote>POSIX</quote> or <quote>C</quote>
-  (the two are equivalent) ensures that everything will work as expected
-  on your temporary system.</para>
-
-  <para>By putting <filename class="directory">/tools/bin</filename> and
-  <filename class="directory">/tools/sbin</filename> at
-  the end of the standard <envar>PATH</envar>, all the programs installed in
-  <xref linkend="chapter-temp-system"/> are only picked up by the shell
-  if they have not yet been built on the target system. This configuration
-  forces use of the final system binaries as they are built over the
-  temp-system, minimising the chance of final system programs being built
-  against the temp-system.</para>
-
-</sect1>
Index: OK/boot/common/shadow.xml
===================================================================
--- BOOK/boot/common/shadow.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,67 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-shadow" role="wrap">
-  <?dbhtml filename="shadow.html"?>
-
-  <title>Shadow-&shadow-version;</title>
-
-  <indexterm zone="ch-boot-shadow">
-    <primary sortas="a-Shadow">Shadow</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/shadow.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Shadow</title>
-
-    <para os="a">Disable the installation of the <command>groups</command>
-    program and man pages, as better versions of these programs are provided by
-    Coreutils, Util-linux and Man-pages. Also, prevent Shadow from setting the
-    suid bit on its installed programs:</para>
-
-<screen os="b"><userinput>cp -v src/Makefile.in{,.orig}
-sed -e 's/groups$(EXEEXT) //' \
-    -e 's/\(^suidu*bins = \).*/\1\\/' \
-    src/Makefile.in.orig &gt; src/Makefile.in</userinput></screen>
-
-    <para os="c">Tell Shadow to use <command>passwd</command> in
-    <filename class="directory">/tools/bin</filename>:</para>
-
-<screen os="d"><userinput>cat > config.cache &lt;&lt; "EOF"
-shadow_cv_passwd_dir=/tools/bin
-EOF</userinput></screen>
-
-    <para os="e">Prepare Shadow for compilation:</para>
-
-<screen os="f"><userinput>./configure \
-    --prefix=/tools \
-    --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET} \
-    --cache-file=config.cache</userinput></screen>
-
-    <para os="k">Compile the package:</para>
-
-<screen os="l"><userinput>make</userinput></screen>
-
-    <para os="m">Install the package:</para>
-
-<screen os="n"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-shadow" role="."/></para>
-  </sect2>
-
-</sect1>
Index: OK/boot/common/sysvinit.xml
===================================================================
--- BOOK/boot/common/sysvinit.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,253 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-sysvinit" role="wrap">
-  <?dbhtml filename="sysvinit.html"?>
-
-  <title>Sysvinit-&sysvinit-version;</title>
-
-  <indexterm zone="ch-boot-sysvinit">
-    <primary sortas="a-Sysvinit">Sysvinit</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Sysvinit package contains programs for controlling the startup,
-    running, and shutdown of the system.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Sysvinit</title>
-
-    <para os="p1">Apply a patch to prevent installation of unneeded programs,
-    and allow Sysvinit to be installed in
-    <filename class="directory">/tools</filename>:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../sysvinit-&sysvinit-version;-tools_updates-1.patch</userinput></screen>
-
-    <para os ="c">Compile the package:</para>
-
-<screen os="ac"><userinput>make -C src clobber
-make -C src CC="${CC}"</userinput></screen>
-
-   <para os="e">Install the package:</para>
-
-<screen os="ad"><userinput>make -C src ROOT=/tools install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="conf-tools-sysvinit" role="configuration">
-    <title>Configuring Sysvinit</title>
-
-    <indexterm zone="conf-tools-sysvinit">
-      <primary sortas="a-Sysvinit">Sysvinit</primary>
-      <secondary>configuring</secondary>
-    </indexterm>
-
-    <indexterm zone="conf-tools-sysvinit">
-      <primary sortas="e-/etc/inittab">/etc/inittab</primary>
-    </indexterm>
-
-    <para>Create a new file <filename>/tools/etc/inittab</filename> by running the
-    following:</para>
-
-<screen><userinput>cat &gt; /tools/etc/inittab &lt;&lt; "EOF"
-<literal># Begin /tools/etc/inittab
-
-id:3:initdefault:
-
-si::sysinit:/tools/etc/rc.d/init.d/rc sysinit
-
-l0:0:wait:/tools/etc/rc.d/init.d/rc 0
-l1:S1:wait:/tools/etc/rc.d/init.d/rc 1
-l2:2:wait:/tools/etc/rc.d/init.d/rc 2
-l3:3:wait:/tools/etc/rc.d/init.d/rc 3
-l4:4:wait:/tools/etc/rc.d/init.d/rc 4
-l5:5:wait:/tools/etc/rc.d/init.d/rc 5
-l6:6:wait:/tools/etc/rc.d/init.d/rc 6
-
-ca:12345:ctrlaltdel:/tools/sbin/shutdown -t1 -a -r now
-
-su:S016:once:/tools/sbin/sulogin
-</literal>
-EOF</userinput></screen>
-
-    <para>The following command adds the standard virtual terminals to
-    <filename>/tools/etc/inittab</filename>. If your system only has a serial
-    console skip the following command:</para>
-
-<screen><userinput>cat &gt;&gt; /tools/etc/inittab &lt;&lt; "EOF"
-<literal>1:2345:respawn:/tools/sbin/agetty --noclear -I '\033(K' tty1 9600
-2:2345:respawn:/tools/sbin/agetty --noclear -I '\033(K' tty2 9600
-3:2345:respawn:/tools/sbin/agetty --noclear -I '\033(K' tty3 9600
-4:2345:respawn:/tools/sbin/agetty --noclear -I '\033(K' tty4 9600
-5:2345:respawn:/tools/sbin/agetty --noclear -I '\033(K' tty5 9600
-6:2345:respawn:/tools/sbin/agetty --noclear -I '\033(K' tty6 9600
-</literal>
-EOF</userinput></screen>
-
-    <para>If your system has a serial console, run the following command to add
-    the entry to <filename>/tools/etc/inittab</filename>.</para>
-
-<screen><userinput>cat &gt;&gt; /tools/etc/inittab &lt;&lt; "EOF"
-<literal>c0:12345:respawn:/tools/sbin/agetty --noclear 115200 ttyS0 vt100
-</literal>
-EOF</userinput></screen>
-
-   <para>Finally, add the end line to <filename>/tools/etc/inittab</filename>.</para>
-
-<screen><userinput>cat &gt;&gt; /tools/etc/inittab &lt;&lt; "EOF"
-<literal># End /tools/etc/inittab</literal>
-EOF</userinput></screen>
-
-    <para>The <parameter>-I '\033(K'</parameter> option tells
-    <command>agetty</command> to send this escape sequence to the terminal
-    before doing anything else. This escape sequence switches the console
-    character set to a user-defined one, which can be modified by running
-    the <command>setfont</command> program. Sending this
-    escape sequence is necessary for people who use non-ISO 8859-1 screen
-    fonts, but it does not affect native English speakers.</para>
-
-  </sect2>
-
-  <sect2 id="contents-sysvinit" role="content">
-    <title>Contents of Sysvinit</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>bootlogd, fstab-decode, halt, init, killall5,
-        poweroff (link to halt), reboot (link to halt), runlevel,
-        shutdown, and telinit (link to init)</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="bootlogd">
-        <term><command>bootlogd</command></term>
-        <listitem>
-          <para>Logs boot messages to a log file</para>
-          <indexterm zone="ch-boot-sysvinit bootlogd">
-            <primary sortas="b-bootlogd">bootlogd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fstab-decode">
-        <term><command>fstab-decode</command></term>
-        <listitem>
-          <para>Runs a command with fstab-encoded arguments</para>
-          <indexterm zone="ch-boot-sysvinit fstab-decode">
-            <primary sortas="b-fstab-decode">fstab-decode</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="halt-sysv">
-        <term><command>halt</command></term>
-        <listitem>
-          <para>Normally invokes <command>shutdown</command> with the
-          <parameter>-h</parameter> option, except when already in run-level 0,
-          then it tells the kernel to halt the system; it notes in the
-          file <filename>/var/log/wtmp</filename> that the system is being
-          brought down</para>
-          <indexterm zone="ch-boot-sysvinit halt-sysv">
-            <primary sortas="b-halt-sysv">halt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="init-sysv">
-        <term><command>init</command></term>
-        <listitem>
-          <para>The first process to be started when the kernel has initialized
-          the hardware which takes over the boot process and starts all the
-          proceses it is instructed to</para>
-          <indexterm zone="ch-boot-sysvinit init-sysv">
-            <primary sortas="b-init-sysv">init</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="killall5">
-        <term><command>killall5</command></term>
-        <listitem>
-          <para>Sends a signal to all processes, except the processes in its own
-          session so it will not kill the shell running the script that called
-          it</para>
-          <indexterm zone="ch-boot-sysvinit killall5">
-            <primary sortas="b-killall5">killall5</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="poweroff-sysv">
-        <term><command>poweroff</command></term>
-        <listitem>
-          <para>Tells the kernel to halt the system and switch off the computer
-          (see <command>halt</command>)</para>
-          <indexterm zone="ch-boot-sysvinit poweroff-sysv">
-            <primary sortas="b-poweroff-sysv">poweroff</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="reboot-sysv">
-        <term><command>reboot</command></term>
-        <listitem>
-          <para>Tells the kernel to reboot the system (see
-          <command>halt</command>)</para>
-          <indexterm zone="ch-boot-sysvinit reboot-sysv">
-            <primary sortas="b-reboot-sysv">reboot</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="runlevel-sysv">
-        <term><command>runlevel</command></term>
-        <listitem>
-          <para>Reports the previous and the current run-level, as noted in
-          the last run-level record in <filename>/run/utmp</filename></para>
-          <indexterm zone="ch-boot-sysvinit runlevel-sysv">
-            <primary sortas="b-runlevel-sysv">runlevel</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="shutdown-sysv">
-        <term><command>shutdown</command></term>
-        <listitem>
-          <para>Brings the system down in a secure way, signaling all processes
-          and notifying all logged-in users</para>
-          <indexterm zone="ch-boot-sysvinit shutdown-sysv">
-            <primary sortas="b-shutdown-sysv">shutdown</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="telinit-sysv">
-        <term><command>telinit</command></term>
-        <listitem>
-          <para>Tells <command>init</command> which run-level to change to</para>
-          <indexterm zone="ch-boot-sysvinit telinit-sysv">
-            <primary sortas="b-telinit-sysv">telinit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/common/whatnext.xml
===================================================================
--- BOOK/boot/common/whatnext.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-whatnext">
-  <?dbhtml filename="whatnext.html"?>
-
-  <title>What to do next</title>
-
-  <para>Now you're at the point to get your <filename
-  class="directory">${CLFS}</filename> directory copied over to your target
-  machine. The easiest method would be to tar it up and copy the file.</para>
-
-<screen><userinput>tar -jcvf ${CLFS}.tar.bz2 ${CLFS}</userinput></screen>
-
-<!--
-  <para>Some others have came up with other ideas on how to do this.
-  Below is a table with the method and link to where the information
-  is stored.</para>
-
-  <table>
-    <title>Boot Methods</title>
-    <?dbfo table-width="6in" ?>
-
-    <tgroup cols="3">
-
-      <colspec colnum="1" colwidth="1in"   colname="Method"/>
-      <colspec colnum="2" colwidth="2.5in" colname="Arch"/>
-      <colspec colnum="3" colwidth="2.5in" colname="Link"/>
-
-      <thead>
-        <row>
-          <entry>Boot Method</entry>
-          <entry>For Architectures</entry>
-          <entry>Hyperlink</entry>
-        </row>
-      </thead>
-
-      <tbody>
-        <row>
-          <entry>nfsroot</entry>
-          <entry>MIPS, PPC, Sparc, x86, and x86_64</entry>
-          <entry><ulink url="http://documents.jg555.com/netboot"/></entry>
-        </row>
-      </tbody>
-
-    </tgroup>
-
-  </table>
--->
-
-</sect1>
Index: OK/boot/mips-chapter.xml
===================================================================
--- BOOK/boot/mips-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,36 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-boot" xreflabel="If You Are Going to Boot">
-  <?dbhtml dir="boot"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>If You Are Going to Boot</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/boot-scripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/bootloaders.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/colo-build.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/creatingdirs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/howtoview.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/colo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/whatnext.xml"/>
-
-</chapter>
Index: OK/boot/mips/bootloaders.xml
===================================================================
--- BOOK/boot/mips/bootloaders.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,22 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-bootloaders">
-  <?dbhtml filename="bootloaders.html"?>
-
-  <title>Bootloaders</title>
-
-  <para>On MIPS based platforms, we have 2 different bootloaders - Colo
-  for the Cobalt based MIPS machines and Arcload for the SGI machines.
-  At this time, in the boot scenario, the only bootloader we can build
-  and that is usable is Cobalt bootloader. On SGI machines that follow
-  this build method, we recommend to do a netboot. Information about
-  netbooting can be found at the link below.</para>
-
-  <para><ulink url="&hints-root;Category:Netboot"/></para>
-
-</sect1>
Index: OK/boot/mips/colo-build.xml
===================================================================
--- BOOK/boot/mips/colo-build.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,70 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-colo-build" role="wrap">
-  <?dbhtml filename="colo-build.html"?>
-
-  <title>Colo-&colo-version;</title>
-
-  <indexterm zone="ch-boot-colo-build">
-    <primary sortas="a-Colo">Colo</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/mips/colo.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Colo</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/mips/colo.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/mips/colo.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/mips/colo.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/mips/colo.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-<screen os="s2"><userinput>cp -v stage2/Makefile{,.orig}
-sed '/^CFLAGS/s/-Werror //' stage2/Makefile.orig &gt; stage2/Makefile</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/mips/colo.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-<screen os="aa"><userinput>cd tools/elf2rfx
-make CC=gcc
-cd ../..
-make CROSS_COMPILE="${CLFS_TARGET}-" binary</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/mips/colo.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="ab"><userinput>cp -v chain/colo-chain.elf /tools/boot/vmlinux
-gzip -9 /tools/boot/vmlinux</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-colo" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/mips/colo.xml
===================================================================
--- BOOK/boot/mips/colo.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,40 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-colo">
-  <?dbhtml filename="colo.html"?>
-
-  <title>Making the Temporary System Bootable</title>
-
-  <indexterm zone="ch-boot-colo">
-    <primary sortas="a-Colo">Colo</primary>
-    <secondary>boot, configuring</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../bootable/mips/colo.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../bootable/mips/colo.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../bootable/mips/colo.xml"
-  xpointer="xpointer(//*[@os='d'])"/>
-
-<screen os="aa"><userinput>cat &gt; ${CLFS}/boot/default.colo &lt;&lt; "EOF"
-#:CoLo:#
-#
-# load linux
-#
-lcd 'Booting &linux-version2;...'
-load vmlinux-&linux-version2;.gz
-execute root=/dev/hda2 console=ttyS0,115200 ide1=noprobe
-EOF</userinput></screen>
-
-</sect1>
Index: OK/boot/mips/creatingdirs.xml
===================================================================
--- BOOK/boot/mips/creatingdirs.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,39 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-creatingdirs">
-  <?dbhtml filename="creatingdirs.html"?>
-
-  <title>Creating Directories</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-   <para>These entries are needed for the RaQ2 bootloader. Only use these
-   if you are utilizing the Colo bootloader:</para>
-
-<screen><userinput>cd ${CLFS}/boot
-ln -svf . boot</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='d'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='e'])"/>
-
-</sect1>
Index: OK/boot/mips/kernel.xml
===================================================================
--- BOOK/boot/mips/kernel.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,121 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-kernel" role="wrap">
-  <?dbhtml filename="kernel.html"?>
-
-  <title>Linux-&linux-version2;</title>
-
-  <indexterm zone="ch-boot-kernel">
-    <primary sortas="a-Linux">Linux</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../bootable/x86/kernel.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of the kernel</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../bootable/x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../bootable/x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
-
-<screen><userinput>make ARCH=mips CROSS_COMPILE=${CLFS_TARGET}- menuconfig</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-<screen><userinput>make ARCH=mips CROSS_COMPILE=${CLFS_TARGET}-</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='af'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-<screen><userinput>make ARCH=mips CROSS_COMPILE=${CLFS_TARGET}- \
-   INSTALL_MOD_PATH=/tools modules_install</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../bootable/x86/kernel.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-<screen><userinput>make ARCH=mips CROSS_COMPILE=${CLFS_TARGET}- \
-   INSTALL_MOD_PATH=/tools firmware_install</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='u'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='v'])"/>
-
-<screen><userinput>mkdir -pv /tools/boot
-cp -v vmlinux /tools/boot/vmlinux-&linux-version2;
-gzip -9 /tools/boot/vmlinux-&linux-version2;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='w1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='x1'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-kernel" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/mips64-64-chapter.xml
===================================================================
--- BOOK/boot/mips64-64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,37 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-boot" xreflabel="If You Are Going to Boot">
-  <?dbhtml dir="boot"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>If You Are Going to Boot</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/boot-scripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/bootloaders.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/colo-build.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/creatingdirs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/howtoview.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/colo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/whatnext.xml"/>
-
-</chapter>
Index: OK/boot/mips64-chapter.xml
===================================================================
--- BOOK/boot/mips64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,37 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-boot" xreflabel="If You Are Going to Boot">
-  <?dbhtml dir="boot"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>If You Are Going to Boot</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/boot-scripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/bootloaders.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/colo-build.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/creatingdirs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/howtoview.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/colo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/whatnext.xml"/>
-
-</chapter>
Index: OK/boot/mips64/colo-build.xml
===================================================================
--- BOOK/boot/mips64/colo-build.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,80 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-colo-build" role="wrap">
-  <?dbhtml filename="colo-build.html"?>
-
-  <title>Colo-&colo-version;</title>
-
-  <indexterm zone="ch-boot-colo-build">
-    <primary sortas="a-Colo">Colo</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/mips/colo.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Colo</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../mips/colo-build.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/mips64/colo.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/mips64/colo.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/mips/colo.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/mips/colo.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../mips/colo-build.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../mips/colo-build.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../mips/colo-build.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-<screen os="aa"><userinput>cd tools/elf2rfx
-make CC=gcc
-cd ../..
-make CROSS_COMPILE="${CLFS_TARGET}-" binary</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../mips/colo-build.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../mips/colo-build.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-colo" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/mips64/createfiles.xml
===================================================================
--- BOOK/boot/mips64/createfiles.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,42 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-createfiles">
-  <?dbhtml filename="createfiles.html"?>
-
-  <title>Creating Essential Symlinks</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/createfiles.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-<screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,login,pwd,stty} ${CLFS}/bin
-ln -sv /tools/bin/file ${CLFS}/usr/bin
-ln -sv /tools/lib/libgcc_s.so{,.1} ${CLFS}/usr/lib
-ln -sv /tools/lib32/libgcc_s.so{,.1} ${CLFS}/usr/lib32
-ln -sv /tools/lib64/libgcc_s.so{,.1} ${CLFS}/usr/lib64
-ln -sv /tools/lib/libstdc++.so{.6,} ${CLFS}/usr/lib
-ln -sv /tools/lib32/libstdc++.so{.6,} ${CLFS}/usr/lib32
-ln -sv /tools/lib64/libstdc++.so{.6,} ${CLFS}/usr/lib64
-sed -e 's/tools/usr/' /tools/lib/libstdc++.la &gt; ${CLFS}/usr/lib/libstdc++.la
-ln -sv bash ${CLFS}/bin/sh
-ln -sv /tools/sbin/init ${CLFS}/sbin
-ln -sv /tools/etc/{login.{access,defs},limits} ${CLFS}/etc</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/createfiles.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/createfiles.xml"
-  xpointer="xpointer(//*[@os='d'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/createfiles.xml"
-  xpointer="xpointer(//*[@os='e'])"/>
-
-</sect1>
Index: OK/boot/mips64/creatingdirs.xml
===================================================================
--- BOOK/boot/mips64/creatingdirs.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,50 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-creatingdirs">
-  <?dbhtml filename="creatingdirs.html"?>
-
-  <title>Creating Directories</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-<screen><userinput>mkdir -pv ${CLFS}/{bin,boot,dev,{etc/,}opt,home,lib{,32,64},mnt}
-mkdir -pv ${CLFS}/{proc,media/{floppy,cdrom},run/{shm},sbin,srv,sys}
-mkdir -pv ${CLFS}/var/{lock,log,mail,spool}
-mkdir -pv ${CLFS}/var/{opt,cache,lib{,32,64}/{misc,locate},local}
-install -dv ${CLFS}/root -m 0750
-install -dv ${CLFS}{/var,}/tmp -m 1777
-ln -sv ../run ${CLFS}/var/run
-mkdir -pv ${CLFS}/usr/{,local/}{bin,include,lib{,32,64},sbin,src}
-mkdir -pv ${CLFS}/usr/{,local/}share/{doc,info,locale,man}
-mkdir -pv ${CLFS}/usr/{,local/}share/{misc,terminfo,zoneinfo}
-mkdir -pv ${CLFS}/usr/{,local/}share/man/man{1,2,3,4,5,6,7,8}
-install -dv ${CLFS}/usr/lib/locale
-ln -sv ../lib/locale ${CLFS}/usr/lib32
-ln -sv ../lib/locale ${CLFS}/usr/lib64</userinput></screen>
-
-   <para>These entries are needed for the RaQ2 bootloader. Only use these
-   if you are utilizing the Colo bootloader:</para>
-
-<screen><userinput>cd /${CLFS}/boot
-ln -svf . boot</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='d'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='e'])"/>
-
-</sect1>
Index: OK/boot/mips64/flags.xml
===================================================================
--- BOOK/boot/mips64/flags.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,22 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-flags">
-  <?dbhtml filename="flags.html"?>
-
-  <title>Build Flags</title>
-
-  <para>We will need to copy our build variables into our new system:</para>
-
-<screen><userinput>cat &gt;&gt; ${CLFS}/root/.bash_profile &lt;&lt; EOF
-export BUILD32="${BUILD32}"
-export BUILDN32="${BUILDN32}"
-export BUILD64="${BUILD64}"
-export CLFS_TARGET32="${CLFS_TARGET32}"
-EOF</userinput></screen>
-
-</sect1>
Index: OK/boot/mips64/kernel.xml
===================================================================
--- BOOK/boot/mips64/kernel.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,125 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-kernel" role="wrap">
-  <?dbhtml filename="kernel.html"?>
-
-  <title>Linux-&linux-version2;</title>
-
-  <indexterm zone="ch-boot-kernel">
-    <primary sortas="a-Linux">Linux</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../bootable/x86/kernel.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of the kernel</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64/kernel.xml"
-    xpointer="xpointer(//*[@os='m1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../bootable/x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../bootable/x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
-
-<screen><userinput>make ARCH=mips CROSS_COMPILE=${CLFS_TARGET}- menuconfig</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-<screen><userinput>make ARCH=mips CROSS_COMPILE=${CLFS_TARGET}-</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='af'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-<screen><userinput>make ARCH=mips CROSS_COMPILE=${CLFS_TARGET}- \
-   INSTALL_MOD_PATH=/tools modules_install</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../bootable/x86/kernel.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-<screen><userinput>make ARCH=mips CROSS_COMPILE=${CLFS_TARGET}- \
-   INSTALL_MOD_PATH=/tools firmware_install</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='u'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='v'])"/>
-
-<screen><userinput>mkdir -pv /tools/boot
-cp -v vmlinux /tools/boot/vmlinux-&linux-version2;
-gzip -9 /tools/boot/vmlinux-&linux-version2;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='w1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='x1'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-kernel" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/multilib/createfiles.xml
===================================================================
--- BOOK/boot/multilib/createfiles.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,40 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-createfiles">
-  <?dbhtml filename="createfiles.html"?>
-
-  <title>Creating Essential Symlinks</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/createfiles.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-<screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,login,pwd,stty} ${CLFS}/bin
-ln -sv /tools/bin/file ${CLFS}/usr/bin
-ln -sv /tools/lib/libgcc_s.so{,.1} ${CLFS}/usr/lib
-ln -sv /tools/lib64/libgcc_s.so{,.1} ${CLFS}/usr/lib64
-ln -sv /tools/lib/libstdc++.so{.6,} ${CLFS}/usr/lib
-ln -sv /tools/lib64/libstdc++.so{.6,} ${CLFS}/usr/lib64
-sed -e 's/tools/usr/' /tools/lib/libstdc++.la &gt; ${CLFS}/usr/lib/libstdc++.la
-ln -sv bash ${CLFS}/bin/sh
-ln -sv /tools/sbin/init ${CLFS}/sbin
-ln -sv /tools/etc/{login.{access,defs},limits} ${CLFS}/etc</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/createfiles.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/createfiles.xml"
-  xpointer="xpointer(//*[@os='d'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/createfiles.xml"
-  xpointer="xpointer(//*[@os='e'])"/>
-
-</sect1>
Index: OK/boot/multilib/creatingdirs.xml
===================================================================
--- BOOK/boot/multilib/creatingdirs.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,47 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-creatingdirs">
-  <?dbhtml filename="creatingdirs.html"?>
-
-  <title>Creating Directories</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
-<screen os="c"><userinput>mkdir -pv ${CLFS}/{bin,boot,dev,{etc/,}opt,home,lib{,64},mnt}
-mkdir -pv ${CLFS}/{proc,media/{floppy,cdrom},run/{,shm},sbin,srv,sys}
-mkdir -pv ${CLFS}/var/{lock,log,mail,spool}
-mkdir -pv ${CLFS}/var/{opt,cache,lib{,64}/{misc,locate},local}
-install -dv ${CLFS}/root -m 0750
-install -dv ${CLFS}{/var,}/tmp -m 1777
-ln -sv ../run ${CLFS}/var/run
-mkdir -pv ${CLFS}/usr/{,local/}{bin,include,lib{,64},sbin,src}
-mkdir -pv ${CLFS}/usr/{,local/}share/{doc,info,locale,man}
-mkdir -pv ${CLFS}/usr/{,local/}share/{misc,terminfo,zoneinfo}
-mkdir -pv ${CLFS}/usr/{,local/}share/man/man{1,2,3,4,5,6,7,8}
-install -dv ${CLFS}/usr/lib/locale
-ln -sv ../lib/locale ${CLFS}/usr/lib64</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='d'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='e'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='f'])"/>
-
-</sect1>
Index: OK/boot/multilib/e2fsprogs.xml
===================================================================
--- BOOK/boot/multilib/e2fsprogs.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,91 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-e2fsprogs" role="wrap">
-  <?dbhtml filename="e2fsprogs.html"?>
-
-  <title>E2fsprogs-&e2fsprogs-version;</title>
-
-  <indexterm zone="ch-boot-e2fsprogs">
-    <primary sortas="a-E2fsprogs">E2fsprogs</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/e2fsprogs.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of E2fsprogs</title>
-
-    <para os="m1">Make sure the libraries get installed to
-    <filename class="directory">/tools/lib64</filename>:</para>
-
-<screen os="m2"><userinput>cp -v configure{,.orig}
-sed -e "/libdir=.*\/lib/s@/lib@/lib64@g" configure.orig &gt; configure</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="aa"><userinput>../configure \
-    --prefix=/tools \
-    --enable-elf-shlibs \
-    --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET} \
-    --disable-libblkid \
-    --disable-libuuid \
-    --disable-fsck \
-    --disable-uuidd</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-e2fsprogs" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/multilib/eudev.xml
===================================================================
--- BOOK/boot/multilib/eudev.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,75 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-eudev" role="wrap">
-  <?dbhtml filename="eudev.html"?>
-
-  <title>Eudev-&eudev-version;</title>
-
-  <indexterm zone="ch-boot-eudev">
-    <primary sortas="a-Eudev">Eudev</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/eudev.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Eudev</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eudev.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>./configure \
-    --prefix=/tools \
-    --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET} \
-    --libdir=/tools/lib64 \
-    --with-rootlibdir=/tools/lib64 \
-    --disable-introspection \
-    --disable-gtk-doc-html \
-    --disable-gudev \
-    --disable-keymap \
-    --with-firmware-path=/lib/firmware \
-    --enable-libkmod</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eudev.xml"
-    xpointer="xpointer(//*[@os='b1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eudev.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eudev.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eudev.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eudev.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eudev.xml"
-    xpointer="xpointer(//*[@os='r1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eudev.xml"
-    xpointer="xpointer(//*[@os='r2'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/eudev.xml"
-  xpointer="xpointer(//*[@role='content'])"/>
-
-</sect1>
Index: OK/boot/multilib/flags.xml
===================================================================
--- BOOK/boot/multilib/flags.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,21 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-flags">
-  <?dbhtml filename="flags.html"?>
-
-  <title>Build Flags</title>
-
-  <para>We will need to copy our build variables into our new system:</para>
-
-<screen><userinput>cat &gt;&gt; ${CLFS}/root/.bash_profile &lt;&lt; EOF
-export BUILD32="${BUILD32}"
-export BUILD64="${BUILD64}"
-export CLFS_TARGET32="${CLFS_TARGET32}"
-EOF</userinput></screen>
-
-</sect1>
Index: OK/boot/multilib/grub-build.xml
===================================================================
--- BOOK/boot/multilib/grub-build.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,84 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-grub-build" role="wrap">
-  <?dbhtml filename="grub-build.html"?>
-
-  <title>GRUB-&grub-version;</title>
-
-  <indexterm zone="ch-boot-grub-build">
-    <primary sortas="a-GRUB">GRUB</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/x86/grub.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GRUB</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/x86/grub.xml"
-    xpointer="xpointer(//*[@os='n1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/x86/grub.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/grub-build.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/x86/grub.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="ab"><userinput>./configure \
-    --prefix=/tools \
-    --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET} \
-    --libdir=/tools/lib64 \
-    --disable-werror \
-    --enable-grub-mkfont=no \
-    --with-bootdir=tools/boot</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/grub-build.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/grub-build.xml"
-    xpointer="xpointer(//*[@os='bc'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/x86/grub.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/x86/grub.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/x86/grub.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/grub-build.xml"
-    xpointer="xpointer(//*[@os='ag'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-grub" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/multilib/kmod.xml
===================================================================
--- BOOK/boot/multilib/kmod.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,83 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-kmod" role="wrap">
-  <?dbhtml filename="kmod.html"?>
-
-  <title>Kmod-&kmod-version;</title>
-
-  <indexterm zone="ch-boot-kmod">
-    <primary sortas="a-Kmod">Kmod</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/kmod.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Kmod</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/kmod.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/kmod.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/kmod.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>./configure \
-    --prefix=/tools \
-    --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET} \
-    --libdir=/tools/lib64 \
-    --with-xz \
-    --with-zlib</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/kmod.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/kmod.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/kmod.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/kmod.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/kmod.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/kmod.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/kmod.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-kmod" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/ppc-chapter.xml
===================================================================
--- BOOK/boot/ppc-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,37 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-boot" xreflabel="If You Are Going to Boot">
-  <?dbhtml dir="boot"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>If You Are Going to Boot</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/boot-scripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/hfsutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/powerpc-utils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/yaboot-build.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingdirs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/howtoview.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/yaboot.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/whatnext.xml"/>
-
-</chapter>
Index: OK/boot/ppc/hfsutils.xml
===================================================================
--- BOOK/boot/ppc/hfsutils.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,71 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-hfsutils" role="wrap">
-  <?dbhtml filename="hfsutils.html"?>
-
-  <title>Hfsutils-&hfsutils-version;</title>
-
-  <indexterm zone="ch-boot-hfsutils">
-    <primary sortas="a-Hfsutils">Hfsutils</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/ppc/hfsutils.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Hfsutils</title>
-
-    <para>If you have created, or will create, the ext2 filesystem on your
-    Mac using ext2fsx you can jump ahead to
-    <xref linkend="ch-boot-yaboot-build" role="."/>. The next three packages
-    are for people who cannot do that.</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/ppc/hfsutils.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/ppc/hfsutils.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/ppc/hfsutils.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen><userinput>CC="${CC}" \
-./configure \
-    --prefix=/tools</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/ppc/hfsutils.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/ppc/hfsutils.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/ppc/hfsutils.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/ppc/hfsutils.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref linkend="contents-hfsutils" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/ppc/kernel.xml
===================================================================
--- BOOK/boot/ppc/kernel.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,125 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-kernel" role="wrap">
-  <?dbhtml filename="kernel.html"?>
-
-  <title>Linux-&linux-version2;</title>
-
-  <indexterm zone="ch-boot-kernel">
-    <primary sortas="a-Linux">Linux</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../bootable/x86/kernel.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of the kernel</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../bootable/x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
-
-<screen><userinput>make ARCH=powerpc CROSS_COMPILE=${CLFS_TARGET}- menuconfig</userinput></screen>
-
-    <warning>
-    <para>Ensure you select all of the necessary mac drivers, particularly for
-    ide and input.</para>
-    </warning>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-<screen><userinput>make ARCH=powerpc CROSS_COMPILE=${CLFS_TARGET}-</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='af'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-<screen><userinput>make ARCH=powerpc CROSS_COMPILE=${CLFS_TARGET}- \
-   INSTALL_MOD_PATH=/tools modules_install</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../bootable/x86/kernel.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-<screen><userinput>make ARCH=powerpc CROSS_COMPILE=${CLFS_TARGET}- \
-   INSTALL_MOD_PATH=/tools firmware_install</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='u'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='v'])"/>
-
-<screen><userinput>mkdir -pv /tools/boot
-cp -v vmlinux /tools/boot/clfskernel-&linux-version2;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='w1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='x1'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-kernel" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/ppc/powerpc-utils.xml
===================================================================
--- BOOK/boot/ppc/powerpc-utils.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,51 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-powerpc-utils" role="wrap">
-  <?dbhtml filename="powerpc-utils.html"?>
-
-  <title>Powerpc-Utils_&powerpcutils-version;</title>
-
-  <indexterm zone="ch-boot-powerpc-utils">
-    <primary sortas="a-Powerpc-Utils">Powerpc-Utils</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/ppc/powerpc-utils.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Powerpc-Utils</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/ppc/powerpc-utils.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/ppc/powerpc-utils.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <para os="c">This package's Makefile has issues with cross-compiling. Fortunately,
-    we only need one program and it is a simple task to compile it.</para>
-
-<screen os="d"><userinput>${CC} -o nvsetenv nvsetenv.c nwnvsetenv.c</userinput></screen>
-
-    <para os="e">Install the program:</para>
-
-<screen os="f"><userinput>install -v -m755 nvsetenv /tools/sbin</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref linkend="contents-powerpc-utils" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/ppc/yaboot-build.xml
===================================================================
--- BOOK/boot/ppc/yaboot-build.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,82 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-yaboot-build" role="wrap">
-  <?dbhtml filename="yaboot-build.html"?>
-
-  <title>Yaboot-&yaboot-version;</title>
-
-  <indexterm zone="ch-boot-yaboot-build">
-    <primary sortas="a-Yaboot">Yaboot</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/ppc/yaboot.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Yaboot</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='p5'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='p6'])"/>
-
-    <para os="p1">The following patch allows <command>ofpath</command> to use
-    <literal>PATH_PREFIX</literal> like the other
-    <filename class="directory">ybin</filename> scripts:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&yaboot-ofpath_path-patch;</userinput></screen>
-
-    <para>The Makefile is already set to do kernel-style cross-compiling,
-    but it will try to use <command>strip</command> to strip the second-stage
-    loader. It also tries to change user and group ownership for the installed
-    files to <systemitem class="username">root</systemitem>, which the
-    <systemitem class="username">clfs</systemitem> user cannot do. It will also
-    fail due to a compile warning with the -Werror flag on.   The following
-    command fixes these issues:</para>
-
-<screen><userinput>cp -v Makefile{,.orig}
-sed -e "s/\(strip \)/${CLFS_TARGET}-\1/" \
-    -e 's/-o root -g root//' \
-    -e 's/-Werror//' \
-    Makefile.orig &gt; Makefile</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen><userinput>make CROSS=${CLFS_TARGET}-</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-<screen><userinput>make CROSS=${CLFS_TARGET}- ROOT=/tools PREFIX="" install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref linkend="contents-yaboot" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/ppc/yaboot.xml
===================================================================
--- BOOK/boot/ppc/yaboot.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,82 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-yaboot">
-  <?dbhtml filename="yaboot.html"?>
-
-  <title>Making the Temporary System Bootable</title>
-
-  <indexterm zone="ch-boot-yaboot">
-    <primary sortas="a-Yaboot">Yaboot</primary>
-    <secondary>boot, configuring</secondary>
-  </indexterm>
-
-  <para os="a">Some of the idiosyncracies of booting on ppc are discussed in
-   <xref linkend="appendixe" role="."/>. Essentially, there are two options
-   here - either copy the bootloader to an  OSX root partition and boot from
-   Open Firmware, or use an install, Live, or rescue CD to set up a bootstrap
-   partition.</para>
-
-  <sect2 role=".">
-    <title>Copying the bootloader to OSX and booting from OF.</title>
-
-    <para os="b">You must now ensure that <filename>/tools/etc/yaboot.conf</filename>
-    contains the correct details for the CLFS system.  Consult
-    <xref linkend="ch-bootable-yaboot" role="."/> for details, but note that
-    at this point you do not need the <literal>install, magicboot, enablecdboot
-    </literal>or <literal>macosx</literal> parameters because these are not
-    available when you boot from Open Firmware.</para>
-
-    <para os="c">By this stage, you should have the temporary system on an ext2
-    filesystem on your Mac.  Now, from within OSX, copy
-    <filename>/tools/lib/yaboot/yaboot</filename>) and
-    <filename>/tools/etc/yaboot.conf</filename>) to the OSX <filename>/</filename>
-    directory.</para>
-
-   <para os="d">Each time you want to boot into the temporary system, hold down
-   the option-command-o-f keys to get to Open Firmware, then use the following
-   command, replacing <literal>X</literal> with the number of the partition
-   containing the <emphasis>OSX</emphasis> root filesystem (typically, this
-   will be '3').</para>
-
-<screen os="e" role="nodump"><userinput>boot hd:X,yaboot</userinput></screen>
-
-  </sect2>
-
-  <sect2 role=".">
-    <title>Using a CD to set up the bootstrap partition.</title>
-
-    <para os="f">This is particularly appropriate if you cannot write to an
-    ext2 filesystem from OSX. Boot from the CD, and (as necessary) create
-    partitions and filesystems, mount the CLFS partition at
-    <filename>/tools</filename>  and untar the temporary system there.</para>
-
-    <para os="g">Now set up <filename>/tools/etc/yaboot.conf</filename> - see
-    <xref linkend="ch-bootable-yaboot" role="."/> for details of what should be
-    in it, but note that the <emphasis>install</emphasis> and <emphasis>magicboot
-    </emphasis>specifications should point to<filename>/tools/lib/yaboot/</filename>
-    and <emphasis>not</emphasis> <filename>/usr/lib/yaboot</filename>.</para>
-
-    <para os="h">To write the bootloader to the disk, with <filename>/tools/sbin
-   </filename>first on your path and <filename>/proc</filename> mounted, run the
-   following command:</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../bootable/ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
-
-<screen os="j" role="nodump"><userinput>PATH_PREFIX=/tools ybin -v -C /tools/etc/yaboot.conf</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../bootable/ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-<screen os="u" role="nodump"><userinput>PATH_PREFIX=/tools mkofboot</userinput></screen>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/ppc64-64-chapter.xml
===================================================================
--- BOOK/boot/ppc64-64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,38 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-boot" xreflabel="If You Are Going to Boot">
-  <?dbhtml dir="boot"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>If You Are Going to Boot</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/boot-scripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/hfsutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/powerpc-utils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64-64/yaboot-build.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingdirs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/howtoview.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/yaboot.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/whatnext.xml"/>
-
-</chapter>
Index: OK/boot/ppc64-64/yaboot-build.xml
===================================================================
--- BOOK/boot/ppc64-64/yaboot-build.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,104 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-yaboot-build" role="wrap">
-  <?dbhtml filename="yaboot-build.html"?>
-
-  <title>Yaboot-&yaboot-version;</title>
-
-  <indexterm zone="ch-boot-yaboot-build">
-    <primary sortas="a-Yaboot">Yaboot</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/ppc/yaboot.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Yaboot</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='p5'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='p6'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/yaboot-build.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/yaboot-build.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <para>The Makefile is already set to do kernel-style cross-compiling,
-    but it will try to use <command>strip</command> to strip the second-stage
-    loader.  It also expects to be running as root for the install, and to
-    install for the root user, which user CLFS cannot do. We also need to use
-    the 64-bit compiler, and to force <command>ld</command> to use a 64-bit
-    emulation. Userland tools attempt to use host headers and we do not want
-    that. The following commands will fix and achieve this:</para>
-
-<screen><userinput>cp -v Makefile{,.orig}
-sed -e "s/\(-print-libgcc-file-name\)/${BUILD64} \1/" \
-            -e "s/\(strip \)/${CLFS_TARGET}-\1/" \
-            -e "s/\(-Bstatic\)/-melf64ppc \1/" \
-            -e 's/-melf32ppclinux//' \
-            -e 's/-o root -g root//' \
-            -e 's/-Werror//' \
-            -e '0,/UCFLAGS/s/usr/tools/' \
-    Makefile.orig &gt; Makefile</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen><userinput>CFLAGS=${BUILD64} make CROSS=${CLFS_TARGET}-</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/ppc64/yaboot.xml"
-    xpointer="xpointer(//*[@os='j0'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/ppc64/yaboot.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-<screen><userinput>make CROSS=${CLFS_TARGET}- ROOT=/tools PREFIX= install 2&gt;&amp;1 | tee instlog</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/ppc64/yaboot.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/ppc64/yaboot.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/ppc64/yaboot.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref linkend="contents-yaboot" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/ppc64-chapter.xml
===================================================================
--- BOOK/boot/ppc64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,39 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-boot" xreflabel="If You Are Going to Boot">
-  <?dbhtml dir="boot"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>If You Are Going to Boot</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/boot-scripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/e2fsprogs-libs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/hfsutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/powerpc-utils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/yaboot-build.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/creatingdirs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/howtoview.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/yaboot.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/whatnext.xml"/>
-
-</chapter>
Index: OK/boot/ppc64/e2fsprogs-libs.xml
===================================================================
--- BOOK/boot/ppc64/e2fsprogs-libs.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,91 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-e2fsprogs-libs" role="wrap">
-  <?dbhtml filename="e2fsprogs-libs.html"?>
-
-  <title>E2fsprogs-&e2fsprogs-version; 32bit Libraries</title>
-
-  <indexterm zone="ch-boot-e2fsprogs">
-    <primary sortas="a-E2fsprogs">E2fsprogs</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/e2fsprogs.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of E2fsprogs</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <para>When cross-compiling, <command>configure</command> cannot determine
-    data type sizes and assumes short=2, int=4, long=4, long long=8.
-    This is not correct for PowerPC64. Adjust the values with:</para>
-
-<!--<screen><userinput>echo "ac_cv_sizeof_long_long=8" &gt; config.cache
-echo "ac_cv_sizeof_long=8" &gt;&gt; config.cache
-echo "ac_cv_sizeof_int=4" &gt;&gt; config.cache
-echo "ac_cv_sizeof_short=2" &gt;&gt; config.cache</userinput></screen>-->
-
-<screen><userinput>echo "ac_cv_sizeof_long=8" &gt; config.cache</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="aa"><userinput>CC="${CC} ${BUILD32}" \
-../configure \
-    --prefix=/tools \
-    --enable-elf-shlibs \
-    --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET} \
-    --disable-libblkid \
-    --disable-libuuid \
-    --disable-fsck \
-    --disable-uuidd \
-    --cache-file=config.cache</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-e2fsprogs" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/ppc64/e2fsprogs.xml
===================================================================
--- BOOK/boot/ppc64/e2fsprogs.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,100 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-e2fsprogs" role="wrap">
-  <?dbhtml filename="e2fsprogs.html"?>
-
-  <title>E2fsprogs-&e2fsprogs-version;</title>
-
-  <indexterm zone="ch-boot-e2fsprogs">
-    <primary sortas="a-E2fsprogs">E2fsprogs</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/e2fsprogs.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of E2fsprogs</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='m1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='m2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <para>When cross-compiling, <command>configure</command> cannot determine
-    data type sizes and assumes short=2, int=4, long=4, long long=8.
-    This is not correct for PowerPC64. Adjust the values with:</para>
-
-<!--<screen><userinput>echo "ac_cv_sizeof_long_long=8" &gt; config.cache
-echo "ac_cv_sizeof_long=8" &gt;&gt; config.cache
-echo "ac_cv_sizeof_int=4" &gt;&gt; config.cache
-echo "ac_cv_sizeof_short=2" &gt;&gt; config.cache</userinput></screen>-->
-
-<screen><userinput>echo "ac_cv_sizeof_long=8" &gt; config.cache</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="aa"><userinput>../configure \
-    --prefix=/tools \
-    --enable-elf-shlibs \
-    --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET} \
-    --disable-libblkid \
-    --disable-libuuid \
-    --disable-fsck \
-    --disable-uuidd \
-    --cache-file=config.cache</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-<screen os="g"><userinput>make libs
-make -C e2fsck/</userinput></screen>
-
-    <para os="i">Install the e2fsck binary:</para>
-
-<screen os="j"><userinput>make install -C e2fsck</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-e2fsprogs" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/ppc64/kernel.xml
===================================================================
--- BOOK/boot/ppc64/kernel.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,124 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-kernel" role="wrap">
-  <?dbhtml filename="kernel.html"?>
-
-  <title>Linux-&linux-version2;</title>
-
-  <indexterm zone="ch-boot-kernel">
-    <primary sortas="a-Linux">Linux</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../bootable/x86/kernel.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of the kernel</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64/kernel.xml"
-    xpointer="xpointer(//*[@os='m1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../bootable/x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../bootable/x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
-
-<screen><userinput>make ARCH=powerpc CROSS_COMPILE=${CLFS_TARGET}- menuconfig</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-<screen><userinput>make ARCH=powerpc CROSS_COMPILE=${CLFS_TARGET}-</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='af'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-<screen><userinput>make ARCH=powerpc CROSS_COMPILE=${CLFS_TARGET}- \
-   INSTALL_MOD_PATH=/tools modules_install</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../bootable/x86/kernel.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-<screen><userinput>make ARCH=powerpc CROSS_COMPILE=${CLFS_TARGET}- \
-   INSTALL_MOD_PATH=/tools firmware_install</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='u'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='v'])"/>
-
-<screen><userinput>mkdir -pv /tools/boot
-cp -v vmlinux /tools/boot/clfskernel-&linux-version2;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='w1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='x1'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-kernel" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/ppc64/powerpc-utils.xml
===================================================================
--- BOOK/boot/ppc64/powerpc-utils.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,56 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-powerpc-utils" role="wrap">
-  <?dbhtml filename="powerpc-utils.html"?>
-
-  <title>Powerpc-Utils_&powerpcutils-version;</title>
-
-  <indexterm zone="ch-boot-powerpc-utils">
-    <primary sortas="a-Powerpc-Utils">Powerpc-Utils</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/ppc/powerpc-utils.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Powerpc-Utils</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/powerpc-utils.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/powerpc-utils.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/powerpc-utils.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>${CC} ${BUILD32} -o nvsetenv nvsetenv.c nwnvsetenv.c</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/powerpc-utils.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/powerpc-utils.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref linkend="contents-powerpc-utils" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/ppc64/yaboot-build.xml
===================================================================
--- BOOK/boot/ppc64/yaboot-build.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,101 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-yaboot-build" role="wrap">
-  <?dbhtml filename="yaboot-build.html"?>
-
-  <title>Yaboot-&yaboot-version;</title>
-
-  <indexterm zone="ch-boot-yaboot-build">
-    <primary sortas="a-Yaboot">Yaboot</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/ppc/yaboot.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Yaboot</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='p5'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='p6'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/yaboot-build.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/yaboot-build.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <para>The Makefile is already set to do kernel-style cross-compiling,
-    but it will try to use <command>strip</command> to strip the second-stage
-    loader.  It also expects to be running as root for the install, and to
-    install for the root user, which user CLFS cannot do.  We also need to use
-    the 32-bit compiler, and to force <command>ld</command> to use a 32-bit
-    emulation. The following commands will fix and achieve this:</para>
-
-<screen><userinput>cp -v Makefile{,.orig}
-sed -e "s/\(-print-libgcc-file-name\)/${BUILD32} \1/" \
-            -e "s/\(-Bstatic\)/-melf32ppclinux \1/" \
-            -e "s/\(strip \)/${CLFS_TARGET}-\1/" \
-            -e 's/-o root -g root//' \
-            -e 's/-Werror//' \
-    Makefile.orig &gt; Makefile</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen><userinput>CFLAGS=${BUILD32} make CROSS=${CLFS_TARGET}-</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/ppc64/yaboot.xml"
-    xpointer="xpointer(//*[@os='j0'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/ppc64/yaboot.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-<screen><userinput>make CROSS=${CLFS_TARGET}- ROOT=/tools PREFIX= install 2&gt;&amp;1 | tee instlog</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/ppc64/yaboot.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/ppc64/yaboot.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/ppc64/yaboot.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref linkend="contents-yaboot" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/ppc64/yaboot.xml
===================================================================
--- BOOK/boot/ppc64/yaboot.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,70 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-yaboot">
-  <?dbhtml filename="yaboot.html"?>
-
-  <title>Making the Temporary System Bootable</title>
-
-  <indexterm zone="ch-boot-yaboot">
-    <primary sortas="a-Yaboot">Yaboot</primary>
-    <secondary>boot, configuring</secondary>
-  </indexterm>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-  <sect2 role=".">
-    <title>Copying the bootloader to OSX and booting from OF.</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-  </sect2>
-
-  <sect2 role=".">
-    <title>Using a CD to set up the bootstrap partition.</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <para os="f2">It is also appropriate if you are running an old 32-bit Linux
-    kernel on a 64-bit machine, or if the kernel personality has been forced to
-    32-bit.</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../bootable/ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../bootable/ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-<screen os="u" role="nodump"><userinput>PATH_PREFIX=/tools mkofboot</userinput></screen>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/sparc-chapter.xml
===================================================================
--- BOOK/boot/sparc-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,36 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-boot" xreflabel="If You Are Going to Boot">
-  <?dbhtml dir="boot"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>If You Are Going to Boot</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/boot-scripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/elftoaout.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/silo-build.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingdirs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/howtoview.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/silo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/whatnext.xml"/>
-
-</chapter>
Index: OK/boot/sparc/elftoaout.xml
===================================================================
--- BOOK/boot/sparc/elftoaout.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,51 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-elftoaout" role="wrap">
-  <?dbhtml filename="elftoaout.html"?>
-
-  <title>ELFtoaout-&elftoaout-version;</title>
-
-  <indexterm zone="ch-boot-elftoaout">
-    <primary sortas="a-ELFtoaout">ELFtoaout</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/sparc/elftoaout.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of ELFtoaout</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/sparc/elftoaout.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/sparc/elftoaout.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <para>Compile the ELFtoaout package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-    <para>Install the package:</para>
-
-<screen><userinput>install -v -m 0755 -s elftoaout /cross-tools/bin</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-elftoaout" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/sparc/fstab.xml
===================================================================
--- BOOK/boot/sparc/fstab.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,44 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-fstab">
-  <?dbhtml filename="fstab.html"?>
-
-  <title>Creating the /etc/fstab File</title>
-
-  <indexterm zone="ch-boot-fstab">
-    <primary sortas="e-/etc/fstab">/etc/fstab</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/fstab.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-<screen><userinput>cat &gt; ${CLFS}/etc/fstab &lt;&lt; "EOF"
-<literal># Begin /etc/fstab
-
-# file system  mount-point     type        options          dump  fsck
-#                                                                 order
-
-/dev/<replaceable>[xxx]</replaceable>        /            <replaceable>[fff]</replaceable>       defaults         1     1
-/dev/<replaceable>[yyy]</replaceable>        swap         swap        pri=1            0     0
-devpts         /dev/pts        devpts      gid=&gid-tty;,mode=620   0     0
-shm            /dev/shm        tmpfs       defaults         0     0
-none           /proc/openprom  openpromfs  defaults         0     0
-# End /etc/fstab</literal>
-EOF</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/fstab.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/fstab.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-</sect1>
Index: OK/boot/sparc/kernel.xml
===================================================================
--- BOOK/boot/sparc/kernel.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,120 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-kernel" role="wrap">
-  <?dbhtml filename="kernel.html"?>
-
-  <title>Linux-&linux-version2;</title>
-
-  <indexterm zone="ch-boot-kernel">
-    <primary sortas="a-Linux">Linux</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../bootable/x86/kernel.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-<title>Installation of the kernel</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../bootable/x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../bootable/x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
-
-<screen><userinput>make ARCH=sparc CROSS_COMPILE=${CLFS_TARGET}- menuconfig</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-<screen><userinput>make ARCH=sparc CROSS_COMPILE=${CLFS_TARGET}-</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='af'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-<screen><userinput>make ARCH=sparc CROSS_COMPILE=${CLFS_TARGET}- \
-   INSTALL_MOD_PATH=/tools modules_install</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../bootable/x86/kernel.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-<screen><userinput>make ARCH=sparc CROSS_COMPILE=${CLFS_TARGET}- \
-   INSTALL_MOD_PATH=/tools firmware_install</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='u'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='v'])"/>
-
-<screen><userinput>mkdir -pv /tools/boot
-cp -v vmlinux /tools/boot/clfskernel-&linux-version2;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='w1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='x1'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-kernel" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/sparc/silo-build.xml
===================================================================
--- BOOK/boot/sparc/silo-build.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,75 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-silo-build" role="wrap">
-  <?dbhtml filename="silo-build.html"?>
-
-  <title>Silo-&silo-version;</title>
-
-  <indexterm zone="ch-boot-silo-build">
-    <primary sortas="a-Silo">Silo</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/sparc/silo.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Silo</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/sparc/silo.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/sparc/silo.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-<para os="ae">This sed allows us to compile the bin2h binary separately.</para>
-
-<screen os="ad"><userinput>cp -v common/Makefile{,.orig}
-sed -e 's@\$(PROGRAMS)$@programs\n\nprograms: &amp;@' common/Makefile.orig &gt; common/Makefile</userinput></screen>
-
-<para os="af">Compile the bin2h and util binaries for the host.</para>
-
-<screen os="aa"><userinput>make -C common programs CC=cc
-make -C second util CC=cc</userinput></screen>
-
-    <variablelist>
-      <varlistentry>
-        <term><parameter>CC=cc</parameter></term>
-        <listitem>
-          <para>Overwrites the default value of <command>gcc -m32</command> which will fail
-to compile on 64 bit targets. This is not to be confused with <command>CC=${CC}</command> below.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/sparc/silo.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="ac"><userinput>make CC=${CC} AS=${AS} LD=${LD} STRIP=${STRIP}</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/sparc/silo.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-<screen os="ab"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-silo" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/sparc/silo.xml
===================================================================
--- BOOK/boot/sparc/silo.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,41 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-silo" role="wrap">
-  <?dbhtml filename="silo.html"?>
-
-  <title>Making the Temporary System Bootable</title>
-
-  <indexterm zone="ch-boot-silo">
-    <primary sortas="a-Silo">Silo</primary>
-    <secondary>boot, configuring</secondary>
-  </indexterm>
-
-  <para os="a">This is for the configuration of <command>silo</command>, similar
-  to what is in boot-scripts.</para>
-
-<screen><userinput>cat &gt; ${CLFS}/etc/silo.conf &lt;&lt; "EOF"
-<literal># Begin /etc/silo.conf
-partition = 1         # Boot partition (= root partition)
-root = /dev/sda1      # Root partition
-timeout = 150         # Wait 15 seconds before booting the default section
-
-image = /tools/boot/vmlinuz-clfs-&linux-version2;
-  label = linux
-# End /etc/silo.conf</literal>
-EOF</userinput></screen>
-
-   <para os="b">If you already have Silo installed on your target system, you do
-   not need to reinstall it. Silo is just a chain loader and has no bearing on
-   the system build.</para>
-
-   <para os="c">After you get the build copied to the system that it will
-   boot from, you will need to issue the following command:</para>
-
-<screen os="d"><userinput>silo -f</userinput></screen>
-
-</sect1>
Index: OK/boot/sparc64-64-chapter.xml
===================================================================
--- BOOK/boot/sparc64-64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,37 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-boot" xreflabel="If You Are Going to Boot">
-  <?dbhtml dir="boot"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>If You Are Going to Boot</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/boot-scripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/elftoaout.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/silo-build.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingdirs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/howtoview.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/silo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/whatnext.xml"/>
-
-</chapter>
Index: OK/boot/sparc64-64/silo-build.xml
===================================================================
--- BOOK/boot/sparc64-64/silo-build.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,65 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-silo-build" role="wrap">
-  <?dbhtml filename="silo-build.html"?>
-
-  <title>Silo-&silo-version;</title>
-
-  <indexterm zone="ch-boot-silo-build">
-    <primary sortas="a-Silo">Silo</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/sparc/silo.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Silo</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/sparc/silo.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/sparc/silo.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/sparc/silo.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../sparc/silo.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/sparc/silo.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../sparc/silo.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/sparc/silo.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-<screen os="ac"><userinput>tar -xvf silo-loaders-&silo-version;.tar.gz -C ${CLFS}</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-silo" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/sparc64-chapter.xml
===================================================================
--- BOOK/boot/sparc64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,37 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-boot" xreflabel="If You Are Going to Boot">
-  <?dbhtml dir="boot"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>If You Are Going to Boot</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/boot-scripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/elftoaout.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/silo-build.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/creatingdirs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/howtoview.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/silo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/whatnext.xml"/>
-
-</chapter>
Index: OK/boot/sparc64/kernel.xml
===================================================================
--- BOOK/boot/sparc64/kernel.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,122 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-kernel" role="wrap">
-  <?dbhtml filename="kernel.html"?>
-
-  <title>Linux-&linux-version2;</title>
-
-  <indexterm zone="ch-boot-kernel">
-    <primary sortas="a-Linux">Linux</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../bootable/x86/kernel.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of the kernel</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../bootable/x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64/kernel.xml"
-    xpointer="xpointer(//*[@os='m1'])"/>
-
-<screen><userinput>make mrproper ARCH=sparc64 CROSS_COMPILE=${CLFS_TARGET}-</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
-
-<screen><userinput>make ARCH=sparc64 CROSS_COMPILE=${CLFS_TARGET}- menuconfig</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-<screen><userinput>make ARCH=sparc64 CROSS_COMPILE=${CLFS_TARGET}-</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='af'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-<screen><userinput>make ARCH=sparc64 INSTALL_MOD_PATH=/tools \
-   CROSS_COMPILE=${CLFS_TARGET}- modules_install</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../bootable/x86/kernel.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-<screen><userinput>make ARCH=sparc64 CROSS_COMPILE=${CLFS_TARGET}- \
-   INSTALL_MOD_PATH=/tools firmware_install</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='u'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='v'])"/>
-
-<screen><userinput>mkdir -pv /tools/boot
-cp -v vmlinux /tools/boot/clfskernel-&linux-version2;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='w1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='x1'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-kernel" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/x86-chapter.xml
===================================================================
--- BOOK/boot/x86-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,34 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-boot" xreflabel="If You Are Going to Boot">
-  <?dbhtml dir="boot"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>If You Are Going to Boot</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/boot-scripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/grub-build.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingdirs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/howtoview.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/whatnext.xml"/>
-
-</chapter>
Index: OK/boot/x86/grub-build.xml
===================================================================
--- BOOK/boot/x86/grub-build.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,90 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-grub-build" role="wrap">
-  <?dbhtml filename="grub-build.html"?>
-
-  <title>GRUB-&grub-version;</title>
-
-  <indexterm zone="ch-boot-grub-build">
-    <primary sortas="a-GRUB">GRUB</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/x86/grub.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GRUB</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/x86/grub.xml"
-    xpointer="xpointer(//*[@os='n1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/x86/grub.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-<screen os="s2"><userinput>cp -v grub-core/gnulib/stdio.in.h{,.orig}
-sed -e '/gets is a/d' grub-core/gnulib/stdio.in.h.orig &gt; grub-core/gnulib/stdio.in.h</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/x86/grub.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="ab"><userinput>./configure \
-    --prefix=/tools \
-    --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET} \
-    --disable-werror \
-    --enable-grub-mkfont=no \
-    --with-bootdir=tools/boot</userinput></screen>
-
-<para os="b">The meaning of the new configure option:</para>
-
-  <variablelist os="bc">
-
-    <varlistentry>
-      <term><parameter>--enable-grub-mkfont=no</parameter></term>
-      <listitem><para>Prevents GRUB from trying to build
-      <command>grub-mkfont</command>, which requires Freetype.</para></listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><parameter>--with-bootdir=tools/boot</parameter></term>
-      <listitem><para>This modifies GRUB's default location where it
-      searches for kernel images and installs its bootloader files.</para></listitem>
-    </varlistentry>
-
-  </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/x86/grub.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/x86/grub.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/x86/grub.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-<screen os="ag"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-grub" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/x86/kernel.xml
===================================================================
--- BOOK/boot/x86/kernel.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,135 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-kernel" role="wrap">
-  <?dbhtml filename="kernel.html"?>
-
-  <title>Linux-&linux-version2;</title>
-
-  <indexterm zone="ch-boot-kernel">
-    <primary sortas="a-Linux">Linux</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../bootable/x86/kernel.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of the kernel</title>
-
-    <warning os="aa">
-      <para>Here a temporary cross-compiled kernel will be built. When
-      configuring it, select the minimal amount of options required to
-      boot the target machine and build the final system. I.e., no support
-      for sound, printers, etc. will be needed.</para>
-
-      <para>Also, try to avoid the use of modules if possible, and don't
-      use the resulting kernel image for production systems.</para>
-    </warning>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../bootable/x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../bootable/x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../bootable/x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../bootable/x86/kernel.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../bootable/x86/kernel.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../bootable/x86/kernel.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <note os="kc"><para>A good starting place for setting up the kernel
-    configuration is to run <command>make defconfig</command>. This will set the    base configuration to a good state that takes your current system
-    architecture into account.</para>
-
-    <para>Be sure to configure the following options as
-    shown, or the system might not work correctly or boot at all.</para>
-
-<screen role="nodump">Device Drivers  ---&gt;
-  Generic Driver Options  ---&gt;
-    ()  path to uevent helper (CONFIG_UEVENT_HELPER_PATH)
-    [*] Maintain a devtmpfs filesystem to mount at /dev (CONFIG_DEVTMPFS)
-    [ ] Fallback user-helper invocation for firmware loading (CONFIG_FW_LOADER_USER_HELPER)</screen></note>
-
-    <para os="ae">Configure the kernel via a menu-driven interface:</para>
-
-<screen><userinput>make ARCH=i386 CROSS_COMPILE=${CLFS_TARGET}- menuconfig</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../bootable/x86/kernel.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-<screen><userinput>make ARCH=i386 CROSS_COMPILE=${CLFS_TARGET}-</userinput></screen>
-
-    <para os="af">If the use of kernel modules can't be avoided, a file in
-    <filename class="directory">/etc/modprobe.d</filename> may be needed.
-    Information pertaining to modules and kernel configuration is
-    located in the kernel documentation in the <filename
-    class="directory">Documentation</filename> directory of the kernel
-    sources tree. The <filename>modprobe.d</filename> man page may also
-    be of interest.</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../bootable/x86/kernel.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-<screen><userinput>make ARCH=i386 CROSS_COMPILE=${CLFS_TARGET}- \
-    INSTALL_MOD_PATH=/tools modules_install</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../bootable/x86/kernel.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-<screen><userinput>make ARCH=i386 CROSS_COMPILE=${CLFS_TARGET}- \
-    INSTALL_MOD_PATH=/tools firmware_install</userinput></screen>
-
-    <para os="u">After kernel compilation is complete, additional steps are
-    required to complete the installation. Some files need to be copied to
-    the <filename class="directory">/tools/boot</filename> directory.</para>
-
-    <para os="v">Issue the following commands to install the kernel:</para>
-
-<screen><userinput>mkdir -pv /tools/boot
-cp -v arch/i386/boot/bzImage /tools/boot/vmlinuz-clfs-&linux-version2;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../bootable/x86/kernel.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-<screen os="w1"><userinput>cp -v System.map /tools/boot/System.map-&linux-version2;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../bootable/x86/kernel.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
-<screen os="x1"><userinput>cp -v .config /tools/boot/config-&linux-version2;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-kernel" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/x86_64-64-chapter.xml
===================================================================
--- BOOK/boot/x86_64-64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,35 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-boot" xreflabel="If You Are Going to Boot">
-  <?dbhtml dir="boot"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>If You Are Going to Boot</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/boot-scripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/grub-build.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingdirs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/howtoview.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/whatnext.xml"/>
-
-</chapter>
Index: OK/boot/x86_64-chapter.xml
===================================================================
--- BOOK/boot/x86_64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,35 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-boot" xreflabel="If You Are Going to Boot">
-  <?dbhtml dir="boot"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>If You Are Going to Boot</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/boot-scripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/grub-build.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/creatingdirs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/howtoview.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/whatnext.xml"/>
-
-</chapter>
Index: OK/boot/x86_64/kernel.xml
===================================================================
--- BOOK/boot/x86_64/kernel.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,124 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-kernel" role="wrap">
-  <?dbhtml filename="kernel.html"?>
-
-  <title>Linux-&linux-version2;</title>
-
-  <indexterm zone="ch-boot-kernel">
-    <primary sortas="a-Linux">Linux</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../bootable/x86/kernel.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of the kernel</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <para os="m1">To ensure that your system boots and you can properly run both
-    32 bit and 64 bit binaries, please make sure that you enable support for
-    ELF and emulations for 32bit ELF into the kernel.</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../bootable/x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../bootable/x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
-
-<screen><userinput>make ARCH=x86_64 CROSS_COMPILE=${CLFS_TARGET}- menuconfig</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-<screen><userinput>make ARCH=x86_64 CROSS_COMPILE=${CLFS_TARGET}-</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='af'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-<screen><userinput>make ARCH=x86_64 CROSS_COMPILE=${CLFS_TARGET}- \
-   INSTALL_MOD_PATH=/tools modules_install</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../bootable/x86/kernel.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-<screen><userinput>make ARCH=x86_64 CROSS_COMPILE=${CLFS_TARGET}- \
-   INSTALL_MOD_PATH=/tools firmware_install</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='u'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='v'])"/>
-
-<screen><userinput>mkdir -pv /tools/boot
-cp -v arch/x86_64/boot/bzImage /tools/boot/vmlinuz-clfs-&linux-version2;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='w1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='x1'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-kernel" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/bootable/common/introduction.xml
===================================================================
--- BOOK/bootable/common/introduction.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,18 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-bootable-introduction">
-  <?dbhtml filename="introduction.html"?>
-
-  <title>Introduction</title>
-
-  <para>It is time to make the CLFS system bootable. This chapter
-  discusses building a kernel for the new CLFS system and installing the boot
-  loader so that the CLFS system can be selected for booting at startup.</para>
-
-</sect1>
-
Index: OK/bootable/mips-chapter.xml
===================================================================
--- BOOK/bootable/mips-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,19 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-bootable" xreflabel="Making the CLFS System Bootable">
-  <?dbhtml dir="bootable"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Making the CLFS System Bootable</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/arcload.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/colo.xml"/>
-
-</chapter>
Index: OK/bootable/mips/arcload.xml
===================================================================
--- BOOK/bootable/mips/arcload.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,52 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-bootable-arcload">
-  <?dbhtml filename="arcload.html"?>
-
-  <title>Making the CLFS System Bootable via Arcload</title>
-
-  <indexterm zone="ch-bootable-arcload">
-    <primary sortas="a-Arcload">Arcload</primary>
-    <secondary>configuring</secondary>
-  </indexterm>
-
-  <note os="a">
-    <para>This bootloader is for the MIPS based SGI Workstations and
-    Servers.</para>
-  </note>
-
-  <para os="b">Earlier, we compiled and installed the Arcload boot loader
-  software in preparation for this step. Now we will configure our system
-  to boot using Arcload. Here is a simple <filename>arc.cf</filename>
-  to use.</para>
-
-<screen><userinput>cat &gt; /boot/arc.cf &lt;&lt; "EOF"
-<literal>append  "root=/dev/sda3";
-append  "console=ttyS0,9600";
-
-CLFS {
-  &linux-version2; {
-    description  "&linux-version2;";
-    image system "/&linux-version2;";
-  }
-
-  debug {
-    description  "Debug Shell";
-    append "init=/bin/bash";
-  }
-}</literal>
-EOF</userinput></screen>
-
-  <para os="c">Now we use <command>dvhtool</command> to make the system
-  bootable:</para>
-
-<screen os="d"><userinput>dvhtool --unix-to-vh /usr/lib/arcload/sash sash
-dvhtool --unix-to-vh /boot/arc.cf arc.cf
-dvhtool --unix-to-vh /boot/&linux-version2; &linux-version2;</userinput></screen>
-
-</sect1>
Index: OK/bootable/mips/colo.xml
===================================================================
--- BOOK/bootable/mips/colo.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,58 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-bootable-colo">
-  <?dbhtml filename="colo.html"?>
-
-  <title>Making the CLFS System Bootable via Colo</title>
-
-  <indexterm zone="ch-bootable-colo">
-    <primary sortas="a-Colo">Colo</primary>
-    <secondary>configuring</secondary>
-  </indexterm>
-
-  <note os="a">
-    <para>This bootloader is for the MIPS based cobalt servers RaQ,
-    RaQ2, Qube, or the Qube2.</para>
-  </note>
-
-  <para os="c">Your shiny new CLFS system is almost complete. One of the last
-  things to do is ensure you can boot it. The instructions below apply
-  only to Cobalt RaQ1/RaQ2/Cube2 servers. Information on <quote>boot
-  loading</quote> for other architectures should be available in the
-  usual resource-specific locations for those architectures.</para>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
-  <para os="d">Earlier, we compiled and installed the Cobalt boot loader
-  software in preparation for this step. Now we will configure our system
-  to boot using Colo. Here is a simple <filename>default.colo</filename>
-  to use.</para>
-
-<screen><userinput>cat &gt; /boot/default.colo &lt;&lt; "EOF"
-<literal>#:CoLo:#
-#
-# load linux
-#
-lcd 'Booting &linux-version2;...'
-load vmlinux-&linux-version2;.gz
-execute root=/dev/hda2 console=ttyS0,115200 ide1=noprobe</literal>
-EOF</userinput></screen>
-
-  <para os="e">Included in <filename class="directory">/usr/lib/colo/examples</filename>
-  are more examples of a <filename>default.colo</filename> file.</para>
-
-  <para os="v">The FHS stipulates that the bootloader's configuration file should
-  be symlinked to <filename class="symlink">/etc/{Bootloader Name}</filename>.
-  To satisfy this requirement for Colo, issue the following command:</para>
-
-<screen os="f"><userinput>mkdir -v /etc/colo &amp;&amp;
-ln -sv /boot/colo/default.colo /etc/colo</userinput></screen>
-
-</sect1>
Index: OK/bootable/mips/kernel.xml
===================================================================
--- BOOK/bootable/mips/kernel.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,141 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-bootable-kernel" role="wrap">
-  <?dbhtml filename="kernel.html"?>
-
-  <title>Linux-&linux-version2;</title>
-
-  <indexterm zone="ch-bootable-kernel">
-    <primary sortas="a-Linux">Linux</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/kernel.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of the kernel</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='kc'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='kd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='t2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='u'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='v'])"/>
-
-<screen><userinput>cp -v vmlinux /boot/vmlinux-&linux-version2;
-gzip -9 /boot/vmlinux-&linux-version2;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='w1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='x1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='y'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='y1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='z'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/kernel.xml"
-  xpointer="xpointer(id('contents-kernel'))"/>
-
-</sect1>
Index: OK/bootable/mips64-64-chapter.xml
===================================================================
--- BOOK/bootable/mips64-64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,19 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-bootable" xreflabel="Making the CLFS System Bootable">
-  <?dbhtml dir="bootable"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Making the CLFS System Bootable</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/arcload.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/colo.xml"/>
-
-</chapter>
Index: OK/bootable/mips64-chapter.xml
===================================================================
--- BOOK/bootable/mips64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,19 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-bootable" xreflabel="Making the CLFS System Bootable">
-  <?dbhtml dir="bootable"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Making the CLFS System Bootable</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/arcload.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/colo.xml"/>
-
-</chapter>
Index: OK/bootable/mips64/arcload.xml
===================================================================
--- BOOK/bootable/mips64/arcload.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,52 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-bootable-arcload">
-  <?dbhtml filename="arcload.html"?>
-
-  <title>Making the CLFS System Bootable via Arcload</title>
-
-  <indexterm zone="ch-bootable-arcload">
-    <primary sortas="a-Arcload">Arcload</primary>
-    <secondary>configuring</secondary>
-  </indexterm>
-
-  <note os="a">
-    <para>This bootloader is for the MIPS based SGI Workstations and
-    Servers.</para>
-  </note>
-
-  <para os="b">Earlier, we compiled and installed the Arcload boot loader
-  software in preparation for this step. Now we will configure our system
-  to boot using Arcload. Here is a simple <filename>arc.cf</filename>
-  to use.</para>
-
-<screen><userinput>cat &gt; /boot/arc.cf &lt;&lt; "EOF"
-<literal>append  "root=/dev/sda3";
-append  "console=ttyS0,9600";
-
-CLFS {
-  &linux-version2; {
-    description  "&linux-version2;";
-    image system "/&linux-version2;";
-  }
-
-  debug {
-    description  "Debug Shell";
-    append "init=/bin/bash";
-  }
-}</literal>
-EOF</userinput></screen>
-
-  <para os="c">Now we use <command>dvhtool</command> to make the system
-  bootable:</para>
-
-<screen os="d"><userinput>dvhtool --unix-to-vh /usr/lib/arcload/sash64 sash64
-dvhtool --unix-to-vh /boot/arc.cf arc.cf
-dvhtool --unix-to-vh /boot/&linux-version2; &linux-version2;</userinput></screen>
-
-</sect1>
Index: OK/bootable/ppc-chapter.xml
===================================================================
--- BOOK/bootable/ppc-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,18 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-bootable" xreflabel="Making the CLFS System Bootable">
-  <?dbhtml dir="bootable"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Making the CLFS System Bootable</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/yaboot.xml"/>
-
-</chapter>
Index: OK/bootable/ppc/kernel.xml
===================================================================
--- BOOK/bootable/ppc/kernel.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,152 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-bootable-kernel" role="wrap">
-  <?dbhtml filename="kernel.html"?>
-
-  <title>Linux-&linux-version2;</title>
-
-  <indexterm zone="ch-bootable-kernel">
-    <primary sortas="a-Linux">Linux</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/kernel.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of the kernel</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='kc'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='kd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <warning>
-    <para>If you are using an existing config in which the ARCH was specified as
-    <literal>ppc</literal> (instead of <literal>powerpc</literal>), you will
-    have to run <command>make menuconfig</command> after
-    <command>make oldconfig</command> and manually select many of the
-    mac-specific options for ide and input.</para>
-    </warning>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='t2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='u'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='v'])"/>
-
-<screen><userinput>cp -v vmlinux /boot/clfskernel-&linux-version2;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='w1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='x1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='y'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='y1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='z'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/kernel.xml"
-  xpointer="xpointer(id('contents-kernel'))"/>
-
-</sect1>
Index: OK/bootable/ppc/yaboot.xml
===================================================================
--- BOOK/bootable/ppc/yaboot.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,149 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-bootable-yaboot" arch="ppc">
-  <?dbhtml filename="yaboot.html"?>
-
-  <title>Making the CLFS System Bootable</title>
-
-  <indexterm zone="ch-bootable-yaboot">
-    <primary sortas="a-Yaboot">Yaboot</primary>
-  <secondary>configuring</secondary></indexterm>
-
-  <para os="a">Your shiny new CLFS system is almost complete. One of the last
-  things to do is to ensure that the system can be properly booted. The
-  instructions below apply only to NewWorld Macintoshes.</para>
-
-  <para os="b">Boot loading can be a complex area, so a few cautionary words
-  are in order. Be familiar with the current boot loader and any other
-  operating systems present on the hard drive(s) that need to be bootable.
-  Make sure that an emergency CD is ready to <quote>rescue</quote> the
-  computer if it becomes un-bootable.  It is also a good idea to enable booting
-  from Open Firmware in case things go really wrong.</para>
-
-  <para os="c">Earlier, we compiled and installed the yaboot boot loader software
-  in preparation for this step. The procedure involves writing the bootloader
-  to a bootstrap partition and blessing it so that Open Firmware will boot from
-  it.  This is all handled by <command>ybin</command>, the yaboot installer.</para>
-
-  <para os="d">Ybin writes an optional 'OS selector' menu into Open Firmware,
-  then writes yaboot and <filename>yaboot.conf</filename> to the bootstrap
-  partition, blesses this, and updates the boot device recorded in nvram. When
-  booted, the OF provides the initial menu to choose between linux, boot from
-  CD, and e.g. OSX (depending on what was in <filename>yaboot.conf</filename>).
-  If you boot to 'linux', yaboot is executed and lets you select which kernel
-  to use.</para>
-
-  <para os="e">Images (kernels) are specified, together with any necessary path,
-  in <filename>yaboot.conf</filename> - the details are incorporated into the
-  bootloader, but no attempt is made to access or validate the paths until
-  they are selected. There are many possible options that can be specified in
-  <filename>yaboot.conf</filename>, see the man page for the details. Most
-  people will be able to specify device=hd: (for a single hard disk), but if
-  you have multiple disks, or if you wish to be pedantic, you can specify the
-  full OF path to the device, obtained by running <command>ofpath /dev/hdX</command>
-  .</para>
-
-  <para os="h">Using the above information, determine the appropriate designators
-  for the bootstrap partition and the root partition. For the following example,
-  it is assumed that the bootstrap partition is <filename class="partition">hda2
-  </filename> and the root partition is <filename class="partition">hda7</filename>.
-  We will also assume that you wish to be able to boot an OSX installation on
-  <filename class="partition">hda4</filename>. Change these items as necessary
-  for your machine.</para>
-
-  <para os="i">If your machine has a SATA disk, specify the partitions using
-  <filename class="devicefile">/dev/sda7</filename> and so forth in the usual
-  way. At least some of the distros specify a full OF path to the 'device' and
-  to the image(s), such as
-  <parameter>device=/ht@0,f2000000/pci@3/k2-sata-root@c/k2-sata@0/disk@0:</parameter>
-  for the disk, and
-  <parameter>image=/ht@0,f2000000/pci@3/k2-sata-root@c/k2-sata@0/disk@0:9,/boot/clfskernel-&linux-version2;</parameter>
-  which definitely works.</para>
-
-  <para os="k">Create a <quote>yaboot.conf</quote> file defining yaboot's boot
-  menu:</para>
-
-<screen os="l" role="nodump"><?dbfo keep-together="auto"?><userinput>cat &gt; /etc/yaboot.conf &lt;&lt; "EOF"
-<literal># Begin /etc/yaboot.conf
-
-# By default, yaboot will boot the first menu entry.
-
-# Allow 10 seconds before booting the default.
-# this will also apply to the first-stage os selector
-timeout=100
-
-# These variables are global
-# first, where to put the bootstrap partition
-boot=/dev/hda2
-
-# Which disk to use
-device=hd:
-
-# Default partition for the kernel images
-partition=7
-
-# default root partition
-root=/dev/hda7
-
-# where ybin is to find yaboot and ofboot
-install=/usr/lib/yaboot/yaboot
-magicboot=/usr/lib/yaboot/ofboot
-
-# allow the initial menu to offer CD as an option
-enablecdboot
-
-# allow the initial menu to offer booting from Open Firmware
-enableofboot
-
-# allow the initial menu to boot from mac osx
-macosx=/dev/hda4
-
-# white on black is boring!
-# note  the spellings : 'fgcolor' but 'light'
-# in this context, light means 'without high intensity'
-fgcolor=light-green
-
-# The first entry is for CLFS.
-# For all images, the pathname is relative to the filesystem
-# on which they are situated and can include at most one
-# directory
-image=/boot/clfskernel-&linux-version2;
-    label=&version;
-    read-only</literal>
-EOF</userinput></screen>
-
-
-  <para os="n">Add an entry for the host distribution, if you have one. It might
-  look something like this if the kernel and initrd are in the host's '/'
-  directory on <filename class="partition">hda6</filename>:</para>
-
-<screen os="o" role="nodump"><userinput>cat &gt;&gt; /etc/yaboot.conf &lt;&lt; "EOF"
-<literal>title Debian
-image=/pci@f4000000/ata-6d/disk@0:6,/vmlinux
-    label=Debian
-    initrd=/pci@f4000000/ata-6d/disk@0:6,/initrd.gz
-    initrd-size=10000
-    append="root=/dev/hda7"
-    read-only</literal>
-EOF</userinput></screen>
-
-  <warning os="r">
-    <para>The following command will update the bootstrap partition and the
-    boot variable in Open Firmware. Do not run the command if this is not
-    desired.</para>
-  </warning>
-
-<screen os="s" role="nodump"><userinput>ybin</userinput></screen>
-
-  <para os="t">Alternatively, if the bootstrap partition has not already been
-  initialized, perhaps because you are using a Live CD, you will need to use
-  a different command to install the bootloader for the first time:</para>
-
-<screen os="u" role="nodump"><userinput>mkofboot</userinput></screen>
-
-</sect1>
Index: OK/bootable/ppc64-64-chapter.xml
===================================================================
--- BOOK/bootable/ppc64-64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,18 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-bootable" xreflabel="Making the CLFS System Bootable">
-  <?dbhtml dir="bootable"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Making the CLFS System Bootable</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/yaboot.xml"/>
-
-</chapter>
Index: OK/bootable/ppc64-chapter.xml
===================================================================
--- BOOK/bootable/ppc64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,18 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-bootable" xreflabel="Making the CLFS System Bootable">
-  <?dbhtml dir="bootable"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Making the CLFS System Bootable</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/yaboot.xml"/>
-
-</chapter>
Index: OK/bootable/ppc64/yaboot.xml
===================================================================
--- BOOK/bootable/ppc64/yaboot.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,64 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-bootable-yaboot" arch="ppc">
-  <?dbhtml filename="yaboot.html"?>
-
-  <title>Making the CLFS System Bootable</title>
-
-  <indexterm zone="ch-bootable-yaboot">
-    <primary sortas="a-Yaboot">Yaboot</primary>
-  <secondary>configuring</secondary></indexterm>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-  <para os="s1">You may see an error message referencing ioctl32 with 'Unknown
-  cmd' and '/dev/nvram'.  This does not appear to cause any problems.</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='u'])"/>
-
-</sect1>
Index: OK/bootable/sparc-chapter.xml
===================================================================
--- BOOK/bootable/sparc-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,18 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-bootable" xreflabel="Making the CLFS System Bootable">
-  <?dbhtml dir="bootable"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Making the CLFS System Bootable</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/silo.xml"/>
-
-</chapter>
Index: OK/bootable/sparc/kernel.xml
===================================================================
--- BOOK/bootable/sparc/kernel.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,144 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-bootable-kernel" role="wrap">
-  <?dbhtml filename="kernel.html"?>
-
-  <title>Linux-&linux-version2;</title>
-
-  <indexterm zone="ch-bootable-kernel">
-    <primary sortas="a-Linux">Linux</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/kernel.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of the kernel</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='kc'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='kd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='t2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='u'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='v'])"/>
-
-<screen><userinput>cp -v vmlinux /boot/clfskernel-&linux-version2;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='w1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='x1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='y'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='y1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='z'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/kernel.xml"
-  xpointer="xpointer(id('contents-kernel'))"/>
-
-</sect1>
Index: OK/bootable/sparc/silo.xml
===================================================================
--- BOOK/bootable/sparc/silo.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,36 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-bootable-silo">
-  <?dbhtml filename="silo.html"?>
-
-  <title>Making the CLFS System Bootable</title>
-
-  <indexterm zone="ch-bootable-silo">
-    <primary sortas="a-silo">Silo</primary>
-    <secondary>configuring</secondary>
-  </indexterm>
-
-  <para>Create a <filename>silo.conf</filename> file defining Silo's boot
-  menu:</para>
-
-<screen><userinput>cat &gt; /etc/silo.conf &lt;&lt; "EOF"
-<literal># Begin /etc/silo.conf
-partition = 1         # Boot partition (= root partition)
-root = /dev/sda1      # Root partition
-timeout = 150         # Wait 15 seconds before booting the default section
-
-image = /boot/clfskernel-&linux-version2;
-  label = linux
-# End /etc/silo.conf</literal>
-EOF</userinput></screen>
-
-  <para>Now to make Silo bootable:</para>
-
-<screen><userinput>silo -f</userinput></screen>
-
-</sect1>
Index: OK/bootable/sparc64-64-chapter.xml
===================================================================
--- BOOK/bootable/sparc64-64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,18 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-bootable" xreflabel="Making the CLFS System Bootable">
-  <?dbhtml dir="bootable"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Making the CLFS System Bootable</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/silo.xml"/>
-
-</chapter>
Index: OK/bootable/sparc64-chapter.xml
===================================================================
--- BOOK/bootable/sparc64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,18 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-bootable" xreflabel="Making the CLFS System Bootable">
-  <?dbhtml dir="bootable"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Making the CLFS System Bootable</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/silo.xml"/>
-
-</chapter>
Index: OK/bootable/x86-chapter.xml
===================================================================
--- BOOK/bootable/x86-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,18 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-bootable" xreflabel="Making the CLFS System Bootable">
-  <?dbhtml dir="bootable"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Making the CLFS System Bootable</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/grub.xml"/>
-
-</chapter>
Index: OK/bootable/x86/grub.xml
===================================================================
--- BOOK/bootable/x86/grub.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,53 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-bootable-grub">
-  <?dbhtml filename="grub.html"?>
-
-  <title>Making the CLFS System Bootable</title>
-
-  <indexterm zone="ch-bootable-grub">
-    <primary sortas="a-GRUB">GRUB</primary>
-    <secondary>bootable</secondary>
-  </indexterm>
-
-  <para os="a">Your shiny new CLFS system is almost complete. One of the last
-  things to do is to ensure that the system can be properly booted. The
-  instructions below apply only to computers of x86 and x86_64 architecture,
-  meaning mainstream PCs. Information on <quote>boot loading</quote> for
-  other architectures should be available in the usual resource-specific
-  locations for those architectures.</para>
-
-  <para os="b">Boot loading can be a complex area, so a few cautionary words
-  are in order. Be familiar with the current boot loader and any other
-  operating systems present on the hard drive(s) that need to be bootable.
-  Make sure that an emergency boot disk is ready to <quote>rescue</quote>
-  the computer if the computer becomes unusable (un-bootable).</para>
-
-  <warning os="w1">
-    <para>The following command will overwrite the current boot loader.
-    Do not run the command if this is not desired, for example, if using
-    a third party boot manager to manage the Master Boot Record (MBR).
-    In this scenario, it would make more sense to install GRUB into the
-    <quote>boot sector</quote> of the CLFS partition. In this case, this
-    next command would become <userinput>grub-install /dev/sda2</userinput>
-    .</para>
-  </warning>
-
-  <para os="e">Instruct GRUB to install itself into the MBR of
-  <filename class="partition">sda</filename>:</para>
-
-<screen os="f"><userinput>grub-install /dev/sda</userinput></screen>
-
-  <para os="c">Next, we need to generate a configuration for GRUB.
-  In previous versions of grub we could create the configuration manually
-  here, but with GRUB2 we can generate <filename>grub.cfg</filename>
-  automatically. You can do this with the following command:</para>
-
-<screen os="d"><userinput>grub-mkconfig -o /boot/grub/grub.cfg</userinput></screen>
-
-</sect1>
Index: OK/bootable/x86/kernel.xml
===================================================================
--- BOOK/bootable/x86/kernel.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,247 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-bootable-kernel" role="wrap">
-  <?dbhtml filename="kernel.html"?>
-
-  <title>Linux-&linux-version2;</title>
-
-  <indexterm zone="ch-bootable-kernel">
-    <primary sortas="a-Linux">Linux</primary>
-  </indexterm>
-
-  <sect2 role="package"><title/>
-    <para>The Linux package contains the Linux kernel.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of the kernel</title>
-
-    <para os="a">Building the kernel involves a few steps&mdash;configuration,
-    compilation, and installation. Read the <filename>README</filename>
-    file in the kernel source tree for alternative methods to the way this
-    book configures the kernel.</para>
-
-    <para os="p1">Apply the latest Linux sublevel patch:</para>
-
-<screen os="p2"><userinput>xzcat ../&linux-sublevel-patch; | patch -Np1 -i -</userinput></screen>
-
-    <para os="b">Prepare for compilation by running the following command:</para>
-
-<screen os="c"><userinput>make mrproper</userinput></screen>
-
-    <para os="d">This ensures that the kernel tree is absolutely clean. The
-    kernel team recommends that this command be issued prior to each
-    kernel compilation. Do not rely on the source tree being clean after
-    un-tarring.</para>
-
-    <note os="kc"><para>A good starting place for setting up the kernel
-    configuration is to run <command>make defconfig</command>. This will set the    base configuration to a good state that takes your current system
-    architecture into account.</para>
-
-    <para>Be sure to configure the following options as
-    shown, or the system might not work correctly or boot at all.
-    Refer to <filename>/usr/share/doc/systemd-&systemd-version;/README</filename>:</para>
-
-    <screen role="nodump">General setup  ---&gt;
-  [*] open by fhandle syscalls (CONFIG_FHANDLE)
-  [ ] Auditing support (CONFIG_AUDIT)
-  [*] Control Group support (CONFIG_CGROUPS)
-Processor type and features  ---&gt;
-  [*] Enable seccomp to safely compute untrusted bytecode (CONFIG_SECCOMP)
-Networking support  ---&gt;
-  Networking options  ---&gt;
-    &lt;*&gt; The IPv6 protocol (CONFIG_IPV6)
-Device Drivers  ---&gt;
-  Generic Driver Options  ---&gt;
-    ()  path to uevent helper (CONFIG_UEVENT_HELPER_PATH)
-    [*] Maintain a devtmpfs filesystem to mount at /dev (CONFIG_DEVTMPFS)
-    [ ] Fallback user-helper invocation for firmware loading (CONFIG_FW_LOADER_USER_HELPER)
-File systems  ---&gt;
-  [*] Inotify support for userspace (CONFIG_FSNOTIFY)
-  &lt;*&gt; Kernel automounter version 4 support (also supports v3) (CONFIG_AUTOFS4_FS)
-  Pseudo filesystems  ---&gt;
-    [*] Tmpfs POSIX Access Control Lists (CONFIG_TMPFS_POSIX_Acl)
-    [*] Tmpfs extended attributes (CONFIG_TMPFS_XATTR)
-Firmware Drivers ---&gt;
-  EFI (Extensible Firmware Interface) Support ---&gt;
-    &lt;*&gt; EFI Variable Support via sysfs (CONFIG_EFI_VARS)
--*- Enable the block layer ---&gt; (CONFIG_BLOCK)
-  Partition Types ---&gt;
-    [*] Advanced partition selection (CONFIG_PARTITION_ADVANCED)
-    [*]   EFI GUID Partition support (CONFIG_EFI_PARTITION)
-Kernel Hacking ---&gt;
-  [*] Collect scheduler debugging info (CONFIG_SCHED_DEBUG)
-  [*] Collect scheduler statistics (CONFIG_SCHEDSTATS)</screen></note>
-
-    <note os="kd"><para>While "The IPv6 Protocol" is not strictly required, it
-    is highly recommended by the Systemd developers. "EFI Variable support" and
-    "EFI GUID Partition support" are for UEFI systems. "Collect scheduler
-    debugging info" and "Collect scheduler statistics" is for systemd-bootchart.
-    </para></note>
-
-    <para os="h">Configure the kernel via a menu-driven interface.
-    CBLFS has some information regarding particular kernel configuration
-    requirements of packages outside of CLFS at <ulink
-    url="&cblfs-root;"/>:</para>
-
-<screen os="i"><userinput>make menuconfig</userinput></screen>
-
-    <para os="j">Alternatively, <command>make oldconfig</command> may be more
-    appropriate in some situations. See the <filename>README</filename>
-    file for more information.</para>
-
-    <para os="k">If desired, skip kernel configuration by copying the kernel
-    config file, <filename>.config</filename>, from the host system
-    (assuming it is available) to the root directory of the unpacked kernel
-    sources. However, we do not recommend this option. It is often better
-    to explore all the configuration menus and create the kernel configuration
-    from scratch.</para>
-
-    <para os="m">Compile the kernel image and modules:</para>
-
-<screen os="n"><userinput>make</userinput></screen>
-
-    <para os="o">If using kernel modules, a configuration file in
-    <filename class="directory">/etc/modprobe.d</filename> file may be needed.
-    Information pertaining to modules and kernel configuration is
-    located in the kernel documentation in the <filename
-    class="directory">Documentation</filename> directory of the kernel
-    sources tree. Also, <filename>modprobe.d(5)</filename> may
-    be of interest.</para>
-
-    <para os="s">Install the modules, if the kernel configuration uses
-    them:</para>
-
-<screen os="t"><userinput>make modules_install</userinput></screen>
-
-    <para os="s2">Install the firmware, if the kernel configuration uses
-    them:</para>
-
-<screen os="t2"><userinput>make firmware_install</userinput></screen>
-
-    <para os="u">After kernel compilation is complete, additional steps are
-    required to complete the installation. Some files need to be copied to
-    the <filename class="directory">/boot</filename> directory.</para>
-
-    <para os="v">Issue the following command to install the kernel:</para>
-
-<screen><userinput>cp -v arch/i386/boot/bzImage /boot/vmlinuz-clfs-&linux-version2;</userinput></screen>
-
-    <para os="w"><filename>System.map</filename> is a symbol file for the kernel.
-    It maps the function entry points of every function in the kernel API,
-    as well as the addresses of the kernel data structures for the running
-    kernel. Issue the following command to install the map file:</para>
-
-<screen os="w1"><userinput>cp -v System.map /boot/System.map-&linux-version2;</userinput></screen>
-
-    <para os="x">The kernel configuration file <filename>.config</filename>
-    produced by the <command>make menuconfig</command> step above contains
-    all the configuration selections for the kernel that was just compiled.
-    It is a good idea to keep this file for future reference:</para>
-
-<screen os="x1"><userinput>cp -v .config /boot/config-&linux-version2;</userinput></screen>
-
-    <para os="y">It is important to note that the files in the kernel source
-    directory are not owned by <systemitem class="username">root</systemitem>.
-    Whenever a package is unpacked as user <systemitem
-    class="username">root</systemitem> (like we do inside the final-system
-    build environment), the files have the user and group IDs of whatever
-    they were on the packager's computer. This is usually not a problem
-    for any other package to be installed because the source tree is
-    removed after the installation. However, the Linux source tree is
-    often retained for a long time. Because of this, there is a chance
-    that whatever user ID the packager used will be assigned to somebody
-    on the machine. That person would then have write access to the kernel
-    source.</para>
-
-    <para os="y1">If the kernel source tree is going to retained, run
-    <command>chown -R 0:0</command> on the <filename
-    class="directory">linux-&linux-version;</filename> directory to
-    ensure all files are owned by user <systemitem
-    class="username">root</systemitem>.</para>
-
-    <warning os="z">
-      <para>Some kernel documentation recommends creating a symlink from
-      <filename class="symlink">/usr/src/linux</filename> pointing to the
-      kernel source directory. This is specific to kernels prior to the
-      2.6 series and <emphasis>must not</emphasis> be created on a CLFS
-      system as it can cause problems for packages you may wish to build
-      once your base CLFS system is complete.</para>
-
-      <para>Also, the headers in the system's <filename
-      class="directory">include</filename> directory should
-      <emphasis>always</emphasis> be the ones against which Glibc was
-      compiled and should <emphasis>never</emphasis> be replaced by headers
-      from a different kernel version.</para>
-    </warning>
-
-  </sect2>
-
-  <sect2 id="contents-kernel" role="content">
-    <title>Contents of Linux</title>
-
-    <segmentedlist>
-      <segtitle>Installed files</segtitle>
-      <segtitle>Installed directory</segtitle>
-
-      <seglistitem>
-        <seg>config-[linux-version], clfskernel-[linux-version],
-        and System.map-[linux-version]</seg>
-        <seg>/lib/modules</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="config">
-        <term><filename>config-[linux-version]</filename></term>
-        <listitem>
-          <para>Contains all the configuration selections for the kernel</para>
-          <indexterm zone="ch-bootable-kernel config">
-            <primary sortas="e-/boot/config">/boot/config-[linux-version]</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="clfskernel">
-        <term><filename>clfskernel-[linux-version]</filename></term>
-        <listitem>
-          <para>The engine of the Linux system. When turning on the
-          computer, the kernel is the first part of the operating system
-          that gets loaded. It detects and initializes all components of
-          the computer's hardware, then makes these components available
-          as a tree of files to the software and turns a single CPU into
-          a multitasking machine capable of running scores of programs
-          seemingly at the same time.</para>
-          <indexterm zone="ch-bootable-kernel clfskernel">
-            <primary sortas="b-clfskernel">clfskernel-[linux-version]</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="System.map">
-        <term><filename>System.map-[linux-version]</filename></term>
-        <listitem>
-          <para>A list of addresses and symbols; it maps the entry points
-          and addresses of all the functions and data structures in the
-          kernel</para>
-          <indexterm zone="ch-bootable-kernel System.map">
-            <primary sortas="e-/boot/System.map">/boot/System.map-[linux-version]</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/bootable/x86_64-64-chapter.xml
===================================================================
--- BOOK/bootable/x86_64-64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,18 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-bootable" xreflabel="Making the CLFS System Bootable">
-  <?dbhtml dir="bootable"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Making the CLFS System Bootable</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/grub.xml"/>
-
-</chapter>
Index: OK/bootable/x86_64-chapter.xml
===================================================================
--- BOOK/bootable/x86_64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,18 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-bootable" xreflabel="Making the CLFS System Bootable">
-  <?dbhtml dir="bootable"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Making the CLFS System Bootable</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/grub.xml"/>
-
-</chapter>
Index: OK/bootable/x86_64/kernel.xml
===================================================================
--- BOOK/bootable/x86_64/kernel.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,144 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-bootable-kernel" role="wrap">
-  <?dbhtml filename="kernel.html"?>
-
-  <title>Linux-&linux-version2;</title>
-
-  <indexterm zone="ch-bootable-kernel">
-    <primary sortas="a-Linux">Linux</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/kernel.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of the kernel</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='kc'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='kd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='t2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='u'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='v'])"/>
-
-<screen><userinput>cp -v arch/x86_64/boot/bzImage /boot/vmlinuz-clfs-&linux-version2;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='w1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='x1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='y'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='y1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='z'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/kernel.xml"
-  xpointer="xpointer(id('contents-kernel'))"/>
-
-</sect1>
Index: OK/chroot/common/changingowner.xml
===================================================================
--- BOOK/chroot/common/changingowner.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,44 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-chroot-changingowner">
-  <?dbhtml filename="changingowner.html"?>
-
-  <title>Changing Ownership</title>
-
-    <para os="a">Currently, the <filename class="directory">/tools</filename>
-    and <filename class="directory">/cross-tools</filename> directories
-    are owned by the user <emphasis>clfs</emphasis>, a user that
-    exists only on the host system. Although <filename
-    class="directory">/tools</filename> and <filename
-    class="directory">/cross-tools</filename> can be deleted once the CLFS
-    system has been finished, they can be retained to build
-    additional CLFS systems. If the <filename class="directory">/tools</filename>
-    and <filename class="directory">/cross-tools</filename> directories are
-    kept as is, the files are owned by a user ID without a corresponding
-    account. This is dangerous because a user account created later could
-    get this same user ID and would own these directories and all the files
-    therein, thus exposing those files to possible malicious manipulation.</para>
-
-    <para os="b">One possible fix for this issue might be to add the
-    <systemitem class="username">clfs</systemitem> user to the new CLFS system
-    later when creating the <filename>/etc/passwd</filename> file, taking care
-    to assign it the same user and group IDs as on the host system. Alternatively,
-    assign the contents of the <filename class="directory">/tools</filename>
-    and <filename class="directory">/cross-tools</filename> directories to
-    user <systemitem class="username">root</systemitem> by running the
-    following commands:</para>
-
-<screen os="c"><userinput>chown -Rv 0:0 /tools
-chown -Rv 0:0 /cross-tools</userinput></screen>
-
-    <para os="d">The commands use <parameter>0:0</parameter> instead of
-    <parameter>root:root</parameter>, because <command>chown</command>
-    is unable to resolve the name <quote>root</quote> until the
-    <filename>passwd</filename> file has been created.</para>
-
-</sect1>
Index: OK/chroot/common/chroot.xml
===================================================================
--- BOOK/chroot/common/chroot.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,63 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-chroot-chroot">
-  <?dbhtml filename="chroot.html"?>
-
-  <title>Entering the Chroot Environment</title>
-
-  <para>It is time to enter the chroot environment to begin building
-  and installing the final CLFS system. As user <systemitem
-  class="username">root</systemitem>, run the following command to
-  enter the realm that is, at the moment, populated with only the
-  temporary tools:</para>
-
-<screen><userinput>chroot "${CLFS}" /tools/bin/env -i \
-    HOME=/root TERM="${TERM}" PS1='\u:\w\$ ' \
-    PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin \
-    /tools/bin/bash --login +h</userinput></screen>
-
-  <para>The <parameter>-i</parameter> option given to the
-  <command>env</command> command will clear all variables of the chroot
-  environment. After that, only the <envar>HOME</envar>,
-  <envar>TERM</envar>, <envar>PS1</envar>, and
-  <envar>PATH</envar> variables are set again. The
-  <parameter>TERM=${TERM}</parameter> construct will set the
-  <envar>TERM</envar> variable inside chroot to the same value as
-  outside chroot. This variable is needed for programs like
-  <command>vim</command> and <command>less</command> to operate
-  properly.  If other variables are needed, such as
-  <envar>CFLAGS</envar> or <envar>CXXFLAGS</envar>, this is
-  a good place to set them again.</para>
-
-  <para>From this point on, there is no need to use the
-  <envar>CLFS</envar> variable anymore, because all work will be
-  restricted to the CLFS file system.  This is because the Bash shell is
-  told that <filename class="directory">${CLFS}</filename> is now the root
-  (<filename class="directory">/</filename>) directory.</para>
-
-  <para>Notice that <filename class="directory">/tools/bin</filename> comes
-  last in the <envar>PATH</envar>. This means that a temporary tool will no
-  longer be used once its final version is installed. This occurs when the
-  shell does not <quote>remember</quote> the locations of executed
-  binaries&mdash;for this reason, hashing is switched off by passing the
-  <parameter>+h</parameter> option to <command>bash</command>.</para>
-
-  <para>It is important that all the commands throughout the remainder
-  of this chapter and the following chapters are run from within the
-  chroot environment. If you leave this environment for any reason
-  (rebooting for example), remember to first mount the <systemitem
-  class="filesystem">proc</systemitem> and <systemitem
-  class="filesystem">devpts</systemitem> file systems (discussed in the
-  previous section) and enter chroot again before continuing with the
-  installations.</para>
-
-  <para>Note that the <command>bash</command> prompt will say
-  <computeroutput>I have no name!</computeroutput> This is normal because the
-  <filename>/etc/passwd</filename> file has not been created yet.</para>
-
-</sect1>
Index: OK/chroot/common/createfiles.xml
===================================================================
--- BOOK/chroot/common/createfiles.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,83 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-chroot-createfiles">
-  <?dbhtml filename="createfiles.html"?>
-
-  <title>Creating Essential Symlinks</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../boot/common/createfiles.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,pwd,stty} /bin
-ln -sv /tools/bin/file /usr/bin
-ln -sv /tools/lib/libgcc_s.so{,.1} /usr/lib
-ln -sv /tools/lib/libstdc++.so{.6,} /usr/lib
-sed -e 's/tools/usr/' /tools/lib/libstdc++.la &gt; /usr/lib/libstdc++.la
-ln -sv bash /bin/sh</userinput></screen>
-
-    <variablelist os="c">
-      <title>The purpose of each link:</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../boot/common/createfiles.xml"
-      xpointer="xpointer(//*[@os='c1'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../boot/common/createfiles.xml"
-      xpointer="xpointer(//*[@os='c2'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../boot/common/createfiles.xml"
-      xpointer="xpointer(//*[@os='c3'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../boot/common/createfiles.xml"
-      xpointer="xpointer(//*[@os='c4'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../boot/common/createfiles.xml"
-      xpointer="xpointer(//*[@os='c6'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../boot/common/createfiles.xml"
-      xpointer="xpointer(//*[@os='c7'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../boot/common/createfiles.xml"
-      xpointer="xpointer(//*[@os='c8'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../boot/common/createfiles.xml"
-      xpointer="xpointer(//*[@os='c9'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../boot/common/createfiles.xml"
-      xpointer="xpointer(//*[@os='c10'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../boot/common/createfiles.xml"
-      xpointer="xpointer(//*[@os='c11'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../boot/common/createfiles.xml"
-      xpointer="xpointer(//*[@os='c12'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../boot/common/createfiles.xml"
-      xpointer="xpointer(//*[@os='c13'])"/>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../boot/common/createfiles.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-<screen os="e"><userinput>ln -sv /proc/self/mounts /etc/mtab</userinput></screen>
-
-</sect1>
Index: OK/chroot/common/creatingdirs.xml
===================================================================
--- BOOK/chroot/common/creatingdirs.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,41 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-chroot-creatingdirs">
-  <?dbhtml filename="creatingdirs.html"?>
-
-  <title>Creating Directories</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../boot/common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
-<screen os="c"><userinput>mkdir -pv /{bin,boot,dev,{etc/,}opt,home,lib,mnt}
-mkdir -pv /{proc,media/{floppy,cdrom},run/shm,sbin,srv,sys}
-mkdir -pv /var/{lock,log,mail,spool}
-mkdir -pv /var/{opt,cache,lib/{misc,locate},local}
-install -dv -m 0750 /root
-install -dv -m 1777 {/var,}/tmp
-ln -sv ../run /var/run
-mkdir -pv /usr/{,local/}{bin,include,lib,sbin,src}
-mkdir -pv /usr/{,local/}share/{doc,info,locale,man}
-mkdir -pv /usr/{,local/}share/{misc,terminfo,zoneinfo}
-mkdir -pv /usr/{,local/}share/man/man{1..8}</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../boot/common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='d'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../boot/common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='e'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../boot/common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='f'])"/>
-
-</sect1>
Index: OK/chroot/common/introduction.xml
===================================================================
--- BOOK/chroot/common/introduction.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,16 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-chroot-introduction">
-  <?dbhtml filename="introduction.html"?>
-
-  <title>Introduction</title>
-
-  <para>This chapter shows how to prepare a <command>chroot</command>
-  jail to build the final system packages into.</para>
-
-</sect1>
Index: OK/chroot/common/kernfs.xml
===================================================================
--- BOOK/chroot/common/kernfs.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,64 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-chroot-kernfs">
-  <?dbhtml filename="kernfs.html"?>
-
-  <title>Mounting Virtual Kernel File Systems</title>
-
-    <note os="a">
-      <para>The commands in the remainder of the book should be run as
-      the <systemitem class="username">root</systemitem> user. Check
-      that ${CLFS} is set in the
-      <systemitem class="username">root</systemitem> user&rsquo;s environment
-       before proceeding.</para>
-    </note>
-
-  <para>Various file systems exported by the kernel are used to communicate
-  to and from the kernel itself. These file systems are virtual in that no
-  disk space is used for them. The content of the file systems resides in
-  memory.</para>
-
-  <para>Begin by creating directories onto which the file systems will
-  be mounted:</para>
-
-<screen><userinput>mkdir -pv ${CLFS}/{dev,proc,run,sys}</userinput></screen>
-
-  <para>Two device nodes, <filename class="devicefile">/dev/console</filename>
-  and <filename class="devicefile">/dev/null</filename>, are required to be
-  present on the file system. These are needed by the kernel even before
-  starting Udev early in the boot process, so we create them here:</para>
-
-<screen><userinput>mknod -m 600 ${CLFS}/dev/console c 5 1
-mknod -m 666 ${CLFS}/dev/null c 1 3</userinput></screen>
-
-  <para>Once the system is complete and booting, the rest of our device
-  nodes will be created by the kernel's
-  <systemitem class="filesystem">devtmpfs</systemitem> file system. For now
-  though, we will just use the <quote>bind</quote> option in the mount command
-  to make our host system's <filename class="directory">/dev</filename> structure appear in the new CLFS file system:</para>
-
-<screen><userinput>mount -v -o bind /dev ${CLFS}/dev</userinput></screen>
-
-  <para>Now mount the remaining file systems:</para>
-
-<screen><userinput>mount -vt devpts -o gid=&gid-tty;,mode=620 devpts ${CLFS}/dev/pts
-mount -vt proc proc ${CLFS}/proc
-mount -vt tmpfs tmpfs ${CLFS}/run
-mount -vt sysfs sysfs ${CLFS}/sys</userinput></screen>
-
-  <para>On some host systems, <filename class="directory">/dev/shm</filename>
-  is a symbolic link to <filename class="directory">/run/shm</filename>.
-  If it is, create a directory in <filename class="directory">/run</filename>:</para>
-
-<screen><userinput>[ -h ${CLFS}/dev/shm ] &amp;&amp; mkdir -pv ${CLFS}/$(readlink ${CLFS}/dev/shm)</userinput></screen>
-
-  <para>Remember that if for any reason you stop working on the CLFS system
-  and start again later, it is important to check that these file systems
-  are mounted again before entering the chroot environment.</para>
-
-</sect1>
Index: OK/chroot/common/pwdgroup.xml
===================================================================
--- BOOK/chroot/common/pwdgroup.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,113 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-chroot-pwdgroup">
-  <?dbhtml filename="pwdgroup.html"?>
-
-  <title>Creating the passwd and group Files</title>
-
-  <indexterm zone="ch-chroot-pwdgroup">
-    <primary sortas="e-/etc/passwd">/etc/passwd</primary>
-    <secondary>chroot</secondary>
-  </indexterm>
-
-  <indexterm zone="ch-chroot-pwdgroup">
-    <primary sortas="e-/etc/group">/etc/group</primary>
-    <secondary>chroot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../boot/common/pwdgroup.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-  <para>Create the <filename>/etc/passwd</filename> file by running the
-  following command:</para>
-
-<screen><userinput>cat &gt; /etc/passwd &lt;&lt; "EOF"
-<literal>root:x:&uid-root;:&gid-root;:root:/root:/bin/bash</literal>
-<literal>bin:x:&uid-bin;:&gid-bin;:/bin:/bin/false</literal>
-<literal>daemon:x:&uid-daemon;:&gid-daemon;:/sbin:/bin/false</literal>
-<literal>messagebus:x:&uid-messagebus;:&gid-messagebus;:D-Bus Message Daemon User:/dev/null:/bin/false</literal>
-<literal>systemd-bus-proxy:x:&uid-systemd-bus-proxy;:&gid-systemd-bus-proxy;:systemd Bus Proxy:/:/bin/false</literal>
-<literal>systemd-journal-gateway:x:&uid-systemd-journal-gateway;:&gid-systemd-journal-gateway;:systemd Journal Gateway:/:/bin/false</literal>
-<literal>systemd-journal-remote:x:&uid-systemd-journal-remote;:&gid-systemd-journal-remote;:systemd Journal Remote:/:/bin/false</literal>
-<literal>systemd-journal-upload:x:&uid-systemd-journal-upload;:&gid-systemd-journal-upload;:systemd Journal Upload:/:/bin/false</literal>
-<literal>systemd-network:x:&uid-systemd-network;:&gid-systemd-network;:systemd Network Management:/:/bin/false</literal>
-<literal>systemd-resolve:x:&uid-systemd-resolve;:&gid-systemd-resolve;:systemd Resolver:/:/bin/false</literal>
-<literal>systemd-timesync:x:&uid-systemd-timesync;:&gid-systemd-timesync;:systemd Time Synchronization:/:/bin/false</literal>
-<literal>systemd-coredump:x:&uid-systemd-coredump;:&gid-systemd-coredump;:systemd Core Dumper:/:/bin/false</literal>
-<literal>nobody:x:&uid-nobody;:&gid-nogroup;:Unprivileged User:/dev/null:/bin/false</literal>
-EOF</userinput></screen>
-
-  <para os="b">The actual password for
-  <systemitem class="username">root</systemitem> (the <quote>x</quote>
-  used here is just a placeholder) will be set later.</para>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../boot/common/pwdgroup.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-  <para>Create the <filename>/etc/group</filename> file by running the
-  following command:</para>
-
-<screen><userinput>cat &gt; /etc/group &lt;&lt; "EOF"
-<literal>root:x:0:
-bin:x:&gid-bin;:
-sys:x:&gid-sys;:
-kmem:x:&gid-kmem;:
-tty:x:&gid-tty;:
-tape:x:&gid-tape;:
-daemon:x:&gid-daemon;:
-floppy:x:&gid-floppy;:
-disk:x:&gid-disk;:
-lp:x:&gid-lp;:
-dialout:x:&gid-dialout;:
-audio:x:&gid-audio;:
-video:x:&gid-video;:
-utmp:x:&gid-utmp;:
-usb:x:&gid-usb;:
-cdrom:x:&gid-cdrom;:
-adm:x:&gid-adm;:
-mail:x:&gid-mail;:
-messagebus:x:&gid-messagebus;:
-nogroup:x:&gid-nogroup;:
-systemd-bus-proxy:x:&gid-systemd-bus-proxy;:
-systemd-journal:x:&gid-systemd-journal;:
-systemd-journal-gateway:x:&gid-systemd-journal-gateway;:
-systemd-journal-remote:x:&gid-systemd-journal-remote;:
-systemd-journal-upload:x:&gid-systemd-journal-upload;:
-systemd-network:x:&gid-systemd-network;:
-systemd-resolve:x:&gid-systemd-resolve;:
-systemd-timesync:x:&gid-systemd-timesync;:
-systemd-coredump:x:&gid-systemd-coredump;:
-wheel:x:&gid-wheel;:</literal>
-EOF</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../boot/common/pwdgroup.xml"
-  xpointer="xpointer(//*[@os='d'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../boot/common/pwdgroup.xml"
-  xpointer="xpointer(//*[@os='e'])"/>
-
-  <para>To remove the <quote>I have no name!</quote> prompt, start a
-  new shell. Since a full Glibc was installed in <xref
-  linkend="chapter-cross-tools"/> and the <filename>/etc/passwd</filename>
-  and <filename>/etc/group</filename> files have been created, user name
-  and group name resolution will now work.</para>
-
-<screen role="nodump"><userinput>exec /tools/bin/bash --login +h</userinput></screen>
-
-  <para>Note the use of the <parameter>+h</parameter> directive. This tells
-  <command>bash</command> not to use its internal path hashing. Without this
-  directive, <command>bash</command> would remember the paths to binaries it
-  has executed. To ensure the use of the newly compiled binaries as soon as
-  they are installed, the <parameter>+h</parameter> directive will be used
-  for the duration of the next chapters.</para>
-
-</sect1>
Index: OK/chroot/mips-chapter.xml
===================================================================
--- BOOK/chroot/mips-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,23 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-chroot" xreflabel="If You Are Going to Chroot">
-  <?dbhtml dir="chroot"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>If You Are Going to Chroot</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kernfs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/before-chroot.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/chroot.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/creatingdirs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
-
-</chapter>
Index: OK/chroot/mips/before-chroot.xml
===================================================================
--- BOOK/chroot/mips/before-chroot.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,72 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-chroot-before-chroot">
-  <?dbhtml filename="before-chroot.html"?>
-  <title>Before Entering the Chroot Environment</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/before-chroot.xml"
-  xpointer="xpointer(//*[@role='determining-ifneeded'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/before-chroot.xml"
-  xpointer="xpointer(//*[@role='using-setarch'])"/>
-
-  <sect2 role="using-uname_hack">
-    <title>Using a Uname Hack</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/before-chroot.xml"
-    xpointer="xpointer(//*[@os='uua'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/before-chroot.xml"
-    xpointer="xpointer(//*[@os='uub'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/before-chroot.xml"
-    xpointer="xpointer(//*[@os='uuc'])"/>
-
-<screen os="uud"><userinput>make uname_hack_fake_machine=mips</userinput></screen>
-
-    <variablelist os="uue">
-      <title>The meaning of the make and install options:</title>
-
-      <varlistentry os="uue1">
-        <term><parameter>uname_hack_fake_machine=mips</parameter></term>
-        <listitem>
-          <para>This parameter sets the value that the uts machine type will be
-          changed to.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/before-chroot.xml"
-    xpointer="xpointer(//*[@os='uuf'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/before-chroot.xml"
-    xpointer="xpointer(//*[@os='uug'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/before-chroot.xml"
-    xpointer="xpointer(//*[@os='uuh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/before-chroot.xml"
-    xpointer="xpointer(//*[@os='uui'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/before-chroot.xml"
-    xpointer="xpointer(//*[@os='uuj'])"/>
-
-  </sect2>
-
-</sect1>
Index: OK/chroot/mips/creatingdirs.xml
===================================================================
--- BOOK/chroot/mips/creatingdirs.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,39 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-chroot-creatingdirs">
-  <?dbhtml filename="creatingdirs.html"?>
-
-  <title>Creating Directories</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-   <para os="m1">These entries are needed for the RaQ2 bootloader. Only use these
-   if you are utilizing the Colo bootloader:</para>
-
-<screen os="m2"><userinput>cd /boot
-ln -svf . boot</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='d'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='e'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='f'])"/>
-
-</sect1>
Index: OK/chroot/mips64-64-chapter.xml
===================================================================
--- BOOK/chroot/mips64-64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,23 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-chroot" xreflabel="If You Are Going to Chroot">
-  <?dbhtml dir="chroot"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>If You Are Going to Chroot</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kernfs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/chroot.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/creatingdirs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64-64/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
-
-</chapter>
Index: OK/chroot/mips64-64/flags.xml
===================================================================
--- BOOK/chroot/mips64-64/flags.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,23 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-chroot-flags">
-  <?dbhtml filename="flags.html"?>
-
-  <title>Build Flags</title>
-
-  <para>We will need to setup target specific flags for the compiler
-  and linkers.</para>
-
-<screen><userinput>export BUILD64="-mabi=64"</userinput></screen>
-
-   <para>To prevent errors when you come back to your build, we will export these
-   variables to prevent any build issues in the future:</para>
-
-<screen><userinput>echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ~/.bash_profile</userinput></screen>
-
-</sect1>
Index: OK/chroot/mips64-chapter.xml
===================================================================
--- BOOK/chroot/mips64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,23 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-chroot" xreflabel="If You Are Going to Chroot">
-  <?dbhtml dir="chroot"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>If You Are Going to Chroot</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kernfs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/chroot.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/creatingdirs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
-
-</chapter>
Index: OK/chroot/mips64/createfiles.xml
===================================================================
--- BOOK/chroot/mips64/createfiles.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,36 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-chroot-createfiles">
-  <?dbhtml filename="createfiles.html"?>
-
-  <title>Creating Essential Symlinks</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/createfiles.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-<screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,pwd,stty} /bin
-ln -sv /tools/bin/file /usr/bin
-ln -sv /tools/lib/libgcc_s.so{,.1} /usr/lib
-ln -sv /tools/lib32/libgcc_s.so{,.1} /usr/lib32
-ln -sv /tools/lib64/libgcc_s.so{,.1} /usr/lib64
-ln -sv /tools/lib/libstdc++.so{.6,} /usr/lib
-ln -sv /tools/lib32/libstdc++.so{.6,} /usr/lib32
-ln -sv /tools/lib64/libstdc++.so{.6,} /usr/lib64
-sed -e 's/tools/usr/' /tools/lib/libstdc++.la &gt; /usr/lib/libstdc++.la
-ln -sv bash /bin/sh</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../boot/common/createfiles.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/createfiles.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-</sect1>
Index: OK/chroot/mips64/creatingdirs.xml
===================================================================
--- BOOK/chroot/mips64/creatingdirs.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,52 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-chroot-creatingdirs">
-  <?dbhtml filename="creatingdirs.html"?>
-
-  <title>Creating Directories</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
-<screen><userinput>mkdir -pv /{bin,boot,dev,{etc/,}opt,home,lib{,32,64},mnt}
-mkdir -pv /{proc,media/{floppy,cdrom},run/{,shm},sbin,srv,sys}
-mkdir -pv /var/{lock,log,mail,spool}
-mkdir -pv /var/{opt,cache,lib{,32,64}/{misc,locate},local}
-install -dv /root -m 0750
-install -dv {/var,}/tmp -m 1777
-ln -sv ../run /var/run
-mkdir -pv /usr/{,local/}{bin,include,lib{,32,64},sbin,src}
-mkdir -pv /usr/{,local/}share/{doc,info,locale,man}
-mkdir -pv /usr/{,local/}share/{misc,terminfo,zoneinfo}
-mkdir -pv /usr/{,local/}share/man/man{1..8}
-install -dv /usr/lib/locale
-ln -sv ../lib/locale /usr/lib32
-ln -sv ../lib/locale /usr/lib64</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../mips/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='m1'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../mips/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='m2'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='d'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='e'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='f'])"/>
-
-</sect1>
Index: OK/chroot/mips64/flags.xml
===================================================================
--- BOOK/chroot/mips64/flags.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,34 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-chroot-flags">
-  <?dbhtml filename="flags.html"?>
-
-  <title>Build Flags</title>
-
-  <para>We will need to setup target specific flags for the compiler
-  and linkers.</para>
-
-<screen><userinput>export BUILD32="-mabi=32"
-export BUILDN32="-mabi=n32"
-export BUILD64="-mabi=64"</userinput></screen>
-
-  <para>You will need to set your host target triplet for o32 bit:</para>
-
-<screen><userinput>export CLFS_TARGET32="$(echo ${MACH_TYPE}| sed -e 's/64//g')"</userinput></screen>
-
-   <para>To prevent errors when you come back to your build, we will export these
-   variables to prevent any build issues in the future:</para>
-
-<screen><userinput>cat &gt;&gt; ${CLFS}/root/.bash_profile &lt;&lt; EOF
-export BUILD32="${BUILD32}"
-export BUILDN32="${BUILDN32}"
-export BUILD64="${BUILD64}"
-export CLFS_TARGET32="${CLFS_TARGET32}"
-EOF</userinput></screen>
-
-</sect1>
Index: OK/chroot/multilib/createfiles.xml
===================================================================
--- BOOK/chroot/multilib/createfiles.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,37 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-chroot-createfiles">
-  <?dbhtml filename="createfiles.html"?>
-
-  <title>Creating Essential Symlinks</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/createfiles.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-<screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,pwd,stty} /bin
-ln -sv /tools/bin/file /usr/bin
-ln -sv /tools/lib/libgcc_s.so{,.1} /usr/lib
-ln -sv /tools/lib64/libgcc_s.so{,.1} /usr/lib64
-ln -sv /tools/lib/libstd* /usr/lib
-ln -sv /tools/lib64/libstd* /usr/lib64
-ln -sv bash /bin/sh</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../boot/common/createfiles.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/createfiles.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/createfiles.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-</sect1>
Index: OK/chroot/multilib/creatingdirs.xml
===================================================================
--- BOOK/chroot/multilib/creatingdirs.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,43 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-chroot-creatingdirs">
-  <?dbhtml filename="creatingdirs.html"?>
-
-  <title>Creating Directories</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
-<screen><userinput>mkdir -pv /{bin,boot,dev,{etc/,}opt,home,lib{,64},mnt}
-mkdir -pv /{proc,media/{floppy,cdrom},run/{,shm},sbin,srv,sys}
-mkdir -pv /var/{lock,log,mail,spool}
-mkdir -pv /var/{opt,cache,lib{,64}/{misc,locate},local}
-install -dv /root -m 0750
-install -dv {/var,}/tmp -m 1777
-ln -sv ../run /var/run
-mkdir -pv /usr/{,local/}{bin,include,lib{,64},sbin,src}
-mkdir -pv /usr/{,local/}share/{doc,info,locale,man}
-mkdir -pv /usr/{,local/}share/{misc,terminfo,zoneinfo}
-mkdir -pv /usr/{,local/}share/man/man{1..8}
-install -dv /usr/lib/locale
-ln -sv ../lib/locale /usr/lib64</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='d'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='e'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='f'])"/>
-
-</sect1>
Index: OK/chroot/ppc-chapter.xml
===================================================================
--- BOOK/chroot/ppc-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,23 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-chroot" xreflabel="If You Are Going to Chroot">
-  <?dbhtml dir="chroot"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>If You Are Going to Chroot</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kernfs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/before-chroot.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/chroot.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingdirs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
-
-</chapter>
Index: OK/chroot/ppc/before-chroot.xml
===================================================================
--- BOOK/chroot/ppc/before-chroot.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,72 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-chroot-before-chroot">
-  <?dbhtml filename="before-chroot.html"?>
-  <title>Before Entering the Chroot Environment</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/before-chroot.xml"
-  xpointer="xpointer(//*[@role='determining-ifneeded'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/before-chroot.xml"
-  xpointer="xpointer(//*[@role='using-setarch'])"/>
-
-  <sect2 role="using-uname_hack">
-    <title>Using a Uname Hack</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/before-chroot.xml"
-    xpointer="xpointer(//*[@os='uua'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/before-chroot.xml"
-    xpointer="xpointer(//*[@os='uub'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/before-chroot.xml"
-    xpointer="xpointer(//*[@os='uuc'])"/>
-
-<screen os="uud"><userinput>make uname_hack_fake_machine=ppc</userinput></screen>
-
-    <variablelist os="uue">
-      <title>The meaning of the make and install options:</title>
-
-      <varlistentry os="uue1">
-        <term><parameter>uname_hack_fake_machine=ppc</parameter></term>
-        <listitem>
-          <para>This parameter sets the value that the uts machine type will be
-          changed to.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/before-chroot.xml"
-    xpointer="xpointer(//*[@os='uuf'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/before-chroot.xml"
-    xpointer="xpointer(//*[@os='uug'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/before-chroot.xml"
-    xpointer="xpointer(//*[@os='uuh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/before-chroot.xml"
-    xpointer="xpointer(//*[@os='uui'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/before-chroot.xml"
-    xpointer="xpointer(//*[@os='uuj'])"/>
-
-  </sect2>
-
-</sect1>
Index: OK/chroot/ppc64-64-chapter.xml
===================================================================
--- BOOK/chroot/ppc64-64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,22 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-chroot" xreflabel="If You Are Going to Chroot">
-  <?dbhtml dir="chroot"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>If You Are Going to Chroot</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kernfs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/chroot.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingdirs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
-
-</chapter>
Index: OK/chroot/ppc64-chapter.xml
===================================================================
--- BOOK/chroot/ppc64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,23 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-chroot" xreflabel="If You Are Going to Chroot">
-  <?dbhtml dir="chroot"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>If You Are Going to Chroot</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kernfs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/chroot.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/creatingdirs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
-
-</chapter>
Index: OK/chroot/ppc64/flags.xml
===================================================================
--- BOOK/chroot/ppc64/flags.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,32 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-chroot-flags">
-  <?dbhtml filename="flags.html"?>
-
-  <title>Build Flags</title>
-
-  <para>We will need to setup target specific flags for the compiler
-  and linkers.</para>
-
-<screen><userinput>export BUILD32="-m32"
-export BUILD64="-m64"</userinput></screen>
-
-  <para>You will need to set your host target triplet for 32 bit:</para>
-
-<screen><userinput>export CLFS_TARGET32="powerpc-unknown-linux-gnu"</userinput></screen>
-
-   <para>To prevent errors when you come back to your build, we will export these
-   variables to prevent any build issues in the future:</para>
-
-<screen><userinput>cat &gt;&gt; ${CLFS}/root/.bash_profile &lt;&lt; EOF
-export BUILD32="${BUILD32}"
-export BUILD64="${BUILD64}"
-export CLFS_TARGET32="${CLFS_TARGET32}"
-EOF</userinput></screen>
-
-</sect1>
Index: OK/chroot/sparc-chapter.xml
===================================================================
--- BOOK/chroot/sparc-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,23 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-chroot" xreflabel="If You Are Going to Chroot">
-  <?dbhtml dir="chroot"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>If You Are Going to Chroot</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kernfs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/before-chroot.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/chroot.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingdirs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
-
-</chapter>
Index: OK/chroot/sparc/before-chroot.xml
===================================================================
--- BOOK/chroot/sparc/before-chroot.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,72 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-chroot-before-chroot">
-  <?dbhtml filename="before-chroot.html"?>
-  <title>Before Entering the Chroot Environment</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/before-chroot.xml"
-  xpointer="xpointer(//*[@role='determining-ifneeded'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/before-chroot.xml"
-  xpointer="xpointer(//*[@role='using-setarch'])"/>
-
-  <sect2 role="using-uname_hack">
-    <title>Using a Uname Hack</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/before-chroot.xml"
-    xpointer="xpointer(//*[@os='uua'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/before-chroot.xml"
-    xpointer="xpointer(//*[@os='uub'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/before-chroot.xml"
-    xpointer="xpointer(//*[@os='uuc'])"/>
-
-<screen os="uud"><userinput>make uname_hack_fake_machine=sparc</userinput></screen>
-
-    <variablelist os="uue">
-      <title>The meaning of the make and install options:</title>
-
-      <varlistentry os="uue1">
-        <term><parameter>uname_hack_fake_machine=sparc</parameter></term>
-        <listitem>
-          <para>This parameter sets the value that the uts machine type will be
-          changed to.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/before-chroot.xml"
-    xpointer="xpointer(//*[@os='uuf'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/before-chroot.xml"
-    xpointer="xpointer(//*[@os='uug'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/before-chroot.xml"
-    xpointer="xpointer(//*[@os='uuh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/before-chroot.xml"
-    xpointer="xpointer(//*[@os='uui'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/before-chroot.xml"
-    xpointer="xpointer(//*[@os='uuj'])"/>
-
-  </sect2>
-
-</sect1>
Index: OK/chroot/sparc64-64-chapter.xml
===================================================================
--- BOOK/chroot/sparc64-64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,23 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-chroot" xreflabel="If You Are Going to Chroot">
-  <?dbhtml dir="chroot"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>If You Are Going to Chroot</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kernfs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/chroot.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingdirs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64-64/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
-
-</chapter>
Index: OK/chroot/sparc64-64/flags.xml
===================================================================
--- BOOK/chroot/sparc64-64/flags.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,31 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-chroot-flags">
-  <?dbhtml filename="flags.html"?>
-
-  <title>Build Flags</title>
-
-  <para>We will need to setup target specific flags for the compiler
-  and linkers.</para>
-
-<screen><userinput>export BUILD64="[BUILD64 entries]"</userinput></screen>
-
-   <para>To prevent errors when you come back to your build, we will export these
-   variables to prevent any build issues in the future:</para>
-
-<screen><userinput>echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ~/.bash_profile</userinput></screen>
-
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-   href="../../final-preps/sparc64-64/variables.xml"
-   xpointer="xpointer(//*[@os='k'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-   href="../../final-preps/sparc64-64/variables.xml"
-   xpointer="xpointer(//*[@os='l'])"/>
-
-</sect1>
Index: OK/chroot/sparc64-chapter.xml
===================================================================
--- BOOK/chroot/sparc64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,23 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-chroot" xreflabel="If You Are Going to Chroot">
-  <?dbhtml dir="chroot"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>If You Are Going to Chroot</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kernfs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/chroot.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/creatingdirs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
-
-</chapter>
Index: OK/chroot/sparc64/flags.xml
===================================================================
--- BOOK/chroot/sparc64/flags.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,40 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-chroot-flags">
-  <?dbhtml filename="flags.html"?>
-
-  <title>Build Flags</title>
-
-  <para>We will need to setup target specific flags for the compiler
-  and linkers.</para>
-
-<screen><userinput>export BUILD32="[BUILD32 entries]"
-export BUILD64="[BUILD64 entries]"</userinput></screen>
-
-  <para>You will need to set your host target triplet for 32 bit:</para>
-
-<screen><userinput>export CLFS_TARGET32="sparcv9-unknown-linux-gnu"</userinput></screen>
-
-   <para>To prevent errors when you come back to your build, we will export these
-   variables to prevent any build issues in the future:</para>
-
-<screen><userinput>cat &gt;&gt; ${CLFS}/root/.bash_profile &lt;&lt; EOF
-export BUILD32="${BUILD32}"
-export BUILD64="${BUILD64}"
-export CLFS_TARGET32="${CLFS_TARGET32}"
-EOF</userinput></screen>
-
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-   href="../../final-preps/sparc64/variables.xml"
-   xpointer="xpointer(//*[@os='k'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-   href="../../final-preps/sparc64/variables.xml"
-   xpointer="xpointer(//*[@os='l'])"/>
-
-</sect1>
Index: OK/chroot/x86-chapter.xml
===================================================================
--- BOOK/chroot/x86-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,23 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-chroot" xreflabel="If You Are Going to Chroot">
-  <?dbhtml dir="chroot"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>If You Are Going to Chroot</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kernfs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/before-chroot.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/chroot.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingdirs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
-
-</chapter>
Index: OK/chroot/x86/before-chroot.xml
===================================================================
--- BOOK/chroot/x86/before-chroot.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,138 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-chroot-before-chroot">
-  <?dbhtml filename="before-chroot.html"?>
-  <title>Before Entering the Chroot Environment</title>
-
-  <sect2 role="determining-ifneeded">
-    <title>Determining if steps need to be taken</title>
-
-    <para>Before we can enter the chroot we have to make sure that the system is
-    in the proper state. From this point on the <envar>${CLFS_TARGET}</envar>
-    environment variable will no longer exist, so it will have no bearing on the
-    rest of the book - most packages will rely on
-    <command>config.guess</command> provided by
-    <xref linkend="ch-system-automake"/>. Packages that do not use autotools
-    either do not care about the target triplet, or have their own means
-    of determining its value.</para>
-
-    <para>In both cases, the information about the host cpu used to determine
-    the target triplet is gathered from the same place,
-    <command>uname -m</command>. Executing this command outside of the chroot
-    as well as inside the chroot will have the exact same output.</para>
-
-   <para>If you're unsure if your host and target have the same target
-    triplet, you can use this test to determine what the host's target triplet
-    is and if you need to take any steps to ensure that you don't build for the
-    wrong architecture. Extract the <xref linkend="ch-system-automake"/> tarball
-    and <command>cd</command> into the created directory. Then execute the
-    following to see what the detected target triplet is by
-    <command>config.guess</command>:</para>
-
-<screen><userinput>lib/config.guess</userinput></screen>
-
-    <para>If the output of that command does not equal what is in
-    <envar>${CLFS_TARGET}</envar> then you need to read on. If it does then you
-    can safely continue onto <xref linkend="ch-chroot-chroot"/>.</para>
-
-  </sect2>
-
-  <sect2 role="using-setarch">
-    <title>Using Setarch</title>
-
-    <para>If your host has a tool called <command>setarch</command>, this may
-    solve your problems, at least if you're building for i686. On an
-    architecture such as x86_64, using
-    <command>setarch linux32 uname -m</command> will only
-    ever output i686. It is not possible to get an output of i486 or i586.</para>
-
-    <para>To test if setarch does everything you need it to, execute the
-    following command from inside the <xref linkend="ch-system-automake"/>
-    directory:</para>
-
-<screen><userinput>setarch linux32 lib/config.guess</userinput></screen>
-
-    <para>If the output of the command above equals what is in
-    <envar>${CLFS_TARGET}</envar> then you have a viable solution. You can
-    wrap the chroot command on the next page with
-    <command>setarch linux32</command>. It will look like the following:</para>
-
-<screen><userinput>setarch linux32 chroot "${CLFS}" /tools/bin/env -i \
-    HOME=/root TERM="${TERM}" PS1='\u:\w\$ ' \
-    PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin \
-    /tools/bin/bash --login +h</userinput></screen>
-
-    <para>If setarch works for you then you can safely continue onto
-    <xref linkend="ch-chroot-chroot"/>. If not, there is one more option
-    covered in this book.</para>
-
-  </sect2>
-
-  <sect2 role="using-uname_hack">
-    <title>Using a Uname Hack</title>
-
-    <para os="uua">The Uname Hack is a kernel module that modifies the output of
-    <command>uname -m</command> by directly changing the value of the
-    detected machine type. The kernel module will save the original value
-    and restore it when the module is unloaded.</para>
-
-    <variablelist os="uub" role="materials">
-      <varlistentry>
-        <term>Uname Hack (&uname_hack-version;) - &uname_hack-size;:</term>
-
-        <listitem>
-          <para>Home page: <ulink url="&uname_hack-home;"/></para>
-          <para>Download: <ulink url="&uname_hack-url;"/></para>
-          <para>MD5 sum: <literal>&uname_hack-md5;</literal></para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-    <para os="uuc">Extract the tarball and <command>cd</command> into the
-    created directory. To build the Uname Hack you must have the kernel sources
-    for your currently running kernel available. Build the Uname Hack with the
-    following or similar command:</para>
-
-<screen os="uud"><userinput>make uname_hack_fake_machine=i486</userinput></screen>
-
-    <variablelist os="uue">
-      <title>The meaning of the make and install options:</title>
-
-      <varlistentry os="uue1">
-        <term><parameter>uname_hack_fake_machine=i486</parameter></term>
-        <listitem>
-          <para>This parameter sets the value that the uts machine type will be
-          changed to. Alternatively this could be set to i586 or i686.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para os="uuf">In the top level directory of the Uname Hack package you
-    should see a file named <filename>uname_hack.ko</filename>. As soon as
-    that module is loaded into the running kernel the output of
-    <command>uname -m</command> will be affected immediately system-wide.
-    Load the kernel module with the following command:</para>
-
-<screen os="uug"><userinput>insmod uname_hack.ko</userinput></screen>
-
-    <para os="uuh">To test if the Uname Hack is working properly, execute the
-    following command from inside the <xref linkend="ch-system-automake"/>
-    directory:</para>
-
-<screen os="uui"><userinput>lib/config.guess</userinput></screen>
-
-    <para os="uuj">The output of the above command should be the same as the
-    <envar>${CLFS_TARGET}</envar> environment variable. If this is not the
-    case, you can try and get help on the CLFS Support Mailing List or the
-    IRC Channel. See <xref linkend="ch-intro-askforhelp"/> for more
-    information.</para>
-
-  </sect2>
-
-</sect1>
Index: OK/chroot/x86_64-64-chapter.xml
===================================================================
--- BOOK/chroot/x86_64-64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,23 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-chroot" xreflabel="If You Are Going to Chroot">
-  <?dbhtml dir="chroot"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>If You Are Going to Chroot</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kernfs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/chroot.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingdirs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
-
-</chapter>
Index: OK/chroot/x86_64-64/flags.xml
===================================================================
--- BOOK/chroot/x86_64-64/flags.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,23 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-chroot-flags">
-  <?dbhtml filename="flags.html"?>
-
-  <title>Build Flags</title>
-
-  <para>We will need to setup target specific flags for the compiler
-  and linkers.</para>
-
-<screen><userinput>export BUILD64="-m64"</userinput></screen>
-
-   <para>To prevent errors when you come back to your build, we will export these
-   variables to prevent any build issues in the future:</para>
-
-<screen><userinput>echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ~/.bash_profile</userinput></screen>
-
-</sect1>
Index: OK/chroot/x86_64-chapter.xml
===================================================================
--- BOOK/chroot/x86_64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,23 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-chroot" xreflabel="If You Are Going to Chroot">
-  <?dbhtml dir="chroot"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>If You Are Going to Chroot</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kernfs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/chroot.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/creatingdirs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
-
-</chapter>
Index: OK/chroot/x86_64/flags.xml
===================================================================
--- BOOK/chroot/x86_64/flags.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,32 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-chroot-flags">
-  <?dbhtml filename="flags.html"?>
-
-  <title>Build Flags</title>
-
-  <para>We will need to setup target specific flags for the compiler
-  and linkers:</para>
-
-<screen><userinput>export BUILD32="-m32"
-export BUILD64="-m64"</userinput></screen>
-
-  <para>You will need to set your host target triplet for 32 bit:</para>
-
-<screen><userinput>export CLFS_TARGET32="i686-pc-linux-gnu"</userinput></screen>
-
-   <para>To prevent errors when you come back to your build, we will export these
-   variables to prevent any build issues in the future:</para>
-
-<screen><userinput>cat &gt;&gt; ${CLFS}/root/.bash_profile &lt;&lt; EOF
-export BUILD32="${BUILD32}"
-export BUILD64="${BUILD64}"
-export CLFS_TARGET32="${CLFS_TARGET32}"
-EOF</userinput></screen>
-
-</sect1>
Index: OK/cross-tools/64/binutils.xml
===================================================================
--- BOOK/cross-tools/64/binutils.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,177 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-binutils" role="wrap">
-  <?dbhtml filename="binutils.html"?>
-
-  <title>Cross Binutils-&binutils-version;</title>
-
-  <indexterm zone="ch-cross-tools-binutils">
-    <primary sortas="a-Binutils">Binutils</primary>
-    <secondary>cross tools</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/binutils.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Cross Binutils</title>
-
-    <para os="da">It is important that Binutils be compiled before Glibc and
-    GCC because both Glibc and GCC perform various tests on the available
-    linker and assembler to determine which of their own features to
-    enable.</para>
-
-<!-- Branch update patch area
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/binutils.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/binutils.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/binutils.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/binutils.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/binutils.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-<screen os="bc"><userinput>AR=ar AS=as \
-../binutils-&binutils-dir;/configure \
-    --prefix=/cross-tools \
-    --host=${CLFS_HOST} \
-    --target=${CLFS_TARGET} \
-    --with-sysroot=${CLFS} \
-    --with-lib-path=/tools/lib \
-    --disable-nls \
-    --disable-static \
-    --enable-64-bit-bfd \
-    --disable-multilib \
-    --enable-gold=yes \
-    --enable-plugins \
-    --enable-threads \
-    --disable-werror</userinput></screen>
-
-    <variablelist os="bd">
-      <title>The meaning of the new configure options:</title>
-
-      <varlistentry os="bd1">
-        <term><parameter>AR=ar AS=as</parameter></term>
-        <listitem>
-          <para>This prevents Binutils from compiling with ${CLFS_HOST}-ar
-           and ${CLFS_HOST}-as as they are provided by this package and therefore
-           not installed yet.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="bd2">
-        <term><parameter>--host=${CLFS_HOST}</parameter></term>
-        <listitem>
-          <para>When used with --target, this creates a cross-architecture
-          executable that creates files for ${CLFS_TARGET} but runs on ${CLFS_HOST}.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="bd3">
-        <term><parameter>--target=${CLFS_TARGET}</parameter></term>
-        <listitem>
-          <para>When used with --host, this creates a cross-architecture
-          executable that creates files for ${CLFS_TARGET} but runs on ${CLFS_HOST}.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="bd4">
-        <term><parameter>--with-sysroot=${CLFS}</parameter></term>
-        <listitem>
-          <para>Tells configure to build a linker that uses ${CLFS} as its
-          root directory for its search paths.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="bd5">
-        <term><parameter>--with-lib-path=/tools/lib</parameter></term>
-        <listitem>
-          <para>This tells the configure script to specify the library
-          search path during the compilation of Binutils, resulting in
-          <filename class="directory">/tools/lib</filename> being passed
-          to the linker. This prevents the linker from searching through
-          library directories on the host.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="bd6">
-        <term><parameter>--disable-nls</parameter></term>
-        <listitem>
-          <para>This disables internationalization as i18n is not needed for the
-          cross-compile tools.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="bd7">
-        <term><parameter>--disable-multilib</parameter></term>
-        <listitem>
-          <para>This option disables the building of a multilib
-          capable Binutils.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="bd8">
-        <term><parameter>--enable-64-bit-bfd</parameter></term>
-        <listitem>
-          <para>This adds 64 bit support to Binutils.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="bd9">
-        <term><parameter>--disable-werror</parameter></term>
-        <listitem>
-          <para>This prevents the build from stopping in the event that there
-          are warnings from the host's compiler.</para>
-        </listitem>
-      </varlistentry>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../common/binutils.xml"
-      xpointer="xpointer(//*[@os='bd10'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../common/binutils.xml"
-      xpointer="xpointer(//*[@os='bd11'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../common/binutils.xml"
-      xpointer="xpointer(//*[@os='bd12'])"/>
-
-    </variablelist>
-
-    <para os="be">Compile the package:</para>
-
-<screen os="bf"><userinput>make</userinput></screen>
-
-    <para os="bh">Install the package:</para>
-
-<screen os="bi"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-binutils" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/64/gcc-final.xml
===================================================================
--- BOOK/cross-tools/64/gcc-final.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,97 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-gcc-final" role="wrap">
-  <?dbhtml filename="gcc-final.html"?>
-
-  <title>Cross GCC-&gcc-version; - Final</title>
-
-  <indexterm zone="ch-cross-tools-gcc-final">
-    <primary sortas="a-GCC">GCC</primary>
-    <secondary>cross tools, final</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GCC Cross Compiler</title>
-
-<!--GCC Branch Update Area
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ag'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ah'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bf'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bg'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bi'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bk'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/64/gcc-static.xml
===================================================================
--- BOOK/cross-tools/64/gcc-static.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,112 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-gcc-static" role="wrap">
-  <?dbhtml filename="gcc-static.html"?>
-
-  <title>Cross GCC-&gcc-version; - Static</title>
-
-  <indexterm zone="ch-cross-tools-gcc-static">
-    <primary sortas="a-GCC">GCC</primary>
-    <secondary>cross tools, static</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Cross GCC Compiler with Static libgcc
-    and no Threads</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-<!--GCC Branch Update Area
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-<screen os="ab"><userinput>patch -Np1 -i ../&gcc-specs_pure64-patch;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ag'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ah'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='t1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='t2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='al'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='am'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='an'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ao'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ap'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aq'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ar'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/64/glibc.xml
===================================================================
--- BOOK/cross-tools/64/glibc.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,129 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-glibc" role="wrap">
-  <?dbhtml filename="glibc.html"?>
-
-  <title>Glibc-&glibc-version;</title>
-
-  <indexterm zone="ch-cross-tools-glibc">
-    <primary sortas="a-Glibc">Glibc</primary>
-    <secondary>cross tools</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/glibc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Glibc</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-<screen os="df"><userinput>BUILD_CC="gcc" \
-CC="${CLFS_TARGET}-gcc ${BUILD64}" \
-AR="${CLFS_TARGET}-ar" \
-RANLIB="${CLFS_TARGET}-ranlib" \
-../glibc-&glibc-version;/configure \
-    --prefix=/tools \
-    --host=${CLFS_TARGET} \
-    --build=${CLFS_HOST} \
-    --enable-kernel=&glibc-kernel-version; \
-    --with-binutils=/cross-tools/bin \
-    --with-headers=/tools/include \
-    --enable-obsolete-rpc</userinput></screen>
-
-    <variablelist os="dg">
-      <title>The meaning of the new configure options:</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg1'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../multilib/glibc-64bit.xml"
-      xpointer="xpointer(//*[@os='fa1'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg3'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg4'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg5'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg6'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg7'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg8'])"/>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='di'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dk'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dl'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dm'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dn'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-glibc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/common/binutils.xml
===================================================================
--- BOOK/cross-tools/common/binutils.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,180 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-binutils" role="wrap">
-  <?dbhtml filename="binutils.html"?>
-
-  <title>Cross Binutils-&binutils-version;</title>
-
-  <indexterm zone="ch-cross-tools-binutils">
-    <primary sortas="a-Binutils">Binutils</primary>
-    <secondary>cross tools</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/binutils.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Cross Binutils</title>
-
-    <para os="da">It is important that Binutils be compiled before Glibc and
-    GCC because both Glibc and GCC perform various tests on the available
-    linker and assembler to determine which of their own features to
-    enable.</para>
-
-<!-- Branch update patch area
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/binutils.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/binutils.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/binutils.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/binutils.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/binutils.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-<screen os="bc"><userinput>AR=ar AS=as \
-../binutils-&binutils-dir;/configure \
-    --prefix=/cross-tools \
-    --host=${CLFS_HOST} \
-    --target=${CLFS_TARGET} \
-    --with-sysroot=${CLFS} \
-    --with-lib-path=/tools/lib \
-    --disable-nls \
-    --disable-static \
-    --disable-multilib \
-    --enable-gold=yes \
-    --enable-plugins \
-    --enable-threads \
-    --disable-werror</userinput></screen>
-
-    <variablelist os="bd">
-      <title>The meaning of the new configure options:</title>
-
-      <varlistentry os="bd1">
-        <term><parameter>AR=ar AS=as</parameter></term>
-        <listitem>
-          <para>This prevents Binutils from compiling with ${CLFS_HOST}-ar
-           and ${CLFS_HOST}-as as they are provided by this package and therefore
-           not installed yet.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="bd2">
-        <term><parameter>--host=${CLFS_HOST}</parameter></term>
-        <listitem>
-          <para>When used with <option>--target</option>, this creates a
-          cross-architecture executable which creates files for
-          ${CLFS_TARGET} but runs on ${CLFS_HOST}.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="bd3">
-        <term><parameter>--target=${CLFS_TARGET}</parameter></term>
-        <listitem>
-          <para>When used with <option>--host</option>, this creates a
-          cross-architecture executable that creates files for
-          ${CLFS_TARGET} but runs on ${CLFS_HOST}.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="bd4">
-        <term><parameter>--with-sysroot=${CLFS}</parameter></term>
-        <listitem>
-          <para>Tells configure to build a linker that uses ${CLFS} as its
-          root directory for its search paths.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="bd5">
-        <term><parameter>--with-lib-path=/tools/lib</parameter></term>
-        <listitem>
-          <para>This tells the configure script to specify the library
-          search path during the compilation of Binutils, resulting in
-          <filename class="directory">/tools/lib</filename> being passed
-          to the linker. This prevents the linker from searching through
-          library directories on the host.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="bd6">
-        <term><parameter>--disable-nls</parameter></term>
-        <listitem>
-          <para>This disables internationalization as i18n is not needed for the
-          cross-compile tools.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="bd7">
-        <term><parameter>--disable-multilib</parameter></term>
-        <listitem>
-          <para>This option disables the building of a multilib
-          capable Binutils.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="bd8">
-        <term><parameter>--disable-werror</parameter></term>
-        <listitem>
-          <para>This prevents the build from stopping in the event that there
-          are warnings from the host's compiler.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="bd10">
-        <term><parameter>--enable-gold=yes</parameter></term>
-        <listitem>
-          <para>This option enables the building of the gold linker.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="bd11">
-        <term><parameter>--enable-plugins</parameter></term>
-        <listitem>
-          <para>This option enables support for plugins.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="bd12">
-        <term><parameter>--enable-threads</parameter></term>
-        <listitem>
-          <para>This option enables multi-threaded linking for the gold linker.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para os="be">Compile the package:</para>
-
-<screen os="bf"><userinput>make</userinput></screen>
-
-    <para os="bh">Install the package:</para>
-
-<screen os="bi"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-binutils" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/common/file.xml
===================================================================
--- BOOK/cross-tools/common/file.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,73 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-file" role="wrap">
-  <?dbhtml filename="file.html"?>
-
-  <title>File-&file-version;</title>
-
-  <indexterm zone="ch-cross-tools-file">
-    <primary sortas="a-File">File</primary>
-    <secondary>cross tools</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/file.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of File</title>
-
-    <para>One method that <command>file</command> uses for identifying a given
-    file is to run <quote>magic tests</quote>, where it compares the file's
-    contents to data in <quote>magic files</quote>, which contain information
-    about a number of standard file formats. When File is compiled, it will run
-    <command>file -C</command> to combine the information from the
-    magic files in its source tree into a single <filename>magic.mgc</filename>
-    file, which it will use after it is installed. When we build File in
-    <xref linkend="chapter-temp-system"/>, it will be cross-compiled, so it
-    will not be able to run the <command>file</command> program that it just
-    built, which means that we need one that will run on the host system.</para>
-
-    <para>Prepare File for compilation:</para>
-
-<screen><userinput>./configure \
-    --prefix=/cross-tools</userinput></screen>
-
-    <variablelist>
-      <title>The meaning of the configure options:</title>
-
-      <varlistentry>
-        <term><parameter>--prefix=/cross-tools</parameter></term>
-        <listitem>
-          <para>This tells the configure script to prepare to install the
-          package in the <filename class="directory">/cross-tools</filename>
-          directory.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para>Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-    <para>Install the package:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-file" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/common/gcc-final.xml
===================================================================
--- BOOK/cross-tools/common/gcc-final.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,113 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-gcc-final" role="wrap">
-  <?dbhtml filename="gcc-final.html"?>
-
-  <title>Cross GCC-&gcc-version; - Final</title>
-
-  <indexterm zone="ch-cross-tools-gcc-final">
-    <primary sortas="a-GCC">GCC</primary>
-    <secondary>cross tools, final</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GCC Cross Compiler</title>
-
-<!--GCC Branch Update Area
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ag'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ah'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-<screen os="bf"><userinput>AR=ar \
-LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
-../gcc-&gcc-version;/configure \
-    --prefix=/cross-tools \
-    --build=${CLFS_HOST} \
-    --target=${CLFS_TARGET} \
-    --host=${CLFS_HOST} \
-    --with-sysroot=${CLFS} \
-    --with-local-prefix=/tools \
-    --with-native-system-header-dir=/tools/include \
-    --disable-nls \
-    --disable-static \
-    --enable-languages=c,c++ \
-    --disable-multilib \
-    --with-mpc=/cross-tools \
-    --with-mpfr=/cross-tools \
-    --with-gmp=/cross-tools \
-    --with-isl=/cross-tools</userinput></screen>
-
-    <variablelist os="bg">
-      <title>The meaning of the new configure options:</title>
-
-      <varlistentry os="bg1">
-        <term><parameter>--enable-languages=c,c++</parameter></term>
-        <listitem>
-          <para>This option ensures that only the C and C++ compilers are built.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para os="bh">Continue with compiling the package:</para>
-
-<screen os="bi"><userinput>make AS_FOR_TARGET="${CLFS_TARGET}-as" \
-    LD_FOR_TARGET="${CLFS_TARGET}-ld"</userinput></screen>
-
-    <para os="bj">Install the package:</para>
-
-<screen os="bk"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/common/gcc-static.xml
===================================================================
--- BOOK/cross-tools/common/gcc-static.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,241 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-gcc-static" role="wrap">
-  <?dbhtml filename="gcc-static.html"?>
-
-  <title>Cross GCC-&gcc-version; - Static</title>
-
-  <indexterm zone="ch-cross-tools-gcc-static">
-    <primary sortas="a-GCC">GCC</primary>
-    <secondary>cross tools, static</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Cross GCC Compiler with Static libgcc
-    and no Threads</title>
-
-    <para os="e">Here we will compile GCC, as a cross-compiler that will create
-    executables for our target architecture, statically so that it will not
-    need to look for Glibc's startfiles, which do not yet exist in
-    <filename class="directory">/tools</filename>. We will use this
-    cross-compiler, plus the cross-linker we have just installed with Binutils,
-    to compile Glibc. After Glibc is installed into
-    <filename class="directory">/tools</filename>, we can rebuild GCC
-    so that it will then be able to build executables that link against the
-    libraries in <filename class="directory">/tools</filename>.</para>
-
-<!--GCC Branch Update Area
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <para os="aa">Make a couple of essential adjustments to GCC's specs
-    to ensure GCC uses our build environment:</para>
-
-<screen os="ab"><userinput>patch -Np1 -i ../&gcc-specs-patch;</userinput></screen>
-
-    <para os="ag">Change the StartFile Spec so that GCC looks in
-<filename class="directory">/tools</filename>:</para>
-
-<screen os="ah"><userinput>echo -en '\n#undef STANDARD_STARTFILE_PREFIX_1\n#define STANDARD_STARTFILE_PREFIX_1 "/tools/lib/"\n' &gt;&gt; gcc/config/linux.h
-echo -en '\n#undef STANDARD_STARTFILE_PREFIX_2\n#define STANDARD_STARTFILE_PREFIX_2 ""\n' &gt;&gt; gcc/config/linux.h</userinput></screen>
-
-    <para os="t1">We will create a dummy <filename>limits.h</filename> so
-    the build will not use the one provided by the host distro:</para>
-
-<screen os="t2"><userinput>touch /tools/include/limits.h</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-<screen os="al"><userinput>AR=ar \
-LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
-../gcc-&gcc-version;/configure \
-    --prefix=/cross-tools \
-    --build=${CLFS_HOST} \
-    --host=${CLFS_HOST} \
-    --target=${CLFS_TARGET} \
-    --with-sysroot=${CLFS} \
-    --with-local-prefix=/tools \
-    --with-native-system-header-dir=/tools/include \
-    --disable-shared \
-    --with-mpfr=/cross-tools \
-    --with-gmp=/cross-tools \
-    --with-isl=/cross-tools \
-    --with-mpc=/cross-tools \
-    --without-headers \
-    --with-newlib \
-    --disable-decimal-float \
-    --disable-libgomp \
-    --disable-libssp \
-    --disable-libatomic \
-    --disable-libitm \
-    --disable-libsanitizer \
-    --disable-libquadmath \
-    --disable-libvtv \
-    --disable-libcilkrts \
-    --disable-libstdc++-v3 \
-    --disable-threads \
-    --disable-multilib \
-    --enable-languages=c \
-    --with-glibc-version=&glibc-version;</userinput></screen>
-
-    <variablelist os="am">
-      <title>The meaning of the new configure options:</title>
-
-      <varlistentry>
-        <term><parameter>--build=${CLFS_HOST}</parameter></term>
-        <listitem>
-          <para>This specifies the system on which the cross-compiler is being
-          built.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--with-local-prefix=/tools</parameter></term>
-        <listitem>
-          <para>The purpose of this switch is to remove <filename
-          class="directory">/usr/local/include</filename> from
-          <command>gcc</command>'s include search path. This is not
-          absolutely essential, however, it helps to minimize the
-          influence of the host system.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--with-native-system-headers-dir=/tools/include</parameter></term>
-        <listitem>
-          <para>This switch ensures that GCC will search for the system headers
-           in <filename class="directory">/tools/include</filename> and that
-           host system headers will not be searched.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--disable-shared</parameter></term>
-        <listitem>
-          <para>This tells GCC not to create a shared library.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--without-headers</parameter></term>
-        <listitem>
-          <para>Disables GCC from using the target's Libc when cross compiling.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--with-newlib</parameter></term>
-        <listitem>
-          <para>This causes GCC to enable the <envar>inhibit_libc</envar> flag,
-          which prevents <filename class="libraryfile">libgcc</filename>
-          from building code that uses libc support.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--disable-decimal-float</parameter></term>
-        <listitem>
-          <para>Disables support for the C decimal floating point extension.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--disable-lib*</parameter></term>
-        <listitem>
-          <para>These options prevent GCC from building a number of libraries
-          that are not needed at this time.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--disable-threads</parameter></term>
-        <listitem>
-          <para>This will prevent GCC from looking for the multi-thread
-          include files, since they haven't been created for this architecture
-          yet. GCC will be able to find the multi-thread information after
-          the Glibc headers are created.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--with-system-zlib</parameter></term>
-        <listitem>
-          <para>This tells GCC to link to the system-installed zlib instead
-          of the one in its source tree.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--enable-languages=c</parameter></term>
-        <listitem>
-          <para>This option ensures that only the C compiler is built.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--with-glibc-version=&glibc-version;</parameter></term>
-        <listitem>
-          <para>Needed when bootstrapping a cross toolchain without the header
-          files available for building the initial bootstrap compiler.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para os="an">Continue with compiling the package:</para>
-
-<screen os="ao"><userinput>make all-gcc all-target-libgcc</userinput></screen>
-
-    <variablelist os="ap">
-      <title>The meaning of the new make options:</title>
-
-      <varlistentry>
-        <term><parameter>all-gcc all-target-libgcc</parameter></term>
-        <listitem>
-          <para>Compiles only the parts of GCC that are needed at this time,
-          rather than the full package.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para os="aq">Install the package:</para>
-
-<screen os="ar"><userinput>make install-gcc install-target-libgcc</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/common/glibc.xml
===================================================================
--- BOOK/cross-tools/common/glibc.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,157 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-glibc" role="wrap">
-  <?dbhtml filename="glibc.html"?>
-
-  <title>Glibc-&glibc-version;</title>
-
-  <indexterm zone="ch-cross-tools-glibc">
-    <primary sortas="a-Glibc">Glibc</primary>
-    <secondary>cross tools</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/glibc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Glibc</title>
-
-    <para os="da">It should be noted that compiling Glibc in any way other than
-    the method suggested in this book puts the stability of the system at
-    risk.</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/glibc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/glibc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/glibc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-<screen os="df"><userinput>BUILD_CC="gcc" \
-CC="${CLFS_TARGET}-gcc" \
-AR="${CLFS_TARGET}-ar" \
-RANLIB="${CLFS_TARGET}-ranlib" \
-../glibc-&glibc-version;/configure \
-    --prefix=/tools \
-    --host=${CLFS_TARGET} \
-    --build=${CLFS_HOST} \
-    --enable-kernel=&glibc-kernel-version; \
-    --with-binutils=/cross-tools/bin \
-    --with-headers=/tools/include \
-    --enable-obsolete-rpc</userinput></screen>
-
-    <variablelist os="dg">
-      <title>The meaning of the new configure options:</title>
-
-      <varlistentry os="dg1">
-        <term><parameter>BUILD_CC="gcc"</parameter></term>
-        <listitem>
-          <para>This sets Glibc to use the current compiler on our system. This is
-          used to create the tools Glibc uses during its build.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="dg2">
-        <term><parameter>CC="${CLFS_TARGET}-gcc"</parameter></term>
-        <listitem>
-          <para>This forces Glibc to use the GCC compiler that we made for our target
-          architecture.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="dg3">
-        <term><parameter>AR="${CLFS_TARGET}-ar"</parameter></term>
-        <listitem>
-          <para>This forces Glibc to use the <command>ar</command> utility
-          we made for our target architecture.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="dg4">
-        <term><parameter>RANLIB="${CLFS_TARGET}-ranlib"</parameter></term>
-        <listitem>
-          <para>This forces Glibc to use the <command>ranlib</command> utility
-          we made for our target architecture.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="dg5">
-        <term><parameter>--enable-kernel=&glibc-kernel-version;</parameter></term>
-        <listitem>
-          <para>This tells Glibc to compile the library with support
-          for &glibc-kernel-version; and later Linux kernels.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="dg6">
-        <term><parameter>--with-binutils=/cross-tools/bin</parameter></term>
-        <listitem>
-          <para>This tells Glibc to use the Binutils that are specific to
-          our target architecture.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="dg7">
-        <term><parameter>--with-headers=/tools/include</parameter></term>
-        <listitem>
-          <para>This tells Glibc to compile itself against the headers
-          recently installed to the <filename class="directory">/tools</filename>
-          directory, so that it knows exactly what features the kernel has
-          and can optimize itself accordingly.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="dg8">
-        <term><parameter>--enable-obsolete-rpc</parameter></term>
-        <listitem>
-          <para>This tells Glibc to install rpc headers that are not installed
-          by default but may be needed by other packages.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para os="dh">During this stage the following warning might appear:</para>
-
-<blockquote os="di"><screen><computeroutput>configure: WARNING:
-*** These auxiliary programs are missing or
-*** incompatible versions: msgfmt
-*** some features will be disabled.
-*** Check the INSTALL file for required versions.</computeroutput></screen></blockquote>
-
-    <para os="dj">The missing or incompatible <command>msgfmt</command> program is
-    generally harmless. This <command>msgfmt</command> program is part of the
-    Gettext package which the host distribution should provide. You might also
-    see a similar (also harmless) message about missing
-    <command>autoconf</command>.</para>
-
-    <para os="dk">Compile the package:</para>
-
-<screen os="dl"><userinput>make</userinput></screen>
-
-    <para os="dm">Install the package:</para>
-
-<screen os="dn"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-glibc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/common/gmp.xml
===================================================================
--- BOOK/cross-tools/common/gmp.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,84 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-gmp" role="wrap">
-  <?dbhtml filename="gmp.html"?>
-
-  <title>GMP-&gmp-version;</title>
-
-  <indexterm zone="ch-cross-tools-gmp">
-    <primary sortas="a-GMP">GMP</primary>
-    <secondary>cross tools</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/gmp.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GMP</title>
-
-<!--
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gmp.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gmp.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <para>This package and the next two - MPFR and MPC - will be installed
-    into <filename class="directory">/cross-tools</filename> because GCC
-    requires them to build.</para>
-
-    <para os="a">Prepare GMP for compilation:</para>
-
-<screen os="b"><userinput>./configure \
-    --prefix=/cross-tools \
-    --enable-cxx \
-    --disable-static</userinput></screen>
-
-    <variablelist os="b1">
-      <title>The meaning of the new configure option:</title>
-
-      <varlistentry>
-        <term><parameter>--enable-cxx</parameter></term>
-        <listitem>
-          <para>This tells GMP to enable C++ support.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--disable-static</parameter></term>
-        <listitem>
-          <para>This tells the GMP package not to compile or install static
-          libraries, which are not needed for the Cross-Tools</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">Install the package:</para>
-
-<screen os="f"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gmp" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/common/introduction.xml
===================================================================
--- BOOK/cross-tools/common/introduction.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,53 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-introduction">
-  <?dbhtml filename="introduction.html"?>
-
-  <title>Introduction</title>
-
-  <para>This chapter shows you how to create cross platform tools.</para>
-
-  <para>If for some reason you have to stop and come back later, remember
-  to use the <command>su - clfs</command> command, and it will setup the
-  build environment that you left.</para>
-
-  <sect2>
-    <title>Common Notes</title>
-
-    <important>
-      <para>Before issuing the build instructions for a package, the package
-      should be unpacked, and a <command>cd</command> into the created
-      directory should be performed.</para>
-    </important>
-
-    <para>Several of the packages are patched before compilation, but only
-    when the patch is needed to circumvent a problem. A patch is often needed
-    in both this and the next chapters, but sometimes in only one or the other.
-    Therefore, do not be concerned if instructions for a downloaded patch seem
-    to be missing. Warning messages about <emphasis>offset</emphasis> or
-    <emphasis>fuzz</emphasis> may also be encountered when applying a patch.
-    Do not worry about these warnings, as the patch was still successfully
-    applied.</para>
-
-    <para>During the compilation of most packages, there will be several
-    warnings that scroll by on the screen. These are normal and can safely
-    be ignored. These warnings are as they appear&mdash;warnings about
-    deprecated, but not invalid, use of the C or C++ syntax. C standards
-    change fairly often, and some packages still use the older standard.
-    This is not a problem, but does prompt the warning.</para>
-
-    <important>
-      <para>After installing each package, both in this and the next chapters,
-      delete its source and build directories, unless specifically instructed
-      otherwise. Deleting the sources prevents mis-configuration
-      when the same package is reinstalled later.</para>
-    </important>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/common/isl.xml
===================================================================
--- BOOK/cross-tools/common/isl.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-isl" role="wrap">
-  <?dbhtml filename="isl.html"?>
-
-  <title>ISL-&isl-version;</title>
-
-  <indexterm zone="ch-cross-tools-isl">
-    <primary sortas="a-ISL">ISL</primary>
-    <secondary>cross tools</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/isl.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of ISL</title>
-
-    <para>We will install ISL to enable extra functionality for GCC.
-    It is not strictly required, but GCC can link to it to enable its
-    new loop generation feature called Graphite.</para>
-
-    <para os="a">Prepare ISL for compilation:</para>
-
-<screen os="b"><userinput>LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
-./configure \
-    --prefix=/cross-tools \
-    --disable-static \
-    --with-gmp-prefix=/cross-tools</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">Install the package:</para>
-
-<screen os="f"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-isl" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/common/m4.xml
===================================================================
--- BOOK/cross-tools/common/m4.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,54 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-m4" role="wrap">
-  <?dbhtml filename="m4.html"?>
-
-  <title>M4-&m4-version;</title>
-
-  <indexterm zone="ch-cross-tools-m4">
-    <primary sortas="a-M4">M4</primary>
-    <secondary>cross tools</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/m4.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of M4</title>
-
-    <para>M4 is required to build GMP. We will compile and install an
-    <command>m4</command> program into
-    <filename class="directory">/cross-tools</filename>, so that we have a
-    known-good version which can be used to build GMP, both in
-    Cross-Tools and the Temporary System.</para>
-
-    <para os="a">Prepare M4 for compilation:</para>
-
-<screen os="b"><userinput>./configure \
-    --prefix=/cross-tools</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">Install the package:</para>
-
-<screen os="f"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-m4" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/common/mpc.xml
===================================================================
--- BOOK/cross-tools/common/mpc.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,52 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-mpc" role="wrap">
-  <?dbhtml filename="mpc.html"?>
-
-  <title>MPC-&mpc-version;</title>
-
-  <indexterm zone="ch-cross-tools-mpc">
-    <primary sortas="a-MPC">MPC</primary>
-    <secondary>cross tools</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/mpc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of MPC</title>
-
-    <para os="a">Prepare MPC for compilation:</para>
-
-<screen os="b"><userinput>LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
-./configure \
-    --prefix=/cross-tools \
-    --disable-static \
-    --with-gmp=/cross-tools \
-    --with-mpfr=/cross-tools</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">Install the package:</para>
-
-<screen os="f"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-mpc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/common/mpfr.xml
===================================================================
--- BOOK/cross-tools/common/mpfr.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,79 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-mpfr" role="wrap">
-  <?dbhtml filename="mpfr.html"?>
-
-  <title>MPFR-&mpfr-version;</title>
-
-  <indexterm zone="ch-cross-tools-mpfr">
-    <primary sortas="a-MPFR">MPFR</primary>
-    <secondary>cross tools</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/mpfr.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of MPFR</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/mpfr.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/mpfr.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <para os="a">Prepare MPFR for compilation:</para>
-
-<screen os="b"><userinput>LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
-./configure \
-    --prefix=/cross-tools \
-    --disable-static \
-    --with-gmp=/cross-tools</userinput></screen>
-
-    <variablelist os="b1">
-      <title>The meaning of the new configure options:</title>
-
-      <varlistentry>
-        <term><parameter>LDFLAGS="-Wl,-rpath,/cross-tools/lib"</parameter></term>
-        <listitem>
-          <para>This tells <command>configure</command> to search in
-          <filename class="directory">/cross-tools</filename> for libraries.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--with-gmp=/cross-tools</parameter></term>
-        <listitem>
-          <para>This tells <command>configure</command> where to find GMP.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">Install the package:</para>
-
-<screen os="f"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-mpfr" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/common/ncurses.xml
===================================================================
--- BOOK/cross-tools/common/ncurses.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,83 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-ncurses" role="wrap">
-  <?dbhtml filename="ncurses.html"?>
-
-  <title>Ncurses-&ncurses-version;</title>
-
-  <indexterm zone="ch-cross-tools-ncurses">
-    <primary sortas="a-Ncurses">Ncurses</primary>
-    <secondary>cross tools</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/ncurses.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Ncurses</title>
-
-    <para os="e1">When Ncurses is compiled, it executes <command>tic</command>
-    to create a terminfo database in
-    <filename class="directory">${prefix}/share/terminfo</filename>. If
-    possible, the <filename>Makefile</filename> will use the
-    <command>tic</command> binary that was just compiled in its
-    source tree, but this does not work when Ncurses is cross-compiled. To
-    allow the Ncurses build in <xref linkend="chapter-temp-system" /> to succeed, we
-    will build and install a <command>tic</command> program that can be run on
-    the host system.</para>
-
-<!--Ncurses Branch Update Area
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../temp-system/common/ncurses.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../temp-system/common/ncurses.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <para os="a">Prepare Ncurses for compilation:</para>
-
-<screen os="b"><userinput>AWK=gawk ./configure \
-    --prefix=/cross-tools \
-    --without-debug</userinput></screen>
-
-    <variablelist os="b1">
-      <title>The meaning of the new configure options:</title>
-
-      <varlistentry os="b2">
-        <term><parameter>--without-debug</parameter></term>
-        <listitem>
-          <para>Tells Ncurses to build without debugging information.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para os="c">Only one binary is needed for the Cross-Tools. Build the
-    headers and then build <command>tic</command>:</para>
-
-<screen os="d"><userinput>make -C include
-make -C progs tic</userinput></screen>
-
-    <para os="e">Install <command>tic</command> with the following command:</para>
-
-<screen os="f"><userinput>install -v -m755 progs/tic /cross-tools/bin</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-ncurses" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/common/pkg-config-lite.xml
===================================================================
--- BOOK/cross-tools/common/pkg-config-lite.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,86 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-pkg-config-lite" role="wrap">
-  <?dbhtml filename="pkg-config-lite.html"?>
-
-  <title>Pkg-config-lite-&pkg-config-lite-version;</title>
-
-  <indexterm zone="ch-cross-tools-pkg-config-lite">
-    <primary sortas="a-Pkg-config-lite">Pkg-config-lite</primary>
-    <secondary>cross tools</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/pkg-config-lite.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Pkg-config-lite</title>
-
-    <para os="a">Several packages in the temporary system will use
-    <command>pkg-config</command> to find various required and optional
-    dependencies. Unfortunately, this could result in those packages
-    finding libraries on the host system and trying to link against them,
-    which will not work. To avoid this problem, we will install
-    a <command>pkg-config</command> binary in
-    <filename class="directory">/cross-tools</filename> and configure it so
-    that it will look for Pkg-config files only in
-    <filename class="directory">/tools</filename>.</para>
-
-    <para os="b">Prepare Pkg-config-lite for compilation:</para>
-
-<screen os="c"><userinput>./configure \
-    --prefix=/cross-tools \
-    --host=${CLFS_TARGET} \
-    --with-pc-path=/tools/lib/pkgconfig:/tools/share/pkgconfig</userinput></screen>
-
-    <variablelist os="d">
-      <title>The meaning of the new configure option:</title>
-
-      <varlistentry>
-        <term><parameter>--host=${CLFS_TARGET}</parameter></term>
-        <listitem>
-          <para>Several packages that we will cross-compile later will try to
-          search for <command>${CLFS_TARGET}-pkg-config</command>. Setting
-          this option ensures that Pkg-config-lite will create a hard
-          link in <filename class="directory">/cross-tools/bin</filename> with
-          this name, so that it will be used instead of any similarly-named
-          program that might exist on the host.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--with-pc-path</parameter></term>
-        <listitem>
-          <para>This sets the default PKG_CONFIG_PATH to
-          <filename class="directory">/tools/lib/pkgconfig</filename> and
-          <filename class="directory">/tools/share/pkgconfig</filename>.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para os="e">Compile the package:</para>
-
-<screen os="f"><userinput>make</userinput></screen>
-
-    <para os="g">Install the package:</para>
-
-<screen os="h"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-pkg-config-lite" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/mips-chapter.xml
===================================================================
--- BOOK/cross-tools/mips-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,29 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-cross-tools" xreflabel="Constructing Cross-Compile Tools">
-  <?dbhtml dir="cross-tools"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing Cross-Compile Tools</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/linux-headers.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/isl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gcc-static.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/glibc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gcc-final.xml"/>
-
-</chapter>
Index: OK/cross-tools/mips/linux-headers.xml
===================================================================
--- BOOK/cross-tools/mips/linux-headers.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,80 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-linux-headers" role="wrap">
-  <?dbhtml filename="linux-headers.html"?>
-
-  <title>Linux-&linux-version2; Headers</title>
-
-  <indexterm zone="ch-cross-tools-linux-headers">
-    <primary sortas="a-Linux Headers">Linux Headers</primary>
-    <secondary>cross tools</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/linux-headers.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Linux Headers</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/linux-headers.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../bootable/x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../bootable/x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/linux-headers.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-<screen os="c"><userinput>make mrproper
-make ARCH=mips headers_check
-make ARCH=mips INSTALL_HDR_PATH=/tools headers_install</userinput></screen>
-
-    <variablelist os="d">
-      <title>The meaning of the make commands:</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/linux-headers.xml"
-    xpointer="xpointer(//*[@os='d1'])"/>
-
-      <varlistentry os="d2">
-        <term><parameter>make ARCH=mips headers_check</parameter></term>
-        <listitem>
-          <para>Sanitizes the raw kernel headers so that they can be used
-          by userspace programs.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="d3">
-        <term><parameter>make ARCH=mips INSTALL_HDR_PATH=/tools headers_install</parameter></term>
-        <listitem>
-          <para>This will install the kernel headers into
-          <filename class="directory">/tools/include</filename>.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-linux-headers" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/mips64-64-chapter.xml
===================================================================
--- BOOK/cross-tools/mips64-64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,29 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-cross-tools" xreflabel="Constructing Cross-Compile Tools">
-  <?dbhtml dir="cross-tools"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing Cross-Compile Tools</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/linux-headers.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/isl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64-64/gcc-static.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/glibc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64-64/gcc-final.xml"/>
-
-</chapter>
Index: OK/cross-tools/mips64-64/gcc-final.xml
===================================================================
--- BOOK/cross-tools/mips64-64/gcc-final.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,125 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-gcc-final" role="wrap">
-  <?dbhtml filename="gcc-final.html"?>
-
-  <title>Cross GCC-&gcc-version; - Final</title>
-
-  <indexterm zone="ch-cross-tools-gcc-final">
-    <primary sortas="a-GCC">GCC</primary>
-    <secondary>cross tools, final</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GCC Cross Compiler</title>
-
-<!--GCC Branch Update Area
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ag'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ah'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-<screen os="bf"><userinput>AR=ar \
-LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
-../gcc-&gcc-version;/configure \
-    --prefix=/cross-tools \
-    --build=${CLFS_HOST} \
-    --target=${CLFS_TARGET} \
-    --host=${CLFS_HOST} \
-    --with-sysroot=${CLFS} \
-    --with-local-prefix=/tools \
-    --with-native-system-header-dir=/tools/include \
-    --disable-static \
-    --enable-languages=c,c++ \
-    --disable-multilib \
-    --with-mpc=/cross-tools \
-    --with-mpfr=/cross-tools \
-    --with-gmp=/cross-tools \
-    --with-isl=/cross-tools \
-    --with-abi=64</userinput></screen>
-
-    <variablelist os="bg">
-      <title>The meaning of the new configure options:</title>
-
-      <varlistentry>
-        <term><parameter>--with-abi=64</parameter></term>
-        <listitem>
-          <para>For MIPS64, GCC defaults to building for the N32 ABI. This
-          option changes the default to 64 bits.</para>
-        </listitem>
-      </varlistentry>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../common/gcc-final.xml"
-      xpointer="xpointer(//*[@os='bg1'])"/>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bi'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bk'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/mips64-64/gcc-static.xml
===================================================================
--- BOOK/cross-tools/mips64-64/gcc-static.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,143 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-gcc-static" role="wrap">
-  <?dbhtml filename="gcc-static.html"?>
-
-  <title>Cross GCC-&gcc-version; - Static</title>
-
-  <indexterm zone="ch-cross-tools-gcc-static">
-    <primary sortas="a-GCC">GCC</primary>
-    <secondary>cross tools, static</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Cross GCC Compiler with Static libgcc
-    and no Threads</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-<!--GCC Branch Update Area
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ag'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ah'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='t1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='t2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-<screen os="al"><userinput>AR=ar \
-LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
-../gcc-&gcc-version;/configure \
-    --prefix=/cross-tools \
-    --build=${CLFS_HOST} \
-    --host=${CLFS_HOST} \
-    --target=${CLFS_TARGET} \
-    --with-sysroot=${CLFS} \
-    --with-local-prefix=/tools \
-    --with-native-system-header-dir=/tools/include \
-    --disable-shared \
-    --with-mpfr=/cross-tools \
-    --with-gmp=/cross-tools \
-    --with-isl=/cross-tools \
-    --with-mpc=/cross-tools \
-    --without-headers \
-    --with-newlib \
-    --disable-decimal-float \
-    --disable-libgomp \
-    --disable-libssp \
-    --disable-libatomic \
-    --disable-libitm \
-    --disable-libsanitizer \
-    --disable-libquadmath \
-    --disable-libvtv \
-    --disable-libcilkrts \
-    --disable-libcilkrts \
-    --disable-threads \
-    --disable-multilib \
-    --enable-languages=c \
-    --with-abi=64 \
-    --with-glibc-version=&glibc-version;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='am'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='an'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ao'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ap'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aq'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ar'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/mips64-chapter.xml
===================================================================
--- BOOK/cross-tools/mips64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,31 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-cross-tools" xreflabel="Constructing Cross-Compile Tools">
-  <?dbhtml dir="cross-tools"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing Cross-Compile Tools</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/linux-headers.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/pkg-config-lite.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/isl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gcc-static.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/glibc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/glibc-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/glibc-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gcc-final.xml"/>
-
-</chapter>
Index: OK/cross-tools/mips64/glibc-n32.xml
===================================================================
--- BOOK/cross-tools/mips64/glibc-n32.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,117 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-glibc-n32" role="wrap">
-  <?dbhtml filename="glibc-n32.html"?>
-
-  <title>Glibc-&glibc-version; N32</title>
-
-  <indexterm zone="ch-cross-tools-glibc-n32">
-    <primary sortas="a-Glibc">Glibc</primary>
-    <secondary>cross tools, N32</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/glibc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Glibc</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc.xml"
-    xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <para os="n1">Configure Glibc to install its 32-bit libraries into <filename
-    class="directory">/tools/lib32</filename>:</para>
-
-<screen os="n2"><userinput>echo "libc_cv_slibdir=/tools/lib32" &gt;&gt; config.cache</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-<screen os="df"><userinput>BUILD_CC="gcc" CC="${CLFS_TARGET}-gcc ${BUILDN32}" \
-AR="${CLFS_TARGET}-ar" RANLIB="${CLFS_TARGET}-ranlib" \
-../glibc-&glibc-version;/configure \
-    --prefix=/tools \
-    --host=${CLFS_TARGET} \
-    --build=${CLFS_HOST} \
-    --libdir=/tools/lib32 \
-    --enable-kernel=&glibc-kernel-version; \
-    --with-binutils=/cross-tools/bin \
-    --with-headers=/tools/include \
-    --enable-obsolete-rpc \
-    --cache-file=config.cache</userinput></screen>
-
-    <variablelist os="fa">
-      <title>The meaning of the new configure options:</title>
-
-      <varlistentry os="fa1">
-        <term><parameter>CC="${CLFS_TARGET}-gcc ${BUILDN32}"</parameter></term>
-        <listitem>
-          <para>Forces Glibc to utilize our target architecture GCC utilizing
-          the N32 flags.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--libdir=/tools/lib32</parameter></term>
-        <listitem>
-          <para>Installs Glibc into /tools/lib32 instead of /tools/lib.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc.xml"
-    xpointer="xpointer(//*[@os='dh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc.xml"
-    xpointer="xpointer(//*[@os='di'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc.xml"
-    xpointer="xpointer(//*[@os='dj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc.xml"
-    xpointer="xpointer(//*[@os='dk'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc.xml"
-    xpointer="xpointer(//*[@os='dl'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc.xml"
-    xpointer="xpointer(//*[@os='dm'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc.xml"
-    xpointer="xpointer(//*[@os='dn'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-glibc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/multilib/binutils.xml
===================================================================
--- BOOK/cross-tools/multilib/binutils.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,140 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-binutils" role="wrap">
-  <?dbhtml filename="binutils.html"?>
-
-  <title>Cross Binutils-&binutils-version;</title>
-
-  <indexterm zone="ch-cross-tools-binutils">
-    <primary sortas="a-Binutils">Binutils</primary>
-    <secondary>cross tools</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/binutils.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Cross Binutils</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='da'])"/>
-
-<!-- Branch update patch area
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/binutils.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/binutils.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-<screen os="bc"><userinput>AR=ar AS=as \
-../binutils-&binutils-dir;/configure \
-    --prefix=/cross-tools \
-    --host=${CLFS_HOST} \
-    --target=${CLFS_TARGET} \
-    --with-sysroot=${CLFS} \
-    --with-lib-path=/tools/lib:/tools/lib64 \
-    --disable-nls \
-    --disable-static \
-    --enable-64-bit-bfd \
-    --enable-gold=yes \
-    --enable-plugins \
-    --enable-threads \
-    --disable-werror</userinput></screen>
-
-    <variablelist os="bd">
-      <title>The meaning of the configure options:</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../common/binutils.xml"
-      xpointer="xpointer(//*[@os='bd1'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../common/binutils.xml"
-      xpointer="xpointer(//*[@os='bd2'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../common/binutils.xml"
-      xpointer="xpointer(//*[@os='bd3'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../common/binutils.xml"
-      xpointer="xpointer(//*[@os='bd4'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../common/binutils.xml"
-      xpointer="xpointer(//*[@os='bd5'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../common/binutils.xml"
-      xpointer="xpointer(//*[@os='bd6'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../64/binutils.xml"
-      xpointer="xpointer(//*[@os='bd8'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../64/binutils.xml"
-      xpointer="xpointer(//*[@os='bd9'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../common/binutils.xml"
-      xpointer="xpointer(//*[@os='bd10'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../common/binutils.xml"
-      xpointer="xpointer(//*[@os='bd11'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../common/binutils.xml"
-      xpointer="xpointer(//*[@os='bd12'])"/>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='be'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='bf'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='bh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='bi'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-binutils" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/multilib/gcc-final.xml
===================================================================
--- BOOK/cross-tools/multilib/gcc-final.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,110 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-gcc-final" role="wrap">
-  <?dbhtml filename="gcc-final.html"?>
-
-  <title>Cross GCC-&gcc-version; - Final</title>
-
-  <indexterm zone="ch-cross-tools-gcc-final">
-    <primary sortas="a-GCC">GCC</primary>
-    <secondary>cross tools, final</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GCC Cross Compiler</title>
-
-<!--GCC Branch Update Area
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ag'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ah'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-<screen os="bf"><userinput>AR=ar \
-LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
-../gcc-&gcc-version;/configure \
-    --prefix=/cross-tools \
-    --build=${CLFS_HOST} \
-    --target=${CLFS_TARGET} \
-    --host=${CLFS_HOST} \
-    --with-sysroot=${CLFS} \
-    --with-local-prefix=/tools \
-    --with-native-system-header-dir=/tools/include \
-    --disable-static \
-    --enable-languages=c,c++ \
-    --with-mpc=/cross-tools \
-    --with-mpfr=/cross-tools \
-    --with-gmp=/cross-tools \
-    --with-isl=/cross-tools</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bg'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bi'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bk'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/multilib/gcc-static.xml
===================================================================
--- BOOK/cross-tools/multilib/gcc-static.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,141 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-gcc-static" role="wrap">
-  <?dbhtml filename="gcc-static.html"?>
-
-  <title>Cross GCC-&gcc-version; - Static</title>
-
-  <indexterm zone="ch-cross-tools-gcc-static">
-    <primary sortas="a-GCC">GCC</primary>
-    <secondary>cross tools, static</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Cross GCC Compiler with Static libgcc
-    and no Threads</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-<!--GCC Branch Update Area
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ag'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ah'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='t1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='t2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-<screen os="al"><userinput>AR=ar \
-LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
-../gcc-&gcc-version;/configure \
-    --prefix=/cross-tools \
-    --build=${CLFS_HOST} \
-    --host=${CLFS_HOST} \
-    --target=${CLFS_TARGET} \
-    --with-sysroot=${CLFS} \
-    --with-local-prefix=/tools \
-    --with-native-system-header-dir=/tools/include \
-    --disable-shared \
-    --with-mpfr=/cross-tools \
-    --with-gmp=/cross-tools \
-    --with-mpc=/cross-tools \
-    --without-headers \
-    --with-newlib \
-    --disable-decimal-float \
-    --disable-libgomp \
-    --disable-libssp \
-    --disable-libatomic \
-    --disable-libitm \
-    --disable-libsanitizer \
-    --disable-libquadmath \
-    --disable-libvtv \
-    --disable-libcilkrts \
-    --disable-libstdc++-v3 \
-    --disable-threads \
-    --with-isl=/cross-tools \
-    --enable-languages=c \
-    --with-glibc-version=&glibc-version;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='am'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='an'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ao'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ap'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aq'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ar'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/multilib/glibc-64bit.xml
===================================================================
--- BOOK/cross-tools/multilib/glibc-64bit.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,117 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-glibc-64" role="wrap">
-  <?dbhtml filename="glibc-64.html"?>
-
-  <title>Glibc-&glibc-version; 64-Bit</title>
-
-  <indexterm zone="ch-cross-tools-glibc-64">
-    <primary sortas="a-Glibc">Glibc</primary>
-    <secondary>cross tools, 64 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/glibc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Glibc</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <para os="n1">Configure Glibc to install its 64-bit libraries into <filename
-    class="directory">/tools/lib64</filename>:</para>
-
-<screen os="n2"><userinput>echo "libc_cv_slibdir=/tools/lib64" &gt;&gt; config.cache</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-<screen os="df"><userinput>BUILD_CC="gcc" CC="${CLFS_TARGET}-gcc ${BUILD64}" \
-AR="${CLFS_TARGET}-ar" RANLIB="${CLFS_TARGET}-ranlib" \
-../glibc-&glibc-version;/configure \
-    --prefix=/tools \
-    --host=${CLFS_TARGET} \
-    --build=${CLFS_HOST} \
-    --libdir=/tools/lib64 \
-    --enable-kernel=&glibc-kernel-version; \
-    --with-binutils=/cross-tools/bin \
-    --with-headers=/tools/include \
-    --enable-obsolete-rpc \
-    --cache-file=config.cache</userinput></screen>
-
-    <variablelist os="dg">
-      <title>The meaning of the new configure options:</title>
-
-      <varlistentry os="fa1">
-        <term><parameter>CC="${CLFS_TARGET}-gcc ${BUILD64}"</parameter></term>
-        <listitem>
-          <para>Forces Glibc to build using our target architecture GCC
-          utilizing the 64 Bit flags.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="fa2">
-        <term><parameter>--libdir=/tools/lib64</parameter></term>
-        <listitem>
-          <para>Puts Glibc into /tools/lib64 instead of /tools/lib.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='dh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='di'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='dj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='dk'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='dl'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='dm'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='dn'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-glibc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/multilib/glibc.xml
===================================================================
--- BOOK/cross-tools/multilib/glibc.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,131 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-glibc" role="wrap">
-  <?dbhtml filename="glibc.html"?>
-
-  <title>Glibc-&glibc-version; 32 Bit</title>
-
-  <indexterm zone="ch-cross-tools-glibc">
-    <primary sortas="a-Glibc">Glibc</primary>
-    <secondary>cross tools, 32 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/glibc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Glibc</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-<screen os="df"><userinput>BUILD_CC="gcc" CC="${CLFS_TARGET}-gcc ${BUILD32}" \
-AR="${CLFS_TARGET}-ar" RANLIB="${CLFS_TARGET}-ranlib" \
-../glibc-&glibc-version;/configure \
-    --prefix=/tools \
-    --host=${CLFS_TARGET32} \
-    --build=${CLFS_HOST} \
-    --enable-kernel=&glibc-kernel-version; \
-    --with-binutils=/cross-tools/bin \
-    --with-headers=/tools/include \
-    --enable-obsolete-rpc</userinput></screen>
-
-    <variablelist os="dg">
-      <title>The meaning of the new configure options:</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg1'])"/>
-
-      <varlistentry os="ea1">
-        <term><parameter>CC="${CLFS_TARGET}-gcc ${BUILD32}"</parameter></term>
-        <listitem>
-          <para>Forces Glibc to utilize our target architecture GCC utilizing
-          the 32 Bit flags.</para>
-        </listitem>
-      </varlistentry>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg3'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg4'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg5'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg6'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg7'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg8'])"/>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='di'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dk'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dl'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dm'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dn'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-glibc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/multilib/pkg-config-lite.xml
===================================================================
--- BOOK/cross-tools/multilib/pkg-config-lite.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,88 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-pkg-config-lite" role="wrap">
-  <?dbhtml filename="pkg-config-lite.html"?>
-
-  <title>Pkg-config-lite-&pkg-config-lite-version;</title>
-
-  <indexterm zone="ch-cross-tools-pkg-config-lite">
-    <primary sortas="a-Pkg-config-lite">Pkg-config-lite</primary>
-    <secondary>cross tools</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/pkg-config-lite.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Pkg-config-lite</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/pkg-config-lite.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/pkg-config-lite.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-<screen os="c"><userinput>./configure \
-    --prefix=/cross-tools \
-    --host=${CLFS_TARGET} \
-    --with-pc-path=/tools/lib64/pkgconfig:/tools/share/pkgconfig</userinput></screen>
-
-    <variablelist os="d">
-      <title>The meaning of the new configure option:</title>
-
-      <varlistentry>
-        <term><parameter>--host=${CLFS_TARGET}</parameter></term>
-        <listitem>
-          <para>This option makes sure the installation includes the proper
-          <command>{$CLFS_TARGET}-pkg-config</command> to be detected and used
-          when cross-compiling some tools in the temporary system and boot
-          chapter.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--with-pc-path</parameter></term>
-        <listitem>
-          <para>This sets the default PKG_CONFIG_PATH to
-          <filename class="directory">/tools/lib64/pkgconfig</filename> and
-          <filename class="directory">/tools/share/pkgconfig</filename>.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/pkg-config-lite.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/pkg-config-lite.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/pkg-config-lite.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/pkg-config-lite.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-pkg-config-lite" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/ppc-chapter.xml
===================================================================
--- BOOK/cross-tools/ppc-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,29 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-cross-tools" xreflabel="Constructing Cross-Compile Tools">
-  <?dbhtml dir="cross-tools"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing Cross-Compile Tools</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/linux-headers.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/isl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/gcc-static.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/glibc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/gcc-final.xml"/>
-
-</chapter>
Index: OK/cross-tools/ppc/gcc-final.xml
===================================================================
--- BOOK/cross-tools/ppc/gcc-final.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,97 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-gcc-final" role="wrap">
-  <?dbhtml filename="gcc-final.html"?>
-
-  <title>Cross GCC-&gcc-version; - Final</title>
-
-  <indexterm zone="ch-cross-tools-gcc-final">
-    <primary sortas="a-GCC">GCC</primary>
-    <secondary>cross tools, final</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GCC Cross Compiler</title>
-
-<!--GCC Branch Update Area
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ag'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ah'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bf'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bg'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bi'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bk'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/ppc/gcc-static.xml
===================================================================
--- BOOK/cross-tools/ppc/gcc-static.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,113 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-gcc-static" role="wrap">
-  <?dbhtml filename="gcc-static.html"?>
-
-  <title>Cross GCC-&gcc-version; - Static</title>
-
-  <indexterm zone="ch-cross-tools-gcc-static">
-    <primary sortas="a-GCC">GCC</primary>
-    <secondary>cross tools, static</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Cross GCC Compiler with Static libgcc
-    and no Threads</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-<!--GCC Branch Update Area
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ag'])"/>
-
-<screen os="ah"><userinput>echo -en '\n#undef STANDARD_STARTFILE_PREFIX_1\n#define STANDARD_STARTFILE_PREFIX_1 "/tools/lib/"\n' &gt;&gt; gcc/config/rs6000/sysv4.h
-echo -en '\n#undef STANDARD_STARTFILE_PREFIX_2\n#define STANDARD_STARTFILE_PREFIX_2 ""\n' &gt;&gt; gcc/config/rs6000/sysv4.h</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='t1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='t2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='al'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='am'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='an'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ao'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ap'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aq'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ar'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/ppc/linux-headers.xml
===================================================================
--- BOOK/cross-tools/ppc/linux-headers.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,80 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-linux-headers" role="wrap">
-  <?dbhtml filename="linux-headers.html"?>
-
-  <title>Linux-&linux-version2; Headers</title>
-
-  <indexterm zone="ch-cross-tools-linux-headers">
-    <primary sortas="a-Linux Headers">Linux Headers</primary>
-    <secondary>cross tools</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/linux-headers.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Linux Headers</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/linux-headers.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../bootable/x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../bootable/x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/linux-headers.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-<screen os="c"><userinput>make mrproper
-make ARCH=powerpc headers_check
-make ARCH=powerpc INSTALL_HDR_PATH=/tools headers_install</userinput></screen>
-
-    <variablelist os="d">
-      <title>The meaning of the make commands:</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/linux-headers.xml"
-    xpointer="xpointer(//*[@os='d1'])"/>
-
-      <varlistentry os="d2">
-        <term><parameter>make ARCH=powerpc headers_check</parameter></term>
-        <listitem>
-          <para>Sanitizes the raw kernel headers so that they can be used
-          by userspace programs.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="d3">
-        <term><parameter>make ARCH=powerpc INSTALL_HDR_PATH=/tools headers_install</parameter></term>
-        <listitem>
-          <para>This will install the kernel headers into
-          <filename class="directory">/tools/include</filename>.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-linux-headers" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/ppc64-64-chapter.xml
===================================================================
--- BOOK/cross-tools/ppc64-64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,29 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-cross-tools" xreflabel="Constructing Cross-Compile Tools">
-  <?dbhtml dir="cross-tools"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing Cross-Compile Tools</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/linux-headers.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/isl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64-64/gcc-static.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/glibc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64-64/gcc-final.xml"/>
-
-</chapter>
Index: OK/cross-tools/ppc64-64/gcc-final.xml
===================================================================
--- BOOK/cross-tools/ppc64-64/gcc-final.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,97 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-gcc-final" role="wrap">
-  <?dbhtml filename="gcc-final.html"?>
-
-  <title>Cross GCC-&gcc-version; - Final</title>
-
-  <indexterm zone="ch-cross-tools-gcc-final">
-    <primary sortas="a-GCC">GCC</primary>
-    <secondary>cross tools, final</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GCC Cross Compiler</title>
-
-<!--GCC Branch Update Area
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ag'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ah'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bf'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bg'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bi'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bk'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/ppc64-64/gcc-static.xml
===================================================================
--- BOOK/cross-tools/ppc64-64/gcc-static.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,112 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-gcc-static" role="wrap">
-  <?dbhtml filename="gcc-static.html"?>
-
-  <title>Cross GCC-&gcc-version; - Static</title>
-
-  <indexterm zone="ch-cross-tools-gcc-static">
-    <primary sortas="a-GCC">GCC</primary>
-    <secondary>cross tools, static</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Cross GCC Compiler with Static libgcc
-    and no Threads</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-<!--GCC Branch Update Area
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-<screen os="ab"><userinput>patch -Np1 -i ../&gcc-specs_pure64-patch;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ag'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ah'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='t1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='t2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='al'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='am'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='an'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ao'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ap'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aq'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ar'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/ppc64-chapter.xml
===================================================================
--- BOOK/cross-tools/ppc64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,30 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-cross-tools" xreflabel="Constructing Cross-Compile Tools">
-  <?dbhtml dir="cross-tools"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing Cross-Compile Tools</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/linux-headers.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/pkg-config-lite.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/isl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gcc-static.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/glibc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/glibc-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gcc-final.xml"/>
-
-</chapter>
Index: OK/cross-tools/sparc-chapter.xml
===================================================================
--- BOOK/cross-tools/sparc-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,29 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-cross-tools" xreflabel="Constructing Cross-Compile Tools">
-  <?dbhtml dir="cross-tools"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing Cross-Compile Tools</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/linux-headers.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/isl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gcc-static.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/glibc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gcc-final.xml"/>
-
-</chapter>
Index: OK/cross-tools/sparc/linux-headers.xml
===================================================================
--- BOOK/cross-tools/sparc/linux-headers.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,80 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-linux-headers" role="wrap">
-  <?dbhtml filename="linux-headers.html"?>
-
-  <title>Linux-&linux-version2; Headers</title>
-
-  <indexterm zone="ch-cross-tools-linux-headers">
-    <primary sortas="a-Linux Headers">Linux Headers</primary>
-    <secondary>cross tools</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/linux-headers.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Linux Headers</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/linux-headers.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../bootable/x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../bootable/x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/linux-headers.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-<screen os="c"><userinput>make mrproper
-make ARCH=sparc headers_check
-make ARCH=sparc INSTALL_HDR_PATH=/tools headers_install</userinput></screen>
-
-    <variablelist os="d">
-      <title>The meaning of the make commands:</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/linux-headers.xml"
-    xpointer="xpointer(//*[@os='d1'])"/>
-
-      <varlistentry os="d2">
-        <term><parameter>make ARCH=sparc headers_check</parameter></term>
-        <listitem>
-          <para>Sanitizes the raw kernel headers so that they can be used
-          by userspace programs.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="d3">
-        <term><parameter>make ARCH=sparc INSTALL_HDR_PATH=/tools headers_install</parameter></term>
-        <listitem>
-          <para>This will install the kernel headers into
-          <filename class="directory">/tools/include</filename>.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-linux-headers" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/sparc64-64-chapter.xml
===================================================================
--- BOOK/cross-tools/sparc64-64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,29 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-cross-tools" xreflabel="Constructing Cross-Compile Tools">
-  <?dbhtml dir="cross-tools"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing Cross-Compile Tools</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/linux-headers.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/isl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/gcc-static.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64-64/glibc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/gcc-final.xml"/>
-
-</chapter>
Index: OK/cross-tools/sparc64-64/glibc.xml
===================================================================
--- BOOK/cross-tools/sparc64-64/glibc.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,87 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-glibc" role="wrap">
-  <?dbhtml filename="glibc.html"?>
-
-  <title>Glibc-&glibc-version;</title>
-
-  <indexterm zone="ch-cross-tools-glibc">
-    <primary sortas="a-Glibc">Glibc</primary>
-    <secondary>cross tools</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/glibc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Glibc</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../64/glibc.xml"
-    xpointer="xpointer(//*[@os='df'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='dg'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='di'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dk'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dl'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dm'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dn'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-glibc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/sparc64-chapter.xml
===================================================================
--- BOOK/cross-tools/sparc64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,30 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-cross-tools" xreflabel="Constructing Cross-Compile Tools">
-  <?dbhtml dir="cross-tools"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing Cross-Compile Tools</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/linux-headers.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/pkg-config-lite.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/isl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gcc-static.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/glibc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/glibc-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gcc-final.xml"/>
-
-</chapter>
Index: OK/cross-tools/sparc64/glibc-64bit.xml
===================================================================
--- BOOK/cross-tools/sparc64/glibc-64bit.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,104 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-glibc-64" role="wrap">
-  <?dbhtml filename="glibc-64.html"?>
-
-  <title>Glibc-&glibc-version; 64-Bit</title>
-
-  <indexterm zone="ch-cross-tools-glibc-64">
-    <primary sortas="a-Glibc">Glibc</primary>
-    <secondary>cross tools, 64 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/glibc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Glibc</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <para os="dd">Add the following variables to <filename>config.cache</filename> so they are set properly:</para>
-
-<screen os="de"><userinput>cat &gt; config.cache &lt;&lt; "EOF"
-libc_cv_forced_unwind=yes
-libc_cv_c_cleanup=yes
-libc_cv_sparc64_tls=yes
-libc_cv_gnu89_inline=yes
-EOF</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='n1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='n2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='df'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='dg'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='di'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dk'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dl'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dm'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dn'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-glibc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/sparc64/linux-headers.xml
===================================================================
--- BOOK/cross-tools/sparc64/linux-headers.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,80 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-linux-headers" role="wrap">
-  <?dbhtml filename="linux-headers.html"?>
-
-  <title>Linux-&linux-version2; Headers</title>
-
-  <indexterm zone="ch-cross-tools-linux-headers">
-    <primary sortas="a-Linux Headers">Linux Headers</primary>
-    <secondary>cross tools</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/linux-headers.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Linux Headers</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/linux-headers.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../bootable/x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../bootable/x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/linux-headers.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-<screen os="c"><userinput>make mrproper
-make ARCH=sparc64 headers_check
-make ARCH=sparc64 INSTALL_HDR_PATH=/tools headers_install</userinput></screen>
-
-    <variablelist os="d">
-      <title>The meaning of the make commands:</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/linux-headers.xml"
-    xpointer="xpointer(//*[@os='d1'])"/>
-
-      <varlistentry os="d2">
-        <term><parameter>make ARCH=sparc64 headers_check</parameter></term>
-        <listitem>
-          <para>Sanitizes the raw kernel headers so that they can be used
-          by userspace programs.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="d3">
-        <term><parameter>make ARCH=sparc64 INSTALL_HDR_PATH=/tools headers_install</parameter></term>
-        <listitem>
-          <para>This will install the kernel headers into
-          <filename class="directory">/tools/include</filename>.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-linux-headers" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/x86-chapter.xml
===================================================================
--- BOOK/cross-tools/x86-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,29 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-cross-tools" xreflabel="Constructing Cross-Compile Tools">
-  <?dbhtml dir="cross-tools"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing Cross-Compile Tools</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/linux-headers.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/isl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gcc-static.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/glibc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gcc-final.xml"/>
-
-</chapter>
Index: OK/cross-tools/x86/linux-headers.xml
===================================================================
--- BOOK/cross-tools/x86/linux-headers.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,80 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-linux-headers" role="wrap">
-  <?dbhtml filename="linux-headers.html"?>
-
-  <title>Linux-&linux-version2; Headers</title>
-
-  <indexterm zone="ch-cross-tools-linux-headers">
-    <primary sortas="a-Linux Headers">Linux Headers</primary>
-    <secondary>cross tools</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/linux-headers.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Linux Headers</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/linux-headers.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../bootable/x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../bootable/x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/linux-headers.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-<screen os="c"><userinput>make mrproper
-make ARCH=i386 headers_check
-make ARCH=i386 INSTALL_HDR_PATH=/tools headers_install</userinput></screen>
-
-    <variablelist os="d">
-      <title>The meaning of the make commands:</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/linux-headers.xml"
-    xpointer="xpointer(//*[@os='d1'])"/>
-
-      <varlistentry os="d2">
-        <term><parameter>make ARCH=i386 headers_check</parameter></term>
-        <listitem>
-          <para>Sanitizes the raw kernel headers so that they can be used
-          by userspace programs.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="d3">
-        <term><parameter>make ARCH=i386 INSTALL_HDR_PATH=/tools headers_install</parameter></term>
-        <listitem>
-          <para>This will install the kernel headers into
-          <filename class="directory">/tools/include</filename>.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-linux-headers" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/x86_64-64-chapter.xml
===================================================================
--- BOOK/cross-tools/x86_64-64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,29 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-cross-tools" xreflabel="Constructing Cross-Compile Tools">
-  <?dbhtml dir="cross-tools"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing Cross-Compile Tools</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/linux-headers.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/isl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/gcc-static.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/glibc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/gcc-final.xml"/>
-
-</chapter>
Index: OK/cross-tools/x86_64-chapter.xml
===================================================================
--- BOOK/cross-tools/x86_64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,30 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-cross-tools" xreflabel="Constructing Cross-Compile Tools">
-  <?dbhtml dir="cross-tools"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing Cross-Compile Tools</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/linux-headers.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/pkg-config-lite.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/isl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gcc-static.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/glibc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/glibc-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gcc-final.xml"/>
-
-</chapter>
Index: OK/cross-tools/x86_64/linux-headers.xml
===================================================================
--- BOOK/cross-tools/x86_64/linux-headers.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,80 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-linux-headers" role="wrap">
-  <?dbhtml filename="linux-headers.html"?>
-
-  <title>Linux-&linux-version2; Headers</title>
-
-  <indexterm zone="ch-cross-tools-linux-headers">
-    <primary sortas="a-Linux Headers">Linux Headers</primary>
-    <secondary>cross tools</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/linux-headers.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Linux Headers</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/linux-headers.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../bootable/x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../bootable/x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/linux-headers.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-<screen os="c"><userinput>make mrproper
-make ARCH=x86_64 headers_check
-make ARCH=x86_64 INSTALL_HDR_PATH=/tools headers_install</userinput></screen>
-
-    <variablelist os="d">
-      <title>The meaning of the make commands:</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/linux-headers.xml"
-    xpointer="xpointer(//*[@os='d1'])"/>
-
-      <varlistentry os="d2">
-        <term><parameter>make ARCH=x86_64 headers_check</parameter></term>
-        <listitem>
-          <para>Sanitizes the raw kernel headers so that they can be used
-          by userspace programs.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="d3">
-        <term><parameter>make ARCH=x86_64 INSTALL_HDR_PATH=/tools headers_install</parameter></term>
-        <listitem>
-          <para>This will install the kernel headers into
-          <filename class="directory">/tools/include</filename>.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-linux-headers" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/editor-tools/Clean-spaces.sh
===================================================================
--- BOOK/editor-tools/Clean-spaces.sh	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,43 +1,0 @@
-#!/bin/bash -e
-
-# This script will clean the trailing spaces on the given file
-# or in all XML files under the given directory.
-
-NAME=`basename $0`
-
-if [ -z "$1" ]; then
-  echo "USAGE: $NAME -d directory"
-  echo "       $NAME -f file"
-  exit;
-fi
-
-case "$1" in
-  -d )
-
-    if [ -z "$2" ]; then
-      echo "A directory is needed"
-      exit
-    fi;
-
-    for filename in `find $2 -name "*.xml"`; do
-      sed  -i -e "s/[[:space:]]\+$//" "${filename}"
-    done;
-    exit;;
-
-  -f )
-
-    if [ -z "$2" ]; then
-      echo "A filename is needed"
-      exit
-    fi
-
-    sed  -i -e "s/[[:space:]]\+$//" $2
-    exit;;
-
-  * )
-
-    echo "USAGE: $NAME -d directory"
-    echo "       $NAME -f file"
-    exit;;
-
-esac
Index: OK/editor-tools/Find-files.sh
===================================================================
--- BOOK/editor-tools/Find-files.sh	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,18 +1,0 @@
-#!/bin/bash
-
-# This script will find all XML files in the working repository copy
-# that contains the same string in their name.
-
-# To be executed from the top-level directory.
-
-# Useful to find the files related with a same package in all
-# directories and architectures.
-
-NAME=`basename $0`
-
-if [ -z "$1" ]; then
-  echo "USAGE: $NAME string"
-  exit
-fi
-
-find . -name "*$1*.xml" | sort
Index: OK/editor-tools/Xinclude-resolver.sh
===================================================================
--- BOOK/editor-tools/Xinclude-resolver.sh	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,28 +1,0 @@
-#!/bin/bash
-
-# This script will create a copy of the given XML file
-# with the Xinclude tags resolved.
-
-# Must be executed from the same dir where the XML file
-# to be resolved is found.
-
-# The DTD declaration is removed from the output due that
-# xmllint add also the full set of entities.
-
-# Useful to see the actual text and commands and to know
-# in what files the Xincluded blocks are actually placed.
-
-# Remember to remove the full-*xml files after finished
-# your review of that files. They don't be commited to the
-# SVN repository.
-
-NAME=`basename $0`
-
-if [ -z "$1" ]; then
-  echo "USAGE: $NAME filename.xml"
-  exit
-fi
-
-xmllint -xinclude -output /tmp/temp.xml $1
-
-xmllint -dropdtd -output full-$1 /tmp/temp.xml
Index: OK/filesize.sh
===================================================================
--- BOOK/filesize.sh	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,19 +1,0 @@
-#!/bin/bash
-
-FILENAME=$1
-
-if [ "${FILENAME}" = ""  ]; then
-  echo "To Calculate the proper file size use the following command."
-  echo "$0 filename"
-  exit 255
-else
-  FILESIZE=$(ls -l ${FILENAME} | cut -f5 -d' ')
-  ((size=${FILESIZE}/1024))
-  if [ "${size}" = "0" ]; then
-    size=$(echo .$(echo ${FILESIZE} | cut -b1))
-  fi
-  FILEMD5SUM=$(md5sum ${FILENAME})
-
-  echo "${size} KB"
-  echo "${FILEMD5SUM}"
-fi
Index: OK/final-preps/common/abouttestsuites.xml
===================================================================
--- BOOK/final-preps/common/abouttestsuites.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-final-preps-abouttestsuites">
-  <?dbhtml filename="abouttestsuites.html"?>
-
-  <title>About the Test Suites</title>
-
-  <para>Most packages provide a test suite, usually a script or
-  <command>make</command> target, which tests the just-compiled programs or
-  libraries by executing or linking to them. Test suites are often useful
-  for verifying that a package compiled correctly. However, they cannot
-  be run while cross-compiling so we will not mention test suite commands
-  for any packages until <xref linkend="chapter-building-system"/>.</para>
-
-</sect1>
Index: OK/final-preps/common/addinguser.xml
===================================================================
--- BOOK/final-preps/common/addinguser.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,118 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-final-preps-addinguser">
-  <?dbhtml filename="addinguser.html"?>
-
-  <title>Adding the CLFS User</title>
-
-  <para>When logged in as user <systemitem class="username">root</systemitem>,
-  making a single mistake can damage or destroy a system. Therefore, we
-  recommend building the packages as an unprivileged user.
-  You could use your own user name, but to make it easier to set up a clean
-  work environment, create a new user called <systemitem
-  class="username">clfs</systemitem> as a member of a new group (also named
-  <systemitem class="groupname">clfs</systemitem>) and use this user during
-  the installation process. As <systemitem class="username">root</systemitem>,
-  issue the following commands to add the new user:</para>
-
-<screen><userinput>groupadd clfs
-useradd -s /bin/bash -g clfs -d /home/clfs clfs
-mkdir -pv /home/clfs
-chown -v clfs:clfs /home/clfs</userinput></screen>
-
-  <variablelist>
-    <title>The meaning of the command line options:</title>
-
-    <varlistentry>
-      <term><parameter>-s /bin/bash</parameter></term>
-      <listitem>
-        <para>This makes <command>bash</command> the default shell for
-        user <systemitem class="username">clfs</systemitem>.</para>
-
-        <important>
-          <para>The build instructions assume that the <command>bash</command>
-          shell is in use.</para>
-        </important>
-
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><parameter>-g clfs</parameter></term>
-      <listitem>
-        <para>This option adds the new user to the
-        <systemitem class="groupname">clfs</systemitem> group.</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><parameter>-d /home/clfs</parameter></term>
-      <listitem>
-        <para>This option sets the user's home directory, but does not create
-        it. We could have used <option>-m</option> to tell
-        <command>useradd</command> to create the directory as well, but this
-        would also copy the contents of the host system's
-        <filename class="directory">/etc/skel</filename> directory into the new
-        user's home. We would prefer to have a clean user environment, so we
-        just create an empty directory after adding the user.</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><parameter>clfs</parameter></term>
-      <listitem>
-        <para>This is the actual name for the created group and user.</para>
-      </listitem>
-    </varlistentry>
-
-  </variablelist>
-
-  <para>To log in as <systemitem class="username">clfs</systemitem> (as
-  opposed to switching to user <systemitem class="username">clfs</systemitem>
-  when logged in as <systemitem class="username">root</systemitem>, which
-  does not require the <systemitem class="username">clfs</systemitem> user
-  to have a password), give <systemitem class="username">clfs</systemitem>
-  a password:</para>
-
-<screen><userinput>passwd clfs</userinput></screen>
-
-  <para>As <systemitem class="username">root</systemitem>,
-  grant <systemitem class="username">clfs</systemitem> full access to
-  <filename class="directory">${CLFS}/cross-tools</filename> and
-  <filename class="directory">${CLFS}/tools</filename> by making <systemitem
-  class="username">clfs</systemitem> the directorys' owner:</para>
-
-<screen><userinput>chown -v clfs ${CLFS}/tools
-chown -v clfs ${CLFS}/cross-tools</userinput></screen>
-
-  <para>If a separate working directory was created as suggested, run the
-  following command as <systemitem class="username">root</systemitem> to
-  give user <systemitem class="username">clfs</systemitem> ownership of this
-  directory as well:</para>
-
-<screen><userinput>chown -v clfs ${CLFS}/sources</userinput></screen>
-
-  <para>Next, login as user <systemitem class="username">clfs</systemitem>.
-  This can be done via a virtual console, through a display manager, or
-  with the following substitute user command:</para>
-
-<screen><userinput>su - clfs</userinput></screen>
-
-  <para>The <quote><parameter>-</parameter></quote> instructs
-  <command>su</command> to start a login shell as opposed to a non-login
-  shell. The difference between these two types of shells can be found
-  in detail in <filename>bash(1)</filename> and <command>info
-  bash</command>.</para>
-
-  <note>
-    <para>Until specified otherwise, all commands from this point on
-    should be done as the <systemitem class="username">clfs</systemitem>
-    user.</para>
-  </note>
-
-</sect1>
Index: OK/final-preps/common/creatingcrossdir.xml
===================================================================
--- BOOK/final-preps/common/creatingcrossdir.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,33 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-final-preps-creatingcrossdir">
-  <?dbhtml filename="creatingcrossdir.html"?>
-
-  <title>Creating the ${CLFS}/cross-tools Directory</title>
-
-  <para>The cross-binutils and cross-compiler built in
-  <xref linkend="chapter-cross-tools"/> will be installed under
-  <filename class="directory">${CLFS}/cross-tools</filename> to keep them
-  separate from the host programs. The programs compiled here are
-  cross-tools and will not be a part of the final CLFS system or the
-  temp-system. By keeping these programs in a separate directory, they
-  can easily be discarded later after their use.</para>
-
-  <para>Create the required directory by running the following as
-  <systemitem class="username">root</systemitem>:</para>
-
-<screen><userinput>install -dv ${CLFS}/cross-tools</userinput></screen>
-
-  <para>The next step is to create a <filename
-  class="symlink">/cross-tools</filename> symlink on the host system.
-  This will point to the newly-created directory on the CLFS partition.
-  Run this command as  <systemitem class="username">root</systemitem> as well:</para>
-
-<screen><userinput>ln -sv ${CLFS}/cross-tools /</userinput></screen>
-
-</sect1>
Index: OK/final-preps/common/creatingtoolsdir.xml
===================================================================
--- BOOK/final-preps/common/creatingtoolsdir.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,47 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-final-preps-creatingtoolsdir">
-  <?dbhtml filename="creatingtoolsdir.html"?>
-
-  <title>Creating the ${CLFS}/tools Directory</title>
-
-  <para>All programs compiled in <xref linkend="chapter-temp-system"/>
-  will be installed under <filename class="directory">${CLFS}/tools</filename>
-  to keep them separate from the programs compiled in <xref
-  linkend="chapter-building-system"/>. The programs compiled here are
-  temporary tools and will not be a part of the final CLFS system. By keeping
-  these programs in a separate directory, they can easily be discarded later
-  after their use. This also prevents these programs from ending up in the
-  host production directories (easy to do by accident in <xref
-  linkend="chapter-temp-system"/>).</para>
-
-  <para>Create the required directory by running the following as
-  <systemitem class="username">root</systemitem>:</para>
-
-<screen><userinput>install -dv ${CLFS}/tools</userinput></screen>
-
-  <para>The next step is to create a <filename class="symlink">/tools</filename>
-  symlink on the host system. This will point to the newly-created directory
-  on the CLFS partition. Run this command as <systemitem
-  class="username">root</systemitem> as well:</para>
-
-<screen><userinput>ln -sv ${CLFS}/tools /</userinput></screen>
-
-  <note>
-    <para>The above command is correct. The <command>ln</command> command
-    has a few syntactic variations, so be sure to check <command>info
-    coreutils ln</command> and <filename>ln(1)</filename> before reporting
-    what you may think is an error.</para>
-  </note>
-
-  <para>The created symlink enables the toolchain to be compiled so that
-  it always refers to <filename class="directory">/tools</filename>,
-  meaning that the compiler, assembler, and linker will work. This will
-  provide a common place for our temporary tools system.</para>
-
-</sect1>
Index: OK/final-preps/common/introduction.xml
===================================================================
--- BOOK/final-preps/common/introduction.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,19 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-final-preps-introduction">
-  <?dbhtml filename="introduction.html"?>
-
-  <title>Introduction</title>
-
-  <para>In this chapter, we will perform a few additional tasks to prepare
-  for building the cross-compile tools. We will create directories in
-  <filename class="directory">${CLFS}</filename> for the installation of the
-  cross-toolchain and temporary system, add an unprivileged user to reduce risk,
-  and create an appropriate build environment for that user.</para>
-
-</sect1>
Index: OK/final-preps/common/settingenviron.xml
===================================================================
--- BOOK/final-preps/common/settingenviron.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,95 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-final-preps-settingenviron">
-  <?dbhtml filename="settingenvironment.html"?>
-
-  <title>Setting Up the Environment</title>
-
-  <para os="a">Set up a good working environment by creating two new startup
-  files for the <command>bash</command> shell. While logged in as user
-  <systemitem class="username">clfs</systemitem>, issue the following
-  command to create a new <filename>.bash_profile</filename>:</para>
-
-<screen os="b"><userinput>cat &gt; ~/.bash_profile &lt;&lt; "EOF"
-<literal>exec env -i HOME=${HOME} TERM=${TERM} PS1='\u:\w\$ ' /bin/bash</literal>
-EOF</userinput></screen>
-
-  <para os="c">When logged on as user <systemitem class="username">clfs</systemitem>,
-  the initial shell is usually a <emphasis>login</emphasis> shell which
-  reads the <filename>/etc/profile</filename> of the host (probably
-  containing some settings and environment variables) and then
-  <filename>.bash_profile</filename>. The
-  <command>exec env -i.../bin/bash</command> command in the
-  <filename>.bash_profile</filename> file replaces the running shell with
-  a new one with a completely empty environment, except for the
-  <envar>HOME</envar>, <envar>TERM</envar>, and <envar>PS1</envar> variables.
-  This ensures that no unwanted and potentially hazardous environment
-  variables from the host system leak into the build environment. The
-  technique used here achieves the goal of ensuring a clean environment.</para>
-
-  <para os="d">The new instance of the shell is a <emphasis>non-login</emphasis>
-  shell, which does not read the <filename>/etc/profile</filename> or
-  <filename>.bash_profile</filename> files, but rather reads the
-  <filename>.bashrc</filename> file instead. Create the
-  <filename>.bashrc</filename> file now:</para>
-
-<screen os="e"><userinput>cat &gt; ~/.bashrc &lt;&lt; "EOF"
-<literal>set +h
-umask 022
-CLFS=/mnt/clfs
-LC_ALL=POSIX
-PATH=/cross-tools/bin:/bin:/usr/bin
-export CLFS LC_ALL PATH
-unset CFLAGS CXXFLAGS PKG_CONFIG_PATH</literal>
-EOF</userinput></screen>
-
-  <para os="f">The <command>set +h</command> command turns off
-  <command>bash</command>'s hash function. Hashing is ordinarily a useful
-  feature&mdash;<command>bash</command> uses a hash table to remember the
-  full path of executable files to avoid searching the <envar>PATH</envar>
-  time and again to find the same executable. However, the new tools should
-  be used as soon as they are installed. By switching off the hash function,
-  the shell will always search the <envar>PATH</envar> when a program is to
-  be run. As such, the shell will find the newly compiled tools in
-  <filename class="directory">/cross-tools</filename> as soon as they are
-  available without remembering a previous version of the same program in a
-  different location.</para>
-
-  <para os="g">Setting the user file-creation mask (umask) to 022 ensures that
-  newly created files and directories are only writable by their owner,
-  but are readable and executable by anyone (assuming default modes are
-  used by the open(2) system call, new files will end up with permission
-  mode 644 and directories with mode 755).</para>
-
-  <para os="h">The <envar>CLFS</envar> variable should be set to the
-  chosen mount point.</para>
-
-  <para os="i">The <envar>LC_ALL</envar> variable controls the localization
-  of certain programs, making their messages follow the conventions of a
-  specified country. Setting <envar>LC_ALL</envar> to <quote>POSIX</quote>
-  or <quote>C</quote> (the two are equivalent) ensures that everything will
-  work as expected in the temporary build environment.</para>
-
-  <para os="j">By putting <filename class="directory">/cross-tools/bin</filename>
-  at the beginning of the <envar>PATH</envar>, the cross-compiler
-  built in <xref linkend="chapter-cross-tools"/> will be picked up by
-  the build process for the temp-system packages before anything that
-  may be installed on the host. This, combined with turning off
-  hashing, helps to ensure that you will be using the cross-compile
-  tools to build the temp-system in /tools.</para>
-
-  <para os="k">The <envar>CFLAGS</envar>, <envar>CXXFLAGS</envar> and
-  <envar>PKG_CONFIG_PATH</envar> variables should not be set while building the
-  temporary system, so we unset them.</para>
-
-  <para os="l">Finally, to have the environment fully prepared for building the
-  temporary tools, source the just-created user profile:</para>
-
-<screen os="m"><userinput>source ~/.bash_profile</userinput></screen>
-
-</sect1>
Index: OK/final-preps/mips-chapter.xml
===================================================================
--- BOOK/final-preps/mips-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,21 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-final-preps" xreflabel="Final Preparations">
-  <?dbhtml dir="final-preps"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Final Preparations</title>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingtoolsdir.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingcrossdir.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/addinguser.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/abouttestsuites.xml"/>
-
-</chapter>
Index: OK/final-preps/mips/variables.xml
===================================================================
--- BOOK/final-preps/mips/variables.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,45 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-final-preps-variables">
-  <?dbhtml filename="variables.html"?>
-
-  <title>Build Variables</title>
-
-  <bridgehead renderas="sect4">Setting Host and Target</bridgehead>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <para os="aa">For a MIPS Little Endian Machine:</para>
-
-<screen os="ab"><userinput>export CLFS_TARGET="<replaceable>mipsel-unknown-linux-gnu</replaceable>"</userinput></screen>
-
-    <para os="ac">For a MIPS Big Endian Machine:</para>
-
-<screen os="ad"><userinput>export CLFS_TARGET="<replaceable>mips-unknown-linux-gnu</replaceable>"</userinput></screen>
-
-  <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-</sect1>
Index: OK/final-preps/mips64-64-chapter.xml
===================================================================
--- BOOK/final-preps/mips64-64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,21 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-final-preps" xreflabel="Final Preparations">
-  <?dbhtml dir="final-preps"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Final Preparations</title>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingtoolsdir.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingcrossdir.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/addinguser.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64-64/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/abouttestsuites.xml"/>
-
-</chapter>
Index: OK/final-preps/mips64-64/variables.xml
===================================================================
--- BOOK/final-preps/mips64-64/variables.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,59 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-final-preps-variables">
-  <?dbhtml filename="variables.html"?>
-
-  <title>Build Variables</title>
-
-  <bridgehead renderas="sect4">Setting Host and Target</bridgehead>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../mips/variables.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../mips64/variables.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../mips/variables.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../mips64/variables.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64-64/variables.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-<screen os="h"><userinput>export BUILD64="-mabi=64"</userinput></screen>
-
-  <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64-64/variables.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64-64/variables.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-</sect1>
Index: OK/final-preps/mips64-chapter.xml
===================================================================
--- BOOK/final-preps/mips64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,21 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-final-preps" xreflabel="Final Preparations">
-  <?dbhtml dir="final-preps"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Final Preparations</title>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingtoolsdir.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingcrossdir.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/addinguser.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/abouttestsuites.xml"/>
-
-</chapter>
Index: OK/final-preps/mips64/variables.xml
===================================================================
--- BOOK/final-preps/mips64/variables.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,68 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-final-preps-variables">
-  <?dbhtml filename="variables.html"?>
-
-  <title>Build Variables</title>
-
-  <bridgehead renderas="sect4">Setting Host and Target</bridgehead>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../mips/variables.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-<screen os="ab"><userinput>export CLFS_TARGET="<replaceable>mips64el-unknown-linux-gnu</replaceable>"</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../mips/variables.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
-<screen os="ad"><userinput>export CLFS_TARGET="<replaceable>mips64-unknown-linux-gnu</replaceable>"</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64/variables.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-<screen os="f"><userinput>export CLFS_TARGET32="$(echo ${CLFS_TARGET}| sed -e 's/64//g')"</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64/variables.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-<screen os="h"><userinput>export BUILD32="-mabi=32"
-export BUILDN32="-mabi=n32"
-export BUILD64="-mabi=64"</userinput></screen>
-
-  <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64/variables.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-<screen os="j"><userinput>cat &gt;&gt; ~/.bashrc &lt;&lt; EOF
-export CLFS_HOST="${CLFS_HOST}"
-export CLFS_TARGET="${CLFS_TARGET}"
-export CLFS_TARGET32="${CLFS_TARGET32}"
-export BUILD32="${BUILD32}"
-export BUILDN32="${BUILDN32}"
-export BUILD64="${BUILD64}"
-EOF</userinput></screen>
-
-</sect1>
Index: OK/final-preps/ppc-chapter.xml
===================================================================
--- BOOK/final-preps/ppc-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,21 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-final-preps" xreflabel="Final Preparations">
-  <?dbhtml dir="final-preps"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Final Preparations</title>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingtoolsdir.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingcrossdir.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/addinguser.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/abouttestsuites.xml"/>
-
-</chapter>
Index: OK/final-preps/ppc/variables.xml
===================================================================
--- BOOK/final-preps/ppc/variables.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,39 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-final-preps-variables">
-  <?dbhtml filename="variables.html"?>
-
-  <title>Build Variables</title>
-
-  <bridgehead renderas="sect4">Setting Host and Target</bridgehead>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>export CLFS_TARGET="powerpc-unknown-linux-gnu"</userinput></screen>
-
-  <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-</sect1>
Index: OK/final-preps/ppc64-64-chapter.xml
===================================================================
--- BOOK/final-preps/ppc64-64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,21 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-final-preps" xreflabel="Final Preparations">
-  <?dbhtml dir="final-preps"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Final Preparations</title>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingtoolsdir.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingcrossdir.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/addinguser.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64-64/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/abouttestsuites.xml"/>
-
-</chapter>
Index: OK/final-preps/ppc64-64/variables.xml
===================================================================
--- BOOK/final-preps/ppc64-64/variables.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,47 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-final-preps-variables">
-  <?dbhtml filename="variables.html"?>
-
-  <title>Build Variables</title>
-
-  <bridgehead renderas="sect4">Setting Host and Target</bridgehead>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>export CLFS_TARGET="powerpc64-unknown-linux-gnu"</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64-64/variables.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64-64/variables.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-  <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64-64/variables.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64-64/variables.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-</sect1>
Index: OK/final-preps/ppc64-chapter.xml
===================================================================
--- BOOK/final-preps/ppc64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,21 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-final-preps" xreflabel="Final Preparations">
-  <?dbhtml dir="final-preps"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Final Preparations</title>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingtoolsdir.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingcrossdir.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/addinguser.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/abouttestsuites.xml"/>
-
-</chapter>
Index: OK/final-preps/ppc64/variables.xml
===================================================================
--- BOOK/final-preps/ppc64/variables.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,53 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-final-preps-variables">
-  <?dbhtml filename="variables.html"?>
-
-  <title>Build Variables</title>
-
-  <bridgehead renderas="sect4">Setting Host and Target</bridgehead>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>export CLFS_TARGET="powerpc64-unknown-linux-gnu"</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64/variables.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-<screen os="f"><userinput>export CLFS_TARGET32="powerpc-unknown-linux-gnu"</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64/variables.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64/variables.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-  <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64/variables.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64/variables.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-</sect1>
Index: OK/final-preps/sparc-chapter.xml
===================================================================
--- BOOK/final-preps/sparc-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,21 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-final-preps" xreflabel="Final Preparations">
-  <?dbhtml dir="final-preps"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Final Preparations</title>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingtoolsdir.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingcrossdir.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/addinguser.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/abouttestsuites.xml"/>
-
-</chapter>
Index: OK/final-preps/sparc/variables.xml
===================================================================
--- BOOK/final-preps/sparc/variables.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,39 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-final-preps-variables">
-  <?dbhtml filename="variables.html"?>
-
-  <title>Build Variables</title>
-
-  <bridgehead renderas="sect4">Setting Host and Target</bridgehead>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>export CLFS_TARGET="sparc-unknown-linux-gnu"</userinput></screen>
-
-  <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-</sect1>
Index: OK/final-preps/sparc64-64-chapter.xml
===================================================================
--- BOOK/final-preps/sparc64-64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,21 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-final-preps" xreflabel="Final Preparations">
-  <?dbhtml dir="final-preps"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Final Preparations</title>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingtoolsdir.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingcrossdir.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/addinguser.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64-64/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/abouttestsuites.xml"/>
-
-</chapter>
Index: OK/final-preps/sparc64-64/variables.xml
===================================================================
--- BOOK/final-preps/sparc64-64/variables.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,90 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-final-preps-variables">
-  <?dbhtml filename="variables.html"?>
-
-  <title>Build Variables</title>
-
-  <bridgehead renderas="sect4">Setting Host and Target</bridgehead>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../sparc64/variables.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-  <para os="g">We will need to setup target specific flags for the compiler
-  and linkers. You can choose the appropriate BUILD64 and GCCTARGET
-  from the table at the bottom of the page.</para>
-
-<screen os="h"><userinput>export BUILD64="<replaceable>[BUILD64 entries]</replaceable>"
-export GCCTARGET="<replaceable>[GCCTARGET entries]</replaceable>"</userinput></screen>
-
-  <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64-64/variables.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-<screen os="j"><userinput>cat &gt;&gt; ~/.bashrc &lt;&lt; EOF
-export CLFS_HOST="${CLFS_HOST}"
-export CLFS_TARGET="${CLFS_TARGET}"
-export BUILD64="${BUILD64}"
-export GCCTARGET="${GCCTARGET}"
-EOF</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../sparc64/variables.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-  <table os="l">
-    <title>List of architectures, target triplets, and recommended book</title>
-    <?dbfo table-width="7in" ?>
-
-    <tgroup cols="3">
-
-      <colspec colnum="1" colwidth="1in"   colname="Processor"/>
-      <colspec colnum="2" colwidth="3.2in" colname="Build64"/>
-      <colspec colnum="3" colwidth="2.8in" colname="GCC"/>
-
-      <thead>
-        <row>
-          <entry>Processor</entry>
-          <entry>BUILD64</entry>
-          <entry>GCCTARGET</entry>
-        </row>
-      </thead>
-
-      <tbody>
-        <row>
-          <entry>Ultrasparc and Ultrasparc2</entry>
-          <entry>-m64 -mcpu=ultrasparc -mtune=ultrasparc</entry>
-          <entry>-mcpu=ultrasparc -mtune=ultrasparc</entry>
-        </row>
-        <row>
-          <entry>Ultrasparc3</entry>
-          <entry>-m64 -mcpu=ultrasparc3 -mtune=ultrasparc3</entry>
-          <entry>-mcpu=ultrasparc3 -mtune=ultrasparc3</entry>
-        </row>
-      </tbody>
-
-    </tgroup>
-
-  </table>
-
-</sect1>
Index: OK/final-preps/sparc64-chapter.xml
===================================================================
--- BOOK/final-preps/sparc64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,21 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-final-preps" xreflabel="Final Preparations">
-  <?dbhtml dir="final-preps"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Final Preparations</title>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingtoolsdir.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingcrossdir.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/addinguser.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/abouttestsuites.xml"/>
-
-</chapter>
Index: OK/final-preps/sparc64/variables.xml
===================================================================
--- BOOK/final-preps/sparc64/variables.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,102 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-final-preps-variables">
-  <?dbhtml filename="variables.html"?>
-
-  <title>Build Variables</title>
-
-  <bridgehead renderas="sect4">Setting Host and Target</bridgehead>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>export CLFS_TARGET="sparc64-unknown-linux-gnu"</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64/variables.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-<screen os="f"><userinput>export CLFS_TARGET32="sparcv9-unknown-linux-gnu"</userinput></screen>
-
-  <para os="g">We will need to setup target specific flags for the compiler
-  and linkers. You can choose the appropriate BUILD32, BUILD64, and GCCTARGET
-  from the table at the bottom of the page.</para>
-
-<screen os="h"><userinput>export BUILD32="<replaceable>[BUILD32 entries]</replaceable>"
-export BUILD64="<replaceable>[BUILD64 entries]</replaceable>"
-export GCCTARGET="<replaceable>[GCCTARGET entries]</replaceable>"</userinput></screen>
-
-  <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64/variables.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-<screen os="j"><userinput>cat &gt;&gt; ~/.bashrc &lt;&lt; EOF
-export CLFS_HOST="${CLFS_HOST}"
-export CLFS_TARGET="${CLFS_TARGET}"
-export CLFS_TARGET32="${CLFS_TARGET32}"
-export BUILD32="${BUILD32}"
-export BUILD64="${BUILD64}"
-export GCCTARGET="${GCCTARGET}"
-EOF</userinput></screen>
-
-  <para os="k">The following table gives the entries for different Sparc 64 capable
-  processors. Pick the processor that matches your system. Note: GCC settings are
-  only needed in the early sections of the book, and will not be used in the final-system
-  builds.</para>
-
-  <table os="l">
-    <title>List of 32-Bit settings, 64-Bit Build settings, and GCC setting</title>
-    <?dbfo table-width="7in" ?>
-
-    <tgroup cols="4">
-
-      <colspec colnum="1" colwidth="1in" colname="Processor"/>
-      <colspec colnum="2" colwidth="2in" colname="Build32"/>
-      <colspec colnum="3" colwidth="2in" colname="Build64"/>
-      <colspec colnum="4" colwidth="2in" colname="GCC"/>
-
-      <thead>
-        <row>
-          <entry>Processor</entry>
-          <entry>BUILD32</entry>
-          <entry>BUILD64</entry>
-          <entry>GCCTARGET</entry>
-        </row>
-      </thead>
-
-      <tbody>
-        <row>
-          <entry>Ultrasparc and Ultrasparc2</entry>
-          <entry>-m32 -mcpu=ultrasparc -mtune=ultrasparc</entry>
-          <entry>-m64 -mcpu=ultrasparc -mtune=ultrasparc</entry>
-          <entry>-mcpu=ultrasparc -mtune=ultrasparc</entry>
-        </row>
-        <row>
-          <entry>Ultrasparc3</entry>
-          <entry>-m32 -mcpu=ultrasparc3 -mtune=ultrasparc3</entry>
-          <entry>-m64 -mcpu=ultrasparc3 -mtune=ultrasparc3</entry>
-          <entry>-mcpu=ultrasparc3 -mtune=ultrasparc3</entry>
-        </row>
-      </tbody>
-
-    </tgroup>
-
-  </table>
-
-</sect1>
Index: OK/final-preps/x86-chapter.xml
===================================================================
--- BOOK/final-preps/x86-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,21 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-final-preps" xreflabel="Final Preparations">
-  <?dbhtml dir="final-preps"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Final Preparations</title>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingtoolsdir.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingcrossdir.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/addinguser.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/abouttestsuites.xml"/>
-
-</chapter>
Index: OK/final-preps/x86/variables.xml
===================================================================
--- BOOK/final-preps/x86/variables.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,87 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-final-preps-variables">
-  <?dbhtml filename="variables.html"?>
-
-  <title>Build Variables</title>
-
-  <bridgehead renderas="sect4">Setting Host and Target</bridgehead>
-
-  <para os="a">During the building of the cross-compile tools you will need to
-  set a few variables that will be dependent on your particular needs.
-  The first variable will be the triplet of the host machine, which will be
-  put into the <envar>CLFS_HOST</envar> variable. To account for the
-  possibility that the host and target are the same arch, as cross-compiling
-  won't work when host and target are the same, part of the triplet needs to
-  be changed slightly - in our case, we will change part of the triplet
-  to "cross". Set <envar>CLFS_HOST</envar> using the following command:</para>
-
-<screen os="b"><userinput>export CLFS_HOST=$(echo ${MACHTYPE} | sed -e 's/-[^-]*/-cross/')</userinput></screen>
-
-  <para os="c">Now you will need to set the triplet for the target
-  architecture. Set the target variable using the following command:</para>
-
-<screen os="d"><userinput>export CLFS_TARGET="<replaceable>[target triplet]</replaceable>"</userinput></screen>
-
-  <para os="t1">Replace [target triplet] with the appropriate machine triplet
-  using the table at the bottom of the page.</para>
-
-  <bridgehead renderas="sect4">Copy settings to the Environment</bridgehead>
-
-  <para os="e">Now add these to <filename>~/.bashrc</filename>, just in
-  case you have to exit and restart building later:</para>
-
-<screen os="f"><userinput>cat &gt;&gt; ~/.bashrc &lt;&lt; EOF
-export CLFS_HOST="${CLFS_HOST}"
-export CLFS_TARGET="${CLFS_TARGET}"
-EOF</userinput></screen>
-
-  <table os="g">
-    <title>Processor Type and  Target Triplets</title>
-    <?dbfo table-width="5in" ?>
-
-    <tgroup cols="2">
-
-      <colspec colnum="1" colwidth="2.5in" colname="Processor"/>
-      <colspec colnum="2" colwidth="2.5in" colname="Triplet"/>
-
-      <thead>
-        <row>
-          <entry>Processor</entry>
-          <entry>Target Triplet</entry>
-        </row>
-      </thead>
-
-      <tbody>
-        <row>
-          <entry>386 Compatibles</entry>
-          <entry>Not Supported By Glibc</entry>
-        </row>
-        <row>
-          <entry>486 Compatibles</entry>
-          <entry>i486-pc-linux-gnu</entry>
-        </row>
-        <row>
-          <entry>Pentium, K6, 586 Compatibles</entry>
-          <entry>i586-pc-linux-gnu</entry>
-        </row>
-        <row>
-          <entry>Pentium II, Pentium III, Pentium 4</entry>
-          <entry>i686-pc-linux-gnu</entry>
-        </row>
-        <row>
-          <entry>Athlon, Duron</entry>
-          <entry>i686-pc-linux-gnu</entry>
-        </row>
-      </tbody>
-
-    </tgroup>
-
-  </table>
-
-</sect1>
Index: OK/final-preps/x86_64-64-chapter.xml
===================================================================
--- BOOK/final-preps/x86_64-64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,21 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-final-preps" xreflabel="Final Preparations">
-  <?dbhtml dir="final-preps"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Final Preparations</title>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingtoolsdir.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingcrossdir.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/addinguser.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/abouttestsuites.xml"/>
-
-</chapter>
Index: OK/final-preps/x86_64-64/variables.xml
===================================================================
--- BOOK/final-preps/x86_64-64/variables.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,49 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-final-preps-variables">
-  <?dbhtml filename="variables.html"?>
-
-  <title>Build Variables</title>
-
-  <bridgehead renderas="sect4">Setting Host and Target</bridgehead>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64/variables.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64/variables.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-<screen os="h"><userinput>export BUILD64="-m64"</userinput></screen>
-
-  <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64/variables.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-<screen os="j"><userinput>cat &gt;&gt; ~/.bashrc &lt;&lt; EOF
-export CLFS_HOST="${CLFS_HOST}"
-export CLFS_TARGET="${CLFS_TARGET}"
-export BUILD64="${BUILD64}"
-EOF</userinput></screen>
-
-</sect1>
Index: OK/final-preps/x86_64-chapter.xml
===================================================================
--- BOOK/final-preps/x86_64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,21 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-final-preps" xreflabel="Final Preparations">
-  <?dbhtml dir="final-preps"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Final Preparations</title>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingtoolsdir.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingcrossdir.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/addinguser.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/abouttestsuites.xml"/>
-
-</chapter>
Index: OK/final-preps/x86_64/variables.xml
===================================================================
--- BOOK/final-preps/x86_64/variables.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,53 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-final-preps-variables">
-  <?dbhtml filename="variables.html"?>
-
-  <title>Build Variables</title>
-
-  <bridgehead renderas="sect4">Setting Host and Target</bridgehead>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>export CLFS_TARGET="x86_64-unknown-linux-gnu"</userinput></screen>
-
-  <para os="e">Now set the target triplet for 32 bits:</para>
-
-<screen os="f"><userinput>export CLFS_TARGET32="i686-pc-linux-gnu"</userinput></screen>
-
-  <para os="g">We will need to setup target-specific flags for the compiler
-  and linker:</para>
-
-<screen os="h"><userinput>export BUILD32="-m32"
-export BUILD64="-m64"</userinput></screen>
-
-  <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
-
-  <para os="i">Now add the host and target variables, and compiler and linker
-  flags, to <filename>~/.bashrc</filename>, just in case you have to exit and
-  restart building later:</para>
-
-<screen os="j"><userinput>cat &gt;&gt; ~/.bashrc &lt;&lt; EOF
-export CLFS_HOST="${CLFS_HOST}"
-export CLFS_TARGET="${CLFS_TARGET}"
-export CLFS_TARGET32="${CLFS_TARGET32}"
-export BUILD32="${BUILD32}"
-export BUILD64="${BUILD64}"
-EOF</userinput></screen>
-
-</sect1>
Index: OK/final-system/64/binutils.xml
===================================================================
--- BOOK/final-system/64/binutils.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,120 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-binutils" role="wrap">
-  <?dbhtml filename="binutils.html"?>
-
-  <title>Binutils-&binutils-version;</title>
-
-  <indexterm zone="ch-system-binutils">
-    <primary sortas="a-Binutils">Binutils</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/binutils.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Binutils</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-<!-- Branch update patch area
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/binutils.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/binutils.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-<screen os="ca"><userinput>CC="gcc -isystem /usr/include" \
-LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
-../binutils-&binutils-dir;/configure \
-    --prefix=/usr \
-    --libdir=/usr/lib \
-    --enable-shared \
-    --disable-multilib \
-    --enable-64-bit-bfd \
-    --enable-gold=yes \
-    --enable-plugins \
-    --with-system-zlib \
-    --enable-threads</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-<!--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='l'])"/> -->
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/binutils.xml"
-  xpointer="xpointer(id('contents-binutils'))"/>
-
-</sect1>
Index: OK/final-system/64/gcc.xml
===================================================================
--- BOOK/final-system/64/gcc.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,150 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-gcc" role="wrap">
-  <?dbhtml filename="gcc.html"?>
-
-  <title>GCC-&gcc-version;</title>
-
-  <indexterm zone="ch-system-gcc">
-    <primary sortas="a-GCC">GCC</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GCC</title>
-
-<!--GCC Branch Update Area
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <para os="p5">Apply the following patch so that GCC links to
-    <filename class="directory">/lib</filename> instead of
-    <filename class="directory">/lib64</filename>:</para>
-
-<screen os="p6"><userinput>patch -Np1 -i ../&gcc-pure64-patch;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='fix1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='fix2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='i1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='y'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='z'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/gcc.xml"
-  xpointer="xpointer(id('contents-gcc'))"/>
-
-</sect1>
Index: OK/final-system/common/aboutdebug.xml
===================================================================
--- BOOK/final-system/common/aboutdebug.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,49 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-aboutdebug">
-  <?dbhtml filename="aboutdebug.html"?>
-
-  <title>About Debugging Symbols</title>
-
-  <para os="a">Most programs and libraries are, by default, compiled with debugging
-  symbols included (with <command>gcc</command>'s <option>-g</option> option).
-  This means that when debugging a program or library that was compiled with
-  debugging information included, the debugger can provide not only memory
-  addresses, but also the names of the routines and variables.</para>
-
-  <para os="b">However, the inclusion of these debugging symbols enlarges a
-  program or library significantly. The following is an example of the
-  amount of space these symbols occupy:</para>
-
-  <itemizedlist os="c">
-    <listitem os="c1">
-      <para>a bash binary with debugging symbols: 1200 KB</para>
-    </listitem>
-    <listitem os="c2">
-      <para>a bash binary without debugging symbols: 480 KB</para>
-    </listitem>
-    <listitem os="c3">
-      <para>Glibc and GCC files (<filename class="directory">/lib</filename>
-      and <filename class="directory">/usr/lib</filename>) with debugging
-      symbols: 87 MB</para>
-    </listitem>
-    <listitem os="c4">
-      <para>Glibc and GCC files without debugging symbols: 16 MB</para>
-    </listitem>
-  </itemizedlist>
-
-  <para os="d">Sizes may vary depending on which compiler and C library were used,
-  but when comparing programs with and without debugging symbols, the
-  difference will usually be a factor between two and five.</para>
-
-  <para os="e">Because most users will never use a debugger on their system software,
-  a lot of disk space can be regained by removing these symbols. The next
-  section shows how to strip all debugging symbols from the programs and
-  libraries.</para>
-
-</sect1>
Index: OK/final-system/common/acl.xml
===================================================================
--- BOOK/final-system/common/acl.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,137 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-acl" role="wrap">
-  <?dbhtml filename="acl.html"?>
-
-  <title>Acl-&acl-version;</title>
-
-  <indexterm zone="ch-system-acl">
-    <primary sortas="a-Acl">Acl</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>Acl is a library for getting and setting POSIX Access Control Lists.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Acl</title>
-
-    <para os="s1">Apply a sed for a test:</para>
-
-<screen os="s2"><userinput>sed -i -e "/TABS-1;/a if (x > (TABS-1)) x = (TABS-1);" \
-    libacl/__acl_to_any_text.c</userinput></screen>
-
-    <para os="a">Apply a sed to install the documentation with a versioned
-    directory:</para>
-
-<screen os="b"><userinput>sed -i -e 's|/@pkg_name@|&amp;-@pkg_version@|' include/builddefs.in</userinput></screen>
-
-    <para os="c">Apply a sed to fix a few tests:</para>
-
-<screen os="d"><userinput>sed -i "s:| sed.*::g" test/{sbits-restore,cp,misc}.test</userinput></screen>
-
-    <para os="e">Prepare Acl for compilation:</para>
-
-<screen os="f"><userinput>./configure \
-    --prefix=/usr \
-    --libexecdir=/usr/lib</userinput></screen>
-
-    <para os="g">Compile the package:</para>
-
-<screen os="h"><userinput>make</userinput></screen>
-
-    <para os="i">The Acl tests need a filesystem which supports access controls
-    after Coreutils has been built with the Acl libraries. Return to this
-    section after Coreutils has been installed. Test the results:</para>
-
-<screen os="j"><userinput remap="test">make tests</userinput></screen>
-
-    <para os="k">Install the package:</para>
-
-<screen os="l"><userinput>make install install-dev install-lib</userinput></screen>
-
-    <para os="m">Move the shared library to <filename class="directory">/lib</filename>
-    and recreate the symlink in <filename class="directory">/usr/lib</filename>:</para>
-
-<screen os="n"><userinput>mv -v /usr/lib/libacl.so.* /lib
-ln -sfv ../../lib/libacl.so.1 /usr/lib/libacl.so</userinput></screen>
-
-    <para os="o">Set the proper permissions on the shared library:</para>
-
-<screen os="p"><userinput>chmod 755 -v /lib/libacl.so.1.1.0</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-acl" role="content">
-    <title>Contents of Acl</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed libraries</segtitle>
-      <segtitle>Installed directories</segtitle>
-
-      <seglistitem>
-        <seg>chacl, getfacl, setfacl</seg>
-        <seg>libattr.[a,so]</seg>
-        <seg>/usr/include/acl, /usr/share/doc/acl-&acl-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="chacl">
-        <term><command>chacl</command></term>
-        <listitem>
-          <para>Changes the access control list of a file or directory</para>
-          <indexterm zone="ch-system-acl chacl">
-            <primary sortas="b-chacl">chacl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="getfacl">
-        <term><command>getfacl</command></term>
-        <listitem>
-          <para>Get file access control lists</para>
-          <indexterm zone="ch-system-acl getfacl">
-            <primary sortas="b-getfacl">getfacl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="setfacl">
-        <term><command>setfacl</command></term>
-        <listitem>
-          <para>Set file access control lists</para>
-          <indexterm zone="ch-system-acl setfacl">
-            <primary sortas="b-setfacl">setfacl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libacl">
-        <term><filename class="libraryfile">libacl</filename></term>
-        <listitem>
-          <para>Library to manage access control lists</para>
-          <indexterm zone="ch-system-acl libacl">
-            <primary sortas="c-libacl">libacl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/adjusting.xml
===================================================================
--- BOOK/final-system/common/adjusting.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,62 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-adjusting">
-  <?dbhtml filename="adjusting.html"?>
-
-  <title>Adjusting the Toolchain</title>
-
-  <para os="a">Now we adjust GCC's specs so that they point to the new
-  dynamic linker. A <command>perl</command> command accomplishes this:</para>
-
-<screen os="c"><userinput>gcc -dumpspecs | \
-perl -p -e 's@/tools/lib/ld@/lib/ld@g;' \
-     -e 's@\*startfile_prefix_spec:\n@$_/usr/lib/ @g;' &gt; \
-     $(dirname $(gcc --print-libgcc-file-name))/specs</userinput></screen>
-
-  <para os="d">The <command>perl</command> command above makes 2
-  modifications to GCC's specs: it removes <quote>/tools</quote> from the
-  pathname to the dynamic linker, and adds <quote>/usr/lib/</quote> to the
-  startfile_prefix_spec. It is a good idea to visually inspect the
-  <filename>specs</filename> file, and compare with the output of
-  <command>gcc -dumpspecs</command>, to verify that
-  the intended changes were actually made.</para>
-
-  <caution>
-
-    <para os="f">It is imperative at this point to stop and ensure that
-    the basic functions (compiling and linking) of the adjusted toolchain
-    are working as expected. To do this, perform a sanity
-    check:</para>
-
-<screen os="g"><userinput>echo 'int main(){}' &gt; dummy.c
-gcc dummy.c
-readelf -l a.out | grep ': /lib'</userinput></screen>
-
-    <para os="h">If everything is working correctly, there should be no errors,
-    and the output of the last command will be:</para>
-
-<screen os="i"><computeroutput>[Requesting program interpreter: /lib/ld-linux.so.2]</computeroutput></screen>
-
-    <para os="j">Note that <filename class="directory">/lib</filename> is now
-    the prefix of our dynamic linker.</para>
-
-    <para os="k">If the output does not appear as shown above or is not received
-    at all, then something is seriously wrong. Investigate and retrace the
-    steps to find out where the problem is and correct it. The most likely
-    reason is that something went wrong with the specs file amendment
-    above. Any issues will need to be resolved before continuing on with
-    the process.</para>
-
-    <para os="l">Once everything is working correctly, clean up the test
-    files:</para>
-
-<screen os="m"><userinput>rm -v dummy.c a.out</userinput></screen>
-
-  </caution>
-
-</sect1>
Index: OK/final-system/common/attr.xml
===================================================================
--- BOOK/final-system/common/attr.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,133 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-attr" role="wrap">
-  <?dbhtml filename="attr.html"?>
-
-  <title>Attr-&attr-version;</title>
-
-  <indexterm zone="ch-system-attr">
-    <primary sortas="a-Attr">Attr</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>Attr is a library for getting and setting POSIX.1e
-    (formerly POSIX 6) draft 15 capabilities.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Attr</title>
-
-    <para os="s1">Apply a sed which prevents man-pages which were installed by
-    the <xref linkend="ch-system-man-pages"/> package:</para>
-
-<screen os="s2"><userinput>sed -i -e "/SUBDIRS/s|man[25]||g" man/Makefile</userinput></screen>
-
-    <para os="a">Apply a sed to install the documentation with a versioned
-    directory:</para>
-
-<screen os="b"><userinput>sed -i -e 's|/@pkg_name@|&amp;-@pkg_version@|' include/builddefs.in</userinput></screen>
-
-    <para os="c">Prepare Attr for compilation:</para>
-
-<screen os="d"><userinput>./configure \
-    --prefix=/usr</userinput></screen>
-
-    <para os="e">Compile the package:</para>
-
-<screen os="f"><userinput>make</userinput></screen>
-
-    <para os="g">The tests need to run with a filesystem which supports extended
-    attributes. Test the results:</para>
-
-<screen os="h"><userinput remap="test">make -j1 tests root-tests</userinput></screen>
-
-    <para os="i">Install the package:</para>
-
-<screen os="j"><userinput>make install install-dev install-lib</userinput></screen>
-
-    <para os="k">Move the shared library to <filename class="directory">/lib
-    </filename> and recreate the symlink in <filename class="directory">/usr/lib
-    </filename>:</para>
-
-<screen os="l"><userinput>mv -v /usr/lib/libattr.so.* /lib
-ln -sfv ../../lib/$(readlink /usr/lib/libattr.so) /usr/lib/libattr.so</userinput></screen>
-
-    <para os="m">Set the proper permissions on the shared library:</para>
-
-<screen os="n"><userinput>chmod 755 -v /lib/libattr.so.1.1.0</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-attr" role="content">
-    <title>Contents of Attr</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed libraries</segtitle>
-      <segtitle>Installed directories</segtitle>
-
-      <seglistitem>
-        <seg>attr, getfattr, setfattr</seg>
-        <seg>libattr.[a,so]</seg>
-        <seg>/usr/include/attr, /usr/share/doc/attr-&attr-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="attr">
-        <term><command>attr</command></term>
-        <listitem>
-          <para>Manage extended attributes on filesystem objects</para>
-          <indexterm zone="ch-system-attr attr">
-            <primary sortas="b-attr">attr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="getfattr">
-        <term><command>getfattr</command></term>
-        <listitem>
-          <para>Get extended attributes of filesystem objects</para>
-          <indexterm zone="ch-system-attr getfattr">
-            <primary sortas="b-getfattr">getfattr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="setfattr">
-        <term><command>setfattr</command></term>
-        <listitem>
-          <para>Set extended attributes of filesystem objects</para>
-          <indexterm zone="ch-system-attr setfattr">
-            <primary sortas="b-setfattr">setfattr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libattr">
-        <term><filename class="libraryfile">libattr</filename></term>
-        <listitem>
-          <para>Library to manage extended attributes on filesystem objects</para>
-          <indexterm zone="ch-system-attr libattr">
-            <primary sortas="c-libattr">libattr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/autoconf.xml
===================================================================
--- BOOK/final-system/common/autoconf.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,165 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-autoconf" role="wrap">
-  <?dbhtml filename="autoconf.html"?>
-
-  <title>Autoconf-&autoconf-version;</title>
-
-  <indexterm zone="ch-system-autoconf">
-    <primary sortas="a-Autoconf">Autoconf</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Autoconf package contains programs for producing shell scripts that
-    can automatically configure source code.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Autoconf</title>
-
-    <para os="a">Prepare Autoconf for compilation:</para>
-
-<screen os="b"><userinput>./configure \
-    --prefix=/usr</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">To test the results, issue:</para>
-
-<screen os="e2"><userinput remap="test">make check VERBOSE=yes</userinput></screen>
-
-    <para os="e3">17 tests are skipped that use Automake and different GCC languages.
-    For full test coverage, Autoconf can be re-tested after Automake has been
-    installed.</para>
-
-    <para os="f">Install the package:</para>
-
-<screen os="g"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-autoconf" role="content">
-    <title>Contents of Autoconf</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed directory</segtitle>
-
-      <seglistitem>
-        <seg>autoconf, autoheader, autom4te, autoreconf, autoscan, autoupdate,
-        ifnames</seg>
-        <seg>/usr/share/autoconf</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="autoconf">
-        <term><command>autoconf</command></term>
-        <listitem>
-          <para>Produces shell scripts that automatically configure software
-          source code packages to adapt to many kinds of Unix-like systems.
-          The configuration scripts it produces are independent&mdash;running
-          them does not require the <command>autoconf</command> program.</para>
-          <indexterm zone="ch-system-autoconf autoconf">
-            <primary sortas="b-autoconf">autoconf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="autoheader">
-        <term><command>autoheader</command> </term>
-        <listitem>
-          <para>A tool for creating template files of C
-          <emphasis>#define</emphasis> statements for configure to use</para>
-          <indexterm zone="ch-system-autoconf autoheader">
-            <primary sortas="b-autoheader">autoheader</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="autom4te">
-        <term><command>autom4te</command></term>
-        <listitem>
-          <para>A wrapper for the M4 macro processor</para>
-          <indexterm zone="ch-system-autoconf autom4te">
-            <primary sortas="b-autom4te">autom4te</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="autoreconf">
-        <term><command>autoreconf</command></term>
-        <listitem>
-          <para>Automatically runs <command>autoconf</command>,
-          <command>autoheader</command>, <command>aclocal</command>,
-          <command>automake</command>, <command>gettextize</command>, and
-          <command>libtoolize</command> in the correct order to save time
-          when changes are made to <command>autoconf</command> and
-          <command>automake</command> template files</para>
-          <indexterm zone="ch-system-autoconf autoreconf">
-            <primary sortas="b-autoreconf">autoreconf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="autoscan">
-        <term><command>autoscan</command> </term>
-        <listitem>
-          <para>Helps to create a <filename>configure.in</filename> file for a
-          software package; it examines the source files in a directory tree,
-          searching them for common portability issues, and creates a
-          <filename>configure.scan</filename> file that serves as as a
-          preliminary <filename>configure.in</filename> file for the package</para>
-          <indexterm zone="ch-system-autoconf autoscan">
-            <primary sortas="b-autoscan">autoscan</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="autoupdate">
-        <term><command>autoupdate</command></term>
-        <listitem>
-          <para>Modifies a <filename>configure.in</filename> file that still
-          calls <command>autoconf</command> macros by their old names to use the
-          current macro names</para>
-          <indexterm zone="ch-system-autoconf autoupdate">
-            <primary sortas="b-autoupdate">autoupdate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ifnames">
-        <term><command>ifnames</command> </term>
-        <listitem>
-          <para>Helps when writing <filename>configure.in</filename> files
-          for a software package; it prints the identifiers that the package
-          uses in C preprocessor conditionals. If a package has already been set
-          up to have some portability, this program can help determine what
-          <command>configure</command> needs to check for. It can also fill in
-          gaps in a <filename>configure.in</filename> file generated by
-          <command>autoscan</command></para>
-          <indexterm zone="ch-system-autoconf ifnames">
-            <primary sortas="b-ifnames">ifnames</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/automake.xml
===================================================================
--- BOOK/final-system/common/automake.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,244 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-automake" role="wrap">
-  <?dbhtml filename="automake.html"?>
-
-  <title>Automake-&automake-version;</title>
-
-  <indexterm zone="ch-system-automake">
-    <primary sortas="a-Automake">Automake</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Automake package contains programs for generating Makefiles
-    for use with Autoconf.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Automake</title>
-
-    <para os="p1">Apply the following patch to fix outdated syntax that is no
-    longer recognized by Perl-&perl-version;.</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&automake-perl-patch;</userinput></screen>
-
-    <para os="a">Prepare Automake for compilation:</para>
-
-<screen os="b"><userinput>./configure \
-    --prefix=/usr \
-    --docdir=/usr/share/doc/automake-&automake-version;</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">To test the results, issue:</para>
-
-<screen os="e2"><userinput remap="test">make check</userinput></screen>
-
-    <para os="f">Install the package:</para>
-
-<screen os="g"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-automake" role="content">
-    <title>Contents of Automake</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed directories</segtitle>
-
-      <seglistitem>
-        <seg>aclocal, aclocal-&automake-version2;, automake,
-        automake-&automake-version2;, compile, config.guess, config.sub,
-        depcomp, install-sh, mdate-sh, missing, mkinstalldirs,
-        py-compile, symlink-tree, ylwrap</seg>
-        <seg>/usr/share/aclocal-&automake-version2;,
-        /usr/share/automake-&automake-version2;, /usr/share/doc/automake</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="aclocal">
-        <term><command>aclocal</command></term>
-        <listitem>
-          <para>Generates <filename>aclocal.m4</filename> files based on the
-          contents of <filename>configure.in</filename> files</para>
-          <indexterm zone="ch-system-automake aclocal">
-            <primary sortas="b-aclocal">aclocal</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="aclocal-version">
-        <term><command>aclocal-&automake-version2;</command></term>
-        <listitem>
-          <para>A hard link to <command>aclocal</command></para>
-          <indexterm zone="ch-system-automake aclocal-version">
-            <primary
-            sortas="b-aclocal-&automake-version2;">aclocal-&automake-version2;</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="automake">
-        <term><command>automake</command></term>
-        <listitem>
-          <para>A tool for automatically generating
-          <filename>Makefile.in</filename> files from
-          <filename>Makefile.am</filename> files. To create all the
-          <filename>Makefile.in</filename> files for a package, run this
-          program in the top-level directory. By scanning the
-          <filename>configure.in</filename> file, it automatically finds
-          each appropriate <filename>Makefile.am</filename> file and generates
-          the corresponding <filename>Makefile.in</filename> file</para>
-          <indexterm zone="ch-system-automake automake">
-            <primary sortas="b-automake">automake</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="automake-version">
-        <term><command>automake-&automake-version2;</command></term>
-        <listitem>
-          <para>A hard link to <command>automake</command></para>
-          <indexterm zone="ch-system-automake automake-version">
-            <primary
-            sortas="b-automake-&automake-version2;">automake-&automake-version2;</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="compile">
-        <term><command>compile</command></term>
-        <listitem>
-          <para>A wrapper for compilers</para>
-          <indexterm zone="ch-system-automake compile">
-            <primary sortas="b-compile">compile</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="config.guess">
-        <term><command>config.guess</command></term>
-        <listitem>
-          <para>A script that attempts to guess the canonical triplet for
-          the given build, host, or target architecture</para>
-          <indexterm zone="ch-system-automake config.guess">
-            <primary sortas="b-config.guess">config.guess</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="config.sub">
-        <term><command>config.sub</command></term>
-        <listitem>
-          <para>A configuration validation subroutine script</para>
-          <indexterm zone="ch-system-automake config.sub">
-            <primary sortas="b-config.sub">config.sub</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="depcomp">
-        <term><command>depcomp</command></term>
-        <listitem>
-          <para>A script for compiling a program so that dependency information
-          is generated in addition to the desired output</para>
-          <indexterm zone="ch-system-automake depcomp">
-            <primary sortas="b-depcomp">depcomp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="install-sh">
-        <term><command>install-sh</command></term>
-        <listitem>
-          <para>A script that installs a program, script, or data file</para>
-          <indexterm zone="ch-system-automake install-sh">
-            <primary sortas="b-install-sh">install-sh</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mdate-sh">
-        <term><command>mdate-sh</command></term>
-        <listitem>
-          <para>A script that prints the modification time of a file or
-          directory</para>
-          <indexterm zone="ch-system-automake mdate-sh">
-            <primary sortas="b-mdate-sh">mdate-sh</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="missing">
-        <term><command>missing</command></term>
-        <listitem>
-          <para>A script acting as a common stub for missing GNU programs during
-          an installation</para>
-          <indexterm zone="ch-system-automake missing">
-            <primary sortas="b-missing">missing</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mkinstalldirs">
-        <term><command>mkinstalldirs</command></term>
-        <listitem>
-          <para>A script that creates a directory tree</para>
-          <indexterm zone="ch-system-automake mkinstalldirs">
-            <primary sortas="b-mkinstalldirs">mkinstalldirs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="py-compile">
-        <term><command>py-compile</command></term>
-        <listitem>
-          <para>Compiles a Python program</para>
-          <indexterm zone="ch-system-automake py-compile">
-            <primary sortas="b-py-compile">py-compile</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="symlink-tree">
-        <term><command>symlink-tree</command></term>
-        <listitem>
-          <para>A script to create a symlink tree of a directory tree</para>
-          <indexterm zone="ch-system-automake symlink-tree">
-            <primary sortas="b-symlink-tree">symlink-tree</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ylwrap">
-        <term><command>ylwrap</command></term>
-        <listitem>
-          <para>A wrapper for <command>lex</command> and
-          <command>yacc</command></para>
-          <indexterm zone="ch-system-automake ylwrap">
-            <primary sortas="b-ylwrap">ylwrap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/bash.xml
===================================================================
--- BOOK/final-system/common/bash.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,144 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-bash" role="wrap">
-  <?dbhtml filename="bash.html"?>
-
-  <title>Bash-&bash-version;</title>
-
-  <indexterm zone="ch-system-bash">
-    <primary sortas="a-Bash">Bash</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Bash package contains the Bourne-Again SHell.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Bash</title>
-
-    <para os="p1">The following patch contains updates from the maintainer. The
-    maintainer of Bash only releases these patches to fix serious issues:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&bash-branch_update-patch;</userinput></screen>
-
-    <para os="a">Prepare Bash for compilation:</para>
-
-<screen os="b"><userinput>./configure \
-    --prefix=/usr \
-    --without-bash-malloc \
-    --with-installed-readline \
-    --docdir=/usr/share/doc/bash-&bash-version;</userinput></screen>
-
-    <variablelist os="c">
-      <title>The meaning of the new configure option:</title>
-
-      <varlistentry>
-        <term><parameter>--with-installed-readline</parameter></term>
-        <listitem>
-          <para>This option tells Bash to use the
-          <filename class="libraryfile">readline</filename> library that is
-          already installed on the system rather than using its own readline
-          version.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-    <para os="d">Compile the package:</para>
-
-<screen os="e"><userinput>make</userinput></screen>
-
-    <para os="f">To test the results, issue:</para>
-
-<screen os="f2"><userinput remap="test">make tests</userinput></screen>
-
-    <para os="g">Install the package:</para>
-
-<screen os="h"><userinput>make install</userinput></screen>
-
-    <para os="i">Move the <command>bash</command> binary to
-    <filename class="directory">/bin</filename>, overwriting the symlink
-    that was previously created:</para>
-
-<screen os="j"><userinput>mv -v /usr/bin/bash /bin</userinput></screen>
-
-    <para os="k">Run the newly compiled <command>bash</command> program (replacing
-    the one that is currently being executed):</para>
-
-<screen os="l" role="nodump"><userinput>exec /bin/bash --login +h</userinput></screen>
-
-    <note os="m">
-      <para>The parameters used make the <command>bash</command>
-      process an interactive login shell and continue to disable hashing so
-      that new programs are found as they become available.</para>
-    </note>
-
-  </sect2>
-
-  <sect2 id="contents-bash" role="content">
-    <title>Contents of Bash</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed directory</segtitle>
-
-      <seglistitem>
-        <seg>bash, bashbug, sh (link to bash)</seg>
-        <seg>/usr/share/doc/bash-&bash-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="bash">
-        <term><command>bash</command></term>
-        <listitem>
-          <para>A widely-used command interpreter; it performs many types of
-          expansions and substitutions on a given command line before executing
-          it, thus making this interpreter a powerful tool</para>
-          <indexterm zone="ch-system-bash bash">
-            <primary sortas="b-bash">bash</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="bashbug">
-        <term><command>bashbug</command></term>
-        <listitem>
-          <para>A shell script to help the user compose and mail standard
-          formatted bug reports concerning <command>bash</command></para>
-          <indexterm zone="ch-system-bash bashbug">
-            <primary sortas="b-bashbug">bashbug</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sh">
-        <term><command>sh</command></term>
-        <listitem>
-          <para>A symlink to the <command>bash</command> program; when invoked
-          as <command>sh</command>, <command>bash</command> tries to mimic the
-          startup behavior of historical versions of <command>sh</command> as
-          closely as possible, while conforming to the POSIX standard as
-          well</para>
-          <indexterm zone="ch-system-bash sh">
-            <primary sortas="b-sh">sh</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/bc.xml
===================================================================
--- BOOK/final-system/common/bc.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,104 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-bc" role="wrap">
-  <?dbhtml filename="bc.html"?>
-
-  <title>Bc-&bc-version;</title>
-
-  <indexterm zone="ch-system-bc">
-    <primary sortas="a-Bc">Bc</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Bc package contains an arbitrary precision numeric processing language.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Bc</title>
-
-    <para os="s1">Change an internal script to use <command>sed</command> 
-        instead of <command>ed</command>:</para>
-
-<screen os="s2"><userinput>cat &gt; bc/fix-libmath_h &lt;&lt; "EOF"
-#! /bin/bash
-sed -e '1   s/^/{"/' \
-    -e     's/$/",/' \
-    -e '2,$ s/^/"/'  \
-    -e   '$ d'       \
-    -i libmath.h
-
-sed -e '$ s/$/0}/' \
--i libmath.h
-EOF</userinput></screen>
-
-    <para os="a">Prepare Bc for compilation:</para>
-
-<screen os="b"><userinput>./configure \
-    --prefix=/usr \
-    --with-readline \
-    --mandir=/usr/share/man \
-    --infodir=/usr/share/info</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">To test the results, issue:</para>
-
-<screen os="e2"><userinput remap="test">echo "quit" | ./bc/bc -l Test/checklib.b</userinput></screen>
-
-    <para os="f">Install the package:</para>
-
-<screen os="g"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-bc" role="content">
-    <title>Contents of Bc</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>bc, dc</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="bc">
-        <term><command>bc</command></term>
-        <listitem>
-          <para>is a command line calculator</para>
-          <indexterm zone="ch-system-bc bc">
-            <primary sortas="b-bc">bc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dc">
-        <term><command>dc</command></term>
-          <listitem>
-          <para>is a reverse-polish command line calculator</para>
-          <indexterm zone="ch-system-bc dc">
-            <primary sortas="b-dc">dc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/binutils.xml
===================================================================
--- BOOK/final-system/common/binutils.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,347 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-binutils" role="wrap">
-  <?dbhtml filename="binutils.html"?>
-
-  <title>Binutils-&binutils-version;</title>
-
-  <indexterm zone="ch-system-binutils">
-    <primary sortas="a-Binutils">Binutils</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Binutils package contains a linker, an assembler, and other
-    tools for handling object files.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Binutils</title>
-
-    <para os="b">Verify that the PTYs are working properly inside the build
-    environment. Check that everything is set up correctly by performing a
-    simple test:</para>
-
-<screen os="c" role="nodump"><userinput>expect -c "spawn ls"</userinput></screen>
-
-    <para os="d">This command should give the following output:</para>
-
-<screen os="e"><computeroutput>spawn ls</computeroutput></screen>
-
-    <para os="f">If, instead, it gives a message saying to create more ptys,
-    then the environment is not set up for proper PTY operation. This issue
-    needs to be resolved before running the test suites for Binutils and GCC.</para>
-
-<!-- Branch update patch area
-    <para os="p1">The following patch contains a number of updates to the
-    &binutils-version; branch by the Binutils developers:</para>
-
-    <screen os="p2"><userinput>patch -Np1 -i ../&binutils-branch_update-patch;</userinput></screen>
--->
-
-    <para os="g">The Binutils documentation recommends building Binutils outside of the
-    source directory in a dedicated build directory:</para>
-
-<screen os="h"><userinput>mkdir -v ../binutils-build
-cd ../binutils-build</userinput></screen>
-
-    <para os="i">Prepare Binutils for compilation:</para>
-
-<screen os="ca"><userinput>CC="gcc -isystem /usr/include" \
-LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
-../binutils-&binutils-dir;/configure \
-    --prefix=/usr \
-    --enable-shared \
-    --enable-gold=yes \
-    --enable-plugins \
-    --with-system-zlib \
-    --enable-threads</userinput></screen>
-
-    <para os="j">Compile the package:</para>
-
-<screen os="k"><userinput>make tooldir=/usr</userinput></screen>
-
-<!--    <important os="l">
-      <para>During <command>make tooldir=/usr</command> you may receive the
-      following error message. It is safe to ignore.</para>
-
-<screen><computeroutput>WARNING: `flex' is missing on your system. You should only
-need it if you modified a `.l' file. You may need the `Flex'
-package in order for those modifications to take effect. You
-can get `Flex' from any GNU archive site.</computeroutput></screen>
-    </important> -->
-
-    <variablelist os="n">
-      <title>The meaning of the make parameter:</title>
-
-      <varlistentry>
-        <term><parameter>tooldir=/usr</parameter></term>
-        <listitem>
-          <para>Normally, the tooldir (the directory where the executables
-          will ultimately be located) is set to <filename
-          class="directory">$(exec_prefix)/$(target_alias)</filename>. Because this
-          is a custom system, this target-specific directory in <filename
-          class="directory">/usr</filename> is not required.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-    <important os="o">
-      <para>Due to Binutils' critical role in a properly functioning system,
-      the CLFS developers strongly recommend running the testsuite.</para>
-    </important>
-
-    <para os="p">Test the results:</para>
-
-<screen os="q"><userinput remap="test">make check</userinput></screen>
-
-    <para os="r">Install the package:</para>
-
-<screen os="s"><userinput>make tooldir=/usr install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-binutils" role="content">
-    <title>Contents of Binutils</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed libraries</segtitle>
-      <segtitle>Installed directory</segtitle>
-
-      <seglistitem>
-        <seg>addr2line, ar, as, c++filt, elfedit, gprof, ld, ld.bfd, ld.gold,
-        nm, objcopy, objdump, ranlib, readelf, size, strings, strip</seg>
-        <seg>libbfd.[a,so], libopcodes.[a,so]</seg>
-        <seg>/usr/lib/ldscripts</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="addr2line">
-        <term><command>addr2line</command></term>
-        <listitem>
-          <para>Translates program addresses to file names and line numbers;
-          given an address and the name of an executable, it uses the debugging
-          information in the executable to determine which source file and line
-          number are associated with the address</para>
-          <indexterm zone="ch-system-binutils addr2line">
-            <primary sortas="b-addr2line">addr2line</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ar">
-        <term><command>ar</command></term>
-        <listitem>
-          <para>Creates, modifies, and extracts from archives</para>
-          <indexterm zone="ch-system-binutils ar">
-            <primary sortas="b-ar">ar</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="as">
-        <term><command>as</command></term>
-        <listitem>
-          <para>An assembler that assembles the output of <command>gcc</command>
-          into object files</para>
-          <indexterm zone="ch-system-binutils as">
-            <primary sortas="b-as">as</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="c-filt">
-        <term><command>c++filt</command></term>
-        <listitem>
-          <para>Used by the linker to de-mangle C++ and Java symbols and to keep
-          overloaded functions from clashing</para>
-          <indexterm zone="ch-system-binutils c-filt">
-            <primary sortas="b-c++filt">c++filt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="elfedit">
-        <term><command>elfedit</command></term>
-        <listitem>
-          <para>Updates the ELF header of ELF files</para>
-          <indexterm zone="ch-system-binutils elfedit">
-            <primary sortas="b-elfedit">elfedit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gprof">
-        <term><command>gprof</command></term>
-        <listitem>
-          <para>Displays call graph profile data</para>
-          <indexterm zone="ch-system-binutils gprof">
-            <primary sortas="b-gprof">gprof</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ld">
-        <term><command>ld</command></term>
-        <listitem>
-          <para>A linker that combines a number of object and archive files
-          into a single file, relocating their data and tying up symbol
-          references</para>
-          <indexterm zone="ch-system-binutils ld">
-            <primary sortas="b-ld">ld</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ld.bfd">
-        <term><command>ld.bfd</command></term>
-        <listitem>
-          <para>Hard link to <command>ld</command></para>
-          <indexterm zone="ch-system-binutils ld.bfd">
-            <primary sortas="b-ld.bfd">ld.bfd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ld.gold">
-        <term><command>ld.gold</command></term>
-        <listitem>
-          <para>A linker designed to be faster than <command>ld</command>,
-          especially for large C++ applications.</para>
-          <indexterm zone="ch-system-binutils ld.gold">
-            <primary sortas="b-ld.gold">ld.gold</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="nm">
-        <term><command>nm</command></term>
-        <listitem>
-          <para>Lists the symbols occurring in a given object file</para>
-          <indexterm zone="ch-system-binutils nm">
-            <primary sortas="b-nm">nm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="objcopy">
-        <term><command>objcopy</command></term>
-        <listitem>
-          <para>Translates one type of object file into another</para>
-          <indexterm zone="ch-system-binutils objcopy">
-            <primary sortas="b-objcopy">objcopy</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="objdump">
-        <term><command>objdump</command></term>
-        <listitem>
-          <para>Displays information about the given object file, with options
-          controlling the particular information to display; the information
-          shown is useful to programmers who are working on the compilation
-          tools</para>
-          <indexterm zone="ch-system-binutils objdump">
-            <primary sortas="b-objdump">objdump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ranlib">
-        <term><command>ranlib</command></term>
-        <listitem>
-          <para>Generates an index of the contents of an archive and stores it
-          in the archive; the index lists all of the symbols defined by archive
-          members that are relocatable object files</para>
-          <indexterm zone="ch-system-binutils ranlib">
-            <primary sortas="b-ranlib">ranlib</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="readelf">
-        <term><command>readelf</command></term>
-        <listitem>
-          <para>Displays information about ELF type binaries</para>
-          <indexterm zone="ch-system-binutils readelf">
-            <primary sortas="b-readelf">readelf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="size">
-        <term><command>size</command></term>
-        <listitem>
-          <para>Lists the section sizes and the total size for the given
-          object files</para>
-          <indexterm zone="ch-system-binutils size">
-            <primary sortas="b-size">size</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="strings">
-        <term><command>strings</command></term>
-        <listitem>
-          <para>Outputs, for each given file, the sequences of printable
-          characters that are of at least the specified length (defaulting to
-          four); for object files, it prints, by default, only the strings from
-          the initializing and loading sections while for other types of files,
-          it scans the entire file</para>
-          <indexterm zone="ch-system-binutils strings">
-            <primary sortas="b-strings">strings</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="strip">
-        <term><command>strip</command></term>
-        <listitem>
-          <para>Discards symbols from object files</para>
-          <indexterm zone="ch-system-binutils strip">
-            <primary sortas="b-strip">strip</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libbfd">
-        <term><filename class="libraryfile">libbfd</filename></term>
-        <listitem>
-          <para>The Binary File Descriptor library</para>
-          <indexterm zone="ch-system-binutils libbfd">
-            <primary sortas="c-libbfd">libbfd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libopcodes">
-        <term><filename class="libraryfile">libopcodes</filename></term>
-        <listitem>
-          <para>A library for dealing with opcodes&mdash;the <quote>readable
-          text</quote> versions of instructions for the processor;
-          it is used for building utilities like
-          <command>objdump</command>.</para>
-          <indexterm zone="ch-system-binutils libopcodes">
-            <primary sortas="c-libopcodes">libopcodes</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/bison.xml
===================================================================
--- BOOK/final-system/common/bison.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,108 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-bison" role="wrap">
-  <?dbhtml filename="bison.html"?>
-
-  <title>Bison-&bison-version;</title>
-
-  <indexterm zone="ch-system-bison">
-    <primary sortas="a-Bison">Bison</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Bison package contains a parser generator.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Bison</title>
-
-    <para os="a">Prepare Bison for compilation:</para>
-
-<screen os="b"><userinput>./configure \
-        --prefix=/usr \
-        --docdir=/usr/share/doc/bison-&bison-version;</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">To test the results, issue:</para>
-
-<screen os="e2"><userinput remap="test">make check</userinput></screen>
-
-    <para os="f">Install the package:</para>
-
-<screen os="g"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-bison" role="content">
-    <title>Contents of Bison</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed library</segtitle>
-      <segtitle>Installed directories</segtitle>
-
-      <seglistitem>
-        <seg>bison, yacc</seg>
-        <seg>liby.a</seg>
-        <seg>/usr/share/bison, /usr/share/doc/bison-&bison-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="bison">
-        <term><command>bison</command></term>
-        <listitem>
-          <para>Generates, from a series of rules, a program for analyzing
-          the structure of text files; Bison is a replacement for Yacc (Yet
-          Another Compiler Compiler)</para>
-          <indexterm zone="ch-system-bison bison">
-            <primary sortas="b-bison">bison</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="yacc">
-        <term><command>yacc</command></term>
-        <listitem>
-          <para>A wrapper for <command>bison</command>, meant for programs that
-          still call <command>yacc</command> instead of <command>bison</command>;
-          it calls <command>bison</command> with the <option>-y</option>
-          option</para>
-          <indexterm zone="ch-system-bison yacc">
-            <primary sortas="b-yacc">yacc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="liby.a">
-        <term><filename class="libraryfile">liby.a</filename></term>
-        <listitem>
-          <para>The Yacc library containing implementations of Yacc-compatible
-          <emphasis>yyerror</emphasis> and <emphasis>main</emphasis> functions;
-          this library is normally not very useful, but POSIX requires it</para>
-          <indexterm zone="ch-system-bison liby.a">
-            <primary sortas="c-liby.a">liby.a</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/bzip2.xml
===================================================================
--- BOOK/final-system/common/bzip2.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,224 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-bzip2" role="wrap">
-  <?dbhtml filename="bzip2.html"?>
-
-  <title>Bzip2-&bzip2-version;</title>
-
-  <indexterm zone="ch-system-bzip2">
-    <primary sortas="a-Bzip2">Bzip2</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Bzip2 package contains programs for compressing and
-    decompressing files. Compressing text files with <command>bzip2</command>
-    yields a much better compression percentage than with the traditional
-    <command>gzip</command>.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Bzip2</title>
-
-    <para os="s1">By default Bzip2 creates some symlinks that use absolute
-    pathnames. The following sed will cause them to be created with relative
-    paths instead:</para>
-
-<screen os="s2"><userinput>sed -i -e 's:ln -s -f $(PREFIX)/bin/:ln -s :' Makefile</userinput></screen>
-
-    <para os="s3">Make Bzip2 install its manpages in
-    <filename class="directory">/usr/share/man</filename> instead of
-    <filename class="directory">/usr/man</filename>:</para>
-
-<screen os="s4"><userinput>sed -i 's@X)/man@X)/share/man@g' ./Makefile</userinput></screen>
-
-    <para os="a">The Bzip2 package does not contain a <command>configure</command>
-    script. Compile it with:</para>
-
-<screen os="b"><userinput>make -f Makefile-libbz2_so
-make clean</userinput></screen>
-
-    <para os="c">The <parameter>-f</parameter> flag will cause Bzip2 to be built
-    using a different <filename>Makefile</filename> file, in this case the
-    <filename>Makefile-libbz2_so</filename> file, which creates a dynamic
-    <filename class="libraryfile">libbz2.so</filename> library and links the
-    Bzip2 utilities against it.</para>
-
-    <para os="d">Recompile the package using a non-shared library and test it:</para>
-
-<screen os="e"><userinput>make</userinput></screen>
-
-    <para os="g">Install the programs:</para>
-
-<screen os="h"><userinput>make PREFIX=/usr install</userinput></screen>
-
-    <para os="i">Install the shared <command>bzip2</command> binary into the
-    <filename class="directory">/bin</filename> directory, make
-    some necessary symbolic links, and clean up:</para>
-
-<screen os="j"><userinput>cp -v bzip2-shared /bin/bzip2
-cp -av libbz2.so* /lib
-ln -sv ../../lib/libbz2.so.1.0 /usr/lib/libbz2.so
-rm -v /usr/bin/{bunzip2,bzcat,bzip2}
-ln -sv bzip2 /bin/bunzip2
-ln -sv bzip2 /bin/bzcat</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-bzip2" role="content">
-    <title>Contents of Bzip2</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed libraries</segtitle>
-
-      <seglistitem>
-        <seg>bunzip2 (link to bzip2), bzcat (link to bzip2), bzcmp (link to
-        bzdiff), bzdiff, bzegrep (link to bzgrep), bzfgrep (link to bzgrep),
-        bzgrep, bzip2, bzip2recover, bzless (link to bzmore), bzmore</seg>
-        <seg>libbz2.a, libbz2.so (link to libbz2.so.1.0), libbz2.so.1.0 (link to
-        libbz2.so.&bzip2-version;), libbz2.so.&bzip2-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="bunzip2">
-        <term><command>bunzip2</command></term>
-        <listitem>
-          <para>Decompresses bzipped files</para>
-          <indexterm zone="ch-system-bzip2 bunzip2">
-            <primary sortas="b-bunzip2">bunzip2</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="bzcat">
-        <term><command>bzcat</command></term>
-        <listitem>
-          <para>Decompresses to standard output</para>
-          <indexterm zone="ch-system-bzip2 bzcat">
-            <primary sortas="b-bzcat">bzcat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="bzcmp">
-        <term><command>bzcmp</command></term>
-        <listitem>
-          <para>Runs <command>cmp</command> on bzipped files</para>
-          <indexterm zone="ch-system-bzip2 bzcmp">
-            <primary sortas="b-bzcmp">bzcmp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="bzdiff">
-        <term><command>bzdiff</command></term>
-        <listitem>
-          <para>Runs <command>diff</command> on bzipped files</para>
-          <indexterm zone="ch-system-bzip2 bzdiff">
-            <primary sortas="b-bzdiff">bzdiff</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="bzegrep">
-        <term><command>bzegrep</command></term>
-        <listitem>
-          <para>Runs <command>egrep</command> on bzipped files</para>
-          <indexterm zone="ch-system-bzip2 bzegrep">
-            <primary sortas="b-bzegrep">bzegrep</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="bzfgrep">
-        <term><command>bzfgrep</command></term>
-        <listitem>
-          <para>Runs <command>fgrep</command> on bzipped files</para>
-          <indexterm zone="ch-system-bzip2 bzfgrep">
-            <primary sortas="b-bzfgrep">bzfgrep</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="bzgrep">
-        <term><command>bzgrep</command></term>
-        <listitem>
-          <para>Runs <command>grep</command> on bzipped files</para>
-          <indexterm zone="ch-system-bzip2 bzgrep">
-            <primary sortas="b-bzgrep">bzgrep</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="bzip2">
-        <term><command>bzip2</command></term>
-        <listitem>
-          <para>Compresses files using the Burrows-Wheeler block sorting text
-          compression algorithm with Huffman coding; the compression rate is
-          better than that achieved by more conventional compressors using
-          <quote>Lempel-Ziv</quote> algorithms, like <command>gzip</command></para>
-          <indexterm zone="ch-system-bzip2 bzip2">
-            <primary sortas="b-bzip2">bzip2</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="bzip2recover">
-        <term><command>bzip2recover</command></term>
-        <listitem>
-          <para>Tries to recover data from damaged bzipped files</para>
-          <indexterm zone="ch-system-bzip2 bzip2recover">
-            <primary sortas="b-bzip2recover">bzip2recover</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="bzless">
-        <term><command>bzless</command></term>
-        <listitem>
-          <para>Runs <command>less</command> on bzipped files</para>
-          <indexterm zone="ch-system-bzip2 bzless">
-            <primary sortas="b-bzless">bzless</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="bzmore">
-        <term><command>bzmore</command></term>
-        <listitem>
-          <para>Runs <command>more</command> on bzipped files</para>
-          <indexterm zone="ch-system-bzip2 bzmore">
-            <primary sortas="b-bzmore">bzmore</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libbz2">
-        <term><filename class="libraryfile">libbz2*</filename></term>
-        <listitem>
-          <para>The library implementing lossless, block-sorting data
-          compression, using the Burrows-Wheeler algorithm</para>
-          <indexterm zone="ch-system-bzip2 libbz2">
-            <primary sortas="c-libbz2*">libbz2*</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/coreutils.xml
===================================================================
--- BOOK/final-system/common/coreutils.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,1204 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-coreutils" role="wrap">
-  <?dbhtml filename="coreutils.html"?>
-
-  <title>Coreutils-&coreutils-version;</title>
-
-  <indexterm zone="ch-system-coreutils">
-    <primary sortas="a-Coreutils">Coreutils</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Coreutils package contains utilities for showing and setting the
-    basic system characteristics.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Coreutils</title>
-
-    <para os="p1">A known issue with the <command>uname</command> program from
-    this package is that the <option>-p</option> switch always
-    returns <computeroutput>unknown</computeroutput>. The following patch
-    fixes this behavior for all architectures:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&coreutils-uname-patch;</userinput></screen>
-
-    <para os="c">Now prepare Coreutils for compilation:</para>
-
-<screen os="d"><userinput>FORCE_UNSAFE_CONFIGURE=1 \
-./configure \
-    --prefix=/usr \
-    --enable-no-install-program=kill,uptime \
-    --enable-install-program=hostname \
-    --libexecdir=/usr/lib</userinput></screen>
-
-    <variablelist os="d1">
-      <title>The meaning of the configure options:</title>
-
-        <varlistentry os="d2">
-          <term><parameter>FORCE_UNSAFE_CONFIGURE=1</parameter></term>
-          <listitem>
-            <para>Forces Coreutils to compile when using the root user.</para>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    <para os="e">Compile the package:</para>
-
-<screen os="f"><userinput>make</userinput></screen>
-
-   <para os="g">Now the test suite is ready to be run. First, run
-    the tests that are meant to be run as user
-    <systemitem class="username">root</systemitem>:</para>
-
-<screen os="h"><userinput remap="test">make NON_ROOT_USERNAME=nobody check-root</userinput></screen>
-
-    <para os="i">The test suite will now be run as the
-    <systemitem class="username">nobody</systemitem> user. Some tests require
-    that the user be a member of more than one group. Add a temporary group
-    and make the user <systemitem class="username">nobody</systemitem> a part
-    of it so that the tests are not skipped:</para>
-
-<screen os="j"><userinput remap="test">echo "dummy:x:1000:nobody" &gt;&gt; /etc/group</userinput></screen>
-
-    <para os="k">Fix permissions of some files so the non-root user can compile
-    and run the tests:</para>
-
-<screen os="l"><userinput remap="test">chown -Rv nobody .</userinput></screen>
-
-    <para os="m">Then run the remainder of the tests as the
-    <systemitem class="username">nobody</systemitem> user:</para>
-
-<screen os="n"><userinput remap="test">su nobody -s /bin/bash \
-    -c "PATH=$PATH make RUN_EXPENSIVE_TESTS=yes -k check || true"</userinput></screen>
-
-    <para os="o">Remove the temporary group:</para>
-
-<screen os="p"><userinput remap="test">sed -i '/dummy/d' /etc/group</userinput></screen>
-
-    <para os="q">Install the package:</para>
-
-<screen os="r"><userinput>make install</userinput></screen>
-
-    <para os="s">Move programs to the locations specified by the FHS:</para>
-
-<screen os="t"><userinput>mv -v /usr/bin/{cat,chgrp,chmod,chown,cp,date} /bin
-mv -v /usr/bin/{dd,df,echo,false,hostname,ln,ls,mkdir,mknod} /bin
-mv -v /usr/bin/{mv,pwd,rm,rmdir,stty,true,uname} /bin
-mv -v /usr/bin/chroot /usr/sbin</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-coreutils" role="content">
-    <title>Contents of Coreutils</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed library</segtitle>
-      <segtitle>Installed directory</segtitle>
-
-      <seglistitem>
-        <seg>[, base64, basename, cat, chcon, chgrp, chmod, chown, chroot,
-        cksum, comm, cp, csplit, cut, date, dd, df, dir, dircolors, dirname, du,
-        echo, env, expand, expr, factor, false, fmt, fold, groups, head,
-        hostid, hostname, id, install, join, link, ln, logname, ls, md5sum,
-        mkdir, mkfifo, mknod, mktemp, mv, nice, nl, nohup, nproc, numfmt, od, paste,
-        pathchk, pinky, pr, printenv, printf, ptx, pwd, readlink, realpath, rm,
-        rmdir, runcon, seq, sha1sum, sha224sum, sha256sum, sha384sum,
-        sha512sum, shred, shuf, sleep, sort, split, stat, stdbuf, stty, sum,
-        sync, tac, tail, tee, test, timeout, touch, tr, true, truncate, tsort,
-        tty, uname, unexpand, uniq, unlink, users, vdir, wc, who, whoami, yes</seg>
-        <seg>libstdbuf.so</seg>
-        <seg>/usr/lib/coreutils</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="base64">
-        <term><command>base64</command></term>
-        <listitem>
-          <para>Base64 encode/decode data and print to standard output</para>
-          <indexterm zone="ch-system-coreutils base64">
-            <primary sortas="b-base64">base64</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="basename">
-        <term><command>basename</command></term>
-        <listitem>
-          <para>Strips any path and a given suffix from a file name</para>
-          <indexterm zone="ch-system-coreutils basename">
-            <primary sortas="b-basename">basename</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cat">
-        <term><command>cat</command></term>
-        <listitem>
-          <para>Concatenates files to standard output</para>
-          <indexterm zone="ch-system-coreutils cat">
-            <primary sortas="b-cat">cat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="chcon">
-        <term><command>chcon</command></term>
-        <listitem>
-          <para>Changes security context for files and directories</para>
-          <indexterm zone="ch-system-coreutils chcon">
-            <primary sortas="b-chcon">chcon</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="chgrp">
-        <term><command>chgrp</command></term>
-        <listitem>
-          <para>Changes the group ownership of files and directories</para>
-          <indexterm zone="ch-system-coreutils chgrp">
-            <primary sortas="b-chgrp">chgrp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="chmod">
-        <term><command>chmod</command></term>
-        <listitem>
-          <para>Changes the permissions of each file to the given mode; the mode
-          can be either a symbolic representation of the changes to make or an
-          octal number representing the new permissions</para>
-          <indexterm zone="ch-system-coreutils chmod">
-            <primary sortas="b-chmod">chmod</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="chown">
-        <term><command>chown</command></term>
-        <listitem>
-          <para>Changes the user and/or group ownership of files and
-          directories</para>
-          <indexterm zone="ch-system-coreutils chown">
-            <primary sortas="b-chown">chown</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="chroot">
-        <term><command>chroot</command></term>
-        <listitem>
-          <para>Runs a command with the specified directory as the
-          <filename class="directory">/</filename> directory</para>
-          <indexterm zone="ch-system-coreutils chroot">
-            <primary sortas="b-chroot">chroot</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cksum">
-        <term><command>cksum</command></term>
-        <listitem>
-          <para>Prints the Cyclic Redundancy Check (CRC) checksum and the byte
-          counts of each specified file</para>
-          <indexterm zone="ch-system-coreutils cksum">
-            <primary sortas="b-cksum">cksum</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="comm">
-        <term><command>comm</command></term>
-        <listitem>
-          <para>Compares two sorted files, outputting in three columns the lines
-          that are unique and the lines that are common</para>
-          <indexterm zone="ch-system-coreutils comm">
-            <primary sortas="b-comm">comm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cp">
-        <term><command>cp</command></term>
-        <listitem>
-          <para>Copies files</para>
-          <indexterm zone="ch-system-coreutils cp">
-            <primary sortas="b-cp">cp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="csplit">
-        <term><command>csplit</command></term>
-        <listitem>
-          <para>Splits a given file into several new files, separating them
-          according to given patterns or line numbers and outputting the byte
-          count of each new file</para>
-          <indexterm zone="ch-system-coreutils csplit">
-            <primary sortas="b-csplit">csplit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cut">
-        <term><command>cut</command></term>
-        <listitem>
-          <para>Prints sections of lines, selecting the parts according to given
-          fields or positions</para>
-          <indexterm zone="ch-system-coreutils cut">
-            <primary sortas="b-cut">cut</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="date">
-        <term><command>date</command></term>
-        <listitem>
-          <para>Displays the current time in the given format, or sets the
-          system date</para>
-          <indexterm zone="ch-system-coreutils date">
-            <primary sortas="b-date">date</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dd">
-        <term><command>dd</command> </term>
-        <listitem>
-          <para>Copies a file using the given block size and count, while
-          optionally performing conversions on it</para>
-          <indexterm zone="ch-system-coreutils dd">
-            <primary sortas="b-dd">dd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="df">
-        <term><command>df</command></term>
-        <listitem>
-          <para>Reports the amount of disk space available (and used) on all
-          mounted file systems, or only on the file systems holding the selected
-          files</para>
-          <indexterm zone="ch-system-coreutils df">
-            <primary sortas="b-df">df</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dir">
-        <term><command>dir</command></term>
-        <listitem>
-          <para>Lists the contents of each given directory (the same as
-          the <command>ls</command> command)</para>
-          <indexterm zone="ch-system-coreutils dir">
-            <primary sortas="b-dir">dir</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dircolors">
-        <term><command>dircolors</command></term>
-        <listitem>
-          <para>Outputs commands to set the <envar>LS_COLOR</envar>
-          environment variable to change the color scheme used by
-          <command>ls</command></para>
-          <indexterm zone="ch-system-coreutils dircolors">
-            <primary sortas="b-dircolors">dircolors</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dirname">
-        <term><command>dirname</command></term>
-        <listitem>
-          <para>Strips the non-directory suffix from a file name</para>
-          <indexterm zone="ch-system-coreutils dirname">
-            <primary sortas="b-dirname">dirname</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="du">
-        <term><command>du</command></term>
-        <listitem>
-          <para>Reports the amount of disk space used by the current directory,
-          by each of the given directories (including all subdirectories) or by
-          each of the given files</para>
-          <indexterm zone="ch-system-coreutils du">
-            <primary sortas="b-du">du</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="echo">
-        <term><command>echo</command></term>
-        <listitem>
-          <para>Displays the given strings</para>
-          <indexterm zone="ch-system-coreutils echo">
-            <primary sortas="b-echo">echo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="env">
-        <term><command>env</command></term>
-        <listitem>
-          <para>Runs a command in a modified environment</para>
-          <indexterm zone="ch-system-coreutils env">
-            <primary sortas="b-env">env</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="expand">
-        <term><command>expand</command></term>
-        <listitem>
-          <para>Converts tabs to spaces</para>
-          <indexterm zone="ch-system-coreutils expand">
-            <primary sortas="b-expand">expand</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="expr">
-        <term><command>expr</command></term>
-        <listitem>
-          <para>Evaluates expressions</para>
-          <indexterm zone="ch-system-coreutils expr">
-            <primary sortas="b-expr">expr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="factor">
-        <term><command>factor</command></term>
-        <listitem>
-          <para>Prints the prime factors of all specified integer numbers</para>
-          <indexterm zone="ch-system-coreutils factor">
-            <primary sortas="b-factor">factor</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="false">
-        <term><command>false</command></term>
-        <listitem>
-          <para>Does nothing, unsuccessfully; it always exits with a status code
-          indicating failure</para>
-          <indexterm zone="ch-system-coreutils false">
-            <primary sortas="b-false">false</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fmt">
-        <term><command>fmt</command></term>
-        <listitem>
-          <para>Reformats the paragraphs in the given files</para>
-          <indexterm zone="ch-system-coreutils fmt">
-            <primary sortas="b-fmt">fmt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fold">
-        <term><command>fold</command></term>
-        <listitem>
-          <para>Wraps the lines in the given files</para>
-          <indexterm zone="ch-system-coreutils fold">
-            <primary sortas="b-fold">fold</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="groups">
-        <term><command>groups</command></term>
-        <listitem>
-          <para>Reports a user's group memberships</para>
-          <indexterm zone="ch-system-coreutils groups">
-            <primary sortas="b-groups">groups</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="head">
-        <term><command>head</command></term>
-        <listitem>
-          <para>Prints the first ten lines (or the given number of lines)
-          of each given file</para>
-          <indexterm zone="ch-system-coreutils head">
-            <primary sortas="b-head">head</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hostid">
-        <term><command>hostid</command></term>
-        <listitem>
-          <para>Reports the numeric identifier (in hexadecimal) of the host</para>
-          <indexterm zone="ch-system-coreutils hostid">
-            <primary sortas="b-hostid">hostid</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hostname">
-        <term><command>hostname</command></term>
-        <listitem>
-          <para>Reports or sets the name of the host</para>
-          <indexterm zone="ch-system-coreutils hostname">
-            <primary sortas="b-hostname">hostname</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="id">
-        <term><command>id</command></term>
-        <listitem>
-          <para>Reports the effective user ID, group ID, and group memberships
-          of the current user or specified user</para>
-          <indexterm zone="ch-system-coreutils id">
-            <primary sortas="b-id">id</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="install">
-        <term><command>install</command> </term>
-        <listitem>
-          <para>Copies files while setting their permission modes and, if
-          possible, their owner and group</para>
-          <indexterm zone="ch-system-coreutils install">
-            <primary sortas="b-install">install</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="join">
-        <term><command>join</command></term>
-        <listitem>
-          <para>Joins the lines that have identical join fields from two
-          separate files</para>
-          <indexterm zone="ch-system-coreutils join">
-            <primary sortas="b-join">join</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="link">
-        <term><command>link</command></term>
-        <listitem>
-          <para>Creates a hard link with the given name to a file</para>
-          <indexterm zone="ch-system-coreutils link">
-            <primary sortas="b-link">link</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ln">
-        <term><command>ln</command></term>
-        <listitem>
-          <para>Makes hard links or soft (symbolic) links between files</para>
-          <indexterm zone="ch-system-coreutils ln">
-            <primary sortas="b-ln">ln</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="logname">
-        <term><command>logname</command></term>
-        <listitem>
-          <para>Reports the current user's login name</para>
-          <indexterm zone="ch-system-coreutils logname">
-            <primary sortas="b-logname">logname</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ls">
-        <term><command>ls</command></term>
-        <listitem>
-          <para>Lists the contents of each given directory</para>
-          <indexterm zone="ch-system-coreutils ls">
-            <primary sortas="b-ls">ls</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="md5sum">
-        <term><command>md5sum</command></term>
-        <listitem>
-          <para>Reports or checks Message Digest 5 (MD5) checksums</para>
-          <indexterm zone="ch-system-coreutils md5sum">
-            <primary sortas="b-md5sum">md5sum</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mkdir">
-        <term><command>mkdir</command></term>
-        <listitem>
-          <para>Creates directories with the given names</para>
-          <indexterm zone="ch-system-coreutils mkdir">
-            <primary sortas="b-mkdir">mkdir</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mkfifo">
-        <term><command>mkfifo</command></term>
-        <listitem>
-          <para>Creates First-In, First-Outs (FIFOs), a <quote>named
-          pipe</quote> in UNIX parlance, with the given names</para>
-          <indexterm zone="ch-system-coreutils mkfifo">
-            <primary sortas="b-mkfifo">mkfifo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mknod">
-        <term><command>mknod</command></term>
-        <listitem>
-          <para>Creates device nodes with the given names; a device node is a
-          character special file, a block special file, or a FIFO</para>
-          <indexterm zone="ch-system-coreutils mknod">
-            <primary sortas="b-mknod">mknod</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mktemp">
-        <term><command>mktemp</command></term>
-        <listitem>
-          <para>Creates temporary files in a secure manner; it is used in
-          scripts</para>
-          <indexterm zone="ch-system-coreutils mktemp">
-            <primary sortas="b-mktemp">mktemp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mv">
-        <term><command>mv</command></term>
-        <listitem>
-          <para>Moves or renames files or directories</para>
-          <indexterm zone="ch-system-coreutils mv">
-            <primary sortas="b-mv">mv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="nice">
-        <term><command>nice</command></term>
-        <listitem>
-          <para>Runs a program with modified scheduling priority</para>
-          <indexterm zone="ch-system-coreutils nice">
-            <primary sortas="b-nice">nice</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="nl">
-        <term><command>nl</command></term>
-        <listitem>
-          <para>Numbers the lines from the given files</para>
-          <indexterm zone="ch-system-coreutils nl">
-            <primary sortas="b-nl">nl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="nohup">
-        <term><command>nohup</command></term>
-        <listitem>
-          <para>Runs a command immune to hangups, with its output redirected to
-          a log file</para>
-          <indexterm zone="ch-system-coreutils nohup">
-            <primary sortas="b-nohup">nohup</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="nproc">
-        <term><command>nproc</command></term>
-        <listitem>
-          <para>Prints the number of processing units available to the current
-          process</para>
-          <indexterm zone="ch-system-coreutils nproc">
-            <primary sortas="b-nproc">nproc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="numfmt">
-        <term><command>numfmt</command></term>
-        <listitem>
-          <para>Converts numbers to or from human-readable strings</para>
-          <indexterm zone="ch-system-coreutils numfmt">
-            <primary sortas="b-numfmt">numfmt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="od">
-        <term><command>od</command></term>
-        <listitem>
-          <para>Dumps files in octal and other formats</para>
-          <indexterm zone="ch-system-coreutils od">
-            <primary sortas="b-od">od</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="paste">
-        <term><command>paste</command></term>
-        <listitem>
-          <para>Merges the given files, joining sequentially corresponding lines
-          side by side, separated by tab characters</para>
-          <indexterm zone="ch-system-coreutils paste">
-            <primary sortas="b-paste">paste</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pathchk">
-        <term><command>pathchk</command></term>
-        <listitem>
-          <para>Checks if file names are valid or portable</para>
-          <indexterm zone="ch-system-coreutils pathchk">
-            <primary sortas="b-pathchk">pathchk</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pinky">
-        <term><command>pinky</command></term>
-        <listitem>
-          <para>Is a lightweight finger client; it reports some information
-          about the given users</para>
-          <indexterm zone="ch-system-coreutils pinky">
-            <primary sortas="b-pinky">pinky</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pr">
-        <term><command>pr</command></term>
-        <listitem>
-          <para>Paginates and columnates files for printing</para>
-          <indexterm zone="ch-system-coreutils pr">
-            <primary sortas="b-pr">pr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="printenv">
-        <term><command>printenv</command></term>
-        <listitem>
-          <para>Prints the environment</para>
-          <indexterm zone="ch-system-coreutils printenv">
-            <primary sortas="b-printenv">printenv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="printf">
-        <term><command>printf</command></term>
-        <listitem>
-          <para>Prints the given arguments according to the given format, much
-          like the C printf function</para>
-          <indexterm zone="ch-system-coreutils printf">
-            <primary sortas="b-printf">printf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ptx">
-        <term><command>ptx</command></term>
-        <listitem>
-          <para>Produces a permuted index from the contents of the given files,
-          with each keyword in its context</para>
-          <indexterm zone="ch-system-coreutils ptx">
-            <primary sortas="b-ptx">ptx</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pwd">
-        <term><command>pwd</command></term>
-        <listitem>
-          <para>Reports the name of the current working directory</para>
-          <indexterm zone="ch-system-coreutils pwd">
-            <primary sortas="b-pwd">pwd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="readlink">
-        <term><command>readlink</command></term>
-        <listitem>
-          <para>Reports the value of the given symbolic link</para>
-          <indexterm zone="ch-system-coreutils readlink">
-            <primary sortas="b-readlink">readlink</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="realpath">
-        <term><command>realpath</command></term>
-        <listitem>
-          <para>Prints the resolved path</para>
-          <indexterm zone="ch-system-coreutils realpath">
-            <primary sortas="b-realpath">realpath</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rm">
-        <term><command>rm</command></term>
-        <listitem>
-          <para>Removes files or directories</para>
-          <indexterm zone="ch-system-coreutils rm">
-            <primary sortas="b-rm">rm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rmdir">
-        <term><command>rmdir</command></term>
-        <listitem>
-          <para>Removes directories if they are empty</para>
-          <indexterm zone="ch-system-coreutils rmdir">
-            <primary sortas="b-rmdir">rmdir</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="runcon">
-        <term><command>runcon</command></term>
-        <listitem>
-          <para>Runs a command with specified security context</para>
-          <indexterm zone="ch-system-coreutils runcon">
-            <primary sortas="b-runcon">runcon</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="seq">
-        <term><command>seq</command></term>
-        <listitem>
-          <para>Prints a sequence of numbers within a given range and with a
-          given increment</para>
-          <indexterm zone="ch-system-coreutils seq">
-            <primary sortas="b-seq">seq</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sha1sum">
-        <term><command>sha1sum</command></term>
-        <listitem>
-          <para>Prints or checks 160-bit Secure Hash Algorithm 1 (SHA1)
-          checksums</para>
-          <indexterm zone="ch-system-coreutils sha1sum">
-            <primary sortas="b-sha1sum">sha1sum</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sha224sum">
-        <term><command>sha224sum</command></term>
-        <listitem>
-          <para>Prints or checks SHA224 checksums</para>
-          <indexterm zone="ch-system-coreutils sha224sum">
-            <primary sortas="b-sha224sum">sha224sum</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sha256sum">
-        <term><command>sha256sum</command></term>
-        <listitem>
-          <para>Prints or checks SHA256 checksums</para>
-          <indexterm zone="ch-system-coreutils sha256sum">
-            <primary sortas="b-sha256sum">sha256sum</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sha384sum">
-        <term><command>sha384sum</command></term>
-        <listitem>
-          <para>Prints or checks SHA384 checksums</para>
-          <indexterm zone="ch-system-coreutils sha384sum">
-            <primary sortas="b-sha384sum">sha384sum</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sha512sum">
-        <term><command>sha512sum</command></term>
-        <listitem>
-          <para>Prints or checks SHA512 checksums</para>
-          <indexterm zone="ch-system-coreutils sha512sum">
-            <primary sortas="b-sha512sum">sha512sum</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="shred">
-        <term><command>shred</command></term>
-        <listitem>
-          <para>Overwrites the given files repeatedly with complex patterns,
-          making it difficult to recover the data</para>
-          <indexterm zone="ch-system-coreutils shred">
-            <primary sortas="b-shred">shred</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="shuf">
-        <term><command>shuf</command></term>
-        <listitem>
-          <para>Write a random permutation of the input lines to standard output or a file</para>
-          <indexterm zone="ch-system-coreutils shuf">
-            <primary sortas="b-shuf">shuf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sleep">
-        <term><command>sleep</command></term>
-        <listitem>
-          <para>Pauses for the given amount of time</para>
-          <indexterm zone="ch-system-coreutils sleep">
-            <primary sortas="b-sleep">sleep</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sort">
-        <term><command>sort</command></term>
-        <listitem>
-          <para>Sorts the lines from the given files</para>
-          <indexterm zone="ch-system-coreutils sort">
-            <primary sortas="b-sort">sort</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="split">
-        <term><command>split</command></term>
-        <listitem>
-          <para>Splits the given file into pieces, by size or by number of
-          lines</para>
-          <indexterm zone="ch-system-coreutils split">
-            <primary sortas="b-split">split</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="stat">
-        <term><command>stat</command></term>
-        <listitem>
-          <para>Displays file or filesystem status</para>
-          <indexterm zone="ch-system-coreutils stat">
-            <primary sortas="b-stat">stat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="stdbuf">
-        <term><command>stdbuf</command></term>
-        <listitem>
-          <para>Runs a command with modified buffering operations for its
-          standard streams</para>
-          <indexterm zone="ch-system-coreutils stdbuf">
-            <primary sortas="b-stdbuf">stdbuf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="stty">
-        <term><command>stty</command></term>
-        <listitem>
-          <para>Sets or reports terminal line settings</para>
-          <indexterm zone="ch-system-coreutils stty">
-            <primary sortas="b-stty">stty</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sum">
-        <term><command>sum</command></term>
-        <listitem>
-          <para>Prints checksum and block counts for each given file</para>
-          <indexterm zone="ch-system-coreutils sum">
-            <primary sortas="b-sum">sum</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sync">
-        <term><command>sync</command></term>
-        <listitem>
-          <para>Flushes file system buffers; it forces changed blocks to disk
-          and updates the super block</para>
-          <indexterm zone="ch-system-coreutils sync">
-            <primary sortas="b-sync">sync</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tac">
-        <term><command>tac</command></term>
-        <listitem>
-          <para>Concatenates the given files in reverse</para>
-          <indexterm zone="ch-system-coreutils tac">
-            <primary sortas="b-tac">tac</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tail">
-        <term><command>tail</command></term>
-        <listitem>
-          <para>Prints the last ten lines (or the given number of lines) of each
-          given file</para>
-          <indexterm zone="ch-system-coreutils tail">
-            <primary sortas="b-tail">tail</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tee">
-        <term><command>tee</command></term>
-        <listitem>
-          <para>Reads from standard input while writing both to standard output
-          and to the given files</para>
-          <indexterm zone="ch-system-coreutils tee">
-            <primary sortas="b-tee">tee</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="test">
-        <term><command>test</command> or <command>[</command></term>
-        <listitem>
-          <para>Compares values and checks file types</para>
-          <indexterm zone="ch-system-coreutils test">
-            <primary sortas="b-test">test</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="timeout">
-        <term><command>timeout</command></term>
-        <listitem>
-          <para>Runs a command with a time limit</para>
-          <indexterm zone="ch-system-coreutils timeout">
-            <primary sortas="b-timeout">timeout</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="touch">
-        <term><command>touch</command></term>
-        <listitem>
-          <para>Changes file timestamps, setting the access and modification
-          times of the given files to the current time; files that do not exist
-          are created with zero length</para>
-          <indexterm zone="ch-system-coreutils touch">
-            <primary sortas="b-touch">touch</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tr">
-        <term><command>tr</command></term>
-        <listitem>
-          <para>Translates, squeezes, and deletes the given characters from
-          standard input</para>
-          <indexterm zone="ch-system-coreutils tr">
-            <primary sortas="b-tr">tr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="true">
-        <term><command>true</command></term>
-        <listitem>
-          <para>Does nothing, successfully; it always exits with a status code
-          indicating success</para>
-          <indexterm zone="ch-system-coreutils true">
-            <primary sortas="b-true">true</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="truncate">
-        <term><command>truncate</command></term>
-        <listitem>
-          <para>Shrinks or expands a file to the specified size</para>
-          <indexterm zone="ch-system-coreutils truncate">
-            <primary sortas="b-truncate">truncate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tsort">
-        <term><command>tsort</command></term>
-        <listitem>
-          <para>Performs a topological sort; it writes a completely ordered list
-          according to the partial ordering in a given file</para>
-          <indexterm zone="ch-system-coreutils tsort">
-            <primary sortas="b-tsort">tsort</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tty">
-        <term><command>tty</command></term>
-        <listitem>
-          <para>Reports the file name of the terminal connected to standard
-          input</para>
-          <indexterm zone="ch-system-coreutils tty">
-            <primary sortas="b-tty">tty</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="uname">
-        <term><command>uname</command></term>
-        <listitem>
-          <para>Reports system information</para>
-          <indexterm zone="ch-system-coreutils uname">
-            <primary sortas="b-uname">uname</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="unexpand">
-        <term><command>unexpand</command></term>
-        <listitem>
-          <para>Converts spaces to tabs</para>
-          <indexterm zone="ch-system-coreutils unexpand">
-            <primary sortas="b-unexpand">unexpand</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="uniq">
-        <term><command>uniq</command></term>
-        <listitem>
-          <para>Discards all but one of successive identical lines</para>
-          <indexterm zone="ch-system-coreutils uniq">
-            <primary sortas="b-uniq">uniq</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="unlink">
-        <term><command>unlink</command></term>
-        <listitem>
-          <para>Removes the given file</para>
-          <indexterm zone="ch-system-coreutils unlink">
-            <primary sortas="b-unlink">unlink</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="users">
-        <term><command>users</command></term>
-        <listitem>
-          <para>Reports the names of the users currently logged on</para>
-          <indexterm zone="ch-system-coreutils users">
-            <primary sortas="b-users">users</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vdir">
-        <term><command>vdir</command></term>
-        <listitem>
-          <para>Is the same as <command>ls -l</command></para>
-          <indexterm zone="ch-system-coreutils vdir">
-            <primary sortas="b-vdir">vdir</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="wc">
-        <term><command>wc</command></term>
-        <listitem>
-          <para>Reports the number of lines, words, and bytes for each given
-          file, as well as a total line when more than one file is given</para>
-          <indexterm zone="ch-system-coreutils wc">
-            <primary sortas="b-wc">wc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="who">
-        <term><command>who</command></term>
-        <listitem>
-          <para>Reports who is logged on</para>
-          <indexterm zone="ch-system-coreutils who">
-            <primary sortas="b-who">who</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="whoami">
-        <term><command>whoami</command></term>
-        <listitem>
-          <para>Reports the user name associated with the current effective
-          user ID</para>
-          <indexterm zone="ch-system-coreutils whoami">
-            <primary sortas="b-whoami">whoami</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="yes">
-        <term><command>yes</command></term>
-        <listitem>
-          <para>Repeatedly outputs <quote>y</quote> or a given string until
-          killed</para>
-          <indexterm zone="ch-system-coreutils yes">
-            <primary sortas="b-yes">yes</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libstdbuf">
-        <term><filename class="libraryfile">libstdbuf</filename></term>
-        <listitem>
-          <para>Library used by <command>stdbuf</command></para>
-          <indexterm zone="ch-system-coreutils libstdbuf">
-            <primary sortas="c-libstdbuf">libstdbuf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/dbus.xml
===================================================================
--- BOOK/final-system/common/dbus.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,159 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-dbus" role="wrap">
-  <?dbhtml filename="dbus.html"?>
-
-  <title>D-Bus-&dbus-version;</title>
-
-  <indexterm zone="ch-system-dbus">
-    <primary sortas="a-D-Bus">D-Bus</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>D-Bus is a message bus system, a simple way for applications
-    to talk to one another.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of D-Bus</title>
-
-    <para os="a">Prepare D-Bus for compilation:</para>
-
-<screen os="b"><userinput>./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --libexecdir=/usr/lib/dbus-1.0 \
-    --localstatedir=/var \
-    --with-systemdsystemunitdir=/lib/systemd/system \
-    --docdir=/usr/share/doc/dbus-&dbus-version;</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">This package does come with a test suite, but it requires
-    several packages that are not included in CLFS. Instructions for running
-    the test suite can be found in the CBLFS wiki at
-    <ulink url="&cblfs-root;index.php/D-BUS_Core"/>.</para>
-
-    <para os="f">Install the package:</para>
-
-<screen os="g"><userinput>make install</userinput></screen>
-
-    <para os="h">Move the shared library to <filename class="directory">/lib
-    </filename> and recreate the symbolic link.</para>
-
-<screen os="i"><userinput>mv -v /usr/lib/libdbus-1.so.* /lib
-ln -sfv ../../lib/$(readlink /usr/lib/libdbus-1.so) /usr/lib/libdbus-1.so</userinput></screen>
-
-    <para os="j">Create a symlink so that D-Bus and systemd can use the same
-    <filename>machine-id</filename> file:</para>
-
-<screen os="k"><userinput>ln -sv /etc/machine-id /var/lib/dbus</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-dbus" role="content">
-    <title>Contents of D-Bus</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed libraries</segtitle>
-      <segtitle>Installed directories</segtitle>
-
-      <seglistitem>
-        <seg>dbus-cleanup-sockets, dbus-daemon, dbus-launch, dbus-monitor, dbus-send, dbus-uuidgen</seg>
-        <seg>libdbus-1.[a,so]</seg>
-        <seg>/etc/dbus-1, /usr/include/dbus-1.0, /usr/lib/dbus-1.0,
-        /usr/share/doc/dbus-&dbus-version;, /var/lib/dbus</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="dbus-cleanup-sockets">
-        <term><command>dbus-cleanup-sockets</command></term>
-        <listitem>
-          <para>Cleans up leftover sockets in a directory</para>
-          <indexterm zone="ch-system-dbus dbus-cleanup-sockets">
-            <primary sortas="b-dbus-cleanup-sockets">dbus-cleanup-sockets</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dbus-daemon">
-        <term><command>dbus-daemon</command></term>
-        <listitem>
-          <para>The message bus daemon</para>
-          <indexterm zone="ch-system-dbus dbus-daemon">
-            <primary sortas="b-dbus-daemon">dbus-daemon</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dbus-uuidgen">
-        <term><command>dbus-uuidgen</command></term>
-        <listitem>
-          <para>Utility to generate UUIDs</para>
-          <indexterm zone="ch-system-dbus dbus-uuidgen">
-            <primary sortas="b-dbus-uuidgen">dbus-uuidgen</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dbus-monitor">
-        <term><command>dbus-monitor</command></term>
-        <listitem>
-          <para>A debug probe that prints message bus messages</para>
-          <indexterm zone="ch-system-dbus dbus-monitor">
-            <primary sortas="b-dbus-monitor">dbus-monitor</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dbus-launch">
-        <term><command>dbus-launch</command></term>
-        <listitem>
-          <para>Utility to start a message bus from a shell script</para>
-          <indexterm zone="ch-system-dbus dbus-launch">
-            <primary sortas="b-dbus-launch">dbus-launch</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dbus-send">
-        <term><command>dbus-send</command></term>
-        <listitem>
-          <para>Send a message to a message bus</para>
-          <indexterm zone="ch-system-dbus dbus-send">
-            <primary sortas="b-dbus-send">dbus-send</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libdbus-1">
-        <term><filename class="libraryfile">libdbus-1</filename></term>
-        <listitem>
-          <para>Library containing the API for using the message bus</para>
-          <indexterm zone="ch-system-dbus libdbus-1">
-            <primary sortas="c-libdbus-1">libdbus-1</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/diffutils.xml
===================================================================
--- BOOK/final-system/common/diffutils.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,118 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-diffutils" role="wrap">
-  <?dbhtml filename="diffutils.html"?>
-
-  <title>Diffutils-&diffutils-version;</title>
-
-  <indexterm zone="ch-system-diffutils">
-    <primary sortas="a-Diffutils">Diffutils</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Diffutils package contains programs that show the differences
-    between files or directories.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Diffutils</title>
-
-    <para os="s1">Fix a bug that prevents locale files from being installed:</para>
-
-<screen os="s2"><userinput>sed -i 's:= @mkdir_p@:= /bin/mkdir -p:' po/Makefile.in.in</userinput></screen>
-
-    <para os="a">Prepare Diffutils for compilation:</para>
-
-<screen os="b"><userinput>./configure \
-    --prefix=/usr</userinput></screen>
-
-    <para os="s5">Diffutils wants <command>ed</command> as the default editor
-    for <command>sdiff</command>. The following <command>sed</command> will
-    change the default to <command>vi</command>:</para>
-
-<screen os="s6"><userinput>sed -i 's@\(^#define DEFAULT_EDITOR_PROGRAM \).*@\1"vi"@' lib/config.h</userinput></screen>
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">To test the results, issue:</para>
-
-<screen os="e2"><userinput remap="test">make check</userinput></screen>
-
-    <para os="f">Install the package:</para>
-
-<screen os="g"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-diffutils" role="content">
-    <title>Contents of Diffutils</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>cmp, diff, diff3, sdiff</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="cmp">
-        <term><command>cmp</command></term>
-        <listitem>
-          <para>Compares two files and reports whether or in which bytes
-          they differ</para>
-          <indexterm zone="ch-system-diffutils cmp">
-            <primary sortas="b-cmp">cmp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="diff">
-        <term><command>diff</command></term>
-        <listitem>
-          <para>Compares two files or directories and reports which lines in
-          the files differ</para>
-          <indexterm zone="ch-system-diffutils diff">
-            <primary sortas="b-diff">diff</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="diff3">
-        <term><command>diff3</command></term>
-        <listitem>
-          <para>Compares three files line by line</para>
-          <indexterm zone="ch-system-diffutils diff3">
-            <primary sortas="b-diff3">diff3</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sdiff">
-        <term><command>sdiff</command></term>
-        <listitem>
-          <para>Merges two files and interactively outputs the results</para>
-          <indexterm zone="ch-system-diffutils sdiff">
-            <primary sortas="b-sdiff">sdiff</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/e2fsprogs.xml
===================================================================
--- BOOK/final-system/common/e2fsprogs.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,500 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-e2fsprogs" role="wrap">
-  <?dbhtml filename="e2fsprogs.html"?>
-
-  <title>E2fsprogs-&e2fsprogs-version;</title>
-
-  <indexterm zone="ch-system-e2fsprogs">
-    <primary sortas="a-E2fsprogs">E2fsprogs</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The E2fsprogs package contains the utilities for handling the
-    <systemitem class="filesystem">ext2</systemitem> file system. It also
-    supports the <systemitem class="filesystem">ext3</systemitem> and
-    <systemitem class="filesystem">ext4</systemitem> journaling
-    file systems.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of E2fsprogs</title>
-
-    <para os="a">The E2fsprogs documentation recommends that the package be
-    built in a subdirectory of the source tree:</para>
-
-<screen os="b"><userinput>mkdir -v build
-cd build</userinput></screen>
-
-    <para os="c">Prepare E2fsprogs for compilation:</para>
-
-<screen os="d"><userinput>../configure \
-    --prefix=/usr \
-    --bindir=/bin \
-    --with-root-prefix="" \
-    --enable-elf-shlibs \
-    --disable-libblkid \
-    --disable-libuuid \
-    --disable-fsck \
-    --disable-uuidd</userinput></screen>
-
-    <variablelist os="e">
-      <title>The meaning of the configure options:</title>
-
-      <varlistentry os="e1">
-        <term><parameter>--with-root-prefix=""</parameter></term>
-        <listitem>
-          <para>Certain programs (such as the <command>e2fsck</command>
-          program) are considered essential programs. When, for example,
-          <filename class="directory">/usr</filename> is not mounted,
-          these programs still need to be available. They belong in
-          directories like <filename class="directory">/lib</filename> and
-          <filename class="directory">/sbin</filename>. If this option is
-          not passed to E2fsprogs' configure, the programs are installed into
-          the <filename class="directory">/usr</filename> directory.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="e2">
-        <term><parameter>--enable-elf-shlibs</parameter></term>
-        <listitem>
-          <para>This creates the shared libraries which some programs
-          in this package use.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="e3">
-        <term><parameter>--disable-*</parameter></term>
-        <listitem>
-          <para>This prevents E2fsprogs from building and installing the
-          <systemitem class="library">libuuid</systemitem> and
-          <systemitem class="library">libblkid</systemitem> libraries, the
-          <systemitem class="daemon">uuidd</systemitem> daemon, and the
-          <command>fsck</command> wrapper, as Util-Linux installed all of
-          them earlier.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para os="f">Compile the package:</para>
-
-<screen os="g"><userinput>make</userinput></screen>
-
-    <para os="h">To test the results, issue:</para>
-
-<screen os="h2"><userinput remap="test">make check</userinput></screen>
-
-    <para os="i">Install the binaries, documentation and shared libraries:</para>
-
-<screen os="j"><userinput>make install</userinput></screen>
-
-    <para os="k">Install the static libraries and headers:</para>
-
-<screen os="l"><userinput>make install-libs</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-e2fsprogs" role="content">
-    <title>Contents of E2fsprogs</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed libraries</segtitle>
-      <segtitle>Installed directories</segtitle>
-
-      <seglistitem>
-        <seg>badblocks, chattr, compile_et, debugfs, dumpe2fs, e2freefrag,
-        e2fsck, e2image, e2initrd_helper, e2label, e2undo, e4defrag, filefrag,
-        fsck.ext2, fsck.ext3, fsck.ext4, fsck.ext4dev, logsave, lsattr,
-        mk_cmds, mke2fs, mkfs.ext2, mkfs.ext3, mkfs.ext4, mkfs.ext4dev,
-        mklost+found, resize2fs, tune2fs</seg>
-        <seg>libcom_err.[a,so], libe2p.[a,so], libext2fs.[a,so],
-        libss.[a,so], libquota.a</seg>
-        <seg>/usr/include/e2p, /usr/include/et, /usr/include/ext2fs,
-        /usr/include/quota, /usr/include/ss, /usr/share/et, /usr/share/ss</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="badblocks">
-        <term><command>badblocks</command></term>
-        <listitem>
-          <para>Searches a device (usually a disk partition) for bad
-          blocks</para>
-          <indexterm zone="ch-system-e2fsprogs badblocks">
-            <primary sortas="b-badblocks">badblocks</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="chattr">
-        <term><command>chattr</command></term>
-        <listitem>
-          <para>Changes the attributes on a Linux file system</para>
-          <indexterm zone="ch-system-e2fsprogs chattr">
-            <primary sortas="b-chattr">chattr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="compile_et">
-        <term><command>compile_et</command></term>
-        <listitem>
-          <para>An error table compiler; it converts a table of error-code
-          names and messages into a C source file suitable for use with the
-          <filename class="libraryfile">com_err</filename> library</para>
-          <indexterm zone="ch-system-e2fsprogs compile_et">
-            <primary sortas="b-compile_et">compile_et</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="debugfs">
-        <term><command>debugfs</command></term>
-        <listitem>
-          <para>A file system debugger; it can be used to examine and change
-          the state of an <systemitem class="filesystem">ext2</systemitem>
-          file system</para>
-          <indexterm zone="ch-system-e2fsprogs debugfs">
-            <primary sortas="b-debugfs">debugfs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dumpe2fs">
-        <term><command>dumpe2fs</command></term>
-        <listitem>
-          <para>Prints the super block and blocks group information for the
-          file system present on a given device</para>
-          <indexterm zone="ch-system-e2fsprogs dumpe2fs">
-            <primary sortas="b-dumpe2fs">dumpe2fs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="e2freefrag">
-        <term><command>e2freefrag</command></term>
-        <listitem>
-          <para> Reports free space fragmentation information</para>
-          <indexterm zone="ch-system-e2fsprogs e2freefrag">
-            <primary sortas="b-e2freefrag">e2freefrag</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="e2fsck">
-        <term><command>e2fsck</command></term>
-        <listitem>
-          <para>Is used to check, and optionally repair <systemitem
-          class="filesystem">ext2</systemitem>, <systemitem
-          class="filesystem">ext3</systemitem> and <systemitem
-          class="filesystem">ext4</systemitem>file systems</para>
-          <indexterm zone="ch-system-e2fsprogs e2fsck">
-            <primary sortas="b-e2fsck">e2fsck</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="e2image">
-        <term><command>e2image</command></term>
-        <listitem>
-          <para>Is used to save critical <systemitem
-          class="filesystem">ext2</systemitem> file system data to a file</para>
-          <indexterm zone="ch-system-e2fsprogs e2image">
-            <primary sortas="b-e2image">e2image</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="e2initrd_helper">
-        <term><command>e2initrd_helper</command></term>
-        <listitem>
-          <para>Prints the FS type of a given filesystem, given either a
-          device name or label</para>
-          <indexterm zone="ch-system-e2fsprogs e2initrd_helper">
-            <primary sortas="b-e2initrd_helper">e2initrd_helper</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="e2label">
-        <term><command>e2label</command></term>
-        <listitem>
-          <para>Displays or changes the file system label on the <systemitem
-          class="filesystem">ext2</systemitem> file system present on a given
-          device</para>
-          <indexterm zone="ch-system-e2fsprogs e2label">
-            <primary sortas="b-e2label">e2label</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="e2undo">
-        <term><command>e2undo</command></term>
-        <listitem>
-          <para>Replays an undo log for an ext2/ext3/ext4 filesystem</para>
-          <indexterm zone="ch-system-e2fsprogs e2undo">
-            <primary sortas="b-e2undo">e2undo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="e4defrag">
-        <term><command>e4defrag</command></term>
-        <listitem>
-          <para>Online defragmenter for ext4 filesystems</para>
-          <indexterm zone="ch-system-e2fsprogs e4defrag">
-            <primary sortas="b-e4defrag">e4defrag</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="filefrag">
-        <term><command>filefrag</command></term>
-        <listitem>
-          <para>Reports on how badly fragmented a particular file might be</para>
-          <indexterm zone="ch-system-e2fsprogs filefrag">
-            <primary sortas="b-filefrag">filefrag</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fsck.ext2">
-        <term><command>fsck.ext2</command></term>
-        <listitem>
-          <para>By default checks <systemitem class="filesystem">ext2</systemitem>
-          file systems</para>
-          <indexterm zone="ch-system-e2fsprogs fsck.ext2">
-            <primary sortas="b-fsck.ext2">fsck.ext2</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fsck.ext3">
-        <term><command>fsck.ext3</command></term>
-        <listitem>
-          <para>By default checks <systemitem class="filesystem">ext3</systemitem>
-          file systems</para>
-          <indexterm zone="ch-system-e2fsprogs fsck.ext3">
-            <primary sortas="b-fsck.ext3">fsck.ext3</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fsck.ext4">
-        <term><command>fsck.ext4</command></term>
-        <listitem>
-          <para>By default checks <systemitem class="filesystem">ext4</systemitem>
-          file systems</para>
-          <indexterm zone="ch-system-e2fsprogs fsck.ext4">
-            <primary sortas="b-fsck.ext4">fsck.ext4</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fsck.ext4dev">
-        <term><command>fsck.ext4dev</command></term>
-        <listitem>
-          <para>By default checks <systemitem class="filesystem">ext4dev</systemitem>
-          file systems</para>
-          <indexterm zone="ch-system-e2fsprogs fsck.ext4dev">
-            <primary sortas="b-fsck.ext4dev">fsck.ext4dev</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="logsave">
-        <term><command>logsave</command></term>
-        <listitem>
-          <para>Saves the output of a command in a log file</para>
-          <indexterm zone="ch-system-e2fsprogs logsave">
-            <primary sortas="b-logsave">logsave</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lsattr">
-        <term><command>lsattr</command></term>
-        <listitem>
-          <para>Lists the attributes of files on a second extended file
-          system</para>
-          <indexterm zone="ch-system-e2fsprogs lsattr">
-            <primary sortas="b-lsattr">lsattr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mk_cmds">
-        <term><command>mk_cmds</command></term>
-        <listitem>
-          <para>Converts a table of command names and help messages into a C
-          source file suitable for use with the <filename
-          class="libraryfile">libss</filename> subsystem library</para>
-          <indexterm zone="ch-system-e2fsprogs mk_cmds">
-            <primary sortas="b-mk_cmds">mk_cmds</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mke2fs">
-        <term><command>mke2fs</command></term>
-        <listitem>
-          <para>Creates an <systemitem class="filesystem">ext2</systemitem>,
-          <systemitem class="filesystem">ext3</systemitem> or <systemitem
-          class="filesystem">ext4</systemitem> file system on the given device</para>
-          <indexterm zone="ch-system-e2fsprogs mke2fs">
-            <primary sortas="b-mke2fs">mke2fs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mkfs.ext2">
-        <term><command>mkfs.ext2</command></term>
-        <listitem>
-          <para>By default creates <systemitem class="filesystem">ext2</systemitem>
-          file systems</para>
-          <indexterm zone="ch-system-e2fsprogs mkfs.ext2">
-            <primary sortas="b-mkfs.ext2">mkfs.ext2</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mkfs.ext3">
-        <term><command>mkfs.ext3</command></term>
-        <listitem>
-          <para>By default creates <systemitem class="filesystem">ext3</systemitem>
-          file systems</para>
-          <indexterm zone="ch-system-e2fsprogs mkfs.ext3">
-            <primary sortas="b-mkfs.ext3">mkfs.ext3</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mkfs.ext4">
-        <term><command>mkfs.ext4</command></term>
-        <listitem>
-          <para>By default creates <systemitem class="filesystem">ext4</systemitem>
-          file systems</para>
-          <indexterm zone="ch-system-e2fsprogs mkfs.ext4">
-            <primary sortas="b-mkfs.ext4">mkfs.ext4</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mkfs.ext4dev">
-        <term><command>mkfs.ext4dev</command></term>
-        <listitem>
-          <para>By default creates <systemitem class="filesystem">ext4dev</systemitem>
-          file systems</para>
-          <indexterm zone="ch-system-e2fsprogs mkfs.ext4dev">
-            <primary sortas="b-mkfs.ext4dev">mkfs.ext4dev</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mklost-found">
-        <term><command>mklost+found</command></term>
-        <listitem>
-          <para>Used to create a <filename class="directory">lost+found</filename>
-          directory on an <systemitem class="filesystem">ext2</systemitem> file
-          system; it pre-allocates disk blocks to this directory to lighten the
-          task of <command>e2fsck</command></para>
-          <indexterm zone="ch-system-e2fsprogs mklost-found">
-            <primary sortas="b-mklost+found">mklost+found</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="resize2fs">
-        <term><command>resize2fs</command></term>
-        <listitem>
-          <para>Can be used to enlarge or shrink an <systemitem
-          class="filesystem">ext2</systemitem> file system</para>
-          <indexterm zone="ch-system-e2fsprogs resize2fs">
-            <primary sortas="b-resize2fs">resize2fs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tune2fs">
-        <term><command>tune2fs</command></term>
-        <listitem>
-          <para>Adjusts tunable file system parameters on an <systemitem
-          class="filesystem">ext2</systemitem> file system</para>
-          <indexterm zone="ch-system-e2fsprogs tune2fs">
-            <primary sortas="b-tune2fs">tune2fs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcom_err">
-        <term><filename class="libraryfile">libcom_err</filename></term>
-        <listitem>
-          <para>The common error display routine</para>
-          <indexterm zone="ch-system-e2fsprogs libcom_err">
-            <primary sortas="c-libcom_err">libcom_err</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libe2p">
-        <term><filename class="libraryfile">libe2p</filename></term>
-        <listitem>
-          <para>Used by <command>dumpe2fs</command>, <command>chattr</command>,
-          and <command>lsattr</command></para>
-          <indexterm zone="ch-system-e2fsprogs libe2p">
-            <primary sortas="c-libe2p">libe2p</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libext2fs">
-        <term><filename class="libraryfile">libext2fs</filename></term>
-        <listitem>
-          <para>Contains routines to enable user-level programs to manipulate an
-          <systemitem class="filesystem">ext2</systemitem> file system</para>
-          <indexterm zone="ch-system-e2fsprogs libext2fs">
-            <primary sortas="c-libext2fs">libext2fs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libquota">
-        <term><filename class="libraryfile">libquota</filename></term>
-        <listitem>
-          <para>Provides an interface for creating and updating quota files
-          and ext4 superblock fields</para>
-          <indexterm zone="ch-system-e2fsprogs libquota">
-            <primary sortas="c-libquota">libquota</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libss">
-        <term><filename class="libraryfile">libss</filename></term>
-        <listitem>
-          <para>Used by <command>debugfs</command></para>
-          <indexterm zone="ch-system-e2fsprogs libss">
-            <primary sortas="c-libss">libss</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/expat.xml
===================================================================
--- BOOK/final-system/common/expat.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,97 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-expat" role="wrap">
-  <?dbhtml filename="expat.html"?>
-
-  <title>Expat-&expat-version;</title>
-
-  <indexterm zone="ch-system-expat">
-    <primary sortas="a-Expat">Expat</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>Expat is a stream-oriented XML parser library written in C.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Expat</title>
-
-    <para os="a">Prepare Expat for compilation:</para>
-
-<screen os="b"><userinput>./configure \
-    --prefix=/usr</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">To test the results, issue:</para>
-
-<screen os="e2"><userinput remap="test">make check</userinput></screen>
-
-    <para os="f">Install the package:</para>
-
-<screen os="g"><userinput>make install</userinput></screen>
-
-    <para os="h">Install the documentation:</para>
-
-<screen os="i"><userinput>install -v -m755 -d /usr/share/doc/expat-&expat-version;
-install -v -m644 doc/*.{html,png,css} /usr/share/doc/expat-&expat-version;</userinput></screen>
-
-
-  </sect2>
-
-  <sect2 id="contents-expat" role="content">
-    <title>Contents of Expat</title>
-
-    <segmentedlist>
-      <segtitle>Installed program</segtitle>
-      <segtitle>Installed library</segtitle>
-      <segtitle>Installed directory</segtitle>
-
-      <seglistitem>
-        <seg>xmlwf</seg>
-        <seg>libexpat.[so,a]</seg>
-        <seg>/usr/share/doc/expat-&expat-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="xmlwf">
-        <term><command>xmlwf</command></term>
-        <listitem>
-          <para>is a non-validating utility to check whether or not XML
-          documents are well formed</para>
-          <indexterm zone="ch-system-expat xmlwf">
-            <primary sortas="b-xmlwf">xmlwf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libexpat">
-        <term><filename class="libraryfile">libexpat</filename></term>
-        <listitem>
-          <para>contains API functions for parsing XML</para>
-          <indexterm zone="ch-system-expat libexpat">
-            <primary sortas="c-libexpat">libexpat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/file.xml
===================================================================
--- BOOK/final-system/common/file.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,92 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-file" role="wrap">
-  <?dbhtml filename="file.html"?>
-
-  <title>File-&file-version;</title>
-
-  <indexterm zone="ch-system-file">
-    <primary sortas="a-File">File</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The File package contains a utility for determining the type of
-    a given file or files.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of File</title>
-
-    <para os="a">Prepare File for compilation:</para>
-
-<screen os="b"><userinput>./configure \
-    --prefix=/usr</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">To test the results, issue:</para>
-
-<screen os="e2"><userinput remap="test">make check</userinput></screen>
-
-    <para os="f">Install the package:</para>
-
-<screen os="g"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-file" role="content">
-    <title>Contents of File</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed library</segtitle>
-
-      <seglistitem>
-        <seg>file</seg>
-        <seg>libmagic.[a,so]</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="file">
-        <term><command>file</command></term>
-        <listitem>
-          <para>Tries to classify each given file; it does this by performing
-          several tests&mdash;file system tests, magic number tests, and
-          language tests</para>
-          <indexterm zone="ch-system-file file">
-            <primary sortas="b-file">file</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libmagic">
-        <term><filename class="libraryfile">libmagic</filename></term>
-        <listitem>
-          <para>Contains routines for magic number recognition, used by the
-          <command>file</command> program</para>
-          <indexterm zone="ch-system-file libmagic">
-            <primary sortas="c-libmagic">libmagic</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/findutils.xml
===================================================================
--- BOOK/final-system/common/findutils.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,176 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-findutils" role="wrap">
-  <?dbhtml filename="findutils.html"?>
-
-  <title>Findutils-&findutils-version;</title>
-
-  <indexterm zone="ch-system-findutils">
-    <primary sortas="a-Findutils">Findutils</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Findutils package contains programs to find files. These programs
-    are provided to recursively search through a directory tree and to
-    create, maintain, and search a database (often faster than the recursive
-    find, but unreliable if the database has not been recently updated).</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Findutils</title>
-
-    <para os="a">Prepare Findutils for compilation:</para>
-
-<screen os="b"><userinput>./configure \
-    --prefix=/usr \
-    --libexecdir=/usr/lib/locate \
-    --localstatedir=/var/lib/locate</userinput></screen>
-
-    <variablelist os="c">
-      <title>The meaning of the configure options:</title>
-
-      <varlistentry>
-        <term><parameter>--localstatedir</parameter></term>
-        <listitem>
-          <para>This option changes the location of the <command>locate</command>
-          database to be in <filename class="directory">/var/lib/locate</filename>,
-          which is FHS-compliant.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para os="d">Compile the package:</para>
-
-<screen os="e"><userinput>make</userinput></screen>
-
-    <para os="f">To test the results, issue:</para>
-
-<screen os="f2"><userinput remap="test">make check</userinput></screen>
-
-    <para os="g">Install the package:</para>
-
-<screen os="h"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-findutils" role="content">
-    <title>Contents of Findutils</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed directory</segtitle>
-
-      <seglistitem>
-        <seg>bigram, code, find, frcode, locate, oldfind, updatedb, xargs</seg>
-        <seg>/usr/lib/locate</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="bigram">
-        <term><command>bigram</command></term>
-        <listitem>
-          <para>Was formerly used to produce <command>locate</command>
-          databases</para>
-          <indexterm zone="ch-system-findutils bigram">
-            <primary sortas="b-bigram">bigram</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="code">
-        <term><command>code</command></term>
-        <listitem>
-          <para>Was formerly used to produce <command>locate</command>
-          databases; it is the ancestor of <command>frcode</command>.</para>
-          <indexterm zone="ch-system-findutils code">
-            <primary sortas="b-code">code</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="find">
-        <term><command>find</command></term>
-        <listitem>
-          <para>Searches given directory trees for files matching the specified
-          criteria</para>
-          <indexterm zone="ch-system-findutils find">
-            <primary sortas="b-find">find</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="frcode">
-        <term><command>frcode</command></term>
-        <listitem>
-          <para>Is called by <command>updatedb</command> to compress the list
-          of file names; it uses front-compression, reducing the database size
-          by a factor of four to five.</para>
-          <indexterm zone="ch-system-findutils frcode">
-            <primary sortas="b-frcode">frcode</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="locate">
-        <term><command>locate</command></term>
-        <listitem>
-          <para>Searches through a database of file names and reports the names
-          that contain a given string or match a given pattern</para>
-          <indexterm zone="ch-system-findutils locate">
-            <primary sortas="b-locate">locate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="oldfind">
-        <term><command>oldfind</command></term>
-        <listitem>
-          <para>Older version of find, using a different algorithm</para>
-          <indexterm zone="ch-system-findutils oldfind">
-            <primary sortas="b-oldfind">oldfind</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="updatedb">
-        <term><command>updatedb</command></term>
-        <listitem>
-          <para>Updates the <command>locate</command> database; it scans the
-          entire file system (including other file systems that are currently
-          mounted, unless told not to) and puts every file name it finds into
-          the database</para>
-          <indexterm zone="ch-system-findutils updatedb">
-            <primary sortas="b-updatedb">updatedb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xargs">
-        <term><command>xargs</command></term>
-        <listitem>
-          <para>Can be used to apply a given command to a list of files</para>
-          <indexterm zone="ch-system-findutils xargs">
-            <primary sortas="b-xargs">xargs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/flex.xml
===================================================================
--- BOOK/final-system/common/flex.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,139 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-flex" role="wrap">
-  <?dbhtml filename="flex.html"?>
-
-  <title>Flex-&flex-version;</title>
-
-  <indexterm zone="ch-system-flex">
-    <primary sortas="a-Flex">Flex</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Flex package contains a utility for generating programs that
-    recognize patterns in text.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Flex</title>
-
-    <para os="a">Prepare Flex for compilation:</para>
-
-<screen os="b"><userinput>./configure \
-    --prefix=/usr \
-    --docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">To test the results, issue:</para>
-
-<screen os="e2"><userinput remap="test">make check</userinput></screen>
-
-    <para os="e3">The test suite will report 3 failures for tests that
-    use <command>bison</command>, which is not installed yet. For full
-    test coverage, you can run Flex's test suite again after Bison
-    is installed.</para>
-
-    <para os="f">Install the package:</para>
-
-<screen os="g"><userinput>make install</userinput></screen>
-
-    <para os="h">A few programs do not know about <command>flex</command> yet and
-    try to run its predecessor, <command>lex</command>. To support those
-    programs, create a symbolic link named <filename>lex</filename> that
-    runs <filename>flex</filename> in <command>lex</command> emulation
-    mode:</para>
-
-<screen os="i"><userinput>ln -sv flex /usr/bin/lex</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-flex" role="content">
-    <title>Contents of Flex</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed libraries</segtitle>
-      <segtitle>Installed directory</segtitle>
-
-      <seglistitem>
-        <seg>flex, flex++ (link to flex), lex</seg>
-        <seg>libfl.[a,so], libfl_pic.[a,so]</seg>
-        <seg>/usr/share/doc/flex-&flex-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="flex">
-        <term><command>flex</command></term>
-        <listitem>
-          <para>A tool for generating programs that recognize patterns in text;
-          it allows for the versatility to specify the rules for pattern-finding,
-          eradicating the need to develop a specialized program</para>
-          <indexterm zone="ch-system-flex flex">
-            <primary sortas="b-flex">flex</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="flexpp">
-        <term><command>flex++</command></term>
-        <listitem>
-          <para>Link to <command>flex</command> which makes it generate C++
-          scanner classes</para>
-          <indexterm zone="ch-system-flex flexpp">
-            <primary sortas="b-flex++">flex++</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lex">
-        <term><command>lex</command></term>
-        <listitem>
-          <para>A script that runs <command>flex</command> in
-          <command>lex</command> emulation mode</para>
-          <indexterm zone="ch-system-flex lex">
-            <primary sortas="b-lex">lex</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libfl">
-        <term><filename class="libraryfile">libfl</filename></term>
-        <listitem>
-          <para>The <filename class="libraryfile">flex</filename> library</para>
-          <indexterm zone="ch-system-flex libfl">
-            <primary sortas="c-libfl">libfl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libfl_pic">
-        <term><filename class="libraryfile">libfl_pic</filename></term>
-        <listitem>
-          <para>The <filename class="libraryfile">flex</filename> library</para>
-          <indexterm zone="ch-system-flex libfl_pic">
-            <primary sortas="c-libfl">libfl_pic</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/gawk.xml
===================================================================
--- BOOK/final-system/common/gawk.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,158 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-gawk" role="wrap">
-  <?dbhtml filename="gawk.html"?>
-
-  <title>Gawk-&gawk-version;</title>
-
-  <indexterm zone="ch-system-gawk">
-    <primary sortas="a-Gawk">Gawk</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Gawk package contains programs for manipulating text
-    files.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Gawk</title>
-
-    <para os="a">Prepare Gawk for compilation:</para>
-
-<screen os="b"><userinput>./configure \
-    --prefix=/usr \
-    --libexecdir=/usr/lib</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">To test the results, issue:</para>
-
-<screen os="e2"><userinput remap="test">make check</userinput></screen>
-
-    <para os="f">Install the package:</para>
-
-<screen os="g"><userinput>make install</userinput></screen>
-
-    <para os="h">Install the documentation:</para>
-
-<screen os="i"><userinput>mkdir -v /usr/share/doc/gawk-&gawk-version;
-cp -v doc/{awkforai.txt,*.{eps,pdf,jpg}} /usr/share/doc/gawk-&gawk-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-gawk" role="content">
-    <title>Contents of Gawk</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed directories</segtitle>
-
-      <seglistitem>
-        <seg>awk (link to gawk), gawk, gawk-&gawk-version;, grcat, igawk,
-        pgawk, pgawk-&gawk-version;, pwcat</seg>
-        <seg>/usr/lib/awk, /usr/lib/gawk, /usr/share/awk,
-        /usr/share/doc/gawk-&gawk-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="awk">
-        <term><command>awk</command></term>
-        <listitem>
-          <para>A link to <command>gawk</command></para>
-          <indexterm zone="ch-system-gawk awk">
-            <primary sortas="b-awk">awk</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gawk">
-        <term><command>gawk</command></term>
-        <listitem>
-          <para>A program for manipulating text files; it is the GNU
-          implementation of <command>awk</command></para>
-          <indexterm zone="ch-system-gawk gawk">
-            <primary sortas="b-gawk">gawk</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gawk-version">
-        <term><command>gawk-&gawk-version;</command></term>
-          <listitem>
-          <para>A hard link to <command>gawk</command></para>
-          <indexterm zone="ch-system-gawk gawk-version">
-            <primary sortas="b-gawk-&gawk-version;">gawk-&gawk-version;</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="grcat">
-        <term><command>grcat</command></term>
-        <listitem>
-          <para>Dumps the group database <filename>/etc/group</filename></para>
-          <indexterm zone="ch-system-gawk grcat">
-            <primary sortas="b-grcat">grcat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="igawk">
-        <term><command>igawk</command></term>
-        <listitem>
-          <para>Gives <command>gawk</command> the ability to include files</para>
-          <indexterm zone="ch-system-gawk igawk">
-            <primary sortas="b-igawk">igawk</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pgawk">
-        <term><command>pgawk</command></term>
-        <listitem>
-          <para>The profiling version of <command>gawk</command></para>
-          <indexterm zone="ch-system-gawk pgawk">
-            <primary sortas="b-pgawk">pgawk</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pgawk-version">
-        <term><command>pgawk-&gawk-version;</command></term>
-        <listitem>
-          <para>Hard link to <command>pgawk</command></para>
-          <indexterm zone="ch-system-gawk pgawk-version">
-            <primary sortas="b-pgawk-&gawk-version;">pgawk-&gawk-version;</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pwcat">
-        <term><command>pwcat</command></term>
-        <listitem>
-          <para>Dumps the password database <filename>/etc/passwd</filename></para>
-          <indexterm zone="ch-system-gawk pwcat">
-            <primary sortas="b-pwcat">pwcat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/gcc.xml
===================================================================
--- BOOK/final-system/common/gcc.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,428 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-gcc" role="wrap">
-  <?dbhtml filename="gcc.html"?>
-
-  <title>GCC-&gcc-version;</title>
-
-  <indexterm zone="ch-system-gcc">
-    <primary sortas="a-GCC">GCC</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The GCC package contains the GNU compiler collection, which includes
-    the C and C++ compilers.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GCC</title>
-
-<!--GCC Branch Update Area
-    <para os="p1">The following patch contains a number of updates to the
-    &gcc-version; branch by the GCC developers:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&gcc-branch_update-patch;</userinput></screen>
--->
-
-    <para os="fix1">Apply a <command>sed</command> substitution that will
-    suppress the execution of the <command>fixincludes</command> script:</para>
-
-<screen os="fix2"><userinput>sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in</userinput></screen>
-
-    <para os="f">The GCC documentation recommends building GCC outside of the source
-    directory in a dedicated build directory:</para>
-
-<screen os="g"><userinput>mkdir -v ../gcc-build
-cd ../gcc-build</userinput></screen>
-
-    <para os="h">Prepare GCC for compilation:</para>
-
-<screen os="i"><userinput>SED=sed CC="gcc -isystem /usr/include" \
-CXX="g++ -isystem /usr/include" \
-LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
-../gcc-&gcc-version;/configure \
-    --prefix=/usr \
-    --libexecdir=/usr/lib \
-    --enable-languages=c,c++ \
-    --disable-multilib \
-    --with-system-zlib \
-    --enable-install-libiberty \
-    --disable-bootstrap</userinput></screen>
-
-    <variablelist os="i1">
-      <title>The meaning of the new configure options:</title>
-
-      <varlistentry>
-        <term><parameter>SED=sed</parameter></term>
-        <listitem>
-          <para>This prevents a hard-coded path to
-          <filename>/tools/bin/sed</filename> in the <command>fixincl</command>
-          program.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--disable-bootstrap</parameter></term>
-        <listitem>
-          <para>For a native build, GCC defaults to performing a 3-stage
-          "bootstrap" of the compiler. This means that GCC is compiled a total
-          of 3 times - it is compiled once, the first stage compiler is used
-          to build itself again, and the second stage compiler builds itself
-          once more. The second and third passes are then compared, verifying
-          that GCC is able to reproduce itself successfully. However, there is
-          no need for this with the CLFS build process so we disable it here.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para os="j">Compile the package:</para>
-
-<screen os="k"><userinput>make</userinput></screen>
-
-    <important os="l">
-      <para>Due to GCC's critical role in a properly functioning system,
-      the CLFS developers strongly recommend running the testsuite.</para>
-    </important>
-
-   <para os="s1">Increase the stack size prior to running the tests:</para>
-
-<screen os="s2"><userinput remap="test">ulimit -s 32768</userinput></screen>
-
-    <para os="m">Test the results, but do not stop at errors:</para>
-
-<screen os="n"><userinput remap="test">make -k check</userinput></screen>
-
-    <para os="o">The <parameter>-k</parameter> flag is used to make the test suite
-    run through to completion and not stop at the first failure. The GCC test
-    suite is very comprehensive and is almost guaranteed to generate a few
-    failures. To receive a summary of the test suite results, run:</para>
-
-<screen os="p"><userinput remap="test">../gcc-&gcc-version;/contrib/test_summary</userinput></screen>
-
-    <para os="q">For only the summaries, pipe the output through
-    <userinput>grep -A7 Summ</userinput>.</para>
-
-    <para os="r">A few unexpected failures cannot always be avoided. The
-    GCC developers are usually aware of these issues, but have not
-    resolved them yet.</para>
-
-    <para os="s">Install the package:</para>
-
-<screen os="t"><userinput>make install</userinput></screen>
-
-    <para os="w">Create a link to satisfy FHS requirements:</para>
-
-<screen os="x"><userinput>ln -sv ../usr/bin/cpp /lib</userinput></screen>
-
-    <para os="y">Many packages use the name <command>cc</command> to call the C
-    compiler. To satisfy those packages, create a symlink:</para>
-
-<screen os="z"><userinput>ln -sv gcc /usr/bin/cc</userinput></screen>
-
-    <para os="aa">Finally, move a misplaced file:</para>
-
-<screen os="ab"><userinput>mv -v /usr/lib/libstdc++*gdb.py /usr/share/gdb/auto-load/usr/lib</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-gcc" role="content">
-    <title>Contents of GCC</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed libraries</segtitle>
-      <segtitle>Installed directories</segtitle>
-
-      <seglistitem>
-        <seg>c++, cc (link to gcc), cpp, g++, gcc, gcov, gcov-tool</seg>
-        <seg>libasan.[a,so], libatomic.[a,so], libcc1.so, libcilkrts.[a,so],
-        libgcc.a, libgcc_eh.a, libgcc_s.so, libgcov.a, libgomp.[a,so],
-        libiberty.a, libitm.[a,so], liblsan.[a,so], liblto_plugin.so,
-        libquadmath.[a,so], libssp.[a,so], libssp_nonshared.a,
-        libstdc++.[a,so], libsupc++.a, libtsan.[a,so], libubsan.[a,so],
-        libvtv.[a,so]</seg>
-        <seg>/usr/include/[c++,libiberty], /usr/lib/gcc,
-        /usr/share/gcc-&gcc-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="cc">
-        <term><command>cc</command></term>
-        <listitem>
-          <para>The C compiler</para>
-          <indexterm zone="ch-system-gcc cc">
-            <primary sortas="b-cc">cc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cpp">
-        <term><command>cpp</command></term>
-        <listitem>
-          <para>The C preprocessor; it is used by the compiler to expand the
-          #include, #define, and similar statements in the source files</para>
-          <indexterm zone="ch-system-gcc cpp">
-            <primary sortas="b-cpp">cpp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="c">
-        <term><command>c++</command></term>
-        <listitem>
-          <para>The C++ compiler</para>
-          <indexterm zone="ch-system-gcc c">
-            <primary sortas="b-c++">c++</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="g">
-        <term><command>g++</command></term>
-        <listitem>
-          <para>The C++ compiler</para>
-          <indexterm zone="ch-system-gcc g">
-            <primary sortas="b-g++">g++</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gcc">
-        <term><command>gcc</command></term>
-        <listitem>
-          <para>The C compiler</para>
-          <indexterm zone="ch-system-gcc gcc">
-            <primary sortas="b-gcc">gcc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gcov">
-        <term><command>gcov</command></term>
-        <listitem>
-          <para>A coverage testing tool; it is used to analyze programs to
-          determine where optimizations will have the most effect</para>
-          <indexterm zone="ch-system-gcc gcov">
-            <primary sortas="b-gcov">gcov</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gcovtool">
-        <term><command>gcov-tool</command></term>
-        <listitem>
-          <para>An offline tool to handle gcda counts</para>
-          <indexterm zone="ch-system-gcc gcovtool">
-            <primary sortas="b-gcov-tool">gcov-tool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libasan">
-        <term><filename class="libraryfile">libasan</filename></term>
-        <listitem>
-          <para>The Address Sanitizer runtime library</para>
-          <indexterm zone="ch-system-gcc libasan">
-            <primary sortas="c-libasan">libasan</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libatomic">
-        <term><filename class="libraryfile">libatomic</filename></term>
-        <listitem>
-          <para>A GCC support runtime library for atomic operations not
-          supported by hardware</para>
-          <indexterm zone="ch-system-gcc libatomic">
-            <primary sortas="c-libatomic">libatomic</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcc1">
-        <term><filename class="libraryfile">libcc1</filename></term>
-        <listitem>
-          <para>Translates API into RPC calls</para>
-          <indexterm zone="ch-system-gcc libcc1">
-            <primary sortas="c-libcc1">libcc1</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcilkrts">
-        <term><filename class="libraryfile">libcilkrts</filename></term>
-        <listitem>
-          <para>Intel&reg; Cilk&trade; Plus runtime library</para>
-          <indexterm zone="ch-system-gcc libcilkrts">
-            <primary sortas="c-libcilkrts">libcilkrts</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgcc">
-        <term><filename class="libraryfile">libgcc</filename></term>
-        <listitem>
-          <para>Contains run-time support for <command>gcc</command></para>
-          <indexterm zone="ch-system-gcc libgcc">
-            <primary sortas="c-libgcc*">libgcc*</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgcov">
-        <term><filename class="libraryfile">libgcov</filename></term>
-        <listitem>
-          <para>Library that is linked into a program when
-          <command>gcc</command> is instructed to enable profiling</para>
-          <indexterm zone="ch-system-gcc libgcov">
-            <primary sortas="c-libgcov">libgcov</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgomp">
-        <term><filename class="libraryfile">libgomp</filename></term>
-        <listitem>
-          <para>GNU implementation of the OpenMP API for multi-platform
-          shared-memory parallel programming in C/C++ and Fortran</para>
-          <indexterm zone="ch-system-gcc libgomp">
-            <primary sortas="c-libgomp">libgomp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libiberty">
-        <term><filename class="libraryfile">libiberty</filename></term>
-        <listitem>
-          <para>Contains routines used by various GNU programs, including
-          <command>getopt</command>, <command>obstack</command>,
-          <command>strerror</command>, <command>strtol</command>, and
-          <command>strtoul</command></para>
-          <indexterm zone="ch-system-gcc libiberty">
-            <primary sortas="c-libiberty">libiberty</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libitm">
-        <term><filename class="libraryfile">libitm</filename></term>
-        <listitem>
-          <para>The GNU Transactional Memory Library, which provides
-          transaction support for accesses to a process's memory</para>
-          <indexterm zone="ch-system-gcc libitm">
-            <primary sortas="c-libitm*">libitm*</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="liblsan">
-        <term><filename class="libraryfile">liblsan</filename></term>
-        <listitem>
-          <para>The Leak Sanitizer runtime library</para>
-          <indexterm zone="ch-system-gcc liblsan">
-            <primary sortas="c-liblsan">liblsan</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="liblto_plugin">
-        <term><filename class="libraryfile">liblto_plugin</filename></term>
-        <listitem>
-          <para>Runtime library for GCC's link-time optimization plugin</para>
-          <indexterm zone="ch-system-gcc liblto_plugin">
-            <primary sortas="c-liblto_plugin">liblto_plugin</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libquadmath">
-        <term><filename class="libraryfile">libquadmath</filename></term>
-        <listitem>
-          <para>The GCC Quad-Precision Math Libarary API</para>
-          <indexterm zone="ch-system-gcc libquadmath">
-            <primary sortas="c-libquadmath*">libquadmath*</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libssp">
-        <term><filename class="libraryfile">libssp</filename></term>
-        <listitem>
-          <para>Contains routines supporting GCC's stack-smashing protection
-          functionality</para>
-          <indexterm zone="ch-system-gcc libssp">
-            <primary sortas="c-libssp*">libssp*</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libstdc">
-        <term><filename class="libraryfile">libstdc++</filename></term>
-        <listitem>
-          <para>The standard C++ library</para>
-          <indexterm zone="ch-system-gcc libstdc">
-            <primary sortas="c-libstdc++">libstdc++</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libsupc">
-        <term><filename class="libraryfile">libsupc++</filename></term>
-        <listitem>
-          <para>Provides supporting routines for the C++ programming
-          language</para>
-          <indexterm zone="ch-system-gcc libsupc">
-            <primary sortas="c-libsupc++">libsupc++</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libtsan">
-        <term><filename class="libraryfile">libtsan</filename></term>
-        <listitem>
-          <para>The Thread Sanitizer runtime library</para>
-          <indexterm zone="ch-system-gcc libtsan">
-            <primary sortas="c-libtsan">libtsan</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libubsan">
-        <term><filename class="libraryfile">libubsan</filename></term>
-        <listitem>
-          <para>The Undefined Behavior Sanitizer runtime library</para>
-          <indexterm zone="ch-system-gcc libubsan">
-            <primary sortas="c-libubsan">libubsan</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libvtv">
-        <term><filename class="libraryfile">libvtv</filename></term>
-        <listitem>
-          <para>The Virtual Table Verification runtime library</para>
-          <indexterm zone="ch-system-gcc libvtv">
-            <primary sortas="c-libvtv">libvtv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/gdbm.xml
===================================================================
--- BOOK/final-system/common/gdbm.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,134 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-gdbm" role="wrap">
-  <?dbhtml filename="gdbm.html"?>
-
-  <title>GDBM-&gdbm-version;</title>
-
-  <indexterm zone="ch-system-gdbm">
-    <primary sortas="a-Gdbm">GDBM</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The GDBM package contains the GNU Database Manager. This is a disk
-    file format database which stores key/data-pairs in single files. The
-    actual data of any record being stored is indexed by a unique key, which can
-    be retrieved in less time than if it was stored in a text file.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GDBM</title>
-
-    <para os="a">Prepare GDBM for compilation:</para>
-
-<screen os="b"><userinput>./configure \
-    --prefix=/usr \
-    --enable-libgdbm-compat</userinput></screen>
-
-    <variablelist os="c">
-      <title>The meaning of the configure option:</title>
-
-      <varlistentry>
-        <term><envar>--enable-libgdbm-compat</envar></term>
-        <listitem>
-          <para>This switch enables the libgdbm compatibility library to be
-          built, as some packages outside of CLFS may require the older DBM
-          routines it provides.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-    <para os="d">Compile the package:</para>
-
-<screen os="e"><userinput>make</userinput></screen>
-
-    <para os="f">To test the results, issue:</para>
-
-<screen os="g"><userinput remap="test">make check</userinput></screen>
-
-    <para os="h">Install the package:</para>
-
-<screen os="i"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-gdbm" role="content">
-    <title>Contents of GDBM</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed libraries</segtitle>
-
-      <seglistitem>
-        <seg>gdbm_dump, gdbm_load, gdbmtool</seg>
-        <seg>libgdbm.{a,so}, libgdbm_compat.{a,so}</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gdbm_dump">
-        <term><command>gdbm_dump</command></term>
-        <listitem>
-          <para>Dumps a GDBM database to a file.</para>
-          <indexterm zone="ch-system-gdbm gdbm_dump">
-            <primary sortas="b-gdbm_dump">gdbm_dump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gdbm_load">
-        <term><command>gdbm_load</command></term>
-        <listitem>
-          <para>Recreates a GDBM database from a dump file.</para>
-          <indexterm zone="ch-system-gdbm gdbm_load">
-            <primary sortas="b-gdbm_load">gdbm_load</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gdbmtool">
-        <term><command>gdbmtool</command></term>
-        <listitem>
-          <para>Tests and modifies a GDBM database</para>
-          <indexterm zone="ch-system-gdbm gdbmtool">
-            <primary sortas="b-gdbmtool">gdbmtool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgdbm">
-        <term><filename class="libraryfile">libgdbm</filename></term>
-        <listitem>
-          <para>Contains functions to manipulate a hashed database</para>
-          <indexterm zone="ch-system-gdbm libgdbm">
-            <primary sortas="c-libgdbm">libgdbm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgdbm_compat">
-        <term><filename class="libraryfile">libgdbm_compat</filename></term>
-        <listitem>
-          <para>Compatibility library containing older DBM functions</para>
-          <indexterm zone="ch-system-gdbm libgdbm_compat">
-            <primary sortas="c-libgdbm_compat">libgdbm_compat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/gettext.xml
===================================================================
--- BOOK/final-system/common/gettext.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,409 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-gettext" role="wrap">
-  <?dbhtml filename="gettext.html"?>
-
-  <title>Gettext-&gettext-version;</title>
-
-  <indexterm zone="ch-system-gettext">
-    <primary sortas="a-Gettext">Gettext</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Gettext package contains utilities for internationalization
-    and localization. These allow programs to be compiled with NLS (Native
-    Language Support), enabling them to output messages in the user's native
-    language.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Gettext</title>
-
-    <para os="a">Prepare Gettext for compilation:</para>
-
-<screen os="b"><userinput>./configure \
-    --prefix=/usr \
-    --docdir=/usr/share/doc/gettext-&gettext-version;</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">To test the results, issue:</para>
-
-<screen os="e2"><userinput remap="test">make check</userinput></screen>
-
-    <para os="f">Install the package:</para>
-
-<screen os="g"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-gettext" role="content">
-    <title>Contents of Gettext</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed libraries</segtitle>
-      <segtitle>Installed directories</segtitle>
-
-      <seglistitem>
-        <seg>autopoint, config.charset, config.rpath, envsubst, gettext,
-        gettext.sh, gettextize, hostname, msgattrib, msgcat, msgcmp, msgcomm,
-        msgconv, msgen, msgexec, msgfilter, msgfmt, msggrep, msginit, msgmerge,
-        msgunfmt, msguniq, ngettext, recode-sr-latin, xgettext</seg>
-        <seg>libasprintf.[a,so], libgettextlib.so, libgettextpo.[a,so],
-        libgettextsrc.so, preloadable_libintl.so</seg>
-        <seg>/usr/lib/gettext, /usr/share/doc/gettext-&gettext-version;,
-        /usr/share/gettext</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="autopoint">
-        <term><command>autopoint</command></term>
-        <listitem>
-          <para>Copies standard Gettext infrastructure files into a source
-          package</para>
-          <indexterm zone="ch-system-gettext autopoint">
-            <primary sortas="b-autopoint">autopoint</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="config.charset">
-        <term><command>config.charset</command></term>
-        <listitem>
-          <para>Outputs a system-dependent table of character encoding aliases</para>
-          <indexterm zone="ch-system-gettext config.charset">
-            <primary sortas="b-config.charset">config.charset</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="config.rpath">
-        <term><command>config.rpath</command></term>
-        <listitem>
-          <para>Outputs a system-dependent set of variables, describing how to
-          set the runtime search path of shared libraries in an executable</para>
-          <indexterm zone="ch-system-gettext config.rpath">
-            <primary sortas="b-config.rpath">config.rpath</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="envsubst">
-        <term><command>envsubst</command></term>
-        <listitem>
-          <para>Substitutes environment variables in shell format strings</para>
-          <indexterm zone="ch-system-gettext envsubst">
-            <primary sortas="b-envsubst">envsubst</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gettext">
-        <term><command>gettext</command></term>
-        <listitem>
-          <para>Translates a natural language message into the user's language
-          by looking up the translation in a message catalog</para>
-          <indexterm zone="ch-system-gettext gettext">
-            <primary sortas="b-gettext">gettext</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gettext.sh">
-        <term><command>gettext.sh</command></term>
-        <listitem>
-          <para>Primarily serves as a shell function library for gettext</para>
-          <indexterm zone="ch-system-gettext gettext.sh">
-            <primary sortas="b-gettext.sh">gettext.sh</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gettextize">
-        <term><command>gettextize</command></term>
-        <listitem>
-          <para>Copies all standard Gettext files into the given top-level
-          directory of a package to begin internationalizing it</para>
-          <indexterm zone="ch-system-gettext gettextize">
-            <primary sortas="b-gettextize">gettextize</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hostname-gettext">
-        <term><command>hostname</command></term>
-        <listitem>
-          <para>Displays a network hostname in various forms</para>
-          <indexterm zone="ch-system-gettext hostname-gettext">
-            <primary sortas="b-hostname-gettext">hostname</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="msgattrib">
-        <term><command>msgattrib</command></term>
-        <listitem>
-          <para>Filters the messages of a translation catalog according to their
-          attributes and manipulates the attributes</para>
-          <indexterm zone="ch-system-gettext msgattrib">
-            <primary sortas="b-msgattrib">msgattrib</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="msgcat">
-        <term><command>msgcat</command></term>
-        <listitem>
-          <para>Concatenates and merges the given
-          <filename class="extension">.po</filename> files</para>
-          <indexterm zone="ch-system-gettext msgcat">
-            <primary sortas="b-msgcat">msgcat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="msgcmp">
-        <term><command>msgcmp</command></term>
-        <listitem>
-          <para>Compares two <filename class="extension">.po</filename>
-          files to check that both contain the same set of msgid strings</para>
-          <indexterm zone="ch-system-gettext msgcmp">
-            <primary sortas="b-msgcmp">msgcmp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="msgcomm">
-        <term><command>msgcomm</command></term>
-        <listitem>
-          <para>Finds the messages that are common to to the given
-          <filename class="extension">.po</filename> files</para>
-          <indexterm zone="ch-system-gettext msgcomm">
-            <primary sortas="b-msgcomm">msgcomm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="msgconv">
-        <term><command>msgconv</command></term>
-        <listitem>
-          <para>Converts a translation catalog to a different character
-          encoding</para>
-          <indexterm zone="ch-system-gettext msgconv">
-            <primary sortas="b-msgconv">msgconv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="msgen">
-        <term><command>msgen</command></term>
-        <listitem>
-          <para>Creates an English translation catalog</para>
-          <indexterm zone="ch-system-gettext msgen">
-            <primary sortas="b-msgen">msgen</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="msgexec">
-        <term><command>msgexec</command></term>
-        <listitem>
-          <para>Applies a command to all translations of a translation
-          catalog</para>
-          <indexterm zone="ch-system-gettext msgexec">
-            <primary sortas="b-msgexec">msgexec</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="msgfilter">
-        <term><command>msgfilter</command></term>
-        <listitem>
-          <para>Applies a filter to all translations of a translation
-          catalog</para>
-          <indexterm zone="ch-system-gettext msgfilter">
-            <primary sortas="b-msgfilter">msgfilter</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="msgfmt">
-        <term><command>msgfmt</command></term>
-        <listitem>
-          <para>Generates a binary message catalog from a translation
-          catalog</para>
-          <indexterm zone="ch-system-gettext msgfmt">
-            <primary sortas="b-msgfmt">msgfmt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="msggrep">
-        <term><command>msggrep</command></term>
-        <listitem>
-          <para>Extracts all messages of a translation catalog that match a
-          given pattern or belong to some given source files</para>
-          <indexterm zone="ch-system-gettext msggrep">
-            <primary sortas="b-msggrep">msggrep</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="msginit">
-        <term><command>msginit</command></term>
-        <listitem>
-          <para>Creates a new <filename class="extension">.po</filename> file,
-          initializing the meta information with values from the user's
-          environment</para>
-          <indexterm zone="ch-system-gettext msginit">
-            <primary sortas="b-msginit">msginit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="msgmerge">
-        <term><command>msgmerge</command></term>
-        <listitem>
-          <para>Combines two raw translations into a single file</para>
-          <indexterm zone="ch-system-gettext msgmerge">
-            <primary sortas="b-msgmerge">msgmerge</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="msgunfmt">
-        <term><command>msgunfmt</command></term>
-        <listitem>
-          <para>Decompiles a binary message catalog into raw translation
-          text</para>
-          <indexterm zone="ch-system-gettext msgunfmt">
-            <primary sortas="b-msgunfmt">msgunfmt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="msguniq">
-        <term><command>msguniq</command></term>
-        <listitem>
-          <para>Unifies duplicate translations in a translation catalog</para>
-          <indexterm zone="ch-system-gettext msguniq">
-            <primary sortas="b-msguniq">msguniq</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ngettext">
-        <term><command>ngettext</command></term>
-        <listitem>
-          <para>Displays native language translations of a textual message whose
-          grammatical form depends on a number</para>
-          <indexterm zone="ch-system-gettext ngettext">
-            <primary sortas="b-ngettext">ngettext</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="recode-sr-latin">
-        <term><command>recode-sr-latin</command></term>
-        <listitem>
-          <para>Recode Serbian text from Cyrillic to Latin script.</para>
-          <indexterm zone="ch-system-gettext recode-sr-latin">
-            <primary sortas="b-recode-sr-latin">recode-sr-latin</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xgettext">
-        <term><command>xgettext</command></term>
-        <listitem>
-          <para>Extracts the translatable message lines from the given source
-          files to make the first translation template</para>
-          <indexterm zone="ch-system-gettext xgettext">
-            <primary sortas="b-xgettext">xgettext</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libasprintf">
-        <term><filename class="libraryfile">libasprintf</filename></term>
-        <listitem>
-          <para>defines the <emphasis>autosprintf</emphasis> class, which makes
-          C formatted output routines usable in C++ programs, for use with the
-          <emphasis>&lt;string&gt;</emphasis> strings and the
-          <emphasis>&lt;iostream&gt;</emphasis> streams</para>
-          <indexterm zone="ch-system-gettext libasprintf">
-            <primary sortas="c-libasprintf">libasprintf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgettextlib">
-        <term><filename class="libraryfile">libgettextlib</filename></term>
-        <listitem>
-          <para>a private library containing common routines used by the
-          various Gettext programs; these are not intended for general use</para>
-          <indexterm zone="ch-system-gettext libgettextlib">
-            <primary sortas="c-libgettextlib">libgettextlib</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgettextpo">
-        <term><filename class="libraryfile">libgettextpo</filename></term>
-        <listitem>
-          <para>Used to write specialized programs that process
-          <filename class="extension">.po</filename> files; this library is
-          used when the standard applications shipped with Gettext (such as
-          <command>msgcomm</command>, <command>msgcmp</command>,
-          <command>msgattrib</command>, and <command>msgen</command>) will
-          not suffice</para>
-          <indexterm zone="ch-system-gettext libgettextpo">
-            <primary sortas="c-libgettextpo">libgettextpo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgettextsrc">
-        <term><filename class="libraryfile">libgettextsrc</filename></term>
-        <listitem>
-          <para>A private library containing common routines used by the
-          various Gettext programs; these are not intended for general use</para>
-          <indexterm zone="ch-system-gettext libgettextsrc">
-            <primary sortas="c-libgettextsrc">libgettextsrc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="preloadable_libintl.so">
-        <term><filename class="libraryfile">preloadable_libintl.so</filename></term>
-        <listitem>
-          <para>A library, intended to be used by LD_PRELOAD, that assists
-          <filename class="libraryfile">libintl</filename> in logging
-          untranslated messages.</para>
-          <indexterm zone="ch-system-gettext preloadable_libintl.so">
-            <primary sortas="c-preloadable_libintl.so">preloadable_libintl.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/glibc.xml
===================================================================
--- BOOK/final-system/common/glibc.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,900 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-glibc" role="wrap">
-  <?dbhtml filename="glibc.html"?>
-
-  <title>Glibc-&glibc-version;</title>
-
-  <indexterm zone="ch-system-glibc">
-    <primary sortas="a-Glibc">Glibc</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Glibc package contains the main C library. This library provides
-    the basic routines for allocating memory, searching directories, opening and
-    closing files, reading and writing files, string handling, pattern matching,
-    arithmetic, and so on.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Glibc</title>
-
-    <note os="z">
-      <para>Some packages outside of CLFS suggest installing GNU libiconv in
-      order to translate data from one encoding to another. The project's
-      home page (<ulink url="http://www.gnu.org/software/libiconv/"/>) says
-      <quote>This library provides an <function>iconv()</function>
-      implementation, for use on systems which don't have one, or whose
-      implementation cannot convert from/to Unicode.</quote> Glibc provides
-      an <function>iconv()</function> implementation and can convert from/to
-      Unicode, therefore libiconv is not required on a CLFS system.</para>
-    </note>
-
-    <para os="l1">At the end of the installation, the build system will run
-    a sanity test to make sure everything installed properly. This script
-    performs its tests by attempting to compile test programs against certain
-    libraries. However it does not specify the path to
-    <filename class="libraryfile">ld.so</filename>, and our toolchain
-    is still configured to use the one in
-    <filename class="directory">/tools</filename>. The following set of
-    commands will force the script to use the complete path of the new
-    <filename class="libraryfile">ld.so</filename> that was just installed:</para>
-
-<screen os="l2"><userinput>LINKER=$(readelf -l /tools/bin/bash | sed -n 's@.*interpret.*/tools\(.*\)]$@\1@p')
-sed -i "s|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=${LINKER} -o|" \
-  scripts/test-installation.pl
-unset LINKER</userinput></screen>
-
-    <para os="b">The Glibc build system is self-contained and will install
-    perfectly, even though the compiler specs file and linker are still
-    pointing at <filename class="directory">/tools</filename>. The specs
-    and linker cannot be adjusted before the Glibc install because the
-    Glibc Autoconf tests would give false results and defeat the goal
-    of achieving a clean build.</para>
-
-    <para os="e">The Glibc documentation recommends building Glibc outside of     the source directory in a dedicated build directory:</para>
-
-<screen os="f"><userinput>mkdir -v ../glibc-build
-cd ../glibc-build</userinput></screen>
-
-    <para os="g">Prepare Glibc for compilation:</para>
-
-<screen os="h"><userinput>../glibc-&glibc-version;/configure \
-    --prefix=/usr \
-    --enable-kernel=&glibc-kernel-version; \
-    --libexecdir=/usr/lib/glibc \
-    --enable-stack-protector=strong \
-    --enable-obsolete-rpc</userinput></screen>
-
-    <variablelist os="i">
-      <title>The meaning of the new configure option:</title>
-
-      <varlistentry>
-        <term><parameter>--libexecdir=/usr/lib/glibc</parameter></term>
-        <listitem>
-          <para>This changes the location for hard links to the
-          <command>getconf</command> utility from their default of <filename
-          class="directory">/usr/libexec</filename> to <filename
-          class="directory">/usr/lib/glibc</filename>.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-    <para os="j">Compile the package:</para>
-
-<screen os="k"><userinput>make</userinput></screen>
-
-    <important os="l">
-      <para>Due to Glibc's critical role in a properly functioning system,
-      the CLFS developers strongly recommend running the testsuite.</para>
-    </important>
-
-    <para os="m">Use the following commands to run the test suite and output
-    any test failures:</para>
-
-<!-- items n,o,p no longer the master, use x86_64 which has no failures -->
-
-<screen os="n"><userinput remap="test">make check</userinput></screen>
-
-    <para os="o">The Glibc test suite is highly dependent on certain functions of
-    the host system, in particular the kernel. The <emphasis>posix/annexc</emphasis> and
-    <emphasis>conform/run-conformtest</emphasis> tests normally fail
-    and you should see <literal>Error 1 (ignored)</literal> in the output. Apart
-    from this, the Glibc test suite is always expected to pass. However, in certain
-    circumstances, some failures are unavoidable. If a test fails because of a missing
-    program (or missing symbolic link), or a segfault, you will see an error code
-    greater than 127 and the details will be in the log. More commonly, tests will
-    fail with <literal>Error 2</literal> - for these, the contents of the corresponding
-    <filename>.out</filename> file, e.g. <filename>posix/annexc.out</filename> may be
-    informative. Here is a list of the most common issues:</para>
-
-    <itemizedlist os="p">
-      <listitem>
-        <para>The <emphasis>nptl/tst-clock2</emphasis>,
-        <emphasis>nptl/tst-attr3</emphasis>,
-        <emphasis>tst/tst-cputimer1</emphasis>, and
-        <emphasis>rt/tst-cpuclock2</emphasis>
-        tests have been known to fail.  The
-        reason is not completely understood, but indications are that minor
-        timing issues can trigger these failures.</para>
-      </listitem>
-      <listitem>
-        <para>The <emphasis>math</emphasis> tests sometimes fail.
-        Certain optimization settings are known to be a
-        factor here.</para>
-      </listitem>
-      <listitem>
-        <para>If you have mounted the CLFS partition with the
-        <parameter>noatime</parameter> option, the <emphasis>atime</emphasis> test
-        will fail. As mentioned in <xref linkend="ch-partitioning-mounting"/>,
-        do not use the <parameter>noatime</parameter> option while building
-        CLFS.</para>
-      </listitem>
-      <listitem>
-        <para>When running on older and slower hardware, some tests
-        can fail because of test timeouts being exceeded.
-        Modifying the make check command to set a TIMEOUTFACTOR is reported to
-        help eliminate these errors (e.g. <command>TIMEOUTFACTOR=16
-        make -k check</command>).</para>
-      </listitem>
-      <listitem>
-        <para>posix/tst-getaddrinfo4 will always fail due to not having a network
-        connection when the test is run.</para>
-      </listitem>
-    </itemizedlist>
-
-    <para os="q">Though it is a harmless message, the install stage of Glibc will
-    complain about the absence of <filename>/etc/ld.so.conf</filename>.
-    Prevent this warning with:</para>
-
-<screen os="r"><userinput>touch /etc/ld.so.conf</userinput></screen>
-
-    <para os="s">Install the package, and remove unneeded files from
-    <filename class="directory">/usr/include/rpcsvc</filename>:</para>
-
-<screen os="t"><userinput>make install &amp;&amp;
-rm -v /usr/include/rpcsvc/*.x</userinput></screen>
-
-    <para os="u">Install the configuration file and runtime directory for
-    <command>nscd</command>:</para>
-
-<screen os="v"><userinput>cp -v ../glibc-&glibc-version;/nscd/nscd.conf /etc/nscd.conf
-mkdir -pv /var/cache/nscd</userinput></screen>
-
-    <para os="w">Install the systemd support files for <command>nscd</command>:</para>
-
-<screen os="x"><userinput>install -v -Dm644 ../glibc-&glibc-version;/nscd/nscd.tmpfiles /usr/lib/tmpfiles.d/nscd.conf
-install -v -Dm644 ../glibc-&glibc-version;/nscd/nscd.service /lib/systemd/system/nscd.service</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="i18n-glibc" role="configuration">
-    <title>Internationalization</title>
-
-    <para>The locales that can make the system respond in a different
-    language were not installed by the above command. Install them
-    with:</para>
-
-<screen><userinput>make localedata/install-locales</userinput></screen>
-
-    <para>To save time, an alternative to running the previous command (which
-    generates and installs every locale listed in the
-    <filename>glibc-&glibc-version;/localedata/SUPPORTED</filename> file) is
-    to install only those locales that are wanted and needed. This can be
-    achieved by using the <command>localedef</command> command. Information on
-    this command is located in the <filename>INSTALL</filename> file in the
-    Glibc source. However, there are a number of locales that are essential in
-    order for the tests of future packages to pass, in particular, the
-    <emphasis>libstdc++</emphasis> tests from GCC. The following instructions,
-    instead of the <parameter>install-locales</parameter> target used above,
-    will install the minimum set of locales necessary for the tests to run
-    successfully:</para>
-
-<screen role="nodump"><userinput>mkdir -pv /usr/lib/locale
-localedef -i cs_CZ -f UTF-8 cs_CZ.UTF-8
-localedef -i de_DE -f ISO-8859-1 de_DE
-localedef -i de_DE@euro -f ISO-8859-15 de_DE@euro
-localedef -i en_HK -f ISO-8859-1 en_HK
-localedef -i en_PH -f ISO-8859-1 en_PH
-localedef -i en_US -f ISO-8859-1 en_US
-localedef -i es_MX -f ISO-8859-1 es_MX
-localedef -i fa_IR -f UTF-8 fa_IR
-localedef -i fr_FR -f ISO-8859-1 fr_FR
-localedef -i fr_FR@euro -f ISO-8859-15 fr_FR@euro
-localedef -i it_IT -f ISO-8859-1 it_IT
-localedef -i ja_JP -f EUC-JP ja_JP</userinput></screen>
-
-    <para>Some locales installed by the <command>make
-    localedata/install-locales</command> command above are not properly
-    supported by some applications that are in CLFS and CBLFS. Because
-    of the various problems that arise due to application programmers making
-    assumptions that break in such locales, CLFS should not be used in locales
-    that utilize multibyte character sets (including UTF-8) or right-to-left
-    writing order.  Numerous unofficial and unstable patches are required to
-    fix these problems, and it has been decided by the CLFS developers not to
-    support such complex locales at this time. This applies to the ja_JP and
-    fa_IR locales as well&mdash;they have been installed only for GCC and
-    Gettext tests to pass, and the <command>watch</command> program (part of
-    the Procps-ng package) does not work properly in them. Various attempts to
-    circumvent these restrictions are documented in internationalization-related
-    hints.</para>
-
-  </sect2>
-
-  <sect2 id="conf-glibc" role="configuration">
-    <title>Configuring Glibc</title>
-
-    <indexterm zone="conf-glibc">
-      <primary sortas="e-/etc/nsswitch.conf">/etc/nsswitch.conf</primary>
-    </indexterm>
-
-    <indexterm zone="conf-glibc">
-      <primary sortas="e-/etc/localtime">/etc/localtime</primary>
-    </indexterm>
-
-    <para>The <filename>/etc/nsswitch.conf</filename> file needs to be created
-    because, although Glibc provides defaults when this file is missing or
-    corrupt, the Glibc defaults do not work well in a networked environment.
-    The time zone also needs to be configured.</para>
-
-    <para>Create a new file <filename>/etc/nsswitch.conf</filename> by running
-    the following:</para>
-
-<screen><userinput>cat &gt; /etc/nsswitch.conf &lt;&lt; "EOF"
-<literal># Begin /etc/nsswitch.conf
-
-passwd: files
-group: files
-shadow: files
-
-hosts: files dns
-networks: files
-
-protocols: files
-services: files
-ethers: files
-rpc: files
-
-# End /etc/nsswitch.conf</literal>
-EOF</userinput></screen>
-
-    <para>Install timezone data:</para>
-<screen><userinput>tar -xf ../tzdata&tzdata-version;.tar.gz
-
-ZONEINFO=/usr/share/zoneinfo
-mkdir -pv $ZONEINFO/{posix,right}
-
-for tz in etcetera southamerica northamerica europe africa antarctica \
-          asia australasia backward pacificnew systemv; do
-    zic -L /dev/null   -d $ZONEINFO       -y "sh yearistype.sh" ${tz}
-    zic -L /dev/null   -d $ZONEINFO/posix -y "sh yearistype.sh" ${tz}
-    zic -L leapseconds -d $ZONEINFO/right -y "sh yearistype.sh" ${tz}
-done
-
-cp -v zone.tab zone1970.tab iso3166.tab $ZONEINFO
-zic -d $ZONEINFO -p America/New_York
-unset ZONEINFO</userinput></screen>
-
-    <variablelist>
-      <title>The meaning of the zic commands:</title>
-
-      <varlistentry>
-        <term><parameter>zic -L /dev/null ...</parameter></term>
-        <listitem>
-          <para>This creates posix timezones, without any leap seconds.  It is
-          conventional to put these in both
-          <filename class="directory">zoneinfo</filename> and
-          <filename class="directory">zoneinfo/posix</filename>. It is
-          necessary to put the POSIX timezones in
-          <filename class="directory">zoneinfo</filename>, otherwise various
-          test-suites will report errors. On an embedded system, where space is
-          tight and you do not intend to ever update the timezones, you could save
-          1.9MB by not using the <filename class="directory">posix</filename>
-          directory, but some applications or test-suites might give less good
-          results</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><parameter>zic -L leapseconds ...</parameter></term>
-        <listitem>
-          <para>This creates right timezones, including leap seconds. On an
-          embedded system, where space is tight and you do not intend to
-          ever update the timezones, or care about the correct time, you could
-          save 1.9MB by omitting the <filename class="directory">right</filename>
-          directory.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><parameter>zic ... -p ...</parameter></term>
-        <listitem>
-          <para>This creates the <filename>posixrules</filename> file. We use
-          New York because POSIX requires the daylight savings time rules
-          to be in accordance with US rules.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-    <para>To determine the local time zone, run the following script:</para>
-
-<screen role="nodump"><userinput>tzselect</userinput></screen>
-
-    <para>After answering a few questions about the location, the script will
-    output the name of the time zone (e.g., <emphasis>EST5EDT</emphasis> or
-    <emphasis>Canada/Eastern</emphasis>). Then create the
-    <filename>/etc/localtime</filename> file by running:</para>
-
-<screen><userinput>cp -v /usr/share/zoneinfo/<replaceable>[xxx]</replaceable> \
-    /etc/localtime</userinput></screen>
-
-    <para>Replace <replaceable>[xxx]</replaceable> with the name of the time zone
-    that <command>tzselect</command> provided (e.g., Canada/Eastern).</para>
-
-  </sect2>
-
-  <sect2 id="conf-ld" role="configuration">
-    <title>Configuring The Dynamic Loader</title>
-
-    <indexterm zone="conf-ld">
-      <primary sortas="e-/etc/ld.so.conf">/etc/ld.so.conf</primary>
-    </indexterm>
-
-    <para os="ld-a">By default, the dynamic loader (<filename
-    class="libraryfile">/lib/ld-linux.so.2</filename>) searches through
-    <filename class="directory">/lib</filename> and <filename
-    class="directory">/usr/lib</filename> for dynamic libraries that are
-    needed by programs as they are run. However, if there are libraries in
-    directories other than <filename class="directory">/lib</filename> and
-    <filename class="directory">/usr/lib</filename>, these need to be
-    added to the <filename>/etc/ld.so.conf</filename> file in order
-    for the dynamic loader to find them. Two directories that are commonly
-    known to contain additional libraries are <filename
-    class="directory">/usr/local/lib</filename> and <filename
-    class="directory">/opt/lib</filename>, so add those directories to the
-    dynamic loader's search path.</para>
-
-    <para os="ld-b">Create a new file <filename>/etc/ld.so.conf</filename> by running the
-    following:</para>
-
-<screen os="ld-c"><userinput>cat &gt; /etc/ld.so.conf &lt;&lt; "EOF"
-<literal># Begin /etc/ld.so.conf
-
-/usr/local/lib
-/opt/lib
-
-# End /etc/ld.so.conf</literal>
-EOF</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-glibc" role="content">
-    <title>Contents of Glibc</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed libraries</segtitle>
-      <segtitle>Installed directories</segtitle>
-
-      <seglistitem>
-        <seg>catchsegv, gencat, getconf, getent, iconv, iconvconfig, ldconfig,
-        ldd, lddlibc4, locale, localedef, makedb, mtrace, nscd,
-        pcprofiledump, pldd, rpcgen, sln, sotruss, sprof, tzselect, xtrace,
-        zdump, zic</seg>
-        <seg>ld.so, libBrokenLocale.[a,so], libSegFault.so, libanl.[a,so],
-        libc.[a,so], libc_nonshared.a, libcidn.[a,so], libcrypt.[a,so],
-        libdl.[a,so], libg.a, libieee.a, libm.[a,so], libmcheck.a,
-        libmemusage.so, libnsl.a, libnss_compat.so, libnss_dns.so,
-        libnss_files.so, libnss_hesiod.so, libnss_nis.so, libnss_nisplus.so,
-        libpcprofile.so, libpthread.[a,so], libpthread_nonshared.a,
-        libresolv.[a,so], librpcsvc.a, librt.[a,so], libthread_db.so,
-        libutil.[a,so]</seg>
-        <seg>/usr/include/arpa, /usr/include/bits, /usr/include/gnu,
-        /usr/include/net, /usr/include/netash, /usr/include/netatalk,
-        /usr/include/netax25, /usr/include/neteconet, /usr/include/netinet,
-        /usr/include/netipx, /usr/include/netiucv, /usr/include/netpacket,
-        /usr/include/netrom, /usr/include/netrose, /usr/include/nfs,
-        /usr/include/protocols, /usr/include/rpc, /usr/include/rpcsvc,
-        /usr/include/scsi, /usr/include/sys, /usr/lib/audit, /usr/lib/gconv,
-        /usr/lib/glibc, /usr/lib/locale, /usr/share/i18n, /usr/share/zoneinfo,
-        /var/cache/ldconfig, /var/cache/nscd</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="catchsegv">
-        <term><command>catchsegv</command></term>
-        <listitem>
-          <para>Can be used to create a stack trace when a program
-          terminates with a segmentation fault</para>
-          <indexterm zone="ch-system-glibc catchsegv">
-            <primary sortas="b-catchsegv">catchsegv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gencat">
-        <term><command>gencat</command></term>
-        <listitem>
-          <para>Generates message catalogues</para>
-          <indexterm zone="ch-system-glibc gencat">
-            <primary sortas="b-gencat">gencat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="getconf">
-        <term><command>getconf</command></term>
-        <listitem>
-          <para>Displays the system configuration values for file system specific
-          variables</para>
-          <indexterm zone="ch-system-glibc getconf">
-            <primary sortas="b-getconf">getconf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="getent">
-        <term><command>getent</command></term>
-        <listitem>
-          <para>Gets entries from an administrative database</para>
-          <indexterm zone="ch-system-glibc getent">
-            <primary sortas="b-getent">getent</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="iconv">
-        <term><command>iconv</command></term>
-        <listitem>
-          <para>Performs character set conversion</para>
-          <indexterm zone="ch-system-glibc iconv">
-            <primary sortas="b-iconv">iconv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="iconvconfig">
-        <term><command>iconvconfig</command></term>
-        <listitem>
-          <para>Creates fastloading <command>iconv</command> module configuration
-          files</para>
-          <indexterm zone="ch-system-glibc iconvconfig">
-            <primary sortas="b-iconvconfig">iconvconfig</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ldconfig">
-        <term><command>ldconfig</command></term>
-        <listitem>
-          <para>Configures the dynamic linker runtime bindings</para>
-          <indexterm zone="ch-system-glibc ldconfig">
-            <primary sortas="b-ldconfig">ldconfig</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ldd">
-        <term><command>ldd</command></term>
-        <listitem>
-          <para>Reports which shared libraries are required
-          by each given program or shared library</para>
-          <indexterm zone="ch-system-glibc ldd">
-            <primary sortas="b-ldd">ldd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lddlibc4">
-        <term><command>lddlibc4</command></term>
-        <listitem>
-          <para>Assists <command>ldd</command> with object files</para>
-          <indexterm zone="ch-system-glibc lddlibc4">
-            <primary sortas="b-lddlibc4">lddlibc4</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="locale">
-        <term><command>locale</command></term>
-        <listitem>
-          <para>Tells the compiler to enable or disable the use of POSIX locales
-          for built-in operations</para>
-          <indexterm zone="ch-system-glibc locale">
-            <primary sortas="b-locale">locale</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="localedef">
-        <term><command>localedef</command></term>
-        <listitem>
-          <para>Compiles locale specifications</para>
-          <indexterm zone="ch-system-glibc localedef">
-            <primary sortas="b-localedef">localedef</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="makedb">
-        <term><command>makedb</command></term>
-        <listitem>
-          <para>Creates a simple database from textual input</para>
-          <indexterm zone="ch-system-glibc makedb">
-            <primary sortas="b-makedb">makedb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mtrace">
-        <term><command>mtrace</command></term>
-        <listitem>
-          <para>Reads and interprets a memory trace file and
-          displays a summary in human-readable format</para>
-          <indexterm zone="ch-system-glibc mtrace">
-            <primary sortas="b-mtrace">mtrace</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="nscd">
-        <term><command>nscd</command></term>
-        <listitem>
-          <para>A daemon that provides a cache for the most common name
-          service requests</para>
-          <indexterm zone="ch-system-glibc nscd">
-            <primary sortas="b-nscd">nscd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pcprofiledump">
-        <term><command>pcprofiledump</command></term>
-        <listitem>
-          <para>Dumps information generated by PC profiling</para>
-          <indexterm zone="ch-system-glibc pcprofiledump">
-            <primary sortas="b-pcprofiledump">pcprofiledump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pldd">
-        <term><command>pldd</command></term>
-        <listitem>
-          <para>Lists dynamic shared objects used by running processes</para>
-          <indexterm zone="ch-system-glibc pldd">
-            <primary sortas="b-pldd">pldd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rpcgen">
-        <term><command>rpcgen</command></term>
-        <listitem>
-          <para>Generates C code to implement the Remote Procecure Call (RPC)
-          protocol</para>
-          <indexterm zone="ch-system-glibc rpcgen">
-            <primary sortas="b-rpcgen">rpcgen</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sln">
-        <term><command>sln</command></term>
-        <listitem>
-          <para>A statically linked program that creates symbolic links</para>
-          <indexterm zone="ch-system-glibc sln">
-            <primary sortas="b-sln">sln</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sotruss">
-        <term><command>sotruss</command></term>
-        <listitem>
-          <para>Traces shared library procedure calls of a specified command</para>
-          <indexterm zone="ch-system-glibc sotruss">
-            <primary sortas="b-sotruss">sotruss</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sprof">
-        <term><command>sprof</command></term>
-        <listitem>
-          <para>Reads and displays shared object profiling data</para>
-          <indexterm zone="ch-system-glibc sprof">
-            <primary sortas="b-sprof">sprof</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tzselect">
-        <term><command>tzselect</command></term>
-        <listitem>
-          <para>Asks the user about the location of the
-          system and reports the corresponding time zone description</para>
-          <indexterm zone="ch-system-glibc tzselect">
-            <primary sortas="b-tzselect">tzselect</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xtrace">
-        <term><command>xtrace</command></term>
-        <listitem>
-          <para>Traces the execution of a program by
-          printing the currently executed function</para>
-          <indexterm zone="ch-system-glibc xtrace">
-            <primary sortas="b-xtrace">xtrace</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="zdump">
-        <term><command>zdump</command></term>
-        <listitem>
-          <para>The time zone dumper</para>
-          <indexterm zone="ch-system-glibc zdump">
-            <primary sortas="b-zdump">zdump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="zic">
-        <term><command>zic</command></term>
-        <listitem>
-          <para>The time zone compiler</para>
-          <indexterm zone="ch-system-glibc zic">
-            <primary sortas="b-zic">zic</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ld.so">
-        <term><filename class="libraryfile">ld.so</filename></term>
-        <listitem>
-          <para>The helper program for shared library executables</para>
-          <indexterm zone="ch-system-glibc ld.so">
-            <primary sortas="c-ld.so">ld.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libBrokenLocale">
-        <term><filename class="libraryfile">libBrokenLocale</filename></term>
-        <listitem>
-          <para>Used by programs, such as Mozilla, to solve broken locales</para>
-          <indexterm zone="ch-system-glibc libBrokenLocale">
-            <primary sortas="c-libBrokenLocale">libBrokenLocale</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libSegFault">
-        <term><filename class="libraryfile">libSegFault</filename></term>
-        <listitem>
-          <para>The segmentation fault signal handler</para>
-          <indexterm zone="ch-system-glibc libSegFault">
-            <primary sortas="c-libSegFault">libSegFault</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libanl">
-        <term><filename class="libraryfile">libanl</filename></term>
-        <listitem>
-          <para>An asynchronous name lookup library</para>
-          <indexterm zone="ch-system-glibc libanl">
-            <primary sortas="c-libanl">libanl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libc">
-        <term><filename class="libraryfile">libc</filename></term>
-        <listitem>
-          <para>The main C library</para>
-          <indexterm zone="ch-system-glibc libc">
-            <primary sortas="c-libc">libc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcidn">
-        <term><filename class="libraryfile">libcidn</filename></term>
-        <listitem>
-          <para>Used internally by Glibc for handling internationalized domain
-          names in the <function>getaddrinfo()</function> function</para>
-          <indexterm zone="ch-system-glibc libcidn">
-            <primary sortas="c-libcidn">libcidn</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcrypt">
-        <term><filename class="libraryfile">libcrypt</filename></term>
-        <listitem>
-          <para>The cryptography library</para>
-          <indexterm zone="ch-system-glibc libcrypt">
-            <primary sortas="c-libcrypt">libcrypt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libdl">
-        <term><filename class="libraryfile">libdl</filename></term>
-        <listitem>
-          <para>The dynamic linking interface library</para>
-          <indexterm zone="ch-system-glibc libdl">
-            <primary sortas="c-libdl">libdl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libg">
-        <term><filename class="libraryfile">libg</filename></term>
-        <listitem>
-          <para>A runtime library for <command>g++</command></para>
-          <indexterm zone="ch-system-glibc libg">
-            <primary sortas="c-libg">libg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libieee">
-        <term><filename class="libraryfile">libieee</filename></term>
-        <listitem>
-          <para>The Institute of Electrical and Electronic Engineers (IEEE)
-          floating point library</para>
-          <indexterm zone="ch-system-glibc libieee">
-            <primary sortas="c-libieee">libieee</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libm">
-        <term><filename class="libraryfile">libm</filename></term>
-        <listitem>
-          <para>The mathematical library</para>
-          <indexterm zone="ch-system-glibc libm">
-            <primary sortas="c-libm">libm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libmcheck">
-        <term><filename class="libraryfile">libmcheck</filename></term>
-        <listitem>
-          <para>Contains code run at boot</para>
-          <indexterm zone="ch-system-glibc libmcheck">
-            <primary sortas="c-libmcheck">libmcheck</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libmemusage">
-        <term><filename class="libraryfile">libmemusage</filename></term>
-        <listitem>
-          <para>Used by <command>memusage</command> (included in Glibc, but
-          not built in a base CLFS system as it has additional dependencies)
-          to help collect information about the memory usage of a program</para>
-          <indexterm zone="ch-system-glibc libmemusage">
-            <primary sortas="c-libmemusage">libmemusage</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libnsl">
-        <term><filename class="libraryfile">libnsl</filename></term>
-        <listitem>
-          <para>The network services library</para>
-          <indexterm zone="ch-system-glibc libnsl">
-            <primary sortas="c-libnsl">libnsl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libnss">
-        <term><filename class="libraryfile">libnss</filename></term>
-        <listitem>
-          <para>The Name Service Switch libraries, containing functions for
-          resolving host names, user names, group names, aliases, services,
-          protocols, etc.</para>
-          <indexterm zone="ch-system-glibc libnss">
-            <primary sortas="c-libnss">libnss</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpcprofile">
-        <term><filename class="libraryfile">libpcprofile</filename></term>
-        <listitem>
-          <para>Contains profiling functions used to track the amount of CPU
-          time spent in specific source code lines</para>
-          <indexterm zone="ch-system-glibc libpcprofile">
-            <primary sortas="c-libpcprofile">libpcprofile</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpthread">
-        <term><filename class="libraryfile">libpthread</filename></term>
-        <listitem>
-          <para>The POSIX threads library</para>
-          <indexterm zone="ch-system-glibc libpthread">
-            <primary sortas="c-libpthread">libpthread</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libresolv">
-        <term><filename class="libraryfile">libresolv</filename></term>
-        <listitem>
-          <para>Contains functions for creating, sending, and interpreting
-          packets to the Internet domain name servers</para>
-          <indexterm zone="ch-system-glibc libresolv">
-            <primary sortas="c-libresolv">libresolv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="librpcsvc">
-        <term><filename class="libraryfile">librpcsvc</filename></term>
-        <listitem>
-          <para>Contains functions providing miscellaneous RPC services</para>
-          <indexterm zone="ch-system-glibc librpcsvc">
-            <primary sortas="c-librpcsvc">librpcsvc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="librt">
-        <term><filename class="libraryfile">librt</filename></term>
-        <listitem>
-          <para>Contains functions providing most of the interfaces specified by
-          the POSIX.1b Realtime Extension</para>
-          <indexterm zone="ch-system-glibc librt">
-            <primary sortas="c-librt">librt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libthread_db">
-        <term><filename class="libraryfile">libthread_db</filename></term>
-        <listitem>
-          <para>Contains functions useful for
-          building debuggers for multi-threaded programs</para>
-          <indexterm zone="ch-system-glibc libthread_db">
-            <primary sortas="c-libthread_db">libthread_db</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libutil">
-        <term><filename class="libraryfile">libutil</filename></term>
-        <listitem>
-          <para>Contains code for <quote>standard</quote> functions used in
-          many different Unix utilities</para>
-          <indexterm zone="ch-system-glibc libutil">
-            <primary sortas="c-libutil">libutil</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/gmp.xml
===================================================================
--- BOOK/final-system/common/gmp.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,122 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-gmp" role="wrap">
-  <?dbhtml filename="gmp.html"?>
-
-  <title>GMP-&gmp-version;</title>
-
-  <indexterm zone="ch-system-gmp">
-    <primary sortas="a-GMP">GMP</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>GMP is a library for arithmetic on arbitrary precision integers,
-    rational numbers, and floating-point numbers.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GMP</title>
-
-<!--
-    <para os="p1">The following patch contains a number of updates to the
-    &gmp-version; branch by the GMP developers:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&gmp-branch_update-patch;</userinput></screen>
-
--->
-
-    <note os="n1">
-      <para>If you are compiling this package on a different CPU than you plan
-      to run the CLFS system on, you must replace GMP's
-      <filename>config.guess</filename> and <filename>config.sub</filename>
-      wrappers with the originals. This will prevent GMP from optimizing for
-      the wrong CPU. You can make this change with the following command:</para>
-
-<screen>mv -v config{fsf,}.guess
-mv -v config{fsf,}.sub</screen>
-
-    </note>
-
-    <para os="a">Prepare GMP for compilation:</para>
-
-<screen os="b"><userinput>CC="gcc -isystem /usr/include" \
-CXX="g++ -isystem /usr/include" \
-LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
-./configure \
-    --prefix=/usr \
-    --enable-cxx \
-    --docdir=/usr/share/doc/gmp-&gmp-version;</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">Build the HTML documentation:</para>
-
-<screen os="f"><userinput>make html</userinput></screen>
-
-    <para os="g">Test the results:</para>
-
-<screen os="h"><userinput remap="test">make check</userinput></screen>
-
-    <para os="i">Install the package:</para>
-
-<screen os="j"><userinput>make install</userinput></screen>
-
-    <para os="k">Install the documentation:</para>
-
-<screen os="l"><userinput>make install-html</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-gmp" role="content">
-    <title>Contents of GMP</title>
-
-    <segmentedlist>
-      <segtitle>Installed libraries</segtitle>
-      <segtitle>Installed directory</segtitle>
-
-      <seglistitem>
-        <seg>libgmp.[a,so], libgmpxx.[a,so]</seg>
-        <seg>/usr/share/doc/gmp-&gmp-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgmp">
-        <term><filename class="libraryfile">libgmp</filename></term>
-        <listitem>
-          <para>Contains the definitions for GNU multiple precision functions.</para>
-          <indexterm zone="ch-system-gmp libgmp">
-            <primary sortas="c-libgmp">libgmp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgmpxx">
-        <term><filename class="libraryfile">libgmpxx</filename></term>
-        <listitem>
-          <para>Contains a C++ class wrapper for GMP types.</para>
-          <indexterm zone="ch-system-gmp libgmpxx">
-            <primary sortas="c-libgmpxx">libgmpxx</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/gperf.xml
===================================================================
--- BOOK/final-system/common/gperf.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,79 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-gperf" role="wrap">
-  <?dbhtml filename="gperf.html"?>
-
-  <title>Gperf-&gperf-version;</title>
-
-  <indexterm zone="ch-system-gperf">
-    <primary sortas="a-Gperf">Gperf</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>Gperf generates a perfect hash function from a key set.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Gperf</title>
-
-    <para os="a">Prepare Gperf for compilation:</para>
-
-<screen os="b"><userinput>./configure \
-    --prefix=/usr \
-    --docdir=/usr/share/doc/gperf-&gperf-version;</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">To test the results, issue:</para>
-
-<screen os="e2"><userinput remap="test">make check</userinput></screen>
-
-    <para os="f">Install the package:</para>
-
-<screen os="g"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-gperf" role="content">
-    <title>Contents of Gperf</title>
-
-    <segmentedlist>
-      <segtitle>Installed program</segtitle>
-      <segtitle>Installed directory</segtitle>
-
-      <seglistitem>
-        <seg>gperf</seg>
-        <seg>/usr/share/doc/gperf-&gperf-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gperf">
-        <term><command>gperf</command></term>
-        <listitem>
-          <para>Generates a perfect hash function from a key set</para>
-          <indexterm zone="ch-system-gperf gperf">
-            <primary sortas="b-gperf">gperf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/grep.xml
===================================================================
--- BOOK/final-system/common/grep.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,98 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-grep" role="wrap">
-  <?dbhtml filename="grep.html"?>
-
-  <title>Grep-&grep-version;</title>
-
-  <indexterm zone="ch-system-grep">
-    <primary sortas="a-Grep">Grep</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Grep package contains programs for searching through
-    files.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Grep</title>
-
-    <para os="a">Prepare Grep for compilation:</para>
-
-<screen os="b"><userinput>./configure \
-    --prefix=/usr \
-    --bindir=/bin</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">To test the results, issue:</para>
-
-<screen os="e2"><userinput remap="test">make check</userinput></screen>
-
-    <para os="f">Install the package:</para>
-
-<screen os="g"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-grep" role="content">
-    <title>Contents of Grep</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>egrep, fgrep, grep</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="egrep">
-        <term><command>egrep</command></term>
-        <listitem>
-          <para>Prints lines matching an extended regular expression</para>
-          <indexterm zone="ch-system-grep egrep">
-            <primary sortas="b-egrep">egrep</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fgrep">
-        <term><command>fgrep</command></term>
-        <listitem>
-          <para>Prints lines matching a list of fixed strings</para>
-          <indexterm zone="ch-system-grep fgrep">
-            <primary sortas="b-fgrep">fgrep</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="grep">
-        <term><command>grep</command></term>
-        <listitem>
-          <para>Prints lines matching a basic regular expression</para>
-          <indexterm zone="ch-system-grep grep">
-            <primary sortas="b-grep">grep</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/groff.xml
===================================================================
--- BOOK/final-system/common/groff.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,532 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-groff" role="wrap">
-  <?dbhtml filename="groff.html"?>
-
-  <title>Groff-&groff-version;</title>
-
-  <indexterm zone="ch-system-groff">
-    <primary sortas="a-Groff">Groff</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Groff package contains programs for processing and formatting
-    text.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Groff</title>
-
-    <para os="a">Groff expects the environment variable <envar>PAGE</envar>
-    to contain the default paper size. For users in the United States,
-    <parameter>PAGE=letter</parameter> is appropriate. Elsewhere,
-    <parameter>PAGE=A4</parameter> may be more suitable.</para>
-
-    <para os="b">Prepare Groff for compilation:</para>
-
-<screen os="c"><userinput>PAGE=<replaceable>[paper_size]</replaceable> ./configure \
-    --prefix=/usr</userinput></screen>
-
-    <para os="d">Compile the package:</para>
-
-<screen os="e"><userinput>make</userinput></screen>
-
-    <para os="f">This package does not come with a test suite.</para>
-
-    <para os="g">Install the package:</para>
-
-<screen os="h"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-groff" role="content">
-    <title>Contents of Groff</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed directories</segtitle>
-
-      <seglistitem>
-        <seg>addftinfo, afmtodit, chem, eqn, eqn2graph, gdiffmk, grap2graph,
-        grn, grodvi, groff, groffer, grog, grolbp, grolj4, grops, grotty,
-        hpftodit, indxbib, lkbib, lookbib, mmroff, neqn, nroff, pdfroff,
-        pfbtops, pic, pic2graph, post-grohtml, pre-grohtml, preconv, refer,
-        roff2dvi, roff2html, roff2pdf, roff2ps, roff2text, roff2x, soelim,
-        tbl, tfmtodit, troff</seg>
-        <seg>/usr/lib/groff, /usr/share/doc/groff-&groff-version;, /usr/share/groff</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="addftinfo">
-        <term><command>addftinfo</command></term>
-        <listitem>
-          <para>Reads a troff font file and adds some additional font-metric
-          information that is used by the <command>groff</command> system</para>
-          <indexterm zone="ch-system-groff addftinfo">
-            <primary sortas="b-addftinfo">addftinfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="afmtodit">
-        <term><command>afmtodit</command></term>
-        <listitem>
-          <para>Creates a font file for use with <command>groff</command> and
-          <command>grops</command></para>
-          <indexterm zone="ch-system-groff afmtodit">
-            <primary sortas="b-afmtodit">afmtodit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="chem">
-        <term><command>chem</command></term>
-        <listitem>
-          <para>Groff preprocessor for producing chemical structure diagrams</para>
-          <indexterm zone="ch-system-groff chem">
-            <primary sortas="b-chem">chem</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="eqn">
-        <term><command>eqn</command></term>
-        <listitem>
-          <para>Compiles descriptions of equations embedded within troff
-          input files into commands that are understood by
-          <command>troff</command></para>
-          <indexterm zone="ch-system-groff eqn">
-            <primary sortas="b-eqn">eqn</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="eqn2graph">
-        <term><command>eqn2graph</command></term>
-        <listitem>
-          <para>Converts a troff EQN (equation) into a cropped image</para>
-          <indexterm zone="ch-system-groff eqn2graph">
-            <primary sortas="b-eqn2graph">eqn2graph</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gdiffmk">
-        <term><command>gdiffmk</command></term>
-        <listitem>
-          <para>Marks differences between groff/nroff/troff files</para>
-          <indexterm zone="ch-system-groff gdiffmk">
-            <primary sortas="b-gdiffmk">gdiffmk</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="grap2graph">
-        <term><command>grap2graph</command></term>
-        <listitem>
-          <para>Converts a grap diagram into a cropped bitmap image</para>
-          <indexterm zone="ch-system-groff grap2graph">
-            <primary sortas="b-grap2graph">grap2graph</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="grn">
-        <term><command>grn</command></term>
-        <listitem>
-          <para>A <command>groff</command> preprocessor for gremlin files</para>
-          <indexterm zone="ch-system-groff grn">
-            <primary sortas="b-grn">grn</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="grodvi">
-        <term><command>grodvi</command></term>
-        <listitem>
-          <para>A driver for <command>groff</command> that produces TeX dvi
-          format</para>
-          <indexterm zone="ch-system-groff grodvi">
-            <primary sortas="b-grodvi">grodvi</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="groff">
-        <term><command>groff</command></term>
-        <listitem>
-          <para>A front-end to the groff document formatting system; normally, it
-          runs the <command>troff</command> program and a post-processor
-          appropriate for the selected device</para>
-          <indexterm zone="ch-system-groff groff">
-            <primary sortas="b-groff">groff</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="groffer">
-        <term><command>groffer</command></term>
-        <listitem>
-          <para>Displays groff files and man pages on X and tty terminals</para>
-          <indexterm zone="ch-system-groff groffer">
-            <primary sortas="b-groffer">groffer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="grog">
-        <term><command>grog</command></term>
-        <listitem>
-          <para>Reads files and guesses which of the <command>groff</command>
-          options <option>-e</option>, <option>-man</option>, <option>-me</option>,
-          <option>-mm</option>, <option>-ms</option>, <option>-p</option>,
-          <option>-s</option>, and <option>-t</option> are required for printing
-          files, and reports the <command>groff</command> command including those
-          options</para>
-          <indexterm zone="ch-system-groff grog">
-            <primary sortas="b-grog">grog</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="grolbp">
-        <term><command>grolbp</command></term>
-        <listitem>
-          <para>Is a <command>groff</command> driver for Canon CAPSL printers
-          (LBP-4 and LBP-8 series laser printers)</para>
-          <indexterm zone="ch-system-groff grolbp">
-            <primary sortas="b-grolbp">grolbp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="grolj4">
-        <term><command>grolj4</command></term>
-        <listitem>
-          <para>Is a driver for <command>groff</command> that produces output
-          in PCL5 format suitable for an HP LaserJet 4 printer</para>
-          <indexterm zone="ch-system-groff grolj4">
-            <primary sortas="b-grolj4">grolj4</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="grops">
-        <term><command>grops</command></term>
-        <listitem>
-          <para>Translates the output of GNU <command>troff</command> to
-          PostScript</para>
-          <indexterm zone="ch-system-groff grops">
-            <primary sortas="b-grops">grops</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="grotty">
-        <term><command>grotty</command></term>
-        <listitem>
-          <para>Translates the output of GNU <command>troff</command> into
-          a form suitable for typewriter-like devices</para>
-          <indexterm zone="ch-system-groff grotty">
-            <primary sortas="b-grotty">grotty</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hpftodit">
-        <term><command>hpftodit</command></term>
-        <listitem>
-          <para>Creates a font file for use with <command>groff -Tlj4</command>
-          from an HP-tagged font metric file</para>
-          <indexterm zone="ch-system-groff hpftodit">
-            <primary sortas="b-hpftodit">hpftodit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="indxbib">
-        <term><command>indxbib</command></term>
-        <listitem>
-          <para>Creates an inverted index for the bibliographic databases with a
-          specified file for use with <command>refer</command>,
-          <command>lookbib</command>, and <command>lkbib</command></para>
-          <indexterm zone="ch-system-groff indxbib">
-            <primary sortas="b-indxbib">indxbib</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lkbib">
-        <term><command>lkbib</command></term>
-        <listitem>
-          <para>Searches bibliographic databases for references that contain
-          specified keys and reports any references found</para>
-          <indexterm zone="ch-system-groff lkbib">
-            <primary sortas="b-lkbib">lkbib</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lookbib">
-        <term><command>lookbib</command></term>
-        <listitem>
-          <para>Prints a prompt on the standard error (unless the standard input
-          is not a terminal), reads a line containing a set of keywords from the
-          standard input, searches the bibliographic databases in a specified file
-          for references containing those keywords, prints any references found
-          on the standard output, and repeats this process until the end of
-          input</para>
-          <indexterm zone="ch-system-groff lookbib">
-            <primary sortas="b-lookbib">lookbib</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mmroff">
-        <term><command>mmroff</command></term>
-        <listitem>
-          <para>A simple preprocessor for <command>groff</command></para>
-          <indexterm zone="ch-system-groff mmroff">
-            <primary sortas="b-mmroff">mmroff</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="neqn">
-        <term><command>neqn</command></term>
-        <listitem>
-          <para>Formats equations for American Standard Code for Information
-          Interchange (ASCII) output</para>
-          <indexterm zone="ch-system-groff neqn">
-            <primary sortas="b-neqn">neqn</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="nroff">
-        <term><command>nroff</command></term>
-        <listitem>
-          <para>A script that emulates the <command>nroff</command> command
-          using <command>groff</command></para>
-          <indexterm zone="ch-system-groff nroff">
-            <primary sortas="b-nroff">nroff</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pdfroff">
-        <term><command>pdfroff</command></term>
-        <listitem>
-          <para>Creates pdf documents using groff</para>
-          <indexterm zone="ch-system-groff pdfroff">
-            <primary sortas="b-pdfroff">pdfroff</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pfbtops">
-        <term><command>pfbtops</command></term>
-        <listitem>
-          <para>Translates a PostScript font in <filename
-          class="extension">.pfb</filename> format to ASCII</para>
-          <indexterm zone="ch-system-groff pfbtops">
-            <primary sortas="b-pfbtops">pfbtops</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pic">
-        <term><command>pic</command></term>
-        <listitem>
-          <para>Compiles descriptions of pictures embedded within troff or
-          TeX input files into commands understood by TeX or
-          <command>troff</command></para>
-          <indexterm zone="ch-system-groff pic">
-            <primary sortas="b-pic">pic</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pic2graph">
-        <term><command>pic2graph</command></term>
-        <listitem>
-          <para>Converts a PIC diagram into a cropped image</para>
-          <indexterm zone="ch-system-groff pic2graph">
-            <primary sortas="b-pic2graph">pic2graph</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="post-grohtml">
-        <term><command>post-grohtml</command></term>
-        <listitem>
-          <para>Translates the output of GNU <command>troff</command> to
-          HTML</para>
-          <indexterm zone="ch-system-groff post-grohtml">
-            <primary sortas="b-post-grohtml">post-grohtml</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pre-grohtml">
-        <term><command>pre-grohtml</command></term>
-        <listitem>
-          <para>Translates the output of GNU <command>troff</command> to
-          HTML</para>
-          <indexterm zone="ch-system-groff pre-grohtml">
-            <primary sortas="b-pre-grohtml">pre-grohtml</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="preconv">
-        <term><command>preconv</command></term>
-        <listitem>
-          <para>Converts encoding of input files to something GNU
-          <command>troff</command> understands</para>
-          <indexterm zone="ch-system-groff preconv">
-            <primary sortas="b-preconv">preconv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="refer">
-        <term><command>refer</command></term>
-        <listitem>
-          <para>Copies the contents of a file to the standard output, except
-          that lines between <emphasis>.[</emphasis> and <emphasis>.]</emphasis>
-          are interpreted as citations, and lines between <emphasis>.R1</emphasis>
-          and <emphasis>.R2</emphasis> are interpreted as commands for how
-          citations are to be processed</para>
-          <indexterm zone="ch-system-groff refer">
-            <primary sortas="b-refer">refer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="roff2dvi">
-        <term><command>roff2dvi</command></term>
-        <listitem>
-          <para>Transforms roff files into other formats</para>
-          <indexterm zone="ch-system-groff roff2dvi">
-            <primary sortas="b-roff2dvi">roff2dvi</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="roff2html">
-        <term><command>roff2html</command></term>
-        <listitem>
-          <para>Transforms roff files into other formats</para>
-          <indexterm zone="ch-system-groff roff2html">
-            <primary sortas="b-roff2html">roff2html</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="roff2pdf">
-        <term><command>roff2pdf</command></term>
-        <listitem>
-          <para>Transforms roff files into other formats</para>
-          <indexterm zone="ch-system-groff roff2pdf">
-            <primary sortas="b-roff2pdf">roff2pdf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="roff2ps">
-        <term><command>roff2ps</command></term>
-        <listitem>
-          <para>Transforms roff files into other formats</para>
-          <indexterm zone="ch-system-groff roff2ps">
-            <primary sortas="b-roff2ps">roff2ps</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="roff2text">
-        <term><command>roff2text</command></term>
-        <listitem>
-          <para>Transforms roff files into other formats</para>
-          <indexterm zone="ch-system-groff roff2text">
-            <primary sortas="b-roff2text">roff2text</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="roff2x">
-        <term><command>roff2x</command></term>
-        <listitem>
-          <para>Transforms roff files into other formats</para>
-          <indexterm zone="ch-system-groff roff2x">
-            <primary sortas="b-roff2x">roff2x</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="soelim">
-        <term><command>soelim</command></term>
-        <listitem>
-          <para>Reads files and replaces lines of the form <emphasis>.so
-          file</emphasis> by the contents of the mentioned
-          <emphasis>file</emphasis></para>
-          <indexterm zone="ch-system-groff soelim">
-            <primary sortas="b-soelim">soelim</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tbl">
-        <term><command>tbl</command></term>
-        <listitem>
-          <para>Compiles descriptions of tables embedded within troff input
-          files into commands that are understood by
-          <command>troff</command></para>
-          <indexterm zone="ch-system-groff tbl">
-            <primary sortas="b-tbl">tbl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tfmtodit">
-        <term><command>tfmtodit</command></term>
-        <listitem>
-          <para>Creates a font file for use with <command>groff
-          -Tdvi</command></para>
-          <indexterm zone="ch-system-groff tfmtodit">
-            <primary sortas="b-tfmtodit">tfmtodit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="troff">
-        <term><command>troff</command></term>
-        <listitem>
-          <para>Is highly compatible with Unix <command>troff</command>; it
-          should usually be invoked using the <command>groff</command> command,
-          which will also run preprocessors and post-processors in the
-          appropriate order and with the appropriate options</para>
-          <indexterm zone="ch-system-groff troff">
-            <primary sortas="b-troff">troff</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/gzip.xml
===================================================================
--- BOOK/final-system/common/gzip.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,222 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-gzip" role="wrap">
-  <?dbhtml filename="gzip.html"?>
-
-  <title>Gzip-&gzip-version;</title>
-
-  <indexterm zone="ch-system-gzip">
-    <primary sortas="a-Gzip">Gzip</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Gzip package contains programs for compressing and decompressing
-    files.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Gzip</title>
-
-    <para os="a">Prepare Gzip for compilation:</para>
-
-<screen os="b"><userinput>./configure \
-    --prefix=/usr \
-    --bindir=/bin</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">To test the results, issue:</para>
-
-<screen os="e2"><userinput remap="test">make check</userinput></screen>
-
-    <para os="f">Install the package:</para>
-
-<screen os="g"><userinput>make install</userinput></screen>
-
-    <para os="h">Now we will move some of the utilities to
-    <filename class="directory">/usr/bin</filename> to meet FHS compliance:</para>
-
-<screen os="i"><userinput>mv -v /bin/{gzexe,uncompress} /usr/bin
-mv -v /bin/z{egrep,cmp,diff,fgrep,force,grep,less,more,new} /usr/bin
-	</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-gzip" role="content">
-    <title>Contents of Gzip</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>gunzip, gzexe, gzip, uncompress, zcat, zcmp, zdiff,
-        zegrep, zfgrep, zforce, zgrep, zless, zmore, znew</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gunzip">
-        <term><command>gunzip</command></term>
-        <listitem>
-          <para>Decompresses gzipped files</para>
-          <indexterm zone="ch-system-gzip gunzip">
-            <primary sortas="b-gunzip">gunzip</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gzexe">
-        <term><command>gzexe</command></term>
-        <listitem>
-          <para>Creates self-decompressing executable files</para>
-          <indexterm zone="ch-system-gzip gzexe">
-            <primary sortas="b-gzexe">gzexe</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gzip">
-        <term><command>gzip</command></term>
-        <listitem>
-          <para>Compresses the given files using Lempel-Ziv (LZ77) coding</para>
-          <indexterm zone="ch-system-gzip gzip">
-            <primary sortas="b-gzip">gzip</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="uncompress">
-        <term><command>uncompress</command></term>
-        <listitem>
-          <para>Decompresses compressed files</para>
-          <indexterm zone="ch-system-gzip uncompress">
-            <primary sortas="b-uncompress">uncompress</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="zcat">
-        <term><command>zcat</command></term>
-        <listitem>
-          <para>Decompresses the given gzipped files to standard output</para>
-          <indexterm zone="ch-system-gzip zcat">
-            <primary sortas="b-zcat">zcat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="zcmp">
-        <term><command>zcmp</command></term>
-        <listitem>
-          <para>Runs <command>cmp</command> on gzipped files</para>
-          <indexterm zone="ch-system-gzip zcmp">
-            <primary sortas="b-zcmp">zcmp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="zdiff">
-        <term><command>zdiff</command></term>
-        <listitem>
-          <para>Runs <command>diff</command> on gzipped files</para>
-          <indexterm zone="ch-system-gzip zdiff">
-            <primary sortas="b-zdiff">zdiff</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="zegrep">
-        <term><command>zegrep</command></term>
-        <listitem>
-          <para>Runs <command>egrep</command> on gzipped files</para>
-          <indexterm zone="ch-system-gzip zegrep">
-            <primary sortas="b-zegrep">zegrep</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="zfgrep">
-        <term><command>zfgrep</command></term>
-        <listitem>
-          <para>Runs <command>fgrep</command> on gzipped files</para>
-          <indexterm zone="ch-system-gzip zfgrep">
-            <primary sortas="b-zfgrep">zfgrep</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="zforce">
-        <term><command>zforce</command></term>
-        <listitem>
-          <para>Forces a <filename class="extension">.gz</filename> extension on
-          all given files that are gzipped files, so that <command>gzip</command>
-          will not compress them again; this can be useful when file names were
-          truncated during a file transfer</para>
-          <indexterm zone="ch-system-gzip zforce">
-            <primary sortas="b-zforce">zforce</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="zgrep">
-        <term><command>zgrep</command></term>
-        <listitem>
-          <para>Runs <command>grep</command> on gzipped files</para>
-          <indexterm zone="ch-system-gzip zgrep">
-            <primary sortas="b-zgrep">zgrep</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="zless">
-        <term><command>zless</command></term>
-        <listitem>
-          <para>Runs <command>less</command> on gzipped files</para>
-          <indexterm zone="ch-system-gzip zless">
-            <primary sortas="b-zless">zless</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="zmore">
-        <term><command>zmore</command></term>
-        <listitem>
-          <para>Runs <command>more</command> on gzipped files</para>
-          <indexterm zone="ch-system-gzip zmore">
-            <primary sortas="b-zmore">zmore</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="znew">
-        <term><command>znew</command></term>
-        <listitem>
-          <para>Re-compresses files from <command>compress</command> format to
-          <command>gzip</command> format&mdash;<filename
-          class="extension">.Z</filename> to <filename
-          class="extension">.gz</filename></para>
-          <indexterm zone="ch-system-gzip znew">
-            <primary sortas="b-znew">znew</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/iana-etc.xml
===================================================================
--- BOOK/final-system/common/iana-etc.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,90 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-iana-etc" role="wrap">
-  <?dbhtml filename="iana-etc.html"?>
-
-  <title>Iana-Etc-&iana-etc-version;</title>
-
-  <indexterm zone="ch-system-iana-etc">
-    <primary sortas="a-Iana-Etc">Iana-Etc</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Iana-Etc package provides data for network services and
-    protocols.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Iana-Etc</title>
-
-    <para os="p2">The following patch contains xml files which provide updates
-    to the services and protocol files:</para>
-
-<screen os="p3"><userinput>xzcat ../&iana-etc-numbers_update-patch; | patch -Np1 -i -</userinput></screen>
-
-    <para os="a">The following command converts the raw data provided by IANA into
-    the correct formats for the <filename>/etc/protocols</filename> and
-    <filename>/etc/services</filename> data files:</para>
-
-<screen os="b"><userinput>make</userinput></screen>
-
-    <para os="c">This package does not come with a test suite.</para>
-
-    <para os="d">Install the package:</para>
-
-<screen os="e"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-iana-etc" role="content">
-    <title>Contents of Iana-Etc</title>
-
-    <segmentedlist>
-      <segtitle>Installed files</segtitle>
-
-      <seglistitem>
-        <seg>/etc/protocols, /etc/services</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="protocols">
-        <term><filename>/etc/protocols</filename></term>
-        <listitem>
-          <para>Describes the various DARPA Internet protocols that are
-          available from the TCP/IP subsystem</para>
-          <indexterm zone="ch-system-iana-etc">
-            <primary sortas="e-/etc/protocols">/etc/protocols</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="services">
-        <term><filename>/etc/services</filename></term>
-        <listitem>
-          <para>Provides a mapping between friendly textual names for internet
-          services, and their underlying assigned port numbers and protocol
-          types</para>
-          <indexterm zone="ch-system-iana-etc">
-            <primary sortas="e-/etc/services">/etc/services</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/intltool.xml
===================================================================
--- BOOK/final-system/common/intltool.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,123 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-intltool" role="wrap">
-  <?dbhtml filename="intltool.html"?>
-
-  <title>Intltool-&intltool-version;</title>
-
-  <indexterm zone="ch-system-intltool">
-    <primary sortas="a-Intltool">Intltool</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Intltool package contains internationalization tools.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Intltool</title>
-
-    <para os="p1">Apply the following patch to fix outdated syntax that is no
-    longer recognized by Perl-&perl-version;.</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&intltool-perl-patch;</userinput></screen>
-
-    <para os="a">Prepare Intltool for compilation:</para>
-
-<screen os="b"><userinput>./configure \
-    --prefix=/usr</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">To test the results, issue:</para>
-
-<screen os="e2"><userinput remap="test">make check</userinput></screen>
-
-    <para os="f">Install the package:</para>
-
-<screen os="g"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-intltool" role="content">
-    <title>Contents of Intltool</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed directories</segtitle>
-
-      <seglistitem>
-        <seg>intltool-extract, intltool-merge, intltool-prepare, intltool-update, intltoolize</seg>
-        <seg>/usr/share/intltool</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="intltool-extract">
-        <term><command>intltool-extract</command></term>
-        <listitem>
-          <para>Generates header files which can be read by gettext</para>
-          <indexterm zone="ch-system-intltool intltool-extract">
-            <primary sortas="b-intltool-extract">intltool-extract</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="intltool-merge">
-        <term><command>intltool-merge</command></term>
-        <listitem>
-          <para>Merges translated strings into various types of files</para>
-          <indexterm zone="ch-system-intltool intltool-merge">
-            <primary sortas="b-intltool-merge">intltool-merge</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="intltool-prepare">
-        <term><command>intltool-prepare</command></term>
-        <listitem>
-          <para>Prepares software to make use of intltool</para>
-          <indexterm zone="ch-system-intltool intltool-prepare">
-            <primary sortas="b-intltool-prepare">intltool-prepare</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="intltool-update">
-        <term><command>intltool-update</command></term>
-        <listitem>
-          <para>Updates PO template files and merges translations with them</para>
-          <indexterm zone="ch-system-intltool intltool-update">
-            <primary sortas="b-intltool-update">intltool-update</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="intltoolize">
-        <term><command>intltoolize</command></term>
-        <listitem>
-          <para>Copies intltool related files to software packages</para>
-          <indexterm zone="ch-system-intltool intltoolize">
-            <primary sortas="b-intltoolize">intltoolize</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/introduction.xml
===================================================================
--- BOOK/final-system/common/introduction.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-introduction">
-  <?dbhtml filename="introduction.html"?>
-
-  <title>Introduction</title>
-
-  <para os="a">In this chapter, we enter the building site and start
-  constructing the CLFS system in earnest. The installation of this
-  software is straightforward. Although in many cases the installation
-  instructions could be made shorter and more generic, we have opted
-  to provide the full instructions for every package to minimize the
-  possibilities for mistakes.  The key to learning what makes a Linux
-  system work is to know what each package is used for and why the user
-  (or the system) needs it.  For every installed package, a summary of
-  its contents is given, followed by concise descriptions of each
-  program and library the package installed.</para>
-
-  <para os="b">If using compiler optimizations, please review the
-  optimization hint at <ulink url="&hints-root;Optimization"/>.
-  Compiler optimizations can make a program run slightly faster, but
-  they may also cause compilation difficulties and problems when
-  running the program. If a package refuses to compile when using
-  optimization, try to compile it without optimization and see if
-  that fixes the problem. Even if the package
-  does compile when using optimization, there is the risk it may have
-  been compiled incorrectly because of the complex interactions between
-  the code and build tools.  Also note that the <option>-march</option>
-  and <option>-mtune</option> options may cause problems with the toolchain
-  packages (Binutils, GCC and Glibc). The small potential gains achieved in
-  using compiler optimizations are often outweighed by the risks. First-time
-  builders of CLFS are encouraged to build without custom optimizations.
-  The subsequent system will still run very fast and be stable at the
-  same time.</para>
-
-  <para os="c">The order that packages are installed in this chapter needs to
-  be strictly followed to ensure that no program accidentally acquires a
-  path referring to <filename class="directory">/tools</filename>
-  hard-wired into it. For the same reason, do not compile packages in
-  parallel. Compiling in parallel may save time (especially on dual-CPU
-  machines), but it could result in a program containing a hard-wired
-  path to <filename class="directory">/tools</filename>, which will
-  cause the program to stop working when that directory is
-  removed.</para>
-
-  <para os="d">To keep track of which package installs particular files, a
-  package manager can be used. For a general overview of different styles of
-  package managers, please take a look at the next page.</para>
-
-</sect1>
Index: OK/final-system/common/iproute2.xml
===================================================================
--- BOOK/final-system/common/iproute2.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,287 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-iproute2" role="wrap">
-  <?dbhtml filename="iproute2.html"?>
-
-  <title>IPRoute2-&iproute2-version;</title>
-
-  <indexterm zone="ch-system-iproute2">
-    <primary sortas="a-IPRoute2">IPRoute2</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The IPRoute2 package contains programs for basic and advanced
-    IPV4-based networking.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of IPRoute2</title>
-
-    <para os="s1">ARPD will not be installed as Berkeley DB is not installed.
-        Remove any <command>arpd</command> references during install.</para>
-
-    <screen os="s2"><userinput>sed -i '/ARPD/d' Makefile
-            sed -i 's/arpd.8//' man/man8/Makefile
-            sed -i '/tc-simple/s@tc-skbmod.8 @@' man/man8/Makefile
-            rm -v doc/arpd.sgml
-    </userinput></screen>
-
-    <para os="a">Compile the package:</para>
-
-<screen os="b"><userinput>make</userinput></screen>
-
-    <para os="c">This package does not come with a test suite.</para>
-
-    <para os="d">Install the package:</para>
-
-<screen os="e"><userinput>make DOCDIR=/usr/share/doc/iproute2-&iproute2-version; install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-iproute2" role="content">
-    <title>Contents of IPRoute2</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed directories</segtitle>
-
-      <seglistitem>
-        <seg>bridge, ctstat (link to lnstat), genl, ifcfg, ifstat, ip, lnstat,
-        nstat, routef, routel, rtacct, rtmon, rtpr, rtstat (link to lnstat), ss,
-        tc</seg>
-        <seg>/etc/iproute2, /usr/lib/tc,
-        /usr/share/doc/iproute2-&iproute2-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="bridge">
-        <term><command>bridge</command></term>
-        <listitem>
-          <para>Configures network bridges</para>
-          <indexterm zone="ch-system-iproute2 bridge">
-            <primary sortas="b-bridge">bridge</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ctstat">
-        <term><command>ctstat</command></term>
-        <listitem>
-          <para>Connection status utility</para>
-          <indexterm zone="ch-system-iproute2 ctstat">
-            <primary sortas="b-ctstat">ctstat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="genl">
-        <term><command>genl</command></term>
-        <listitem>
-          <para>Needs description</para>
-          <indexterm zone="ch-system-iproute2 genl">
-            <primary sortas="b-genl">genl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ifcfg">
-        <term><command>ifcfg</command></term>
-        <listitem>
-          <para>A shell script wrapper for the <command>ip</command>
-          command</para>
-          <indexterm zone="ch-system-iproute2 ifcfg">
-            <primary sortas="b-ifcfg">ifcfg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ifstat">
-        <term><command>ifstat</command></term>
-        <listitem>
-          <para>Shows the interface statistics, including the amount of
-          transmitted and received packets by interface</para>
-          <indexterm zone="ch-system-iproute2 ifstat">
-            <primary sortas="b-ifstat">ifstat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ip">
-        <term><command>ip</command></term>
-        <listitem>
-          <para>The main executable. It has several different functions:</para>
-
-          <para><command>ip link <replaceable>[device]</replaceable></command>
-          allows users to look at the state of devices and to make changes</para>
-
-          <para><command>ip addr</command> allows users to look at addresses and
-          their properties, add new addresses, and delete old ones</para>
-
-          <para><command>ip neighbor</command> allows users to look at neighbor
-          bindings and their properties, add new neighbor entries, and delete
-          old ones</para>
-
-          <para><command>ip rule</command> allows users to look at the routing
-          policies and change them</para>
-
-          <para><command>ip route</command> allows users to look at the routing
-          table and change routing table rules</para>
-
-          <para><command>ip tunnel</command> allows users to look at the IP
-          tunnels and their properties, and change them</para>
-
-          <para><command>ip maddr</command> allows users to look at the multicast
-          addresses and their properties, and change them</para>
-
-          <para><command>ip mroute</command> allows users to set, change, or
-          delete the multicast routing</para>
-
-          <para><command>ip monitor</command> allows users to continuously monitor
-          the state of devices, addresses and routes</para>
-          <indexterm zone="ch-system-iproute2 ip">
-            <primary sortas="b-ip">ip</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lnstat">
-        <term><command>lnstat</command></term>
-        <listitem>
-          <para>Provides Linux network statistics. It is a generalized and more
-          feature-complete replacement for the old <command>rtstat</command>
-          program</para>
-          <indexterm zone="ch-system-iproute2 lnstat">
-            <primary sortas="b-lnstat">lnstat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="nstat">
-        <term><command>nstat</command></term>
-        <listitem>
-          <para>Shows network statistics</para>
-          <indexterm zone="ch-system-iproute2 nstat">
-            <primary sortas="b-nstat">nstat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="routef">
-        <term><command>routef</command></term>
-        <listitem>
-          <para>A component of <command>ip route</command>. This is for flushing
-          the routing tables</para>
-          <indexterm zone="ch-system-iproute2 routef">
-            <primary sortas="b-routef">routef</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="routel">
-        <term><command>routel</command></term>
-        <listitem>
-          <para>A component of <command>ip route</command>. This is for listing
-          the routing tables</para>
-          <indexterm zone="ch-system-iproute2 routel">
-            <primary sortas="b-routel">routel</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rtacct">
-        <term><command>rtacct</command></term>
-        <listitem>
-          <para>Displays the contents of
-          <filename>/proc/net/rt_acct</filename></para>
-          <indexterm zone="ch-system-iproute2 rtacct">
-            <primary sortas="b-rtacct">rtacct</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rtmon">
-        <term><command>rtmon</command></term>
-        <listitem>
-          <para>Route monitoring utility</para>
-          <indexterm zone="ch-system-iproute2 rtmon">
-            <primary sortas="b-rtmon">rtmon</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rtpr">
-        <term><command>rtpr</command></term>
-        <listitem>
-          <para>Converts the output of <command>ip -o</command> back into a
-          readable form</para>
-          <indexterm zone="ch-system-iproute2 rtpr">
-            <primary sortas="b-rtpr">rtpr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rtstat">
-        <term><command>rtstat</command></term>
-        <listitem>
-          <para>Route status utility</para>
-          <indexterm zone="ch-system-iproute2 rtstat">
-            <primary sortas="b-rtstat">rtstat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ss">
-        <term><command>ss</command></term>
-        <listitem>
-          <para>Similar to the <command>netstat</command> command; shows
-          active connections</para>
-          <indexterm zone="ch-system-iproute2 ss">
-            <primary sortas="b-ss">ss</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tc">
-        <term><command>tc</command></term>
-        <listitem>
-          <para>Traffic Controlling Executable; this is for Quality Of Service
-          (QOS) and Class Of Service (COS) implementations</para>
-
-          <para><command>tc qdisc</command> allows users to setup the queueing
-          discipline</para>
-
-          <para><command>tc class</command> allows users to setup classes based on
-          the queuing discipline scheduling</para>
-
-          <para><command>tc estimator</command> allows users to estimate the
-          network flow into a network</para>
-
-          <para><command>tc filter</command> allows users to setup the QOS/COS
-          packet filtering</para>
-
-          <para><command>tc policy</command> allows users to setup the QOS/COS
-          policies</para>
-          <indexterm zone="ch-system-iproute2 ss">
-            <primary sortas="b-tc">tc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/iputils.xml
===================================================================
--- BOOK/final-system/common/iputils.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,163 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-iputils" role="wrap">
-  <?dbhtml filename="iputils.html"?>
-
-  <title>IPutils-&iputils-version;</title>
-
-  <indexterm zone="ch-system-iputils">
-    <primary sortas="a-IPutils">IPutils</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The IPutils package contains programs for basic networking.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of IPutils</title>
-
-    <para os="p1">Apply the following patch for man-pages and build edits:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&iputils-build-patch;</userinput></screen>
-
-    <para os="a">Compile the package:</para>
-
-<screen os="b"><userinput>make TARGETS="clockdiff ping rdisc tracepath tracepath6 traceroute6"</userinput></screen>
-
-    <para os="c">This package does not come with a test suite.</para>
-
-    <para os="d">Install the package:</para>
-
-<screen os="e"><userinput>install -v -m755 ping /bin
-install -v -m755 clockdiff /usr/bin
-install -v -m755 rdisc /usr/bin
-install -v -m755 tracepath /usr/bin
-install -v -m755 trace{path,route}6 /usr/bin
-install -v -m644 doc/*.8 /usr/share/man/man8
-ln -sv ping /bin/ping4
-ln -sv ping /bin/ping6</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-iputils" role="content">
-    <title>Contents of iputils</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>clockdiff, ping, rdisc, tracepath, tracepath6, traceroute6, ping4 (link to ping), ping6 (link to ping)</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-<!--
-      <varlistentry id="arping">
-        <term><command>arping</command></term>
-        <listitem>
-          <para>Sends an ARP request to a neighbor host</para>
-          <indexterm zone="ch-system-iputils arping">
-            <primary sortas="b-arping">arping</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
-      <varlistentry id="clockdiff">
-        <term><command>clockdiff</command></term>
-        <listitem>
-          <para>Measures the clock difference between hosts</para>
-          <indexterm zone="ch-system-iputils clockdiff">
-            <primary sortas="b-clockdiff">clockdiff</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ping">
-        <term><command>ping</command></term>
-        <listitem>
-          <para>Sends echo-request packets and reports how long the replies
-          take.</para>
-          <indexterm zone="ch-system-iputils ping">
-            <primary sortas="b-ping">ping</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ping4">
-        <term><command>ping</command></term>
-        <listitem>
-          <para>Executes ping for IPV4 support</para>
-          <indexterm zone="ch-system-iputils ping4">
-            <primary sortas="b-ping4">ping</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ping6">
-        <term><command>ping6</command></term>
-        <listitem>
-          <para>Executes ping for  IPV6 support</para>
-          <indexterm zone="ch-system-iputils ping6">
-            <primary sortas="b-ping6">ping6</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rdisc">
-        <term><command>rdisc</command></term>
-        <listitem>
-          <para>Network router discovery daemon</para>
-          <indexterm zone="ch-system-iputils rdisc">
-            <primary sortas="b-rdisc">rdisc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tracepath">
-        <term><command>tracepath</command></term>
-        <listitem>
-          <para>Traces the path to a network host discovering MTU along the
-          path. This is the IPV4 version.</para>
-          <indexterm zone="ch-system-iputils tracepath">
-            <primary sortas="b-tracepath">tracepath</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tracepath6">
-        <term><command>tracepath6</command></term>
-        <listitem>
-          <para>Traces the path to a network host discovering MTU along the
-          path. This is the IPV6 version.</para>
-          <indexterm zone="ch-system-iputils tracepath6">
-            <primary sortas="b-tracepath6">tracepath6</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="traceroute6">
-        <term><command>traceroute6</command></term>
-        <listitem>
-          <para>Traces the path to a network host on an IPV6 network</para>
-          <indexterm zone="ch-system-iputils traceroute6">
-            <primary sortas="b-traceroute6">traceroute6</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/isl.xml
===================================================================
--- BOOK/final-system/common/isl.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,85 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-isl" role="wrap">
-  <?dbhtml filename="isl.html"?>
-
-  <title>ISL-&isl-version;</title>
-
-  <indexterm zone="ch-system-isl">
-    <primary sortas="a-ISL">ISL</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>ISL is a library for manipulating sets and relations of integer
-    points bounded by linear constraints.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of ISL</title>
-
-    <para os="a">Prepare ISL for compilation:</para>
-
-<screen os="b"><userinput>CC="gcc -isystem /usr/include" \
-LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
-./configure \
-    --prefix=/usr</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">Test the results:</para>
-
-<screen os="f"><userinput remap="test">make check</userinput></screen>
-
-    <para os="g">Install the package:</para>
-
-<screen os="h"><userinput>make install</userinput></screen>
-
-    <para os="i">Finally, move a misplaced file:</para>
-
-<screen os="j"><userinput>mkdir -pv /usr/share/gdb/auto-load/usr/lib
-mv -v /usr/lib/libisl*gdb.py /usr/share/gdb/auto-load/usr/lib</userinput></screen>
-  </sect2>
-
-  <sect2 id="contents-isl" role="content">
-    <title>Contents of ISL</title>
-
-    <segmentedlist>
-      <segtitle>Installed libraries</segtitle>
-      <segtitle>Installed directory</segtitle>
-
-      <seglistitem>
-        <seg>libisl.[a,so]</seg>
-        <seg>/usr/include/isl</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libisl">
-        <term><filename class="libraryfile">libisl</filename></term>
-        <listitem>
-          <para>The Integer Set Library.</para>
-          <indexterm zone="ch-system-isl libisl">
-            <primary sortas="c-libisl">libisl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/kbd.xml
===================================================================
--- BOOK/final-system/common/kbd.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,386 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-kbd" role="wrap">
-  <?dbhtml filename="kbd.html"?>
-
-  <title>Kbd-&kbd-version;</title>
-
-  <indexterm zone="ch-system-kbd">
-    <primary sortas="a-Kbd">Kbd</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Kbd package contains key-table files and keyboard
-    utilities.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Kbd</title>
-
-    <para os="a">Prepare Kbd for compilation:</para>
-
-<screen os="b"><userinput>PKG_CONFIG_PATH="/tools/lib/pkgconfig" \
-./configure \
-    --prefix=/usr \
-    --disable-vlock \
-    --enable-optional-progs</userinput></screen>
-
-    <variablelist os="c">
-      <title>The meaning of the new configure options:</title>
-
-      <varlistentry>
-        <term><envar>PKG_CONFIG_PATH</envar></term>
-        <listitem>
-          <para>Use pkg-config to obtain the location of the test library
-          metadata built in <xref linkend="ch-temp-system-check"/>.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><envar>--disable-vlock</envar></term>
-        <listitem>
-          <para>Prevents Kbd from trying to build the
-          <command>vlock</command> program, which requires Linux-PAM.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><envar>--enable-optional-progs</envar></term>
-        <listitem>
-          <para>Installs several additional programs.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para os="d">Compile the package:</para>
-
-<screen os="e"><userinput>make</userinput></screen>
-
-    <para os="f">To test the results, issue:</para>
-
-<screen os="g"><userinput remap="test">make check</userinput></screen>
-
-    <para os="h">Install the package:</para>
-
-<screen os="i"><userinput>make install</userinput></screen>
-
-    <para os="j">Some of the programs from Kbd are used by systemd to
-    initialize the system, so those binaries need to be on the root
-    partition:</para>
-
-<screen os="k"><userinput>mv -v /usr/bin/{loadkeys,setfont} /bin</userinput></screen>
-
-    <para os="l">Install the documentation:</para>
-
-<screen os="m"><userinput>mkdir -v /usr/share/doc/kbd-&kbd-version;
-cp -R -v docs/doc/* /usr/share/doc/kbd-&kbd-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-kbd" role="content">
-    <title>Contents of Kbd</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed directories</segtitle>
-
-      <seglistitem>
-        <seg>chvt, deallocvt, dumpkeys, fgconsole, getkeycodes, kbdinfo,
-        kbd_mode, kbdrate, loadkeys, loadunimap, mapscrn, openvt, psfaddtable
-        (link to psfxtable), psfgettable (link to psfxtable), psfstriptable
-        (link to psfxtable), psfxtable, resizecons, setfont, setkeycodes,
-        setleds, setmetamode, setvtrgb, showconsolefont, showkey,
-        unicode_start, unicode_stop</seg>
-        <seg>/usr/share/consolefonts, /usr/share/consoletrans,
-        /usr/share/doc/kbd-&kbd-version;,
-        /usr/share/keymaps, /usr/share/unimaps</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="chvt">
-        <term><command>chvt</command></term>
-        <listitem>
-          <para>Changes the foreground virtual terminal</para>
-          <indexterm zone="ch-system-kbd chvt">
-            <primary sortas="b-chvt">chvt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="deallocvt">
-        <term><command>deallocvt</command></term>
-        <listitem>
-          <para>Deallocates unused virtual terminals</para>
-          <indexterm zone="ch-system-kbd deallocvt">
-            <primary sortas="b-deallocvt">deallocvt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dumpkeys">
-        <term><command>dumpkeys</command></term>
-        <listitem>
-          <para>Dumps the keyboard translation tables</para>
-          <indexterm zone="ch-system-kbd dumpkeys">
-            <primary sortas="b-dumpkeys">dumpkeys</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fgconsole">
-        <term><command>fgconsole</command></term>
-        <listitem>
-          <para>Prints the number of the active virtual terminal</para>
-          <indexterm zone="ch-system-kbd fgconsole">
-            <primary sortas="b-fgconsole">fgconsole</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="getkeycodes">
-        <term><command>getkeycodes</command></term>
-        <listitem>
-          <para>Prints the kernel scancode-to-keycode mapping table</para>
-          <indexterm zone="ch-system-kbd getkeycodes">
-            <primary sortas="b-getkeycodes">getkeycodes</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kbdinfo">
-        <term><command>kbdinfo</command></term>
-        <listitem>
-          <para>Obtains information about the console</para>
-          <indexterm zone="ch-system-kbd kbdinfo">
-            <primary sortas="b-kbdinfo">kbdinfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kbd_mode">
-        <term><command>kbd_mode</command></term>
-        <listitem>
-          <para>Reports or sets the keyboard mode</para>
-          <indexterm zone="ch-system-kbd kbd_mode">
-            <primary sortas="b-kbd_mode">kbd_mode</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kbdrate">
-        <term><command>kbdrate</command></term>
-        <listitem>
-          <para>Sets the keyboard repeat and delay rates</para>
-          <indexterm zone="ch-system-kbd kbdrate">
-            <primary sortas="b-kbdrate">kbdrate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="loadkeys">
-        <term><command>loadkeys</command></term>
-        <listitem>
-          <para>Loads the keyboard translation tables</para>
-          <indexterm zone="ch-system-kbd loadkeys">
-            <primary sortas="b-loadkeys">loadkeys</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="loadunimap">
-        <term><command>loadunimap</command></term>
-        <listitem>
-          <para>Loads the kernel unicode-to-font mapping table</para>
-          <indexterm zone="ch-system-kbd loadunimap">
-            <primary sortas="b-loadunimap">loadunimap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mapscrn">
-        <term><command>mapscrn</command></term>
-        <listitem>
-          <para>An obsolete program that used to load a user-defined output
-          character mapping table into the console driver; this is now done
-          by <command>setfont</command></para>
-          <indexterm zone="ch-system-kbd mapscrn">
-            <primary sortas="b-mapscrn">mapscrn</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="openvt">
-        <term><command>openvt</command></term>
-        <listitem>
-          <para>Starts a program on a new virtual terminal (VT)</para>
-          <indexterm zone="ch-system-kbd openvt">
-            <primary sortas="b-openvt">openvt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="psfaddtable">
-        <term><command>psfaddtable</command></term>
-        <listitem>
-          <para>Adds a Unicode character table to a console font</para>
-          <indexterm zone="ch-system-kbd psfaddtable">
-            <primary sortas="b-psfaddtable">psfaddtable</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="psfgettable">
-        <term><command>psfgettable</command></term>
-        <listitem>
-          <para>Extracts the embedded Unicode character table from a console
-          font</para>
-          <indexterm zone="ch-system-kbd psfgettable">
-            <primary sortas="b-psfgettable">psfgettable</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="psfstriptable">
-        <term><command>psfstriptable</command></term>
-        <listitem>
-          <para>Removes the embedded Unicode character table from a console
-          font</para>
-          <indexterm zone="ch-system-kbd psfstriptable">
-            <primary sortas="b-psfstriptable">psfstriptable</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="psfxtable">
-        <term><command>psfxtable</command></term>
-        <listitem>
-          <para>Handle Unicode character tables for console fonts</para>
-          <indexterm zone="ch-system-kbd psfxtable">
-            <primary sortas="b-psfxtable">psfxtable</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="resizecons">
-        <term><command>resizecons</command></term>
-        <listitem>
-          <para>Changes the kernel idea of the console size</para>
-          <indexterm zone="ch-system-kbd resizecons">
-            <primary sortas="b-resizecons">resizecons</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="setfont">
-        <term><command>setfont</command></term>
-        <listitem>
-          <para>Changes the Enhanced Graphic Adapter (EGA) and Video Graphics
-          Array (VGA) fonts on the console</para>
-          <indexterm zone="ch-system-kbd setfont">
-            <primary sortas="b-setfont">setfont</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="setkeycodes">
-        <term><command>setkeycodes</command></term>
-        <listitem>
-          <para>Loads kernel scancode-to-keycode mapping table entries; this is
-          useful if there are unusual keys on the keyboard</para>
-          <indexterm zone="ch-system-kbd setkeycodes">
-            <primary sortas="b-setkeycodes">setkeycodes</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="setleds">
-        <term><command>setleds</command></term>
-        <listitem>
-          <para>Sets the keyboard flags and Light Emitting Diodes (LEDs)</para>
-          <indexterm zone="ch-system-kbd setleds">
-            <primary sortas="b-setleds">setleds</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="setmetamode">
-        <term><command>setmetamode</command></term>
-        <listitem>
-          <para>Defines the keyboard meta-key handling</para>
-          <indexterm zone="ch-system-kbd setmetamode">
-            <primary sortas="b-setmetamode">setmetamode</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="setvtrgb">
-        <term><command>setvtrgb</command></term>
-        <listitem>
-          <para>Sets the virtal terminal RGB colors</para>
-          <indexterm zone="ch-system-kbd setvtrgb">
-            <primary sortas="b-setvtrgb">setvtrgb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="showconsolefont">
-        <term><command>showconsolefont</command></term>
-        <listitem>
-          <para>Shows the current EGA/VGA console screen font</para>
-          <indexterm zone="ch-system-kbd showconsolefont">
-            <primary sortas="b-showconsolefont">showconsolefont</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="showkey">
-        <term><command>showkey</command></term>
-        <listitem>
-          <para>Reports the scancodes, keycodes, and ASCII codes of the keys
-          pressed on the keyboard</para>
-          <indexterm zone="ch-system-kbd showkey">
-            <primary sortas="b-showkey">showkey</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="unicode_start">
-        <term><command>unicode_start</command></term>
-        <listitem>
-          <para>Puts the keyboard and console in UNICODE mode. Never use it on
-          CLFS, because applications are not configured to support UNICODE.</para>
-          <indexterm zone="ch-system-kbd unicode_start">
-            <primary sortas="b-unicode_start">unicode_start</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="unicode_stop">
-        <term><command>unicode_stop</command></term>
-        <listitem>
-          <para>Reverts keyboard and console from UNICODE mode</para>
-          <indexterm zone="ch-system-kbd unicode_stop">
-            <primary sortas="b-unicode_stop">unicode_stop</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/kmod.xml
===================================================================
--- BOOK/final-system/common/kmod.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,177 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-kmod" role="wrap">
-  <?dbhtml filename="kmod.html"?>
-
-  <title>Kmod-&kmod-version;</title>
-
-  <indexterm zone="ch-system-kmod">
-    <primary sortas="a-Kmod">Kmod</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Kmod package contains programs for loading, inserting
-      and removing kernel modules for Linux. Kmod replaces the
-      Module-Init-tools package.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Kmod</title>
-
-    <para os="a">Prepare Kmod for compilation:</para>
-
-<screen os="b"><userinput>./configure \
-    --prefix=/usr \
-    --bindir=/bin \
-    --sysconfdir=/etc \
-    --with-rootlibdir=/lib \
-    --with-zlib \
-    --with-xz</userinput></screen>
-
-    <variablelist os="c">
-      <title>The meaning of the configure option:</title>
-
-      <varlistentry>
-        <term><parameter>--with-rootlibdir=/lib</parameter></term>
-        <listitem>
-          <para>Install location for shared libraries.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--with-zlib --with-xz</parameter></term>
-        <listitem>
-          <para>This allows the Kmod package to handle zlib and XZ
-            compressed kernel modules.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para os="d">Compile the package:</para>
-
-<screen os="e"><userinput>make</userinput></screen>
-
-    <para os="f">To test the results, issue:</para>
-
-<screen os="f2"><userinput remap="test">make check</userinput></screen>
-
-    <para os="g">Install the package:</para>
-
-<screen os="h"><userinput>make install</userinput></screen>
-
-    <para os="i">Create symbolic links for programs that expect Module-Init-Tools:</para>
-
-<screen os="j"><userinput>ln -sfv kmod /bin/lsmod
-for tool in depmod insmod modinfo modprobe rmmod; do
-    ln -sfv ../bin/kmod /sbin/${tool}
-done</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-kmod" role="content">
-    <title>Contents of Kmod</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>depmod (link to kmod), insmod (link to kmod), kmod,
-        lsmod (link to kmod), modinfo (link to kmod), modprobe (link to kmod),
-        rmmod (link to kmod) </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="depmod">
-        <term><command>depmod</command></term>
-        <listitem>
-          <para>Creates a dependency file based on the symbols it finds in
-          the existing set of modules; this dependency file is used by
-          <command>modprobe</command> to automatically load the required
-          modules</para>
-          <indexterm zone="ch-system-kmod depmod">
-            <primary sortas="b-depmod">depmod</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="insmod">
-        <term><command>insmod</command></term>
-        <listitem>
-          <para>Installs a loadable module in the running kernel</para>
-          <indexterm zone="ch-system-kmod insmod">
-            <primary sortas="b-insmod">insmod</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kmod">
-        <term><command>kmod</command></term>
-        <listitem>
-          <para>Loads and unloads kernel modules</para>
-          <indexterm zone="ch-system-kmod kmod">
-            <primary sortas="b-kmod">kmod</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lsmod">
-        <term><command>lsmod</command></term>
-        <listitem>
-          <para>Lists currently loaded modules</para>
-          <indexterm zone="ch-system-kmod lsmod">
-            <primary sortas="b-lsmod">lsmod</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="modinfo">
-        <term><command>modinfo</command></term>
-        <listitem>
-          <para>Examines an object file associated with a kernel module and
-          displays any information that it can glean</para>
-          <indexterm zone="ch-system-kmod modinfo">
-            <primary sortas="b-modinfo">modinfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="modprobe">
-        <term><command>modprobe</command></term>
-        <listitem>
-          <para>Uses a dependency file, created by <command>depmod</command>,
-          to automatically load relevant modules</para>
-          <indexterm zone="ch-system-kmod modprobe">
-            <primary sortas="b-modprobe">modprobe</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rmmod">
-        <term><command>rmmod</command></term>
-        <listitem>
-          <para>Unloads modules from the running kernel</para>
-          <indexterm zone="ch-system-kmod rmmod">
-            <primary sortas="b-rmmod">rmmod</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/less.xml
===================================================================
--- BOOK/final-system/common/less.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,103 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-less" role="wrap">
-  <?dbhtml filename="less.html"?>
-
-  <title>Less-&less-version;</title>
-
-  <indexterm zone="ch-system-less">
-    <primary sortas="a-Less">Less</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Less package contains a text file viewer.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Less</title>
-
-    <para os="a">Prepare Less for compilation:</para>
-
-<screen os="b"><userinput>./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">This package does not come with a test suite.</para>
-
-    <para os="f">Install the package:</para>
-
-<screen os="g"><userinput>make install</userinput></screen>
-
-    <para os="h">Move <command>less</command> to
-    <filename class="directory">/bin</filename>:</para>
-
-<screen os="i"><userinput>mv -v /usr/bin/less /bin</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-less" role="content">
-    <title>Contents of Less</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>less, lessecho, lesskey</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="less">
-        <term><command>less</command></term>
-        <listitem>
-          <para>A file viewer or pager; it displays the contents of the given
-          file, letting the user scroll, find strings, and jump to marks</para>
-          <indexterm zone="ch-system-less less">
-            <primary sortas="b-less">less</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lessecho">
-        <term><command>lessecho</command></term>
-        <listitem>
-          <para>Needed to expand meta-characters, such as <emphasis>*</emphasis>
-          and <emphasis>?</emphasis>, in filenames on Unix systems</para>
-          <indexterm zone="ch-system-less lessecho">
-            <primary sortas="b-lessecho">lessecho</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lesskey">
-        <term><command>lesskey</command></term>
-        <listitem>
-          <para>Used to specify the key bindings for
-          <command>less</command></para>
-          <indexterm zone="ch-system-less lesskey">
-            <primary sortas="b-lesskey">lesskey</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/libcap.xml
===================================================================
--- BOOK/final-system/common/libcap.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,131 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-libcap" role="wrap">
-  <?dbhtml filename="libcap.html"?>
-
-  <title>Libcap-&libcap-version;</title>
-
-  <indexterm zone="ch-system-libcap">
-    <primary sortas="a-Libcap">Libcap</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>Libcap is a library for getting and setting POSIX.1e
-    (formerly POSIX 6) draft 15 capabilities.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Libcap</title>
-
-    <para os="a">Compile the package:</para>
-
-<screen os="b"><userinput>make</userinput></screen>
-
-    <para os="c">This package does not come with a test suite.</para>
-
-    <para os="d">Install the package:</para>
-
-<screen os="e"><userinput>make RAISE_SETFCAP=no install
-chmod -v 755 /lib/libcap.so.&libcap-version;
-ln -sfv ../../lib/$(readlink /lib/libcap.so) /usr/lib/libcap.so
-rm -v /lib/libcap.so
-mv -v /lib/libcap.a /usr/lib</userinput></screen>
-
-    <variablelist os="f">
-      <title>The meaning of the make option:</title>
-
-      <varlistentry>
-        <term><parameter>RAISE_SETFCAP=no</parameter></term>
-        <listitem>
-          <para>This prevents <command>setcap</command> from being run on
-          itself, which will fail if the kernel or file system does not
-          support extended capabilities.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-  <sect2 id="contents-libcap" role="content">
-    <title>Contents of Libcap</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed libraries</segtitle>
-
-      <seglistitem>
-        <seg>capsh, getcap, getpcaps, setcap</seg>
-        <seg>libcap.[a,so]</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="capsh">
-        <term><command>capsh</command></term>
-        <listitem>
-          <para>Capability support and use can be explored and constrained
-          with this tool</para>
-          <indexterm zone="ch-system-libcap capsh">
-            <primary sortas="b-capsh">capsh</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="getcap">
-        <term><command>getcap</command></term>
-        <listitem>
-          <para>Examines file capabilities</para>
-          <indexterm zone="ch-system-libcap getcap">
-            <primary sortas="b-getcap">getcap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="getpcaps">
-        <term><command>getpcaps</command></term>
-        <listitem>
-          <para>Displays the capabilities on the queried process(es)</para>
-          <indexterm zone="ch-system-libcap getpcaps">
-            <primary sortas="b-getpcaps">getpcaps</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="setcap">
-        <term><command>setcap</command></term>
-        <listitem>
-          <para>Sets file capabilities</para>
-          <indexterm zone="ch-system-libcap setcap">
-            <primary sortas="b-setcap">setcap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcap">
-        <term><filename class="libraryfile">libcap</filename></term>
-        <listitem>
-          <para>Library for setting and clearing POSIX.1e capabilities</para>
-          <indexterm zone="ch-system-libcap libcap">
-            <primary sortas="c-libcap">libcap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/libpipeline.xml
===================================================================
--- BOOK/final-system/common/libpipeline.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,79 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-libpipeline" role="wrap">
-  <?dbhtml filename="libpipeline.html"?>
-
-  <title>Libpipeline-&libpipeline-version;</title>
-
-  <indexterm zone="ch-system-libpipeline">
-    <primary sortas="a-Libpipeline">Libpipeline</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Libpipeline package contains a library for manipulating pipelines
-    of subprocesses in a flexible and convenient way.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Libpipeline</title>
-
-    <para os="a">Prepare Libpipeline for compilation:</para>
-
-<screen os="b"><userinput>PKG_CONFIG_PATH=/tools/lib/pkgconfig \
-./configure \
-    --prefix=/usr</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">To test the results, issue:</para>
-
-<screen os="f"><userinput remap="test">make check</userinput></screen>
-
-    <para os="g">Install the package:</para>
-
-<screen os="h"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-libpipeline" role="content">
-    <title>Contents of Libpipeline</title>
-
-    <segmentedlist>
-      <segtitle>Installed libraries</segtitle>
-
-      <seglistitem>
-        <seg>libpipeline.so</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libpipeline">
-        <term><filename class="libraryfile">libpipeline</filename></term>
-        <listitem>
-          <para>This library is used to safely construct pipeline between
-          subprocesses</para>
-          <indexterm zone="ch-system-libpipeline libpipeline">
-            <primary sortas="c-libpipeline">libpipeline</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/libtool.xml
===================================================================
--- BOOK/final-system/common/libtool.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,103 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-libtool" role="wrap">
-  <?dbhtml filename="libtool.html"?>
-
-  <title>Libtool-&libtool-version;</title>
-
-  <indexterm zone="ch-system-libtool">
-    <primary sortas="a-Libtool">Libtool</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Libtool package contains the GNU generic library support script.
-    It wraps the complexity of using shared libraries in a consistent, portable
-    interface.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Libtool</title>
-
-    <para os="a">Prepare Libtool for compilation:</para>
-
-<screen os="b"><userinput>./configure \
-    --prefix=/usr</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">To test the results, issue:</para>
-
-<screen os="e2"><userinput remap="test">make check</userinput></screen>
-
-    <para os="f">Install the package:</para>
-
-<screen os="g"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-libtool" role="content">
-    <title>Contents of Libtool</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed libraries</segtitle>
-      <segtitle>Installed directories</segtitle>
-
-      <seglistitem>
-        <seg>libtool, libtoolize</seg>
-        <seg>libltdl.[a,so]</seg>
-        <seg>/usr/include/libltdl, /usr/share/libtool</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libtool">
-        <term><command>libtool</command></term>
-        <listitem>
-          <para>Provides generalized library-building support services</para>
-          <indexterm zone="ch-system-libtool libtool">
-            <primary sortas="b-libtool">libtool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libtoolize">
-        <term><command>libtoolize</command></term>
-        <listitem>
-          <para>Provides a standard way to add <command>libtool</command> support
-          to a package</para>
-          <indexterm zone="ch-system-libtool libtoolize">
-            <primary sortas="b-libtoolize">libtoolize</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libltdl">
-        <term><filename class="libraryfile">libltdl</filename></term>
-        <listitem>
-          <para>Hides the various difficulties of dlopening libraries</para>
-          <indexterm zone="ch-system-libtool libltdl">
-            <primary sortas="c-libltdl">libltdl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/linux-headers.xml
===================================================================
--- BOOK/final-system/common/linux-headers.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,124 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-linux-headers" role="wrap">
-  <?dbhtml filename="linux-headers.html"?>
-
-  <title>Linux-&linux-version2; Headers</title>
-
-  <indexterm zone="ch-system-linux-headers">
-    <primary sortas="a-Linux Headers">Linux Headers</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Linux Kernel contains a <command>make</command> target that
-    installs <quote>sanitized</quote> kernel headers.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Linux Headers</title>
-
-    <note os="a">
-      <para>For this step you will need to unpack the kernel tarball
-      (<filename>linux-&linux-version;.tar.xz</filename>) and
-      <command>cd</command> into its source
-      directory before entering the commands on this page.</para>
-    </note>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../bootable/x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../bootable/x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <para os="b">Install the kernel header files:</para>
-
-<screen os="c"><userinput>make mrproper
-make headers_check
-make INSTALL_HDR_PATH=/usr headers_install
-find /usr/include -name .install -or -name ..install.cmd | xargs rm -fv</userinput></screen>
-
-    <variablelist os="d">
-      <title>The meaning of the make commands:</title>
-
-      <varlistentry os="d1">
-        <term><parameter>make mrproper</parameter></term>
-        <listitem>
-          <para>Ensures that the kernel source dir is clean.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="d2">
-        <term><parameter>make headers_check</parameter></term>
-        <listitem>
-          <para>Sanitizes the raw kernel headers so that they can be used
-          by userspace programs.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="d3">
-        <term><parameter>make INSTALL_HDR_PATH=/usr headers_install</parameter></term>
-        <listitem>
-          <para>This will install the kernel headers into
-          <filename class="directory">/usr/include</filename>.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="d4">
-        <term><parameter>find /usr/include -name .install -or -name ..install.cmd | xargs rm -fv</parameter></term>
-        <listitem>
-          <para>Removes a number of unneeded debugging files that were installed.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-  <sect2 id="contents-linux-headers" role="content">
-    <title>Contents of Linux Headers</title>
-
-    <segmentedlist>
-      <segtitle>Installed headers</segtitle>
-      <segtitle>Installed directories</segtitle>
-
-      <seglistitem>
-        <seg>/usr/include/{asm,asm-generic,drm,linux,misc,mtd,rdma,scsi,sound,video,xen}/*.h</seg>
-        <seg>/usr/include/asm, /usr/include/asm-generic, /usr/include/drm,
-        /usr/include/linux, /usr/include/misc, /usr/include/mtd, /usr/include/rdma,
-        /usr/include/scsi, /usr/include/sound, /usr/include/uapi,
-        /usr/include/video, /usr/include/xen</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="linux-headers">
-        <term><filename
-        class="headerfile">/usr/include/{asm,asm-generic,drm,linux,mtd,rdma,sound,video}/*.h</filename></term>
-        <listitem>
-          <para>The Linux API headers</para>
-          <indexterm zone="ch-system-linux-headers linux-headers">
-            <primary
-            sortas="e-/usr/include/{asm,linux}/*.h">/usr/include/{asm,linux}/*.h</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/m4.xml
===================================================================
--- BOOK/final-system/common/m4.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,84 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-m4" role="wrap">
-  <?dbhtml filename="m4.html"?>
-
-  <title>M4-&m4-version;</title>
-
-  <indexterm zone="ch-system-m4">
-    <primary sortas="a-M4">M4</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The M4 package contains a macro processor.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of M4</title>
-
-    <para os="a">Prepare M4 for compilation:</para>
-
-<screen os="b"><userinput>./configure \
-    --prefix=/usr</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">To test the results, issue:</para>
-
-<screen os="e2"><userinput remap="test">make check</userinput></screen>
-
-    <para os="f">Install the package:</para>
-
-<screen os="g"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-m4" role="content">
-    <title>Contents of M4</title>
-
-    <segmentedlist>
-      <segtitle>Installed program</segtitle>
-
-      <seglistitem>
-        <seg>m4</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="m4">
-         <!-- Don't remove the extra space, it prevet a FOP warning. -->
-        <term><command>m4 </command></term>
-        <listitem>
-          <para>copies the given files while expanding the macros that they
-          contain. These macros are either built-in or user-defined and can
-          take any number of arguments. Besides performing macro expansion,
-          <command>m4</command> has built-in functions for including named
-          files, running Unix commands, performing integer arithmetic,
-          manipulating text, recursion, etc. The <command>m4</command>
-          program can be used either as a front-end to a compiler or as a
-          macro processor in its own right.</para>
-          <indexterm zone="ch-system-m4 m4">
-            <primary sortas="b-m4">m4</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/make.xml
===================================================================
--- BOOK/final-system/common/make.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,77 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-make" role="wrap">
-  <?dbhtml filename="make.html"?>
-
-  <title>Make-&make-version;</title>
-
-  <indexterm zone="ch-system-make">
-    <primary sortas="a-Make">Make</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Make package contains a program for compiling packages.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Make</title>
-
-    <para os="a">Prepare Make for compilation:</para>
-
-<screen os="b"><userinput>./configure \
-    --prefix=/usr</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">To test the results, issue:</para>
-
-<screen os="e2"><userinput remap="test">make check</userinput></screen>
-
-    <para os="f">Install the package:</para>
-
-<screen os="g"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-make" role="content">
-    <title>Contents of Make</title>
-
-    <segmentedlist>
-      <segtitle>Installed program</segtitle>
-
-      <seglistitem>
-        <seg>make</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="make">
-        <term><command>make</command></term>
-        <listitem>
-          <para>Automatically determines which pieces of a package need to
-          be (re)compiled and then issues the relevant commands</para>
-          <indexterm zone="ch-system-make make">
-            <primary sortas="b-make">make</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/man-db.xml
===================================================================
--- BOOK/final-system/common/man-db.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,407 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-man-db" role="wrap">
-  <?dbhtml filename="man-db.html"?>
-
-  <title>Man-DB-&man-db-version;</title>
-
-  <indexterm zone="ch-system-man-db">
-    <primary sortas="a-Man-DB">Man-DB</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Man-DB package contains programs for finding and viewing man
-    pages.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Man-DB</title>
-
-    <para os="a">Prepare Man-DB for compilation:</para>
-
-<screen os="b"><userinput>./configure \
-    --prefix=/usr \
-    --libexecdir=/usr/lib \
-    --docdir=/usr/share/doc/man-db-&man-db-version; \
-    --sysconfdir=/etc \
-    --disable-setuid \
-    --enable-cache-owner=bin \
-    --with-browser=/usr/bin/lynx \
-    --with-vgrind=/usr/bin/vgrind \
-    --with-grap=/usr/bin/grap</userinput></screen>
-
-    <variablelist os="c">
-      <title>The meaning of the configure options:</title>
-
-      <varlistentry>
-        <term><parameter>--disable-setuid</parameter></term>
-        <listitem>
-          <para>This disables making the <command>man</command> program setuid
-          to user <systemitem class="username">man</systemitem>.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--with-...</parameter></term>
-        <listitem>
-          <para>These three parameters are used to set some default programs.
-          <command>lynx</command> is a text-based web browser (see
-          CBLFS for installation instructions), <command>vgrind</command>
-          converts program sources to Groff input, and <command>grap</command>
-          is useful for typesetting graphs in Groff documents. The
-          <command>vgrind</command> and <command>grap</command> programs are
-          not normally needed for viewing manual pages. They are not part of
-          CLFS or CBLFS, but you should be able to install them yourself after
-          finishing CLFS if you wish to do so.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para os="d">Compile the package:</para>
-
-<screen os="e"><userinput>make</userinput></screen>
-
-    <para os="f">To test the results, issue:</para>
-
-<screen os="g"><userinput remap="test">make check</userinput></screen>
-
-    <para os="h">Install the package:</para>
-
-<screen os="i"><userinput>make install</userinput></screen>
-
-    <para os="j">Edit the installed tmpfile as we have no <systemitem class="username">man</systemitem> user:</para>
-
-<screen os="k"><userinput>sed -i "s:man man:root root:g" /usr/lib/tmpfiles.d/man-db.conf</userinput></screen>
-  </sect2>
-
-  <sect2 id="encoding-man-db" role="encoding">
-    <title>Non-English Manual Pages in CLFS</title>
-
-    <para>The following table shows the character set that Man-DB assumes
-    manual pages installed under
-    <filename class="directory">/usr/share/man/&lt;ll&gt;</filename> will be
-    encoded with.  In addition to this, Man-DB correctly determines if manual
-    pages installed in that directory are UTF-8 encoded.</para>
-
-    <!-- Origin: man-db-2.5.9/lib/encodings.c -->
-    <table>
-<title>Expected character encoding of legacy 8-bit manual pages</title>
-      <?dbfo table-width="6in" ?>
-
-      <tgroup cols="4">
-
-        <colspec colnum="1" colwidth="1.5in"/>
-        <colspec colnum="2" colwidth="1in"/>
-        <colspec colnum="3" colwidth="2.5in"/>
-        <colspec colnum="4" colwidth="1in"/>
-
-        <thead>
-          <row>
-            <entry>Language (code)</entry>
-            <entry>Encoding</entry>
-            <entry>Language (code)</entry>
-            <entry>Encoding</entry>
-          </row>
-        </thead>
-
-        <tbody>
-          <row>
-            <entry>Danish (da)</entry>
-            <entry>ISO-8859-1</entry>
-            <entry>Croatian (hr)</entry>
-            <entry>ISO-8859-2</entry>
-          </row>
-          <row>
-            <entry>German (de)</entry>
-            <entry>ISO-8859-1</entry>
-            <entry>Hungarian (hu)</entry>
-            <entry>ISO-8859-2</entry>
-          </row>
-          <row>
-            <entry>English (en)</entry>
-            <entry>ISO-8859-1</entry>
-            <entry>Japanese (ja)</entry>
-            <entry>EUC-JP</entry>
-          </row>
-          <row>
-            <entry>Spanish (es)</entry>
-            <entry>ISO-8859-1</entry>
-            <entry>Korean (ko)</entry>
-            <entry>EUC-KR</entry>
-          </row>
-          <row>
-            <entry>Estonian (et)</entry>
-            <entry>ISO-8859-1</entry>
-            <entry>Lithuanian (lt)</entry>
-            <entry>ISO-8859-13</entry>
-          </row>
-          <row>
-            <entry>Finnish (fi)</entry>
-            <entry>ISO-8859-1</entry>
-            <entry>Latvian (lv)</entry>
-            <entry>ISO-8859-13</entry>
-          </row>
-          <row>
-            <entry>French (fr)</entry>
-            <entry>ISO-8859-1</entry>
-            <entry>Macedonian (mk)</entry>
-            <entry>ISO-8859-5</entry>
-          </row>
-          <row>
-            <entry>Irish (ga)</entry>
-            <entry>ISO-8859-1</entry>
-            <entry>Polish (pl)</entry>
-            <entry>ISO-8859-2</entry>
-          </row>
-          <row>
-            <entry>Galician (gl)</entry>
-            <entry>ISO-8859-1</entry>
-            <entry>Romanian (ro)</entry>
-            <entry>ISO-8859-2</entry>
-          </row>
-          <row>
-            <entry>Indonesian (id)</entry>
-            <entry>ISO-8859-1</entry>
-            <entry>Russian (ru)</entry>
-            <entry>KOI8-R</entry>
-          </row>
-          <row>
-            <entry>Icelandic (is)</entry>
-            <entry>ISO-8859-1</entry>
-            <entry>Slovak (sk)</entry>
-            <entry>ISO-8859-2</entry>
-          </row>
-          <row>
-            <entry>Italian (it)</entry>
-            <entry>ISO-8859-1</entry>
-            <entry>Slovenian (sl)</entry>
-            <entry>ISO-8859-2</entry>
-          </row>
-          <row>
-            <entry>Norwegian Bokmal (nb)</entry>
-            <entry>ISO-8859-1</entry>
-            <entry>Serbian Latin (sr@latin)</entry>
-            <entry>ISO-8859-2</entry>
-          </row>
-          <row>
-            <entry>Dutch (nl)</entry>
-            <entry>ISO-8859-1</entry>
-            <entry>Serbian (sr)</entry>
-            <entry>ISO-8859-5</entry>
-          </row>
-          <row>
-            <entry>Norwegian Nynorsk (nn)</entry>
-            <entry>ISO-8859-1</entry>
-            <entry>Turkish (tr)</entry>
-            <entry>ISO-8859-9</entry>
-          </row>
-          <row>
-            <entry>Norwegian (no)</entry>
-            <entry>ISO-8859-1</entry>
-            <entry>Ukrainian (uk)</entry>
-            <entry>KOI8-U</entry>
-          </row>
-          <row>
-            <entry>Portuguese (pt)</entry>
-            <entry>ISO-8859-1</entry>
-            <entry>Vietnamese (vi)</entry>
-            <entry>TCVN5712-1</entry>
-          </row>
-          <row>
-            <entry>Swedish (sv)</entry>
-            <entry>ISO-8859-1</entry>
-            <entry>Simplified Chinese (zh_CN)</entry>
-            <entry>GBK</entry>
-          </row>
-          <row>
-            <entry>Belarusian (be)</entry>
-            <entry>CP1251</entry>
-            <entry>Simplified Chinese, Singapore (zh_SG)</entry>
-            <entry>GBK</entry>
-          </row>
-          <row>
-            <entry>Bulgarian (bg)</entry>
-            <entry>CP1251</entry>
-            <entry>Traditional Chinese, Hong Kong (zh_HK)</entry>
-            <entry>BIG5HKSCS</entry>
-          </row>
-          <row>
-            <entry>Czech (cs)</entry>
-            <entry>ISO-8859-2</entry>
-            <entry>Traditional Chinese (zh_TW)</entry>
-            <entry>BIG5</entry>
-          </row>
-          <row>
-            <entry>Greek (el)</entry>
-            <entry>ISO-8859-7</entry>
-            <entry></entry>
-            <entry></entry>
-          </row>
-
-        </tbody>
-
-      </tgroup>
-
-    </table>
-
-    <note>
-      <para>Manual pages in languages not in the list are not supported.</para>
-    </note>
-
-  </sect2>
-
-  <sect2 id="contents-man-db" role="content">
-    <title>Contents of Man-DB</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed libraries</segtitle>
-      <segtitle>Installed directories</segtitle>
-
-      <seglistitem>
-        <seg>accessdb, apropos (link to whatis), catman, lexgrog, man, mandb,
-        manpath, whatis, zsoelim</seg>
-        <seg>libman.so, libmandb.so</seg>
-        <seg>/usr/lib/man-db, /usr/share/doc/man-db-&man-db-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="accessdb">
-        <term><command>accessdb</command></term>
-        <listitem>
-          <para>Dumps the <command>whatis</command> database contents in
-          human-readable form</para>
-          <indexterm zone="ch-system-man-db accessdb">
-            <primary sortas="b-accessdb">accessdb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="apropos">
-        <term><command>apropos</command></term>
-        <listitem>
-          <para>Searches the <command>whatis</command> database and displays
-          the short descriptions of system commands that contain a given
-          string</para>
-          <indexterm zone="ch-system-man-db apropos">
-            <primary sortas="b-apropos">apropos</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="catman">
-        <term><command>catman</command></term>
-        <listitem>
-          <para>Creates or updates the pre-formatted manual pages</para>
-          <indexterm zone="ch-system-man-db catman">
-            <primary sortas="b-catman">catman</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lexgrog">
-        <term><command>lexgrog</command></term>
-        <listitem>
-          <para>Displays one-line summary information about a given manual
-          page</para>
-          <indexterm zone="ch-system-man-db lexgrog">
-            <primary sortas="b-lexgrog">lexgrog</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="man">
-        <term><command>man</command></term>
-        <listitem>
-          <para>Formats and displays the requested manual page</para>
-          <indexterm zone="ch-system-man-db man">
-            <primary sortas="b-man">man</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mandb">
-        <term><command>mandb</command></term>
-        <listitem>
-          <para>Creates or updates the <command>whatis</command> database</para>
-          <indexterm zone="ch-system-man-db mandb">
-            <primary sortas="b-mandb">mandb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="manpath">
-        <term><command>manpath</command></term>
-        <listitem>
-          <para>Displays the contents of $MANPATH or (if $MANPATH is not set)
-          a suitable search path based on the settings in man.conf and the
-          user's environment</para>
-          <indexterm zone="ch-system-man-db manpath">
-            <primary sortas="b-manpath">manpath</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="whatis">
-        <term><command>whatis</command></term>
-        <listitem>
-          <para>Searches the <command>whatis</command> database and displays
-          the short descriptions of system commands that contain the given
-          keyword as a separate word</para>
-          <indexterm zone="ch-system-man-db whatis">
-            <primary sortas="b-whatis">whatis</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="zsoelim">
-        <term><command>zsoelim</command></term>
-        <listitem>
-          <para>Reads files and replaces lines of the form <emphasis>.so
-          file</emphasis> by the contents of the mentioned
-          <emphasis>file</emphasis></para>
-          <indexterm zone="ch-system-man-db zsoelim">
-            <primary sortas="b-zsoelim">zsoelim</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libman">
-        <term><filename class="libraryfile">libman</filename></term>
-        <listitem>
-          <para>Contains run-time support for <command>man</command></para>
-          <indexterm zone="ch-system-man-db libman">
-            <primary sortas="c-libman">libman</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libmandb">
-        <term><filename class="libraryfile">libmandb</filename></term>
-        <listitem>
-          <para>Contains run-time support for <command>man</command></para>
-          <indexterm zone="ch-system-man-db libmandb">
-            <primary sortas="c-libmandb">libmandb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/man-pages.xml
===================================================================
--- BOOK/final-system/common/man-pages.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,71 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-man-pages" role="wrap">
-  <?dbhtml filename="man-pages.html"?>
-
-  <title>Man-pages-&man-pages-version;</title>
-
-  <indexterm zone="ch-system-man-pages">
-    <primary sortas="a-Man-pages">Man-pages</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Man-pages package contains over 2,200 man pages.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Man-pages</title>
-
-    <para os="a">Install Man-pages by running:</para>
-
-<screen os="b"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-manpages" role="content">
-    <title>Contents of Man-pages</title>
-
-    <segmentedlist>
-      <segtitle>Installed files</segtitle>
-
-      <seglistitem>
-        <seg>various man pages</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="man-pages">
-        <term><filename>man pages</filename></term>
-        <listitem>
-          <para>This package contains man pages that describe the following:
-          POSIX headers (section 0p),
-          POSIX utilities (section 1p), POSIX functions (section 3p),
-          user commands (section 1), system calls (section 2),
-          libc calls (section 3), device information (section 4),
-          file formats (section 5), games (section 6),
-          conventions and macro packages (section 7),
-          system administration (section 8), and
-          kernel (section 9).</para>
-          <indexterm zone="ch-system-man-pages man-pages">
-            <primary sortas="e-man-pages">man pages</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/mpc.xml
===================================================================
--- BOOK/final-system/common/mpc.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,90 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-mpc" role="wrap">
-  <?dbhtml filename="mpc.html"?>
-
-  <title>MPC-&mpc-version;</title>
-
-  <indexterm zone="ch-system-mpc">
-    <primary sortas="a-MPC">MPC</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>MPC is a C library for the arithmetic of complex numbers with
-    arbitrarily high precision and correct rounding of the result.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of MPC</title>
-
-    <para os="a">Prepare MPC for compilation:</para>
-
-<screen os="b"><userinput>CC="gcc -isystem /usr/include" \
-LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
-./configure \
-    --prefix=/usr \
-    --docdir=/usr/share/doc/mpc-&mpc-version;</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">Build the HTML documentation:</para>
-
-<screen os="f"><userinput>make html</userinput></screen>
-
-    <para os="g">Test the results:</para>
-
-<screen os="h"><userinput remap="test">make check</userinput></screen>
-
-    <para os="i">Install the package:</para>
-
-<screen os="j"><userinput>make install</userinput></screen>
-
-    <para os="k">Install the HTML documentation:</para>
-
-<screen os="l"><userinput>make install-html</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-mpc" role="content">
-    <title>Contents of MPC</title>
-
-    <segmentedlist>
-      <segtitle>Installed libraries</segtitle>
-      <segtitle>Installed directory</segtitle>
-
-      <seglistitem>
-        <seg>libmpc.[a,so]</seg>
-        <seg>/usr/share/doc/mpc-&mpc-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libmpc">
-        <term><filename class="libraryfile">libmpc</filename></term>
-        <listitem>
-          <para>The Multiple Precision Complex Library.</para>
-          <indexterm zone="ch-system-mpc libmpc">
-            <primary sortas="c-libmpc">libmpc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/mpfr.xml
===================================================================
--- BOOK/final-system/common/mpfr.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,89 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-mpfr" role="wrap">
-  <?dbhtml filename="mpfr.html"?>
-
-  <title>MPFR-&mpfr-version;</title>
-
-  <indexterm zone="ch-system-mpfr">
-    <primary sortas="a-MPFR">MPFR</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The MPFR library is a C library for multiple-precision floating-point
-    computations with correct rounding.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of MPFR</title>
-
-    <para os="p1">Apply a patch with upstream fixes:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&mpfr-fixes-patch;</userinput></screen>
-
-    <para os="a">Prepare MPFR for compilation:</para>
-
-<screen os="b"><userinput>CC="gcc -isystem /usr/include" \
-LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
-./configure \
-    --prefix=/usr \
-    --with-gmp=/usr \
-    --docdir=/usr/share/doc/mpfr-&mpfr-version;</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make
-make html</userinput></screen>
-
-    <para os="e">Test the results:</para>
-
-<screen os="f"><userinput remap="test">make check</userinput></screen>
-
-    <para os="g">Install the package:</para>
-
-<screen os="h"><userinput>make install
-make install-html</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-mpfr" role="content">
-    <title>Contents of MPFR</title>
-
-    <segmentedlist>
-      <segtitle>Installed libraries</segtitle>
-      <segtitle>Installed directory</segtitle>
-
-      <seglistitem>
-        <seg>libmpfr.[a,so]</seg>
-        <seg>/usr/share/doc/mpfr-&mpfr-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libmpfr">
-        <term><filename class="libraryfile">libmpfr</filename></term>
-        <listitem>
-          <para>The Multiple Precision Floating-Point Reliable Library.</para>
-          <indexterm zone="ch-system-mpfr libmpfr">
-            <primary sortas="c-libmpfr">libmpfr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/ncurses.xml
===================================================================
--- BOOK/final-system/common/ncurses.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,286 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-ncurses" role="wrap">
-  <?dbhtml filename="ncurses.html"?>
-
-  <title>Ncurses-&ncurses-version;</title>
-
-  <indexterm zone="ch-system-ncurses">
-    <primary sortas="a-Ncurses">Ncurses</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Ncurses package contains libraries for terminal-independent
-    handling of character screens.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Ncurses</title>
-
-<!--Ncurses Branch Update Area
-    <para os="p1">The following patch contains updates from the &ncurses-version; branch
-    by the Ncurses developers:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&ncurses-branch_update-patch;</userinput></screen>
--->
-
-    <para os="a">Prepare Ncurses for compilation:</para>
-
-<screen os="b"><userinput>./configure \
-    --prefix=/usr \
-    --with-shared \
-    --without-debug \
-    --enable-widec \
-    --enable-pc-files</userinput></screen>
-
-    <variablelist os="b1">
-      <title>The meaning of the new configure option:</title>
-
-      <varlistentry>
-        <term><parameter>--enable-pc-files</parameter></term>
-        <listitem>
-          <para>This tells Ncurses to generate and install .pc files for
-          <command>pkg-config</command>.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">This package has a test suite, but it can only be run after
-    the package is installed. The tests are in the
-    <filename class="directory">test/</filename> directory. See the
-    <filename>README</filename> file in that directory for details.</para>
-
-    <para os="f">Install the package:</para>
-
-<screen os="g"><userinput>make install</userinput></screen>
-
-    <para os="h">Move the <filename class="libraryfile">libncursesw</filename>
-    shared library to <filename class="directory">/lib</filename>
-    and create a new symlink in <filename class="directory">/usr/lib</filename>:</para>
-
-<screen os="i"><userinput>mv -v /usr/lib/libncursesw.so.* /lib
-ln -svf ../../lib/$(readlink /usr/lib/libncursesw.so) /usr/lib/libncursesw.so</userinput></screen>
-
-    <para os="l">Many packages that use Ncurses will compile just fine against
-    the widechar libraries, but won't know to look for them. Create linker
-    scripts and symbolic links to allow older and non-widec compatible
-    programs to build properly:</para>
-
-<screen os="m"><userinput>for lib in ncurses form panel menu ; do
-        echo "INPUT(-l${lib}w)" &gt; /usr/lib/lib${lib}.so
-        ln -sfv lib${lib}w.a /usr/lib/lib${lib}.a
-done
-ln -sfv libncurses++w.a /usr/lib/libncurses++.a
-ln -sfv ncursesw6-config /usr/bin/ncurses6-config</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-ncurses" role="content">
-    <title>Contents of Ncurses</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed libraries</segtitle>
-      <segtitle>Installed directories</segtitle>
-
-      <seglistitem>
-        <seg>captoinfo (link to tic), clear, infocmp, infotocap (link to tic),
-        ncursesw6-config, reset (link to tset), tabs, tic, toe, tput, tset</seg>
-        <seg>libcursesw.so (link to libncursesw.so), libformw.[a,so],
-        libmenuw.[a,so], libncurses++w.a, libncursesw.[a,so],
-        libpanelw.[a,so]</seg>
-        <seg>/usr/share/tabset, /usr/share/terminfo</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="captoinfo">
-        <term><command>captoinfo</command></term>
-        <listitem>
-          <para>Converts a termcap description into a terminfo description</para>
-          <indexterm zone="ch-system-ncurses captoinfo">
-            <primary sortas="b-captoinfo">captoinfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="clear">
-        <term><command>clear</command></term>
-        <listitem>
-          <para>Clears the screen, if possible</para>
-          <indexterm zone="ch-system-ncurses clear">
-            <primary sortas="b-clear">clear</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="infocmp">
-        <term><command>infocmp</command></term>
-        <listitem>
-          <para>Compares or prints out terminfo descriptions</para>
-          <indexterm zone="ch-system-ncurses infocmp">
-            <primary sortas="b-infocmp">infocmp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="infotocap">
-        <term><command>infotocap</command></term>
-        <listitem>
-          <para>Converts a terminfo description into a termcap description</para>
-          <indexterm zone="ch-system-ncurses infotocap">
-            <primary sortas="b-infotocap">infotocap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ncursesw6-config">
-        <term><command>ncursesw6-config</command></term>
-        <listitem>
-          <para>Provides configuration information for ncurses</para>
-          <indexterm zone="ch-system-ncurses ncursesw6-config">
-            <primary sortas="b-ncursesw6-config">ncursesw6-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="reset">
-        <term><command>reset</command></term>
-        <listitem>
-          <para>Reinitializes a terminal to its default values</para>
-          <indexterm zone="ch-system-ncurses reset">
-            <primary sortas="b-reset">reset</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tabs">
-        <term><command>tabs</command></term>
-        <listitem>
-          <para>Sets and clears tab stops on a terminal</para>
-          <indexterm zone="ch-system-ncurses tabs">
-            <primary sortas="b-tabs">tabs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tic">
-        <term><command>tic</command></term>
-        <listitem>
-          <para>The terminfo entry-description compiler that translates a
-          terminfo file from source format into the binary format needed for the
-          ncurses library routines. A terminfo file contains information on the
-          capabilities of a certain terminal</para>
-          <indexterm zone="ch-system-ncurses tic">
-            <primary sortas="b-tic">tic</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="toe">
-        <term><command>toe</command></term>
-        <listitem>
-          <para>Lists all available terminal types, giving the primary name and
-          description for each</para>
-          <indexterm zone="ch-system-ncurses toe">
-            <primary sortas="b-toe">toe</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tput">
-        <term><command>tput</command></term>
-        <listitem>
-          <para>Makes the values of terminal-dependent capabilities available to
-          the shell; it can also be used to reset or initialize a terminal or
-          report its long name</para>
-          <indexterm zone="ch-system-ncurses tput">
-            <primary sortas="b-tput">tput</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tset">
-        <term><command>tset</command></term>
-        <listitem>
-          <para>Can be used to initialize terminals</para>
-          <indexterm zone="ch-system-ncurses tset">
-            <primary sortas="b-tset">tset</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcursesw">
-        <term><filename class="libraryfile">libcursesw</filename></term>
-        <listitem>
-          <para>A link to <filename>libncursesw</filename></para>
-          <indexterm zone="ch-system-ncurses libcursesw">
-            <primary sortas="c-libcursesw">libcursesw</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libncursesw">
-        <term><filename class="libraryfile">libncursesw</filename></term>
-        <listitem>
-          <para>Contains functions to display text in many complex ways on a
-          terminal screen; a good example of the use of these functions is the
-          menu displayed during the kernel's
-          <command>make menuconfig</command></para>
-          <indexterm zone="ch-system-ncurses libncursesw">
-            <primary sortas="c-libncursesw">libncursesw</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libformw">
-        <term><filename class="libraryfile">libformw</filename></term>
-        <listitem>
-          <para>Contains functions to implement forms</para>
-          <indexterm zone="ch-system-ncurses libformw">
-            <primary sortas="c-libformw">libformw</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libmenuw">
-        <term><filename class="libraryfile">libmenuw</filename></term>
-        <listitem>
-          <para>Contains functions to implement menus</para>
-          <indexterm zone="ch-system-ncurses libmenuw">
-            <primary sortas="c-libmenuw">libmenuw</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpanelw">
-        <term><filename class="libraryfile">libpanelw</filename></term>
-        <listitem>
-          <para>Contains functions to implement panels</para>
-          <indexterm zone="ch-system-ncurses libpanelw">
-            <primary sortas="c-libpanelw">libpanelw</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/patch.xml
===================================================================
--- BOOK/final-system/common/patch.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,82 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-patch" role="wrap">
-  <?dbhtml filename="patch.html"?>
-
-  <title>Patch-&patch-version;</title>
-
-  <indexterm zone="ch-system-patch">
-    <primary sortas="a-Patch">Patch</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Patch package contains a program for modifying or creating
-    files by applying a <quote>patch</quote> file typically created by the
-    <command>diff</command> program.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Patch</title>
-
-    <para os="a">Prepare Patch for compilation:</para>
-
-<screen os="b"><userinput>./configure \
-    --prefix=/usr</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">To test the results, issue:</para>
-
-<screen os="e2"><userinput remap="test">make check</userinput></screen>
-
-    <para os="f">Install the package:</para>
-
-<screen os="g"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-patch" role="content">
-    <title>Contents of Patch</title>
-
-    <segmentedlist>
-      <segtitle>Installed program</segtitle>
-
-      <seglistitem>
-        <seg>patch</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="patch">
-        <term><command>patch</command></term>
-        <listitem>
-          <para>Modifies files according to a patch file. A patch file is
-          normally a difference listing created with the <command>diff</command>
-          program. By applying these differences to the original files,
-          <command>patch</command> creates the patched versions.</para>
-          <indexterm zone="ch-system-patch patch">
-            <primary sortas="b-patch">patch</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
-
Index: OK/final-system/common/perl.xml
===================================================================
--- BOOK/final-system/common/perl.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,576 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-perl" role="wrap">
-  <?dbhtml filename="perl.html"?>
-
-  <title>Perl-&perl-version;</title>
-
-  <indexterm zone="ch-system-perl">
-    <primary sortas="a-Perl">Perl</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Perl package contains the Practical Extraction and Report
-    Language.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Perl</title>
-
-    <para os="s3">By default, Perl's Compress::Raw::Zlib and
-    Compress::Raw::Bzip2 modules build and link against internal copies of
-    Zlib and Bzip2. The following command will make Perl use the
-    system-installed copies of these libraries:</para>
-
-<screen os="s4"><userinput>export BUILD_ZLIB=False
-export BUILD_BZIP2=0</userinput></screen>
-
-    <note os="a00">
-      <para>If you are following the boot method you will need to enable the
-      loopback device:</para>
-
-<screen><userinput remap="test">ip link set lo up</userinput></screen>
-    </note>
-
-    <para os="a01">Before starting to configure, create a basic
-    <filename>/etc/hosts</filename> file which will be referenced by one
-    of Perl's configuration files as well as used by the test suite:</para>
-
-<screen os="a02"><userinput remap="test">echo "127.0.0.1 localhost $(hostname)" &gt; /etc/hosts</userinput></screen>
-
-    <para os="a">To have full control over the way Perl is set up, you can
-    run the interactive <command>Configure</command> script and hand-pick
-    the way this package is built. If you prefer instead to use the defaults
-    that Perl auto-detects, prepare Perl for compilation with:</para>
-
-<screen os="b"><userinput>./configure.gnu \
-    --prefix=/usr \
-    -Dvendorprefix=/usr \
-    -Dman1dir=/usr/share/man/man1 \
-    -Dman3dir=/usr/share/man/man3 \
-    -Dpager="/bin/less -isR" \
-    -Dusethreads \
-    -Duseshrplib</userinput></screen>
-
-    <variablelist os="c">
-      <title>The meaning of the configure option:</title>
-
-      <varlistentry os="c1">
-        <term><parameter>-Dman1dir=/usr/share/man/man1 -Dman3dir=/usr/share/man/man3</parameter></term>
-        <listitem>
-          <para>Since Groff is not installed yet,
-          <command>configure.gnu</command> thinks that we do not want
-          man pages for Perl. Issuing these parameters overrides this decision.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="c2">
-        <term><parameter>-Dpager="/bin/less -isR"</parameter></term>
-        <listitem>
-          <para>Less has not yet been installed, so by default
-          <command>perldoc</command> will invoke the <command>more</command>
-          program for viewing documentation. This option ensures that it will
-          use <command>less</command> instead.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="c3">
-        <term><parameter>-Dusethreads</parameter></term>
-        <listitem>
-          <para>This tells Perl to use threads.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="c4">
-        <term><parameter>-Duseshrplib</parameter></term>
-        <listitem>
-          <para>This tells Perl to build a shared libperl.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para os="d">Compile the package:</para>
-
-<screen os="e"><userinput>make</userinput></screen>
-
-    <para os="h">To test the results, issue:</para>
-
-<screen os="h2"><userinput remap="test">make test</userinput></screen>
-
-    <para os="j">Install the package and remove the variables set previously:</para>
-
-<screen os="k"><userinput>make install
-unset BUILD_ZLIB BUILD_BZIP2</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-perl" role="content">
-    <title>Contents of Perl</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed libraries</segtitle>
-      <segtitle>Installed directory</segtitle>
-
-      <seglistitem>
-        <seg>a2p, c2ph, config_data, corelist, cpan, cpan2dist, cpanp,
-        cpanp-run-perl, enc2xs, find2perl, h2ph, h2xs, instmodsh, json_pp,
-        libnetcfg, perl, perl&perl-version; (link to perl), perlbug,
-        perldoc, perlivp, perlthanks (link to perlbug), piconv, pl2pm, pod2html,
-        pod2latex, pod2man, pod2text, pod2usage, podchecker, podselect, prove,
-        psed (link to s2p), pstruct (link to c2ph), ptar, ptardiff, ptargrep,
-        s2p, shasum, splain, xsubpp, zipdetails</seg>
-        <seg>Several hundred which cannot all be listed here</seg>
-        <seg>/usr/lib/perl5</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="a2p">
-        <term><command>a2p</command></term>
-        <listitem>
-          <para>Translates awk to Perl</para>
-          <indexterm zone="ch-system-perl a2p">
-            <primary sortas="b-a2p">a2p</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="c2ph">
-        <term><command>c2ph</command></term>
-        <listitem>
-          <para>Dumps C structures as generated from
-          <command>cc -g -S</command></para>
-          <indexterm zone="ch-system-perl c2ph">
-            <primary sortas="b-c2ph">c2ph</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="config_data">
-        <term><command>config_data</command></term>
-        <listitem>
-          <para>Queries or changes configuration of Perl modules</para>
-          <indexterm zone="ch-system-perl config_data">
-            <primary sortas="b-config_data">config_data</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="corelist">
-        <term><command>corelist</command></term>
-        <listitem>
-          <para>A commandline frontend to Module::CoreList</para>
-          <indexterm zone="ch-system-perl corelist">
-            <primary sortas="b-corelist">corelist</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cpan">
-        <term><command>cpan</command></term>
-        <listitem>
-          <para>Shell script that provides a command interface to CPAN.pm</para>
-          <indexterm zone="ch-system-perl cpan">
-            <primary sortas="b-cpan">cpan</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cpan2dist">
-        <term><command>cpan2dist</command></term>
-        <listitem>
-          <para>The CPANPLUS distribution creator</para>
-          <indexterm zone="ch-system-perl cpan2dist">
-            <primary sortas="b-cpan2dist">cpan2dist</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cpanp">
-        <term><command>cpanp</command></term>
-        <listitem>
-          <para>The CPANPLUS launcher</para>
-          <indexterm zone="ch-system-perl cpanp">
-            <primary sortas="b-cpanp">cpanp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cpanp-run-perl">
-        <term><command>cpanp-run-perl</command></term>
-        <listitem>
-          <para>Perl script that (description needed)</para>
-          <indexterm zone="ch-system-perl cpanp-run-perl">
-            <primary sortas="b-cpanp-run-perl">cpanp-run-perl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="enc2xs">
-        <term><command>enc2xs</command></term>
-        <listitem>
-          <para>Builds a Perl extension for the Encode module from either
-          Unicode Character Mappings or Tcl Encoding Files</para>
-          <indexterm zone="ch-system-perl enc2xs">
-            <primary sortas="b-enc2xs">enc2xs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="find2perl">
-        <term><command>find2perl</command></term>
-        <listitem>
-          <para>Translates <command>find</command> commands to Perl</para>
-          <indexterm zone="ch-system-perl find2perl">
-            <primary sortas="b-find2perl">find2perl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="h2ph">
-        <term><command>h2ph</command></term>
-        <listitem>
-          <para>Converts <filename class="extension">.h</filename> C header
-          files to <filename class="extension">.ph</filename> Perl header
-          files</para>
-          <indexterm zone="ch-system-perl h2ph">
-            <primary sortas="b-h2ph">h2ph</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="h2xs">
-        <term><command>h2xs</command></term>
-        <listitem>
-          <para>Converts <filename class="extension">.h</filename> C header
-          files to Perl extensions</para>
-          <indexterm zone="ch-system-perl h2xs">
-            <primary sortas="b-h2xs">h2xs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="instmodsh">
-        <term><command>instmodsh</command></term>
-        <listitem>
-          <para>A shell script for examining installed Perl modules,
-          and can even create a tarball from an installed module</para>
-          <indexterm zone="ch-system-perl instmodsh">
-            <primary sortas="b-instmodsh">instmodsh</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="json_pp">
-        <term><command>json_pp</command></term>
-        <listitem>
-          <para>Converts data between certain input and output formats</para>
-          <indexterm zone="ch-system-perl json_pp">
-            <primary sortas="b-json_pp">json_pp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libnetcfg">
-        <term><command>libnetcfg</command></term>
-        <listitem>
-          <para>Can be used to configure the
-          <filename class="libraryfile">libnet</filename></para>
-          <indexterm zone="ch-system-perl libnetcfg">
-            <primary sortas="b-libnetcfg">libnetcfg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="perl">
-        <term><command>perl</command></term>
-        <listitem>
-          <para>Combines some of the best features of C, <command>sed</command>,
-          <command>awk</command> and <command>sh</command> into a single
-          swiss-army-knife language</para>
-          <indexterm zone="ch-system-perl perl">
-            <primary sortas="b-perl">perl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="perl-version">
-        <term><command>perl&perl-version;</command></term>
-        <listitem>
-          <para>A hard link to <command>perl</command></para>
-          <indexterm zone="ch-system-perl perl-version">
-            <primary sortas="b-perl&perl-version;">perl&perl-version;</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="perlbug">
-        <term><command>perlbug</command></term>
-        <listitem>
-          <para>Used to generate bug reports about Perl, or the modules that come
-          with it, and mail them</para>
-          <indexterm zone="ch-system-perl perlbug">
-            <primary sortas="b-perlbug">perlbug</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="perldoc">
-        <term><command>perldoc</command></term>
-        <listitem>
-          <para>Displays a piece of documentation in pod format that is embedded
-          in the Perl installation tree or in a Perl script</para>
-          <indexterm zone="ch-system-perl perldoc">
-            <primary sortas="b-perldoc">perldoc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="perlivp">
-        <term><command>perlivp</command></term>
-        <listitem>
-          <para>The Perl Installation Verification Procedure; it can be used to
-          verify that Perl and its libraries have been installed
-          correctly</para>
-          <indexterm zone="ch-system-perl perlivp">
-            <primary sortas="b-perlivp">perlivp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="perlthanks">
-        <term><command>perlthanks</command></term>
-        <listitem>
-          <para>Used to generate thank you messages to mail to the Perl
-          developers</para>
-          <indexterm zone="ch-system-perl perlthanks">
-            <primary sortas="b-perlthanks">perlthanks</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="piconv">
-        <term><command>piconv</command></term>
-        <listitem>
-          <para>A Perl version of the character encoding converter
-          <command>iconv</command></para>
-          <indexterm zone="ch-system-perl piconv">
-            <primary sortas="b-piconv">piconv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pl2pm">
-        <term><command>pl2pm</command></term>
-        <listitem>
-          <para>A rough tool for converting Perl4
-          <filename class="extension">.pl</filename> files to Perl5
-          <filename class="extension">.pm</filename> modules</para>
-          <indexterm zone="ch-system-perl pl2pm">
-            <primary sortas="b-pl2pm">pl2pm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pod2html">
-        <term><command>pod2html</command></term>
-        <listitem>
-          <para>Converts files from pod format to HTML format</para>
-          <indexterm zone="ch-system-perl pod2html">
-            <primary sortas="b-pod2html">pod2html</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pod2latex">
-        <term><command>pod2latex</command></term>
-        <listitem>
-          <para>Converts files from pod format to LaTeX format</para>
-          <indexterm zone="ch-system-perl pod2latex">
-            <primary sortas="b-pod2latex">pod2latex</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pod2man">
-        <term><command>pod2man</command></term>
-        <listitem>
-          <para>Converts pod data to formatted *roff input</para>
-          <indexterm zone="ch-system-perl pod2man">
-            <primary sortas="b-pod2man">pod2man</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pod2text">
-        <term><command>pod2text</command></term>
-        <listitem>
-          <para>Converts pod data to formatted ASCII text</para>
-          <indexterm zone="ch-system-perl pod2text">
-            <primary sortas="b-pod2text">pod2text</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pod2usage">
-        <term><command>pod2usage</command></term>
-        <listitem>
-          <para>Prints usage messages from embedded pod docs in files</para>
-          <indexterm zone="ch-system-perl pod2usage">
-            <primary sortas="b-pod2usage">pod2usage</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="podchecker">
-        <term><command>podchecker</command></term>
-        <listitem>
-          <para>Checks the syntax of pod format documentation files</para>
-          <indexterm zone="ch-system-perl podchecker">
-            <primary sortas="b-podchecker">podchecker</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="podselect">
-        <term><command>podselect</command></term>
-        <listitem>
-          <para>Displays selected sections of pod documentation</para>
-          <indexterm zone="ch-system-perl podselect">
-            <primary sortas="b-podselect">podselect</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="prove">
-        <term><command>prove</command></term>
-        <listitem>
-          <para>A command-line tool for running tests against Test::Harness</para>
-          <indexterm zone="ch-system-perl prove">
-            <primary sortas="b-prove">prove</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="psed">
-        <term><command>psed</command></term>
-        <listitem>
-          <para>A Perl version of the stream editor <command>sed</command></para>
-          <indexterm zone="ch-system-perl psed">
-            <primary sortas="b-psed">psed</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pstruct">
-        <term><command>pstruct</command></term>
-        <listitem>
-          <para>Dumps C structures as generated from <command>cc -g -S</command>
-          stabs</para>
-          <indexterm zone="ch-system-perl pstruct">
-            <primary sortas="b-pstruct">pstruct</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ptar">
-        <term><command>ptar</command></term>
-        <listitem>
-          <para>A <command>tar</command>-like program written in Perl</para>
-          <indexterm zone="ch-system-perl ptar">
-            <primary sortas="b-ptar">ptar</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ptardiff">
-        <term><command>ptardiff</command></term>
-        <listitem>
-          <para>A Perl program that compares an extracted archive with an
-          unextracted one</para>
-          <indexterm zone="ch-system-perl ptardiff">
-            <primary sortas="b-ptardiff">ptardiff</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ptargrep">
-        <term><command>ptargrep</command></term>
-        <listitem>
-          <para>A Perl program that applies pattern matching to the contents
-          of files in a tar archive</para>
-          <indexterm zone="ch-system-perl ptargrep">
-            <primary sortas="b-ptargrep">ptargrep</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="s2p">
-        <term><command>s2p</command></term>
-        <listitem>
-          <para>Translates <command>sed</command> to Perl</para>
-          <indexterm zone="ch-system-perl s2p">
-            <primary sortas="b-s2p">s2p</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="shasum">
-        <term><command>shasum</command></term>
-        <listitem>
-          <para>Prints or checks SHA checksums</para>
-          <indexterm zone="ch-system-perl shasum">
-            <primary sortas="b-shasum">shasum</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="splain">
-        <term><command>splain</command></term>
-        <listitem>
-          <para>Is used to force verbose warning diagnostics in Perl</para>
-          <indexterm zone="ch-system-perl splain">
-            <primary sortas="b-splain">splain</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xsubpp">
-        <term><command>xsubpp</command></term>
-        <listitem>
-          <para>Converts Perl XS code into C code</para>
-          <indexterm zone="ch-system-perl xsubpp">
-            <primary sortas="b-xsubpp">xsubpp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="zipdetails">
-        <term><command>zipdetails</command></term>
-        <listitem>
-          <para>Displays details about the internal structure of a Zip file</para>
-          <indexterm zone="ch-system-perl zipdetails">
-            <primary sortas="b-zipdetails">zipdetails</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/pkg-config-lite.xml
===================================================================
--- BOOK/final-system/common/pkg-config-lite.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,82 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-pkg-config-lite" role="wrap">
-  <?dbhtml filename="pkg-config-lite.html"?>
-
-  <title>Pkg-config-lite-&pkg-config-lite-version;</title>
-
-  <indexterm zone="ch-system-pkg-config-lite">
-    <primary sortas="a-Pkg-config-lite">Pkg-config-lite</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>Pkg-config-lite is a tool to help you insert the correct compiler options
-    on the command line when compiling applications and libraries.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Pkg-config-lite</title>
-
-    <para os="a">Prepare Pkg-config-lite for compilation:</para>
-
-<screen os="b"><userinput>./configure \
-    --prefix=/usr \
-    --docdir=/usr/share/doc/pkg-config-&pkg-config-lite-version;</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">To test the results, issue:</para>
-
-<screen os="e2"><userinput remap="test">make check</userinput></screen>
-
-    <para os="f">Install the package:</para>
-
-<screen os="g"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-pkg-config-lite" role="content">
-    <title>Contents of Pkg-config-lite</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed directory</segtitle>
-
-      <seglistitem>
-        <seg>pkg-config</seg>
-        <seg>/usr/share/doc/pkg-config-&pkg-config-lite-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="pkg-config-lite">
-        <term><command>pkg-config</command></term>
-        <listitem>
-          <para>The <command>pkg-config</command> program is used to retrieve
-          information about installed libraries in the system. It is typically
-          used to compile and link against one or more libraries.</para>
-          <indexterm zone="ch-system-pkg-config-lite pkg-config-lite">
-            <primary sortas="b-pkg-config-lite">pkg-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/pkgmgt.xml
===================================================================
--- BOOK/final-system/common/pkgmgt.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,233 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-pkgmgt">
-  <?dbhtml filename="pkgmgt.html"?>
-
-  <title>Package Management</title>
-
-  <para>Package Management is an often-requested addition to the CLFS Book. A
-  Package Manager allows tracking the installation of files making it easy to
-  remove and upgrade packages. Before you begin to wonder, NO&mdash;this section
-  will not talk about nor recommend any particular package manager. What it
-  provides is a roundup of the more popular techniques and how they work. The
-  perfect package manager for you may be among these techniques or may be a
-  combination of two or more of these techniques. This section briefly mentions
-  issues that may arise when upgrading packages.</para>
-
-  <para>Some reasons why no specific package manager is recommended in
-  CLFS or CBLFS include:</para>
-
-  <itemizedlist>
-    <listitem>
-      <para>Dealing with package management takes the focus away from the goals
-      of these books&mdash;teaching how a Linux system is built.</para>
-    </listitem>
-
-    <listitem>
-      <para>There are multiple solutions for package management, each having
-      its strengths and drawbacks. Including one that satisfies all audiences
-      is difficult.</para>
-    </listitem>
-  </itemizedlist>
-
-  <para>There are some hints written on the topic of package management. Visit
-  the <ulink url="&hints-root;">Hints subproject</ulink> and see if one of them
-  fits your need.</para>
-
-  <sect2>
-    <title>Upgrade Issues</title>
-
-    <para>A Package Manager makes it easy to upgrade to newer versions when they
-    are released. Generally the instructions in CLFS and CBLFS can be
-    used to upgrade to the newer versions. Here are some points that you should
-    be aware of when upgrading packages, especially on a running system.</para>
-
-    <itemizedlist>
-      <listitem>
-        <para>If one of the toolchain packages (Glibc, GCC or Binutils) needs
-        to be upgraded to a newer minor version, it is safer to
-        rebuild CLFS. Though you <emphasis>may</emphasis> be able to get by
-        rebuilding all the packages in their dependency order, we do not
-        recommend it. For example, if glibc-2.2.x needs to be updated to
-        glibc-2.3.x, it is safer to rebuild. For micro version updates, a
-        simple reinstallation usually works, but is not guaranteed. For
-        example, upgrading from glibc-2.3.4 to glibc-2.3.5 will not
-        usually cause any problems.</para>
-      </listitem>
-
-      <listitem>
-        <para>If a package containing a shared library is updated, and if the
-        name of the library changes, then all the packages dynamically linked
-        to the library need to be recompiled to link against the newer library.
-        (Note that there is no correlation between the package version and the
-        name of the library.) For example, consider a package foo-1.2.3 that
-        installs a shared library with name
-        <filename class='libraryfile'>libfoo.so.1</filename>. Say you upgrade
-        the package to a newer version foo-1.2.4 that installs a shared library
-        with name <filename class='libraryfile'>libfoo.so.2</filename>. In this
-        case, all packages that are dynamically linked to
-        <filename class='libraryfile'>libfoo.so.1</filename> need to be
-        recompiled to link against
-        <filename class='libraryfile'>libfoo.so.2</filename>. Note that you
-        should not remove the previous libraries until the dependent packages
-        are recompiled.</para>
-      </listitem>
-
-      <listitem>
-        <para>If you are upgrading a running system, be on the lookout for
-        packages that use <command>cp</command> instead of
-        <command>install</command> to install files. The latter command is
-        usually safer if the executable or library is already loaded in memory.
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2>
-    <title>Package Management Techniques</title>
-
-    <para>The following are some common package management techniques. Before
-    making a decision on a package manager, do some research on the various
-    techniques, particularly the drawbacks of the particular scheme.</para>
-
-    <sect3>
-      <title>It is All in My Head!</title>
-
-      <para>Yes, this is a package management technique. Some folks do not find
-      the need for a package manager because they know the packages intimately
-      and know what files are installed by each package. Some users also do not
-      need any package management because they plan on rebuilding the entire
-      system when a package is changed.</para>
-
-    </sect3>
-
-    <sect3>
-      <title>Install in Separate Directories</title>
-
-      <para>This is a simplistic package management that does not need any extra
-      package to manage the installations. Each package is installed in a
-      separate directory. For example, package foo-1.1 is installed in
-      <filename class='directory'>/usr/pkg/foo-1.1</filename>
-      and a symlink is made from <filename>/usr/pkg/foo</filename> to
-      <filename class='directory'>/usr/pkg/foo-1.1</filename>. When installing
-      a new version foo-1.2, it is installed in
-      <filename class='directory'>/usr/pkg/foo-1.2</filename> and the previous
-      symlink is replaced by a symlink to the new version.</para>
-
-      <para>Environment variables such as <envar>PATH</envar>,
-      <envar>LD_LIBRARY_PATH</envar>, <envar>MANPATH</envar>,
-      <envar>INFOPATH</envar> and <envar>CPPFLAGS</envar> need to be expanded to
-      include <filename>/usr/pkg/foo</filename>. For more than a few packages,
-      this scheme becomes unmanageable.</para>
-
-    </sect3>
-
-    <sect3>
-      <title>Symlink Style Package Management</title>
-
-      <para>This is a variation of the previous package management technique.
-      Each package is installed similar to the previous scheme. But instead of
-      making the symlink, each file is symlinked into the
-      <filename class='directory'>/usr</filename> hierarchy. This removes the
-      need to expand the environment variables. Though the symlinks can be
-      created by the user to automate the creation, many package managers have
-      been written using this approach. A few of the popular ones include Stow,
-      Epkg, Graft, and Depot.</para>
-
-      <para>The installation needs to be faked, so that the package thinks that
-      it is installed in <filename class="directory">/usr</filename> though in
-      reality it is installed in the
-      <filename class="directory">/usr/pkg</filename> hierarchy. Installing in
-      this manner is not usually a trivial task. For example, consider that you
-      are installing a package libfoo-1.1. The following instructions may
-      not install the package properly:</para>
-
-<screen role="nodump"><userinput>./configure \
-    --prefix=/usr/pkg/libfoo/1.1
-make
-make install</userinput></screen>
-
-      <para>The installation will work, but the dependent packages may not link
-      to libfoo as you would expect. If you compile a package that links against
-      libfoo, you may notice that it is linked to
-      <filename class='libraryfile'>/usr/pkg/libfoo/1.1/lib/libfoo.so.1</filename>
-      instead of <filename class='libraryfile'>/usr/lib/libfoo.so.1</filename>
-      as you would expect. The correct approach is to use the
-      <envar>DESTDIR</envar> strategy to fake installation of the package. This
-      approach works as follows:</para>
-
-<screen role="nodump"><userinput>./configure \
-    --prefix=/usr
-make
-make DESTDIR=/usr/pkg/libfoo/1.1 install</userinput></screen>
-
-      <para>Most packages support this approach, but there are some which do not.
-      For the non-compliant packages, you may either need to manually install the
-      package, or you may find that it is easier to install some problematic
-      packages into <filename class='directory'>/opt</filename>.</para>
-
-    </sect3>
-
-    <sect3>
-      <title>Timestamp Based</title>
-
-      <para>In this technique, a file is timestamped before the installation of
-      the package. After the installation, a simple use of the
-      <command>find</command> command with the appropriate options can generate
-      a log of all the files installed after the timestamp file was created. A
-      package manager written with this approach is install-log.</para>
-
-      <para>Though this scheme has the advantage of being simple, it has two
-      drawbacks. If, during installation, the files are installed with any
-      timestamp other than the current time, those files will not be tracked by
-      the package manager. Also, this scheme can only be used when one package
-      is installed at a time. The logs are not reliable if two packages are
-      being installed on two different consoles.</para>
-
-    </sect3>
-
-    <sect3>
-      <title>LD_PRELOAD Based</title>
-
-      <para>In this approach, a library is preloaded before installation. During
-      installation, this library tracks the packages that are being installed by
-      attaching itself to various executables such as <command>cp</command>,
-      <command>install</command>, <command>mv</command> and tracking the system
-      calls that modify the filesystem. For this approach to work, all the
-      executables need to be dynamically linked without the suid or sgid bit.
-      Preloading the library may cause some unwanted side-effects during
-      installation. Therefore, it is advised that one performs some tests to
-      ensure that the package manager does not break anything and logs all the
-      appropriate files.</para>
-
-    </sect3>
-
-    <sect3>
-      <title>Creating Package Archives</title>
-
-      <para>In this scheme, the package installation is faked into a separate
-      tree as described in the Symlink style package management. After the
-      installation, a package archive is created using the installed files.
-      This archive is then used to install the package either on the local
-      machine or can even be used to install the package on other machines.</para>
-
-      <para>This approach is used by most of the package managers found in the
-      commercial distributions. Examples of package managers that follow this
-      approach are RPM (which, incidentally, is required by the <ulink
-      url="http://refspecs.linuxfoundation.org/lsb.shtml">Linux
-      Standard Base Specification</ulink>), pkg-utils, Debian's apt, and
-      Gentoo's Portage system.  A hint describing how to adopt this style of
-      package management for CLFS systems is located at <ulink
-      url="&hints-root;Fakeroot"/>.</para>
-
-    </sect3>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/procps-ng.xml
===================================================================
--- BOOK/final-system/common/procps-ng.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,273 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-procps-ng" role="wrap">
-  <?dbhtml filename="procps-ng.html"?>
-
-  <title>Procps-ng-&procps-ng-version;</title>
-
-  <indexterm zone="ch-system-procps-ng">
-    <primary sortas="a-Procps-ng">Procps-ng</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Procps-ng package contains programs for monitoring
-    processes.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Procps-ng</title>
-
-    <para os="a">Prepare procps-ng for compilation:</para>
-
-<screen os="b"><userinput>./configure \
-    --prefix=/usr \
-    --exec-prefix= \
-    --libdir=/usr/lib \
-    --docdir=/usr/share/doc/procps-ng-&procps-ng-version; \
-    --disable-kill</userinput></screen>
-
-    <variablelist os="c">
-      <title>The meaning of the configure options:</title>
-      <varlistentry>
-        <term><parameter>--disable-kill</parameter></term>
-        <listitem>
-          <para>This switch disables building the <command>kill</command>
-          program - a better version was installed by the Util-linux package.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-    <para os="d">Compile the package:</para>
-
-<screen os="e"><userinput>make</userinput></screen>
-
-    <note os="note1">
-      <para>When using the boot method, two tests will fail if the hostname is
-      not set. If you have booted the temporary system, and want to run the
-      test suite, run the following command:</para>
-
-<screen><userinput remap="test">hostname clfs</userinput></screen>
-    </note>
-
-    <para os="f">If running the testsuite, first disable a test which fails
-    when scripting does not use a tty device:</para>
-
-<screen os="g"><userinput remap="test">sed -i -r 's|(pmap_initname)\\\$|\1|' testsuite/pmap.test/pmap.exp
-make check</userinput></screen>
-
-    <para os="h">Install the package:</para>
-
-<screen os="i"><userinput>make install</userinput></screen>
-
-    <para os="j">Move essential files to a location that can be found if
-    <filename class="directory">/usr</filename> is not mounted:</para>
-
-<screen os="k"><userinput>mv -v /usr/lib/libprocps.so.* /lib
-ln -sfv ../../lib/$(readlink /usr/lib/libprocps.so) /usr/lib/libprocps.so</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-procps-ng" role="content">
-    <title>Contents of Procps-ng</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed library</segtitle>
-      <segtitle>Installed directories</segtitle>
-
-      <seglistitem>
-        <seg>free, pgrep, pidof, pkill, pmap, ps, pwdx, slabtop, sysctl, tload,
-        top, uptime, vmstat, w, watch</seg>
-        <seg>libprocps.{a,so}</seg>
-        <seg>/usr/include/proc, /usr/share/doc/procps-ng-&procps-ng-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="free">
-        <term><command>free</command></term>
-        <listitem>
-          <para>Reports the amount of free and used memory (both physical and
-          swap memory) in the system</para>
-          <indexterm zone="ch-system-procps-ng free">
-            <primary sortas="b-free">free</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pgrep">
-        <term><command>pgrep</command></term>
-        <listitem>
-          <para>Looks up processes based on their name and other attributes</para>
-          <indexterm zone="ch-system-procps-ng pgrep">
-            <primary sortas="b-pgrep">pgrep</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pidof">
-        <term><command>pidof</command></term>
-        <listitem>
-          <para>Reports the PIDs of the given programs</para>
-          <indexterm zone="ch-system-procps-ng pidof">
-            <primary sortas="b-pidof">pidof</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pkill">
-        <term><command>pkill</command></term>
-        <listitem>
-          <para>Signals processes based on their name and other attributes</para>
-          <indexterm zone="ch-system-procps-ng pkill">
-            <primary sortas="b-pkill">pkill</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pmap">
-        <term><command>pmap</command></term>
-        <listitem>
-          <para>Reports the memory map of the given process</para>
-          <indexterm zone="ch-system-procps-ng pmap">
-            <primary sortas="b-pmap">pmap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ps">
-        <term><command>ps</command></term>
-        <listitem>
-          <para>Lists the current running processes</para>
-          <indexterm zone="ch-system-procps-ng ps">
-            <primary sortas="b-ps">ps</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pwdx">
-        <term><command>pwdx</command></term>
-        <listitem>
-          <para>Reports the current working directory of a process</para>
-          <indexterm zone="ch-system-procps-ng pwdx">
-            <primary sortas="b-pwdx">pwdx</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="slabtop">
-        <term><command>slabtop</command></term>
-        <listitem>
-          <para>Displays detailed kernel slab cache information in real time</para>
-          <indexterm zone="ch-system-procps-ng slabtop">
-            <primary sortas="b-slabtop">slabtop</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-
-      <varlistentry id="sysctl">
-        <term><command>sysctl</command></term>
-        <listitem>
-          <para>Modifies kernel parameters at run time</para>
-          <indexterm zone="ch-system-procps-ng sysctl">
-            <primary sortas="b-sysctl">sysctl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tload">
-        <term><command>tload</command></term>
-        <listitem>
-          <para>Prints a graph of the current system load average</para>
-          <indexterm zone="ch-system-procps-ng tload">
-            <primary sortas="b-tload">tload</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="top">
-        <term><command>top</command></term>
-        <listitem>
-          <para>Displays a list of the most CPU intensive processes; it
-          provides an ongoing look at processor activity in real time</para>
-          <indexterm zone="ch-system-procps-ng top">
-            <primary sortas="b-top">top</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="uptime">
-        <term><command>uptime</command></term>
-        <listitem>
-          <para>Reports how long the system has been running, how many users are
-          logged on, and the system load averages</para>
-          <indexterm zone="ch-system-procps-ng uptime">
-            <primary sortas="b-uptime">uptime</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vmstat">
-        <term><command>vmstat</command></term>
-        <listitem>
-          <para>Reports virtual memory statistics, giving information about
-          processes, memory, paging, block Input/Output (IO), traps, and CPU
-          activity</para>
-          <indexterm zone="ch-system-procps-ng vmstat">
-            <primary sortas="b-vmstat">vmstat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="w">
-        <term><command>w</command></term>
-        <listitem>
-          <para>Shows which users are currently logged on, where, and since
-          when</para>
-          <indexterm zone="ch-system-procps-ng w">
-            <primary sortas="b-w">w</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="watch">
-        <term><command>watch</command></term>
-        <listitem>
-          <para>Runs a given command repeatedly, displaying the first
-          screen-full of its output; this allows a user to watch the output
-          change over time</para>
-          <indexterm zone="ch-system-procps-ng watch">
-            <primary sortas="b-watch">watch</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libprocps">
-        <term><filename class="libraryfile">libprocps</filename></term>
-        <listitem>
-          <para>Contains the functions used by most programs in this
-          package</para>
-          <indexterm zone="ch-system-procps-ng libprocps">
-            <primary sortas="c-libprocps">libprocps</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/psmisc.xml
===================================================================
--- BOOK/final-system/common/psmisc.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,136 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-psmisc" role="wrap">
-  <?dbhtml filename="psmisc.html"?>
-
-  <title>Psmisc-&psmisc-version;</title>
-
-  <indexterm zone="ch-system-psmisc">
-    <primary sortas="a-Psmisc">Psmisc</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Psmisc package contains programs for displaying information
-    about running processes.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Psmisc</title>
-
-    <para os="a">Prepare Psmisc for compilation:</para>
-
-<screen os="b"><userinput>./configure \
-    --prefix=/usr</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">This package does not come with a test suite.</para>
-
-    <para os="f">Install the package:</para>
-
-<screen os="g"><userinput>make install</userinput></screen>
-
-    <para os="h">Move the <command>killall</command> and
-    <command>fuser</command> programs to the location specified by the
-    FHS:</para>
-
-<screen os="i"><userinput>mv -v /usr/bin/fuser /bin
-mv -v /usr/bin/killall /bin</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-psmisc" role="content">
-    <title>Contents of Psmisc</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>fuser, killall, peekfd, prtstat, pstree, pstree.x11
-        (link to pstree)</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="fuser">
-        <term><command>fuser</command></term>
-        <listitem>
-          <para>Reports the Process IDs (PIDs) of processes that use the given
-          files or file systems</para>
-          <indexterm zone="ch-system-psmisc fuser">
-            <primary sortas="b-fuser">fuser</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="killall">
-        <term><command>killall</command></term>
-        <listitem>
-          <para>Kills processes by name; it sends a signal to all processes
-          running any of the given commands</para>
-          <indexterm zone="ch-system-psmisc killall">
-            <primary sortas="b-killall">killall</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="peekfd">
-        <term><command>peekfd</command></term>
-        <listitem>
-          <para> Peeks at file descriptors of running processes</para>
-          <indexterm zone="ch-system-psmisc peekfd">
-            <primary sortas="b-peekfd">peekfd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="prtstat">
-        <term><command>prtstat</command></term>
-        <listitem>
-          <para>Prints information about a process</para>
-          <indexterm zone="ch-system-psmisc prtstat">
-            <primary sortas="b-prtstat">prtstat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pstree">
-        <term><command>pstree</command></term>
-        <listitem>
-          <para>Displays running processes as a tree</para>
-          <indexterm zone="ch-system-psmisc pstree">
-            <primary sortas="b-pstree">pstree</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pstree.x11">
-        <term><command>pstree.x11</command></term>
-        <listitem>
-          <para>Same as <command>pstree</command>, except that it waits for
-          confirmation before exiting</para>
-          <indexterm zone="ch-system-psmisc pstree.x11">
-            <primary sortas="b-pstree.x11">pstree.x11</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/readline.xml
===================================================================
--- BOOK/final-system/common/readline.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,114 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-readline" role="wrap">
-  <?dbhtml filename="readline.html"?>
-
-  <title>Readline-&readline-version;</title>
-
-  <indexterm zone="ch-system-readline">
-    <primary sortas="a-Readline">Readline</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Readline package is a set of libraries that offers command-line
-    editing and history capabilities.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Readline</title>
-
-    <para os="p1">The following patch contains updates from the maintainer. The
-    maintainer of Readline only releases these patches to fix serious issues:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&readline-branch_update-patch;</userinput></screen>
-
-<para os="s1">Reinstalling Readline moves the old libraries to
-    &lt;libraryname&gt; and a linking bug may occur in 
-    <command>ldconfig</command>. Prevent this with the following seds:</para>
-
-<screen os="s2"><userinput>sed -i '/MV.*old/d' Makefile.in
-sed -i '/{OLDSUFF}/c:' support/shlib-install</userinput></screen>
-
-    <para os="a">Prepare Readline for compilation:</para>
-
-<screen os="b"><userinput>./configure \
-    --prefix=/usr \
-    --libdir=/lib \
-    --docdir=/usr/share/doc/readline-&readline-version;</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make SHLIB_LIBS=-lncurses</userinput></screen>
-
-    <para os="e">This package does not come with a test suite.</para>
-
-    <para os="f">Install the package:</para>
-
-<screen os="g"><userinput>make SHLIB_LIBS=-lncurses htmldir=/usr/share/doc/readline-&readline-version; install</userinput></screen>
-
-    <para os="h">Now move the static libraries to a more appropriate location:</para>
-
-<screen os="i"><userinput>mv -v /lib/lib{readline,history}.a /usr/lib</userinput></screen>
-
-    <para os="j">Next, relink the dynamic libraries into <filename class="directory">/usr/lib</filename> and remove the <filename class="extension">.so</filename> files in <filename class="directory">/lib</filename>.</para>
-
-<screen os="k"><userinput>ln -svf ../../lib/$(readlink /lib/libreadline.so) /usr/lib/libreadline.so
-ln -svf ../../lib/$(readlink /lib/libhistory.so) /usr/lib/libhistory.so
-rm -v /lib/lib{readline,history}.so</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-readline" role="content">
-    <title>Contents of Readline</title>
-
-    <segmentedlist>
-      <segtitle>Installed libraries</segtitle>
-      <segtitle>Installed directories</segtitle>
-
-      <seglistitem>
-        <seg>libhistory.[a,so], libreadline.[a,so]</seg>
-        <seg>/usr/include/readline, /usr/share/doc/readline-&readline-version;, /usr/share/readline</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libhistory">
-        <term><filename class="libraryfile">libhistory</filename></term>
-        <listitem>
-          <para>Provides a consistent user interface
-          for recalling lines of history</para>
-          <indexterm zone="ch-system-readline libhistory">
-            <primary sortas="c-libhistory">libhistory</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libreadline">
-        <term><filename class="libraryfile">libreadline</filename></term>
-        <listitem>
-          <para>Aids in the consistency of user interface
-          across discrete programs that need to provide a command line
-          interface</para>
-          <indexterm zone="ch-system-readline libreadline">
-            <primary sortas="c-libreadline">libreadline</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/sed.xml
===================================================================
--- BOOK/final-system/common/sed.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,88 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-sed" role="wrap">
-  <?dbhtml filename="sed.html"?>
-
-  <title>Sed-&sed-version;</title>
-
-  <indexterm zone="ch-system-sed">
-    <primary sortas="a-Sed">Sed</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Sed package contains a stream editor.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Sed</title>
-
-    <para os="a">Prepare Sed for compilation:</para>
-
-<screen os="b"><userinput>./configure \
-    --prefix=/usr \
-    --bindir=/bin \
-    --docdir=/usr/share/doc/sed-&sed-version;</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e"> Build the HTML documentation:</para>
-
-<screen os="f"><userinput>make html</userinput></screen>
-
-    <para os="g">To test the results, issue:</para>
-
-<screen os="g2"><userinput remap="test">make check</userinput></screen>
-
-    <para os="h">Install the package:</para>
-
-<screen os="i"><userinput>make install</userinput></screen>
-
-    <para os="j">Install the HTML documentation:</para>
-
-<screen os="k"><userinput>make install-html-am</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-sed" role="content">
-    <title>Contents of Sed</title>
-
-    <segmentedlist>
-      <segtitle>Installed program</segtitle>
-      <segtitle>Installed directory</segtitle>
-
-      <seglistitem>
-        <seg>sed</seg>
-        <seg>/usr/share/doc/sed-&sed-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="sed">
-        <term><command>sed</command></term>
-        <listitem>
-          <para>Filters and transforms text files in a single pass</para>
-          <indexterm zone="ch-system-sed sed">
-            <primary sortas="b-sed">sed</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/shadow.xml
===================================================================
--- BOOK/final-system/common/shadow.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,534 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-shadow" role="wrap">
-  <?dbhtml filename="shadow.html"?>
-
-  <title>Shadow-&shadow-version;</title>
-
-  <indexterm zone="ch-system-shadow">
-    <primary sortas="a-Shadow">Shadow</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Shadow package contains programs for handling passwords in a
-    secure way.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Shadow</title>
-
-    <note os="a">
-      <para>If you would like to enforce the use of strong passwords,
-      refer to <ulink url="&cblfs-root;index.php/Cracklib"/>
-      for installing Cracklib prior to building Shadow. After Cracklib is
-      installed, execute this <command>sed</command> in Shadow's source
-      directory to correct the path to the Cracklib dictionary:</para>
-
-<screen role="nodump"><userinput>sed -i 's@\(DICTPATH.\).*@\1/lib/cracklib/pw_dict@' etc/login.defs</userinput></screen>
-
-      <para>Finally, add <parameter>--with-libcrack</parameter> to the
-      <command>configure</command> command below.</para>
-
-    </note>
-
-    <para os="b">Disable the installation of the <command>groups</command>
-    program and man pages, as better versions of these programs are provided by
-    Coreutils, Util-linux and Man-pages:</para>
-
-<screen os="c"><userinput>sed -i src/Makefile.in \
-  -e 's/groups$(EXEEXT) //'
-find man -name Makefile.in -exec sed -i \
-  -e 's/man1\/groups\.1 //' \
-  -e 's/man3\/getspnam\.3 //' \
-  -e 's/man5\/passwd\.5 //' '{}' \;</userinput></screen>
-
-    <para os="d">Prepare Shadow for compilation:</para>
-
-<screen os="e"><userinput>./configure \
-    --sysconfdir=/etc \
-    --with-group-max-length=32</userinput></screen>
-
-  <variablelist os="f">
-    <title>The meaning of the new configure option:</title>
-
-    <varlistentry>
-      <term><parameter>--sysconfdir=/etc</parameter></term>
-      <listitem><para>Tells Shadow to install its configuration files into
-      <filename class="directory">/etc</filename>, rather than
-      <filename class="directory">/usr/etc</filename>.</para></listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><parameter>--with-group-max-length=32</parameter></term>
-      <listitem><para>The maximum user name is 32 characters.
-      Make the maximum group name the same.</para></listitem>
-    </varlistentry>
-
-  </variablelist>
-
-    <para os="g">Compile the package:</para>
-
-<screen os="h"><userinput>make</userinput></screen>
-
-    <para os="i">This package does not come with a test suite.</para>
-
-    <para os="j">Install the package:</para>
-
-<screen os="k"><userinput>make install</userinput></screen>
-
-    <para os="l" id="shadow-login_defs">Instead of using the default
-    <emphasis>DES</emphasis> method, use the more secure
-    <emphasis>SHA512</emphasis> method of password encryption, which also allows
-    passwords longer than 8 characters. It is also necessary to change the
-    obsolete <filename class="directory">/var/spool/mail</filename> location
-    for user mailboxes that Shadow uses by default to the <filename
-    class="directory">/var/mail</filename> location used currently. Use the
-    following sed command to make these changes to the appropriate
-    configuration file:</para>
-
-    <indexterm os="m" zone="shadow-login_defs">
-      <primary sortas="e-/etc/login.defs">/etc/login.defs</primary>
-    </indexterm>
-
-<screen os="n"><userinput>sed -i /etc/login.defs \
-    -e 's@#\(ENCRYPT_METHOD \).*@\1SHA512@' \
-    -e 's@/var/spool/mail@/var/mail@'</userinput></screen>
-
-    <para os="o">Move a misplaced program to its proper location:</para>
-
-<screen os="p"><userinput>mv -v /usr/bin/passwd /bin</userinput></screen>
-
-    <para os="q">The <command>login</command> program will write to
-    <filename>/var/log/faillog</filename>, to record failed login attempts, and
-    <filename>/var/log/lastlog</filename>, to record the date and
-    time of the latest successful login for each user. These log files are not
-    created automatically if they do not already exist, so we will
-    create them now and give them appropriate ownership and permissions:</para>
-
-<screen os="r"><userinput>touch /var/log/{fail,last}log
-chgrp -v utmp /var/log/{fail,last}log
-chmod -v 664 /var/log/{fail,last}log</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="conf-shadow" role="configuration">
-    <title>Configuring Shadow</title>
-
-    <indexterm zone="conf-shadow">
-      <primary sortas="a-Shadow">Shadow</primary>
-      <secondary>configuring</secondary>
-    </indexterm>
-
-    <para>This package contains utilities to add, modify, and delete users and
-    groups; set and change their passwords; and perform other administrative
-    tasks. For a full explanation of what <emphasis>password shadowing</emphasis>
-    means, see the <filename>doc/HOWTO</filename> file within the unpacked source
-    tree. If using Shadow support, keep in mind that programs which need to
-    verify passwords (display managers, FTP programs, pop3 daemons, etc.) must
-    be Shadow-compliant. That is, they need to be able to work with shadowed
-    passwords.</para>
-
-    <para>To enable shadowed passwords, run the following command:</para>
-
-<screen><userinput>pwconv</userinput></screen>
-
-    <para>To enable shadowed group passwords, run:</para>
-
-<screen role="nodump"><userinput>grpconv</userinput></screen>
-
-    <para>To view or change the default settings for new user accounts that
-    you create, you can edit <filename>/etc/default/useradd</filename>. See
-    <command>man useradd</command> or
-    <ulink url="&cblfs-root;index.php/Configuring_for_Adding_Users"/> for more
-    information.</para>
-
-  </sect2>
-
-  <sect2 id="root-password" role="configuration">
-    <title>Setting the root password</title>
-
-    <para>Choose a password for user <systemitem
-    class="username">root</systemitem> and set it by running:</para>
-
-<screen role="nodump"><userinput>passwd root</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-shadow" role="content">
-    <title>Contents of Shadow</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed directory</segtitle>
-
-      <seglistitem>
-        <seg>chage, chfn, chgpasswd, chpasswd, chsh, expiry, faillog, gpasswd,
-        groupadd, groupdel, groupmems, groupmod, grpck, grpconv, grpunconv,
-        lastlog, login, logoutd, newgrp, newusers, nologin, passwd, pwck,
-        pwconv, pwunconv, sg (link to newgrp), su, useradd, userdel, usermod,
-        vigr (link to vipw), vipw</seg>
-        <seg>/etc/default</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="chage">
-        <term><command>chage</command></term>
-        <listitem>
-          <para>Used to change the maximum number of days between obligatory
-          password changes</para>
-          <indexterm zone="ch-system-shadow chage">
-            <primary sortas="b-chage">chage</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="chfn">
-        <term><command>chfn</command></term>
-        <listitem>
-          <para>Used to change a user's full name and other information</para>
-          <indexterm zone="ch-system-shadow chfn">
-            <primary sortas="b-chfn">chfn</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="chgpasswd">
-        <term><command>chgpasswd</command></term>
-        <listitem>
-          <para>Used to update group passwords in batch mode</para>
-          <indexterm zone="ch-system-shadow chgpasswd">
-            <primary sortas="b-chgpasswd">chgpasswd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="chpasswd">
-        <term><command>chpasswd</command></term>
-        <listitem>
-          <para>Used to update the passwords of an entire series of user
-          accounts</para>
-          <indexterm zone="ch-system-shadow chpasswd">
-            <primary sortas="b-chpasswd">chpasswd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="chsh">
-        <term><command>chsh</command></term>
-        <listitem>
-          <para>Used to change a user's default login shell</para>
-          <indexterm zone="ch-system-shadow chsh">
-            <primary sortas="b-chsh">chsh</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="expiry">
-        <term><command>expiry</command></term>
-        <listitem>
-          <para>Checks and enforces the current password expiration policy</para>
-          <indexterm zone="ch-system-shadow expiry">
-            <primary sortas="b-expiry">expiry</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="faillog">
-        <term><command>faillog</command></term>
-        <listitem>
-          <para>Is used to examine the log of login failures, to set a maximum
-          number of failures before an account is blocked, or to reset the
-          failure count</para>
-          <indexterm zone="ch-system-shadow faillog">
-            <primary sortas="b-faillog">faillog</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gpasswd">
-        <term><command>gpasswd</command></term>
-        <listitem>
-          <para>Is used to add and delete members and administrators to
-          groups</para>
-          <indexterm zone="ch-system-shadow gpasswd">
-            <primary sortas="b-gpasswd">gpasswd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="groupadd">
-        <term><command>groupadd</command></term>
-        <listitem>
-          <para>Creates a group with the given name</para>
-          <indexterm zone="ch-system-shadow groupadd">
-            <primary sortas="b-groupadd">groupadd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="groupdel">
-        <term><command>groupdel</command></term>
-        <listitem>
-          <para>Deletes the group with the given name</para>
-          <indexterm zone="ch-system-shadow groupdel">
-            <primary sortas="b-groupdel">groupdel</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="groupmems">
-        <term><command>groupmems</command></term>
-        <listitem>
-          <para>Allows a user to administer his/her own group membership list
-          without the requirement of superuser privileges</para>
-          <indexterm zone="ch-system-shadow groupmems">
-            <primary sortas="b-groupmems">groupmems</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="groupmod">
-        <term><command>groupmod</command></term>
-        <listitem>
-          <para>Is used to modify the given group's name or GID</para>
-          <indexterm zone="ch-system-shadow groupmod">
-            <primary sortas="b-groupmod">groupmod</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="grpck">
-        <term><command>grpck</command></term>
-        <listitem>
-          <para>Verifies the integrity of the group files
-          <filename>/etc/group</filename> and
-          <filename>/etc/gshadow</filename></para>
-          <indexterm zone="ch-system-shadow grpck">
-            <primary sortas="b-grpck">grpck</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="grpconv">
-        <term><command>grpconv</command></term>
-        <listitem>
-          <para>Creates or updates the shadow group file from the normal
-          group file</para>
-          <indexterm zone="ch-system-shadow grpconv">
-            <primary sortas="b-grpconv">grpconv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="grpunconv">
-        <term><command>grpunconv</command></term>
-        <listitem>
-          <para>Updates <filename>/etc/group</filename> from
-          <filename>/etc/gshadow</filename> and then deletes the latter</para>
-          <indexterm zone="ch-system-shadow grpunconv">
-            <primary sortas="b-grpunconv">grpunconv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lastlog">
-        <term><command>lastlog</command></term>
-        <listitem>
-          <para>Reports the most recent login of all users or of a
-          given user</para>
-          <indexterm zone="ch-system-shadow lastlog">
-            <primary sortas="b-lastlog">lastlog</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="login">
-        <term><command>login</command></term>
-        <listitem>
-          <para>Is used by the system to let users sign on</para>
-          <indexterm zone="ch-system-shadow login">
-            <primary sortas="b-login">login</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="logoutd">
-        <term><command>logoutd</command></term>
-        <listitem>
-          <para>Is a daemon used to enforce restrictions on log-on time
-          and ports</para>
-          <indexterm zone="ch-system-shadow logoutd">
-            <primary sortas="b-logoutd">logoutd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="newgrp">
-        <term><command>newgrp</command></term>
-        <listitem>
-          <para>Is used to change the current GID during a login session</para>
-          <indexterm zone="ch-system-shadow newgrp">
-            <primary sortas="b-newgrp">newgrp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="newusers">
-        <term><command>newusers</command></term>
-        <listitem>
-          <para>Is used to create or update an entire series of user
-          accounts</para>
-          <indexterm zone="ch-system-shadow newusers">
-            <primary sortas="b-newusers">newusers</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="nologin">
-        <term><command>nologin</command></term>
-        <listitem>
-          <para>Displays a message that an account is not available. It is
-          designed to be used as the default shell for disabled accounts.</para>
-          <indexterm zone="ch-system-shadow nologin">
-            <primary sortas="b-nologin">nologin</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="passwd">
-        <term><command>passwd</command></term>
-        <listitem>
-          <para>Is used to change the password for a user or group account</para>
-          <indexterm zone="ch-system-shadow passwd">
-            <primary sortas="b-passwd">passwd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pwck">
-        <term><command>pwck</command></term>
-        <listitem>
-          <para>Verifies the integrity of the password files
-          <filename>/etc/passwd</filename> and
-          <filename>/etc/shadow</filename></para>
-          <indexterm zone="ch-system-shadow pwck">
-            <primary sortas="b-pwck">pwck</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pwconv">
-        <term><command>pwconv</command></term>
-        <listitem>
-          <para>Creates or updates the shadow password file from the normal
-          password file</para>
-          <indexterm zone="ch-system-shadow pwconv">
-            <primary sortas="b-pwconv">pwconv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pwunconv">
-        <term><command>pwunconv</command></term>
-        <listitem>
-          <para>Updates <filename>/etc/passwd</filename> from
-          <filename>/etc/shadow</filename> and then deletes the latter</para>
-          <indexterm zone="ch-system-shadow pwunconv">
-            <primary sortas="b-pwunconv">pwunconv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg">
-        <term><command>sg</command></term>
-        <listitem>
-          <para>Executes a given command while the user's GID
-          is set to that of the given group</para>
-          <indexterm zone="ch-system-shadow sg">
-            <primary sortas="b-sg">sg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="su">
-        <term><command>su</command></term>
-        <listitem>
-          <para>Runs a shell with substitute user and group IDs</para>
-          <indexterm zone="ch-system-shadow su">
-            <primary sortas="b-su">su</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="useradd">
-        <term><command>useradd</command></term>
-        <listitem>
-          <para>Creates a new user with the given name, or updates the default
-          new-user information</para>
-          <indexterm zone="ch-system-shadow useradd">
-            <primary sortas="b-useradd">useradd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="userdel">
-        <term><command>userdel</command></term>
-        <listitem>
-          <para>Deletes the given user account</para>
-          <indexterm zone="ch-system-shadow userdel">
-            <primary sortas="b-userdel">userdel</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="usermod">
-        <term><command>usermod</command></term>
-        <listitem>
-          <para>Is used to modify the given user's login name, User
-          Identification (UID), shell, initial group, home directory, etc.</para>
-          <indexterm zone="ch-system-shadow usermod">
-            <primary sortas="b-usermod">usermod</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vigr">
-        <term><command>vigr</command></term>
-        <listitem>
-          <para>Edits the <filename>/etc/group</filename> or
-          <filename>/etc/gshadow</filename> files</para>
-          <indexterm zone="ch-system-shadow vigr">
-            <primary sortas="b-vigr">vigr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vipw">
-        <term><command>vipw</command></term>
-        <listitem>
-          <para>Edits the <filename>/etc/passwd</filename> or
-          <filename>/etc/shadow</filename> files</para>
-          <indexterm zone="ch-system-shadow vipw">
-            <primary sortas="b-vipw">vipw</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/stripping.xml
===================================================================
--- BOOK/final-system/common/stripping.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,56 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-stripping">
-  <?dbhtml filename="stripping.html"?>
-
-  <title>Stripping</title>
-
-  <para os="a">If the intended user is not a programmer and does not plan to do
-  any debugging on the system software, the system size can be decreased
-  by about 200 MB by removing the debugging symbols from binaries and
-  libraries. This causes no inconvenience other than not being able to
-  debug the software fully anymore.</para>
-
-  <para os="b">Most people who use the command mentioned below do not
-  experience any difficulties. However, it is easy to make a typo and
-  render the new system unusable, so before running the
-  <command>strip</command> command, it is a good idea to make a
-  backup of the current situation.</para>
-
-  <para os="c">Before performing the stripping, take special care to ensure that
-  none of the binaries that are about to be stripped are running. If
-  unsure whether the user entered chroot with the command given in
-  <xref linkend="chapter-chroot" role=","/> first exit from
-  chroot:</para>
-
-<screen os="d" role="nodump"><userinput>logout</userinput></screen>
-
-    <para os="e">Then reenter it with:</para>
-
-<screen os="f" role="nodump"><userinput>chroot ${CLFS} /tools/bin/env -i \
-    HOME=/root TERM=${TERM} PS1='\u:\w\$ ' \
-    PATH=/bin:/usr/bin:/sbin:/usr/sbin \
-    /tools/bin/bash --login</userinput></screen>
-
-    <para os="g">Now the binaries and libraries can be safely stripped:</para>
-
-<screen os="h"><userinput>/tools/bin/find /{,usr/}{bin,lib,sbin} -type f \
-   -exec /tools/bin/strip --strip-debug '{}' ';'</userinput></screen>
-
-    <para os="i">A large number of files will be reported as having their file
-    format not recognized. These warnings can be safely ignored. These
-    warnings indicate that those files are scripts instead of
-    binaries.</para>
-
-    <para os="j">If disk space is very tight, the <option>--strip-all</option>
-    option can be used on the binaries in <filename
-    class="directory">/{,usr/}{bin,sbin}</filename> to gain several more
-    megabytes. Do not use this option on libraries&mdash;they will be
-    destroyed.</para>
-
-</sect1>
Index: OK/final-system/common/systemd.xml
===================================================================
--- BOOK/final-system/common/systemd.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,658 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-<sect1 id="ch-system-systemd" role="wrap">
-  <?dbhtml filename="systemd.html"?>
-
-  <title>Systemd-&systemd-version;</title>
-
-  <indexterm zone="ch-system-systemd">
-    <primary sortas="a-systemd">Systemd</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The systemd package is a system and service manager for Linux
-    operating systems.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Systemd</title>
-
-    <para os="s1">Prevent the <filename>Makefile</filename> from trying to run
-    <command>setcap</command> on <command>systemd-detect-virt</command>,
-    which will fail if the kernel or file system does not support extended
-    capabilities:</para>
-
-<screen os="s2"><userinput>sed -i '/virt-install-hook /d' Makefile.in</userinput></screen>
-
-    <para os="s3">The <filename>timesyncd.conf</filename> file contains a
-    reference to a non-existent <filename>timesyncd.conf(5)</filename> man
-    page. Remove that reference to avoid possible confusion:</para>
-
-<screen os="s4"><userinput>sed -i '/timesyncd.conf/d' src/timesync/timesyncd.conf.in</userinput></screen>
-
-    <para os="cc1">Create a file to declare some variables</para>
-
-<screen os="cc2"><userinput>cat &gt; config.cache &lt;&lt; "EOF"
-<literal>KILL="/bin/kill"
-MOUNT_PATH="/bin/mount"
-UMOUNT_PATH="/bin/umount"
-SULOGIN="/sbin/sulogin"
-XSLTPROC="/usr/bin/xsltproc"
-cc_cv_LDFLAGS__Wl__fuse_ld_gold=no</literal>
-EOF</userinput></screen>
-
-    <para os="a">Prepare systemd for compilation:</para>
-
-<screen os="b"><userinput>./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --libexecdir=/usr/lib \
-    --docdir=/usr/share/doc/systemd-&systemd-version; \
-    --with-rootprefix="" \
-    --with-rootlibdir=/lib \
-    --enable-split-usr \
-    --disable-firstboot \
-    --disable-ldconfig \
-    --disable-lto \
-    --disable-sysusers \
-    --with-default-dnssec=no \
-    --with-kbd-loadkeys=/bin/loadkeys \
-    --with-kbd-setfont=/bin/setfont \
-    --with-dbuspolicydir=/etc/dbus-1/system.d \
-    --with-dbussessionservicedir=/usr/share/dbus-1/services \
-    --with-dbussystemservicedir=/usr/share/dbus-1/system-services \
-    --config-cache</userinput></screen>
-
-    <variablelist os="c">
-      <title>The meaning of the configure options:</title>
-
-      <varlistentry>
-        <term><parameter>--config-cache</parameter></term>
-        <listitem>
-          <para>Use the created <filename>config.cache</filename>.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--with-root*</parameter></term>
-        <listitem>
-          <para>These switches ensure that core programs and
-          shared libraries are installed in the subdirectories
-          of the root partition.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--enable-split-usr</parameter></term>
-        <listitem>
-          <para>This switch ensures that systemd will work on
-          systems where /bin, /lib and /sbin directories are not
-          symlinks to their /usr counterparts.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--disable-firstboot</parameter></term>
-        <listitem>
-          <para>This switch prevents installation of systemd services 
-            responsible for setting up the system for the first time.
-            They are not useful for CLFS as everything is done manually.
-          </para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--disable-ldconfig</parameter></term>
-        <listitem>
-          <para>This switch prevents installation of a systemd unit that runs
-          <command>ldconfig</command> at boot, and increases boot time.
-          While it may be not useful for source distributions like CLFS,
-          this option may be removed.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--disable-lto</parameter></term>
-        <listitem>
-          <para>This prevents the build system from using GCC's Link-time
-          optimization (LTO), to ensure that systemd's binaries will not try
-          to link to <filename class="libraryfile">libgcc_s</filename></para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--disable-sysusers</parameter></term>
-        <listitem>
-            <para>This switch prevents install of systemd services which setup
-            the previously created <filename>/etc/group</filename> and
-            <filename>/etc/passwd</filename> files.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--with-dbus*</parameter></term>
-        <listitem>
-          <para>These switches ensure that D-Bus configuration files get
-          installed to the correct locations.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--with-default-dnssec=no</parameter></term>
-        <listitem>
-          <para>This switch turns off the experimental DNSSEC support.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para os="d">Compile the package:</para>
-
-<screen os="e"><userinput>make</userinput></screen>
-
-    <para os="f">Prevent a broken test case from running:</para>
-
-<screen os="g"><userinput remap="test">sed -e 's@test/udev-test.pl @@'  \
-        -e 's@test-copy$(EXEEXT) @@' \
-        -i Makefile.in
-</userinput></screen>
-
-    <para os="h">To test the results, issue:</para>
-
-<screen os="i"><userinput remap="test">sed -i "s:minix:ext4:g" src/test/test-path-util.c
-make check</userinput></screen>
-
-    <para os="j">Install the package:</para>
-
-<screen os="k"><userinput>make install</userinput></screen>
-
-    <para os="l">Install documentation files that are not installed by default:</para>
-
-<screen os="m"><userinput>install -v -m644 man/*.html /usr/share/doc/systemd-&systemd-version;</userinput></screen>
-
-    <para os="p">Remove an unnecessary directory:</para>
-
-<screen os="q"><userinput>rm -rfv /usr/lib/rpm</userinput></screen>
-
-    <para os="r">Create symlinks for backwards-compatibility with Sysvinit:</para>
-
-<screen os="s"><userinput>for tool in runlevel reboot shutdown poweroff halt telinit; do
-  ln -sfv ../bin/systemctl /sbin/$tool
-done
-ln -sfv ../lib/systemd/systemd /sbin/init</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="conf-systemd" role="configuration">
-    <title>Configuring Systemd</title>
-
-    <indexterm zone="conf-systemd">
-      <primary sortas="a-systemd">systemd</primary>
-    <secondary>configuring</secondary></indexterm>
-
-    <indexterm zone="conf-systemd">
-      <primary sortas="e-/etc/os-release">/etc/os-release</primary>
-    </indexterm>
-
-    <para>Create <filename>/etc/machine-id</filename> which is needed
-    by Journald:</para>
-
-<screen><userinput>systemd-machine-id-setup</userinput></screen>
-
-    <para>Create a file to identify the operating system.
-    <command>systemd</command> will use this file on boot to put information
-    on the screen.</para>
-
-<screen><userinput>cat &gt; /etc/os-release &lt;&lt; "EOF"
-# Begin /etc/os-release
-
-NAME=Cross-LFS
-ID=clfs
-
-PRETTY_NAME=Cross Linux From Scratch
-ANSI_COLOR=0;33
-
-VERSION=&version;
-VERSION_ID=&versionid;
-
-# End /etc/os-release
-EOF</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-systemd" role="content">
-    <title>Contents of Systemd</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed libraries</segtitle>
-      <segtitle>Installed directories</segtitle>
-
-      <seglistitem>
-        <seg>bootctl, busctl, halt (link to systemctl), hostnamectl,
-        init (link to systemd), journalctl, kernel-install, localectl, loginctl,
-        machinectl, poweroff (link to systemctl), reboot (link to systemctl),
-        runlevel (link to systemctl), shutdown (link to systemctl),
-        systemctl, systemd, system-analyze, systemd-ask-password, systemd-cat,
-        systemd-cgls, systemd-cgtop, systemd-coredumpctl, systemd-delta,
-        systemd-detect-virt, systemd-inhibit, systemd-machine-id-setup,
-        systemd-notify, systemd-nspawn, systemd-run, systemd-stdio-bridge
-        (link to systemd-bus-proxyd), systemd-tmpfiles,
-        systemd-tty-ask-password-agent, telinit (link to systemctl),
-        timedatectl, udevadm</seg>
-        <seg>libnss_myhostname.so, libsystemd.so, libudev.so</seg>
-        <seg>/etc/binfmt.d, /etc/init.d, /etc/kernel, /etc/modules-load.d,
-        /etc/sysctl.d, /etc/systemd, /etc/tmpfiles.d, /etc/udev,
-        /etc/xdg/systemd, /lib/systemd, /lib/udev, /usr/include/systemd,
-        /usr/lib/binfmt.d, /usr/lib/kernel, /usr/lib/modules-load.d,
-        /usr/lib/sysctl.d, /usr/lib/systemd,
-        /usr/share/doc-systemd-&systemd-version;, /usr/share/systemd,
-        /usr/share/zsh, /var/lib/systemd</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="bootctl">
-        <term><command>bootctl</command></term>
-        <listitem>
-          <para>Controls the firmware and boot manager settings</para>
-          <indexterm zone="ch-system-systemd bootctl">
-            <primary sortas="b-bootctl">bootctl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="busctl">
-        <term><command>busctl</command></term>
-        <listitem>
-          <para>Introspects and monitors the D-Bus bus</para>
-          <indexterm zone="ch-system-systemd busctl">
-            <primary sortas="b-busctl">busctl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="halt">
-        <term><command>halt</command></term>
-        <listitem>
-          <para>Halts, powers off, or reboots the machine</para>
-          <indexterm zone="ch-system-systemd halt">
-            <primary sortas="b-halt">halt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hostnamectl">
-        <term><command>hostnamectl</command></term>
-        <listitem>
-          <para>Controls the system hostname</para>
-          <indexterm zone="ch-system-systemd hostnamectl">
-            <primary sortas="b-hostnamectl">hostnamectl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="init">
-        <term><command>init</command></term>
-        <listitem>
-          <para>systemd system and service manager</para>
-          <indexterm zone="ch-system-systemd init">
-            <primary sortas="b-init">init</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="journalctl">
-        <term><command>journalctl</command></term>
-        <listitem>
-          <para>Queries the systemd journal</para>
-          <indexterm zone="ch-system-systemd journalctl">
-            <primary sortas="b-journalctl">journalctl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kernel-install">
-        <term><command>kernel-install</command></term>
-        <listitem>
-          <para>Adds and removes kernel and initramfs images to and from
-          <filename class="directory">/boot</filename></para>
-          <indexterm zone="ch-system-systemd kernel-install">
-            <primary sortas="b-kernel-install">kernel-install</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="localectl">
-        <term><command>localectl</command></term>
-        <listitem>
-          <para>Controls the system locale and keyboard layout settings</para>
-          <indexterm zone="ch-system-systemd localectl">
-            <primary sortas="b-localectl">localectl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="loginctl">
-        <term><command>loginctl</command></term>
-        <listitem>
-          <para>Controls the systemd login manager</para>
-          <indexterm zone="ch-system-systemd loginctl">
-            <primary sortas="b-loginctl">loginctl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="machinectl">
-        <term><command>machinectl</command></term>
-        <listitem>
-          <para>Controls the systemd machine manager</para>
-          <indexterm zone="ch-system-systemd machinectl">
-            <primary sortas="b-machinectl">machinectl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="poweroff">
-        <term><command>poweroff</command></term>
-        <listitem>
-          <para>Halts, powers off, or reboots the machine</para>
-          <indexterm zone="ch-system-systemd poweroff">
-            <primary sortas="b-poweroff">poweroff</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="reboot">
-        <term><command>reboot</command></term>
-        <listitem>
-          <para>Halts, powers off, or reboots the machine</para>
-          <indexterm zone="ch-system-systemd reboot">
-            <primary sortas="b-reboot">reboot</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="runlevel">
-        <term><command>runlevel</command></term>
-        <listitem>
-          <para>Prints previous and current SysV runlevel</para>
-          <indexterm zone="ch-system-systemd runlevel">
-            <primary sortas="b-runlevel">runlevel</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="shutdown">
-        <term><command>shutdown</command></term>
-        <listitem>
-          <para>Halts, powers off, or reboots the machine</para>
-          <indexterm zone="ch-system-systemd shutdown">
-            <primary sortas="b-shutdown">shutdown</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="systemctl">
-        <term><command>systemctl</command></term>
-        <listitem>
-          <para>Control the systemd system and service manager</para>
-          <indexterm zone="ch-system-systemd systemctl">
-            <primary sortas="b-systemctl">systemctl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="systemd">
-        <term><command>systemd</command></term>
-        <listitem>
-          <para>System and service manager for Linux</para>
-          <indexterm zone="ch-system-systemd systemd">
-            <primary sortas="b-systemd">systemd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="systemd-analyze">
-        <term><command>systemd-analyze</command></term>
-        <listitem>
-          <para>Analyzes system boot-up permformance</para>
-          <indexterm zone="ch-system-systemd systemd-analyze">
-            <primary sortas="b-systemd-analyze">systemd-analyze</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="systemd-ask-password">
-        <term><command>systemd-ask-password</command></term>
-        <listitem>
-          <para>Queries the user for a system passphrase, via the
-          TTY or an UI agent.</para>
-          <indexterm zone="ch-system-systemd systemd-ask-password">
-            <primary sortas="b-systemd-ask-password">systemd-ask-password</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="systemd-cat">
-        <term><command>systemd-cat</command></term>
-        <listitem>
-          <para>Connects a pipeline or program's output with the journal</para>
-          <indexterm zone="ch-system-systemd systemd-cat">
-            <primary sortas="b-systemd-cat">systemd-cat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="systemd-cgls">
-        <term><command>systemd-cgls</command></term>
-        <listitem>
-          <para>Recursively shows control group contents</para>
-          <indexterm zone="ch-system-systemd systemd-cgls">
-            <primary sortas="b-systemd-cgls">systemd-cgls</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="systemd-cgtop">
-        <term><command>systemd-cgtop</command></term>
-        <listitem>
-          <para>Shows top control groups by resource usage</para>
-          <indexterm zone="ch-system-systemd systemd-cgtop">
-            <primary sortas="b-systemd-cgtop">systemd-cgtop</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="systemd-coredumpctl">
-        <term><command>systemd-coredumpctl</command></term>
-        <listitem>
-          <para>Retrieves coredumps from the journal</para>
-          <indexterm zone="ch-system-systemd systemd-coredumpctl">
-            <primary sortas="b-systemd-coredumpctl">systemd-coredumpctl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="systemd-delta">
-        <term><command>systemd-delta</command></term>
-        <listitem>
-          <para>Finds overridden configuration files</para>
-          <indexterm zone="ch-system-systemd systemd-delta">
-            <primary sortas="b-systemd-delta">systemd-delta</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="systemd-detect-virt">
-        <term><command>systemd-detect-virt</command></term>
-        <listitem>
-          <para>Detects execution in a virtual environment</para>
-          <indexterm zone="ch-system-systemd systemd-detect-virt">
-            <primary sortas="b-systemd-detect-virt">systemd-detect-virt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="systemd-inhibit">
-        <term><command>systemd-inhibit</command></term>
-        <listitem>
-          <para>Executes a program with an inhibition lock taken</para>
-          <indexterm zone="ch-system-systemd systemd-inhibit">
-            <primary sortas="b-systemd-inhibit">systemd-inhibit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="systemd-machine-id-setup">
-        <term><command>systemd-machine-id-setup</command></term>
-        <listitem>
-          <para>Initializes the machine ID in
-          <filename>/etc/machine-id</filename></para>
-          <indexterm zone="ch-system-systemd systemd-machine-id-setup">
-            <primary sortas="b-systemd-machine-id-setup">systemd-machine-id-setup</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="systemd-notify">
-        <term><command>systemd-notify</command></term>
-        <listitem>
-          <para>Notifies init system about start-up completion and other daemon
-          status changes</para>
-          <indexterm zone="ch-system-systemd systemd-notify">
-            <primary sortas="b-systemd-notify">systemd-notify</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="systemd-nspawn">
-        <term><command>systemd-nspawn</command></term>
-        <listitem>
-          <para>Spawns a namespace container for debugging, testing, and
-          building</para>
-          <indexterm zone="ch-system-systemd systemd-nspawn">
-            <primary sortas="b-systemd-nspawn">systemd-nspawn</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="systemd-run">
-        <term><command>systemd-run</command></term>
-        <listitem>
-          <para>Runs programs in transient scope or service units</para>
-          <indexterm zone="ch-system-systemd systemd-run">
-            <primary sortas="b-systemd-run">systemd-run</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="systemd-stdio-bridge">
-        <term><command>systemd-stdio-bridge</command></term>
-        <listitem>
-          <para>Connects stdio or a socket to a given bus address</para>
-          <indexterm zone="ch-system-systemd systemd-stdio-bridge">
-            <primary sortas="b-systemd-stdio-bridge">systemd-stdio-bridge</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="systemd-tmpfiles">
-        <term><command>systemd-tmpfiles</command></term>
-        <listitem>
-          <para>Creates, deletes, and cleans up volatile and temporary files</para>
-          <indexterm zone="ch-system-systemd systemd-tmpfiles">
-            <primary sortas="b-systemd-tmpfiles">systemd-tmpfiles</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="systemd-tty-ask-password-agent">
-        <term><command>systemd-tty-ask-password-agent</command></term>
-        <listitem>
-          <para>Process system password requests</para>
-          <indexterm zone="ch-system-systemd systemd-tty-ask-password-agent">
-            <primary sortas="b-systemd-tty-ask-password-agent">systemd-tty-ask-password-agent</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="telinit">
-        <term><command>telinit</command></term>
-        <listitem>
-          <para>Tells <command>init</command> which run-level to change to</para>
-          <indexterm zone="ch-system-systemd telinit">
-            <primary sortas="b-telinit">telinit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="timedatectl">
-        <term><command>timedatectl</command></term>
-        <listitem>
-          <para>Controls the system time and date</para>
-          <indexterm zone="ch-system-systemd timedatectl">
-            <primary sortas="b-timedatectl">timedatectl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="udevadm">
-        <term><command>udevadm</command></term>
-        <listitem>
-          <para>Udev management tool</para>
-          <indexterm zone="ch-system-systemd udevadm">
-            <primary sortas="b-udevadm">udevadm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libnss_myhostname">
-        <term><filename class="libraryfile">libnss_myhostname</filename></term>
-        <listitem>
-          <para>Plugin for the GNU Name Service Switch (NSS) functionality
-          of Glibc, provding hostname resolution for the locally configured
-          system hostname</para>
-          <indexterm zone="ch-system-systemd libnss_myhostname">
-            <primary sortas="c-libnss_myhostname">libnss_myhostname</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libsystemd">
-        <term><filename class="libraryfile">libsystemd</filename></term>
-        <listitem>
-          <para>Support library for systemd</para>
-          <indexterm zone="ch-system-systemd libsystemd">
-            <primary sortas="c-libsystemd">libsystemd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libudev">
-        <term><filename class="libraryfile">libudev</filename></term>
-        <listitem>
-          <para>A library interface to Udev device information.</para>
-          <indexterm zone="ch-system-systemd libudev">
-            <primary sortas="c-libudev">libudev</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/tar.xml
===================================================================
--- BOOK/final-system/common/tar.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,97 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-tar" role="wrap">
-  <?dbhtml filename="tar.html"?>
-
-  <title>Tar-&tar-version;</title>
-
-  <indexterm zone="ch-system-tar">
-    <primary sortas="a-Tar">Tar</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Tar package contains an archiving program.</para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Tar</title>
-
-    <para os="a">Prepare Tar for compilation:</para>
-
-<screen os="b"><userinput>FORCE_UNSAFE_CONFIGURE=1 ./configure \
-    --prefix=/usr \
-    --bindir=/bin \
-    --libexecdir=/usr/sbin</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">To test the results, issue:</para>
-
-<screen os="e2"><userinput remap="test">make check</userinput></screen>
-
-    <para os="f">Install the package:</para>
-
-<screen os="g"><userinput>make install</userinput></screen>
-
-    <para os="h">Install the documentation:</para>
-
-<screen os="i"><userinput>make -C doc install-html docdir=/usr/share/doc/tar-&tar-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-tar" role="content">
-    <title>Contents of Tar</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed directory</segtitle>
-
-      <seglistitem>
-        <seg>rmt, tar</seg>
-        <seg>/usr/share/doc/tar-&tar-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="rmt">
-        <term><command>rmt</command></term>
-        <listitem>
-          <para>Remotely manipulates a magnetic
-          tape drive through an interprocess communication connection</para>
-          <indexterm zone="ch-system-tar rmt">
-            <primary sortas="b-rmt">rmt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tar">
-        <term><command>tar</command></term>
-        <listitem>
-          <para>Creates, extracts files from, and lists the contents of
-          archives, also known as tarballs</para>
-          <indexterm zone="ch-system-tar tar">
-            <primary sortas="b-tar">tar</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/temp-perl.xml
===================================================================
--- BOOK/final-system/common/temp-perl.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,85 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-temp-perl" role="wrap">
-  <?dbhtml filename="temp-perl.html"?>
-
-  <title>Temporary Perl-&perl-version;</title>
-
-  <indexterm zone="ch-system-temp-perl">
-    <primary sortas="a-Perl">Perl</primary>
-    <secondary>temporary tools</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/perl.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Perl</title>
-
-    <note os="a">
-      <para>In this section, we will add Perl to the temporary system in
-      <filename class="directory">/tools</filename>. This package installation
-      should technically be part of
-      <xref linkend="chapter-temp-system"/>, but Perl has often had problems
-      with cross-compiling, so we will compile and install it while in the
-      final build environment.</para>
-    </note>
-
-    <para os="s1">Change a hardcoded path from
-    <filename class="directory">/usr/include</filename> to
-    <filename class="directory">/tools/include</filename>:</para>
-
-<screen os="s2"><userinput>sed -i 's@/usr/include@/tools/include@g' ext/Errno/Errno_pm.PL</userinput></screen>
-
-<para os="c">Prepare Temporary Perl for compilation:</para>
-
-<screen os="d"><userinput>./configure.gnu \
-    --prefix=/tools \
-    -Dcc="gcc"</userinput></screen>
-
-    <variablelist os="e">
-      <title>The meaning of the configure option:</title>
-
-      <varlistentry>
-        <term><parameter>-Dcc="gcc"</parameter></term>
-        <listitem>
-          <para>Tells Perl to use <command>gcc</command> instead of the
-          default <command>cc</command>.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  <para os="f">Compile the package:</para>
-
-<screen os="g"><userinput>make</userinput></screen>
-
-  <para os="h">Although Perl comes with a test suite, it is not recommended
-  to run it at this point, as this Perl installation is only temporary. The
-  test suite can be run later in this chapter if desired.</para>
-
-    <para os="i">Install the package:</para>
-
-<screen os="j"><userinput>make install</userinput></screen>
-
-    <para os="k">Finally, create a necessary symlink:</para>
-
-<screen os="l"><userinput>ln -sfv /tools/bin/perl /usr/bin</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-perl" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/testsuitesagain.xml
===================================================================
--- BOOK/final-system/common/testsuitesagain.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,41 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-final-system-testsuitesagain">
-  <?dbhtml filename="testsuitesagain.html"?>
-
-  <title>About Test Suites, Again</title>
-
-  <para>In the final-system build, you are no longer cross-compiling so it
-  is possible to run package test suites. Running the test suite for a
-  newly built package is a good idea because it can provide a <quote>sanity
-  check</quote> indicating that everything compiled correctly. A test suite
-  that passes its set of checks usually proves that the package is
-  functioning as the developer intended. It does not, however, guarantee
-  that the package is totally bug free.</para>
-
-  <para>Some test suites are more important than others. For example, the test
-  suites for the core toolchain packages&mdash;GCC, Binutils,
-  and Glibc&mdash;are of the utmost
-  importance due to their central role in a properly functioning system.
-  The test suites for GCC and Glibc can take a very long time to complete,
-  especially on slower hardware, but are strongly recommended.</para>
-
-  <para>A common issue with running the test suites for Binutils and GCC
-  is running out of pseudo terminals (PTYs). This can result in a high
-  number of failing tests. This may happen for several reasons, but the
-  most likely cause (if you chrooted) is that the host system does not have the
-  <systemitem class="filesystem">devpts</systemitem> file system set up
-  correctly. This issue is discussed in greater detail at
-  <ulink url="&faq-root;#no-ptys"/>.</para>
-
-  <para>Sometimes package test suites will fail, but for reasons which the
-  developers are aware of and have deemed non-critical. Consult the logs located
-  at <ulink url="&test-results;"/> to verify whether or not these failures are
-  expected. This site is valid for all tests throughout this book.</para>
-
-</sect1>
Index: OK/final-system/common/texinfo.xml
===================================================================
--- BOOK/final-system/common/texinfo.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,162 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-texinfo" role="wrap">
-  <?dbhtml filename="texinfo.html"?>
-
-  <title>Texinfo-&texinfo-version;</title>
-
-  <indexterm zone="ch-system-texinfo">
-    <primary sortas="a-Texinfo">Texinfo</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Texinfo package contains programs for reading, writing, and
-    converting info pages.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Texinfo</title>
-
-    <para os="a">Prepare Texinfo for compilation:</para>
-
-<screen os="b"><userinput>./configure \
-    --prefix=/usr</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">To test the results, issue:</para>
-
-<screen os="e2"><userinput remap="test">make check</userinput></screen>
-
-    <para os="f">Install the package:</para>
-
-<screen os="g"><userinput>make install</userinput></screen>
-
-    <para os="h">If TeX will be used, install the components belonging in a TeX installation:</para>
-
-<screen os="i"><userinput>make TEXMF=/usr/share/texmf install-tex</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-texinfo" role="content">
-    <title>Contents of Texinfo</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed directory</segtitle>
-
-      <seglistitem>
-        <seg>info, infokey, install-info, makeinfo (link to texi2any),
-        pdftexi2dvi, texi2dvi, texi2pdf, texindex</seg>
-        <seg>/usr/share/texinfo</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="info">
-        <term><command>info</command></term>
-        <listitem>
-          <para>Used to read info pages which are similar to man
-          pages, but often go much deeper than just explaining all the command
-          line options. For example, compare <command>man bison</command> and
-          <command>info bison</command>.</para>
-          <indexterm zone="ch-system-texinfo info">
-            <primary sortas="b-info">info</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="infokey">
-        <term><command>infokey</command></term>
-        <listitem>
-          <para>Compiles a source file containing Info customizations into a
-          binary format</para>
-          <indexterm zone="ch-system-texinfo infokey">
-            <primary sortas="b-infokey">infokey</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="install-info">
-        <term><command>install-info</command></term>
-        <listitem>
-          <para>Used to install info pages; it updates entries in the
-          <command>info</command> index file</para>
-          <indexterm zone="ch-system-texinfo install-info">
-            <primary sortas="b-install-info">install-info</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="makeinfo">
-        <term><command>makeinfo</command></term>
-        <listitem>
-          <para>Translates the given Texinfo source documents into
-          info pages, plain text, or HTML</para>
-          <indexterm zone="ch-system-texinfo makeinfo">
-            <primary sortas="b-makeinfo">makeinfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pdftexi2dvi">
-        <term><command>pdftexi2dvi</command></term>
-        <listitem>
-          <para>Shell script that run <command>texi2dvi --pdf</command></para>
-          <indexterm zone="ch-system-texinfo pdftexi2dvi">
-            <primary sortas="b-pdftexi2dvi">pdftexi2dvi</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="texi2dvi">
-        <term><command>texi2dvi</command></term>
-        <listitem>
-          <para>Used to format the given Texinfo document into a
-          device-independent file that can be printed</para>
-          <indexterm zone="ch-system-texinfo texi2dvi">
-            <primary sortas="b-texi2dvi">texi2dvi</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="texi2pdf">
-        <term><command>texi2pdf</command></term>
-        <listitem>
-          <para>Used to format the given Texinfo document into a
-          Portable Document Format (PDF) file</para>
-          <indexterm zone="ch-system-texinfo texi2pdf">
-            <primary sortas="b-texi2pdf">texi2pdf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="texindex">
-        <term><command>texindex</command></term>
-        <listitem>
-          <para>Used to sort Texinfo index files</para>
-          <indexterm zone="ch-system-texinfo texindex">
-            <primary sortas="b-texindex">texindex</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/util-linux-pass1.xml
===================================================================
--- BOOK/final-system/common/util-linux-pass1.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,62 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-util-linux-pass1" role="wrap">
-  <?dbhtml filename="util-linux-pass1.html"?>
-
-  <title>Util-linux-&util-linux-version; Pass 1</title>
-
-  <indexterm zone="ch-system-util-linux-pass1">
-    <primary sortas="a-Util-linux-pass1">Util-linux</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="util-linux.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Util-linux Pass 1</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="util-linux.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="util-linux.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="util-linux.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="util-linux.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="util-linux.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="util-linux.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="util-linux.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-util-linux" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/util-linux.xml
===================================================================
--- BOOK/final-system/common/util-linux.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,1130 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-util-linux" role="wrap">
-  <?dbhtml filename="util-linux.html"?>
-
-  <title>Util-linux-&util-linux-version;</title>
-
-  <indexterm zone="ch-system-util-linux">
-    <primary sortas="a-Util-linux">Util-linux</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Util-linux package contains miscellaneous utility programs.
-    Among them are utilities for handling file systems, consoles, partitions,
-    and messages.</para>
-
-  </sect2>
-
-  <sect2 id="fhs-util-linux" role="installation">
-    <title>FHS compliance notes</title>
-
-    <para>The FHS recommends using the <filename
-    class="directory">/var/lib/hwclock</filename> directory instead of the
-    usual <filename class="directory">/etc</filename> directory as the
-    location for the <filename>adjtime</filename> file. To make the
-    <command>hwclock</command> program FHS-compliant, run the following:</para>
-
-<screen><userinput>mkdir -pv /var/lib/hwclock</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Util-linux</title>
-
-    <para os="a">Prepare Util-linux for compilation:</para>
-
-<screen os="b"><userinput>./configure \
-    ADJTIME_PATH=/var/lib/hwclock/adjtime \
-    --enable-write \
-    --disable-chfn-chsh \
-    --disable-login \
-    --disable-nologin \
-    --disable-su \
-    --disable-setpriv \
-    --disable-runuser \
-    --docdir=/usr/share/doc/util-linux-&util-linux-version;</userinput></screen>
-
-    <variablelist os="c">
-      <title>The meaning of the configure options:</title>
-
-      <varlistentry>
-        <term><parameter>--enable-write</parameter></term>
-        <listitem>
-          <para>This option allows the <command>write</command> program to be
-          installed.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--disable-*</parameter></term>
-        <listitem>
-          <para>This option disables various programs</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para os="d">Compile the package:</para>
-
-<screen os="e"><userinput>make</userinput></screen>
-
-    <para os="f">To test the results, issue:</para>
-
-<screen os="f2"><userinput remap="test">chown -Rv nobody . &amp;&amp;
-su nobody -s /bin/bash -c "PATH=$PATH make -k check"</userinput></screen>
-
-    <para os="g">Install the package:</para>
-
-<screen os="h"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-util-linux" role="content">
-    <title>Contents of Util-linux</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed libraries</segtitle>
-      <segtitle>Installed directories</segtitle>
-
-      <seglistitem>
-        <seg>addpart, agetty, blkdiscard, blkid, blockdev, cal, cfdisk, chcpu,
-        chrt, col, colcrt, colrm, column, ctrlaltdel, delpart, dmesg,
-        eject, fallocate, fdformat, fdisk, findfs, findmnt, flock, fsck,
-        fsck.cramfs, fsck.minix, fsfreeze, fstrim, getopt, hexdump,
-        hwclock, ionice, ipcmk, ipcrm, ipcs, isosize, kill, last, lastb (link
-        to last), ldattach, logger, look, losetup, lsblk, lscpu, lslocks,
-        mcookie, mesg, mkfs, mkfs.bfs, mkfs.cramfs, mkfs.minix, mkswap, more,
-        mount, mountpoint,  namei, nsenter, partx, pg, pivot_root, prlimit,
-        raw, readprofile, rename, renice, resizepart, rev, rtcwake, script,
-        scriptreplay, setarch, setsid, setterm, sfdisk, sulogin, swaplabel,
-        swapoff, swapon, switch_root, tailf, taskset, ul, umount, unshare,
-        utmpdump, uuidd, uuidgen, wall, wdctl, whereis, wipefs, write</seg>
-        <seg>libblkid.[a,so], libmount.[a,so], libuuid.[a,so]</seg>
-        <seg>/usr/include/blkid, /usr/include/libmount, /usr/include/uuid,
-        /usr/share/bash-completion,
-        /usr/share/doc/util-linux-&util-linux-version;/getopt,
-        and /var/lib/hwclock</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="addpart">
-        <term><command>addpart</command></term>
-        <listitem>
-          <para>Informs the kernel of a new partition</para>
-          <indexterm zone="ch-system-util-linux addpart">
-            <primary sortas="b-addpart">addpart</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="agetty">
-        <term><command>agetty</command></term>
-        <listitem>
-          <para>Opens a tty port, prompts for a login name,
-          and then invokes the <command>login</command> program</para>
-          <indexterm zone="ch-system-util-linux agetty">
-            <primary sortas="b-agetty">agetty</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="blkdiscard">
-        <term><command>blkdiscard</command></term>
-        <listitem>
-          <para>Discards sectors on a device</para>
-          <indexterm zone="ch-system-util-linux blkdiscard">
-            <primary sortas="b-blkdiscard">blkdiscard</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="blkid">
-        <term><command>blkid</command></term>
-        <listitem>
-          <para>A command line utility to locate and print block device
-          attributes</para>
-          <indexterm zone="ch-system-util-linux blkid">
-            <primary sortas="b-blkid">blkid</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="blockdev">
-        <term><command>blockdev</command></term>
-        <listitem>
-          <para>Allows users to call block device ioctls from the command
-          line</para>
-          <indexterm zone="ch-system-util-linux blockdev">
-            <primary sortas="b-blockdev">blockdev</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cal">
-        <term><command>cal</command></term>
-        <listitem>
-          <para>Displays a simple calendar</para>
-          <indexterm zone="ch-system-util-linux cal">
-            <primary sortas="b-cal">cal</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cfdisk">
-        <term><command>cfdisk</command></term>
-        <listitem>
-          <para>Manipulates the partition table of the given device</para>
-          <indexterm zone="ch-system-util-linux cfdisk">
-            <primary sortas="b-cfdisk">cfdisk</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="chcpu">
-        <term><command>chcpu</command></term>
-        <listitem>
-          <para>Utility to configure CPUs</para>
-          <indexterm zone="ch-system-util-linux chcpu">
-            <primary sortas="b-chcpu">chcpu</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="chrt">
-        <term><command>chrt</command></term>
-        <listitem>
-          <para>Manipulates real-time attributes of a process</para>
-          <indexterm zone="ch-system-util-linux chrt">
-            <primary sortas="b-chrt">chrt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="col">
-        <term><command>col</command></term>
-        <listitem>
-          <para>Filters out reverse line feeds</para>
-          <indexterm zone="ch-system-util-linux col">
-            <primary sortas="b-col">col</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="colcrt">
-        <term><command>colcrt</command></term>
-        <listitem>
-          <para>Filters <command>nroff</command> output for terminals
-          that lack some capabilities, such as overstriking and half-lines</para>
-          <indexterm zone="ch-system-util-linux colcrt">
-            <primary sortas="b-colcrt">colcrt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="colrm">
-        <term><command>colrm</command></term>
-        <listitem>
-          <para>Filters out the given columns</para>
-          <indexterm zone="ch-system-util-linux colrm">
-            <primary sortas="b-colrm">colrm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="column">
-        <term><command>column</command></term>
-        <listitem>
-          <para>Formats a given file into multiple columns</para>
-          <indexterm zone="ch-system-util-linux column">
-            <primary sortas="b-column">column</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ctrlaltdel">
-        <term><command>ctrlaltdel</command></term>
-        <listitem>
-          <para>Sets the function of the Ctrl+Alt+Del key combination to a
-          hard or a soft reset</para>
-          <indexterm zone="ch-system-util-linux ctrlaltdel">
-            <primary sortas="b-ctrlaltdel">ctrlaltdel</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="delpart">
-        <term><command>delpart</command></term>
-        <listitem>
-          <para>Asks the kernel to remove a partition</para>
-          <indexterm zone="ch-system-util-linux delpart">
-            <primary sortas="b-delpart">delpart</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dmesg">
-        <term><command>dmesg</command></term>
-        <listitem>
-          <para>Dumps the kernel boot messages</para>
-          <indexterm zone="ch-system-util-linux dmesg">
-            <primary sortas="b-dmesg">dmesg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="eject">
-        <term><command>eject</command></term>
-        <listitem>
-          <para>Eject removable media</para>
-          <indexterm zone="ch-system-util-linux eject">
-            <primary sortas="b-dmesg">eject</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fallocate">
-        <term><command>fallocate</command></term>
-        <listitem>
-          <para>Preallocates space to a file</para>
-          <indexterm zone="ch-system-util-linux fallocate">
-            <primary sortas="b-fallocate">fallocate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fdformat">
-        <term><command>fdformat</command></term>
-        <listitem>
-          <para>Low-level formats a floppy disk</para>
-          <indexterm zone="ch-system-util-linux fdformat">
-            <primary sortas="b-fdformat">fdformat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fdisk">
-        <term><command>fdisk</command></term>
-        <listitem>
-          <para>Manipulates the partition table of the given device</para>
-          <indexterm zone="ch-system-util-linux fdisk">
-            <primary sortas="b-fdisk">fdisk</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="findfs">
-        <term><command>findfs</command></term>
-        <listitem>
-          <para>Finds a file system by label or Universally Unique Identifier
-          (UUID)</para>
-          <indexterm zone="ch-system-util-linux findfs">
-            <primary sortas="b-findfs">findfs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="findmnt">
-        <term><command>findmnt</command></term>
-        <listitem>
-          <para>Lists mounted filesystems or searches for a filesystem</para>
-          <indexterm zone="ch-system-util-linux findmnt">
-            <primary sortas="b-findmnt">findmnt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="flock">
-        <term><command>flock</command></term>
-        <listitem>
-          <para>Acquires a file lock and then executes a command with the lock
-          held</para>
-          <indexterm zone="ch-system-util-linux flock">
-            <primary sortas="b-flock">flock</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fsck">
-        <term><command>fsck</command></term>
-        <listitem>
-          <para>Is used to check, and optionally repair, file systems</para>
-          <indexterm zone="ch-system-util-linux fsck">
-            <primary sortas="b-fsck">fsck</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fsck.cramfs">
-        <term><command>fsck.cramfs</command></term>
-        <listitem>
-          <para>Performs a consistency check on the Cramfs file system on the
-          given device</para>
-          <indexterm zone="ch-system-util-linux fsck.cramfs">
-            <primary sortas="b-fsck.cramfs">fsck.cramfs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fsck.minix">
-        <term><command>fsck.minix</command></term>
-        <listitem>
-          <para>Performs a consistency check on the Minix file system on the
-          given device</para>
-          <indexterm zone="ch-system-util-linux fsck.minix">
-            <primary sortas="b-fsck.minix">fsck.minix</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fsfreeze">
-        <term><command>fsfreeze</command></term>
-        <listitem>
-          <para>Suspends and resumes access to a filesystem</para>
-          <indexterm zone="ch-system-util-linux fsfreeze">
-            <primary sortas="b-fsfreeze">fsfreeze</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fstrim">
-        <term><command>fstrim</command></term>
-        <listitem>
-          <para>Discards unused blocks on a mounted filesystem</para>
-          <indexterm zone="ch-system-util-linux fstrim">
-            <primary sortas="b-fstrim">fstrim</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="getopt">
-        <term><command>getopt</command></term>
-        <listitem>
-          <para>Parses options in the given command line</para>
-          <indexterm zone="ch-system-util-linux getopt">
-            <primary sortas="b-getopt">getopt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hexdump">
-        <term><command>hexdump</command></term>
-        <listitem>
-          <para>Dumps the given file in hexadecimal or in another given
-          format</para>
-          <indexterm zone="ch-system-util-linux hexdump">
-            <primary sortas="b-hexdump">hexdump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hwclock">
-        <term><command>hwclock</command></term>
-        <listitem>
-          <para>Reads or sets the system's hardware clock, also called
-          the Real-Time Clock (RTC) or Basic Input-Output System (BIOS)
-          clock</para>
-          <indexterm zone="ch-system-util-linux hwclock">
-            <primary sortas="b-hwclock">hwclock</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ionice">
-        <term><command>ionice</command></term>
-        <listitem>
-          <para>Gives and sets program I/O scheduling class and priority</para>
-          <indexterm zone="ch-system-util-linux ionice">
-            <primary sortas="b-ionice">ionice</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ipcmk">
-        <term><command>ipcmk</command></term>
-        <listitem>
-          <para>Creates various IPC resources</para>
-          <indexterm zone="ch-system-util-linux ipcmk">
-            <primary sortas="b-ipcmk">ipcmk</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ipcrm">
-        <term><command>ipcrm</command></term>
-        <listitem>
-          <para>Removes the given Inter-Process Communication (IPC) resource</para>
-          <indexterm zone="ch-system-util-linux ipcrm">
-            <primary sortas="b-ipcrm">ipcrm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ipcs">
-        <term><command>ipcs</command></term>
-        <listitem>
-          <para>Provides IPC status information</para>
-          <indexterm zone="ch-system-util-linux ipcs">
-            <primary sortas="b-ipcs">ipcs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="isosize">
-        <term><command>isosize</command></term>
-        <listitem>
-          <para>Reports the size of an iso9660 file system</para>
-          <indexterm zone="ch-system-util-linux isosize">
-            <primary sortas="b-isosize">isosize</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kill">
-        <term><command>kill</command></term>
-        <listitem>
-          <para>Send a signal to a process</para>
-          <indexterm zone="ch-system-util-linux kill">
-            <primary sortas="b-kill">kill</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="last">
-        <term><command>last</command></term>
-        <listitem>
-          <para>Shows which users last logged in (and out), searching back
-          through the <filename>/var/log/wtmp</filename> file; it also shows
-          system boots, shutdowns, and run-level changes</para>
-          <indexterm zone="ch-system-util-linux last">
-            <primary sortas="b-last">last</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lastb">
-        <term><command>lastb</command></term>
-        <listitem>
-          <para>Shows the failed login attempts, as logged in
-          <filename>/var/log/btmp</filename></para>
-          <indexterm zone="ch-system-util-linux lastb">
-            <primary sortas="b-lastb">lastb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ldattach">
-        <term><command>ldattach</command></term>
-        <listitem>
-          <para>Attaches a line discipline to a serial line</para>
-          <indexterm zone="ch-system-util-linux ldattach">
-            <primary sortas="b-ldattach">ldattach</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="logger">
-        <term><command>logger</command></term>
-        <listitem>
-          <para>Enters the given message into the system log</para>
-          <indexterm zone="ch-system-util-linux logger">
-            <primary sortas="b-logger">logger</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="look">
-        <term><command>look</command></term>
-        <listitem>
-          <para>Displays lines that begin with the given string</para>
-          <indexterm zone="ch-system-util-linux look">
-            <primary sortas="b-look">look</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="losetup">
-        <term><command>losetup</command></term>
-        <listitem>
-          <para>Sets up and controls loop devices</para>
-          <indexterm zone="ch-system-util-linux losetup">
-            <primary sortas="b-losetup">losetup</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lsblk">
-        <term><command>lsblk</command></term>
-        <listitem>
-          <para>Prints information about block devices</para>
-          <indexterm zone="ch-system-util-linux lsblk">
-            <primary sortas="b-lsblk">lsblk</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lscpu">
-        <term><command>lscpu</command></term>
-        <listitem>
-          <para>Prints CPU architecture information</para>
-          <indexterm zone="ch-system-util-linux lscpu">
-            <primary sortas="b-lscpu">lscpu</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lslocks">
-        <term><command>lslocks</command></term>
-        <listitem>
-          <para>Lists local system locks</para>
-          <indexterm zone="ch-system-util-linux lslocks">
-            <primary sortas="b-lslocks">lslocks</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mcookie">
-        <term><command>mcookie</command></term>
-        <listitem>
-          <para>Generates magic cookies (128-bit random hexadecimal numbers) for
-          <command>xauth</command></para>
-          <indexterm zone="ch-system-util-linux mcookie">
-            <primary sortas="b-mcookie">mcookie</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mesg">
-        <term><command>mesg</command></term>
-        <listitem>
-          <para>Controls whether other users can send messages to the current
-          user's terminal</para>
-          <indexterm zone="ch-system-util-linux mesg">
-            <primary sortas="b-mesg">mesg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mkfs">
-        <term><command>mkfs</command></term>
-        <listitem>
-          <para>Builds a file system on a device (usually a hard disk
-          partition)</para>
-          <indexterm zone="ch-system-util-linux mkfs">
-            <primary sortas="b-mkfs">mkfs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mkfs.bfs">
-        <term><command>mkfs.bfs</command></term>
-        <listitem>
-          <para>Creates a Santa Cruz Operations (SCO) bfs file system</para>
-          <indexterm zone="ch-system-util-linux mkfs.bfs">
-            <primary sortas="b-mkfs.bfs">mkfs.bfs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mkfs.cramfs">
-        <term><command>mkfs.cramfs</command></term>
-        <listitem>
-          <para>Creates a cramfs file system</para>
-          <indexterm zone="ch-system-util-linux mkfs.cramfs">
-            <primary sortas="b-mkfs.cramfs">mkfs.cramfs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mkfs.minix">
-        <term><command>mkfs.minix</command></term>
-        <listitem>
-          <para>Creates a Minix file system</para>
-          <indexterm zone="ch-system-util-linux mkfs.minix">
-            <primary sortas="b-mkfs.minix">mkfs.minix</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mkswap">
-        <term><command>mkswap</command></term>
-        <listitem>
-          <para>Initializes the given device or file to be used as a swap
-          area</para>
-          <indexterm zone="ch-system-util-linux mkswap">
-            <primary sortas="b-mkswap">mkswap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="more">
-        <term><command>more</command></term>
-        <listitem>
-          <para>A filter for paging through text one screen at a time</para>
-          <indexterm zone="ch-system-util-linux more">
-            <primary sortas="b-more">more</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mount">
-        <term><command>mount</command></term>
-        <listitem>
-          <para>Attaches the file system on the given device to a specified
-          directory in the file-system tree</para>
-          <indexterm zone="ch-system-util-linux mount">
-            <primary sortas="b-mount">mount</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mountpoint">
-        <term><command>mountpoint</command></term>
-        <listitem>
-          <para>Tells you whether or not a directory is a mount point.</para>
-          <indexterm zone="ch-system-util-linux mountpoint">
-            <primary sortas="b-mountpoint">mountpoint</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="namei">
-        <term><command>namei</command></term>
-        <listitem>
-          <para>Shows the symbolic links in the given pathnames</para>
-          <indexterm zone="ch-system-util-linux namei">
-            <primary sortas="b-namei">namei</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="nsenter">
-        <term><command>nsenter</command></term>
-        <listitem>
-          <para>Runs a program with namespaces of other processes</para>
-          <indexterm zone="ch-system-util-linux nsenter">
-            <primary sortas="b-nsenter">nsenter</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="partx">
-        <term><command>partx</command></term>
-        <listitem>
-          <para>Tells the kernel about the presence and numbering of on-disk
-          partitions</para>
-          <indexterm zone="ch-system-util-linux partx">
-            <primary sortas="b-partx">partx</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pg">
-        <term><command>pg</command></term>
-        <listitem>
-          <para>Displays a text file one screen full at a time</para>
-          <indexterm zone="ch-system-util-linux pg">
-            <primary sortas="b-pg">pg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pivot_root">
-        <term><command>pivot_root</command></term>
-        <listitem>
-          <para>Makes the given file system the new root file system of the
-          current process</para>
-          <indexterm zone="ch-system-util-linux pivot_root">
-            <primary sortas="b-pivot_root">pivot_root</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="prlimit">
-        <term><command>prlimit</command></term>
-        <listitem>
-          <para>Gets and sets a process' resource limits</para>
-          <indexterm zone="ch-system-util-linux prlimit">
-            <primary sortas="b-prlimit">prlimit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="raw">
-        <term><command>raw</command></term>
-        <listitem>
-          <para>Binds a Linux raw character device to a block device</para>
-          <indexterm zone="ch-system-util-linux raw">
-            <primary sortas="b-raw">raw</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="readprofile">
-        <term><command>readprofile</command></term>
-        <listitem>
-          <para>Reads kernel profiling information</para>
-          <indexterm zone="ch-system-util-linux readprofile">
-            <primary sortas="b-readprofile">readprofile</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rename">
-        <term><command>rename</command></term>
-        <listitem>
-          <para>Renames the given files, replacing a given string with
-          another</para>
-          <indexterm zone="ch-system-util-linux rename">
-            <primary sortas="b-rename">rename</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="renice">
-        <term><command>renice</command></term>
-        <listitem>
-          <para>Alters the priority of running processes</para>
-          <indexterm zone="ch-system-util-linux renice">
-            <primary sortas="b-renice">renice</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="resizepart">
-        <term><command>resizepart</command></term>
-        <listitem>
-          <para>Asks the Linux kernel to resize a partition</para>
-          <indexterm zone="ch-system-util-linux resizepart">
-            <primary sortas="b-resizepart">resizepart</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rev">
-        <term><command>rev</command></term>
-        <listitem>
-          <para>Reverses the lines of a given file</para>
-          <indexterm zone="ch-system-util-linux rev">
-            <primary sortas="b-rev">rev</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rtcwake">
-        <term><command>rtcwake</command></term>
-        <listitem>
-          <para>Enters a system sleep state until a specified wakeup time</para>
-          <indexterm zone="ch-system-util-linux rtcwake">
-            <primary sortas="b-rtcwake">rtcwake</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="script">
-        <term><command>script</command></term>
-        <listitem>
-          <para>Makes a typescript of a terminal session</para>
-          <indexterm zone="ch-system-util-linux script">
-            <primary sortas="b-script">script</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="scriptreplay">
-        <term><command>scriptreplay</command></term>
-        <listitem>
-          <para>Plays back typescripts created by <command>script</command></para>
-          <indexterm zone="ch-system-util-linux scriptreplay">
-            <primary sortas="b-scriptreplay">scriptreplay</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="setarch">
-        <term><command>setarch</command></term>
-        <listitem>
-          <para>Changes reported architecture in new program environment and
-          sets personality flags</para>
-          <indexterm zone="ch-system-util-linux setarch">
-            <primary sortas="b-setarch">setarch</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="setsid">
-        <term><command>setsid</command></term>
-        <listitem>
-          <para>Runs the given program in a new session</para>
-          <indexterm zone="ch-system-util-linux setsid">
-            <primary sortas="b-setsid">setsid</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="setterm">
-        <term><command>setterm</command></term>
-        <listitem>
-          <para>Sets terminal attributes</para>
-          <indexterm zone="ch-system-util-linux setterm">
-            <primary sortas="b-setterm">setterm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sfdisk">
-        <term><command>sfdisk</command></term>
-        <listitem>
-          <para>A disk partition table manipulator</para>
-          <indexterm zone="ch-system-util-linux sfdisk">
-            <primary sortas="b-sfdisk">sfdisk</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sulogin">
-        <term><command>sulogin</command></term>
-        <listitem>
-          <para>Allows <emphasis>root</emphasis> to log in; it is normally
-          invoked by <command>init</command> when the system goes into single
-          user mode</para>
-          <indexterm zone="ch-system-util-linux sulogin">
-            <primary sortas="b-sulogin">sulogin</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="swaplabel">
-        <term><command>swaplabel</command></term>
-        <listitem>
-          <para>Prints or changes the label or UUID of a swap area</para>
-          <indexterm zone="ch-system-util-linux swaplabel">
-            <primary sortas="b-swaplabel">swaplabel</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="swapoff">
-        <term><command>swapoff</command></term>
-        <listitem>
-          <para>Disables devices and files for paging and swapping</para>
-          <indexterm zone="ch-system-util-linux swapoff">
-            <primary sortas="b-swapoff">swapoff</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="swapon">
-        <term><command>swapon</command></term>
-        <listitem>
-          <para>Enables devices and files for paging and swapping and
-          lists the devices and files currently in use</para>
-          <indexterm zone="ch-system-util-linux swapon">
-            <primary sortas="b-swapon">swapon</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="switch_root">
-        <term><command>switch_root</command></term>
-        <listitem>
-          <para>Switches to another filesystem as the root of the mount tree</para>
-          <indexterm zone="ch-system-util-linux switch_root">
-            <primary sortas="b-switch_root">switch_root</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tailf">
-        <term><command>tailf</command></term>
-        <listitem>
-          <para>Tracks the growth of a log file. Displays the last 10 lines
-          of a log file, then continues displaying any new entries in the
-          log file as they are created</para>
-          <indexterm zone="ch-system-util-linux tailf">
-            <primary sortas="b-tailf">tailf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="taskset">
-        <term><command>taskset</command></term>
-        <listitem>
-          <para>Retrieves or sets a process's CPU affinity</para>
-          <indexterm zone="ch-system-util-linux taskset">
-            <primary sortas="b-taskset">taskset</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ul">
-        <term><command>ul</command></term>
-        <listitem>
-          <para>A filter for translating underscores into escape sequences
-          indicating underlining for the terminal in use</para>
-          <indexterm zone="ch-system-util-linux ul">
-            <primary sortas="b-ul">ul</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="umount">
-        <term><command>umount</command></term>
-        <listitem>
-          <para>Disconnects a file system from the system's file tree</para>
-          <indexterm zone="ch-system-util-linux umount">
-            <primary sortas="b-umount">umount</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="unshare">
-        <term><command>unshare</command></term>
-        <listitem>
-          <para>Runs a program with some namespaces unshared from parent</para>
-          <indexterm zone="ch-system-util-linux unshare">
-            <primary sortas="b-unshare">unshare</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="utmpdump">
-        <term><command>utmpdump</command></term>
-        <listitem>
-          <para>Displays the content of the given login file in a more
-          user-friendly format</para>
-          <indexterm zone="ch-system-util-linux utmpdump">
-            <primary sortas="b-utmpdump">utmpdump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="uuidd">
-        <term><command>uuidd</command></term>
-        <listitem>
-          <para>A daemon used by the UUID library to generate time-based
-          UUIDs in a secure and guranteed-unique fashion.</para>
-          <indexterm zone="ch-system-util-linux uuidd">
-            <primary sortas="b-uuidd">uuidd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="uuidgen">
-        <term><command>uuidgen</command></term>
-        <listitem>
-          <para>Creates new UUIDs. Each new UUID can reasonably be considered
-          unique among all UUIDs created, on the local system and on other
-          systems, in the past and in the future</para>
-          <indexterm zone="ch-system-util-linux uuidgen">
-            <primary sortas="b-uuidgen">uuidgen</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="wall">
-        <term><command>wall</command></term>
-        <listitem>
-          <para>Writes a message to all logged-in users</para>
-          <indexterm zone="ch-system-util-linux wall">
-            <primary sortas="b-wall">wall</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="wdctl">
-        <term><command>wdctl</command></term>
-        <listitem>
-          <para>Show hardware watchdog status</para>
-          <indexterm zone="ch-system-util-linux wdctl">
-            <primary sortas="b-uuidgen">wdctl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="whereis">
-        <term><command>whereis</command></term>
-        <listitem>
-          <para>Reports the location of the binary, source, and man page
-          for the given command</para>
-          <indexterm zone="ch-system-util-linux whereis">
-            <primary sortas="b-whereis">whereis</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="wipefs">
-        <term><command>wipefs</command></term>
-        <listitem>
-          <para>Wipes a filesystem signature from a device</para>
-          <indexterm zone="ch-system-util-linux wipefs">
-            <primary sortas="b-wipefs">wipefs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="write">
-        <term><command>write</command></term>
-        <listitem>
-          <para>Sends a message to the given user <emphasis>if</emphasis> that
-          user has not disabled receipt of such messages</para>
-          <indexterm zone="ch-system-util-linux write">
-            <primary sortas="b-write">write</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libblkid">
-        <term><filename class="libraryfile">libblkid</filename></term>
-        <listitem>
-          <para>Contains routines for device identification and token
-          extraction</para>
-          <indexterm zone="ch-system-util-linux libblkid">
-            <primary sortas="c-libblkid">libblkid</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libmount">
-        <term><filename class="libraryfile">libmount</filename></term>
-        <listitem>
-          <para>Contains routines for parsing the
-          <filename>/etc/fstab</filename>, <filename>/etc/mtab</filename>,
-          and <filename>/proc/self/mountinfo</filename> files, managing
-          <filename>/etc/mtab</filename>, and configuring various mount
-          options</para>
-          <indexterm zone="ch-system-util-linux libmount">
-            <primary sortas="c-libmount">libmount</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libuuid">
-        <term><filename class="libraryfile">libuuid</filename></term>
-        <listitem>
-          <para>Contains routines for generating unique identifiers for objects
-          that may be accessible beyond the local system</para>
-          <indexterm zone="ch-system-util-linux libuuid">
-            <primary sortas="c-libuuid">libuuid</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/vim.xml
===================================================================
--- BOOK/final-system/common/vim.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,396 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-vim" role="wrap">
-  <?dbhtml filename="vim.html"?>
-
-  <title>Vim-&vim-version;</title>
-
-  <indexterm zone="ch-system-vim">
-    <primary sortas="a-Vim">Vim</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Vim package contains a powerful text editor.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Vim</title>
-
-    <tip os="t1">
-      <title>Alternatives to Vim</title>
-
-      <para>If you prefer another editor&mdash;such as Emacs, Joe, or
-      Nano&mdash;please refer to <ulink
-      url="&cblfs-root;index.php/Category:Text_Editors"/>
-      for suggested installation instructions.</para>
-    </tip>
-
-    <para os="p1">The following patch merges all updates from the &vim-version; Branch
-    from the Vim developers:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&vim-branch_update-patch;</userinput></screen>
-
-    <para os="b">Change the default location of
-    the <filename>vimrc</filename> configuration file to <filename
-    class="directory">/etc</filename>:</para>
-
-<screen os="c"><userinput>echo '#define SYS_VIMRC_FILE "/etc/vimrc"' &gt;&gt; src/feature.h</userinput></screen>
-
-    <para os="d">Prepare Vim for compilation:</para>
-
-<screen os="e"><userinput>./configure \
-    --prefix=/usr</userinput></screen>
-
-    <para os="g">Compile the package:</para>
-
-<screen os="h"><userinput>make</userinput></screen>
-
-    <para os="i">To test the results, issue:</para>
-
-<screen os="i2"><userinput remap="test">make test</userinput></screen>
-
-    <para os="i3">However, this test suite outputs a lot of binary data to the
-    screen, which can cause issues with the settings of the current terminal.
-    This can be resolved by redirecting the output to a log file.</para>
-
-    <para os="j">Install the package:</para>
-
-<screen os="k"><userinput>make -j1 install</userinput></screen>
-
-    <para os="l">Many users are accustomed to using <command>vi</command>
-    instead of <command>vim</command>. Some programs, such as
-    <command>vigr</command> and <command>vipw</command>, also use
-    <command>vi</command>. Create a symlink to permit execution of
-    <command>vim</command> when users habitually enter <command>vi</command>
-    and allow programs that use <command>vi</command> to work:</para>
-
-<screen os="m"><userinput>ln -sv vim /usr/bin/vi</userinput></screen>
-
-<para os="n">By default, Vim's documentation is installed in
-<filename class="directory">/usr/share/vim</filename>.  The following symlink
-allows the documentation to be accessed via
-<filename class="directory">/usr/share/doc/vim-&vim-version;</filename>, making
-it consistent with the location of documentation for other packages:</para>
-
-<screen os="o"><userinput>ln -sv ../vim/vim&vim-version2;/doc /usr/share/doc/vim-&vim-version;</userinput></screen>
-
-    <para os="p">If an X Window System is going to be installed on the CLFS
-    system, you may want to recompile Vim after installing X. Vim
-    comes with a GUI version of the editor that requires X and some
-    additional libraries to be installed. For more information, refer to the
-    Vim documentation and the Vim installation page in CBLFS at <ulink
-    url="&cblfs-root;index.php/Vim"/>.</para>
-
-  </sect2>
-
-  <sect2 id="conf-vim" role="configuration">
-    <title>Configuring Vim</title>
-
-    <indexterm zone="conf-vim">
-      <primary sortas="e-/etc/vimrc">/etc/vimrc</primary>
-    </indexterm>
-
-    <para>By default, <command>vim</command> runs in vi-incompatible mode.
-    This may be new to users who have used other editors in the past. The
-    <quote>nocompatible</quote> setting is included below to highlight the
-    fact that a new behavior is being used. It also reminds those who would
-    change to <quote>compatible</quote> mode that it should be the first
-    setting in the configuration file. This is necessary because it changes
-    other settings, and overrides must come after this setting. Create a
-    default <command>vim</command> configuration file by running the
-    following:</para>
-
-<screen><userinput>cat &gt; /etc/vimrc &lt;&lt; "EOF"
-<literal>" Begin /etc/vimrc
-
-set nocompatible
-set backspace=2
-set ruler
-syntax on
-if (&amp;term == "iterm") || (&amp;term == "putty")
-  set background=dark
-endif
-
-" End /etc/vimrc</literal>
-EOF</userinput></screen>
-
-
-    <para>The <parameter>set nocompatible</parameter> makes
-    <command>vim</command> behave in a more useful way (the default) than
-    the vi-compatible manner. Remove the <quote>no</quote> to keep the
-    old <command>vi</command> behavior. The <parameter>set
-    backspace=2</parameter> allows backspacing over line breaks,
-    autoindents, and the start of insert. The <parameter>syntax
-    on</parameter> enables vim's syntax highlighting. Finally, the
-    <emphasis>if</emphasis> statement with the <parameter>set
-    background=dark</parameter> corrects <command>vim</command>'s guess
-    about the background color of some terminal emulators. This gives the
-    highlighting a better color scheme for use on the black background of
-    these programs.</para>
-
-    <para>Documentation for other available options can be obtained by
-    running the following command:</para>
-
-<screen role="nodump"><userinput>vim -c ':options'</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-vim" role="content">
-    <title>Contents of Vim</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed directory</segtitle>
-
-      <seglistitem>
-        <seg>efm_filter.pl, efm_perl.pl, ex (link to vim), less.sh, mve.awk,
-        pltags.pl, ref, rview (link to vim), rvim (link to vim), shtags.pl,
-        tcltags, vi (link to vim), view (link to vim), vim, vim132, vim2html.pl,
-        vimdiff (link to vim), vimm, vimspell.sh, vimtutor, xxd</seg>
-        <seg>/usr/share/vim</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="efm_filter.pl">
-        <term><command>efm_filter.pl</command></term>
-        <listitem>
-          <para>A filter for creating an error file that can be read
-          by <command>vim</command></para>
-          <indexterm zone="ch-system-vim efm_filter.pl">
-            <primary sortas="b-efm_filter.pl">efm_filter.pl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="efm_perl.pl">
-        <term><command>efm_perl.pl</command></term>
-        <listitem>
-          <para>Reformats the error messages of the Perl interpreter for use
-          with the <quote>quickfix</quote> mode of <command>vim</command></para>
-          <indexterm zone="ch-system-vim efm_perl.pl">
-            <primary sortas="b-efm_perl.pl">efm_perl.pl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ex">
-        <term><command>ex</command></term>
-        <listitem>
-          <para>Starts <command>vim</command> in ex mode</para>
-          <indexterm zone="ch-system-vim ex">
-            <primary sortas="b-ex">ex</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="less.sh">
-        <term><command>less.sh</command></term>
-        <listitem>
-          <para>A script that starts <command>vim</command> with less.vim</para>
-          <indexterm zone="ch-system-vim less.sh">
-            <primary sortas="b-less.sh">less.sh</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mve.awk">
-        <term><command>mve.awk</command></term>
-        <listitem>
-          <para>Processes <command>vim</command> errors</para>
-          <indexterm zone="ch-system-vim mve.awk">
-            <primary sortas="b-mve.awk">mve.awk</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pltags.pl">
-        <term><command>pltags.pl</command></term>
-        <listitem>
-          <para>Creates a tags file for Perl code for use by
-          <command>vim</command></para>
-          <indexterm zone="ch-system-vim pltags.pl">
-            <primary sortas="b-pltags.pl">pltags.pl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ref">
-        <term><command>ref</command></term>
-        <listitem>
-          <para>Checks the spelling of arguments</para>
-          <indexterm zone="ch-system-vim ref">
-            <primary sortas="b-ref">ref</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rview">
-        <term><command>rview</command></term>
-        <listitem>
-          <para>Is a restricted version of <command>view</command>; no shell
-          commands can be started and <command>view</command> cannot be
-          suspended</para>
-          <indexterm zone="ch-system-vim rview">
-            <primary sortas="b-rview">rview</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rvim">
-        <term><command>rvim</command></term>
-        <listitem>
-          <para>Is a restricted version of <command>vim</command>; no shell
-          commands can be started and <command>vim</command> cannot be
-          suspended</para>
-          <indexterm zone="ch-system-vim rvim">
-            <primary sortas="b-rvim">rvim</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="shtags.pl">
-        <term><command>shtags.pl</command></term>
-        <listitem>
-          <para>Generates a tags file for Perl scripts</para>
-          <indexterm zone="ch-system-vim shtags.pl">
-            <primary sortas="b-shtags.pl">shtags.pl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tcltags">
-        <term><command>tcltags</command></term>
-        <listitem>
-          <para>Generates a tags file for TCL code</para>
-          <indexterm zone="ch-system-vim tcltags">
-            <primary sortas="b-tcltags">tcltags</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="view">
-        <term><command>view</command></term>
-        <listitem>
-          <para>Starts <command>vim</command> in read-only mode</para>
-          <indexterm zone="ch-system-vim view">
-            <primary sortas="b-view">view</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vi">
-        <term><command>vi</command></term>
-        <listitem>
-          <para>Link to <command>vim</command></para>
-          <indexterm zone="ch-system-vim vi">
-            <primary sortas="b-vi">vi</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vim">
-        <term><command>vim</command></term>
-        <listitem>
-          <para>Is the editor</para>
-          <indexterm zone="ch-system-vim vim">
-            <primary sortas="b-vim">vim</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vim132">
-        <term><command>vim132</command></term>
-        <listitem>
-          <para>Starts <command>vim</command> with the terminal in 132-column
-          mode</para>
-          <indexterm zone="ch-system-vim vim132">
-            <primary sortas="b-vim132">vim132</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vim2html.pl">
-        <term><command>vim2html.pl</command></term>
-        <listitem>
-          <para>Converts Vim documentation to HypterText Markup Language
-          (HTML)</para>
-          <indexterm zone="ch-system-vim vim2html.pl">
-            <primary sortas="b-vim2html.pl">vim2html.pl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vimdiff">
-        <term><command>vimdiff</command></term>
-        <listitem>
-          <para>Edits two or three versions of a file with <command>vim</command>
-          and show differences</para>
-          <indexterm zone="ch-system-vim vimdiff">
-            <primary sortas="b-vimdiff">vimdiff</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vimm">
-        <term><command>vimm</command></term>
-        <listitem>
-          <para>Enables the DEC locator input model on a remote terminal</para>
-          <indexterm zone="ch-system-vim vimm">
-            <primary sortas="b-vimm">vimm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vimspell.sh">
-        <term><command>vimspell.sh</command></term>
-        <listitem>
-          <para>Spell checks a file and generates the syntax statements
-          necessary to highlight in <command>vim</command>. This script
-          requires the old Unix <command>spell</command> command, which
-          is provided neither in CLFS nor in CBLFS</para>
-          <indexterm zone="ch-system-vim vimspell.sh">
-            <primary sortas="b-vimspell.sh">vimspell.sh</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vimtutor">
-        <term><command>vimtutor</command></term>
-        <listitem>
-          <para>Teaches the basic keys and commands of
-          <command>vim</command></para>
-          <indexterm zone="ch-system-vim vimtutor">
-            <primary sortas="b-vimtutor">vimtutor</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xxd">
-        <term><command>xxd</command></term>
-        <listitem>
-          <para>Creates a hex dump of the given file; it can
-          also do the reverse, so it can be used for binary patching</para>
-          <indexterm zone="ch-system-vim xxd">
-            <primary sortas="b-xxd">xxd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/xml-parser.xml
===================================================================
--- BOOK/final-system/common/xml-parser.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,60 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-xml-parser" role="wrap">
-  <?dbhtml filename="xml-parser.html"?>
-
-  <title>XML::Parser-&xml-parser-version;</title>
-
-  <indexterm zone="ch-system-xml-parser">
-    <primary sortas="a-XML-Parser">XML::Parser</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>XML::Parser is a perl module for parsing XML documents.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of XML::Parser</title>
-
-    <para os="a">Prepare XML::Parser for compilation:</para>
-
-<screen os="b"><userinput>perl Makefile.PL</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">To test the results, issue:</para>
-
-<screen os="f"><userinput remap="test">make test</userinput></screen>
-
-    <para os="g">Install the package:</para>
-
-<screen os="h"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-xml-parser" role="content">
-    <title>Contents of XML::Parser</title>
-
-    <segmentedlist>
-      <segtitle>Installed program</segtitle>
-      <segtitle>Installed libraries</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/xz.xml
===================================================================
--- BOOK/final-system/common/xz.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,331 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-xz" role="wrap">
-  <?dbhtml filename="xz.html"?>
-
-  <title>XZ Utils-&xz-version;</title>
-
-  <indexterm zone="ch-system-xz">
-    <primary sortas="a-XZ Utils">XZ Utils</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The XZ Utils package contains programs for compressing and
-    decompressing files. Compressing text files with <command>XZ Utils</command>
-    yields a much better compression percentage than with the traditional
-    <command>gzip</command>.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of XZ Utils</title>
-
-    <para os="a">Prepare XZ Utils for compilation:</para>
-
-<screen os="b"><userinput>./configure \
-    --prefix=/usr \
-    --docdir=/usr/share/doc/xz-&xz-version;</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">To test the results, issue:</para>
-
-<screen os="e2"><userinput remap="test">make check</userinput></screen>
-
-    <para os="f">Install the programs:</para>
-
-<screen os="g"><userinput>make install</userinput></screen>
-
-    <para os="h">Move the <filename>xz</filename> binary, and several symlinks
-    that point to it, into the /bin directory:</para>
-
-<screen os="i"><userinput>mv -v /usr/bin/{xz,lzma,lzcat,unlzma,unxz,xzcat} /bin</userinput></screen>
-
-    <para os="j">Finally, move the shared library to a more appropriate
-    location, and recreate the symlink pointing to it:</para>
-
-<screen os="k"><userinput>mv -v /usr/lib/liblzma.so.* /lib
-ln -sfv ../../lib/$(readlink /usr/lib/liblzma.so) /usr/lib/liblzma.so</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-xz" role="content">
-    <title>Contents of XZ Utils</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed libraries</segtitle>
-      <segtitle>Installed directories</segtitle>
-
-      <seglistitem>
-        <seg>lzcat (link to xz), lzcmp (link to xzdiff), lzdiff (link to
-        xzdiff), lzegrep (link to xzgrep), lzfgrep (link to xzgrep), lzgrep
-        (link to xzgrep), lzless (link to xzless), lzma (link to xz), lzmadec,
-        lzmainfo, lzmore (link to xzmore), unlzma (link to xz), unxz (link to
-        xz), xz, xzcat (link to xz), xzcmp (link to xzdiff), xzdec, xzdiff,
-        xzegrep (link to xzgrep), xzfgrep (link to xzgrep), xzgrep, xzless,
-        xzmore</seg>
-        <seg>liblzma.[a,so]</seg>
-        <seg>/usr/include/lzma, /usr/share/doc/xz-&xz-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lzcat">
-        <term><command>lzcat</command></term>
-        <listitem>
-          <para>Decompresses LZMA and xz files</para>
-          <indexterm zone="ch-system-xz lzcat">
-            <primary sortas="b-lzcat">lzcat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lzcmp">
-        <term><command>lzcmp</command></term>
-        <listitem>
-          <para>Compares lzma compressed files</para>
-          <indexterm zone="ch-system-xz lzcmp">
-            <primary sortas="b-lzcmp">lzcmp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lzdiff">
-        <term><command>lzdiff</command></term>
-        <listitem>
-          <para>Compares lzma compressed files</para>
-          <indexterm zone="ch-system-xz lzdiff">
-            <primary sortas="b-lzdiff">lzdiff</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lzegrep">
-        <term><command>lzegrep</command></term>
-        <listitem>
-          <para>Runs <command>egrep</command> on lzma compressed files</para>
-          <indexterm zone="ch-system-xz lzegrep">
-            <primary sortas="b-lzegrep">lzegrep</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lzfgrep">
-        <term><command>lzfgrep</command></term>
-        <listitem>
-          <para>Runs <command>fgrep</command> on lzma compressed files</para>
-          <indexterm zone="ch-system-xz lzfgrep">
-            <primary sortas="b-lzfgrep">lzfgrep</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lzgrep">
-        <term><command>lzgrep</command></term>
-        <listitem>
-          <para>Runs <command>grep</command> on lzma compressed files</para>
-          <indexterm zone="ch-system-xz lzgrep">
-            <primary sortas="b-lzgrep">lzgrep</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lzless">
-        <term><command>lzless</command></term>
-        <listitem>
-          <para>Runs <command>less</command> on lzma files</para>
-          <indexterm zone="ch-system-xz lzless">
-            <primary sortas="b-lzless">lzless</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lzma">
-        <term><command>lzma</command></term>
-        <listitem>
-          <para>Compresses lzma files</para>
-          <indexterm zone="ch-system-xz lzma">
-            <primary sortas="b-lzma">lzma</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lzmadec">
-        <term><command>lzmadec</command></term>
-        <listitem>
-          <para>Decompresses lzma files</para>
-          <indexterm zone="ch-system-xz lzmadec">
-            <primary sortas="b-lzmadec">lzmadec</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lzmainfo">
-        <term><command>lzmainfo</command></term>
-        <listitem>
-          <para>Displays information stored in an .lzma file header</para>
-          <indexterm zone="ch-system-xz lzmainfo">
-            <primary sortas="b-lzmainfo">lzmainfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lzmore">
-        <term><command>lzmore</command></term>
-        <listitem>
-          <para>Runs <command>more</command> on lzma files</para>
-          <indexterm zone="ch-system-xz lzmore">
-            <primary sortas="b-lzmore">lzmore</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="unlzma">
-        <term><command>unlzma</command></term>
-        <listitem>
-          <para>Uncompresses lzma files</para>
-          <indexterm zone="ch-system-xz unlzma">
-            <primary sortas="b-unlzma">unlzma</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="unxz">
-        <term><command>unxz</command></term>
-        <listitem>
-          <para>Uncompresses xz files</para>
-          <indexterm zone="ch-system-xz unxz">
-            <primary sortas="b-unxz">unxz</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xz">
-        <term><command>xz</command></term>
-        <listitem>
-          <para>Creates xz compressed files</para>
-          <indexterm zone="ch-system-xz xz">
-            <primary sortas="b-xz">xz</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xzcat">
-        <term><command>xzcat</command></term>
-        <listitem>
-          <para>Decompresses xz files</para>
-          <indexterm zone="ch-system-xz xzcat">
-            <primary sortas="b-xzcat">xzcat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xzcmp">
-        <term><command>xzcmp</command></term>
-        <listitem>
-          <para>Compares xz compressed files</para>
-          <indexterm zone="ch-system-xz xzcmp">
-            <primary sortas="b-xzcmp">xzcmp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xzdec">
-        <term><command>xzdec</command></term>
-        <listitem>
-          <para>Decompresses to standard output</para>
-          <indexterm zone="ch-system-xz xzdec">
-            <primary sortas="b-xzdec">xzdec</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xzdiff">
-        <term><command>xzdiff</command></term>
-        <listitem>
-          <para>Compares xz compressed files</para>
-          <indexterm zone="ch-system-xz xzdiff">
-            <primary sortas="b-xzdiff">xzdiff</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xzegrep">
-        <term><command>xzegrep</command></term>
-        <listitem>
-          <para>Runs <command>egrep</command> on xz compressed files</para>
-          <indexterm zone="ch-system-xz xzegrep">
-            <primary sortas="b-xzegrep">xzegrep</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xzfgrep">
-        <term><command>xzfgrep</command></term>
-        <listitem>
-          <para>Runs <command>fgrep</command> on xz compressed files</para>
-          <indexterm zone="ch-system-xz xzfgrep">
-            <primary sortas="b-xzfgrep">xzfgrep</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xzgrep">
-        <term><command>xzgrep</command></term>
-        <listitem>
-          <para>Runs <command>grep</command> on xz compressed files</para>
-          <indexterm zone="ch-system-xz xzgrep">
-            <primary sortas="b-xzgrep">xzgrep</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xzless">
-        <term><command>xzless</command></term>
-        <listitem>
-          <para>Runs <command>less</command> on xz files</para>
-          <indexterm zone="ch-system-xz xzless">
-            <primary sortas="b-xzless">xzless</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xzmore">
-        <term><command>xzmore</command></term>
-        <listitem>
-          <para>Runs <command>more</command> on xz files</para>
-          <indexterm zone="ch-system-xz xzmore">
-            <primary sortas="b-xzmore">xzmore</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="liblzma">
-        <term><filename class="libraryfile">liblzma</filename></term>
-        <listitem>
-          <para>The LZMA library</para>
-          <indexterm zone="ch-system-xz liblzma">
-            <primary sortas="c-liblzma">liblzma</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/zlib.xml
===================================================================
--- BOOK/final-system/common/zlib.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,97 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-zlib" role="wrap">
-  <?dbhtml filename="zlib.html"?>
-
-  <title>Zlib-&zlib-version;</title>
-
-  <indexterm zone="ch-system-zlib">
-    <primary sortas="a-Zlib">Zlib</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Zlib package contains compression and decompression routines
-    used by some programs.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Zlib</title>
-
-    <para os="a">Prepare Zlib for compilation:</para>
-
-<screen os="b"><userinput>CC="gcc -isystem /usr/include" \
-CXX="g++ -isystem /usr/include" \
-LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
-./configure \
-    --prefix=/usr</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">To test the results, issue:</para>
-
-<screen os="e2"><userinput remap="test">make check</userinput></screen>
-
-    <para os="f">Install the package:</para>
-
-<screen os="g"><userinput>make install</userinput></screen>
-
-    <para os="h">The previous command installed two <filename
-    class="extension">.so</filename> files into <filename
-    class="directory">/usr/lib</filename>. We will move them into
-    <filename class="directory">/lib</filename> and then recreate a link
-    in <filename class="directory">/usr/lib</filename>:</para>
-
-<screen os="i"><userinput>mv -v /usr/lib/libz.so.* /lib
-ln -sfv ../../lib/$(readlink /usr/lib/libz.so) /usr/lib/libz.so</userinput></screen>
-
-    <para os="j">Install the documentation:</para>
-
-<screen os="k"><userinput>mkdir -pv /usr/share/doc/zlib-&zlib-version;
-cp -rv doc/* examples /usr/share/doc/zlib-&zlib-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-zlib" role="content">
-    <title>Contents of Zlib</title>
-
-    <segmentedlist>
-      <segtitle>Installed libraries</segtitle>
-      <segtitle>Installed directory</segtitle>
-
-      <seglistitem>
-        <seg>libz.[a,so]</seg>
-        <seg>/usr/share/doc/zlib-&zlib-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libz">
-        <term><filename class="libraryfile">libz</filename></term>
-        <listitem>
-          <para>Contains compression and decompression
-          functions used by some programs</para>
-          <indexterm zone="ch-system-zlib libz">
-            <primary sortas="c-libz">libz</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/mips-chapter.xml
===================================================================
--- BOOK/final-system/mips-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,89 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-building-system" xreflabel="Installing Basic System Software">
-  <?dbhtml dir="final-system"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Installing Basic System Software</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkgmgt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/testsuitesagain.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/temp-perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/linux-headers.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man-pages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/glibc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/adjusting.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/isl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/zlib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/flex.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bison.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/attr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/acl.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux-pass1.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/procps-ng.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iana-etc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libtool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iproute2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gdbm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/readline.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/autoconf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/automake.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gperf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/groff.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/less.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iputils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kbd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libpipeline.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man-db.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/expat.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xml-parser.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dbus.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/colo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/dvhtool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/arcload.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/aboutdebug.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/stripping.xml"/>
-
-</chapter>
Index: OK/final-system/mips/arcload.xml
===================================================================
--- BOOK/final-system/mips/arcload.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,86 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-arcload" role="wrap">
-  <?dbhtml filename="arcload.html"?>
-
-  <title>Arcload-&arcload-version;</title>
-
-  <indexterm zone="ch-system-arcload">
-    <primary sortas="a-Arcload">Arcload</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Arcload package contains a SGI Bootloader.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Arcload</title>
-
- <note os="a">
-    <para>This program is the Arcload bootloader, which is for
-    SGI Workstations and SGI Servers based on MIPS Processors.</para>
-  </note>
-
-    <para os="d">Compile the package:</para>
-
-<screen os="e"><userinput>make MODE=M32 clean
-make CC="gcc" LD="ld" MODE=M32</userinput></screen>
-
-    <para os="f">Install the package:</para>
-
-<screen os="g"><userinput>install -dv /usr/lib/arcload
-cp -v arcload.ecoff /usr/lib/arcload/sash</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-arcload" role="content">
-    <title>Contents of Arcload</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>sashARCS or sash64</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="sashARCS">
-        <term><command>sashARCS</command></term>
-        <listitem>
-          <para>Is a bootloader for IP22/IP32 MIPS systems, which are
-          32 Bit.</para>
-          <indexterm zone="ch-system-arcload sashARCS">
-            <primary sortas="b-sashARCS">sashARCS</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sash64">
-        <term><command>sash64</command></term>
-        <listitem>
-          <para>Is a bootloader for IP27/IP28/IP30 MIPS systems, which are
-          64 Bit.</para>
-          <indexterm zone="ch-system-arcload sash64">
-            <primary sortas="b-sash64">sash64</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/mips/colo.xml
===================================================================
--- BOOK/final-system/mips/colo.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,142 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-colo" role="wrap">
-  <?dbhtml filename="colo.html"?>
-
-  <title>Colo-&colo-version;</title>
-
-  <indexterm zone="ch-system-colo">
-    <primary sortas="a-Colo">Colo</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Colo package contains the Cobalt Boot Loader.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Colo</title>
-
-  <note os="a">
-    <para>This bootloader is for the MIPS based cobalt servers RaQ,
-    RaQ2, Qube, or the Qube2.</para>
-  </note>
-
-    <para os="p3">This patch fixes a relocation error when linking with
-    Binutils:</para>
-
-<screen os="p4"><userinput>patch -Np1 -i ../&colo-relocation-patch;</userinput></screen>
-
-    <para os="s1">Disable -Werror in one of the <filename>Makefile</filename>s
-    to prevent a compile failure:</para>
-
-<screen os="s2"><userinput>sed -i '/^CFLAGS/s/-Werror //' stage2/Makefile</userinput></screen>
-
-    <para os="b">Compile the Colo package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-    <para os="c">Install the package:</para>
-
-<screen os="d"><userinput>install -dv  /usr/lib/colo/examples
-install -v chain/colo-chain.elf /usr/lib/colo
-install -v tools/lcdtools/e2fsck-lcd/e2fsck-lcd /sbin
-install -v tools/lcdtools/e2fsck-lcd/e2fsck-lcd.8 /usr/man/man8
-install -v tools/lcdtools/paneld/paneld /sbin
-install -v tools/lcdtools/paneld/paneld.8 /usr/man/man8
-install -v tools/lcdtools/putlcd/putlcd /sbin
-install -v tools/lcdtools/putlcd/putlcd.8 /usr/man/man8
-install -v examples/menu.colo /usr/lib/colo/examples
-install -v examples/simple.colo /usr/lib/colo/examples
-cp -v chain/colo-chain.elf /boot/vmlinux
-gzip -9 /boot/vmlinux</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-colo" role="content">
-    <title>Contents of Colo</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>colo-chain.elf, e2fsck-lcd, paneld and putlcd</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="colo-chain.elf">
-        <term><command>colo</command></term>
-        <listitem>
-          <para>Is the Cobalt Bootloader's chain mode executeable. This
-          file gets gzipped and renamed to <filename>vmlinux.gz</filename>,
-          so it can be booted automatically by the Cobalt's existing
-          firmware</para>
-          <indexterm zone="ch-system-colo colo-chain.elf">
-            <primary sortas="b-colo-chain.elf">colo-chain.elf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="e2fsck-lcd">
-        <term><command>e2fsck-lcd</command></term>
-        <listitem>
-          <para>Will output file system check progress information on the
-          Cobalt LCD</para>
-          <indexterm zone="ch-system-colo e2fsck-lcd">
-            <primary sortas="b-e2fsck-lcd">e2fsck-lcd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="paneld">
-        <term><command>paneld</command></term>
-        <listitem>
-          <para>Is an admin tool for the LCD panel of Cobalt machines. By
-          default, it will display the current time and optionally a message.
-          When you hold the enter or select button for a couple of seconds
-          you will get an admin menu. The menu will allow you to either halt
-          or reboot your Cobalt machine</para>
-          <indexterm zone="ch-system-colo paneld">
-            <primary sortas="b-paneld">paneld</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="putlcd">
-        <term><command>putlcd</command></term>
-        <listitem>
-          <para>Is a tool to display text on the LCD display of Cobalt
-          machines</para>
-          <indexterm zone="ch-system-colo putlcd">
-            <primary sortas="b-putlcd">putlcd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="md5rom">
-        <term><command>md5rom</command></term>
-        <listitem>
-          <para>Will output the MD5 checksum of a Cobalt's ROM</para>
-          <indexterm zone="ch-system-colo md5rom">
-            <primary sortas="b-md5rom">md5rom</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/mips/dvhtool.xml
===================================================================
--- BOOK/final-system/mips/dvhtool.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,85 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-dvhtool" role="wrap">
-  <?dbhtml filename="dvhtool.html"?>
-
-  <title>Dvhtool-&dvhtool-version;</title>
-
-  <indexterm zone="ch-system-dvhtool">
-    <primary sortas="a-Dvhtool">Dvhtool</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Dvhtool package is used to manipulate volume headers
-    of devices using sgi disk labels.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Dvhtool</title>
-
- <note os="a">
-    <para>This program is required for the Arcload bootloader, which is for
-    SGI Workstations and SGI Servers based on MIPS Processors.</para>
-  </note>
-
-    <para os="b">This patch fixes build issues with Dvhtool and adds support
-    for LVM and Linux partitions:</para>
-
-<screen os="c"><userinput>patch -Np1 -i ../&dvhtool-fixes-patch;</userinput></screen>
-
-    <para os="d">Prepare Dvhtool  for compilation:</para>
-
-<screen os="e"><userinput>./configure \
-    --prefix=/usr</userinput></screen>
-
-    <para os="f">Compile the package:</para>
-
-<screen os="g"><userinput>make</userinput></screen>
-
-    <para os="h">Install the package:</para>
-
-<screen os="i"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-dvhtool" role="content">
-    <title>Contents of Dvhtool</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>dvhtool</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="dvhtool">
-        <term><command>dvhtool</command></term>
-        <listitem>
-          <para>A utility for displaying SGI disk partition and volume header
-          information as well as for copying files to and from the volume
-          header</para>
-          <indexterm zone="ch-system-dvhtool dvhtool">
-            <primary sortas="b-dvhtool">dvhtool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/mips64-64-chapter.xml
===================================================================
--- BOOK/final-system/mips64-64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,88 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-building-system" xreflabel="Installing Basic System Software">
-  <?dbhtml dir="final-system"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Installing Basic System Software</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkgmgt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/testsuitesagain.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/temp-perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/linux-headers.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man-pages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64-64/glibc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64-64/adjusting.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/isl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/zlib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/flex.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bison.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/attr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/acl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux-pass1.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/procps-ng.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iana-etc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libtool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iproute2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gdbm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/readline.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/autoconf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/automake.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gperf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/groff.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/less.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iputils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kbd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libpipeline.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man-db.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/expat.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xml-parser.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dbus.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/colo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/dvhtool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64-64/arcload.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/aboutdebug.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/stripping.xml"/>
-
-</chapter>
Index: OK/final-system/mips64-64/adjusting.xml
===================================================================
--- BOOK/final-system/mips64-64/adjusting.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,66 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-adjusting">
-  <?dbhtml filename="adjusting.html"?>
-
-  <title>Adjusting the Toolchain</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../ppc/adjusting.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="c"><userinput>gcc -dumpspecs | \
-perl -p -e 's@/tools/lib/ld@/lib/ld@g;' \
-     -e 's@/tools/lib32/ld@/lib32/ld@g;' \
-     -e 's@/tools/lib64/ld@/lib64/ld@g;' \
-     -e 's@\*startfile_prefix_spec:\n@$_/usr/lib/ @g;' &gt; \
-     $(dirname $(gcc --print-libgcc-file-name))/specs</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../ppc/adjusting.xml"
-  xpointer="xpointer(//*[@os='d'])"/>
-
-  <caution>
-
-    <para>It is imperative at this point to stop and ensure that
-    the basic functions (compiling and linking) of the adjusted toolchain
-    are working as expected. Since we are doing a 64 bit only build, we
-    will only test the 64 bit ABI. To do this, perform a sanity
-    check:</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/adjusting.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/adjusting.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/adjusting.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/adjusting.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/adjusting.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/adjusting.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/adjusting.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-  </caution>
-
-</sect1>
Index: OK/final-system/mips64-64/arcload.xml
===================================================================
--- BOOK/final-system/mips64-64/arcload.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,50 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-arcload" role="wrap">
-  <?dbhtml filename="arcload.html"?>
-
-  <title>Arcload-&arcload-version;</title>
-
-  <indexterm zone="ch-system-arcload">
-    <primary sortas="a-Arcload">Arcload</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../mips/arcload.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Arcload</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../mips/arcload.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../mips/arcload.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-<screen><userinput>make MODE=M64 clean
-make CC="gcc" LD="ld" MODE=M64</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../mips/arcload.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-<screen><userinput>install -dv /usr/lib/arcload
-cp -v arcload /usr/lib/arcload/sash64</userinput></screen>
-
-  </sect2>
-
-<!--
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../mips/arcload.xml"
-  xpointer="xpointer(id('contents-arcload'))"/>
--->
-
-</sect1>
Index: OK/final-system/mips64-64/glibc.xml
===================================================================
--- BOOK/final-system/mips64-64/glibc.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,160 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-glibc" role="wrap">
-  <?dbhtml filename="glibc.html"?>
-
-  <title>Glibc-&glibc-version;</title>
-
-  <indexterm zone="ch-system-glibc">
-    <primary sortas="a-Glibc">Glibc</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Glibc</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='z'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='l1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='l2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64-64/glibc.xml"
-    xpointer="xpointer(//*[@os='l3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64-64/glibc.xml"
-    xpointer="xpointer(//*[@os='l4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64-64/glibc.xml"
-    xpointer="xpointer(//*[@os='l5'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64-64/glibc.xml"
-    xpointer="xpointer(//*[@os='l6'])"/>
-
-    <para>Now we will force Glibc to build as 64-bit instead of the default
-    n32 with the following sed:</para>
-
-<screen><userinput>sed -i '/default) machine=/s/n32/64/g' \
-    ports/sysdeps/mips/preconfigure</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64-64/glibc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64-64/glibc.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='u'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='v'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('i18n-glibc'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('conf-glibc'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../ppc/glibc.xml"
-  xpointer="xpointer(id('conf-ld'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('contents-glibc'))"/>
-
-</sect1>
Index: OK/final-system/mips64-chapter.xml
===================================================================
--- BOOK/final-system/mips64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,147 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-building-system" xreflabel="Installing Basic System Software">
-  <?dbhtml dir="final-system"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Installing Basic System Software</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkgmgt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/testsuitesagain.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/temp-perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/linux-headers.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man-pages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/glibc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/glibc-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/glibc-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/adjusting.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/m4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gmp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gmp-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/gmp-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/mpfr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/mpfr-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/mpfr-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/mpc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/mpc-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/mpc-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/isl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/isl-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/isl-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/zlib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/zlib-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/zlib-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flex.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flex-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flex-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/attr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/attr-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/attr-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/acl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/acl-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/acl-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/pkg-config-lite.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/ncurses-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/ncurses-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/shadow.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux-64bit-pass1.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/procps-ng.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/procps-ng-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/procps-ng-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/multiarch_wrapper.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iana-etc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libtool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libtool-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libtool-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/iproute2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gdbm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gdbm-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gdbm-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/perl-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/perl-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/readline.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/readline-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/readline-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/autoconf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/automake.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/file-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/file-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gettext-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gettext-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gperf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/groff.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/less.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/iputils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kbd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libpipeline.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libpipeline-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libpipeline-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/man-db.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/make.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/expat.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/expat-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/expat-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xml-parser.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xml-parser-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xml-parser-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/psmisc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/systemd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/systemd-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/systemd-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dbus.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dbus-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dbus-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/tar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/vim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/colo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/dvhtool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/arcload.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/aboutdebug.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/stripping.xml"/>
-
-</chapter>
Index: OK/final-system/mips64/aboutdebug.xml
===================================================================
--- BOOK/final-system/mips64/aboutdebug.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-aboutdebug">
-  <?dbhtml filename="aboutdebug.html"?>
-
-  <title>About Debugging Symbols</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/aboutdebug.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/aboutdebug.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
-  <itemizedlist os="c">
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/aboutdebug.xml"
-    xpointer="xpointer(//*[@os='c1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/aboutdebug.xml"
-    xpointer="xpointer(//*[@os='c2'])"/>
-
-    <listitem os="c3">
-      <para>Glibc and GCC files (<filename class="directory">/lib</filename>,
-      <filename class="directory">/lib32,</filename>,
-      <filename class="directory">/lib64,</filename>,
-      <filename class="directory">/usr/lib</filename>,
-      <filename class="directory">/usr/lib32</filename>,
-      and <filename class="directory">/usr/lib64</filename>) with debugging
-      symbols: 87 MB</para>
-    </listitem>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/aboutdebug.xml"
-    xpointer="xpointer(//*[@os='c4'])"/>
-
-  </itemizedlist>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/aboutdebug.xml"
-  xpointer="xpointer(//*[@os='d'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/aboutdebug.xml"
-  xpointer="xpointer(//*[@os='e'])"/>
-
-</sect1>
Index: OK/final-system/mips64/adjusting.xml
===================================================================
--- BOOK/final-system/mips64/adjusting.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,95 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-adjusting">
-  <?dbhtml filename="adjusting.html"?>
-
-  <title>Adjusting the Toolchain</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../ppc/adjusting.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="c"><userinput>gcc -dumpspecs | \
-perl -p -e 's@/tools/lib/ld@/lib/ld@g;' \
-     -e 's@/tools/lib32/ld@/lib32/ld@g;' \
-     -e 's@/tools/lib64/ld@/lib64/ld@g;' \
-     -e 's@\*startfile_prefix_spec:\n@$_/usr/lib/ @g;' &gt; \
-     $(dirname $(gcc --print-libgcc-file-name))/specs</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../ppc/adjusting.xml"
-  xpointer="xpointer(//*[@os='d'])"/>
-
-  <caution>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/adjusting.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/adjusting.xml"
-    xpointer="xpointer(//*[@os='m2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/adjusting.xml"
-    xpointer="xpointer(//*[@os='m3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/adjusting.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/adjusting.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <para>For N32 ABI:</para>
-
-<screen><userinput>echo 'int main(){}' &gt; dummy.c
-gcc ${BUILDN32} dummy.c
-readelf -l a.out | grep ': /lib'</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/adjusting.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-<screen><computeroutput>[Requesting program interpreter: /lib32/ld.so.1]</computeroutput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/adjusting.xml"
-    xpointer="xpointer(//*[@os='m4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/adjusting.xml"
-    xpointer="xpointer(//*[@os='m5'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/adjusting.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-<screen><computeroutput>[Requesting program interpreter: /lib64/ld.so.1]</computeroutput></screen>
-
-    <para>Note that <filename class="directory">/lib</filename>,
-    <filename class="directory">/lib32</filename> or
-    <filename class="directory">/lib64</filename> is now the prefix
-    of our dynamic linker.</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/adjusting.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/adjusting.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/adjusting.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-  </caution>
-
-</sect1>
Index: OK/final-system/mips64/arcload.xml
===================================================================
--- BOOK/final-system/mips64/arcload.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,50 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-arcload" role="wrap">
-  <?dbhtml filename="arcload.html"?>
-
-  <title>Arcload-&arcload-version;</title>
-
-  <indexterm zone="ch-system-arcload">
-    <primary sortas="a-Arcload">Arcload</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../mips/arcload.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Arcload</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../mips/arcload.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../mips/arcload.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-<screen><userinput>make MODE=M64 clean
-make CC="gcc" LD="ld" MODE=M64</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../mips/arcload.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-<screen><userinput>install -dv /usr/lib64/arcload
-cp -v arcload /usr/lib64/arcload/sash64</userinput></screen>
-
-  </sect2>
-
-<!--
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../mips/arcload.xml"
-  xpointer="xpointer(id('contents-arcload'))"/>
--->
-
-</sect1>
Index: OK/final-system/mips64/binutils.xml
===================================================================
--- BOOK/final-system/mips64/binutils.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,119 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-binutils" role="wrap">
-  <?dbhtml filename="binutils.html"?>
-
-  <title>Binutils-&binutils-version;</title>
-
-  <indexterm zone="ch-system-binutils">
-    <primary sortas="a-Binutils">Binutils</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/binutils.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Binutils</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-<!-- Branch update patch area
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/binutils.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/binutils.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-<screen os="ca"><userinput>CC="gcc -isystem /usr/include ${BUILD64}" \
-LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64:/usr/lib32:/lib32:/usr/lib:/lib ${BUILD64}" \
-../binutils-&binutils-dir;/configure \
-    --prefix=/usr \
-    --enable-shared \
-    --enable-64-bit-bfd \
-    --libdir=/usr/lib64 \
-    --enable-gold=yes \
-    --enable-plugins \
-    --with-system-zlib \
-    --enable-threads</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-<!--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='l'])"/> -->
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/binutils.xml"
-  xpointer="xpointer(id('contents-binutils'))"/>
-
-</sect1>
Index: OK/final-system/mips64/colo.xml
===================================================================
--- BOOK/final-system/mips64/colo.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,70 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-colo" role="wrap">
-  <?dbhtml filename="colo.html"?>
-
-  <title>Colo-&colo-version;</title>
-
-  <indexterm zone="ch-system-colo">
-    <primary sortas="a-Colo">Colo</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../mips/colo.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Colo</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../mips/colo.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <para os="p1">This patch updates the Colo bootloader to build under
-    64 bit:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&colo-make-patch;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../mips/colo.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../mips/colo.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../mips/colo.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../mips/colo.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../mips/colo.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-<screen><userinput>make binary
-make CC="gcc ${BUILD64}" tooldirs</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../mips/colo.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../mips/colo.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../mips/colo.xml"
-  xpointer="xpointer(id('contents-colo'))"/>
-
-</sect1>
Index: OK/final-system/mips64/dvhtool.xml
===================================================================
--- BOOK/final-system/mips64/dvhtool.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,68 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-dvhtool" role="wrap">
-  <?dbhtml filename="dvhtool.html"?>
-
-  <title>Dvhtool-&dvhtool-version;</title>
-
-  <indexterm zone="ch-system-dvhtool">
-    <primary sortas="a-Dvhtool">Dvhtool</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../mips/dvhtool.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Dvhtool</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../mips/dvhtool.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../mips/dvhtool.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../mips/dvhtool.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../mips/dvhtool.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-<screen os="e"><userinput>CC="gcc ${BUILD64}" \
-./configure \
-    --prefix=/usr</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../mips/dvhtool.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../mips/dvhtool.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../mips/dvhtool.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../mips/dvhtool.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-  </sect2>
-
-<!--
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../mips/dvhtool.xml"
-  xpointer="xpointer(id('contents-dvhtool'))"/>
--->
-
-</sect1>
Index: OK/final-system/mips64/gcc.xml
===================================================================
--- BOOK/final-system/mips64/gcc.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,145 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-gcc" role="wrap">
-  <?dbhtml filename="gcc.html"?>
-
-  <title>GCC-&gcc-version;</title>
-
-  <indexterm zone="ch-system-gcc">
-    <primary sortas="a-GCC">GCC</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GCC</title>
-
-<!--GCC Branch Update Area
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='fix1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='fix2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-<screen os="i"><userinput>SED=sed CC="gcc -isystem /usr/include ${BUILD64}" \
-CXX="g++ -isystem /usr/include ${BUILD64}" \
-LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64:/usr/lib32:/lib32:/usr/lib:/lib" \
-../gcc-&gcc-version;/configure \
-    --prefix=/usr \
-    --libdir=/usr/lib64 \
-    --libexecdir=/usr/lib64 \
-    --with-abi=64 \
-    --enable-languages=c,c++ \
-    --with-system-zlib \
-    --enable-install-libiberty \
-    --disable-bootstrap</userinput></screen>
-
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='i1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/gcc.xml"
-    xpointer="xpointer(//*[@os='y'])"/>
-
-<screen os="z"><userinput>mv -v /usr/lib/libstdc++*gdb.py /usr/share/gdb/auto-load/usr/lib
-mv -v /usr/lib32/libstdc++*gdb.py /usr/share/gdb/auto-load/usr/lib32
-mv -v /usr/lib64/libstdc++*gdb.py /usr/share/gdb/auto-load/usr/lib64</userinput></screen>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/gcc.xml"
-  xpointer="xpointer(id('contents-gcc'))"/>
-
-</sect1>
Index: OK/final-system/mips64/glibc-64bit.xml
===================================================================
--- BOOK/final-system/mips64/glibc-64bit.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,176 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-glibc" role="wrap">
-  <?dbhtml filename="glibc-64bit.html"?>
-
-  <title>Glibc-&glibc-version; 64-Bit</title>
-
-  <indexterm zone="ch-system-glibc">
-    <primary sortas="a-Glibc">Glibc</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../multilib/glibc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Glibc</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='l1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='l2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='m1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='m2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='u'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='v'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('i18n-glibc'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('conf-glibc'))"/>
-
-  <sect2 id="conf-ld" role="configuration">
-    <title>Configuring Dynamic Loader</title>
-
-    <indexterm zone="conf-ld">
-      <primary sortas="e-/etc/ld.so.conf">/etc/ld.so.conf</primary>
-    </indexterm>
-
-    <para os="ld-a">By default, the dynamic loader (<filename
-    class="libraryfile">/lib/ld.so.1</filename> for 32bit executables <filename
-    class="libraryfile">/lib32/ld.so.1</filename> for n32 executables and
-    <filename class="libraryfile">/lib64/ld.so.1</filename> for 64bit
-    executables) searches through
-    <filename class="directory">/lib</filename> and <filename
-    class="directory">/usr/lib</filename> for dynamic libraries that are
-    needed by programs as they are run. However, if there are libraries in
-    directories other than <filename class="directory">/lib</filename> and
-    <filename class="directory">/usr/lib</filename>, these need to be
-    added to the <filename>/etc/ld.so.conf</filename> file in order
-    for the dynamic loader to find them. Some directories that are commonly
-    known to contain additional libraries are
-    <filename class="directory">/usr/local/lib</filename>,
-    <filename class="directory">/usr/local/lib32</filename>,
-    <filename class="directory">/usr/local/lib64</filename>,
-    <filename class="directory">/opt/lib</filename>,
-    <filename class="directory">/opt/lib32</filename>,
-    and <filename class="directory">/opt/lib64</filename>,
-    so add those directories to the dynamic loader's search path.</para>
-
-    <para os="ld-b">Create a new file <filename>/etc/ld.so.conf</filename> by running the
-    following:</para>
-
-<screen os="ld-c"><userinput>cat &gt; /etc/ld.so.conf &lt;&lt; "EOF"
-<literal># Begin /etc/ld.so.conf
-
-/usr/local/lib
-/usr/local/lib32
-/usr/local/lib64
-/opt/lib
-/opt/lib32
-/opt/lib64
-
-# End /etc/ld.so.conf</literal>
-EOF</userinput></screen>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('contents-glibc'))"/>
-
-</sect1>
Index: OK/final-system/mips64/glibc-n32.xml
===================================================================
--- BOOK/final-system/mips64/glibc-n32.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,124 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-glibc-n32" role="wrap">
-  <?dbhtml filename="glibc-n32.html"?>
-
-  <title>Glibc-&glibc-version; N32</title>
-
-  <indexterm zone="ch-system-glibc-n32">
-    <primary sortas="a-Glibc">Glibc</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../multilib/glibc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Glibc</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='l1'])"/>
-
-<screen os="l2"><userinput>LINKER=$(readelf -l /tools/bin/bash | sed -n 's@.*interpret.*/tools\(.*\)]$@\1@p')
-sed -i "s|libs -o|libs -L/usr/lib32 -Wl,-dynamic-linker=${LINKER} -o|" \
-  scripts/test-installation.pl
-unset LINKER</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <para os="m1">Configure Glibc to install its 32-bit libraries into
-    <filename class="directory">/lib32</filename>:</para>
-
-<screen os="m2"><userinput>echo "libc_cv_slibdir=/lib32" &gt;&gt; config.cache</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-<screen os="h"><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" \
-../glibc-&glibc-version;/configure \
-    --prefix=/usr \
-    --enable-kernel=&glibc-kernel-version; \
-    --libexecdir=/usr/lib32/glibc \
-    --libdir=/usr/lib32 \
-    --enable-obsolete-rpc \
-    --enable-stack-protector=strong \
-    --cache-file=config.cache</userinput></screen>
-
-    <variablelist os="i">
-      <title>The meaning of the new configure option:</title>
-
-      <varlistentry>
-        <term><parameter>--libexecdir=/usr/lib32/glibc</parameter></term>
-        <listitem>
-          <para>This changes the location for hard links to the
-          <command>getconf</command> utility from their default of <filename
-          class="directory">/usr/libexec</filename> to <filename
-          class="directory">/usr/lib32/glibc</filename>.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-glibc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/mips64/gmp-64bit.xml
===================================================================
--- BOOK/final-system/mips64/gmp-64bit.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,123 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-gmp" role="wrap">
-  <?dbhtml filename="gmp-64bit.html"?>
-
-  <title>GMP-&gmp-version; 64 Bit</title>
-
-  <indexterm zone="ch-system-gmp">
-    <primary sortas="a-GMP">GMP</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/gmp.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GMP</title>
-
-<!--
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='n1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/gmp-64bit.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/gmp-64bit.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/gmp-64bit.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/gmp-64bit.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-<screen os="p"><userinput>cat &gt; /usr/include/gmp.h &lt;&lt; "EOF"
-/* gmp.h - Stub Header  */
-#ifndef __STUB__GMP_H__
-#define __STUB__GMP_H__
-
-#include &lt;sgidefs.h&gt;
-
-#if (_MIPS_SIM == _ABIO32)
-# include "gmp-32.h"
-#elif (_MIPS_SIM == _ABIN32)
-# include "gmp-n32.h"
-#elif (_MIPS_SIM == _ABI64)
-# include "gmp-64.h"
-#endif
-
-#endif /* __STUB__GMP_H__ */
-EOF</userinput></screen>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/gmp.xml"
-  xpointer="xpointer(id('contents-gmp'))"/>
-
-</sect1>
Index: OK/final-system/mips64/pkg-config-lite.xml
===================================================================
--- BOOK/final-system/mips64/pkg-config-lite.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,80 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-pkg-config-lite" role="wrap">
-  <?dbhtml filename="pkg-config-lite.html"?>
-
-  <title>Pkg-config-lite-&pkg-config-lite-version;</title>
-
-  <indexterm zone="ch-system-pkg-config-lite">
-    <primary sortas="a-Pkg-config-lite">Pkg-config-lite</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/pkg-config-lite.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Pkg-config-lite</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/pkg-config-lite.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/pkg-config-lite.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/pkg-config-lite.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/pkg-config-lite.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/pkg-config-lite.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/pkg-config-lite.xml"
-    xpointer="xpointer(//*[@os='e2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/pkg-config-lite.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/pkg-config-lite.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/pkg-config-lite.xml"
-    xpointer="xpointer(//*[@os='m1'])"/>
-
-<screen os="m2"><userinput>export PKG_CONFIG_PATH32="/usr/lib/pkgconfig"
-export PKG_CONFIG_PATHN32="/usr/lib32/pkgconfig"
-export PKG_CONFIG_PATH64="/usr/lib64/pkgconfig"</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/pkg-config-lite.xml"
-    xpointer="xpointer(//*[@os='m3'])"/>
-
-<screen os="m4"><userinput>cat &gt;&gt; ${CLFS}/root/.bash_profile &lt;&lt; EOF
-export PKG_CONFIG_PATH32="${PKG_CONFIG_PATH32}"
-export PKG_CONFIG_PATHN32="${PKG_CONFIG_PATHN32}"
-export PKG_CONFIG_PATH64="${PKG_CONFIG_PATH64}"
-EOF</userinput></screen>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/pkg-config-lite.xml"
-  xpointer="xpointer(id('contents-pkg-config-lite'))"/>
-
-</sect1>
Index: OK/final-system/mips64/stripping.xml
===================================================================
--- BOOK/final-system/mips64/stripping.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,52 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-stripping">
-  <?dbhtml filename="stripping.html"?>
-
-  <title>Stripping</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/stripping.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/stripping.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/stripping.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/stripping.xml"
-  xpointer="xpointer(//*[@os='d'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/stripping.xml"
-  xpointer="xpointer(//*[@os='e'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/stripping.xml"
-  xpointer="xpointer(//*[@os='f'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/stripping.xml"
-  xpointer="xpointer(//*[@os='g'])"/>
-
-<screen os="h"><userinput>/tools/bin/find /{,usr/}{bin,lib,lib32,lib64,sbin} -type f \
-   -exec /tools/bin/strip --strip-debug '{}' ';'</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/stripping.xml"
-  xpointer="xpointer(//*[@os='i'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/stripping.xml"
-  xpointer="xpointer(//*[@os='j'])"/>
-
-</sect1>
Index: OK/final-system/multilib/aboutdebug.xml
===================================================================
--- BOOK/final-system/multilib/aboutdebug.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,53 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-aboutdebug">
-  <?dbhtml filename="aboutdebug.html"?>
-
-  <title>About Debugging Symbols</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/aboutdebug.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/aboutdebug.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
-  <itemizedlist os="c">
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/aboutdebug.xml"
-    xpointer="xpointer(//*[@os='c1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/aboutdebug.xml"
-    xpointer="xpointer(//*[@os='c2'])"/>
-
-    <listitem os="c3">
-      <para>Glibc and GCC files (<filename class="directory">/lib</filename>,
-      <filename class="directory">/lib64,</filename>,
-      <filename class="directory">/usr/lib</filename>,
-      and <filename class="directory">/usr/lib64</filename>) with debugging
-      symbols: 87 MB</para>
-    </listitem>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/aboutdebug.xml"
-    xpointer="xpointer(//*[@os='c4'])"/>
-
-  </itemizedlist>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/aboutdebug.xml"
-  xpointer="xpointer(//*[@os='d'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/aboutdebug.xml"
-  xpointer="xpointer(//*[@os='e'])"/>
-
-</sect1>
Index: OK/final-system/multilib/acl-64bit.xml
===================================================================
--- BOOK/final-system/multilib/acl-64bit.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,93 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-acl" role="wrap">
-  <?dbhtml filename="acl-64bit.html"?>
-
-  <title>Acl-&acl-version; 64 Bit</title>
-
-  <indexterm zone="ch-system-acl">
-    <primary sortas="a-Acl">Acl</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/acl.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Acl</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/acl.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/acl.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/acl.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/acl.xml"
-  xpointer="xpointer(//*[@os='d'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/acl.xml"
-  xpointer="xpointer(//*[@os='e'])"/>
-
-<screen os="f"><userinput>CC="gcc ${BUILD64}" \
-./configure \
-    --prefix=/usr \
-    --libdir=/lib64 \
-    --libexecdir=/usr/lib64</userinput></screen>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/acl.xml"
-  xpointer="xpointer(//*[@os='g'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/acl.xml"
-  xpointer="xpointer(//*[@os='h'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/acl.xml"
-  xpointer="xpointer(//*[@os='i'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/acl.xml"
-  xpointer="xpointer(//*[@os='j'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/acl.xml"
-  xpointer="xpointer(//*[@os='k'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/acl.xml"
-  xpointer="xpointer(//*[@os='l'])"/>
-
-    <para os="m">Recreate the symlink in <filename class="directory">/usr/lib64
-    </filename> and remove the shared link from <filename class="directory">
-    /lib64</filename>:</para>
-
-<screen os="n"><userinput>ln -sfv ../../lib64/$(readlink /lib64/libacl.so) /usr/lib64/libacl.so
-rm -v /lib64/libacl.so</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/acl.xml"
-  xpointer="xpointer(//*[@os='o'])"/>
-
-<screen os="p"><userinput>chmod 755 -v /lib64/libacl.so.1.1.0</userinput></screen>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/acl.xml"
-  xpointer="xpointer(id('contents-acl'))"/>
-
-</sect1>
Index: OK/final-system/multilib/acl-n32.xml
===================================================================
--- BOOK/final-system/multilib/acl-n32.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,98 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-acl-n32" role="wrap">
-  <?dbhtml filename="acl-n32.html"?>
-
-  <title>Acl-&acl-version; N32 Libraries</title>
-
-  <indexterm zone="ch-system-acl-n32">
-    <primary sortas="a-Acl">Acl</primary>
-    <secondary>N32</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/acl.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Acl</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/acl.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/acl.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/acl.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/acl.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/acl.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-<screen os="f"><userinput>CC="gcc ${BUILDN32}" \
-./configure \
-    --prefix=/usr \
-    --libdir=/lib32 \
-    --libexecdir=/usr/lib32</userinput></screen>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/acl.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/acl.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/acl.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/acl.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/acl.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/acl.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <para os="m">Recreate the symlink in <filename class="directory">/usr/lib32
-    </filename> and remove the shared link from <filename class="directory">
-    /lib32</filename>:</para>
-
-<screen os="n"><userinput>ln -sfv ../../lib32/$(readlink /lib32/libacl.so) /usr/lib32/libacl.so
-rm -v /lib32/libacl.so</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/acl.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-<screen os="p"><userinput>chmod 755 -v /lib32/libacl.so.1.1.0</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-acl" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/acl.xml
===================================================================
--- BOOK/final-system/multilib/acl.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,100 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-acl-32" role="wrap">
-  <?dbhtml filename="acl.html"?>
-
-  <title>Acl-&acl-version; 32 Bit Libraries</title>
-
-  <indexterm zone="ch-system-acl-32">
-    <primary sortas="a-Acl">Acl</primary>
-    <secondary>32 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/acl.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Acl</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/acl.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/acl.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/acl.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/acl.xml"
-  xpointer="xpointer(//*[@os='d'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/acl.xml"
-  xpointer="xpointer(//*[@os='e'])"/>
-
-<screen os="f"><userinput>CC="gcc ${BUILD32}" \
-./configure \
-    --prefix=/usr \
-    --libdir=/lib \
-    --libexecdir=/usr/lib</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/acl.xml"
-  xpointer="xpointer(//*[@os='g'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/acl.xml"
-  xpointer="xpointer(//*[@os='h'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/acl.xml"
-  xpointer="xpointer(//*[@os='i'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/acl.xml"
-  xpointer="xpointer(//*[@os='j'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/acl.xml"
-  xpointer="xpointer(//*[@os='k'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/acl.xml"
-  xpointer="xpointer(//*[@os='l'])"/>
-
-    <para os="m">Recreate the symlink in <filename class="directory">/usr/lib
-    </filename> and remove the shared link from <filename class="directory">
-    /lib</filename>:</para>
-
-<screen os="n"><userinput>ln -sfv ../../lib/$(readlink /lib/libacl.so) /usr/lib/libacl.so
-rm -v /lib/libacl.so</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/acl.xml"
-  xpointer="xpointer(//*[@os='o'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/acl.xml"
-  xpointer="xpointer(//*[@os='p'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-acl" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/adjusting.xml
===================================================================
--- BOOK/final-system/multilib/adjusting.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,78 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-adjusting">
-  <?dbhtml filename="adjusting.html"?>
-
-  <title>Adjusting the Toolchain</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/adjusting.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="c"><userinput>gcc -dumpspecs | \
-perl -p -e 's@/tools/lib/ld@/lib/ld@g;' \
-     -e 's@/tools/lib64/ld@/lib64/ld@g;' \
-     -e 's@\*startfile_prefix_spec:\n@$_/usr/lib/ @g;' &gt; \
-     $(dirname $(gcc --print-libgcc-file-name))/specs</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/adjusting.xml"
-  xpointer="xpointer(//*[@os='d'])"/>
-
-  <caution>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <para os="m2">For 32 bit ABI:</para>
-
-<screen os="m3"><userinput>echo 'int main(){}' &gt; dummy.c
-gcc ${BUILD32} dummy.c
-readelf -l a.out | grep ': /lib'</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <para os="m4">For 64 bit ABI:</para>
-
-<screen os="m5"><userinput>echo 'main(){}' &gt; dummy.c
-gcc ${BUILD64} dummy.c
-readelf -l a.out | grep ': /lib'</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <!-- specific to sparc64 -->
-<screen os="i"><computeroutput>[Requesting program interpreter: /lib64/ld-linux.so.2]</computeroutput></screen>
-
-    <para os="m7">Note that <filename class="directory">/lib</filename> or
-    <filename class="directory">/lib64</filename> is now the prefix
-    of our dynamic linker.</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-  </caution>
-
-</sect1>
Index: OK/final-system/multilib/attr-64bit.xml
===================================================================
--- BOOK/final-system/multilib/attr-64bit.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,93 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-attr" role="wrap">
-  <?dbhtml filename="attr-64bit.html"?>
-
-  <title>Attr-&attr-version; 64 Bit</title>
-
-  <indexterm zone="ch-system-attr">
-    <primary sortas="a-Attr">Attr</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Attr</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@os='s1'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@os='s2'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>CC="gcc ${BUILD64}" \
-./configure \
-    --prefix=/usr \
-    --libdir=/lib64 \
-    --libexecdir=/usr/lib64</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@os='e'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@os='f'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@os='g'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@os='h'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@os='i'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@os='j'])"/>
-
-    <para os="k">Recreate the symlink in <filename class="directory">/usr/lib64
-    </filename> and remove the shared link from <filename class="directory">
-    /lib64</filename>:</para>
-
-<screen os="l"><userinput>ln -sfv ../../lib64/$(readlink /lib64/libattr.so) /usr/lib64/libattr.so
-rm -v /lib64/libattr.so</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@os='m'])"/>
-
-<screen os="n"><userinput>chmod 755 -v /lib64/libattr.so.1.1.0</userinput></screen>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(id('contents-attr'))"/>
-
-</sect1>
Index: OK/final-system/multilib/attr-n32.xml
===================================================================
--- BOOK/final-system/multilib/attr-n32.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,98 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-attr-n32" role="wrap">
-  <?dbhtml filename="attr-n32.html"?>
-
-  <title>Attr-&attr-version; N32 Libraries</title>
-
-  <indexterm zone="ch-system-attr-n32">
-    <primary sortas="a-Attr">Attr</primary>
-    <secondary>N32</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Attr</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@os='s1'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@os='s2'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>CC="gcc ${BUILDN32}" \
-./configure \
-    --prefix=/usr \
-    --libdir=/lib32 \
-    --libexecdir=/usr/lib32</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@os='e'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@os='f'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@os='g'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@os='h'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@os='i'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@os='j'])"/>
-
-    <para os="k">Recreate the symlink in <filename class="directory">/usr/lib32
-    </filename> and remove the shared link from <filename class="directory">
-    /lib32</filename>:</para>
-
-<screen os="l"><userinput>ln -sfv ../../lib32/$(readlink /lib32/libattr.so) /usr/lib32/libattr.so
-rm -v /lib32/libattr.so</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@os='m'])"/>
-
-<screen os="n"><userinput>chmod 755 -v /lib32/libattr.so.1.1.0</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-attr" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/attr.xml
===================================================================
--- BOOK/final-system/multilib/attr.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,100 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-attr-32" role="wrap">
-  <?dbhtml filename="attr.html"?>
-
-  <title>Attr-&attr-version; 32 Bit Libraries</title>
-
-  <indexterm zone="ch-system-attr-32">
-    <primary sortas="a-Attr">Attr</primary>
-    <secondary>32 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Attr</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@os='s1'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@os='s2'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>CC="gcc ${BUILD32}" \
-./configure \
-    --prefix=/usr \
-    --libdir=/lib \
-    --libexecdir=/usr/lib</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@os='e'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@os='f'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@os='g'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@os='h'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@os='i'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@os='j'])"/>
-
-    <para os="k">Recreate the symlink in <filename class="directory">/usr/lib
-    </filename> and remove the shared link from <filename class="directory">
-    /lib</filename>:</para>
-
-<screen os="l"><userinput>ln -sfv ../../lib/$(readlink /lib/libattr.so) /usr/lib/libattr.so
-rm -v /lib/libattr.so</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@os='m'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@os='n'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-attr" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/autoconf.xml
===================================================================
--- BOOK/final-system/multilib/autoconf.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,66 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-autoconf" role="wrap">
-  <?dbhtml filename="autoconf.html"?>
-
-  <title>Autoconf-&autoconf-version;</title>
-
-  <indexterm zone="ch-system-autoconf">
-    <primary sortas="a-Autoconf">Autoconf</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/autoconf.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Autoconf</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/autoconf.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD64}" \
-./configure \
-    --prefix=/usr</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/autoconf.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/autoconf.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/autoconf.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/autoconf.xml"
-    xpointer="xpointer(//*[@os='e2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/autoconf.xml"
-    xpointer="xpointer(//*[@os='e3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/autoconf.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/autoconf.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/autoconf.xml"
-  xpointer="xpointer(id('contents-autoconf'))"/>
-
-</sect1>
Index: OK/final-system/multilib/automake.xml
===================================================================
--- BOOK/final-system/multilib/automake.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,71 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-automake" role="wrap">
-  <?dbhtml filename="automake.html"?>
-
-  <title>Automake-&automake-version;</title>
-
-  <indexterm zone="ch-system-automake">
-    <primary sortas="a-Automake">Automake</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/automake.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Automake</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/automake.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/automake.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/automake.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD64}" \
-./configure \
-    --prefix=/usr \
-    --docdir=/usr/share/doc/automake-&automake-version;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/autoconf.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/autoconf.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/automake.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/automake.xml"
-    xpointer="xpointer(//*[@os='e2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/autoconf.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/autoconf.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/automake.xml"
-  xpointer="xpointer(id('contents-automake'))"/>
-
-</sect1>
Index: OK/final-system/multilib/bash.xml
===================================================================
--- BOOK/final-system/multilib/bash.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,102 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-bash" role="wrap">
-  <?dbhtml filename="bash.html"?>
-
-  <title>Bash-&bash-version;</title>
-
-  <indexterm zone="ch-system-bash">
-    <primary sortas="a-Bash">Bash</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/bash.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Bash</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <para os="m1">The following sed points configure towards the correct
-    library directory while searching for Readline:</para>
-
-<screen os="m2"><userinput>sed -i "/ac_cv_rl_libdir/s@/lib@&amp;64@" configure</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
-./configure \
-    --prefix=/usr \
-    --without-bash-malloc \
-    --with-installed-readline \
-    --docdir=/usr/share/doc/bash-&bash-version;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='f2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/bash.xml"
-  xpointer="xpointer(id('contents-bash'))"/>
-
-</sect1>
Index: OK/final-system/multilib/bc.xml
===================================================================
--- BOOK/final-system/multilib/bc.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,72 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-bc" role="wrap">
-  <?dbhtml filename="bc.html"?>
-
-  <title>Bc-&bc-version;</title>
-
-  <indexterm zone="ch-system-bc">
-    <primary sortas="a-Bc">Bc</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/bc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Bc</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bc.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bc.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bc.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD64}" \
-./configure \
-    --prefix=/usr \
-    --mandir=/usr/share/man \
-    --infodir=/usr/share/info</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bc.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bc.xml"
-    xpointer="xpointer(//*[@os='e2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/bc.xml"
-  xpointer="xpointer(id('contents-bc'))"/>
-
-</sect1>
Index: OK/final-system/multilib/binutils.xml
===================================================================
--- BOOK/final-system/multilib/binutils.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,119 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-binutils" role="wrap">
-  <?dbhtml filename="binutils.html"?>
-
-  <title>Binutils-&binutils-version;</title>
-
-  <indexterm zone="ch-system-binutils">
-    <primary sortas="a-Binutils">Binutils</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/binutils.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Binutils</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-<!-- Branch update patch area
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/binutils.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/binutils.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-<screen os="ca"><userinput>CC="gcc -isystem /usr/include ${BUILD64}" \
-LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64:/usr/lib:/lib ${BUILD64}" \
-../binutils-&binutils-dir;/configure \
-    --prefix=/usr \
-    --enable-shared \
-    --enable-64-bit-bfd \
-    --libdir=/usr/lib64 \
-    --enable-gold=yes \
-    --enable-plugins \
-    --with-system-zlib \
-    --enable-threads</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-<!--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='l'])"/> -->
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/binutils.xml"
-  xpointer="xpointer(id('contents-binutils'))"/>
-
-</sect1>
Index: OK/final-system/multilib/bison-64bit.xml
===================================================================
--- BOOK/final-system/multilib/bison-64bit.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,65 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-bison" role="wrap">
-  <?dbhtml filename="bison-64bit.html"?>
-
-  <title>Bison-&bison-version; 64Bit</title>
-
-  <indexterm zone="ch-system-bison">
-    <primary sortas="a-Bison">Bison</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/bison.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Bison</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bison.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD64}" \
-CXX="g++ ${BUILD64}" \
-./configure \
-    --prefix=/usr \
-    --libdir=/usr/lib64 \
-    --docdir=/usr/share/doc/bison-&bison-version;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bison.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bison.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bison.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bison.xml"
-    xpointer="xpointer(//*[@os='e2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bison.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bison.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/bison.xml"
-  xpointer="xpointer(id('contents-bison'))"/>
-
-</sect1>
Index: OK/final-system/multilib/bison-n32.xml
===================================================================
--- BOOK/final-system/multilib/bison-n32.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,70 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-bison-n32" role="wrap">
-  <?dbhtml filename="bison-n32.html"?>
-
-  <title>Bison-&bison-version; N32 Libraries</title>
-
-  <indexterm zone="ch-system-bison-n32">
-    <primary sortas="a-Bison">Bison</primary>
-    <secondary>N32</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/bison.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Bison</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bison.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILDN32}" \
-CXX="g++ ${BUILDN32}" \
-./configure \
-    --prefix=/usr \
-    --libdir=/usr/lib32 \
-    --docdir=/usr/share/doc/bison-&bison-version;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bison.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bison.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bison.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bison.xml"
-    xpointer="xpointer(//*[@os='e2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bison.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bison.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-bison" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/bison.xml
===================================================================
--- BOOK/final-system/multilib/bison.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,68 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-bison-32" role="wrap">
-  <?dbhtml filename="bison.html"?>
-
-  <title>Bison-&bison-version; 32 Bit Libraries</title>
-
-  <indexterm zone="ch-system-bison-32">
-    <primary sortas="a-Bison">Bison</primary>
-    <secondary>32 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/bison.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Bison</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bison.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
-./configure \
-    --prefix=/usr \
-    --docdir=/usr/share/doc/bison-&bison-version;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bison.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bison.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bison.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bison.xml"
-    xpointer="xpointer(//*[@os='e2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bison.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bison.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-bison" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/bzip2-64bit.xml
===================================================================
--- BOOK/final-system/multilib/bzip2-64bit.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,85 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-bzip2" role="wrap">
-  <?dbhtml filename="bzip2-64bit.html"?>
-
-  <title>Bzip2-&bzip2-version; 64 Bit</title>
-
-  <indexterm zone="ch-system-bzip2">
-    <primary sortas="a-Bzip2">Bzip2</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/bzip2.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Bzip2</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="bzip2.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="bzip2.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bzip2.xml"
-    xpointer="xpointer(//*[@os='s3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bzip2.xml"
-    xpointer="xpointer(//*[@os='s4'])"/>
-
-    <para os="m1">We need to change the default lib path
-    to <filename class="directory">lib64</filename>:</para>
-
-<screen os="m2"><userinput>sed -i 's@/lib\(/\| \|$\)@/lib64\1@g' Makefile</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="bzip2.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>make -f Makefile-libbz2_so CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}"
-make clean</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="bzip2.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bzip2.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-<screen os="e"><userinput>make CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}"</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bzip2.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-<screen os="h"><userinput>make CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" PREFIX=/usr install</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bzip2.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-<screen os="j"><userinput>cp -v bzip2-shared /bin/bzip2
-cp -av libbz2.so* /lib64
-ln -sv ../../lib64/libbz2.so.1.0 /usr/lib64/libbz2.so
-rm -v /usr/bin/{bunzip2,bzcat,bzip2}
-ln -sv bzip2 /bin/bunzip2
-ln -sv bzip2 /bin/bzcat</userinput></screen>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/bzip2.xml"
-  xpointer="xpointer(id('contents-bzip2'))"/>
-
-</sect1>
Index: OK/final-system/multilib/bzip2-n32.xml
===================================================================
--- BOOK/final-system/multilib/bzip2-n32.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,85 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-bzip2-n32" role="wrap">
-  <?dbhtml filename="bzip2-n32.html"?>
-
-  <title>Bzip2-&bzip2-version; N32 Libraries</title>
-
-  <indexterm zone="ch-system-bzip2-n32">
-    <primary sortas="a-Bzip2">Bzip2</primary>
-    <secondary>N32</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/bzip2.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Bzip2</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="bzip2.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="bzip2.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bzip2.xml"
-    xpointer="xpointer(//*[@os='s3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bzip2.xml"
-    xpointer="xpointer(//*[@os='s4'])"/>
-
-    <para os="m1">We need to change the default lib path
-    to <filename class="directory">lib32</filename>:</para>
-
-<screen os="m2"><userinput>sed -i 's@/lib\(/\| \|$\)@/lib32\1@g' Makefile</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="bzip2.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>make -f Makefile-libbz2_so CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}"
-make clean</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="bzip2.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="bzip2.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-<screen os="e"><userinput>make CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" libbz2.a</userinput></screen>
-
-    <para os="e1">To test the results, issue:
-    <userinput>make CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" check</userinput>
-    .</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="bzip2.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-<screen os="j"><userinput>cp -v libbz2.a /usr/lib32
-cp -av libbz2.so* /lib32
-ln -sv ../../lib32/libbz2.so.1.0 /usr/lib32/libbz2.so</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-bzip2" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/bzip2.xml
===================================================================
--- BOOK/final-system/multilib/bzip2.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,77 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-bzip2-32" role="wrap">
-  <?dbhtml filename="bzip2.html"?>
-
-  <title>Bzip2-&bzip2-version; 32 Bit Libraries</title>
-
-  <indexterm zone="ch-system-bzip2-32">
-    <primary sortas="a-Bzip2">Bzip2</primary>
-    <secondary>32 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/bzip2.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Bzip2</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bzip2.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bzip2.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bzip2.xml"
-    xpointer="xpointer(//*[@os='s3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bzip2.xml"
-    xpointer="xpointer(//*[@os='s4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bzip2.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>make -f Makefile-libbz2_so CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}"
-make clean</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bzip2.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<para os="d">Recompile the package using a non-shared library:</para>
-
-<screen os="e"><userinput>make CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" libbz2.a</userinput></screen>
-
-    <para os="e1">To test the results, issue:
-    <userinput>make CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" check</userinput>
-    .</para>
-
-    <para os="i">Install the libraries and make
-    a necessary symbolic link:</para>
-
-<screen os="j"><userinput>cp -v libbz2.a /usr/lib
-cp -av libbz2.so* /lib
-ln -sv ../../lib/libbz2.so.1.0 /usr/lib/libbz2.so</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-bzip2" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/coreutils.xml
===================================================================
--- BOOK/final-system/multilib/coreutils.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,117 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-coreutils" role="wrap">
-  <?dbhtml filename="coreutils.html"?>
-
-  <title>Coreutils-&coreutils-version;</title>
-
-  <indexterm zone="ch-system-coreutils">
-    <primary sortas="a-Coreutils">Coreutils</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/coreutils.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Coreutils</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>FORCE_UNSAFE_CONFIGURE=1 \
-CC="gcc ${BUILD64}" \
-./configure \
-    --prefix=/usr \
-    --enable-no-install-program=kill,uptime \
-    --enable-install-program=hostname</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='d1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/coreutils.xml"
-  xpointer="xpointer(id('contents-coreutils'))"/>
-
-</sect1>
Index: OK/final-system/multilib/dbus-64bit.xml
===================================================================
--- BOOK/final-system/multilib/dbus-64bit.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,80 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-dbus" role="wrap">
-  <?dbhtml filename="dbus-64bit.html"?>
-
-  <title>D-Bus-&dbus-version; 64 Bit</title>
-
-  <indexterm zone="ch-system-dbus">
-    <primary sortas="a-D-Bus">D-Bus</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/dbus.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of D-Bus</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/dbus.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD64}" USE_ARCH=64 PKG_CONFIG_PATH=${PKG_CONFIG_PATH64} \
-./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --libdir=/usr/lib64 \
-    --libexecdir=/usr/lib64/dbus-1.0 \
-    --localstatedir=/var \
-    --with-systemdsystemunitdir=/lib/systemd/system \
-    --docdir=/usr/share/doc/dbus-&dbus-version; \
-    SYSTEMD_LIBS="-L/lib64 -lsystemd"</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/dbus.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/dbus.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/dbus.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/dbus.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/dbus.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <para os="h">Move the shared library to <filename class="directory">/lib64
-    </filename> and recreate the symbolic link.</para>
-
-<screen os="i"><userinput>mv -v /usr/lib64/libdbus-1.so.* /lib64
-ln -sfv ../../lib64/$(readlink /usr/lib64/libdbus-1.so) /usr/lib64/libdbus-1.so
-</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/dbus.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/dbus.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/dbus.xml"
-  xpointer="xpointer(id('contents-dbus'))"/>
-
-</sect1>
Index: OK/final-system/multilib/dbus-n32.xml
===================================================================
--- BOOK/final-system/multilib/dbus-n32.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,78 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-dbus-n32" role="wrap">
-  <?dbhtml filename="dbus-n32.html"?>
-
-  <title>D-Bus-&dbus-version; N32 Libraries</title>
-
-  <indexterm zone="ch-system-dbus-n32">
-    <primary sortas="a-D-Bus">D-Bus</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/dbus.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of D-Bus</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/dbus.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILDN32}" USE_ARCH=n32 PKG_CONFIG_PATH=${PKG_CONFIG_PATHN32} \
-./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --libdir=/usr/lib32 \
-    --libexecdir=/usr/lib32/dbus-1.0 \
-    --localstatedir=/var \
-    --with-systemdsystemunitdir=/lib/systemd/system \
-    --docdir=/usr/share/doc/dbus-&dbus-version; \
-    SYSTEMD_LIBS="-L/lib32 -lsystemd"</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/dbus.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/dbus.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/dbus.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/dbus.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/dbus.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <para os="h">Move the shared library to <filename class="directory">/lib32
-    </filename> and recreate the symbolic link.</para>
-
-<screen os="i"><userinput>mv -v /usr/lib32/libdbus-1.so.* /lib32
-ln -sfv ../../lib32/$(readlink /usr/lib32/libdbus-1.so) /usr/lib32/libdbus-1.so
-</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-dbus" role="."/></para>
-
-  </sect2>
-</sect1>
-
-
-
Index: OK/final-system/multilib/dbus.xml
===================================================================
--- BOOK/final-system/multilib/dbus.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,77 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-dbus-32" role="wrap">
-  <?dbhtml filename="dbus.html"?>
-
-  <title>D-Bus-&dbus-version; 32 Bit Libraries</title>
-
-  <indexterm zone="ch-system-dbus-32">
-    <primary sortas="a-D-Bus">D-Bus 32 Bit Libraries</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/dbus.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of D-Bus</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/dbus.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD32}" USE_ARCH=32 PKG_CONFIG_PATH=${PKG_CONFIG_PATH32} \
-./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --libdir=/usr/lib \
-    --libexecdir=/usr/lib/dbus-1.0 \
-    --localstatedir=/var \
-    --with-systemdsystemunitdir=/lib/systemd/system \
-    --docdir=/usr/share/doc/dbus-&dbus-version; \
-    SYSTEMD_LIBS="-L/lib -lsystemd"</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/dbus.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/dbus.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/dbus.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/dbus.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/dbus.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/dbus.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/dbus.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-dbus" role="."/></para>
-
-  </sect2>
-</sect1>
-
Index: OK/final-system/multilib/diffutils.xml
===================================================================
--- BOOK/final-system/multilib/diffutils.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,78 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-diffutils" role="wrap">
-  <?dbhtml filename="diffutils.html"?>
-
-  <title>Diffutils-&diffutils-version;</title>
-
-  <indexterm zone="ch-system-diffutils">
-    <primary sortas="a-Diffutils">Diffutils</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/diffutils.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Diffutils</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/diffutils.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/diffutils.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/diffutils.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD64}" \
-./configure \
-    --prefix=/usr</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/diffutils.xml"
-    xpointer="xpointer(//*[@os='s5'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/diffutils.xml"
-    xpointer="xpointer(//*[@os='s6'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/diffutils.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/diffutils.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/diffutils.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/diffutils.xml"
-    xpointer="xpointer(//*[@os='e2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/diffutils.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/diffutils.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/diffutils.xml"
-  xpointer="xpointer(id('contents-diffutils'))"/>
-
-</sect1>
Index: OK/final-system/multilib/e2fsprogs-64bit.xml
===================================================================
--- BOOK/final-system/multilib/e2fsprogs-64bit.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,95 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-e2fsprogs" role="wrap">
-  <?dbhtml filename="e2fsprogs-64bit.html"?>
-
-  <title>E2fsprogs-&e2fsprogs-version; 64 Bit</title>
-
-  <indexterm zone="ch-system-e2fsprogs">
-    <primary sortas="a-E2fsprogs">E2fsprogs</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/e2fsprogs.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of E2fsprogs</title>
-
-    <para os="m3">Change the library directory to <filename
-    class="directory">lib64</filename>:</para>
-
-<screen os="m4"><userinput>sed -i '/libdir.*=.*\/lib/s@/lib@/lib64@g' configure</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>PKG_CONFIG_PATH="${PKG_CONFIG_PATH64}" \
-CC="gcc ${BUILD64}" \
-../configure \
-    --prefix=/usr \
-    --bindir=/bin \
-    --with-root-prefix="" \
-    --enable-elf-shlibs \
-    --disable-libblkid \
-    --disable-libuuid \
-    --disable-fsck \
-    --disable-uuidd</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='h2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/e2fsprogs.xml"
-  xpointer="xpointer(id('contents-e2fsprogs'))"/>
-
-</sect1>
Index: OK/final-system/multilib/e2fsprogs-n32.xml
===================================================================
--- BOOK/final-system/multilib/e2fsprogs-n32.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,80 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-e2fsprogs-n32" role="wrap">
-  <?dbhtml filename="e2fsprogs-n32.html"?>
-
-  <title>E2fsprogs-&e2fsprogs-version; N32 Libraries</title>
-
-  <indexterm zone="ch-system-e2fsprogs-n32">
-    <primary sortas="a-E2fsprogs">E2fsprogs</primary>
-    <secondary>N32</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/e2fsprogs.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of E2fsprogs</title>
-
-    <para os="m3">Change the library directory to <filename
-    class="directory">lib32</filename>:</para>
-
-<screen os="m4"><userinput>sed -i '/libdir.*=.*\/lib/s@/lib@/lib32@g' configure</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>PKG_CONFIG_PATH="${PKG_CONFIG_PATHN32}" \
-CC="gcc ${BUILDN32}" \
-../configure \
-    --prefix=/usr \
-    --bindir=/bin \
-    --with-root-prefix="" \
-    --enable-elf-shlibs \
-    --disable-libblkid \
-    --disable-libuuid \
-    --disable-fsck \
-    --disable-uuidd</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='m1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='m2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-e2fsprogs" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/e2fsprogs.xml
===================================================================
--- BOOK/final-system/multilib/e2fsprogs.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,75 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-e2fsprogs-32" role="wrap">
-  <?dbhtml filename="e2fsprogs.html"?>
-
-  <title>E2fsprogs-&e2fsprogs-version; 32 Bit Libraries</title>
-
-  <indexterm zone="ch-system-e2fsprogs-32">
-    <primary sortas="a-E2fsprogs">E2fsprogs</primary>
-    <secondary>32 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/e2fsprogs.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of E2fsprogs</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>PKG_CONFIG_PATH="${PKG_CONFIG_PATH32}" \
-CC="gcc ${BUILD32}" \
-../configure \
-    --prefix=/usr \
-    --bindir=/bin \
-    --with-root-prefix="" \
-    --enable-elf-shlibs \
-    --disable-libblkid \
-    --disable-libuuid \
-    --disable-fsck \
-    --disable-uuidd</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <para os="m1">Compile the libraries:</para>
-
-<screen os="m2"><userinput>make libs</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-e2fsprogs" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/expat-64bit.xml
===================================================================
--- BOOK/final-system/multilib/expat-64bit.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,71 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-expat" role="wrap">
-  <?dbhtml filename="expat-64bit.html"?>
-
-  <title>Expat-&expat-version; 64 Bit</title>
-
-  <indexterm zone="ch-system-expat">
-    <primary sortas="a-Expat">Expat</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/expat.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Expat</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/expat.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
-./configure \
-    --prefix=/usr \
-    --libdir=/usr/lib64</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/expat.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/expat.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/expat.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/expat.xml"
-    xpointer="xpointer(//*[@os='e2'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/expat.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/expat.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/expat.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/expat.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/expat.xml"
-  xpointer="xpointer(id('contents-expat'))"/>
-
-</sect1>
Index: OK/final-system/multilib/expat-n32.xml
===================================================================
--- BOOK/final-system/multilib/expat-n32.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,68 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-expat-n32" role="wrap">
-  <?dbhtml filename="expat-n32.html"?>
-
-  <title>Expat-&expat-version; N32 Libraries</title>
-
-  <indexterm zone="ch-system-expat-n32">
-    <primary sortas="a-Expat">Expat</primary>
-    <secondary>N32</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/expat.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Expat</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/expat.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" \
-./configure \
-    --prefix=/usr \
-    --libdir=/usr/lib32</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/expat.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/expat.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/expat.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/expat.xml"
-    xpointer="xpointer(//*[@os='e2'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/expat.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/expat.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-expat" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/expat.xml
===================================================================
--- BOOK/final-system/multilib/expat.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,68 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-expat-32" role="wrap">
-  <?dbhtml filename="expat.html"?>
-
-  <title>Expat-&expat-version; 32 Bit Libraries</title>
-
-  <indexterm zone="ch-system-expat-32">
-    <primary sortas="a-Expat">Expat</primary>
-    <secondary>32 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/expat.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Expat</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/expat.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
-./configure \
-    --prefix=/usr \
-    --libdir=/usr/lib</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/expat.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/expat.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/expat.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/expat.xml"
-    xpointer="xpointer(//*[@os='e2'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/expat.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/expat.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-expat" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/file-64bit.xml
===================================================================
--- BOOK/final-system/multilib/file-64bit.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,63 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-file" role="wrap">
-  <?dbhtml filename="file-64bit.html"?>
-
-  <title>File-&file-version; 64 Bit</title>
-
-  <indexterm zone="ch-system-file">
-    <primary sortas="a-File">File</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/file.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of File</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="file.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD64}" \
-./configure \
-    --prefix=/usr \
-    --libdir=/usr/lib64</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="file.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="file.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="file.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="file.xml"
-    xpointer="xpointer(//*[@os='e2'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="file.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="file.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/file.xml"
-  xpointer="xpointer(id('contents-file'))"/>
-
-</sect1>
Index: OK/final-system/multilib/file-n32.xml
===================================================================
--- BOOK/final-system/multilib/file-n32.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,68 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-file-n32" role="wrap">
-  <?dbhtml filename="file-n32.html"?>
-
-  <title>File-&file-version; N32 Libraries</title>
-
-  <indexterm zone="ch-system-file-n32">
-    <primary sortas="a-File">File</primary>
-    <secondary>N32</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/file.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of File</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="file.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILDN32}" \
-./configure \
-    --prefix=/usr \
-    --libdir=/usr/lib32</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="file.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="file.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="file.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="file.xml"
-    xpointer="xpointer(//*[@os='e2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="file.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="file.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-file" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/file.xml
===================================================================
--- BOOK/final-system/multilib/file.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,67 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-file-32" role="wrap">
-  <?dbhtml filename="file.html"?>
-
-  <title>File-&file-version; 32 Bit Libraries</title>
-
-  <indexterm zone="ch-system-file-32">
-    <primary sortas="a-File">File</primary>
-    <secondary>32 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/file.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of File</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/file.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD32}" \
-./configure \
-    --prefix=/usr</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/file.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/file.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/file.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/file.xml"
-    xpointer="xpointer(//*[@os='e2'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/file.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/file.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-file" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/findutils.xml
===================================================================
--- BOOK/final-system/multilib/findutils.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,173 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-findutils" role="wrap">
-  <?dbhtml filename="findutils.html"?>
-
-  <title>Findutils-&findutils-version;</title>
-
-  <indexterm zone="ch-system-findutils">
-    <primary sortas="a-Findutils">Findutils</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/findutils.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Findutils</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/findutils.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD64}" \
-./configure \
-    --prefix=/usr \
-    --libexecdir=/usr/lib64/locate \
-    --localstatedir=/var/lib64/locate</userinput></screen>
-
-    <variablelist os="c">
-      <title>The meaning of the configure options:</title>
-
-      <varlistentry>
-        <term><parameter>--localstatedir</parameter></term>
-        <listitem>
-          <para>This option changes the location of the <command>locate</command>
-          database to be in <filename class="directory">/var/lib64/locate</filename>,
-          which is FHS-compliant.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/findutils.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/findutils.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/findutils.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/findutils.xml"
-    xpointer="xpointer(//*[@os='f2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/findutils.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/findutils.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-  </sect2>
-
-  <sect2 id="contents-findutils" role="content">
-    <title>Contents of Findutils</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>bigram, code, find, frcode, locate, updatedb, and xargs</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="bigram">
-        <term><command>bigram</command></term>
-        <listitem>
-          <para>Was formerly used to produce <command>locate</command>
-          databases</para>
-          <indexterm zone="ch-system-findutils bigram">
-            <primary sortas="b-bigram">bigram</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="code">
-        <term><command>code</command></term>
-        <listitem>
-          <para>Was formerly used to produce <command>locate</command>
-          databases; it is the ancestor of <command>frcode</command>.</para>
-          <indexterm zone="ch-system-findutils code">
-            <primary sortas="b-code">code</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="find">
-        <term><command>find</command></term>
-        <listitem>
-          <para>Searches given directory trees for files matching the specified
-          criteria</para>
-          <indexterm zone="ch-system-findutils find">
-            <primary sortas="b-find">find</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="frcode">
-        <term><command>frcode</command></term>
-        <listitem>
-          <para>Is called by <command>updatedb</command> to compress the list
-          of file names; it uses front-compression, reducing the database size
-          by a factor of four to five.</para>
-          <indexterm zone="ch-system-findutils frcode">
-            <primary sortas="b-frcode">frcode</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="locate">
-        <term><command>locate</command></term>
-        <listitem>
-          <para>Searches through a database of file names and reports the names
-          that contain a given string or match a given pattern</para>
-          <indexterm zone="ch-system-findutils locate">
-            <primary sortas="b-locate">locate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="updatedb">
-        <term><command>updatedb</command></term>
-        <listitem>
-          <para>Updates the <command>locate</command> database; it scans the
-          entire file system (including other file systems that are currently
-          mounted, unless told not to) and puts every file name it finds into
-          the database</para>
-          <indexterm zone="ch-system-findutils updatedb">
-            <primary sortas="b-updatedb">updatedb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xargs">
-        <term><command>xargs</command></term>
-        <listitem>
-          <para>Can be used to apply a given command to a list of files</para>
-          <indexterm zone="ch-system-findutils xargs">
-            <primary sortas="b-xargs">xargs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/flex-64bit.xml
===================================================================
--- BOOK/final-system/multilib/flex-64bit.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,75 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-flex" role="wrap">
-  <?dbhtml filename="flex-64bit.html"?>
-
-  <title>Flex-&flex-version; 64 Bit</title>
-
-  <indexterm zone="ch-system-flex">
-    <primary sortas="a-Flex">Flex</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/flex.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Flex</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="flex.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure \
-    --prefix=/usr \
-    --libdir=/usr/lib64 \
-    --docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="flex.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='e2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='e3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="flex.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/flex.xml"
-  xpointer="xpointer(id('contents-flex'))"/>
-
-</sect1>
Index: OK/final-system/multilib/flex-n32.xml
===================================================================
--- BOOK/final-system/multilib/flex-n32.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,59 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-flex-n32" role="wrap">
-  <?dbhtml filename="flex-n32.html"?>
-
-  <title>Flex-&flex-version; N32 Libraries</title>
-
-  <indexterm zone="ch-system-flex-n32">
-    <primary sortas="a-Flex">Flex</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/flex.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Flex</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="flex.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure \
-    --prefix=/usr \
-    --libdir=/usr/lib32 \
-    --docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="flex.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="flex.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="flex.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="flex.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-flex" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/flex.xml
===================================================================
--- BOOK/final-system/multilib/flex.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-flex-32" role="wrap">
-  <?dbhtml filename="flex.html"?>
-
-  <title>Flex-&flex-version; 32 Bit Libraries</title>
-
-  <indexterm zone="ch-system-flex-32">
-    <primary sortas="a-Flex">Flex</primary>
-    <secondary>32 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/flex.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Flex</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure \
-    --prefix=/usr \
-    --docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-<screen os="g"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-flex" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/gawk.xml
===================================================================
--- BOOK/final-system/multilib/gawk.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,70 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-gawk" role="wrap">
-  <?dbhtml filename="gawk.html"?>
-
-  <title>Gawk-&gawk-version;</title>
-
-  <indexterm zone="ch-system-gawk">
-    <primary sortas="a-Gawk">Gawk</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/gawk.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Gawk</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gawk.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure \
-    --prefix=/usr \
-    --libexecdir=/usr/lib64</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gawk.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gawk.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gawk.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gawk.xml"
-    xpointer="xpointer(//*[@os='e2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gawk.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gawk.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gawk.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gawk.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/gawk.xml"
-  xpointer="xpointer(id('contents-gawk'))"/>
-
-</sect1>
Index: OK/final-system/multilib/gcc.xml
===================================================================
--- BOOK/final-system/multilib/gcc.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,142 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-gcc" role="wrap">
-  <?dbhtml filename="gcc.html"?>
-
-  <title>GCC-&gcc-version;</title>
-
-  <indexterm zone="ch-system-gcc">
-    <primary sortas="a-GCC">GCC</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GCC</title>
-
-<!--GCC Branch Update Area
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='fix1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='fix2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-<screen os="i"><userinput>SED=sed CC="gcc -isystem /usr/include ${BUILD64}" \
-CXX="g++ -isystem /usr/include ${BUILD64}" \
-LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64:/usr/lib:/lib" \
-../gcc-&gcc-version;/configure \
-    --prefix=/usr \
-    --libdir=/usr/lib64 \
-    --libexecdir=/usr/lib64 \
-    --enable-languages=c,c++ \
-    --with-system-zlib \
-    --enable-install-libiberty \
-    --disable-bootstrap</userinput></screen>
-
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='i1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
-    <para os="y">Finally, move some misplaced files:</para>
-
-
-<screen os="z"><userinput>mv -v /usr/lib/libstdc++*gdb.py /usr/share/gdb/auto-load/usr/lib
-mv -v /usr/lib64/libstdc++*gdb.py /usr/share/gdb/auto-load/usr/lib64</userinput></screen>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/gcc.xml"
-  xpointer="xpointer(id('contents-gcc'))"/>
-
-</sect1>
Index: OK/final-system/multilib/gdbm-64bit.xml
===================================================================
--- BOOK/final-system/multilib/gdbm-64bit.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,69 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-gdbm" role="wrap">
-  <?dbhtml filename="gdbm-64bit.html"?>
-
-  <title>GDBM-&gdbm-version; 64 Bit Libraries</title>
-
-  <indexterm zone="ch-system-gdbm">
-    <primary sortas="a-Gdbm">GDBM</primary>
-    <secondary>64 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/gdbm.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GDBM</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gdbm.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD64}" \
-./configure \
-    --prefix=/usr \
-    --enable-libgdbm-compat \
-    --libdir=/usr/lib64</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gdbm.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gdbm.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gdbm.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gdbm.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gdbm.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gdbm.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gdbm.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/gdbm.xml"
-  xpointer="xpointer(id('contents-gdbm'))"/>
-
-</sect1>
Index: OK/final-system/multilib/gdbm-n32.xml
===================================================================
--- BOOK/final-system/multilib/gdbm-n32.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,73 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-gdbm-n32" role="wrap">
-  <?dbhtml filename="gdbm-n32.html"?>
-
-  <title>GDBM-&gdbm-version; N32 Libraries</title>
-
-  <indexterm zone="ch-system-gdbm-n32">
-    <primary sortas="a-Gdbm">GDBM</primary>
-    <secondary>N32</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/gdbm.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GDBM</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gdbm.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILDN32}" \
-./configure \
-    --prefix=/usr \
-    --enable-libgdbm-compat \
-    --libdir=/usr/lib32</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gdbm.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gdbm.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gdbm.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gdbm.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gdbm.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gdbm.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gdbm.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gdbm" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/gdbm.xml
===================================================================
--- BOOK/final-system/multilib/gdbm.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,72 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-gdbm-32" role="wrap">
-  <?dbhtml filename="gdbm.html"?>
-
-  <title>GDBM-&gdbm-version; 32 Bit Libraries</title>
-
-  <indexterm zone="ch-system-gdbm-32">
-    <primary sortas="a-Gdbm">GDBM</primary>
-    <secondary>32 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/gdbm.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GDBM</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gdbm.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD32}" \
-./configure \
-    --prefix=/usr \
-    --enable-libgdbm-compat</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gdbm.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gdbm.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gdbm.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gdbm.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gdbm.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gdbm.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gdbm.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gdbm" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/gettext-64bit.xml
===================================================================
--- BOOK/final-system/multilib/gettext-64bit.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,64 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-gettext" role="wrap">
-  <?dbhtml filename="gettext-64bit.html"?>
-
-  <title>Gettext-&gettext-version; 64 Bit</title>
-
-  <indexterm zone="ch-system-gettext">
-    <primary sortas="a-Gettext">Gettext</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/gettext.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Gettext</title>
-
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gettext.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
-./configure \
-    --prefix=/usr \
-    --libdir=/usr/lib64 \
-    --docdir=/usr/share/doc/gettext-&gettext-version;</userinput></screen>
-
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gettext.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gettext.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gettext.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gettext.xml"
-    xpointer="xpointer(//*[@os='e2'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gettext.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gettext.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/gettext.xml"
-  xpointer="xpointer(id('contents-gettext'))"/>
-
-</sect1>
Index: OK/final-system/multilib/gettext-n32.xml
===================================================================
--- BOOK/final-system/multilib/gettext-n32.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,69 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-gettext-n32" role="wrap">
-  <?dbhtml filename="gettext-n32.html"?>
-
-  <title>Gettext-&gettext-version; N32 Libraries</title>
-
-  <indexterm zone="ch-system-gettext-n32">
-    <primary sortas="a-Gettext">Gettext</primary>
-    <secondary>N32</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/gettext.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Gettext</title>
-
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gettext.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" \
-./configure \
-    --prefix=/usr \
-    --libdir=/usr/lib32 \
-    --docdir=/usr/share/doc/gettext-&gettext-version;</userinput></screen>
-
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gettext.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gettext.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gettext.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gettext.xml"
-    xpointer="xpointer(//*[@os='e2'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gettext.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gettext.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gettext" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/gettext.xml
===================================================================
--- BOOK/final-system/multilib/gettext.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,68 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-gettext-32" role="wrap">
-  <?dbhtml filename="gettext.html"?>
-
-  <title>Gettext-&gettext-version; 32 Bit Libraries</title>
-
-  <indexterm zone="ch-system-gettext-32">
-    <primary sortas="a-Gettext">Gettext</primary>
-    <secondary>32 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/gettext.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Gettext</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gettext.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
-./configure \
-    --prefix=/usr \
-    --docdir=/usr/share/doc/gettext-&gettext-version;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gettext.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gettext.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gettext.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gettext.xml"
-    xpointer="xpointer(//*[@os='e2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gettext.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gettext.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gettext" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/glibc-64bit.xml
===================================================================
--- BOOK/final-system/multilib/glibc-64bit.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,186 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-glibc" role="wrap">
-  <?dbhtml filename="glibc-64bit.html"?>
-
-  <title>Glibc-&glibc-version; 64-Bit</title>
-
-  <indexterm zone="ch-system-glibc">
-    <primary sortas="a-Glibc">Glibc</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="glibc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Glibc</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='l1'])"/>
-
-<screen os="l2"><userinput>LINKER=$(readelf -l /tools/bin/bash | sed -n 's@.*interpret.*/tools\(.*\)]$@\1@p')
-sed -i "s|libs -o|libs -L/usr/lib64 -Wl,-dynamic-linker=${LINKER} -o|" \
-  scripts/test-installation.pl
-unset LINKER</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <para os="m1">Configure Glibc to install its 64-bit libraries into
-    <filename class="directory">/lib64</filename>:</para>
-
-<screen os="m2"><userinput>echo "libc_cv_slibdir=/lib64" &gt;&gt; config.cache</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-<screen os="h"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
-../glibc-&glibc-version;/configure \
-    --prefix=/usr \
-    --enable-kernel=&glibc-kernel-version; \
-    --libexecdir=/usr/lib64/glibc \
-    --libdir=/usr/lib64 \
-    --enable-obsolete-rpc \
-    --enable-stack-protector=strong \
-    --cache-file=config.cache</userinput></screen>
-
-    <variablelist os="i">
-      <title>The meaning of the new configure option:</title>
-
-      <varlistentry>
-        <term><parameter>--libexecdir=/usr/lib64/glibc</parameter></term>
-        <listitem>
-          <para>This changes the location for hard links to the
-          <command>getconf</command> utility from their default of <filename
-          class="directory">/usr/libexec</filename> to <filename
-          class="directory">/usr/lib64/glibc</filename>.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='u'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='v'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('i18n-glibc'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('conf-glibc'))"/>
-
-  <sect2 id="conf-ld" role="configuration">
-    <title>Configuring The Dynamic Loader</title>
-
-    <indexterm zone="conf-ld">
-      <primary sortas="e-/etc/ld.so.conf">/etc/ld.so.conf</primary>
-    </indexterm>
-
-    <para os="ld-a">By default, the dynamic loader (<filename
-    class="libraryfile">/lib/ld-linux.so.2</filename> for 32bit executables and
-    <filename class="libraryfile">/lib64/ld-linux.so.2</filename> for
-    64bit executables) searches through
-    <filename class="directory">/lib</filename>,
-    <filename class="directory">/lib64</filename>,
-    <filename class="directory">/usr/lib</filename>,
-    and <filename class="directory">/usr/lib64</filename> for dynamic
-    libraries that are needed by programs as they are run. However, if
-    there are libraries in directories other than these, they need to be
-    added to the <filename>/etc/ld.so.conf</filename> file in order
-    for the dynamic loader to find them. Some directories that are commonly
-    known to contain additional libraries are
-    <filename class="directory">/usr/local/lib</filename>,
-    <filename class="directory">/usr/local/lib64</filename>,
-    <filename class="directory">/opt/lib</filename>,
-    and <filename class="directory">/opt/lib64</filename>,
-    so add those directories to the dynamic loader's search path.</para>
-
-    <para os="ld-b">Create a new file <filename>/etc/ld.so.conf</filename> by running the
-    following:</para>
-
-<screen os="ld-c"><userinput>cat &gt; /etc/ld.so.conf &lt;&lt; "EOF"
-<literal># Begin /etc/ld.so.conf
-
-/usr/local/lib
-/usr/local/lib64
-/opt/lib
-/opt/lib64
-
-# End /etc/ld.so.conf</literal>
-EOF</userinput></screen>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('contents-glibc'))"/>
-
-</sect1>
Index: OK/final-system/multilib/glibc.xml
===================================================================
--- BOOK/final-system/multilib/glibc.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,130 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-glibc-32" role="wrap">
-  <?dbhtml filename="glibc.html"?>
-
-  <title>Glibc-&glibc-version; 32 Bit Libraries</title>
-
-  <indexterm zone="ch-system-glibc-32">
-    <primary sortas="a-Glibc">Glibc</primary>
-    <secondary>32 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Glibc</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='z'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='l1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='l2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-<screen os="h"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
-../glibc-&glibc-version;/configure \
-    --prefix=/usr \
-    --enable-kernel=&glibc-kernel-version; \
-    --libexecdir=/usr/lib/glibc \
-    --host=${CLFS_TARGET32} \
-    --enable-stack-protector=strong \
-    --enable-obsolete-rpc</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <para os="l1b">In multilib, we tend to think that compiling for
-    <literal>${CLFS_TARGET32}</literal> is <emphasis>not</emphasis>
-    cross-compiling. Glibc takes the traditional view that if you are building
-    for a different host then you are cross-compiling, so you won't be running
-    the tests and therefore you don't need the locale files. When we run
-    the tests, many will fail if the locale files are missing. The following
-    sed allows these tests to succeed:</para>
-
-<screen os="l2b"><userinput>sed -i '/cross-compiling/s@ifeq@ifneq@g' ../glibc-&glibc-version;/localedata/Makefile</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-glibc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/gmp-64bit.xml
===================================================================
--- BOOK/final-system/multilib/gmp-64bit.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,121 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-gmp" role="wrap">
-  <?dbhtml filename="gmp-64bit.html"?>
-
-  <title>GMP-&gmp-version; 64 Bit</title>
-
-  <indexterm zone="ch-system-gmp">
-    <primary sortas="a-GMP">GMP</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/gmp.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GMP</title>
-
-<!--
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
--->
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='n1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD64}" \
-CXX="g++ -isystem /usr/include ${BUILD64}" \
-LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64 ${BUILD64}" \
-./configure \
-    --prefix=/usr \
-    --libdir=/usr/lib64 \
-    --enable-cxx \
-    --docdir=/usr/share/doc/gmp-&gmp-version;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <para os="m">Create the 64bit header file:</para>
-
-<screen os="n"><userinput>mv -v /usr/include/gmp{,-64}.h</userinput></screen>
-
-    <para os="o">Finally, create a stub header in the place of the originals:</para>
-
-<screen os="p"><userinput>cat &gt; /usr/include/gmp.h &lt;&lt; "EOF"
-/* gmp.h - Stub Header  */
-#ifndef __STUB__GMP_H__
-#define __STUB__GMP_H__
-
-#if defined(__x86_64__) || \
-    defined(__sparc64__) || \
-    defined(__arch64__) || \
-    defined(__powerpc64__) || \
-    defined (__s390x__)
-# include "gmp-64.h"
-#else
-# include "gmp-32.h"
-#endif
-
-#endif /* __STUB__GMP_H__ */
-EOF</userinput></screen>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/gmp.xml"
-  xpointer="xpointer(id('contents-gmp'))"/>
-
-</sect1>
Index: OK/final-system/multilib/gmp-n32.xml
===================================================================
--- BOOK/final-system/multilib/gmp-n32.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,90 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-gmp-n32" role="wrap">
-  <?dbhtml filename="gmp-n32.html"?>
-
-  <title>GMP-&gmp-version; N32 Libraries</title>
-
-  <indexterm zone="ch-system-gmp-n32">
-    <primary sortas="a-GMP">GMP</primary>
-    <secondary>N32</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/gmp.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GMP</title>
-
-<!--
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='n1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILDN32}" \
-CXX="g++ -isystem /usr/include ${BUILDN32}" \
-LDFLAGS="-Wl,-rpath-link,/usr/lib32:/lib32 ${BUILDN32}" \
-  ABI=n32 ./configure \
-    --prefix=/usr \
-    --libdir=/usr/lib32 \
-    --enable-cxx</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <para os="k">Create the N32 header file:</para>
-
-<screen os="l"><userinput>mv -v /usr/include/gmp{,-n32}.h</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gmp" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/gmp.xml
===================================================================
--- BOOK/final-system/multilib/gmp.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,88 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-gmp-32" role="wrap">
-  <?dbhtml filename="gmp.html"?>
-
-  <title>GMP-&gmp-version; 32 Bit Libraries</title>
-
-  <indexterm zone="ch-system-gmp-32">
-    <primary sortas="a-GMP">MPFR</primary>
-    <secondary>32 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/gmp.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GMP</title>
-
-<!--
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='n1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD32}" \
-CXX="g++ -isystem /usr/include ${BUILD32}" \
-LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib ${BUILD32}" \
-  ABI=32 ./configure \
-    --prefix=/usr \
-    --enable-cxx</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <para os="k">The header installed by GMP is architecture specific. Programs compiled as 32bit will require the header provided by the 32bit installation of GMP. The same applies for 64bit programs. Move the header so a wrapper can be put in its place later:</para>
-
-<screen os="l"><userinput>mv -v /usr/include/gmp{,-32}.h</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gmp" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/gperf.xml
===================================================================
--- BOOK/final-system/multilib/gperf.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,79 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-gperf" role="wrap">
-  <?dbhtml filename="gperf.html"?>
-
-  <title>Gperf-&gperf-version;</title>
-
-  <indexterm zone="ch-system-gperf">
-    <primary sortas="a-Gperf">Gperf</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>Gperf generates a perfect hash function from a key set.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Gperf</title>
-
-    <para os="a">Prepare Gperf for compilation:</para>
-
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure \
-    --prefix=/usr \
-    --docdir=/usr/share/doc/gperf-&gperf-version;</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">To test the results, issue:</para>
-
-<screen os="e2"><userinput remap="test">make check</userinput></screen>
-
-    <para os="f">Install the package:</para>
-
-<screen os="g"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-gperf" role="content">
-    <title>Contents of Gperf</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed directory</segtitle>
-
-      <seglistitem>
-        <seg>gperf</seg>
-        <seg>/usr/share/doc/gperf-&gperf-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gperf">
-        <term><command>gperf</command></term>
-        <listitem>
-          <para>Generates a perfect hash function from a key set</para>
-          <indexterm zone="ch-system-gperf gperf">
-            <primary sortas="b-gperf">gperf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/grep.xml
===================================================================
--- BOOK/final-system/multilib/grep.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,62 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-grep" role="wrap">
-  <?dbhtml filename="grep.html"?>
-
-  <title>Grep-&grep-version;</title>
-
-  <indexterm zone="ch-system-grep">
-    <primary sortas="a-Grep">Grep</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/grep.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Grep</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/grep.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure \
-    --prefix=/usr \
-    --bindir=/bin</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/grep.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/grep.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/grep.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/grep.xml"
-    xpointer="xpointer(//*[@os='e2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/grep.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/grep.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/grep.xml"
-  xpointer="xpointer(id('contents-grep'))"/>
-
-</sect1>
Index: OK/final-system/multilib/groff.xml
===================================================================
--- BOOK/final-system/multilib/groff.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,64 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-groff" role="wrap">
-  <?dbhtml filename="groff.html"?>
-
-  <title>Groff-&groff-version;</title>
-
-  <indexterm zone="ch-system-groff">
-    <primary sortas="a-Groff">Groff</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/groff.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Groff</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/groff.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/groff.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-<screen os="c"><userinput>PAGE=<replaceable>[paper_size]</replaceable> CC="gcc ${BUILD64}" \
-CXX="g++ ${BUILD64}" ./configure \
-    --prefix=/usr \
-    --libdir=/usr/lib64</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/groff.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/groff.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/groff.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/groff.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/groff.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/groff.xml"
-  xpointer="xpointer(id('contents-groff'))"/>
-
-</sect1>
Index: OK/final-system/multilib/gzip.xml
===================================================================
--- BOOK/final-system/multilib/gzip.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,69 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-gzip" role="wrap">
-  <?dbhtml filename="gzip.html"?>
-
-  <title>Gzip-&gzip-version;</title>
-
-  <indexterm zone="ch-system-gzip">
-    <primary sortas="a-Gzip">Gzip</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/gzip.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Gzip</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gzip.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD64}" \
-./configure \
-    --prefix=/usr \
-    --bindir=/bin</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gzip.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gzip.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gzip.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-<screen><userinput remap="test">make PERL=perl-64 check</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gzip.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gzip.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gzip.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gzip.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/gzip.xml"
-  xpointer="xpointer(id('contents-gzip'))"/>
-
-</sect1>
Index: OK/final-system/multilib/iproute2.xml
===================================================================
--- BOOK/final-system/multilib/iproute2.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-iproute2" role="wrap">
-  <?dbhtml filename="iproute2.html"?>
-
-  <title>IPRoute2-&iproute2-version;</title>
-
-  <indexterm zone="ch-system-iproute2">
-    <primary sortas="a-iproute2">IPRoute2</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/iproute2.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of IPRoute2</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/iproute2.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/iproute2.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/iproute2.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>make CC="gcc ${BUILD64}" LIBDIR=/usr/lib64</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/iproute2.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/iproute2.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-<screen os="e"><userinput>make LIBDIR=/usr/lib64 \
-    DOCDIR=/usr/share/doc/iproute2-&iproute2-version; install</userinput></screen>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/iproute2.xml"
-  xpointer="xpointer(id('contents-iproute2'))"/>
-
-</sect1>
Index: OK/final-system/multilib/iputils.xml
===================================================================
--- BOOK/final-system/multilib/iputils.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,57 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-iputils" role="wrap">
-  <?dbhtml filename="iputils.html"?>
-
-  <title>IPutils-&iputils-version;</title>
-
-  <indexterm zone="ch-system-iputils">
-    <primary sortas="a-IPutils">IPutils</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/iputils.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of IPutils</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/iputils.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/iputils.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/iputils.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>make CC="gcc ${BUILD64}" \
-    TARGETS="clockdiff ping rdisc tracepath tracepath6 traceroute6"</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/iputils.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/iputils.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/iputils.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/iputils.xml"
-  xpointer="xpointer(id('contents-iputils'))"/>
-
-</sect1>
Index: OK/final-system/multilib/isl-64bit.xml
===================================================================
--- BOOK/final-system/multilib/isl-64bit.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,70 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-isl" role="wrap">
-  <?dbhtml filename="isl-64bit.html"?>
-
-  <title>ISL-&isl-version; 64 Bit</title>
-
-  <indexterm zone="ch-system-isl">
-    <primary sortas="a-ISL">ISL</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/isl.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of ISL</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/isl.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD64}" \
-LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64 ${BUILD64}" \
-./configure \
-    --prefix=/usr \
-    --libdir=/usr/lib64</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/isl.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/isl.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/isl.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/isl.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/isl.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/isl.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/isl.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-<screen os="j"><userinput>mkdir -pv /usr/share/gdb/auto-load/usr/lib64
-mv -v /usr/lib64/*gdb.py /usr/share/gdb/auto-load/usr/lib64</userinput></screen>
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/isl.xml"
-  xpointer="xpointer(id('contents-isl'))"/>
-
-</sect1>
Index: OK/final-system/multilib/isl-n32.xml
===================================================================
--- BOOK/final-system/multilib/isl-n32.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,75 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-isl-n32" role="wrap">
-  <?dbhtml filename="isl-n32.html"?>
-
-  <title>ISL-&isl-version; N32 Libraries</title>
-
-  <indexterm zone="ch-system-isl-n32">
-    <primary sortas="a-ISL">ISL</primary>
-    <secondary>N32</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/isl.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of ISL</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/isl.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILDN32}" \
-LDFLAGS="-Wl,-rpath-link,/usr/lib32:/lib32 ${BUILDN32}" \
-./configure \
-    --prefix=/usr \
-    --libdir=/usr/lib32</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/isl.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/isl.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/isl.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/isl.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/isl.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/isl.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/isl.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-<screen os="j"><userinput>mkdir -pv /usr/share/gdb/auto-load/usr/lib32
-mv -v /usr/lib32/*gdb.py /usr/share/gdb/auto-load/usr/lib32</userinput></screen>
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-isl" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/isl.xml
===================================================================
--- BOOK/final-system/multilib/isl.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,77 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-isl-32" role="wrap">
-  <?dbhtml filename="isl.html"?>
-
-  <title>ISL-&isl-version; 32 Bit Libraries</title>
-
-  <indexterm zone="ch-system-isl-32">
-    <primary sortas="a-ISL">ISL</primary>
-    <secondary>32 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/isl.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of ISL</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/isl.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD32}" \
-LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib ${BUILD32}" \
-./configure \
-    --prefix=/usr \
-    --host=${CLFS_TARGET32}</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/isl.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/isl.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/isl.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/isl.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/isl.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/isl.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/isl.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/isl.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-isl" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/kbd.xml
===================================================================
--- BOOK/final-system/multilib/kbd.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,84 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-kbd" role="wrap">
-  <?dbhtml filename="kbd.html"?>
-
-  <title>Kbd-&kbd-version;</title>
-
-  <indexterm zone="ch-system-kbd">
-    <primary sortas="a-Kbd">Kbd</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/kbd.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Kbd</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/kbd.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD64}" PKG_CONFIG_PATH="/tools/lib64/pkgconfig" \
-./configure \
-    --prefix=/usr \
-    --disable-vlock \
-    --enable-optional-progs</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/kbd.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/kbd.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/kbd.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/kbd.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/kbd.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/kbd.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/kbd.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/kbd.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/kbd.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/kbd.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/kbd.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/kbd.xml"
-  xpointer="xpointer(id('contents-kbd'))"/>
-
-</sect1>
Index: OK/final-system/multilib/kmod-64bit.xml
===================================================================
--- BOOK/final-system/multilib/kmod-64bit.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,80 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-kmod" role="wrap">
-  <?dbhtml filename="kmod-64bit.html"?>
-
-  <title>Kmod-&kmod-version; 64 Bit</title>
-
-  <indexterm zone="ch-system-kmod">
-    <primary sortas="a-Kmod">Kmod</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/kmod.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Kmod</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/kmod.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>PKG_CONFIG_PATH=${PKG_CONFIG_PATH64} CC="gcc ${BUILD64}" \
-./configure \
-    --prefix=/usr \
-    --bindir=/bin \
-    --sysconfdir=/etc \
-    --with-rootlibdir=/lib64 \
-    --libdir=/usr/lib64 \
-    --with-zlib \
-    --with-xz</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/kmod.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/kmod.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/kmod.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/kmod.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/kmod.xml"
-    xpointer="xpointer(//*[@os='f2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/kmod.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/kmod.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/kmod.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/kmod.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/kmod.xml"
-  xpointer="xpointer(id('contents-kmod'))"/>
-
-</sect1>
Index: OK/final-system/multilib/kmod-n32.xml
===================================================================
--- BOOK/final-system/multilib/kmod-n32.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,77 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-kmod-n32" role="wrap">
-  <?dbhtml filename="kmod-n32.html"?>
-
-  <title>Kmod-&kmod-version; N32 Libraries</title>
-
-  <indexterm zone="ch-system-kmod-n32">
-    <primary sortas="a-Kmod">Kmod</primary>
-    <secondary>N32</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/kmod.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Kmod N32 Libraries</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/kmod.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>PKG_CONFIG_PATH=${PKG_CONFIG_PATH32} CC="gcc ${BUILD32}" \
-./configure \
-    --prefix=/usr \
-    --bindir=/bin \
-    --sysconfdir=/etc \
-    --with-rootlibdir=/lib32 \
-    --libdir=/usr/lib32 \
-    --with-zlib \
-    --with-xz</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/kmod.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/kmod.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/kmod.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/kmod.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/kmod.xml"
-    xpointer="xpointer(//*[@os='f2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/kmod.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/kmod.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-kmod" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/kmod.xml
===================================================================
--- BOOK/final-system/multilib/kmod.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,77 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-kmod-32" role="wrap">
-  <?dbhtml filename="kmod.html"?>
-
-  <title>Kmod-&kmod-version; 32 Bit Libraries</title>
-
-  <indexterm zone="ch-system-kmod-32">
-    <primary sortas="a-Kmod">Kmod</primary>
-    <secondary>32 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/kmod.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Kmod</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/kmod.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>PKG_CONFIG_PATH=${PKG_CONFIG_PATH32} CC="gcc ${BUILD32}" \
-./configure \
-    --prefix=/usr \
-    --bindir=/bin \
-    --sysconfdir=/etc \
-    --with-rootlibdir=/lib \
-    --libdir=/usr/lib \
-    --with-zlib \
-    --with-xz</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/kmod.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/kmod.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/kmod.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/kmod.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/kmod.xml"
-    xpointer="xpointer(//*[@os='f2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/kmod.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/kmod.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-kmod" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/less.xml
===================================================================
--- BOOK/final-system/multilib/less.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,66 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-less" role="wrap">
-  <?dbhtml filename="less.html"?>
-
-  <title>Less-&less-version;</title>
-
-  <indexterm zone="ch-system-less">
-    <primary sortas="a-Less">Less</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/less.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Less</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/less.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/less.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/less.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/less.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/less.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/less.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/less.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/less.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/less.xml"
-  xpointer="xpointer(id('contents-less'))"/>
-
-</sect1>
Index: OK/final-system/multilib/libcap-64bit.xml
===================================================================
--- BOOK/final-system/multilib/libcap-64bit.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,50 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-libcap" role="wrap">
-  <?dbhtml filename="libcap-64bit.html"?>
-
-  <title>Libcap-&libcap-version; 64 Bit</title>
-
-  <indexterm zone="ch-system-libcap">
-    <primary sortas="a-Libcap">Libcap</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/libcap.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Libcap</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libcap.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>make CC="gcc ${BUILD64}"</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libcap.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libcap.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-<screen os="e"><userinput>make lib=lib64 install
-chmod -v 755 /lib64/libcap.so.&libcap-version;
-ln -sfv ../../lib64/$(readlink /lib64/libcap.so) /usr/lib64/libcap.so
-rm -v /lib64/libcap.so
-mv -v /lib64/libcap.a /usr/lib64</userinput></screen>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/libcap.xml"
-  xpointer="xpointer(id('contents-libcap'))"/>
-
-</sect1>
Index: OK/final-system/multilib/libcap-n32.xml
===================================================================
--- BOOK/final-system/multilib/libcap-n32.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-libcap-n32" role="wrap">
-  <?dbhtml filename="libcap-n32.html"?>
-
-  <title>Libcap-&libcap-version; N32 Libraries</title>
-
-  <indexterm zone="ch-system-libcap-n32">
-    <primary sortas="a-Libcap">Libcap</primary>
-    <secondary>N32</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/libcap.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Libcap</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libcap.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>make CC="gcc ${BUILDN32}"</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libcap.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libcap.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-<screen os="e"><userinput>make lib=lib32 install
-chmod -v 755 /lib32/libcap.so.&libcap-version;
-ln -sfv ../../lib32/$(readlink /lib32/libcap.so) /usr/lib32/libcap.so
-rm -v /lib32/libcap.so
-mv -v /lib32/libcap.a /usr/lib32</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-libcap" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/libcap.xml
===================================================================
--- BOOK/final-system/multilib/libcap.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,59 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-libcap-32" role="wrap">
-  <?dbhtml filename="libcap.html"?>
-
-  <title>Libcap-&libcap-version; 32 Bit Libraries</title>
-
-  <indexterm zone="ch-system-libcap-32">
-    <primary sortas="a-Libcap">Libcap</primary>
-    <secondary>32 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/libcap.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Libcap</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libcap.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>make CC="gcc ${BUILD32}"</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libcap.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libcap.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-<screen os="e"><userinput>make RAISE_SETFCAP=no lib=lib install
-chmod -v 755 /lib/libcap.so.&libcap-version;
-ln -sfv ../../lib/$(readlink /lib/libcap.so) /usr/lib/libcap.so
-rm -v /lib/libcap.so
-mv -v /lib/libcap.a /usr/lib</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libcap.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-libcap" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/libpipeline-64bit.xml
===================================================================
--- BOOK/final-system/multilib/libpipeline-64bit.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,65 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-libpipeline" role="wrap">
-  <?dbhtml filename="libpipeline-64bit.html"?>
-
-  <title>Libpipeline-&libpipeline-version; 64 Bit Libraries</title>
-
-  <indexterm zone="ch-system-libpipeline">
-    <primary sortas="a-Libpipeline">Libpipeline</primary>
-    <secondary>64 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/libpipeline.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Libpipeline</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libpipeline.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>PKG_CONFIG_PATH=/tools/lib64/pkgconfig
-    CC="gcc ${BUILD64}" \
-./configure \
-    --prefix=/usr \
-    --libdir=/usr/lib64</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libpipeline.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libpipeline.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libpipeline.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libpipeline.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libpipeline.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libpipeline.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/libpipeline.xml"
-  xpointer="xpointer(id('contents-libpipeline'))"/>
-
-</sect1>
Index: OK/final-system/multilib/libpipeline-n32.xml
===================================================================
--- BOOK/final-system/multilib/libpipeline-n32.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,60 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-libpipeline-n32" role="wrap">
-  <?dbhtml filename="libpipeline-n32.html"?>
-
-  <title>Libpipeline-&libpipeline-version; N32 Libraries</title>
-
-  <indexterm zone="ch-system-libpipeline-n32">
-    <primary sortas="a-Libpipeline">Libpipeline</primary>
-    <secondary>N32</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/libpipeline.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Libpipeline</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libpipeline.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILDN32}" \
-./configure \
-    --prefix=/usr \
-    --libdir=/usr/lib32</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libpipeline.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libpipeline.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libpipeline.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libpipeline.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-libpipeline" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/libpipeline.xml
===================================================================
--- BOOK/final-system/multilib/libpipeline.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,59 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-libpipeline-32" role="wrap">
-  <?dbhtml filename="libpipeline.html"?>
-
-  <title>Libpipeline-&libpipeline-version; 32 Bit Libraries</title>
-
-  <indexterm zone="ch-system-libpipeline-32">
-    <primary sortas="a-Libpipeline">Libpipeline</primary>
-    <secondary>32 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/libpipeline.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Libpipeline</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libpipeline.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD32}" \
-./configure \
-    --prefix=/usr</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libpipeline.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libpipeline.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libpipeline.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libpipeline.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-libpipeline" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/libtool-64bit.xml
===================================================================
--- BOOK/final-system/multilib/libtool-64bit.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,76 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-libtool" role="wrap">
-  <?dbhtml filename="libtool-64bit.html"?>
-
-  <title>Libtool-&libtool-version; 64 Bit</title>
-
-  <indexterm zone="ch-system-libtool">
-    <primary sortas="a-Libtool">Libtool</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/libtool.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Libtool</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="libtool.xml"
-    xpointer="xpointer(//*[@os='a1'])"/>
-
-<screen os="a2"><userinput>echo "lt_cv_sys_dlsearch_path='/lib64 /usr/lib64 /usr/local/lib64 /opt/lib64'" &gt; config.cache</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libtool.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure \
-    --prefix=/usr \
-    --libdir=/usr/lib64 \
-    --cache-file=config.cache</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libtool.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libtool.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libtool.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libtool.xml"
-    xpointer="xpointer(//*[@os='e2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libtool.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libtool.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="libtool.xml"
-    xpointer="xpointer(//*[@os='m1'])"/>
-
-<screen os="m2"><userinput>mv -v /usr/bin/libtool{,-64}
-ln -sv multiarch_wrapper /usr/bin/libtool</userinput></screen>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/libtool.xml"
-  xpointer="xpointer(id('contents-libtool'))"/>
-
-</sect1>
Index: OK/final-system/multilib/libtool-n32.xml
===================================================================
--- BOOK/final-system/multilib/libtool-n32.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,77 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-libtool-n32" role="wrap">
-  <?dbhtml filename="libtool-n32.html"?>
-
-  <title>Libtool-&libtool-version; N32 Libraries</title>
-
-  <indexterm zone="ch-system-libtool-n32">
-    <primary sortas="a-Libtool">Libtool</primary>
-    <secondary>N32</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/libtool.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Libtool</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="libtool.xml"
-    xpointer="xpointer(//*[@os='a1'])"/>
-
-<screen os="a2"><userinput>echo "lt_cv_sys_dlsearch_path='/lib32 /usr/lib32 /usr/local/lib32 /opt/lib32'" &gt; config.cache</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="libtool.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure \
-    --prefix=/usr \
-    --libdir=/usr/lib32 \
-    --cache-file=config.cache</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libtool.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libtool.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <para os="e">To test the results, identify the correct emulation, then issue:
-    <userinput>make LDEMULATION=[emulation] check</userinput>. The correct
-    emulation will be elf32btsmipn32 for a big-endian machine and elf32ltsmipn32
-    for a little-endian machine.</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="libtool.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="libtool.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="libtool.xml"
-    xpointer="xpointer(//*[@os='m1'])"/>
-
-<screen os="m2"><userinput>mv -v /usr/bin/libtool{,-n32}</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-libtool" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/libtool.xml
===================================================================
--- BOOK/final-system/multilib/libtool.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,111 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-libtool-32" role="wrap">
-  <?dbhtml filename="libtool.html"?>
-
-  <title>Libtool-&libtool-version; 32 Bit Libraries</title>
-
-<!-- with the introduction of an LDEMULATION  on make check, to fix a test
- failure which has appeared for unknown reasons, this text is now specific
- to mips -o32. -->
-
-  <indexterm zone="ch-system-libtool-32">
-    <primary sortas="a-Libtool">Libtool</primary>
-    <secondary>32 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/libtool.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Libtool</title>
-
-    <para os="a1">The following <filename>config.cache</filename> entry
-    overrides the default search path, which does not take
-    multilib into account:</para>
-
-<screen os="a2"><userinput>echo "lt_cv_sys_dlsearch_path='/lib /usr/lib /usr/local/lib /opt/lib'" &gt; config.cache</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libtool.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure \
-    --prefix=/usr \
-    --cache-file=config.cache</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libtool.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libtool.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <para os="e">To test the results, first identify whether you are on a big- or
-    little-endian machine.  SGI machines are usually big-endian, Cobalt are
-    usually little-endian.  If in doubt you can <command>echo ${MACHTYPE} | grep 'el-'
-    </command>- this will match a little-endian machine.</para>
-
-    <para os="e2">To test on a little-endian machine issue:
-    <userinput>make LDEMULATION=elf32ltsmip check</userinput>.</para>
-
-    <para os="e1">To test on a big-endian machine issue:
-    <userinput>make LDEMULATION=elf32btsmip check</userinput>.</para>
-
-    <variablelist os="c">
-      <title>The meaning of the override on make check:</title>
-
-      <varlistentry>
-        <term><parameter>LDEMULATION=[emulation]</parameter></term>
-        <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-        href="../ppc64/libtool.xml"
-        xpointer="xpointer(//*[@os='c2'])"/> -->
-        <listitem os="c2">
-          <para>Libtool tends to do the wrong thing when building for multilib,
-          at least on the non-default size(s) of architecture.  The causes of
-          these errors are not well understood and they can appear, or disappear,
-          as a result of apparently innocuous other changes in the build.  In
-          this version of the book, one of the tests (pdemo-make) fails to link
-          because it tries to link the 32-bit objects against 64-bit system
-          libraries. This option enables the test to succeed without impacting
-          the other tests (compare the common alternative fixes of
-          <literal>LD="gcc ${BUILD32}"</literal> which causes far fewer tests
-          to be executed, and configuring with
-          <literal>LDFLAGS='-L/lib -L/usr/lib'</literal> which in this case
-          causes other tests to fail.)</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libtool.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libtool.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <para os="m1">Prepare <filename>libtool</filename> to be wrapped by
-    the multiarch wrapper. Libtool by itself is not multilib aware:</para>
-
-<screen os="m2"><userinput>mv -v /usr/bin/libtool{,-32}</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-libtool" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/m4.xml
===================================================================
--- BOOK/final-system/multilib/m4.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,61 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-m4" role="wrap">
-  <?dbhtml filename="m4.html"?>
-
-  <title>M4-&m4-version;</title>
-
-  <indexterm zone="ch-system-m4">
-    <primary sortas="a-M4">M4</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/m4.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of M4</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/m4.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure \
-    --prefix=/usr</userinput></screen>
-
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/m4.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/m4.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/m4.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/m4.xml"
-    xpointer="xpointer(//*[@os='e2'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/m4.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/m4.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/m4.xml"
-  xpointer="xpointer(id('contents-m4'))"/>
-
-</sect1>
Index: OK/final-system/multilib/make.xml
===================================================================
--- BOOK/final-system/multilib/make.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,61 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-make" role="wrap">
-  <?dbhtml filename="make.html"?>
-
-  <title>Make-&make-version;</title>
-
-  <indexterm zone="ch-system-make">
-    <primary sortas="a-Make">Make</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/make.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Make</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/make.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure \
-    --prefix=/usr</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/make.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/make.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/make.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/make.xml"
-    xpointer="xpointer(//*[@os='e2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/make.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/make.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/make.xml"
-  xpointer="xpointer(id('contents-make'))"/>
-
-</sect1>
Index: OK/final-system/multilib/man-db.xml
===================================================================
--- BOOK/final-system/multilib/man-db.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,88 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-man-db" role="wrap">
-  <?dbhtml filename="man-db.html"?>
-
-  <title>Man-DB-&man-db-version;</title>
-
-  <indexterm zone="ch-system-man-db">
-    <primary sortas="a-Man-DB">Man-DB</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/man-db.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Man-DB</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/man-db.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>PKG_CONFIG_PATH="${PKG_CONFIG_PATH64}" \
-    CC="gcc ${BUILD64}" \
-./configure \
-    --prefix=/usr \
-    --libexecdir=/usr/lib64 \
-    --docdir=/usr/share/doc/man-db-&man-db-version; \
-    --sysconfdir=/etc \
-    --libdir=/usr/lib64 \
-    --disable-setuid \
-    --enable-cache-owner=bin \
-    --with-browser=/usr/bin/lynx \
-    --with-vgrind=/usr/bin/vgrind \
-    --with-grap=/usr/bin/grap</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/man-db.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/man-db.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/man-db.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/man-db.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/man-db.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/man-db.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/man-db.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/man-db.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/man-db.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/man-db.xml"
-  xpointer="xpointer(id('encoding-man-db'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/man-db.xml"
-  xpointer="xpointer(id('contents-man-db'))"/>
-
-</sect1>
Index: OK/final-system/multilib/mpc-64bit.xml
===================================================================
--- BOOK/final-system/multilib/mpc-64bit.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,81 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-mpc" role="wrap">
-  <?dbhtml filename="mpc-64bit.html"?>
-
-  <title>MPC-&mpc-version; 64 Bit</title>
-
-  <indexterm zone="ch-system-mpc">
-    <primary sortas="a-MPC">MPC</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/mpc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of MPC</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpc.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD64}" \
-LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64 ${BUILD64}" \
-./configure \
-    --prefix=/usr \
-    --libdir=/usr/lib64 \
-    --docdir=/usr/share/doc/mpc-&mpc-version;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpc.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpc.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpc.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpc.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpc.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/mpc.xml"
-  xpointer="xpointer(id('contents-mpc'))"/>
-
-</sect1>
Index: OK/final-system/multilib/mpc-n32.xml
===================================================================
--- BOOK/final-system/multilib/mpc-n32.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,69 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-mpc-n32" role="wrap">
-  <?dbhtml filename="mpc-n32.html"?>
-
-  <title>MPC-&mpc-version; N32 Libraries</title>
-
-  <indexterm zone="ch-system-mpc-n32">
-    <primary sortas="a-MPC">MPC</primary>
-    <secondary>N32</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/mpc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of MPC</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpc.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILDN32}" \
-LDFLAGS="-Wl,-rpath-link,/usr/lib32:/lib32 ${BUILDN32}" \
-./configure \
-    --prefix=/usr \
-    --libdir=/usr/lib32</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpc.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpc.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpc.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-mpc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/mpc.xml
===================================================================
--- BOOK/final-system/multilib/mpc.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,69 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-mpc-32" role="wrap">
-  <?dbhtml filename="mpc.html"?>
-
-  <title>MPC-&mpc-version; 32 Bit Libraries</title>
-
-  <indexterm zone="ch-system-mpc-32">
-    <primary sortas="a-MPC">MPC</primary>
-    <secondary>32 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/mpc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of MPC</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpc.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD32}" \
-LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib ${BUILD32}" \
-./configure \
-    --prefix=/usr \
-    --host=${CLFS_TARGET32}</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpc.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpc.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpc.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-mpc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/mpfr-64bit.xml
===================================================================
--- BOOK/final-system/multilib/mpfr-64bit.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,73 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-mpfr" role="wrap">
-  <?dbhtml filename="mpfr-64bit.html"?>
-
-  <title>MPFR-&mpfr-version; 64 Bit</title>
-
-  <indexterm zone="ch-system-mpfr">
-    <primary sortas="a-MPFR">MPFR</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/mpfr.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of MPFR</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpfr.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpfr.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpfr.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD64}" \
-    LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64 ${BUILD64}" \
-./configure \
-    --prefix=/usr \
-    --libdir=/usr/lib64 \
-    --docdir=/usr/share/doc/mpfr-&mpfr-version;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpfr.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpfr.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpfr.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpfr.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpfr.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpfr.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/mpfr.xml"
-  xpointer="xpointer(id('contents-mpfr'))"/>
-
-</sect1>
Index: OK/final-system/multilib/mpfr-n32.xml
===================================================================
--- BOOK/final-system/multilib/mpfr-n32.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,78 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-mpfr-n32" role="wrap">
-  <?dbhtml filename="mpfr-n32.html"?>
-
-  <title>MPFR-&mpfr-version; N32 Libraries</title>
-
-  <indexterm zone="ch-system-mpfr-n32">
-    <primary sortas="a-MPFR">MPFR</primary>
-    <secondary>N32</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/mpfr.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of MPFR</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpfr.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpfr.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpfr.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILDN32}" \
-    LDFLAGS="-Wl,-rpath-link,/usr/lib32:/lib32 ${BUILDN32}" \
-./configure \
-    --prefix=/usr \
-    --libdir=/usr/lib32 \
-    --docdir=/usr/share/doc/mpfr-&mpfr-version;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpfr.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpfr.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpfr.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpfr.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpfr.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpfr.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-mpfr" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/mpfr.xml
===================================================================
--- BOOK/final-system/multilib/mpfr.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,78 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-mpfr-32" role="wrap">
-  <?dbhtml filename="mpfr.html"?>
-
-  <title>MPFR-&mpfr-version; 32 Bit Libraries</title>
-
-  <indexterm zone="ch-system-mpfr-32">
-    <primary sortas="a-MPFR">MPFR</primary>
-    <secondary>32 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/mpfr.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of MPFR</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpfr.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpfr.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpfr.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD32}" \
-    LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib ${BUILD32}" \
-./configure \
-    --prefix=/usr \
-    --host=${CLFS_TARGET32} \
-    --docdir=/usr/share/doc/mpfr-&mpfr-version;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpfr.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpfr.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpfr.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpfr.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpfr.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpfr.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-mpfr" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/multiarch_wrapper.xml
===================================================================
--- BOOK/final-system/multilib/multiarch_wrapper.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,144 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-multiarch-wrapper" role="wrap">
-  <?dbhtml filename="multiarch_wrapper.html"?>
-
-  <title>Creating a Multiarch Wrapper</title>
-
-  <indexterm zone="ch-system-multiarch-wrapper">
-    <primary sortas="a-Multiarch Wrapper">Multiarch Wrapper</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Multiarch Wrapper is used to wrap certain binaries that have
-    hardcoded paths to libraries or are architecture specific.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of The Multiarch Wrapper</title>
-
-    <para os="a">Create the source file:</para>
-
-<screen os="b"><userinput>cat &gt; multiarch_wrapper.c &lt;&lt; "EOF"
-#define _GNU_SOURCE
-
-#include &lt;errno.h&gt;
-#include &lt;stdio.h&gt;
-#include &lt;stdlib.h&gt;
-#include &lt;sys/types.h&gt;
-#include &lt;sys/wait.h&gt;
-#include &lt;unistd.h&gt;
-
-#ifndef DEF_SUFFIX
-#  define DEF_SUFFIX "64"
-#endif
-
-int main(int argc, char **argv)
-{
-  char *filename;
-  char *suffix;
-
-  if(!(suffix = getenv("USE_ARCH")))
-    if(!(suffix = getenv("BUILDENV")))
-      suffix = DEF_SUFFIX;
-
-  if (asprintf(&amp;filename, "%s-%s", argv[0], suffix) &lt; 0) {
-    perror(argv[0]);
-    return -1;
-  }
-
-  int status = EXIT_FAILURE;
-  pid_t pid = fork();
-
-  if (pid == 0) {
-    execvp(filename, argv);
-    perror(filename);
-  } else if (pid &lt; 0) {
-    perror(argv[0]);
-  } else {
-    if (waitpid(pid, &amp;status, 0) != pid) {
-      status = EXIT_FAILURE;
-      perror(argv[0]);
-    } else {
-      status = WEXITSTATUS(status);
-    }
-  }
-
-  free(filename);
-
-  return status;
-}
-
-EOF</userinput></screen>
-
-    <para os="c">Compile and Install the Multiarch Wrapper:</para>
-
-<screen os="d"><userinput>gcc ${BUILD64} multiarch_wrapper.c -o /usr/bin/multiarch_wrapper</userinput></screen>
-
-    <para os="e">This multiarch wrapper is going to be used later on in the book
-    with Perl. It will also be very useful outside of the base CLFS system.</para>
-
-    <para os="f">Create a testcase:</para>
-
-<screen os="g"><userinput>echo 'echo "32bit Version"' &gt; test-32
-echo 'echo "64bit Version"' &gt; test-64
-chmod -v 755 test-32 test-64
-ln -sv /usr/bin/multiarch_wrapper test</userinput></screen>
-
-    <para os="h">Test the wrapper:</para>
-
-<screen os="i"><userinput>USE_ARCH=32 ./test
-USE_ARCH=64 ./test</userinput></screen>
-
-    <para os="j">The output of the above command should be:</para>
-
-<screen os="k" role="nodump"><userinput>32bit Version
-64bit Version</userinput></screen>
-
-    <para os="l">Remove the testcase source, binaries, and link:</para>
-
-<screen os="m"><userinput>rm -v multiarch_wrapper.c test{,-32,-64}</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-multiarch-wrapper" role="content">
-    <title>Contents of The Multiarch Wrapper</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>multiarch_wrapper</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="multiarch_wrapper">
-        <term><command>multiarch_wrapper</command></term>
-        <listitem>
-          <para>Will execute a different program based on the
-          <envar>USE_ARCH</envar> variable. The <envar>USE_ARCH</envar>
-          variable will be the suffix of the executed program.</para>
-          <indexterm zone="ch-system-multiarch-wrapper multiarch_wrapper">
-            <primary sortas="b-multiarch_wrapper">multiarch_wrapper</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/ncurses-64bit.xml
===================================================================
--- BOOK/final-system/multilib/ncurses-64bit.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,99 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-ncurses" role="wrap">
-  <?dbhtml filename="ncurses-64bit.html"?>
-
-  <title>Ncurses-&ncurses-version; 64 Bit</title>
-
-  <indexterm zone="ch-system-ncurses">
-    <primary sortas="a-Ncurses">Ncurses</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/ncurses.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Ncurses</title>
-
-<!--Ncurses Branch Update Area
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="ncurses.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="ncurses.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="ncurses.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>PKG_CONFIG_PATH=${PKG_CONFIG_PATH64} \
-CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" ./configure \
-    --prefix=/usr \
-    --libdir=/usr/lib64 \
-    --with-shared \
-    --without-debug \
-    --enable-widec \
-    --enable-pc-files \
-    --with-pkg-config-libdir=/usr/lib64/pkgconfig</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="ncurses.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="ncurses.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="ncurses.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="ncurses.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="ncurses.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <para os="m1">Prepare <filename>ncursesw6-config</filename> to be wrapped by
-    the multiarch wrapper and then wrap it:</para>
-
-<screen os="m2"><userinput>mv -v /usr/bin/ncursesw6-config{,-64}
-ln -svf multiarch_wrapper /usr/bin/ncursesw6-config</userinput></screen>
-
-    <para os="h">Move the <filename class="libraryfile">libncursesw</filename>
-    shared library to <filename class="directory">/lib64</filename>
-    and create a new symlink in <filename class="directory">/usr/lib64</filename>:</para>
-
-<screen os="i"><userinput>mv -v /usr/lib64/libncursesw.so.* /lib64
-ln -svf ../../lib64/$(readlink /usr/lib64/libncursesw.so) /usr/lib64/libncursesw.so</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="ncurses.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-<screen os="m"><userinput>for lib in ncurses form panel menu ; do
-        echo "INPUT(-l${lib}w)" &gt; /usr/lib64/lib${lib}.so
-        ln -sfv lib${lib}w.a /usr/lib64/lib${lib}.a
-done
-ln -sfv libncurses++w.a /usr/lib64/libncurses++.a
-ln -sfv ncursesw6-config-64 /usr/bin/ncurses6-config-64
-ln -sfv ncursesw6-config /usr/bin/ncurses6-config</userinput></screen>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/ncurses.xml"
-  xpointer="xpointer(id('contents-ncurses'))"/>
-
-</sect1>
Index: OK/final-system/multilib/ncurses-n32.xml
===================================================================
--- BOOK/final-system/multilib/ncurses-n32.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,102 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-ncurses-n32" role="wrap">
-  <?dbhtml filename="ncurses-n32.html"?>
-
-  <title>Ncurses-&ncurses-version; N32 Libraries</title>
-
-  <indexterm zone="ch-system-ncurses-n32">
-    <primary sortas="a-Ncurses">Ncurses</primary>
-    <secondary>N32</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/ncurses.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Ncurses</title>
-
-<!--Ncurses Branch Update Area
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="ncurses.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="ncurses.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="ncurses.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>PKG_CONFIG_PATH=${PKG_CONFIG_PATHN32} \
-CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" ./configure \
-    --prefix=/usr \
-    --libdir=/usr/lib32 \
-    --with-shared \
-    --without-debug \
-    --enable-widec \
-    --enable-pc-files \
-    --with-pkg-config-libdir=/usr/lib32/pkgconfig</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="ncurses.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="ncurses.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="ncurses.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="ncurses.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="ncurses.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <para os="m1">Prepare <filename>ncursesw6-config</filename> to be wrapped by
-    the multiarch wrapper:</para>
-
-<screen os="m2"><userinput>mv -v /usr/bin/ncursesw6-config{,-n32}</userinput></screen>
-
-    <para os="h">Move the <filename class="libraryfile">libncursesw</filename>
-    shared library to <filename class="directory">/lib32</filename>
-    and create a new symlink in <filename class="directory">/usr/lib32</filename>:</para>
-
-<screen os="i"><userinput>mv -v /usr/lib32/libncursesw.so.* /lib32
-ln -svf ../../lib32/$(readlink /usr/lib/libncursesw.so) /usr/lib32/libncursesw.so</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="ncurses.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-<screen os="m"><userinput>for lib in ncurses form panel menu ; do
-        echo "INPUT(-l${lib}w)" &gt; /usr/lib32/lib${lib}.so
-        ln -sfv lib${lib}w.a /usr/lib32/lib${lib}.a
-done
-ln -sfv libncurses++w.a /usr/lib32/libncurses++.a
-ln -sfv ncursesw6-config-32 /usr/bin/ncurses6-config-32</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-ncurses" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/ncurses.xml
===================================================================
--- BOOK/final-system/multilib/ncurses.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,106 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-ncurses-32" role="wrap">
-  <?dbhtml filename="ncurses.html"?>
-
-  <title>Ncurses-&ncurses-version; 32 Bit Libraries</title>
-
-  <indexterm zone="ch-system-ncurses-32">
-    <primary sortas="a-Ncurses">Ncurses</primary>
-    <secondary>32 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/ncurses.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Ncurses</title>
-
-<!--Ncurses Branch Update Area
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
-./configure \
-    --prefix=/usr \
-    --libdir=/usr/lib \
-    --with-shared \
-    --without-debug \
-    --enable-widec \
-    --enable-pc-files</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='b1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <para os="m1">Prepare <filename>ncursesw6-config</filename> to be wrapped by
-    the multiarch wrapper:</para>
-
-<screen os="m2"><userinput>mv -v /usr/bin/ncursesw6-config{,-32}</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-<screen os="m"><userinput>for lib in ncurses form panel menu ; do
-        echo "INPUT(-l${lib}w)" &gt; /usr/lib/lib${lib}.so
-        ln -sfv lib${lib}w.a /usr/lib/lib${lib}.a
-done
-ln -sfv libncurses++w.a /usr/lib/libncurses++.a
-ln -sfv ncursesw6-config-32 /usr/bin/ncurses6-config-32</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-ncurses" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/patch.xml
===================================================================
--- BOOK/final-system/multilib/patch.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,61 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-patch" role="wrap">
-  <?dbhtml filename="patch.html"?>
-
-  <title>Patch-&patch-version;</title>
-
-  <indexterm zone="ch-system-patch">
-    <primary sortas="a-Patch">Patch</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/patch.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Patch</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/patch.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure \
-    --prefix=/usr</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/patch.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/patch.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/patch.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/patch.xml"
-    xpointer="xpointer(//*[@os='e2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/patch.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/patch.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/patch.xml"
-  xpointer="xpointer(id('contents-patch'))"/>
-
-</sect1>
Index: OK/final-system/multilib/perl-64bit.xml
===================================================================
--- BOOK/final-system/multilib/perl-64bit.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,137 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-perl" role="wrap">
-  <?dbhtml filename="perl-64bit.html"?>
-
-  <title>Perl-&perl-version; 64 Bit</title>
-
-  <indexterm zone="ch-system-perl">
-    <primary sortas="a-Perl">Perl</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/perl.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Perl</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='s3'])"/>
-
-<screen os="s4"><userinput>sed -i -e '/^BUILD_ZLIB/s/True/False/' \
-       -e '/^INCLUDE/s,\./zlib-src,/usr/include,' \
-       -e '/^LIB/s,\./zlib-src,/usr/lib64,' \
-       cpan/Compress-Raw-Zlib/config.in</userinput></screen>
-
-    <para os="mp1">Perl does not, by default, know about library directories
-    with names other than <filename class="directory">lib</filename>. The
-    following patch will allow it to install to other directories:</para>
-
-<screen os="mp2"><userinput>patch -Np1 -i ../&perl-multilib-patch;</userinput></screen>
-
-    <para os="m2">We still need to tell Perl to actually use
-    <filename class="directory">lib64</filename>:</para>
-
-<screen os="m3"><userinput>echo 'installstyle="lib64/perl5"' &gt;&gt; hints/linux.sh</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>./configure.gnu \
-    --prefix=/usr \
-    -Dvendorprefix=/usr \
-    -Dman1dir=/usr/share/man/man1 \
-    -Dman3dir=/usr/share/man/man3 \
-    -Dpager="/bin/less -isR" \
-    -Dlibpth="/usr/local/lib64 /lib64 /usr/lib64" \
-    -Dcc="gcc ${BUILD64}" \
-    -Dusethreads \
-    -Duseshrplib</userinput></screen>
-
-    <variablelist os="m4">
-      <title>The meaning of the new configure option:</title>
-
-      <varlistentry>
-        <term><parameter>-Dlibpth="/usr/local/lib64 /lib64 /usr/lib64"</parameter></term>
-        <listitem>
-          <para>This tells Perl to link against the 64-bit libraries.</para>
-        </listitem>
-      </varlistentry>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='c1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='c2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='c3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='c4'])"/>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='h2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-<screen os="m"><userinput>mv -v /usr/bin/perl{,-64}
-mv -v /usr/bin/perl&perl-version;{,-64}</userinput></screen>
-
-    <para os="n">Now we need to create a link to the multiarch wrapper that
-    lets us choose which perl installation to use:</para>
-
-<screen os="o"><userinput>ln -sv multiarch_wrapper /usr/bin/perl
-ln -sv multiarch_wrapper /usr/bin/perl&perl-version;</userinput></screen>
-
-    <para os="p">The value of the <envar>USE_ARCH</envar> environment variable
-    will decide which perl binary to execute.
-    <command>USE_ARCH=32 perl -V:cc</command> will give the value of CC used to
-    build the 32bit perl. The multiarch_wrapper will help later with building
-    perl extensions and bindings. Without the multiarch_wrapper it is very hard
-    to setup a 32bit extension or binding.</para>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/perl.xml"
-  xpointer="xpointer(id('contents-perl'))"/>
-
-</sect1>
Index: OK/final-system/multilib/perl-n32.xml
===================================================================
--- BOOK/final-system/multilib/perl-n32.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,131 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-perl-n32" role="wrap">
-  <?dbhtml filename="perl-n32.html"?>
-
-  <title>Perl-&perl-version; N32 Libraries</title>
-
-  <indexterm zone="ch-system-perl-n32">
-    <primary sortas="a-Perl">Perl</primary>
-    <secondary>N32</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/perl.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Perl</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='s3'])"/>
-
-<screen os="s4"><userinput>sed -i -e '/^BUILD_ZLIB/s/True/False/' \
-       -e '/^INCLUDE/s,\./zlib-src,/usr/include,' \
-       -e '/^LIB/s,\./zlib-src,/usr/lib32,' \
-       cpan/Compress-Raw-Zlib/config.in</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-64bit.xml"
-    xpointer="xpointer(//*[@os='mp1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-64bit.xml"
-    xpointer="xpointer(//*[@os='mp2'])"/>
-
-    <para os="m2">We still need to tell perl to actually use
-    <filename class="directory">lib32</filename>:</para>
-
-<screen os="m3"><userinput>echo 'installstyle="lib32/perl5"' &gt;&gt; hints/linux.sh</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>./configure.gnu \
-    --prefix=/usr \
-    -Dvendorprefix=/usr \
-    -Dman1dir=/usr/share/man/man1 \
-    -Dman3dir=/usr/share/man/man3 \
-    -Dpager="/bin/less -isR" \
-    -Dlibpth="/usr/local/lib32 /lib32 /usr/lib32" \
-    -Dcc="gcc ${BUILDN32}" \
-    -Dusethreads \
-    -Duseshrplib</userinput></screen>
-
-    <variablelist os="m4">
-      <title>The meaning of the new configure option:</title>
-
-      <varlistentry>
-        <term><parameter>-Dlibpth="/usr/local/lib32 /lib32 /usr/lib32"</parameter></term>
-        <listitem>
-          <para>This tells Perl to link against the N32 libraries.</para>
-        </listitem>
-      </varlistentry>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='c1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='c2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='c3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='c4'])"/>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='h2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-<screen os="m"><userinput>mv -v /usr/bin/perl{,-n32}
-mv -v /usr/bin/perl&perl-version;{,-n32}</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-perl" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/perl.xml
===================================================================
--- BOOK/final-system/multilib/perl.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,102 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-perl-32" role="wrap">
-  <?dbhtml filename="perl.html"?>
-
-  <title>Perl-&perl-version; 32 Bit Libraries</title>
-
-  <indexterm zone="ch-system-perl-32">
-    <primary sortas="a-Perl">Perl</primary>
-    <secondary>32 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/perl.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Perl</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='s3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='s4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='a00'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='a01'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='a02'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>./configure.gnu \
-    --prefix=/usr \
-    -Dvendorprefix=/usr \
-    -Dman1dir=/usr/share/man/man1 \
-    -Dman3dir=/usr/share/man/man3 \
-    -Dpager="/bin/less -isR" \
-    -Dcc="gcc ${BUILD32}" \
-    -Dusethreads \
-    -Duseshrplib</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='h2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <para os="l">Add a suffix to the <command>perl</command> binary which will
-    be used by the multiarch wrapper:</para>
-
-<screen os="m"><userinput>mv -v /usr/bin/perl{,-32}
-mv -v /usr/bin/perl&perl-version;{,-32}</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-perl" role="."/></para>
-
-  </sect2>
-</sect1>
Index: OK/final-system/multilib/pkg-config-lite.xml
===================================================================
--- BOOK/final-system/multilib/pkg-config-lite.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,78 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-pkg-config-lite" role="wrap">
-  <?dbhtml filename="pkg-config-lite.html"?>
-
-  <title>Pkg-config-lite-&pkg-config-lite-version;</title>
-
-  <indexterm zone="ch-system-pkg-config-lite">
-    <primary sortas="a-Pkg-config-lite">Pkg-config-lite</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/pkg-config-lite.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Pkg-config-lite</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/pkg-config-lite.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure \
-    --prefix=/usr \
-    --docdir=/usr/share/doc/pkg-config-&pkg-config-lite-version; \
-    --with-pc-path=/usr/share/pkgconfig</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/pkg-config-lite.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/pkg-config-lite.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/pkg-config-lite.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/pkg-config-lite.xml"
-    xpointer="xpointer(//*[@os='e2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/pkg-config-lite.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/pkg-config-lite.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <para os="m1">On multilib builds the library direcory has been removed from
-    the default search path of <command>pkg-config</command>. Set some
-    environment variables to help set the path correctly in the future:</para>
-
-<screen os="m2"><userinput>export PKG_CONFIG_PATH32="/usr/lib/pkgconfig"
-export PKG_CONFIG_PATH64="/usr/lib64/pkgconfig"</userinput></screen>
-
-    <para os="m3">Export these variables to prevent any issues in the
-    future.</para>
-
-<screen os="m4"><userinput>cat &gt;&gt; /root/.bash_profile &lt;&lt; EOF
-export PKG_CONFIG_PATH32="${PKG_CONFIG_PATH32}"
-export PKG_CONFIG_PATH64="${PKG_CONFIG_PATH64}"
-EOF</userinput></screen>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/pkg-config-lite.xml"
-  xpointer="xpointer(id('contents-pkg-config-lite'))"/>
-
-</sect1>
Index: OK/final-system/multilib/procps-ng-64bit.xml
===================================================================
--- BOOK/final-system/multilib/procps-ng-64bit.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,76 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-procps-ng" role="wrap">
-  <?dbhtml filename="procps-ng-64bit.html"?>
-
-  <title>Procps-ng-&procps-ng-version; 64 Bit</title>
-
-  <indexterm zone="ch-system-procps-ng">
-    <primary sortas="a-Procps-ng">Procps-ng</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/procps-ng.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Procps-ng</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/procps-ng.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure \
-    --prefix=/usr \
-    --exec-prefix= \
-    --libdir=/usr/lib64 \
-    --docdir=/usr/share/doc/procps-ng-&procps-ng-version; \
-    --disable-kill</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/procps-ng.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/procps-ng.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/procps-ng.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/procps-ng.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/procps-ng.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/procps-ng.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/procps-ng.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/procps-ng.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-<screen os="k"><userinput>mv -v /usr/lib64/libprocps.so.* /lib64
-ln -sfv ../../lib64/$(readlink /usr/lib64/libprocps.so) /usr/lib64/libprocps.so</userinput></screen>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/procps-ng.xml"
-  xpointer="xpointer(id('contents-procps-ng'))"/>
-
-</sect1>
Index: OK/final-system/multilib/procps-ng-n32.xml
===================================================================
--- BOOK/final-system/multilib/procps-ng-n32.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,81 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-procps-ng-n32" role="wrap">
-  <?dbhtml filename="procps-ng-n32.html"?>
-
-  <title>Procps-ng-&procps-ng-version; N32 Libraries</title>
-
-  <indexterm zone="ch-system-procps-ng-n32">
-    <primary sortas="a-Procps-ng">Procps-ng</primary>
-    <secondary>N32</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/procps-ng.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Procps-ng</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/procps-ng.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure \
-    --prefix=/usr \
-    --exec-prefix= \
-    --libdir=/usr/lib32 \
-    --docdir=/usr/share/doc/procps-ng-&procps-ng-version; \
-    --disable-kill</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/procps-ng.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/procps-ng.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/procps-ng.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/procps-ng.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/procps-ng.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/procps-ng.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/procps-ng.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/procps-ng.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-<screen os="k"><userinput>mv -v /usr/lib32/libprocps.so.* /lib32
-ln -sfv ../../lib32/$(readlink /usr/lib32/libprocps.so) /usr/lib32/libprocps.so</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-file" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/procps-ng.xml
===================================================================
--- BOOK/final-system/multilib/procps-ng.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,85 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-procps-ng-32" role="wrap">
-  <?dbhtml filename="procps-ng.html"?>
-
-  <title>Procps-ng-&procps-ng-version; 32 Bit Libraries</title>
-
-  <indexterm zone="ch-system-procps-ng-32">
-    <primary sortas="a-Procps-ng">Procps-ng</primary>
-    <secondary>32 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/procps-ng.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Procps-ng</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/procps-ng.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure \
-    --prefix=/usr \
-    --exec-prefix= \
-    --libdir=/usr/lib \
-    --docdir=/usr/share/doc/procps-ng-&procps-ng-version; \
-    --disable-kill</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/procps-ng.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/procps-ng.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/procps-ng.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/procps-ng.xml"
-    xpointer="xpointer(//*[@os='note1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/procps-ng.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/procps-ng.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/procps-ng.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/procps-ng.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/procps-ng.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-<screen os="k"><userinput>mv -v /usr/lib/libprocps.so.* /lib
-ln -sfv ../../lib/$(readlink /usr/lib/libprocps.so) /usr/lib/libprocps.so</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-procps-ng" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/psmisc.xml
===================================================================
--- BOOK/final-system/multilib/psmisc.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,65 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-psmisc" role="wrap">
-  <?dbhtml filename="psmisc.html"?>
-
-  <title>Psmisc-&psmisc-version;</title>
-
-  <indexterm zone="ch-system-psmisc">
-    <primary sortas="a-Psmisc">Psmisc</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/psmisc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Psmisc</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/psmisc.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure \
-    --prefix=/usr</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/psmisc.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/psmisc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/psmisc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/psmisc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/psmisc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/psmisc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/psmisc.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/psmisc.xml"
-  xpointer="xpointer(id('contents-psmisc'))"/>
-
-</sect1>
Index: OK/final-system/multilib/readline-64bit.xml
===================================================================
--- BOOK/final-system/multilib/readline-64bit.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,88 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-readline" role="wrap">
-  <?dbhtml filename="readline-64bit.html"?>
-
-  <title>Readline-&readline-version; 64 Bit</title>
-
-  <indexterm zone="ch-system-readline">
-    <primary sortas="a-Readline">Readline</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/readline.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Readline</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="readline.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="readline.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/readline.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/readline.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="readline.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
-./configure \
-    --prefix=/usr \
-    --libdir=/lib64 \
-    --docdir=/usr/share/doc/readline-&readline-version;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="readline.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="readline.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="readline.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="readline.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="readline.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="readline.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-<screen os="i"><userinput>mv -v /lib64/lib{readline,history}.a /usr/lib64</userinput></screen>
-
-    <para os="j">Next, relink the dynamic libraries into <filename class="directory">/usr/lib64</filename> and remove the <filename class="extension">.so</filename> files in <filename class="directory">/lib64</filename>.</para>
-
-<screen os="k"><userinput>ln -svf ../../lib64/$(readlink /lib64/libreadline.so) /usr/lib64/libreadline.so
-ln -svf ../../lib64/$(readlink /lib64/libhistory.so) /usr/lib64/libhistory.so
-rm -v /lib64/lib{readline,history}.so</userinput></screen>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/readline.xml"
-  xpointer="xpointer(id('contents-readline'))"/>
-
-</sect1>
Index: OK/final-system/multilib/readline-n32.xml
===================================================================
--- BOOK/final-system/multilib/readline-n32.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,93 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-readline-n32" role="wrap">
-  <?dbhtml filename="readline-n32.html"?>
-
-  <title>Readline-&readline-version; N32 Libraries</title>
-
-  <indexterm zone="ch-system-readline-n32">
-    <primary sortas="a-Readline">Readline</primary>
-    <secondary>N32</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/readline.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Readline</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="readline.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="readline.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/readline.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/readline.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="readline.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" \
-./configure \
-    --prefix=/usr \
-    --libdir=/lib32 \
-    --docdir=/usr/share/doc/readline-&readline-version;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="readline.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="readline.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="readline.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="readline.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="readline.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="readline.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-<screen os="i"><userinput>mv -v /lib32/lib{readline,history}.a /usr/lib32</userinput></screen>
-
-    <para os="j">Next, relink the dynamic libraries into <filename class="directory">/usr/lib32</filename> and remove the <filename class="extension">.so</filename> files in <filename class="directory">/lib32</filename>.</para>
-
-<screen os="k"><userinput>ln -svf ../../lib32/$(readlink /lib32/libreadline.so) /usr/lib32/libreadline.so
-ln -svf ../../lib32/$(readlink /lib32/libhistory.so) /usr/lib32/libhistory.so
-rm -v /lib32/lib{readline,history}.so</userinput></screen>
-
-  </sect2>
-
- <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-file" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/readline.xml
===================================================================
--- BOOK/final-system/multilib/readline.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,97 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-readline-32" role="wrap">
-  <?dbhtml filename="readline.html"?>
-
-  <title>Readline-&readline-version; 32 Bit Libraries</title>
-
-  <indexterm zone="ch-system-readline-32">
-    <primary sortas="a-Readline">Readline</primary>
-    <secondary>32 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/readline.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Readline</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/readline.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/readline.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/readline.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/readline.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/readline.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
-./configure \
-    --prefix=/usr \
-    --libdir=/lib \
-    --docdir=/usr/share/doc/readline-&readline-version;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/readline.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/readline.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/readline.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/readline.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/readline.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/readline.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/readline.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/readline.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/readline.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-  </sect2>
-
- <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-readline" role="."/></para>
-
- </sect2>
-
-</sect1>
Index: OK/final-system/multilib/sed.xml
===================================================================
--- BOOK/final-system/multilib/sed.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,79 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-sed" role="wrap">
-  <?dbhtml filename="sed.html"?>
-
-  <title>Sed-&sed-version;</title>
-
-  <indexterm zone="ch-system-sed">
-    <primary sortas="a-Sed">Sed</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/sed.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Sed</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/sed.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure \
-    --prefix=/usr \
-    --bindir=/bin \
-    --docdir=/usr/share/doc/sed-&sed-version;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/sed.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/sed.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/sed.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/sed.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/sed.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/sed.xml"
-    xpointer="xpointer(//*[@os='g2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/sed.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/sed.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/sed.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/sed.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/sed.xml"
-  xpointer="xpointer(id('contents-sed'))"/>
-
-</sect1>
Index: OK/final-system/multilib/shadow.xml
===================================================================
--- BOOK/final-system/multilib/shadow.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,110 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-shadow" role="wrap">
-  <?dbhtml filename="shadow.html"?>
-
-  <title>Shadow-&shadow-version;</title>
-
-  <indexterm zone="ch-system-shadow">
-    <primary sortas="a-Shadow">Shadow</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/shadow.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Shadow</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-<screen os="c"><userinput>CC="gcc ${BUILD64}" ./configure \
-    --sysconfdir=/etc \
-    --with-group-name-max-length=32</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/shadow.xml"
-  xpointer="xpointer(id('conf-shadow'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/shadow.xml"
-  xpointer="xpointer(id('root-password'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/shadow.xml"
-  xpointer="xpointer(id('contents-shadow'))"/>
-
-</sect1>
Index: OK/final-system/multilib/stripping.xml
===================================================================
--- BOOK/final-system/multilib/stripping.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,52 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-stripping">
-  <?dbhtml filename="stripping.html"?>
-
-  <title>Stripping</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/stripping.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/stripping.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/stripping.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/stripping.xml"
-  xpointer="xpointer(//*[@os='d'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/stripping.xml"
-  xpointer="xpointer(//*[@os='e'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/stripping.xml"
-  xpointer="xpointer(//*[@os='f'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/stripping.xml"
-  xpointer="xpointer(//*[@os='g'])"/>
-
-<screen os="h"><userinput>/tools/bin/find /{,usr/}{bin,lib,lib64,sbin} -type f \
-   -exec /tools/bin/strip --strip-debug '{}' ';'</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/stripping.xml"
-  xpointer="xpointer(//*[@os='i'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/stripping.xml"
-  xpointer="xpointer(//*[@os='j'])"/>
-
-</sect1>
Index: OK/final-system/multilib/systemd-64bit.xml
===================================================================
--- BOOK/final-system/multilib/systemd-64bit.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,143 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-<sect1 id="ch-system-systemd" role="wrap">
-  <?dbhtml filename="systemd-64bit.html"?>
-
-  <title>Systemd-&systemd-version;</title>
-
-  <indexterm zone="ch-system-systemd">
-    <primary sortas="a-systemd">Systemd</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/systemd.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Systemd</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='s3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='s4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='cc1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='cc2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD64}" PKG_CONFIG_PATH="${PKG_CONFIG_PATH64}" \
-./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --libexecdir=/usr/lib64 \
-    --docdir=/usr/share/doc/systemd-&systemd-version; \
-    --with-rootprefix="" \
-    --with-rootlibdir=/lib64 \
-    --enable-split-usr \
-    --disable-firstboot \
-    --disable-ldconfig \
-    --disable-lto \
-    --disable-sysusers \
-    --with-default-dnssec=no \
-    --with-kbd-loadkeys=/bin/loadkeys \
-    --with-kbd-setfont=/bin/setfont \
-    --with-dbuspolicydir=/etc/dbus-1/system.d \
-    --with-dbussessionservicedir=/usr/share/dbus-1/services \
-    --with-dbussystemservicedir=/usr/share/dbus-1/system-services \
-    --config-cache</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/systemd.xml"
-  xpointer="xpointer(id('conf-systemd'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/systemd.xml"
-  xpointer="xpointer(id('contents-systemd'))"/>
-
-</sect1>
Index: OK/final-system/multilib/systemd-n32.xml
===================================================================
--- BOOK/final-system/multilib/systemd-n32.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,84 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-systemd-n32" role="wrap">
-  <?dbhtml filename="systemd-n32.html"?>
-
-  <title>Systemd-&systemd-version; N32 Libraries</title>
-
-  <indexterm zone="ch-system-systemd-n32">
-    <primary sortas="a-systemd">Systemd</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/systemd.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of systemd</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='cc1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='cc2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILDN32}" PKG_CONFIG_PATH="${PKG_CONFIG_PATHN32}" \
-./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --libexecdir=/usr/lib32 \
-    --docdir=/usr/share/doc/systemd-&systemd-version; \
-    --with-rootprefix="" \
-    --with-rootlibdir=/lib32 \
-    --enable-split-usr \
-    --disable-firstboot \
-    --disable-ldconfig \
-    --disable-lto \
-    --disable-sysusers \
-    --with-default-dnssec=no \
-    --with-kbd-loadkeys=/bin/loadkeys \
-    --with-kbd-setfont=/bin/setfont \
-    --with-dbuspolicydir=/etc/dbus-1/system.d \
-    --with-dbussessionservicedir=/usr/share/dbus-1/services \
-    --with-dbussystemservicedir=/usr/share/dbus-1/system-services \
-    --config-cache</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-systemd" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/systemd.xml
===================================================================
--- BOOK/final-system/multilib/systemd.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,85 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-systemd-32" role="wrap">
-  <?dbhtml filename="systemd.html"?>
-
-  <title>Systemd-&systemd-version; 32 Bit Libraries</title>
-
-  <indexterm zone="ch-system-systemd-32">
-    <primary sortas="a-systemd">Systemd</primary>
-    <secondary>32 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/systemd.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Systemd</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='cc1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='cc2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen><userinput>CC="gcc ${BUILD32}" PKG_CONFIG_PATH="${PKG_CONFIG_PATH32}" \
-./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --libexecdir=/usr/lib \
-    --docdir=/usr/share/doc/systemd-&systemd-version; \
-    --with-rootprefix="" \
-    --with-rootlibdir=/lib \
-    --enable-split-usr \
-    --disable-firstboot \
-    --disable-ldconfig \
-    --disable-lto \
-    --disable-sysusers \
-    --with-default-dnssec=no \
-    --with-kbd-loadkeys=/bin/loadkeys \
-    --with-kbd-setfont=/bin/setfont \
-    --with-dbuspolicydir=/etc/dbus-1/system.d \
-    --with-dbussessionservicedir=/usr/share/dbus-1/services \
-    --with-dbussystemservicedir=/usr/share/dbus-1/system-services \
-    --config-cache</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-systemd" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/tar.xml
===================================================================
--- BOOK/final-system/multilib/tar.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,72 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-tar" role="wrap">
-  <?dbhtml filename="tar.html"?>
-
-  <title>Tar-&tar-version;</title>
-
-  <indexterm zone="ch-system-tar">
-    <primary sortas="a-Tar">Tar</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/tar.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Tar</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/tar.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>FORCE_UNSAFE_CONFIGURE=1 CC="gcc ${BUILD64}" \
-./configure \
-    --prefix=/usr \
-    --bindir=/bin \
-    --libexecdir=/usr/sbin</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/tar.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/tar.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/tar.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/tar.xml"
-    xpointer="xpointer(//*[@os='e2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/tar.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/tar.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/tar.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/tar.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/tar.xml"
-  xpointer="xpointer(id('contents-tar'))"/>
-
-</sect1>
Index: OK/final-system/multilib/temp-perl.xml
===================================================================
--- BOOK/final-system/multilib/temp-perl.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,87 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-temp-perl" role="wrap">
-  <?dbhtml filename="temp-perl.html"?>
-
-  <title>Temporary Perl-&perl-version;</title>
-
-  <indexterm zone="ch-system-temp-perl">
-    <primary sortas="a-Perl">Perl</primary>
-    <secondary>temporary tools</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/perl.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Perl</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/temp-perl.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/temp-perl.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/temp-perl.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/temp-perl.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>./configure.gnu \
-    --prefix=/tools \
-    -Dcc="gcc ${BUILD32}"</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/temp-perl.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/temp-perl.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/temp-perl.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/temp-perl.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/temp-perl.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/temp-perl.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/temp-perl.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/temp-perl.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-perl" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/texinfo.xml
===================================================================
--- BOOK/final-system/multilib/texinfo.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,69 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-texinfo" role="wrap">
-  <?dbhtml filename="texinfo.html"?>
-
-  <title>Texinfo-&texinfo-version;</title>
-
-  <indexterm zone="ch-system-texinfo">
-    <primary sortas="a-Texinfo">Texinfo</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/texinfo.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Texinfo</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/texinfo.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure \
-    --prefix=/usr</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/texinfo.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/texinfo.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/texinfo.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/texinfo.xml"
-    xpointer="xpointer(//*[@os='e2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/texinfo.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/texinfo.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/texinfo.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/texinfo.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/texinfo.xml"
-  xpointer="xpointer(id('contents-texinfo'))"/>
-
-</sect1>
Index: OK/final-system/multilib/util-linux-64bit-pass1.xml
===================================================================
--- BOOK/final-system/multilib/util-linux-64bit-pass1.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,69 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-util-linux-pass1" role="wrap">
-  <?dbhtml filename="util-linux-pass1.html"?>
-
-  <title>Util-linux-&util-linux-version; 64bit Pass 1</title>
-
-  <indexterm zone="ch-system-util-linux-pass1">
-    <primary sortas="a-Util-linux">Util-linux</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/util-linux.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Util-linux 64 Bit Pass 1</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="be"><userinput>./configure ADJTIME_PATH=/var/lib/hwclock/adjtime \
-    --libdir=/lib64 \
-    --enable-write \
-    --disable-chfn-chsh \
-    --disable-login \
-    --disable-nologin \
-    --disable-su \
-    --disable-setpriv \
-    --disable-runuser \
-    --docdir=/usr/share/doc/util-linux-&util-linux-version;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-util-linux" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/util-linux-64bit.xml
===================================================================
--- BOOK/final-system/multilib/util-linux-64bit.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,78 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-util-linux" role="wrap">
-  <?dbhtml filename="util-linux-64bit.html"?>
-
-  <title>Util-linux-&util-linux-version; 64 Bit</title>
-
-  <indexterm zone="ch-system-util-linux">
-    <primary sortas="a-Util-linux">Util-linux</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/util-linux.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/util-linux.xml"
-  xpointer="xpointer(//*[@id='fhs-util-linux'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Util-linux</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure \
-    ADJTIME_PATH=/var/lib/hwclock/adjtime \
-    --libdir=/lib64 \
-    --enable-write \
-    --disable-chfn-chsh \
-    --disable-login \
-    --disable-nologin \
-    --disable-su \
-    --disable-setpriv \
-    --disable-runuser \
-    --docdir=/usr/share/doc/util-linux-&util-linux-version;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='f2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/util-linux.xml"
-  xpointer="xpointer(id('contents-util-linux'))"/>
-
-</sect1>
Index: OK/final-system/multilib/util-linux-n32.xml
===================================================================
--- BOOK/final-system/multilib/util-linux-n32.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,79 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-util-linux-n32" role="wrap">
-  <?dbhtml filename="util-linux-n32.html"?>
-
-  <title>Util-linux-&util-linux-version; N32 Libraries</title>
-
-  <indexterm zone="ch-system-util-linux-n32">
-    <primary sortas="a-Util-linux">Util-linux</primary>
-    <secondary>N32</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/util-linux.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Util-linux</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure \
-    ADJTIME_PATH=/var/lib/hwclcock/adjtime \
-    --libdir=/lib32 \
-    --enable-write \
-    --disable-chfn-chsh \
-    --disable-login \
-    --disable-nologin \
-    --disable-su \
-    --disable-setpriv \
-    --disable-runuser \
-    --docdir=/usr/share/doc/util-linux-&util-linux-version;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='f2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-util-linux" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/util-linux.xml
===================================================================
--- BOOK/final-system/multilib/util-linux.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,79 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-util-linux-32" role="wrap">
-  <?dbhtml filename="util-linux.html"?>
-
-  <title>Util-linux-&util-linux-version; 32 Bit</title>
-
-  <indexterm zone="ch-system-util-linux-32">
-    <primary sortas="a-Util-linux">Util-linux 32 Bit Libraries</primary>
-    <secondary>32 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/util-linux.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Util-linux</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure \
-    ADJTIME_PATH=/var/lib/hwclock/adjtime \
-    --libdir=/lib \
-    --enable-write \
-    --disable-chfn-chsh \
-    --disable-login \
-    --disable-nologin \
-    --disable-su \
-    --disable-setpriv \
-    --disable-runuser \
-    --docdir=/usr/share/doc/util-linux-&util-linux-version;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='f2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-util-linux" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/vim.xml
===================================================================
--- BOOK/final-system/multilib/vim.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,110 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-vim" role="wrap">
-  <?dbhtml filename="vim.html"?>
-
-  <title>Vim-&vim-version;</title>
-
-  <indexterm zone="ch-system-vim">
-    <primary sortas="a-Vim">Vim</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/vim.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Vim</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/vim.xml"
-    xpointer="xpointer(//*[@os='t1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/vim.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/vim.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/vim.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/vim.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/vim.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-<screen os="e"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
-./configure \
-    --prefix=/usr</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/vim.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/vim.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/vim.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/vim.xml"
-    xpointer="xpointer(//*[@os='i2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/vim.xml"
-    xpointer="xpointer(//*[@os='i3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/vim.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/vim.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/vim.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/vim.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/vim.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/vim.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/vim.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/vim.xml"
-  xpointer="xpointer(id('conf-vim'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/vim.xml"
-  xpointer="xpointer(id('contents-vim'))"/>
-
-</sect1>
Index: OK/final-system/multilib/xml-parser-64bit.xml
===================================================================
--- BOOK/final-system/multilib/xml-parser-64bit.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,60 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-xml-parser" role="wrap">
-  <?dbhtml filename="xml-parser-64bit.html"?>
-
-  <title>XML-Parser-&xml-parser-version; 64 Bit</title>
-
-  <indexterm zone="ch-system-xml-parser">
-    <primary sortas="a-XML-Parser">XML::Parser</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/xml-parser.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of XML-Parser</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/xml-parser.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>USE_ARCH=64 perl Makefile.PL</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/xml-parser.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/xml-parser.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/xml-parser.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/xml-parser.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/xml-parser.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/xml-parser.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/xml-parser.xml"
-  xpointer="xpointer(id('contents-xml-parser'))"/>
-
-</sect1>
Index: OK/final-system/multilib/xml-parser-n32.xml
===================================================================
--- BOOK/final-system/multilib/xml-parser-n32.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,65 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-xml-parser-n32" role="wrap">
-  <?dbhtml filename="xml-parser-n32.html"?>
-
-  <title>XML-Parser-&xml-parser-version; N32</title>
-
-  <indexterm zone="ch-system-xml-parser-32">
-    <primary sortas="a-XML-Parser">XML::Parser</primary>
-    <secondary>N32</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/xml-parser.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of XML-Parser</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/xml-parser.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>USE_ARCH=n32 perl Makefile.PL</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/xml-parser.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/xml-parser.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/xml-parser.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/xml-parser.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/xml-parser.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/xml-parser.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-xml-parser" role="."/></para>
-
-  </sect2>
-</sect1>
-
Index: OK/final-system/multilib/xml-parser.xml
===================================================================
--- BOOK/final-system/multilib/xml-parser.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,65 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-xml-parser-32" role="wrap">
-  <?dbhtml filename="xml-parser.html"?>
-
-  <title>XML-Parser-&xml-parser-version; 32 Bit</title>
-
-  <indexterm zone="ch-system-xml-parser-32">
-    <primary sortas="a-XML-Parser">XML::Parser</primary>
-    <secondary>32 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/xml-parser.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of XML-Parser</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/xml-parser.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>USE_ARCH=32 perl Makefile.PL</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/xml-parser.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/xml-parser.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/xml-parser.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/xml-parser.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/xml-parser.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/xml-parser.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-xml-parser" role="."/></para>
-
-  </sect2>
-</sect1>
-
Index: OK/final-system/multilib/xz-64bit.xml
===================================================================
--- BOOK/final-system/multilib/xz-64bit.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,78 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-xz" role="wrap">
-  <?dbhtml filename="xz-64bit.html"?>
-
-  <title>XZ Utils-&xz-version; 64 Bit</title>
-
-  <indexterm zone="ch-system-xz">
-    <primary sortas="a-XZ Utils">XZ Utils</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/xz.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of XZ Utils</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="xz.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure \
-    --prefix=/usr \
-    --libdir=/usr/lib64 \
-    --docdir=/usr/share/doc/xz-&xz-version;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="xz.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="xz.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="xz.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="xz.xml"
-    xpointer="xpointer(//*[@os='e2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="xz.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="xz.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/xz.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/xz.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="xz.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-<screen os="k"><userinput>mv -v /usr/lib64/liblzma.so.* /lib64
-ln -sfv ../../lib64/$(readlink /usr/lib64/liblzma.so) /usr/lib64/liblzma.so</userinput></screen>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/xz.xml"
-  xpointer="xpointer(id('contents-xz'))"/>
-
-</sect1>
Index: OK/final-system/multilib/xz-n32.xml
===================================================================
--- BOOK/final-system/multilib/xz-n32.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,73 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-xz-n32" role="wrap">
-  <?dbhtml filename="xz-n32.html"?>
-
-  <title>XZ Utils-&xz-version; N32 Libraries</title>
-
-  <indexterm zone="ch-system-xz-n32">
-    <primary sortas="a-XZ Utils">XZ Utils</primary>
-    <secondary>N32</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/xz.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of XZ Utils</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="xz.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure \
-    --prefix=/usr \
-    --libdir=/usr/lib32 \
-    --docdir=/usr/share/doc/xz-&xz-version;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="xz.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="xz.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="xz.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="xz.xml"
-    xpointer="xpointer(//*[@os='e2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="xz.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-<screen os="g"><userinput>make install</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="xz.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-<screen os="k"><userinput>mv -v /usr/lib32/liblzma.so.* /lib32
-ln -sfv ../../lib32/$(readlink /usr/lib32/liblzma.so) /usr/lib32/liblzma.so</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-xz" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/xz.xml
===================================================================
--- BOOK/final-system/multilib/xz.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,75 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-xz-32" role="wrap">
-  <?dbhtml filename="xz.html"?>
-
-  <title>XZ Utils-&xz-version; 32 Bit Libraries</title>
-
-  <indexterm zone="ch-system-xz-32">
-    <primary sortas="a-XZ Utils">XZ Utils</primary>
-    <secondary>32 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/xz.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of XZ Utils</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/xz.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure \
-    --prefix=/usr \
-    --docdir=/usr/share/doc/xz-&xz-version;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/xz.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/xz.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/xz.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/xz.xml"
-    xpointer="xpointer(//*[@os='e2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/xz.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/xz.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/xz.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/xz.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-xz" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/zlib-64bit.xml
===================================================================
--- BOOK/final-system/multilib/zlib-64bit.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,82 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-zlib" role="wrap">
-  <?dbhtml filename="zlib-64bit.html"?>
-
-  <title>Zlib-&zlib-version; 64 Bit</title>
-
-  <indexterm zone="ch-system-zlib">
-    <primary sortas="a-Zlib">Zlib</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/zlib.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Zlib</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="zlib.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD64}" \
-CXX="g++ -isystem /usr/include ${BUILD64}" \
-LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64 ${BUILD64}" \
-./configure \
-    --prefix=/usr \
-    --libdir=/usr/lib64</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="zlib.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="zlib.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="zlib.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="zlib.xml"
-    xpointer="xpointer(//*[@os='e2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="zlib.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="zlib.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <para os="h">The previous command installed two <filename
-    class="extension">.so</filename> files into <filename
-    class="directory">/usr/lib64</filename>. We will move them into
-    <filename class="directory">/lib64</filename> and then recreate a link
-    in <filename class="directory">/usr/lib64</filename>:</para>
-
-<screen os="i"><userinput>mv -v /usr/lib64/libz.so.* /lib64
-ln -sfv ../../lib64/$(readlink /usr/lib64/libz.so) /usr/lib64/libz.so</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/zlib.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/zlib.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/zlib.xml"
-  xpointer="xpointer(id('contents-zlib'))"/>
-
-</sect1>
Index: OK/final-system/multilib/zlib-n32.xml
===================================================================
--- BOOK/final-system/multilib/zlib-n32.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,79 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-zlib-n32" role="wrap">
-  <?dbhtml filename="zlib-n32.html"?>
-
-  <title>Zlib-&zlib-version; N32 Libraries</title>
-
-  <indexterm zone="ch-system-zlib-n32">
-    <primary sortas="a-Zlib">Zlib</primary>
-    <secondary>N32</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/zlib.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Zlib</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="zlib.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILDN32}" \
-CXX="g++ -isystem /usr/include ${BUILDN32}" \
-LDFLAGS="-Wl,-rpath-link,/usr/lib32:/lib32 ${BUILDN32}" \
-./configure \
-    --prefix=/usr \
-    --libdir=/usr/lib32</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="zlib.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="zlib.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="zlib.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="zlib.xml"
-    xpointer="xpointer(//*[@os='e2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="zlib.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="zlib.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <para os="h">The previous command installed two <filename
-    class="extension">.so</filename> files into <filename
-    class="directory">/usr/lib32</filename>. We will move them into
-    <filename class="directory">/lib32</filename> and then recreate a link
-    in <filename class="directory">/usr/lib32</filename>:</para>
-
-<screen os="i"><userinput>mv -v /usr/lib32/libz.so.* /lib32
-ln -sfv ../../lib32/$(readlink /usr/lib32/libz.so) /usr/lib32/libz.so</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-zlib" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/zlib.xml
===================================================================
--- BOOK/final-system/multilib/zlib.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,77 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-zlib-32" role="wrap">
-  <?dbhtml filename="zlib.html"?>
-
-  <title>Zlib-&zlib-version; 32 Bit Libraries</title>
-
-  <indexterm zone="ch-system-zlib-32">
-    <primary sortas="a-Zlib">Zlib</primary>
-    <secondary>32 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/zlib.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Zlib</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/zlib.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD32}" \
-CXX="g++ -isystem /usr/include ${BUILD32}" \
-LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib ${BUILD32}" \
-./configure \
-    --prefix=/usr</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/zlib.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/zlib.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/zlib.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/zlib.xml"
-    xpointer="xpointer(//*[@os='e2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/zlib.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/zlib.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/zlib.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/zlib.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-zlib" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/ppc-chapter.xml
===================================================================
--- BOOK/final-system/ppc-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,89 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-building-system" xreflabel="Installing Basic System Software">
-  <?dbhtml dir="final-system"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Installing Basic System Software</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkgmgt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/testsuitesagain.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/temp-perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/linux-headers.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man-pages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/glibc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/adjusting.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/isl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/zlib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/flex.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bison.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/attr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/acl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux-pass1.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/procps-ng.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iana-etc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libtool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iproute2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gdbm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/readline.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/autoconf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/automake.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gperf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/groff.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/less.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iputils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kbd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libpipeline.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man-db.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/expat.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xml-parser.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dbus.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/hfsutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/parted.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/powerpc-utils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/yaboot.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/aboutdebug.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/stripping.xml"/>
-
-</chapter>
Index: OK/final-system/ppc/adjusting.xml
===================================================================
--- BOOK/final-system/ppc/adjusting.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,59 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-adjusting">
-  <?dbhtml filename="adjusting.html"?>
-
-  <title>Adjusting the Toolchain</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/adjusting.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/adjusting.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/adjusting.xml"
-  xpointer="xpointer(//*[@os='d'])"/>
-
-  <caution>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-<screen os="i"><computeroutput>[Requesting program interpreter: /lib/ld.so.1]</computeroutput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-  </caution>
-
-</sect1>
Index: OK/final-system/ppc/gcc.xml
===================================================================
--- BOOK/final-system/ppc/gcc.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,134 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-gcc" role="wrap">
-  <?dbhtml filename="gcc.html"?>
-
-  <title>GCC-&gcc-version;</title>
-
-  <indexterm zone="ch-system-gcc">
-    <primary sortas="a-GCC">GCC</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GCC</title>
-
-<!--GCC Branch Update Area
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='fix1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='fix2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='i1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-<screen os="k"><userinput>make STAGE1_CFLAGS="-g -O2"</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='y'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='z'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/gcc.xml"
-  xpointer="xpointer(id('contents-gcc'))"/>
-
-</sect1>
Index: OK/final-system/ppc/glibc.xml
===================================================================
--- BOOK/final-system/ppc/glibc.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,168 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-glibc" role="wrap">
-  <?dbhtml filename="glibc.html"?>
-
-  <title>Glibc-&glibc-version;</title>
-
-  <indexterm zone="ch-system-glibc">
-    <primary sortas="a-Glibc">Glibc</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Glibc</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='z'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='l1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='l2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-<screen os="h"><userinput>../glibc-&glibc-version;/configure \
-    --prefix=/usr \
-    --enable-kernel=&glibc-kernel-version; \
-    --libexecdir=/usr/lib/glibc \
-    --enable-stack-protector=no \
-    --enable-obsolete-rpc</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='u'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='v'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('i18n-glibc'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('conf-glibc'))"/>
-
-  <sect2 id="conf-ld" role="configuration">
-    <title>Configuring The Dynamic Loader</title>
-
-    <indexterm zone="conf-ld">
-      <primary sortas="e-/etc/ld.so.conf">/etc/ld.so.conf</primary>
-    </indexterm>
-
-    <para os="ld-a">By default, the dynamic loader (<filename
-    class="libraryfile">/lib/ld.so.1</filename>) searches through
-    <filename class="directory">/lib</filename> and <filename
-    class="directory">/usr/lib</filename> for dynamic libraries that are
-    needed by programs as they are run. However, if there are libraries in
-    directories other than <filename class="directory">/lib</filename> and
-    <filename class="directory">/usr/lib</filename>, these need to be
-    added to the <filename>/etc/ld.so.conf</filename> file in order
-    for the dynamic loader to find them. Two directories that are commonly
-    known to contain additional libraries are <filename
-    class="directory">/usr/local/lib</filename> and <filename
-    class="directory">/opt/lib</filename>, so add those directories to the
-    dynamic loader's search path.</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='ld-b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='ld-c'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('contents-glibc'))"/>
-
-</sect1>
Index: OK/final-system/ppc/hfsutils.xml
===================================================================
--- BOOK/final-system/ppc/hfsutils.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,223 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-hfsutils" role="wrap">
-  <?dbhtml filename="hfsutils.html"?>
-
-  <title>Hfsutils-&hfsutils-version;</title>
-
-  <indexterm zone="ch-system-hfsutils">
-    <primary sortas="a-Hfsutils">Hfsutils</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Hfsutils package contains a number of utilities for accessing
-    files on <systemitem class="filesystem">hfs</systemitem> filesystems.
-    It is needed to run <command>ybin</command>.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Hfsutils</title>
-
-    <para os="p1">Apply the following patch to add a missing
-    <filename>errno.h</filename> include and allow HFSutils to recognize
-    devices larger than 2GB:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&hfsutils-fixes-patch;</userinput></screen>
-
-    <para os="a">Prepare Hfsutils for compilation:</para>
-
-<screen><userinput>./configure \
-    --prefix=/usr \
-    --mandir=/usr/share/man</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">Install the package:</para>
-
-<screen os="f"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-hfsutils" role="content">
-    <title>Contents of Hfsutils</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>hattrib, hcd, hcopy, hdel, hdir, hfsutils, hformat, hls, hmkdir,
-        hmount, hpwd, hrename, hrmdir, humount, hvol (these are all hardlinks
-        to hfsutils).</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="hattrib">
-        <term><command>hattrib</command></term>
-        <listitem>
-          <para>Change FS file or directory attributes.</para>
-          <indexterm zone="ch-system-hfsutils hattrib">
-            <primary sortas="b-hattrib">hattrib</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hcd">
-        <term><command>hcd</command></term>
-        <listitem>
-          <para>Change working HFS directory.</para>
-          <indexterm zone="ch-system-hfsutils hcd">
-            <primary sortas="b-hcd">hcd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hcopy">
-        <term><command>hcopy</command></term>
-        <listitem>
-          <para>Copy files to or from an HFS volume.</para>
-          <indexterm zone="ch-system-hfsutils hcopy">
-            <primary sortas="b-hcopy">hcopy</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hdel">
-        <term><command>hdel</command></term>
-        <listitem>
-          <para>Delete both forks of an HFS file.</para>
-          <indexterm zone="ch-system-hfsutils hdel">
-            <primary sortas="b-hdel">hdel</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hdir">
-        <term><command>hdir</command></term>
-        <listitem>
-          <para>Display an HFS directory in long format.</para>
-          <indexterm zone="ch-system-hfsutils hdir">
-            <primary sortas="b-hdir">hdir</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hformat">
-        <term><command>hformat</command></term>
-        <listitem>
-          <para>Create a new HFS filesystem and make it current.</para>
-          <indexterm zone="ch-system-hfsutils hformat">
-            <primary sortas="b-hformat">hformat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hfsutils">
-        <term><command>hfsutils</command></term>
-        <listitem>
-          <para>Tools for accessing Macintosh HFS-formatted volumes.</para>
-          <indexterm zone="ch-system-hfsutils hfsutils">
-            <primary sortas="b-hfsutils">hfsutils</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hls">
-        <term><command>hls</command></term>
-        <listitem>
-          <para>List files in an HFS directory.</para>
-          <indexterm zone="ch-system-hfsutils hls">
-            <primary sortas="b-hls">hls</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hmkdir">
-        <term><command>hmkdir</command></term>
-        <listitem>
-          <para>Create a new HFS directory.</para>
-          <indexterm zone="ch-system-hfsutils hmkdir">
-            <primary sortas="b-hmkdir">hmkdir</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hmount">
-        <term><command>hmount</command></term>
-        <listitem>
-          <para>Introduce a new HFS volume and make it current.</para>
-          <indexterm zone="ch-system-hfsutils hmount">
-            <primary sortas="b-hmount">hmount</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hpwd">
-        <term><command>hpwd</command></term>
-        <listitem>
-          <para>Print the full path to the current HFS working directory.</para>
-          <indexterm zone="ch-system-hfsutils hpwd">
-            <primary sortas="b-hpwd">hpwd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hrename">
-        <term><command>hrename</command></term>
-        <listitem>
-          <para>Rename or move an HFS file or directory.</para>
-          <indexterm zone="ch-system-hfsutils hrename">
-            <primary sortas="b-hrename">hrename</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hrmdir">
-        <term><command>hrmdir</command></term>
-        <listitem>
-          <para>Remaove an empty HFS directory.</para>
-          <indexterm zone="ch-system-hfsutils hrmdir">
-            <primary sortas="b-hrmdir">hrmdir</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="humount">
-        <term><command>humount</command></term>
-        <listitem>
-          <para>Remove an HFS volume from the list of known volumes.</para>
-          <indexterm zone="ch-system-hfsutils humount">
-            <primary sortas="b-humount">humount</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hvol">
-        <term><command>hvol</command></term>
-        <listitem>
-          <para>Display or change the current HFS volume.</para>
-          <indexterm zone="ch-system-hfsutils hvol">
-            <primary sortas="b-hvol">hvol</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/ppc/parted.xml
===================================================================
--- BOOK/final-system/ppc/parted.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,114 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-parted" role="wrap">
-  <?dbhtml filename="parted.html"?>
-
-  <title>Parted-&parted-version;</title>
-
-  <indexterm zone="ch-system-parted">
-    <primary sortas="a-Parted">Parted</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>Parted is a program for creating, copying and modifying partitions,
-    and the file systems on them. Parted is especially useful on PPC machines
-    in that, unlike <command>fdisk</command>, it accurately reads Macintosh
-    partition maps.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Parted</title>
-
-    <para os="a">Prepare Parted for compilation:</para>
-
-<screen><userinput>./configure \
-    --prefix=/usr \
-    --disable-device-mapper</userinput></screen>
-
-    <variablelist os="b">
-      <title>The meaning of the configure options:</title>
-
-      <varlistentry os="b1">
-        <term><parameter>--disable-device-mapper</parameter></term>
-        <listitem>
-          <para>This disables the use of the device-mapper library, which we do
-          not install in CLFS.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para os="c">Compile the Parted package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">Install the package:</para>
-
-<screen os="f"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-parted" role="content">
-    <title>Contents of Parted</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed libraries</segtitle>
-
-      <seglistitem>
-        <seg>parted, partprobe</seg>
-        <seg>libparted.[a,so]</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="parted">
-        <term><command>parted</command></term>
-        <listitem>
-          <para>A program for creating, destroying, resizing, checking and
-          copying partitions, and the filesystems on them. This is useful
-          for creating space for new operating systems, reorganising disk
-          usage, copying data between hard disks, and disk imaging.</para>
-          <indexterm zone="ch-system-parted parted">
-            <primary sortas="e-parted">parted</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="partprobe">
-        <term><command>partprobe</command></term>
-        <listitem>
-          <para>Informs the OS of partition table changes.</para>
-          <indexterm zone="ch-system-parted partprobe">
-            <primary sortas="e-partprobe">partprobe</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libparted">
-        <term><filename class="libraryfile">libparted</filename></term>
-        <listitem>
-          <para>A library to manipulate partitions.</para>
-          <indexterm zone="ch-system-parted libparted">
-            <primary sortas="c-libparted">libparted</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/ppc/powerpc-utils.xml
===================================================================
--- BOOK/final-system/ppc/powerpc-utils.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,87 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-powerpc-utils" role="wrap">
-  <?dbhtml filename="powerpc-utils.html"?>
-
-  <title>Powerpc-Utils_&powerpcutils-version;</title>
-
-  <indexterm zone="ch-system-powerpc-utils">
-    <primary sortas="a-Powerpc-Utils">Powerpc-Utils</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Powerpc-Utils package contains a number of utilities for Power
-    Macintoshes and other similar machines.  Most of these utilities are now
-    obsolete, but <command>nvsetenv</command> is needed by <command>ybin</command>
-    to install the bootloader on an hfs partition.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Powerpc-Utils</title>
-
-    <para os="a">This package, originally pmac-utils, has issues with
-    NewWorld Macintoshes. The following patch fixes these issues
-    and generally updates the package:</para>
-
-<screen os="b"><userinput>patch -Np1 -i ../&powerpcutils-patch;</userinput></screen>
-
-    <para os="c">Compile the needed programs:</para>
-
-<screen os="d"><userinput>make nvsetenv nvsetvol</userinput></screen>
-
-    <para os="e">Install the package:</para>
-
-<screen os="f"><userinput>install -v -m755 nvsetenv nvsetvol /usr/sbin
-install -v -m644 nvsetenv.8 nvsetvol.8 /usr/share/man/man8</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-powerpc-utils" role="content">
-    <title>Contents of Powerpc-Utils</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>nvsetenv, nvsetvol</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="nvsetenv">
-        <term><command>nvsetenv</command></term>
-        <listitem>
-          <para>Manipulate variables in the non-volatile RAM.</para>
-          <indexterm zone="ch-system-powerpc-utils nvsetenv">
-            <primary sortas="b-nvsetenv">nvsetenv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="nvsetvol">
-        <term><command>nvsetvol</command></term>
-        <listitem>
-          <para>Adjust the volume of the boot-up chime on Macintoshes.</para>
-          <indexterm zone="ch-system-powerpc-utils nvsetvol">
-            <primary sortas="b-nvsetvol">nvsetvol</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/ppc/yaboot.xml
===================================================================
--- BOOK/final-system/ppc/yaboot.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,166 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-yaboot" role="wrap">
-  <?dbhtml filename="yaboot.html"?>
-
-  <title>Yaboot-&yaboot-version;</title>
-
-  <indexterm zone="ch-system-yaboot">
-    <primary sortas="a-Yaboot">Yaboot</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Yaboot package contains a PowerPC Boot Loader for machines using
-    Open Firmware such as NewWorld Macintoshes.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Yaboot</title>
-
-    <para os="p3">The following patch adds stub functions for newer e2fsprogs releases:</para>
-
-<screen os="p4"><userinput>patch -Np1 -i ../&yaboot-stubfuncs-patch;</userinput></screen>
-
-    <para os="p5">The following patch adds Parted support to yabootconfig:</para>
-
-<screen os="p6"><userinput>patch -Np1 -i ../&yaboot-parted-patch;</userinput></screen>
-
-    <para os="a">The supplied man pages have <filename
-    class="directory">/usr/local</filename> in the text. This sed will correct
-    that:</para>
-
-<screen os="b"><userinput>sed -i 's%/usr/local%/usr%' man/*</userinput></screen>
-
-    <para os="aa"> Prevent the build from failing due to warnings with
-    the following sed:</para>
-
-<screen os="ba"><userinput>sed -i 's%-Werror%%' Makefile</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make PREFIX=/usr</userinput></screen>
-
-    <para os="e">Install the package:</para>
-
-<screen os="f"><userinput>make PREFIX=/usr install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-yaboot" role="content">
-    <title>Contents of Yaboot</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed files</segtitle>
-
-      <seglistitem>
-        <seg>addnote, mkofboot (link to ybin), ofboot, ofpath, yaboot,
-        yabootconfig, ybin</seg>
-        <seg>yaboot.conf</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="addnote">
-        <term><command>addnote</command></term>
-  <listitem>
-    <para>For IBM CHRP machines, add a PT_NOTE program header
-    entry to an elf file so that it can be booted.</para>
-    <indexterm zone="ch-system-yaboot addnote">
-      <primary sortas="b-addnote">addnote</primary>
-    </indexterm>
-  </listitem>
-      </varlistentry>
-
-      <varlistentry id="mkofboot">
-        <term><command>mkofboot</command></term>
-        <listitem>
-          <para>Format the bootstrap partition and install the yaboot
-          boot loader.</para>
-          <indexterm zone="ch-system-yaboot mkofboot">
-            <primary sortas="b-mkofboot">mkofboot</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ofboot">
-        <term><command>ofboot</command></term>
-        <listitem>
-          <para>Script to format the boot menu using yaboot.conf and
-    write the resulting Open Firmware code to the bootstrap.</para>
-          <indexterm zone="ch-system-yaboot ofboot">
-            <primary sortas="b-ofboot">ofboot</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ofpath">
-        <term><command>ofpath</command></term>
-        <listitem>
-          <para>Determine Open Firmware path corresponding to a device
-    node.</para>
-          <indexterm zone="ch-system-yaboot ofpath">
-            <primary sortas="b-ofpath">ofpath</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="yaboot">
-        <term><command>yaboot</command></term>
-        <listitem>
-          <para>Open Firmware boot loader.</para>
-          <indexterm zone="ch-system-yaboot yaboot">
-            <primary sortas="b-yaboot">yaboot</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="yabootconfig">
-        <term><command>yabootconfig</command></term>
-        <listitem>
-          <para>Generate and install a simple yaboot.conf.</para>
-          <indexterm zone="ch-system-yaboot yabootconfig">
-            <primary sortas="b-yabootconfig">yabootconfig</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ybin">
-        <term><command>ybin</command></term>
-        <listitem>
-          <para>Shell script to update or install the boot loader
-    on a bootstrap partition.</para>
-          <indexterm zone="ch-system-yaboot ybin">
-            <primary sortas="b-ybin">ybin</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="yaboot.conf">
-        <term><filename>yaboot.conf</filename></term>
-        <listitem>
-          <para>Configuration file used by <command>ybin</command> to determine
-    how to install <command>yaboot</command> on the bootstrap partition.</para>
-          <indexterm zone="ch-system-yaboot yaboot.conf">
-            <primary sortas="e-yaboot.conf">yaboot.conf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/ppc64-64-chapter.xml
===================================================================
--- BOOK/final-system/ppc64-64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,89 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-building-system" xreflabel="Installing Basic System Software">
-  <?dbhtml dir="final-system"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Installing Basic System Software</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkgmgt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/testsuitesagain.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/temp-perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/linux-headers.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man-pages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64-64/glibc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/adjusting.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/isl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/zlib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/flex.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bison.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/attr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/acl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux-pass1.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/procps-ng.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iana-etc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libtool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iproute2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gdbm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/readline.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/autoconf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/automake.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gperf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/groff.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/less.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iputils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kbd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libpipeline.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man-db.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/expat.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xml-parser.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dbus.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/hfsutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/parted.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/powerpc-utils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64-64/yaboot.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/aboutdebug.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/stripping.xml"/>
-
-</chapter>
Index: OK/final-system/ppc64-64/glibc.xml
===================================================================
--- BOOK/final-system/ppc64-64/glibc.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,171 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-glibc" role="wrap">
-  <?dbhtml filename="glibc.html"?>
-
-  <title>Glibc-&glibc-version;</title>
-
-  <indexterm zone="ch-system-glibc">
-    <primary sortas="a-Glibc">Glibc</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Glibc</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='z'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='l1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='l2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64-64/glibc.xml"
-    xpointer="xpointer(//*[@os='l3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64-64/glibc.xml"
-    xpointer="xpointer(//*[@os='l4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64-64/glibc.xml"
-    xpointer="xpointer(//*[@os='l5'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64-64/glibc.xml"
-    xpointer="xpointer(//*[@os='l6'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-<screen os="h"><userinput>CC="gcc ${BUILD64}" ../glibc-&glibc-version;/configure \
-    --prefix=/usr \
-    --enable-kernel=&glibc-kernel-version; \
-    --libexecdir=/usr/lib/glibc \
-    --libdir=/usr/lib \
-    --enable-obsolete-rpc \
-    --enable-stack-protector=strong \
-    --cache-file=config.cache</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64-64/glibc.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
-
-    <para>The install will finish by checking that everything is correctly installed.
-    Unfortunately, it will test for a multilib installation. On PPC64 Pure64 this means
-    it will try to test the non-existent 32-bit loader which has a different name
-    from the 64-bit loader (unlike on other 64-bit architectures).  We fool it by
-    creating a symlink to the real loader.</para>
-
-<screen><userinput>ln -sv &glibc-ld-name; /lib/ld.so.1</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-    <para>Now we can remove this symlink:</para>
-
-<screen><userinput>rm -v /lib/ld.so.1</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='u'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='v'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('i18n-glibc'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('conf-glibc'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('conf-ld'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('contents-glibc'))"/>
-
-</sect1>
Index: OK/final-system/ppc64-64/yaboot.xml
===================================================================
--- BOOK/final-system/ppc64-64/yaboot.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,122 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-yaboot" role="wrap">
-  <?dbhtml filename="yaboot.html"?>
-
-  <title>Yaboot-&yaboot-version;</title>
-
-  <indexterm zone="ch-system-yaboot">
-    <primary sortas="a-Yaboot">Yaboot</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../ppc/yaboot.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Yaboot</title>
-
-    <para>Yaboot defaults to build as 32bit, so we need to pass appropriate
-    options to both the compiler and the linker.  To prevent the build from
-    failing due to compiler warnings, the -Werror flag is removed.  The
-    Makefile already overrides any CC and ignores LDFLAGS in favour of
-    its own variables, so we need to use the following seds for a
-    successful compile and install.</para>
-
-<screen><userinput>sed -i -e "s/m32/m64/g" \
-    -e "s/-Werror//" \
-    -e "s/elf32ppclinux/elf64ppc/" Makefile
-</userinput></screen>
-
-    <variablelist os="j">
-      <title>The meaning of the sed parameters:</title>
-
-      <varlistentry>
-        <term><parameter>"s/m32/m64/g"</parameter></term>
-        <listitem>
-          <para>Replaces -m32 with -m64 to force <command>gcc</command> to
-          create 64-bit code when compiling yaboot.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><parameter>"s/-Werror//"</parameter></term>
-        <listitem>
-          <para>This deletes the -Werror flag from the Makefile.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><parameter>"s/elf32ppclinux/elf64ppc/"</parameter></term>
-        <listitem>
-          <para>This replaces the 32 bit emulation with a 64 bit emulation
-          flag to force <command>ld</command> to use a suitable 64-bit
-          emulation picked from the output of <command>'ld -V'</command>.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='p5'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='p6'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>make PREFIX=/usr</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <important os="j0">
-      <para>The install of yaboot can fail if you miss any of the
-      patches or seds. <command>ld</command> will issue warnings,
-      but the install will appear to complete successfully. That
-      would result in an unbootable system, so you need to log the
-      output to check it.</para>
-    </important>
-
-<screen os='f'><userinput>make PREFIX=/usr install 2&gt;&amp;1 | tee instlog</userinput></screen>
-
-    <para os='g'>To ensure that the install was successful, run the following
-    command:</para>
-
-<screen os='h'><userinput>grep 'powerpc:common64' instlog</userinput></screen>
-
-    <para os='i'>If the command gave you <emphasis>any</emphasis> output
-    (... is incompatible with powerpc:common output) the build of yaboot is
-    broken and you will have to correct your error(s) and repeat it.</para>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../ppc/yaboot.xml"
-  xpointer="xpointer(id('contents-yaboot'))"/>
-
-</sect1>
Index: OK/final-system/ppc64-chapter.xml
===================================================================
--- BOOK/final-system/ppc64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,119 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-building-system" xreflabel="Installing Basic System Software">
-  <?dbhtml dir="final-system"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Installing Basic System Software</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkgmgt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/testsuitesagain.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/temp-perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/linux-headers.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man-pages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/glibc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/glibc-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/adjusting.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/m4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gmp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gmp-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/mpfr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/mpfr-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/mpc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/mpc-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/isl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/isl-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/zlib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/zlib-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flex.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flex-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/multiarch_wrapper.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/attr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/attr-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/acl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/acl-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/pkg-config-lite.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/ncurses-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/shadow.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux-64bit-pass1.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/procps-ng.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/procps-ng-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iana-etc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/libtool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libtool-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/iproute2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gdbm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gdbm-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/perl-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/readline.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/readline-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/autoconf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/automake.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/file-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gettext-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gperf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/groff.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/less.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/iputils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kbd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libpipeline.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libpipeline-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/man-db.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/make.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/expat.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/expat-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xml-parser.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xml-parser-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/psmisc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/systemd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/systemd-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dbus.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dbus-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/tar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/vim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/hfsutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/parted.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/powerpc-utils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/yaboot.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/aboutdebug.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/stripping.xml"/>
-
-</chapter>
Index: OK/final-system/ppc64/adjusting.xml
===================================================================
--- BOOK/final-system/ppc64/adjusting.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,79 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-adjusting">
-  <?dbhtml filename="adjusting.html"?>
-
-  <title>Adjusting the Toolchain</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/adjusting.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../multilib/adjusting.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/adjusting.xml"
-  xpointer="xpointer(//*[@os='d'])"/>
-
-  <caution>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/adjusting.xml"
-    xpointer="xpointer(//*[@os='m2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/adjusting.xml"
-    xpointer="xpointer(//*[@os='m3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/adjusting.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/adjusting.xml"
-    xpointer="xpointer(//*[@os='m4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/adjusting.xml"
-    xpointer="xpointer(//*[@os='m5'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-<screen><computeroutput>[Requesting program interpreter: /lib64/ld64.so.1]</computeroutput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/adjusting.xml"
-    xpointer="xpointer(//*[@os='m7'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-  </caution>
-
-</sect1>
Index: OK/final-system/ppc64/gcc.xml
===================================================================
--- BOOK/final-system/ppc64/gcc.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,144 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-gcc" role="wrap">
-  <?dbhtml filename="gcc.html"?>
-
-  <title>GCC-&gcc-version;</title>
-
-  <indexterm zone="ch-system-gcc">
-    <primary sortas="a-GCC">GCC</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GCC</title>
-
-<!--GCC Branch Update Area
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='fix1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='fix2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/gcc.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='i1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/gcc.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/gcc.xml"
-    xpointer="xpointer(//*[@os='y'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/gcc.xml"
-    xpointer="xpointer(//*[@os='z'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/gcc.xml"
-  xpointer="xpointer(id('contents-gcc'))"/>
-
-</sect1>
Index: OK/final-system/ppc64/glibc-64bit.xml
===================================================================
--- BOOK/final-system/ppc64/glibc-64bit.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,169 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-glibc" role="wrap">
-  <?dbhtml filename="glibc-64bit.html"?>
-
-  <title>Glibc-&glibc-version; 64-Bit</title>
-
-  <indexterm zone="ch-system-glibc">
-    <primary sortas="a-Glibc">Glibc</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="glibc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Glibc</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='l1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='l2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <para os="m1">Configure Glibc to install its 64-bit libraries into
-    <filename class="directory">/lib64</filename>:</para>
-
-<screen os="m2"><userinput>echo "libc_cv_slibdir=/lib64" &gt;&gt; config.cache</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-<screen os="h"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
-../glibc-&glibc-version;/configure \
-    --prefix=/usr \
-    --enable-kernel=&glibc-kernel-version; \
-    --libexecdir=/usr/lib64/glibc \
-    --libdir=/usr/lib64 \
-    --enable-obsolete-rpc \
-    --enable-stack-protector=strong \
-    --cache-file=config.cache</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='u'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='v'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('i18n-glibc'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('conf-glibc'))"/>
-
-  <sect2 id="conf-ld" role="configuration">
-    <title>Configuring The Dynamic Loader</title>
-
-    <indexterm zone="conf-ld">
-      <primary sortas="e-/etc/ld.so.conf">/etc/ld.so.conf</primary>
-    </indexterm>
-
-    <para>By default, the dynamic loader (<filename
-    class="libraryfile">/lib/ld.so.1</filename> for 32bit executables and
-    <filename class="libraryfile">/lib/ld64.so</filename> for
-    64bit executables) searches through
-    <filename class="directory">/lib</filename>,
-    <filename class="directory">/lib64</filename>,
-    <filename class="directory">/usr/lib</filename>,
-    and <filename class="directory">/usr/lib64</filename> for dynamic
-    libraries that are needed by programs as they are run. However, if
-    there are libraries in directories other than these, they need to be
-    added to the <filename>/etc/ld.so.conf</filename> file in order
-    for the dynamic loader to find them. Some directories that are commonly
-    known to contain additional libraries are
-    <filename class="directory">/usr/local/lib</filename>,
-    <filename class="directory">/usr/local/lib64</filename>,
-    <filename class="directory">/opt/lib</filename>,
-    and <filename class="directory">/opt/lib64</filename>,
-    so add those directories to the dynamic loader's search path.</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='ld-b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='ld-c'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('contents-glibc'))"/>
-
-</sect1>
Index: OK/final-system/ppc64/glibc.xml
===================================================================
--- BOOK/final-system/ppc64/glibc.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,144 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-glibc-32" role="wrap">
-  <?dbhtml filename="glibc.html"?>
-
-  <title>Glibc-&glibc-version; 32 Bit Libraries</title>
-
-  <indexterm zone="ch-system-glibc-32">
-    <primary sortas="a-Glibc">Glibc</primary>
-    <secondary>32 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Glibc</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='z'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='l1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='l2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <para os="u1">The powerpc (32) architecture is expected to fail the
-    check-textrel tests because it cannot protect some elf segments in
-    shared libraries from being executable and writable. Using the default
-    64-bit compiler means the test runs as <literal>__powerpc64__</literal>
-    which is <emphasis>not</emphasis> expected to fail. The problem only exists
-    in 32-bit, the 64-bit ABI allows the segments to be protected.</para>
-
-    <para os="u2">Other distributions alter gcc to default to 32-bits and
-    so do not see this failure.  Whether they then test correctly on 64-bit
-    libraries is not our problem.</para>
-
-    <para os="u3">Force the test to use the 32-bit compiler with the following
-    <command>sed</command> :</para>
-
-<screen os="u4"><userinput>sed -i "s/\(^check-textrel-CFLAGS = \)/\1 ${BUILD32} /" elf/Makefile</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-<screen os="h"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
-../glibc-&glibc-version;/configure \
-    --prefix=/usr \
-    --enable-kernel=&glibc-kernel-version; \
-    --libexecdir=/usr/lib/glibc \
-    --host=${CLFS_TARGET32} \
-    --enable-stack-protector=strong \
-    --enable-obsolete-rpc</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc.xml"
-    xpointer="xpointer(//*[@os='l1b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc.xml"
-    xpointer="xpointer(//*[@os='l2b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-glibc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/ppc64/hfsutils.xml
===================================================================
--- BOOK/final-system/ppc64/hfsutils.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,62 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-hfsutils" role="wrap">
-  <?dbhtml filename="hfsutils.html"?>
-
-  <title>Hfsutils-&hfsutils-version;</title>
-
-  <indexterm zone="ch-system-hfsutils">
-    <primary sortas="a-Hfsutils">Hfsutils</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../ppc/hfsutils.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Hfsutils</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/hfsutils.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/hfsutils.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/hfsutils.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen><userinput>CC="gcc ${BUILD64}" ./configure \
-    --prefix=/usr \
-    --mandir=/usr/share/man</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/hfsutils.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/hfsutils.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/hfsutils.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/hfsutils.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../ppc/hfsutils.xml"
-  xpointer="xpointer(id('contents-hfsutils'))"/>
-
-</sect1>
Index: OK/final-system/ppc64/libtool.xml
===================================================================
--- BOOK/final-system/ppc64/libtool.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,90 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-libtool-32" role="wrap">
-  <?dbhtml filename="libtool.html"?>
-
-  <title>Libtool-&libtool-version; 32 Bit Libraries</title>
-
-  <indexterm zone="ch-system-libtool-32">
-    <primary sortas="a-Libtool">Libtool</primary>
-    <secondary>32 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/libtool.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Libtool</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/libtool.xml"
-    xpointer="xpointer(//*[@os='a1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/libtool.xml"
-    xpointer="xpointer(//*[@os='a2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libtool.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/libtool.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libtool.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libtool.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <para os="e">To test the results, issue:
-    <userinput>make LDEMULATION=elf32ppc check</userinput>.</para>
-
-    <variablelist os="c">
-      <title>The meaning of the override on make check:</title>
-
-      <varlistentry>
-        <term><parameter>LDEMULATION=elf32ppc</parameter></term>
-        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-        href="../multilib/libtool.xml"
-        xpointer="xpointer(//*[@os='c2'])"/>
-      </varlistentry>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libtool.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libtool.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/libtool.xml"
-    xpointer="xpointer(//*[@os='m1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/libtool.xml"
-    xpointer="xpointer(//*[@os='m2'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-libtool" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/ppc64/parted.xml
===================================================================
--- BOOK/final-system/ppc64/parted.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,64 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-parted" role="wrap">
-  <?dbhtml filename="parted.html"?>
-
-  <title>Parted-&parted-version;</title>
-
-  <indexterm zone="ch-system-parted">
-    <primary sortas="a-Parted">Parted</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../ppc/parted.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Parted</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/parted.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen><userinput>CC="gcc ${BUILD64}" ./configure \
-    --prefix=/usr \
-    --libdir=/usr/lib64 \
-    --disable-device-mapper</userinput></screen>
-
-    <variablelist os="b">
-      <title>The meaning of the configure options:</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../final-system/ppc/parted.xml"
-      xpointer="xpointer(//*[@os='b1'])"/>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/parted.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/parted.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/parted.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/parted.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../ppc/parted.xml"
-  xpointer="xpointer(id('contents-parted'))"/>
-
-</sect1>
Index: OK/final-system/ppc64/powerpc-utils.xml
===================================================================
--- BOOK/final-system/ppc64/powerpc-utils.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,52 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-powerpc-utils" role="wrap">
-  <?dbhtml filename="powerpc-utils.html"?>
-
-  <title>Powerpc-Utils_&powerpcutils-version;</title>
-
-  <indexterm zone="ch-system-powerpc-utils">
-    <primary sortas="a-Powerpc-Utils">Powerpc-Utils</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../ppc/powerpc-utils.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Powerpc-Utils</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/powerpc-utils.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/powerpc-utils.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/powerpc-utils.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen><userinput>EXTRACFLAGS="${BUILD32}" make nvsetenv nvsetvol</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/powerpc-utils.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/powerpc-utils.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../ppc/powerpc-utils.xml"
-  xpointer="xpointer(id('contents-powerpc-utils'))"/>
-
-</sect1>
Index: OK/final-system/ppc64/yaboot.xml
===================================================================
--- BOOK/final-system/ppc64/yaboot.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,125 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-yaboot" role="wrap">
-  <?dbhtml filename="yaboot.html"?>
-
-  <title>Yaboot-&yaboot-version;</title>
-
-  <indexterm zone="ch-system-yaboot">
-    <primary sortas="a-Yaboot">Yaboot</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../ppc/yaboot.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Yaboot</title>
-
-    <para>Existing multilib distributions alter gcc to default to 32-bit
-    output.  Because our gcc defaults to 64-bit, we need to pass appropriate
-    options to both the compiler and the linker.  To prevent the build from
-    failing due to compiler warnings, the -Werror flag is removed.  The
-    Makefile already overrides any CC and ignores LDFLAGS in favour of
-    its own variables, so we need to use the following seds for a
-    successful compile and install.</para>
-
-<screen><userinput>sed -i -e "s/\(-print-libgcc-file-name\)/${BUILD32} \1/" \
-    -e "s/-Werror//" \
-    -e "s/\(-Bstatic\)/-melf32ppclinux \1/" Makefile
-</userinput></screen>
-
-    <variablelist os="j">
-      <title>The meaning of the sed parameters:</title>
-
-      <varlistentry>
-        <term><parameter>"s/\(-print-libgcc-file-name\)/${BUILD32} \1/"</parameter></term>
-        <listitem>
-          <para>This picks a convenient place within the Makefile's lgcc
-          variable and inserts the flag to force <command>gcc</command> to
-          create 32-bit code when compiling yaboot.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><parameter>"s/-Werror//"</parameter></term>
-        <listitem>
-          <para>This deletes the -Werror flag from the Makefile.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><parameter>"s/\(-Bstatic\)/-melf32ppclinux \1/"</parameter></term>
-        <listitem>
-          <para>This picks the end of the LFLAGS which the Makefile passes to
-          the linker to create the second-stage linux loader, and inserts a
-          flag to force <command>ld</command> to use a suitable 32-bit
-          emulation picked from the output of <command>'ld -V'</command>.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='p5'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='p6'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>CFLAGS="${BUILD32}" make PREFIX=/usr</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <important os="j0">
-      <para>The multilib install of yaboot can fail if you miss any of the
-      patches or seds, or omit the CFLAGS variable. <command>ld</command> will
-      issue warnings, but the install will appear to complete successfully.
-      That would result in an unbootable system, so you need to log the output
-      to check it.</para>
-    </important>
-
-<screen os='f'><userinput>make PREFIX=/usr install 2&gt;&amp;1 | tee instlog</userinput></screen>
-
-    <para os='g'>To ensure that the install was successful, run the following
-    command:</para>
-
-<screen os='h'><userinput>grep 'powerpc:common64' instlog</userinput></screen>
-
-    <para os='i'>If the command gave you <emphasis>any</emphasis> output
-    (... is incompatible with powerpc:common output) the build of yaboot is
-    broken and you will have to correct your error(s) and repeat it.</para>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../ppc/yaboot.xml"
-  xpointer="xpointer(id('contents-yaboot'))"/>
-
-</sect1>
Index: OK/final-system/sparc-chapter.xml
===================================================================
--- BOOK/final-system/sparc-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,87 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-building-system" xreflabel="Installing Basic System Software">
-  <?dbhtml dir="final-system"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Installing Basic System Software</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkgmgt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/testsuitesagain.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/temp-perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/linux-headers.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man-pages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/glibc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/adjusting.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/isl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/zlib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/flex.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bison.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/attr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/acl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux-pass1.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/procps-ng.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iana-etc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libtool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iproute2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gdbm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/readline.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/autoconf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/automake.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gperf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/groff.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/less.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iputils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kbd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libpipeline.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man-db.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/expat.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xml-parser.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dbus.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/elftoaout.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/silo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/aboutdebug.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/stripping.xml"/>
-
-</chapter>
Index: OK/final-system/sparc/elftoaout.xml
===================================================================
--- BOOK/final-system/sparc/elftoaout.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,73 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-elftoaout" role="wrap">
-  <?dbhtml filename="elftoaout.html"?>
-
-  <title>ELFtoaout-&elftoaout-version;</title>
-
-  <indexterm zone="ch-system-elftoaout">
-    <primary sortas="a-ELFtoaout">ELFtoaout</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The ELFtoaout package contains the Sparc ELF to a.out converter.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of ELFtoaout</title>
-
-    <para os="p1">The following patch fixes some 64 bit issues with
-    elftoaout:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&elftoaout-fixes-patch;</userinput></screen>
-
-    <para os="a">Compile the ELFtoaout package:</para>
-
-<screen os="b"><userinput>make</userinput></screen>
-
-    <para os="c">Install the package:</para>
-
-<screen os="d"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-elftoaout" role="content">
-    <title>Contents of ELFtoaout</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>elf2aout</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="elftoaout">
-        <term><command>elftoaout</command></term>
-        <listitem>
-          <para>Converts an ELF-formatted file to Sparc a.out format for use
-          with openprom</para>
-          <indexterm zone="ch-system-elftoaout elftoaout">
-            <primary sortas="b-elftoaout">elftoaout</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/sparc/silo.xml
===================================================================
--- BOOK/final-system/sparc/silo.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,106 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-silo" role="wrap">
-  <?dbhtml filename="silo.html"?>
-
-  <title>Silo-&silo-version;</title>
-
-  <indexterm zone="ch-system-silo">
-    <primary sortas="a-Silo">Silo</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Silo package contains the Sparc Improved boot LOader.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Silo</title>
-
-    <para os="a">The following patch fixes compile issues:</para>
-
-<screen os="b"><userinput>patch -Np1 -i ../&silo-fixes-patch;</userinput></screen>
-
-    <para os="c">Compile the Silo package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-    <para os="d">Install the package:</para>
-
-<screen os="e"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-silo" role="content">
-    <title>Contents of Silo</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>silo, silocheck, maketile, and tilo.</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="silo">
-        <term><command>silo</command></term>
-        <listitem>
-          <para>Silo bootloader installer. This program installs the
-          first stage into the bootblock.</para>
-          <indexterm zone="ch-system-silo silo">
-            <primary sortas="b-silo">silo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="silocheck">
-        <term><command>silocheck</command></term>
-        <listitem>
-          <para>Checks to see whether a file is readable
-           by silo (very handy if you have larger disks).</para>
-          <indexterm zone="ch-system-silo silocheck">
-            <primary sortas="b-silocheck">silocheck</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="maketilo">
-        <term><command>maketilo</command></term>
-        <listitem>
-          <para>Is a file that is called by the tilo command to build
-          a TFTP boot image.</para>
-          <indexterm zone="ch-system-silo maketilo">
-            <primary sortas="b-maketilo">maketilo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tilo">
-        <term><command>tilo</command></term>
-        <listitem>
-          <para>Tilo is a tool for building a simple TFTP boot loader which
-           embodies several kernel images for different Sun architectures and
-           a ramdisk root image.</para>
-          <indexterm zone="ch-system-silo tilo">
-            <primary sortas="b-tilo">tilo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/sparc64-64-chapter.xml
===================================================================
--- BOOK/final-system/sparc64-64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,87 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-building-system" xreflabel="Installing Basic System Software">
-  <?dbhtml dir="final-system"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Installing Basic System Software</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkgmgt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/testsuitesagain.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/temp-perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/linux-headers.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man-pages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64-64/glibc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/adjusting.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/isl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/zlib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/flex.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bison.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/attr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/acl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux-pass1.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/procps-ng.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iana-etc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libtool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iproute2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gdbm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/readline.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/autoconf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/automake.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gperf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/groff.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/less.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iputils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kbd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libpipeline.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man-db.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/expat.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xml-parser.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dbus.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/elftoaout.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64-64/silo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/aboutdebug.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/stripping.xml"/>
-
-</chapter>
Index: OK/final-system/sparc64-64/glibc.xml
===================================================================
--- BOOK/final-system/sparc64-64/glibc.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,168 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-glibc" role="wrap">
-  <?dbhtml filename="glibc.html"?>
-
-  <title>Glibc-&glibc-version;</title>
-
-  <indexterm zone="ch-system-glibc">
-    <primary sortas="a-Glibc">Glibc</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Glibc</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='z'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='l1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='l2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64-64/glibc.xml"
-    xpointer="xpointer(//*[@os='l3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64-64/glibc.xml"
-    xpointer="xpointer(//*[@os='l4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../sparc64/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='t1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../sparc64/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='t2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64-64/glibc.xml"
-    xpointer="xpointer(//*[@os='l5'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64-64/glibc.xml"
-    xpointer="xpointer(//*[@os='l6'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-<screen os="h"><userinput>CC="gcc ${BUILD64}" \
-../glibc-&glibc-version;/configure \
-    --prefix=/usr \
-    --enable-kernel=&glibc-kernel-version; \
-    --libexecdir=/usr/lib/glibc \
-    --libdir=/usr/lib \
-    --enable-obsolete-rpc \
-    --enable-stack-protector=strong \
-    --cache-file=config.cache</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64-64/glibc.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='u'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='v'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('i18n-glibc'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('conf-glibc'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('conf-ld'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('contents-glibc'))"/>
-
-</sect1>
Index: OK/final-system/sparc64-64/silo.xml
===================================================================
--- BOOK/final-system/sparc64-64/silo.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,53 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-silo" role="wrap">
-  <?dbhtml filename="silo.html"?>
-
-  <title>Silo-&silo-version;</title>
-
-  <indexterm zone="ch-system-silo">
-    <primary sortas="a-Silo">Silo</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Silo package contains the Sparc Improved boot LOader.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Silo</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../sparc/silo.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../sparc/silo.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <para os="c">Compile the Silo package:</para>
-
-<screen><userinput>make CC="gcc ${BUILD64}" LD="ld -m elf64_sparc"</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../sparc/silo.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../sparc/silo.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../sparc/silo.xml"
-  xpointer="xpointer(id('contents-silo'))"/>
-
-</sect1>
Index: OK/final-system/sparc64-chapter.xml
===================================================================
--- BOOK/final-system/sparc64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,117 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-building-system" xreflabel="Installing Basic System Software">
-  <?dbhtml dir="final-system"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Installing Basic System Software</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkgmgt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/testsuitesagain.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/temp-perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/linux-headers.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man-pages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/glibc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/glibc-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/adjusting.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/m4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gmp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gmp-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/mpfr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/mpfr-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/mpc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/mpc-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/isl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/isl-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/zlib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/zlib-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flex.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flex-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/multiarch_wrapper.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/attr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/attr-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/acl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/acl-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/pkg-config-lite.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/ncurses-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/shadow.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux-64bit-pass1.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/procps-ng.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/procps-ng-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iana-etc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/libtool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libtool-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/iproute2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gdbm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gdbm-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/perl-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/readline.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/readline-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/autoconf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/automake.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/file-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gettext-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gperf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/groff.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/less.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/iputils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kbd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libpipeline.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libpipeline-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/man-db.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/make.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/expat.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xml-parser.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xml-parser-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/expat-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/psmisc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/systemd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/systemd-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dbus.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dbus-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/tar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/vim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/elftoaout.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64-64/silo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/aboutdebug.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/stripping.xml"/>
-
-</chapter>
Index: OK/final-system/sparc64/elftoaout.xml
===================================================================
--- BOOK/final-system/sparc64/elftoaout.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,52 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-elftoaout" role="wrap">
-  <?dbhtml filename="elftoaout.html"?>
-
-  <title>ELFtoaout-&elftoaout-version;</title>
-
-  <indexterm zone="ch-system-elftoaout">
-    <primary sortas="a-ELFtoaout">ELFtoaout</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../sparc/elftoaout.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of ELFtoaout</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../sparc/elftoaout.xml"
-  xpointer="xpointer(//*[@os='p1'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../sparc/elftoaout.xml"
-  xpointer="xpointer(//*[@os='p2'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../sparc/elftoaout.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>make CC="gcc ${BUILD64}"</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../sparc/elftoaout.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../sparc/elftoaout.xml"
-  xpointer="xpointer(//*[@os='d'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../sparc/elftoaout.xml"
-  xpointer="xpointer(id('contents-elftoaout'))"/>
-
-</sect1>
Index: OK/final-system/sparc64/glibc-64bit.xml
===================================================================
--- BOOK/final-system/sparc64/glibc-64bit.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,145 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-glibc" role="wrap">
-  <?dbhtml filename="glibc-64bit.html"?>
-
-  <title>Glibc-&glibc-version; 64-Bit</title>
-
-  <indexterm zone="ch-system-glibc">
-    <primary sortas="a-Glibc">Glibc</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Glibc</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='l1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='l2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='m1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='m2'])"/>
-
-    <para os="t1">For TLS support on the Sparc64 we will need to add the following line to
-    <filename>config.cache</filename>:</para>
-
-<screen os="t2"><userinput>echo "libc_cv_sparc64_tls=yes" &gt;&gt; config.cache</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-<screen os="h"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
-../glibc-&glibc-version;/configure \
-    --prefix=/usr \
-    --enable-kernel=&glibc-kernel-version; \
-    --libexecdir=/usr/lib64/glibc \
-    --libdir=/usr/lib64 \
-    --enable-obsolete-rpc \
-    --enable-stack-protector=strong \
-    --cache-file=config.cache</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='u'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='v'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('i18n-glibc'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('conf-glibc'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../multilib/glibc-64bit.xml"
-  xpointer="xpointer(id('conf-ld'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('contents-glibc'))"/>
-
-</sect1>
Index: OK/final-system/sparc64/libtool.xml
===================================================================
--- BOOK/final-system/sparc64/libtool.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,90 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-libtool-32" role="wrap">
-  <?dbhtml filename="libtool.html"?>
-
-  <title>Libtool-&libtool-version; 32 Bit Libraries</title>
-
-  <indexterm zone="ch-system-libtool-32">
-    <primary sortas="a-Libtool">Libtool</primary>
-    <secondary>32 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/libtool.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Libtool</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/libtool.xml"
-    xpointer="xpointer(//*[@os='a1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/libtool.xml"
-    xpointer="xpointer(//*[@os='a2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libtool.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/libtool.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libtool.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libtool.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <para os="e">To test the results, issue:
-    <userinput>make LDEMULATION=elf32_sparc check</userinput>.</para>
-
-    <variablelist os="c">
-      <title>The meaning of the override on make check:</title>
-
-      <varlistentry>
-        <term><parameter>LDEMULATION=elf32_sparc</parameter></term>
-        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-        href="../multilib/libtool.xml"
-        xpointer="xpointer(//*[@os='c2'])"/>
-      </varlistentry>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libtool.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libtool.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/libtool.xml"
-    xpointer="xpointer(//*[@os='m1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/libtool.xml"
-    xpointer="xpointer(//*[@os='m2'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-libtool" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/x86-chapter.xml
===================================================================
--- BOOK/final-system/x86-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,86 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-building-system" xreflabel="Installing Basic System Software">
-  <?dbhtml dir="final-system"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Installing Basic System Software</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkgmgt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/testsuitesagain.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/temp-perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/linux-headers.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man-pages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/glibc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/adjusting.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/isl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/zlib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/flex.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bison.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/attr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/acl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux-pass1.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/procps-ng.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iana-etc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libtool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iproute2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gdbm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/readline.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/autoconf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/automake.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gperf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/groff.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/less.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iputils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kbd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libpipeline.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man-db.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/expat.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xml-parser.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dbus.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/grub.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/aboutdebug.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/stripping.xml"/>
-
-</chapter>
Index: OK/final-system/x86/glibc.xml
===================================================================
--- BOOK/final-system/x86/glibc.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,177 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-glibc" role="wrap">
-  <?dbhtml filename="glibc.html"?>
-
-  <title>Glibc-&glibc-version;</title>
-
-  <indexterm zone="ch-system-glibc">
-    <primary sortas="a-Glibc">Glibc</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Glibc</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='z'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='l1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='l2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-<screen os="h"><userinput>../glibc-&glibc-version;/configure \
-    --prefix=/usr \
-    --enable-kernel=&glibc-kernel-version; \
-    --libexecdir=/usr/lib/glibc \
-    --enable-stack-protector=strong \
-    --enable-obsolete-rpc</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <!-- this is specific to x86 because of the i686 reference in the math tests -->
-    <itemizedlist os="p">
-      <listitem>
-        <para>The <emphasis>nptl/tst-clock2</emphasis>,
-        <emphasis>nptl/tst-attr3</emphasis>,
-        <emphasis>tst/tst-cputimer1</emphasis>, and
-        <emphasis>rt/tst-cpuclock2</emphasis>
-        tests have been known to fail.  The
-        reason is not completely understood, but indications are that minor
-        timing issues can trigger these failures.</para>
-      </listitem>
-      <listitem>
-        <para>The <emphasis>math</emphasis> tests, at least on i686, fail in
-        the <emphasis>test-double</emphasis> and <emphasis>test-idouble</emphasis>
-        tests with gcc-&gcc-version;
-        . These two failures in the math tests appear to be harmless.
-        The math tests may also fail on systems where the CPU is not a relatively
-        new genuine Intel or authentic AMD. Certain optimization settings are
-        also known to be a factor here.</para>
-      </listitem>
-      <listitem>
-        <para>If you have mounted the CLFS partition with the
-        <parameter>noatime</parameter> option, the <emphasis>atime</emphasis> test
-        will fail. As mentioned in <xref linkend="ch-partitioning-mounting"/>,
-        do not use the <parameter>noatime</parameter> option while building
-        CLFS.</para>
-      </listitem>
-      <listitem>
-        <para>When running on older and slower hardware, some tests
-        can fail because of test timeouts being exceeded.
-        Modifying the make check command to set a TIMEOUTFACTOR is reported to
-        help eliminate these errors (e.g. <command>TIMEOUTFACTOR=16
-        make -k check</command>).</para>
-      </listitem>
-      <listitem>
-        <para>posix/tst-getaddrinfo4 will always fail due to not having a network
-        connection when the test is run.</para>
-      </listitem>
-    </itemizedlist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='u'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='v'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('i18n-glibc'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('conf-glibc'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('conf-ld'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('contents-glibc'))"/>
-
-</sect1>
Index: OK/final-system/x86/grub.xml
===================================================================
--- BOOK/final-system/x86/grub.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,312 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-<sect1 id="ch-system-grub" role="wrap">
-  <?dbhtml filename="grub.html"?>
-
-  <title>GRUB-&grub-version;</title>
-
-  <indexterm zone="ch-system-grub">
-    <primary sortas="a-GRUB">GRUB</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The GRUB package contains the GRand Unified Bootloader.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GRUB</title>
-
-    <note os="n1">
-      <para>If you would like use a different bootloader than this
-      one you can go to the following link for alternative bootloaders
-      and the instructions to use them.
-      <ulink url="http://trac.clfs.org/wiki/bootloaders"/></para>
-    </note>
-
-    <note os="n2">
-      <para>This package is known to have issues when its default optimization
-      flags (including the <option>-march</option> and <option>-mtune</option>
-      options) are changed. If any environment variables that override default
-      optimizations have been defined, such as <envar>CFLAGS</envar> and
-      <envar>CXXFLAGS</envar>, unset them when building GRUB.</para>
-    </note>
-
-    <para os="s1">Glibc-&glibc-version; does not declare gets():</para>
-
-<screen os="s2"><userinput>sed -i -e '/gets is a/d' grub-core/gnulib/stdio.in.h</userinput></screen>
-
-    <para os="a">Prepare GRUB for compilation:</para>
-
-<screen os="b"><userinput>./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --disable-werror</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">To test GRUB you must have QEMU installed and then, issue:</para>
-
-<screen os="d2"><userinput remap="test">make check</userinput></screen>
-
-    <para os="f">Install the package:</para>
-
-<screen os="g"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="conf-grub" role="configuration">
-    <title>Configuring GRUB</title>
-
-    <indexterm zone="conf-grub">
-      <primary sortas="a-GRUB">GRUB</primary>
-    <secondary>configuring</secondary></indexterm>
-
-    <indexterm zone="conf-grub">
-      <primary sortas="e-/etc/default/grub">/etc/default/grub</primary>
-    </indexterm>
-
-    <para>Now that grub is installed, we need to configure the defaults that
-    will be used to generate the configuration after we install the kernel.
-    Create this file with the following:</para>
-
-<screen><userinput>install -m755 -dv /etc/default
-cat &gt; /etc/default/grub &lt;&lt; "EOF"
-<literal># Begin /etc/default/grub
-
-GRUB_DEFAULT=0
-#GRUB_SAVEDEFAULT=true
-GRUB_HIDDEN_TIMEOUT=
-GRUB_HIDDEN_TIMEOUT_QUIET=false
-GRUB_TIMEOUT=10
-GRUB_DISTRIBUTOR=Cross-LFS
-
-GRUB_CMDLINE_LINUX=""
-GRUB_CMDLINE_LINUX_DEFAULT=""
-
-#GRUB_TERMINAL=console
-#GRUB_GFXMODE=640x480
-#GRUB_GFXPAYLOAD_LINUX=keep
-
-#GRUB_DISABLE_LINUX_UUID=true
-#GRUB_DISABLE_LINUX_RECOVERY=true
-
-#GRUB_INIT_TUNE="480 440 1"
-
-#GRUB_DISABLE_OS_PROBER=true
-
-# End /etc/default/grub</literal>
-EOF</userinput></screen>
-
-    <variablelist>
-      <title>The meaning of the above options and possible alternate
-      values:</title>
-
-    <varlistentry>
-      <term><parameter>GRUB_DEFAULT=</parameter></term>
-      <listitem>
-        <para>Write Me</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><parameter>GRUB_SAVEDEFAULT=</parameter></term>
-      <listitem>
-        <para>Write Me</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><parameter>GRUB_HIDDEN_TIMEOUT=</parameter></term>
-      <listitem>
-        <para>Write Me</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><parameter>GRUB_HIDDEN_TIMEOUT_QUIET=</parameter></term>
-      <listitem>
-        <para>Write Me</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><parameter>GRUB_TIMEOUT=</parameter></term>
-      <listitem>
-        <para>Write Me</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><parameter>GRUB_DISTRIBUTOR=</parameter></term>
-      <listitem>
-        <para>Write Me</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><parameter>GRUB_CMDLINE_LINUX=</parameter></term>
-      <listitem>
-        <para>Write Me</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><parameter>GRUB_CMDLINE_LINUX_DEFAULT=</parameter></term>
-      <listitem>
-        <para>Write Me</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><parameter>GRUB_TERMINAL=</parameter></term>
-      <listitem>
-        <para>Write Me</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><parameter>GRUB_GFXMODE=</parameter></term>
-      <listitem>
-        <para>Write Me</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><parameter>GRUB_GFXPAYLOAD_LINUX=</parameter></term>
-      <listitem>
-        <para>Write Me</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><parameter>GRUB_DEFAULT=</parameter></term>
-      <listitem>
-        <para>Write Me</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><parameter>GRUB_DISABLE_LINUX_UUID=</parameter></term>
-      <listitem>
-        <para>Write Me</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><parameter>GRUB_DISABLE_LINUX_RECOVERY=</parameter></term>
-      <listitem>
-        <para>Write Me</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><parameter>GRUB_INIT_TUNE=</parameter></term>
-      <listitem>
-        <para>Write Me</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><parameter>GRUB_DISABLE_OS_PROBER=</parameter></term>
-      <listitem>
-        <para>Write Me</para>
-      </listitem>
-    </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-  <sect2 id="contents-grub" role="content">
-    <title>Contents of GRUB</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed directories</segtitle>
-
-      <seglistitem>
-        <seg>grub, grub-install, grub-md5-crypt, grub-set-default, grub-terminfo, and mbchk</seg>
-        <seg>/usr/lib/grub, /boot/grub</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="grub">
-        <term><command>grub</command></term>
-        <listitem>
-          <para>The Grand Unified Bootloader's command shell</para>
-          <indexterm zone="ch-system-grub grub">
-            <primary sortas="b-grub">grub</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="grub-install">
-        <term><command>grub-install</command></term>
-        <listitem>
-          <para>Installs GRUB on the given device</para>
-          <indexterm zone="ch-system-grub grub-install">
-            <primary sortas="b-grub-install">grub-install</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="grub-md5-crypt">
-        <term><command>grub-md5-crypt</command></term>
-        <listitem>
-          <para>Encrypts a password in MD5 format</para>
-          <indexterm zone="ch-system-grub grub-md5-crypt">
-            <primary sortas="b-grub-md5-crypt">grub-md5-crypt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="grub-set-default">
-        <term><command>grub-set-default</command></term>
-        <listitem>
-          <para>Sets the default boot entry for GRUB</para>
-          <indexterm zone="ch-system-grub grub-set-default">
-            <primary sortas="b-grub-set-default">grub-set-default</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="grub-terminfo">
-        <term><command>grub-terminfo</command></term>
-        <listitem>
-          <para>Generates a terminfo command from a terminfo name; it can be
-          employed if an unknown terminal is being used</para>
-          <indexterm zone="ch-system-grub grub-terminfo">
-            <primary sortas="b-grub-terminfo">grub-terminfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mbchk">
-        <term><command>mbchk</command></term>
-        <listitem>
-          <para>Checks the format of a multi-boot kernel</para>
-          <indexterm zone="ch-system-grub mbchk">
-            <primary sortas="b-mbchk">mbchk</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/x86_64-64-chapter.xml
===================================================================
--- BOOK/final-system/x86_64-64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,86 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-building-system" xreflabel="Installing Basic System Software">
-  <?dbhtml dir="final-system"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Installing Basic System Software</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkgmgt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/testsuitesagain.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/temp-perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/linux-headers.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man-pages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/glibc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/adjusting.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/isl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/zlib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/flex.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bison.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/attr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/acl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux-pass1.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/procps-ng.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iana-etc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libtool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iproute2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gdbm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/readline.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/autoconf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/automake.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gperf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/groff.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/less.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iputils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kbd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libpipeline.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man-db.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/expat.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xml-parser.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dbus.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/grub.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/aboutdebug.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/stripping.xml"/>
-
-</chapter>
Index: OK/final-system/x86_64-64/adjusting.xml
===================================================================
--- BOOK/final-system/x86_64-64/adjusting.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,59 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-adjusting">
-  <?dbhtml filename="adjusting.html"?>
-
-  <title>Adjusting the Toolchain</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/adjusting.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/adjusting.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/adjusting.xml"
-  xpointer="xpointer(//*[@os='d'])"/>
-
-  <caution>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-<screen><computeroutput>[Requesting program interpreter: /lib/ld-linux-x86-64.so.2]</computeroutput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-  </caution>
-
-</sect1>
Index: OK/final-system/x86_64-64/binutils.xml
===================================================================
--- BOOK/final-system/x86_64-64/binutils.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,111 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-binutils" role="wrap">
-  <?dbhtml filename="binutils.html"?>
-
-  <title>Binutils-&binutils-version;</title>
-
-  <indexterm zone="ch-system-binutils">
-    <primary sortas="a-Binutils">Binutils</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/binutils.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Binutils</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-<!-- Branch update patch area
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/binutils.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/binutils.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../64/binutils.xml"
-    xpointer="xpointer(//*[@os='ca'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-<!--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='l'])"/> -->
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/binutils.xml"
-  xpointer="xpointer(id('contents-binutils'))"/>
-
-</sect1>
Index: OK/final-system/x86_64-64/glibc.xml
===================================================================
--- BOOK/final-system/x86_64-64/glibc.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,182 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-glibc" role="wrap">
-  <?dbhtml filename="glibc.html"?>
-
-  <title>Glibc-&glibc-version;</title>
-
-  <indexterm zone="ch-system-glibc">
-    <primary sortas="a-Glibc">Glibc</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Glibc</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='z'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='l1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='l2'])"/>
-
-    <para os="l3">Modify the <command>ldd</command> rewrite script to prevent
-    it from adding <filename class="directory">lib64</filename> and
-    <filename class="directory">libx32</filename> to its list of linker
-    search locations:</para>
-
-<screen os="l4"><userinput>sed -i '/RTLDLIST/d' sysdeps/unix/sysv/linux/*/ldd-rewrite.sed</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <para os="l5">Configure Glibc to install its libraries into
-    <filename class="directory">/lib</filename>:</para>
-
-<screen os="l6"><userinput>echo "libc_cv_slibdir=/lib" &gt;&gt; config.cache</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-<screen os="h"><userinput>../glibc-&glibc-version;/configure \
-    --prefix=/usr \
-    --enable-kernel=&glibc-kernel-version; \
-    --libexecdir=/usr/lib/glibc \
-    --libdir=/usr/lib \
-    --enable-obsolete-rpc \
-    --enable-stack-protector=strong \
-    --cache-file=config.cache</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='u'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='v'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('i18n-glibc'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('conf-glibc'))"/>
-
-  <sect2 id="conf-ld" role="configuration">
-    <title>Configuring The Dynamic Loader</title>
-
-    <indexterm zone="conf-ld">
-      <primary sortas="e-/etc/ld.so.conf">/etc/ld.so.conf</primary>
-    </indexterm>
-
-    <para>By default, the dynamic loader (<filename
-    class="libraryfile">/lib/ld-linux-x86-64.so.2</filename>) searches through
-    <filename class="directory">/lib</filename> and <filename
-    class="directory">/usr/lib</filename> for dynamic libraries that are
-    needed by programs as they are run. However, if there are libraries in
-    directories other than <filename class="directory">/lib</filename> and
-    <filename class="directory">/usr/lib</filename>, these need to be
-    added to the <filename>/etc/ld.so.conf</filename> file in order
-    for the dynamic loader to find them. Two directories that are commonly
-    known to contain additional libraries are <filename
-    class="directory">/usr/local/lib</filename> and <filename
-    class="directory">/opt/lib</filename>, so add those directories to the
-    dynamic loader's search path.</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='ld-b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='ld-c'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('contents-glibc'))"/>
-
-</sect1>
Index: OK/final-system/x86_64-chapter.xml
===================================================================
--- BOOK/final-system/x86_64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,116 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-building-system" xreflabel="Installing Basic System Software">
-  <?dbhtml dir="final-system"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Installing Basic System Software</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkgmgt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/testsuitesagain.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/temp-perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/linux-headers.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man-pages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/glibc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/glibc-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/adjusting.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/m4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gmp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gmp-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/mpfr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/mpfr-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/mpc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/mpc-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/isl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/isl-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/zlib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/zlib-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flex.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flex-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/multiarch_wrapper.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/attr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/attr-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/acl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/acl-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/pkg-config-lite.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/ncurses-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/shadow.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux-64bit-pass1.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/procps-ng.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/procps-ng-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iana-etc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/libtool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libtool-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/iproute2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gdbm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gdbm-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/perl-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/readline.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/readline-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/autoconf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/automake.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/file-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gettext-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gperf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/groff.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/less.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/iputils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kbd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libpipeline.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libpipeline-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/man-db.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/make.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/expat.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/expat-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xml-parser.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xml-parser-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/psmisc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/systemd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/systemd-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dbus.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dbus-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/tar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/vim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/grub.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/aboutdebug.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/stripping.xml"/>
-
-</chapter>
Index: OK/final-system/x86_64/adjusting.xml
===================================================================
--- BOOK/final-system/x86_64/adjusting.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,79 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-adjusting">
-  <?dbhtml filename="adjusting.html"?>
-
-  <title>Adjusting the Toolchain</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/adjusting.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../multilib/adjusting.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/adjusting.xml"
-  xpointer="xpointer(//*[@os='d'])"/>
-
-  <caution>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/adjusting.xml"
-    xpointer="xpointer(//*[@os='m2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/adjusting.xml"
-    xpointer="xpointer(//*[@os='m3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/adjusting.xml"
-    xpointer="xpointer(//*[@os='m4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/adjusting.xml"
-    xpointer="xpointer(//*[@os='m5'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-<screen><computeroutput>[Requesting program interpreter: /lib64/ld-linux-x86-64.so.2]</computeroutput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/adjusting.xml"
-    xpointer="xpointer(//*[@os='m7'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-  </caution>
-
-</sect1>
Index: OK/final-system/x86_64/glibc-64bit.xml
===================================================================
--- BOOK/final-system/x86_64/glibc-64bit.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,172 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-glibc" role="wrap">
-  <?dbhtml filename="glibc-64bit.html"?>
-
-  <title>Glibc-&glibc-version; 64-Bit</title>
-
-  <indexterm zone="ch-system-glibc">
-    <primary sortas="a-Glibc">Glibc</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../multilib/glibc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Glibc</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='l1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='l2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='m1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='m2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-<screen os="h"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
-../glibc-&glibc-version;/configure \
-    --prefix=/usr \
-    --enable-kernel=&glibc-kernel-version; \
-    --libexecdir=/usr/lib64/glibc \
-    --libdir=/usr/lib64 \
-    --enable-obsolete-rpc \
-    --enable-stack-protector=strong \
-    --cache-file=config.cache</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='u'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='v'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('i18n-glibc'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('conf-glibc'))"/>
-
-  <sect2 id="conf-ld" role="configuration">
-    <title>Configuring The Dynamic Loader</title>
-
-    <indexterm zone="conf-ld">
-      <primary sortas="e-/etc/ld.so.conf">/etc/ld.so.conf</primary>
-    </indexterm>
-
-    <para>By default, the dynamic loader (<filename
-    class="libraryfile">/lib/ld-linux.so.2</filename> for 32bit executables and
-    <filename class="libraryfile">/lib64/ld-linux-x86-64.so.2</filename> for
-    64bit executables) searches through
-    <filename class="directory">/lib</filename>,
-    <filename class="directory">/lib64</filename>,
-    <filename class="directory">/usr/lib</filename>,
-    and <filename class="directory">/usr/lib64</filename> for dynamic
-    libraries that are needed by programs as they are run. However, if
-    there are libraries in directories other than these, they need to be
-    added to the <filename>/etc/ld.so.conf</filename> file in order
-    for the dynamic loader to find them. Some directories that are commonly
-    known to contain additional libraries are
-    <filename class="directory">/usr/local/lib</filename>,
-    <filename class="directory">/usr/local/lib64</filename>,
-    <filename class="directory">/opt/lib</filename>,
-    and <filename class="directory">/opt/lib64</filename>,
-    so add those directories to the dynamic loader's search path.</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='ld-b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='ld-c'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('contents-glibc'))"/>
-
-</sect1>
Index: OK/final-system/x86_64/libtool.xml
===================================================================
--- BOOK/final-system/x86_64/libtool.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,90 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-libtool-32" role="wrap">
-  <?dbhtml filename="libtool.html"?>
-
-  <title>Libtool-&libtool-version; 32 Bit Libraries</title>
-
-  <indexterm zone="ch-system-libtool-32">
-    <primary sortas="a-Libtool">Libtool</primary>
-    <secondary>32 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/libtool.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Libtool</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/libtool.xml"
-    xpointer="xpointer(//*[@os='a1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/libtool.xml"
-    xpointer="xpointer(//*[@os='a2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libtool.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/libtool.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libtool.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libtool.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <para os="e">To test the results, issue:
-    <userinput>make LDEMULATION=elf_i386 check</userinput></para>
-
-    <variablelist os="c">
-      <title>The meaning of the override on make check:</title>
-
-      <varlistentry>
-        <term><parameter>LDEMULATION=elf_i386</parameter></term>
-        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-        href="../multilib/libtool.xml"
-        xpointer="xpointer(//*[@os='c2'])"/>
-      </varlistentry>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libtool.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libtool.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/libtool.xml"
-    xpointer="xpointer(//*[@os='m1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/libtool.xml"
-    xpointer="xpointer(//*[@os='m2'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-libtool" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/general.ent
===================================================================
--- BOOK/general.ent	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,64 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!ENTITY month "08"> <!-- Use two digits -->
-<!ENTITY month_name "August">
-<!ENTITY day "03"> <!-- Use two digits -->
-<!ENTITY year "2017"> <!-- Use four digits -->
-
-<!ENTITY releasedate "&month_name; &day;, &year;">
-
-<!ENTITY major-version "3">
-<!ENTITY minor-version "1">
-<!ENTITY extra-version "0">
-<!ENTITY generic-version "git"> <!-- Use "git", "testing", or "x.y.z[-pre{x}]" -->
-
-<!ENTITY versionid "&year;&month;&day;"> <!-- /etc/os-release from systemd -->
-<!ENTITY version "GIT-&year;&month;&day;">
-
-<!ENTITY version-x86 "&version;-x86">
-<!ENTITY version-x86_64 "&version;-x86_64-Multilib">
-<!ENTITY version-x86_64-64 "&version;-x86_64-Pure64">
-<!ENTITY version-ppc "&version;-PowerPC">
-<!ENTITY version-ppc64 "&version;-PowerPC64-Multilib">
-<!ENTITY version-ppc64-64 "&version;-PowerPC64-Pure64">
-<!ENTITY version-sparc "&version;-Sparc">
-<!ENTITY version-sparcv8 "&version;-Sparc_v8">
-<!ENTITY version-sparc64 "&version;-Sparc64-Multilib">
-<!ENTITY version-sparc64-64 "&version;-Sparc64-Pure64">
-<!ENTITY version-mips "&version;-MIPS">
-<!ENTITY version-mips64 "&version;-MIPS64-Multilib">
-<!ENTITY version-mips64-64 "&version;-MIPS64-Pure64">
-<!ENTITY version-native "&version;-Native">
-<!ENTITY version-native64 "&version;-Native-Multilib">
-
-<!ENTITY lfs-root "http://www.linuxfromscratch.org/">
-<!ENTITY clfs-root "http://clfs.org/">
-<!ENTITY clfs-wiki "http://trac.clfs.org/">
-<!ENTITY clfs-ticket-root "&clfs-wiki;ticket/">
-<!ENTITY cblfs-root "http://cblfs.clfs.org/">
-<!ENTITY faq-root "&clfs-wiki;wiki/faq">
-<!ENTITY hints-root "http://hints.clfs.org/index.php/">
-<!ENTITY livecd-root "&lfs-root;livecd/">
-<!ENTITY test-results "&clfs-root;testsuite-logs/&generic-version;/">
-<!ENTITY errata "&clfs-wiki;wiki/errata">
-
-<!ENTITY gnu "http://ftp.gnu.org/gnu/">
-<!ENTITY gnu-software "http://www.gnu.org/software/">
-<!ENTITY alpha-gnu "ftp://alpha.gnu.org/gnu/">
-<!ENTITY redhat "ftp://sources.redhat.com/pub/">
-<!ENTITY kernel "http://www.kernel.org/pub/">
-<!ENTITY savannah "http://download.savannah.gnu.org">
-<!ENTITY sourceforge "http://downloads.sourceforge.net/">
-
-<!ENTITY dependencies "Installation depends on">
-<!ENTITY testsuites "Test suite depends on">
-<!ENTITY before "Must be installed before">
-
-<!ENTITY % packages-entities SYSTEM "packages.ent">
-%packages-entities;
-
-<!ENTITY % patches-entities SYSTEM "patches.ent">
-%patches-entities;
-
-<!ENTITY % uid-gid-entities SYSTEM "users_groups.ent">
-%uid-gid-entities;
Index: OK/index.xml
===================================================================
--- BOOK/index.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,36 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "general.ent">
-  %general-entities;
-]>
-
-<bookinfo>
-  <title>Cross-Compiled Linux From Scratch</title>
-  <subtitle>Version &version;</subtitle>
-
-  <authorgroup>
-    <author>
-      <firstname>Joe</firstname>
-      <surname>Ciccone</surname>
-    </author>
-    <author>
-      <firstname>Jim</firstname>
-      <surname>Gifford</surname>
-    </author>
-    <author>
-      <firstname>Ryan</firstname>
-	  <surname>Oliver</surname>
-    </author>
-  </authorgroup>
-
-  <copyright id="copyright">
-    <year>2005&ndash;&year;</year>
-    <holder>Joe Ciccone, Jim Gifford &amp; Ryan Oliver</holder>
-  </copyright>
-
-  <bibliosource>
-    <emphasis>Based on LFS, Copyright &copy; 1999&ndash;&year; Gerard Beekmans</emphasis>
-  </bibliosource>
-
-</bookinfo>
Index: OK/introduction/common/acknowledgements.xml
===================================================================
--- BOOK/introduction/common/acknowledgements.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,133 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-intro-acknowledgements">
-  <title>Cross-LFS Acknowledgements</title>
-  <?dbhtml filename="acknowledgements.html"?>
-
-  <para>The CLFS team would like to acknowledge people who
-  have assisted in making the book what it is today.</para>
-
-  <para>Our Leaders:</para>
-
-  <itemizedlist>
-    <listitem>
-      <para>William Harrington - Lead Developer.</para>
-    </listitem>
-    <listitem>
-      <para>Jonathan Norman - x86, x86_64, PowerPC &amp; UltraSPARC builds,
-      Release Manager 2.x Series</para>
-    </listitem>
-    <listitem>
-      <para>Chris Staub - x86 and x86_64 builds. Leader of Quality Control.</para>
-    </listitem>
-  </itemizedlist>
-
-  <para>Our CLFS Team:</para>
-
-  <itemizedlist>
-    <listitem>
-      <para>Matt Darcy - x86, X86_64, and Sparc builds.</para>
-    </listitem>
-    <listitem>
-      <para>Manuel Canales Esparcia - Book XML.</para>
-    </listitem>
-    <listitem>
-      <para>Justin Knierim - Website Architect.</para>
-    </listitem>
-    <listitem>
-      <para>Ken Moffat - PowerPC and X86_64 builds. Developer of Pure 64 Hint.</para>
-    </listitem>
-  </itemizedlist>
-
-  <para>Outside the Development Team</para>
-  <itemizedlist>
-    <listitem>
-      <para>Jürg Billeter - Testing and assisting in the development of the Linux Headers Package</para>
-    </listitem>
-    <listitem>
-      <para>Richard Downing - Testing, typo, and content fixes.</para>
-    </listitem>
-    <listitem>
-      <para>Peter Ennis - Typo and content fixes.</para>
-    </listitem>
-    <listitem>
-      <para>Tony Morgan - Typo and content fixes.</para>
-    </listitem>
-  </itemizedlist>
-
-  <para>The CLFS team would also like to acknowledge contributions of people
-  from <ulink url="clfs-dev@lists.clfs.org"/> and associated mailing lists
-  who have provided valuable technical and editorial corrections while testing
-  the Cross-LFS book.</para>
-
-  <itemizedlist>
-    <listitem>
-      <para>G. Moko - Text updates and Typos</para>
-    </listitem>
-    <listitem>
-      <para>Maxim Osipov - MIPS Testing.</para>
-    </listitem>
-    <listitem>
-      <para>Doug Ronne - Various x86_64 fixes.</para>
-    </listitem>
-    <listitem>
-      <para>Theo Schneider - Testing of the Linux Headers Package</para>
-    </listitem>
-    <listitem>
-      <para>Martin Ward - Recommendations for Systemd and the Boot method,
-      among other contributions</para>
-    </listitem>
-    <listitem>
-      <para>William Zhou - Text updates and Typos</para>
-    </listitem>
-  </itemizedlist>
-
-  <para>Former Team Members</para>
-  <itemizedlist>
-    <listitem>
-      <para>Joe Ciccone - Lead Developer.</para>
-    </listitem>
-    <listitem>
-      <para>Nathan Coulson - Bootscripts.</para>
-    </listitem>
-    <listitem>
-      <para>Jim Gifford - Lead Developer.</para>
-    </listitem>
-    <listitem>
-      <para>Jeremy Huntwork - PowerPC, x86, Sparc builds.</para>
-    </listitem>
-    <listitem>
-      <para>Karen McGuiness - Proofreader.</para>
-    </listitem>
-    <listitem>
-      <para>Ryan Oliver - Build Process Developer.</para>
-    </listitem>
-    <listitem>
-      <para>Alexander E. Patrakov - Udev/Hotplug Integration</para>
-    </listitem>
-    <listitem>
-      <para>Jeremy Utley - Release Manager 1.x Series.</para>
-    </listitem>
-    <listitem>
-      <para>Zack Winkles - Unstable book work.</para>
-    </listitem>
-  </itemizedlist>
-
-  <para>The Linux From Scratch Project</para>
-  <itemizedlist>
-    <listitem>
-      <para><ulink url="mailto:gerard@linuxfromscratch.org">Gerard
-      Beekmans</ulink> &lt;gerard@linuxfromscratch.org&gt; &ndash;
-      Creator of Linux From Scratch, on which Cross-LFS is based</para>
-    </listitem>
-
-  </itemizedlist>
-
-  <para>Thank you all for your support.</para>
-
-</sect1>
Index: OK/introduction/common/askforhelp.xml
===================================================================
--- BOOK/introduction/common/askforhelp.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,139 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-intro-askforhelp">
-  <?dbhtml filename="askforhelp.html"?>
-
-  <title>Help</title>
-
-  <para>If an issue or a question is encountered while working through
-  this book, check the FAQ page at <ulink url="&faq-root;#generalfaq"/>.
-  Questions are often already answered there. If your question is not
-  answered on this page, try to find the source of the problem. The
-  following hint will give you some guidance for troubleshooting:
-  <ulink url="&hints-root;Errors"/>.</para>
-
-  <para>We also have a wonderful CLFS community that is willing to offer
-  assistance through the mailing lists and IRC (see the <xref
-  linkend="ch-intro-resources"/> section of this book). However, we
-  get several support questions everyday and many of them can be easily
-  answered by going to the FAQ and by searching the mailing lists first.
-  So for us to offer the best assistance possible, you need to do some
-  research on your own first. This allows us to focus on the more unusual
-  support needs. If your searches do not produce a solution, please include
-  all relevant information (mentioned below) in your request for help.</para>
-
-  <sect2>
-    <title>Things to Mention</title>
-
-    <para>Apart from a brief explanation of the problem being experienced,
-    the essential things to include in any request for help are:</para>
-
-    <itemizedlist>
-      <listitem>
-        <para>The version of the book being used (in this case
-        &version;)</para>
-      </listitem>
-      <listitem>
-        <para>The host distribution and version being used to
-        create CLFS.</para>
-      </listitem>
-      <listitem>
-        <para>The architecture of the host and target.</para>
-      </listitem>
-      <listitem>
-        <para>The value of the ${CLFS_HOST} and ${CLFS_TARGET} environment
-        variables, and if applicable, ${BUILD32}, ${BUILD64}, ${BUILDN32},
-        and ${GCCTARGET}.</para>
-      </listitem>
-      <listitem>
-        <para>The package or section in which the problem was encountered.</para>
-      </listitem>
-      <listitem>
-        <para>The exact error message or symptom received. See <xref
-        linkend="ch-intro-askforhelp-compilation-problems"/> below for an
-        example.</para>
-      </listitem>
-      <listitem>
-        <para>Note whether you have deviated from the book at all. A package
-        version change or even a minor change to any command is considered
-        deviation.</para>
-      </listitem>
-    </itemizedlist>
-
-    <note>
-      <para>Deviating from this book does <emphasis>not</emphasis>
-      mean that we will not help you. After all, the CLFS project is
-      about personal preference. Be upfront about any changes to
-      the established procedure&mdash;this helps us evaluate and determine
-      possible causes of your problem.</para>
-    </note>
-
-  </sect2>
-
-  <sect2>
-    <title>Configure Script Problems</title>
-
-    <para>If something goes wrong while running the <command>configure</command>
-    script, review the <filename>config.log</filename> file. This file may
-    contain the errors you encountered during <command>configure</command>.
-    It often logs errors that may have not been printed to the screen. Include
-    only the <emphasis>relevant</emphasis> lines if you need to ask for
-    help.</para>
-
-  </sect2>
-
-  <sect2 id="ch-intro-askforhelp-compilation-problems">
-    <title>Compilation Problems</title>
-
-    <para>Both the screen output and the contents of various files are
-    useful in determining the cause of compilation problems. The screen output
-    from the <command>configure</command> script and the
-    <command>make</command> run can be helpful. It is not necessary to
-    include the entire output, but do include enough of the relevant
-    information. Below is an example of the type of information to include
-    from the screen output from <command>make</command>:</para>
-
-<screen><computeroutput>gcc -DALIASPATH=\"/mnt/clfs/usr/share/locale:.\"
--DLOCALEDIR=\"/mnt/clfs/usr/share/locale\"
--DLIBDIR=\"/mnt/clfs/usr/lib\"
--DINCLUDEDIR=\"/mnt/clfs/usr/include\" -DHAVE_CONFIG_H -I. -I.
--g -O2 -c getopt1.c
-gcc -g -O2 -static -o make ar.o arscan.o commands.o dir.o
-expand.o file.o function.o getopt.o implicit.o job.o main.o
-misc.o read.o remake.o rule.o signame.o variable.o vpath.o
-default.o remote-stub.o version.o opt1.o
--lutil job.o: In function `load_too_high':
-/clfs/tmp/make-3.79.1/job.c:1565: undefined reference
-to `getloadavg'
-collect2: ld returned 1 exit status
-make[2]: *** [make] Error 1
-make[2]: Leaving directory `/clfs/tmp/make-3.79.1'
-make[1]: *** [all-recursive] Error 1
-make[1]: Leaving directory `/clfs/tmp/make-3.79.1'
-make: *** [all-recursive-am] Error 2</computeroutput></screen>
-
-    <para>In this case, many people would just include the bottom
-    section:</para>
-
-<screen><computeroutput>make [2]: *** [make] Error 1</computeroutput></screen>
-
-    <para>This is not enough information to properly diagnose the problem
-    because it only notes that something went wrong, not
-    <emphasis>what</emphasis> went wrong.  The entire section, as in the
-    example above, is what should be saved because it includes the command
-    that was executed and the associated error message(s).</para>
-
-    <para>An excellent article about asking for help on the Internet is
-    available online at <ulink
-    url="http://catb.org/~esr/faqs/smart-questions.html"/>.  Read and
-    follow the hints in this document to increase the likelihood of getting
-    the help you need.</para>
-
-  </sect2>
-
-</sect1>
Index: OK/introduction/common/changelog.xml
===================================================================
--- BOOK/introduction/common/changelog.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,914 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-intro-changelog" xreflabel="Master Changelog">
-  <?dbhtml filename="changelog.html"?>
-
-  <title>Master Changelog</title>
-
-  <para>This is version &version; of the Cross-Compiled Linux From Scratch
-  book, dated &releasedate;. If this book is more than six months old, a newer
-  and better version is probably already available. To find out, please check
-  one of the mirrors via <ulink url="&clfs-wiki;"/>.</para>
-
-  <para>Below is a list of detailed changes made since the previous release of
-   the book.</para>
-
-  <itemizedlist>
-    <title>Changelog Entries:</title>
-
-<!-- Changelog template
-
-    <listitem>
-      <para>Date</para>
-      <itemizedlist>
-        <listitem>
-          <para>[name] - Changelog entry.</para>
-        </listitem>
-        <listitem>
-          <para>[name] - Previous changelog entry.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
--->
-    <listitem>
-      <para>02 July 2017</para>
-      <itemizedlist>
-        <listitem>
-          <para>[William Harrington] - Upgrade Diffutils to 3.6. Fixes
-          ticket <ulink url="&clfs-ticket-root;1175">#1175.</ulink></para> 
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>09 June 2017</para>
-      <itemizedlist>
-        <listitem>
-          <para>[William Harrington] - Upgrade PERL to 5.26.0. Fixes
-          ticket <ulink url="&clfs-ticket-root;1167">#1167.</ulink></para> 
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>04 June 2017</para>
-      <itemizedlist>
-        <listitem>
-          <para>[Chris] - Simplified sed command in temp-system Bzip2.</para> 
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>02 June 2017</para>
-      <itemizedlist>
-        <listitem>
-          <para>[William Harrington] - Upgrade Sed to 4.4. Fixes
-          ticket <ulink url="&clfs-ticket-root;1149">#1149.</ulink></para> 
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>01 June 2017</para>
-      <itemizedlist>
-        <listitem>
-          <para>[William Harrington] - Upgrade Shadow to 4.5. Fixes
-          ticket <ulink url="&clfs-ticket-root;1150">#1150.</ulink></para> 
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>29 May 2017</para>
-      <itemizedlist>
-        <listitem>
-          <para>[William Harrington] - Upgrade File to 5.31. Fixes
-          ticket <ulink url="&clfs-ticket-root;1163">#1163.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Upgrade Flex to 2.6.4. Fixes
-          ticket <ulink url="&clfs-ticket-root;1089">#1089.</ulink></para> 
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>24 May 2017</para>
-      <itemizedlist>
-        <listitem>
-          <para>[William Harrington] - Upgrade Coreutils to 8.27. Fixes
-          ticket <ulink url="&clfs-ticket-root;1142">#1142.</ulink></para> 
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>19 May 2017</para>
-      <itemizedlist>
-        <listitem>
-          <para>[William Harrington] - Upgrade Libcap to 2.25. Fixes
-          ticket <ulink url="&clfs-ticket-root;1140">#1140.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Move Libcap after Acl.</para> 
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>17 May 2017</para>
-      <itemizedlist>
-        <listitem>
-          <para>[William Harrington] - Upgrade Vim to 8.0-0597. Fixes
-          ticket <ulink url="&clfs-ticket-root;1154">#1154.</ulink></para> 
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>14 May 2017</para>
-      <itemizedlist>
-        <listitem>
-          <para>[William Harrington] - Upgrade Perl to 5.24.1. Fixes
-          ticket <ulink url="&clfs-ticket-root;1035">#1035.</ulink></para> 
-        </listitem>
-      </itemizedlist>
-      <itemizedlist>
-        <listitem>
-          <para>[William Harrington] - Upgrade Binutils to 2.28. Fixes
-          ticket <ulink url="&clfs-ticket-root;1108">#1108.</ulink></para> 
-        </listitem>
-      </itemizedlist>
-      <itemizedlist>
-        <listitem>
-          <para>[William Harrington] - Upgrade ISL to 0.17.1. Fixes
-          ticket <ulink url="&clfs-ticket-root;1114">#1114.</ulink></para> 
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>13 May 2017</para>
-      <itemizedlist>
-        <listitem>
-          <para>[William Harrington] - Upgrade GCC to 7.1.0. Fixes
-          ticket <ulink url="&clfs-ticket-root;1114">#1114.</ulink></para> 
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>10 May 2017</para>
-      <itemizedlist>
-        <listitem>
-          <para>[William Harrington] - Upgrade MPFR to 3.1.5. Fixes
-          ticket <ulink url="&clfs-ticket-root;1145">#1145.</ulink></para> 
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>06 May 2017</para>
-      <itemizedlist>
-        <listitem>
-          <para>[William Harrington] - Upgrade GLIBC to 2.25. Fixes
-          ticket <ulink url="&clfs-ticket-root;1109">#1109.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Upgrade Expat to 2.2.0. Fixes
-          ticket <ulink url="&clfs-ticket-root;1130">#1130.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Upgrade Check to 0.11.0. Fixes
-          ticket <ulink url="&clfs-ticket-root;1127">#1127.</ulink></para> 
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>04 May 2017</para>
-      <itemizedlist>
-        <listitem>
-          <para>[William Harrington] - Upgrade Man-DB to 2.7.6.1. Fixes
-          ticket <ulink url="&clfs-ticket-root;1143">#1143.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Upgrade Tar to 1.29. Fixes
-          ticket <ulink url="&clfs-ticket-root;1151">#1151.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Upgrade BC to 1.07.1. Fixes
-          ticket <ulink url="&clfs-ticket-root;1124">#1124.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Upgrade Grep to 3.0. Fixes
-          ticket <ulink url="&clfs-ticket-root;1107">#1107.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Upgrade Readline to 7.0. Fixes
-          ticket <ulink url="&clfs-ticket-root;1086">#1086.</ulink></para> 
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>03 May 2017</para>
-      <itemizedlist>
-        <listitem>
-          <para>[William Harrington] - Upgrade Bash to 4.4. Fixes
-          ticket <ulink url="&clfs-ticket-root;1085">#1085.</ulink></para> 
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>16 April 2017</para>
-      <itemizedlist>
-        <listitem>
-          <para>[William Harrington] - Upgrade Util-linux to 2.29.2. Fixes
-          ticket <ulink url="&clfs-ticket-root;1038">#1038.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Upgrade Systemd 233. Fixes
-          ticket <ulink url="&clfs-ticket-root;1003">#1003.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Update group and user ids.</para> 
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>16 April 2017</para>
-      <itemizedlist>
-        <listitem>
-          <para>[William Harrington] - Upgrade Linux kernel to 4.9.21. Fixes
-          ticket <ulink url="&clfs-ticket-root;1105">#1105.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Upgrade IProute2 to 4.9.0. Fixes
-          ticket <ulink url="&clfs-ticket-root;1103">#1103.</ulink></para> 
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>15 April 2017</para>
-      <itemizedlist>
-        <listitem>
-          <para>[William Harrington] - Upgrade D-Bus to 1.10.18. Fixes ticket
-          <ulink url="&clfs-ticket-root;1049">#1049.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Upgrade DejaGNU to 1.6. Fixes ticket
-          <ulink url="&clfs-ticket-root;1128">#1128.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Upgrade DHCPCD to 6.11.5. Fixes ticket
-          <ulink url="&clfs-ticket-root;1077">#1077.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Upgrade Diffutils to 3.5. Fixes ticket
-          <ulink url="&clfs-ticket-root;1129">#1129.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Upgrade E2fsprogs to 1.43.4. Fixes
-          ticket <ulink url="&clfs-ticket-root;1113">#1113.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Upgrade File to 5.30. Fixes
-          ticket <ulink url="&clfs-ticket-root;1131">#1131.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Upgrade Findutils to 4.6.0. Fixes
-          ticket <ulink url="&clfs-ticket-root;1101">#1101.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Upgrade Gawk to 4.1.4. Fixes
-          ticket <ulink url="&clfs-ticket-root;1132">#1132.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Upgrade GDBM to 1.13. Fixes
-          ticket <ulink url="&clfs-ticket-root;1133">#1133.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Upgrade Gettext to 0.19.8.1. Fixes
-          ticket <ulink url="&clfs-ticket-root;1134">#1134.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Upgrade GMP to 6.1.2. Fixes
-          ticket <ulink url="&clfs-ticket-root;1100">#1100.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Upgrade GZIP to 1.8. Fixes
-          ticket <ulink url="&clfs-ticket-root;1136">#1136.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Upgrade KBD to 2.0.4. Fixes
-          ticket <ulink url="&clfs-ticket-root;1137">#1137.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Upgrade LESS to 491. Fixes
-          ticket <ulink url="&clfs-ticket-root;1139">#1139.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Upgrade M4 to 1.4.18. Fixes
-          ticket <ulink url="&clfs-ticket-root;1142">#1142.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Upgrade Make to 4.2.1. Fixes
-          ticket <ulink url="&clfs-ticket-root;1112">#1112.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Upgrade Man-pages to 4.09. Fixes
-          ticket <ulink url="&clfs-ticket-root;1144">#1144.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Upgrade Procps-ng to 3.3.12. Fixes
-          ticket <ulink url="&clfs-ticket-root;1148">#1148.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Upgrade Texinfo to 6.3. Fixes
-          ticket <ulink url="&clfs-ticket-root;1152">#1152.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Upgrade TZData to 2017b. Fixes
-          ticket <ulink url="&clfs-ticket-root;1153">#1153.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Upgrade XZ-Utils to 5.2.3. Fixes
-          ticket <ulink url="&clfs-ticket-root;1157">#1157.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Upgrade Zlib to 1.2.11. Fixes
-          ticket <ulink url="&clfs-ticket-root;1156">#1156.</ulink></para> 
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>28 December 2016</para>
-      <itemizedlist>
-        <listitem>
-	  <para>[Chris] - Added "ext_attr" to the list of filesystem attributes
-          to check for when creating a filesystem. Thanks to Roger Koehler for
-          pointing this out.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>13 March 2016</para>
-      <itemizedlist>
-        <listitem>
-          <para>[Chris] - Updated Gawk dependencies - Gawk can use
-          GMP, MPFR, Readline.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>04 March 2016</para>
-      <itemizedlist>
-        <listitem>
-          <para>[Chris] - Added creation of
-          <filename>/var/log/faillog</filename> to Shadow instructions.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>19 February 2016</para>
-      <itemizedlist>
-        <listitem>
-          <para>[Chris] - Removed --disable-profile from Glibc instructions -
-          profiling is disabled by default.</para>
-        </listitem>
-        <listitem>
-          <para>[Chris] - Removed commands to create libcurses* symlinks in
-          Ncurses, as few packages now are likely to need them. Fixes ticket
-          <ulink url="&clfs-ticket-root;1102">#1102.</ulink></para>
-        </listitem>
-        <listitem>
-          <para>[Chris] - Modified Ncurses instructions to move fewer libs
-          to /lib{,32,64} as only libncursesw itself is needed there.Fixes
-          ticket
-          <ulink url="&clfs-ticket-root;1104">#1104.</ulink></para>
-        </listitem>
-        <listitem>
-          <para>[Chris] - Prevented the <command>bashbug</command> script
-          from being installed in <filename class="directory">/bin</filename>,
-          as it is not needed there. Fixes ticket
-          <ulink url="&clfs-ticket-root;1099">#1099.</ulink></para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>17 January 2016</para>
-      <itemizedlist>
-        <listitem>
-          <para>[Chris] - Removed redundant commands from multilib Ncurses
-          pages.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>07 January 2016</para>
-      <itemizedlist>
-        <listitem>
-          <para>[Chris] - Removed command in Grep instructions for security fix
-          that was addressed in latest version.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>28 December 2015</para>
-      <itemizedlist>
-        <listitem>
-          <para>[William Harrington] - Upgrade to GREP 2.22. 
-          Fixes ticket <ulink url="&clfs-ticket-root;1087">#1087.</ulink></para>
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Upgrade to LESS 481. 
-          Fixes ticket <ulink url="&clfs-ticket-root;1088">#1088.</ulink></para>
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Upgrade to Ncurses 6.0.
-          Fixes ticket <ulink url="&clfs-ticket-root;1044">#1044.</ulink></para>
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Upgrade to GCC 5.3.0.
-          Fixes ticket <ulink url="&clfs-ticket-root;1094">#1094.</ulink></para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>23 December 2015</para>
-      <itemizedlist>
-        <listitem>
-          <para>[Chris] - Changed LSB link to its new location at
-          linuxfoundation.org.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>19 December 2015</para>
-      <itemizedlist>
-        <listitem>
-          <para>[Chris] - Added -j1 to vim install command to prevent
-          errors in make install output.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>13 December 2015</para>
-      <itemizedlist>
-        <listitem>
-          <para>[Chris] - Edited configure options to have one per line. Fixes
-          ticket <ulink url="&clfs-ticket-root;1091">#1091.</ulink></para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>05 December 2015</para>
-      <itemizedlist>
-        <listitem>
-          <para>[Chris] - Removed unneeded directory and symlink creation
-          on Pure64 Essential Symlinks page.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>30 November 2015</para>
-      <itemizedlist>
-        <listitem>
-          <para>[Chris] - Removed one more remaining --disable-libstdcxx-pch
-          option from final-system GCC installation.</para>
-        </listitem>
-        <listitem>
-          <para>[Chris] - Updates to command explanations.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>27 November 2015</para>
-      <itemizedlist>
-        <listitem>
-          <para>[William Harrington] - Update GCC to 5.2.0. Fixes ticket
-          <ulink url="&clfs-ticket-root;1019">#1019.</ulink></para>
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Remove CLooG. Fixes ticket
-          <ulink url="&clfs-ticket-root;1020">#1020.</ulink></para>
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Update ISL to 0.15. Fixes ticket
-          <ulink url="&clfs-ticket-root;978">#978.</ulink></para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>17 October 2015</para>
-      <itemizedlist>
-        <listitem>
-          <para>[William Harrington] - Update GLIBC to 2.22. Fixes ticket
-          <ulink url="&clfs-ticket-root;1027">#1027.</ulink></para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>16 October 2015</para>
-      <itemizedlist>
-        <listitem>
-          <para>[William Harrington] - Update Binutils to 2.25.1. Fixes ticket
-          <ulink url="&clfs-ticket-root;1023">#1023.</ulink></para>
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Update XZ to 5.2.2. Fixes ticket
-          <ulink url="&clfs-ticket-root;1081">#1081.</ulink></para>
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Update KBD to 2.0.3. Fixes ticket
-          <ulink url="&clfs-ticket-root;1057">#1057.</ulink></para>
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Update TZDATA to 2015g. Fixes ticket
-          <ulink url="&clfs-ticket-root;1051">#1051.</ulink></para>
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Update Libpipeline to 1.4.1. Fixes ticket
-          <ulink url="&clfs-ticket-root;1067">#1067.</ulink></para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>01 October 2015</para>
-      <itemizedlist>
-        <listitem>
-          <para>[Chris] - Removed unneeded --disable-static option from
-          Cross-Tools File page, as that is now the default.</para>
-        </listitem>
-        <listitem>
-          <para>[Chris] - Removed --without-shared option from
-          Cross-Tools Ncurses page, as that is the default.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>22 September 2015</para>
-      <itemizedlist>
-        <listitem>
-          <para>[William Harrington] - Update Libtool to 2.4.6. Fixes ticket
-          <ulink url="&clfs-ticket-root;1076">#1076.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Update Gettext to 0.19.6. Fixes ticket
-          <ulink url="&clfs-ticket-root;1075">#1075.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Update File to 5.25. Fixes ticket
-          <ulink url="&clfs-ticket-root;1074">#1074.</ulink></para> 
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>18 September 2015</para>
-      <itemizedlist>
-        <listitem>
-          <para>[William Harrington] - Remove sed for E2fsprogs. Fixes ticket
-          <ulink url="&clfs-ticket-root;1073">#1073.</ulink></para> 
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>16 September 2015</para>
-      <itemizedlist>
-        <listitem>
-          <para>[William Harrington] - Update IProute2 to 4.1.1. Fixes ticket
-          <ulink url="&clfs-ticket-root;992">#992.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Update Linux to 4.1.7. Fixes ticket
-          <ulink url="&clfs-ticket-root;995">#995.</ulink></para> 
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>15 September 2015</para>
-      <itemizedlist>
-        <listitem>
-          <para>[William Harrington] - Update Procps-ng to 3.3.11. Fixes ticket
-          <ulink url="&clfs-ticket-root;1072">#1072.</ulink></para> 
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>07 September 2015</para>
-      <itemizedlist>
-        <listitem>
-          <para>[William Harrington] - mv <command>gzexe</command> and <command>uncompress</command> to <filename class="directory">/usr/bin</filename>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>06 September 2015</para>
-      <itemizedlist>
-        <listitem>
-          <para>[William Harrington] - Add IPv6 entry to /etc/hosts for localhost</para>
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Update iputils to s20150815. Fixes ticket
-          <ulink url="&clfs-ticket-root;1066">#1066.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - mv <command>fuser killall</command> to <filename class="directory">/bin</filename> per the FHS. Fixes ticket
-          <ulink url="&clfs-ticket-root;1068">#1068.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Update MPFR to 3.1.3. Fixes ticket
-          <ulink url="&clfs-ticket-root;1043">#1043.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Update Texinfo to 6.0. Fixes ticket
-          <ulink url="&clfs-ticket-root;1041">#1041.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Update XML-Parser to 2.44. Fixes ticket
-          <ulink url="&clfs-ticket-root;1039">#1039.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Update XZ to 5.2.1. Fixes ticket
-          <ulink url="&clfs-ticket-root;1037">#1037.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Update Patch to 2.7.5. Fixes ticket
-          <ulink url="&clfs-ticket-root;1034">#1034.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Update MPC to 1.0.3. Fixes ticket
-          <ulink url="&clfs-ticket-root;1033">#1033.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Update KMOD to 21. Fixes ticket
-          <ulink url="&clfs-ticket-root;1031">#1031.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Update Intltool to 0.51.0. Fixes ticket
-          <ulink url="&clfs-ticket-root;1030">#1030.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Update Groff to 1.22.3. Fixes ticket
-          <ulink url="&clfs-ticket-root;1029">#1029.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Update Grep to 2.21. Fixes ticket
-          <ulink url="&clfs-ticket-root;1028">#1028.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Update DejaGNU to 1.5.3. Fixes ticket
-          <ulink url="&clfs-ticket-root;1025">#1025.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Update Bison to 3.0.4. Fixes ticket
-          <ulink url="&clfs-ticket-root;1024">#1024.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Update Automake to 1.15. Fixes ticket
-          <ulink url="&clfs-ticket-root;1022">#1022.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Update LESS to 479. Fixes ticket
-          <ulink url="&clfs-ticket-root;1056">#1056.</ulink></para> 
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>04 September 2015</para>
-      <itemizedlist>
-        <listitem>
-          <para>[William Harrington] - Update File to 5.24. Fixes ticket
-          <ulink url="&clfs-ticket-root;1021">#1021.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Update Man-db to 2.7.2. Fixes ticket
-          <ulink url="&clfs-ticket-root;1032">#1032.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Update TCL to 8.6.4. Fixes ticket
-          <ulink url="&clfs-ticket-root;1036">#1036.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Update Check to 0.10.0. Fixes ticket
-          <ulink url="&clfs-ticket-root;1045">#1045.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Update E2fsprogs to 1.42.13. Fixes ticket
-          <ulink url="&clfs-ticket-root;1046">#1046.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Update Gawk to 4.1.3. Fixes ticket
-          <ulink url="&clfs-ticket-root;1047">#1047.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Update Gettext to 0.19.5.1. Fixes ticket
-          <ulink url="&clfs-ticket-root;1048">#1048.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Update Man-pages to 4.02. Fixes ticket
-          <ulink url="&clfs-ticket-root;1050">#1050.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Add Bc memory leak patch. Fixes ticket
-          <ulink url="&clfs-ticket-root;1055">#1055.</ulink></para> 
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>30 July 2015</para>
-      <itemizedlist>
-        <listitem>
-          <para>[Chris] - Removed reference to Freecode, as it's no longer being updated.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>07 February 2015</para>
-      <itemizedlist>
-        <listitem>
-          <para>[Chris] - Updated FHS URL to new location.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>2 November 2014</para>
-      <itemizedlist>
-        <listitem>
-          <para>[Chris] - Removed obsolete command for fixing
-          <command>tzselect</command> from Glibc instructions.</para>
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Update E2FSprogs to 1.42.12. Fixes ticket
-          <ulink url="&clfs-ticket-root;1012">#1012.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Update Libtool to 2.4.3. Fixes ticket
-          <ulink url="&clfs-ticket-root;1013">#1013.</ulink></para> 
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>31 October 2014</para>
-      <itemizedlist>
-        <listitem>
-          <para>[William Harrington] - Update TZDATA to 2014i. Fixes ticket
-          <ulink url="&clfs-ticket-root;1006">#1006.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Update Util-linux to 2.25.2. Fixes ticket
-          <ulink url="&clfs-ticket-root;1007">#1007.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Update XZ Utils to 5.0.7. Fixes ticket
-          <ulink url="&clfs-ticket-root;1008">#1008.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Update DHCPCD to 6.6.0. Fixes ticket
-          <ulink url="&clfs-ticket-root;1009">#1009.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Update Libpipeline to 1.4.0. Fixes ticket
-          <ulink url="&clfs-ticket-root;1010">#1010.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Update D-Bus to 1.9.0. Fixes ticket
-          <ulink url="&clfs-ticket-root;987">#987.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Update GLIBC to 2.20. Fixes ticket
-          <ulink url="&clfs-ticket-root;982">#982.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Update Coreutils to 8.23. Fixes ticket
-          <ulink url="&clfs-ticket-root;975">#975.</ulink></para> 
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>25 October 2014</para>
-      <itemizedlist>
-        <listitem>
-          <para>[William Harrington] - Update GREP to 2.20. Fixes ticket
-          <ulink url="&clfs-ticket-root;969">#969.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Update Check to 0.9.14. Fixes ticket
-          <ulink url="&clfs-ticket-root;986">#986.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Update DHCPCD to 6.5.1. Fixes ticket
-          <ulink url="&clfs-ticket-root;988">#988.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Update File to 5.20. Fixes ticket
-          <ulink url="&clfs-ticket-root;990">#990.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Update Gettext to 0.19.3. Fixes ticket
-          <ulink url="&clfs-ticket-root;991">#991.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Update KBD to 2.0.2. Fixes ticket
-          <ulink url="&clfs-ticket-root;993">#993.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Update Libpipeline to 1.3.1. Fixes ticket
-          <ulink url="&clfs-ticket-root;994">994.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Update Make to 4.1. Fixes ticket
-          <ulink url="&clfs-ticket-root;996">#996.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Add Man-DB Home Page. Fixes ticket
-          <ulink url="&clfs-ticket-root;997">#997.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Update Man-DB to 2.7.0.2. Fixes ticket
-          <ulink url="&clfs-ticket-root;998">#998.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Update Man-pages to 3.75. Fixes ticket
-          <ulink url="&clfs-ticket-root;999">#999.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Update Perl to 5.20.1. Fixes ticket
-          <ulink url="&clfs-ticket-root;1000">#1000.</ulink> All hail the
-          1000 ticket!</para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Update Procps-ng to 3.3.10. Fixes ticket
-          <ulink url="&clfs-ticket-root;1001">#1001.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Update Tar to 1.28. Fixes ticket
-          <ulink url="&clfs-ticket-root;1004">#1004.</ulink></para> 
-        </listitem>
-        <listitem>
-          <para>[William Harrington] - Update TCL to 8.6.2. Fixes ticket
-          <ulink url="&clfs-ticket-root;1005">#1005.</ulink></para> 
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>18 October 2014</para>
-      <itemizedlist>
-        <listitem>
-          <para>[William Harrington] - Update LESS to 464.</para> 
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>18 October 2014</para>
-      <itemizedlist>
-        <listitem>
-          <para>[William Harrington] - Changelog restarted, see the 3.0.0 book for the
-          old changelog.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-  </itemizedlist>
-
-</sect1>
Index: OK/introduction/common/how.xml
===================================================================
--- BOOK/introduction/common/how.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,79 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-intro-how">
-  <?dbhtml filename="how.html"?>
-
-  <title>How to Build a CLFS System</title>
-
-  <para>The CLFS system will be built by using a previously installed
-  Unix system or Linux distribution (such as Debian, Fedora, openSUSE,
-  or Ubuntu). This existing system (the host) will be used as a starting
-  point to provide necessary programs, including a compiler, linker, and shell,
-  to build the new system. Select the <quote>development</quote> option
-  during the distribution installation to be able to access these
-  tools.</para>
-
-  <para>As an alternative to installing an entire separate distribution onto
-  your machine, you may wish to use a livecd. Most distributions provide
-  a livecd, which provides an environment to which you can add the required
-  tools onto, allowing you to successfully follow the instructions in this
-  book. Remember that if you reboot the livecd you will need to reconfigure
-  the host environment before continuing with your build.</para>
-
-  <para><xref linkend="chapter-partitioning"/> of this book describes how
-  to create a new Linux native partition and file system, the place
-  where the new CLFS system will be compiled and installed. <xref
-  linkend="chapter-getting-materials"/> explains which packages and
-  patches need to be downloaded to build a CLFS system and how to store
-  them on the new file system. <xref linkend="chapter-final-preps"/>
-  discusses the setup for an appropriate working environment. Please read
-  <xref linkend="chapter-final-preps"/> carefully as it explains several
-  important issues the developer should be aware of before beginning to
-  work through <xref linkend="chapter-cross-tools"/> and
-  beyond.</para>
-
-  <para><xref linkend="chapter-cross-tools"/> explains the installation of
-  cross-compile tools which will be built on the host but be able to compile
-  programs that run on the target machine. These cross-compile tools will
-  be used to create a temporary, minimal system that will be the basis for
-  building the final CLFS system. Some of these packages are needed to resolve
-  circular dependencies&mdash;for example, to compile a compiler, you need a
-  compiler.</para>
-
-  <para>The process of building cross-compile tools first involves building and
-  installing all the necessary tools to create a build system for the target
-  machine. With these cross-compiled tools, we eliminate any
-  dependencies on the toolchain from our host distro.</para>
-
-  <para>After we build our <quote>Cross-Tools</quote>, we start building
-  a very minimal working system in
-  <filename class="directory">/tools</filename>, using the cross-toolchain in
-  <filename class="directory">/cross-tools</filename>. Once the temporary
-  system is finished, we perform a few additional tasks to prepare to
-  enter this temporary build environment, either by booting or chrooting into
-  it. For more details about the difference between these methods, see
-  <xref linkend="ch-temp-system-choose"/>.</para>
-
-  <para>In <xref linkend="chapter-building-system"/>, after having booted
-  or chrooted into the temporary build environment, the full CLFS system is
-  built.</para>
-
-  <para>To finish the installation, several configuration files are created in
-  <xref linkend="chapter-system-config"/>, and the kernel and boot loader are
-  set up in <xref linkend="chapter-bootable"/>.
-  <xref linkend="chapter-finalizing"/>
-  contains information on furthering the CLFS experience beyond this book.
-  After the steps in this book have been implemented, the computer will be
-  ready to reboot into the new CLFS system.</para>
-
-  <para>This is the process in a nutshell. Detailed information on each
-  step is discussed in the following chapters and package descriptions.
-  Items that may seem complicated will be clarified, and everything will
-  fall into place as the reader embarks on the CLFS adventure.</para>
-
-</sect1>
Index: OK/introduction/common/resources.xml
===================================================================
--- BOOK/introduction/common/resources.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,85 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-intro-resources">
-  <?dbhtml filename="resources.html"?>
-
-  <title>Resources</title>
-
-  <sect2 id="ch-intro-faq">
-    <title>FAQ</title>
-
-    <para>If during the building of the CLFS system you encounter any
-    errors, have any questions, or think there is a typo in the book,
-    please start by consulting the Frequently Asked Questions (FAQ)
-    that is located at <ulink url="&faq-root;"/>.</para>
-
-  </sect2>
-
-  <sect2 id="ch-intro-maillists" xreflabel="Chapter 1 - Mailing Lists">
-    <title>Mailing Lists</title>
-
-    <para>The <uri>clfs.org</uri> server hosts a number of
-    mailing lists used for the development of the CLFS project. These lists
-    include the main development and support lists, among others. If the
-    FAQ does not contain your answer, you can search the CLFS lists via
-    The Mail Archive <ulink url="http://www.mail-archive.com"/>. You can
-    find the mail lists with the following link:</para>
-
-    <para><ulink url="http://www.mail-archive.com/index.php?hunt=clfs"/></para>
-
-    <para>For information on the different lists, how to subscribe, archive
-    locations, and additional information, visit <ulink url="&clfs-wiki;wiki/lists"/>.</para>
-
-  </sect2>
-
-  <sect2 id="ch-intro-newsserver">
-    <title>News Server</title>
-
-    <para>Cross-LFS does not maintain its own News Server, but we do provide
-    access via <uri>gmane.org</uri> <ulink url="http://gmane.org"/>. If you want to subscribe
-    to the Cross-LFS lists via a newsreader you can utilize <uri>gmane.org</uri>.
-    You can find the gmane search for CLFS with the following link:</para>
-
-   <para><ulink url="http://dir.gmane.org/search.php?match=clfs"/></para>
-
-  </sect2>
-
-  <sect2 id="ch-intro-irc">
-    <title>IRC</title>
-
-    <para>Several members of the CLFS community offer assistance on our
-    community Internet Relay Chat (IRC) network. Before using this support,
-    please make sure that your question is not already answered in the CLFS
-    FAQ or the mailing list archives. You can find the IRC network at
-    <uri>chat.freenode.net</uri>. The support channel for cross-lfs is
-    named #cross-lfs. If you need to show people the output of your
-    problems, please use
-    <ulink url="http://pastebin.clfs.org"/> and reference
-    the pastebin URL when asking your questions.</para>
-
-  </sect2>
-
-  <sect2 id="ch-intro-mirrors" xreflabel="Chapter 1 - Mirror sites">
-    <title>Mirror Sites</title>
-
-    <para>The CLFS project has a number of world-wide mirrors to make
-    accessing the website and downloading the required packages more
-    convenient. Please visit the CLFS website at
-    <ulink url="&clfs-wiki;wiki/mirrors"/> for mirrors of CLFS.</para>
-
-  </sect2>
-
-  <sect2 id="ch-intro-contactinfo">
-    <title>Contact Information</title>
-
-    <para>Please direct all your questions and comments to the
-    CLFS mailing lists (see above).</para>
-
-  </sect2>
-
-</sect1>
Index: OK/introduction/common/whatsnew.xml
===================================================================
--- BOOK/introduction/common/whatsnew.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,39 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-intro-whatsnew" xreflabel="Master WhatsNew">
-  <?dbhtml filename="whatsnew.html"?>
-
-  <title>What's new since the last release.</title>
-
-  <para>Below is a list of package updates made since the previous release of the book.</para>
-
-  <itemizedlist>
-    <title>Upgraded to:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-  <itemizedlist>
-    <title>Added:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-  <itemizedlist>
-    <title>Removed:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-</sect1>
Index: OK/introduction/mips-chapter.xml
===================================================================
--- BOOK/introduction/mips-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,26 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-intro" xreflabel="Introduction">
-  <?dbhtml dir="introduction"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Introduction</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/acknowledgements.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/how.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/buildinfo.xml"/>
-  <!-- Uncoment after the first CLFS release
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/whatsnew.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/whatsnew.xml"/>
-  -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changelog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/changelog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resources.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/askforhelp.xml"/>
-
-</chapter>
Index: OK/introduction/mips/buildinfo.xml
===================================================================
--- BOOK/introduction/mips/buildinfo.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,31 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-introduction-buildinfo">
-  <?dbhtml filename="build-info.html"?>
-
-  <title>Recommended Build Information</title>
-
-  <para>On the RaQ2, we are recommending the following:</para>
-
-  <blockquote>
-
-    <para>The RaQ2 uses DOS style partitions, so build on a x86 and
-    put the RaQ2 hard drive into that system.</para>
-
-    <para>Follow the directions using the reboot section.</para>
-
-    <para>Remove the hard drive and put it into the RaQ2 and
-    continue your build.</para>
-
-  </blockquote>
-
-  <para>On other MIPS based systems, you will have to build on the
-  machine itself, since most of the other MIPS machines use SGI
-  style partitions.</para>
-
-</sect1>
Index: OK/introduction/mips/changelog.xml
===================================================================
--- BOOK/introduction/mips/changelog.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,48 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-intro-changelog-mips">
-  <?dbhtml filename="changelog-mips.html"?>
-
-  <title>Changelog for MIPS 32 Bit</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/changelog.xml"
-  xpointer="xpointer(/sect1/para[1])"/>
-
-  <itemizedlist>
-    <title>Changelog Entries:</title>
-
-<!-- Changelog template
-
-    <listitem>
-      <para>Date</para>
-      <itemizedlist>
-        <listitem>
-          <para>[name] - Changelog entry.</para>
-        </listitem>
-        <listitem>
-          <para>[name] - Another changelog entry.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
--->
-
-    <listitem>
-      <para>18 October 2014</para>
-      <itemizedlist>
-        <listitem>
-          <para>[William Harrington] - Changelog restarted, see the 3.0.0 book for the
-          old changelog.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-  </itemizedlist>
-
-</sect1>
Index: OK/introduction/mips/whatsnew.xml
===================================================================
--- BOOK/introduction/mips/whatsnew.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,41 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-intro-whatsnew-mips">
-  <?dbhtml filename="whatsnew-mips.html"?>
-
-  <title>What's new for MIPS 32 Bit</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/whatsnew.xml"
-  xpointer="xpointer(/sect1/para[1])"/>
-
-  <itemizedlist>
-    <title>Upgraded to:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-  <itemizedlist>
-    <title>Added:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-  <itemizedlist>
-    <title>Removed:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-</sect1>
Index: OK/introduction/mips64-64-chapter.xml
===================================================================
--- BOOK/introduction/mips64-64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,26 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-intro" xreflabel="Introduction">
-  <?dbhtml dir="introduction"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Introduction</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/acknowledgements.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/how.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/buildinfo.xml"/>
-  <!-- Uncoment after the first CLFS release
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/whatsnew.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64-64/whatsnew.xml"/>
-  -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changelog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64-64/changelog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resources.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/askforhelp.xml"/>
-
-</chapter>
Index: OK/introduction/mips64-64/changelog.xml
===================================================================
--- BOOK/introduction/mips64-64/changelog.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,48 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-intro-changelog-mips64">
-  <?dbhtml filename="changelog-mips64.html"?>
-
-  <title>Changelog for MIPS64-64</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/changelog.xml"
-  xpointer="xpointer(/sect1/para[1])"/>
-
-  <itemizedlist>
-    <title>Changelog Entries:</title>
-
-<!-- Changelog template
-
-    <listitem>
-      <para>Date</para>
-      <itemizedlist>
-        <listitem>
-          <para>[name] - Changelog entry.</para>
-        </listitem>
-        <listitem>
-          <para>[name] - Another changelog entry.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
--->
-
-    <listitem>
-      <para>18 October 2014</para>
-      <itemizedlist>
-        <listitem>
-          <para>[William Harrington] - Changelog restarted, see the 3.0.0 book for the
-          old changelog.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-  </itemizedlist>
-
-</sect1>
-
Index: OK/introduction/mips64-64/whatsnew.xml
===================================================================
--- BOOK/introduction/mips64-64/whatsnew.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,41 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-intro-whatsnew-mips64">
-  <?dbhtml filename="whatsnew-mips64.html"?>
-
-  <title>What's new for MIPS 64 Bit</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/whatsnew.xml"
-  xpointer="xpointer(/sect1/para[1])"/>
-
-  <itemizedlist>
-    <title>Upgraded to:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-  <itemizedlist>
-    <title>Added:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-  <itemizedlist>
-    <title>Removed:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-</sect1>
Index: OK/introduction/mips64-chapter.xml
===================================================================
--- BOOK/introduction/mips64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,26 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-intro" xreflabel="Introduction">
-  <?dbhtml dir="introduction"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Introduction</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/acknowledgements.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/how.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/buildinfo.xml"/>
-  <!-- Uncoment after the first CLFS release
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/whatsnew.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/whatsnew.xml"/>
-  -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changelog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/changelog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resources.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/askforhelp.xml"/>
-
-</chapter>
Index: OK/introduction/mips64/changelog.xml
===================================================================
--- BOOK/introduction/mips64/changelog.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,48 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-intro-changelog-mips64">
-  <?dbhtml filename="changelog-mips64.html"?>
-
-  <title>Changelog for MIPS 64 Bit</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/changelog.xml"
-  xpointer="xpointer(/sect1/para[1])"/>
-
-  <itemizedlist>
-    <title>Changelog Entries:</title>
-
-<!-- Changelog template
-
-    <listitem>
-      <para>Date</para>
-      <itemizedlist>
-        <listitem>
-          <para>[name] - Changelog entry.</para>
-        </listitem>
-        <listitem>
-          <para>[name] - Another changelog entry.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
--->
-
-    <listitem>
-      <para>18 October 2014</para>
-      <itemizedlist>
-        <listitem>
-          <para>[William Harrington] - Changelog restarted, see the 3.0.0 book for the
-          old changelog.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-  </itemizedlist>
-
-</sect1>
Index: OK/introduction/mips64/whatsnew.xml
===================================================================
--- BOOK/introduction/mips64/whatsnew.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,41 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-intro-whatsnew-mips64">
-  <?dbhtml filename="whatsnew-mips64.html"?>
-
-  <title>What's new for MIPS 64 Bit Multilib</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/whatsnew.xml"
-  xpointer="xpointer(/sect1/para[1])"/>
-
-  <itemizedlist>
-    <title>Upgraded to:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-  <itemizedlist>
-    <title>Added:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-  <itemizedlist>
-    <title>Removed:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-</sect1>
Index: OK/introduction/ppc-chapter.xml
===================================================================
--- BOOK/introduction/ppc-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,25 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-intro" xreflabel="Introduction">
-  <?dbhtml dir="introduction"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Introduction</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/acknowledgements.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/how.xml"/>
-  <!-- Uncoment after the first CLFS release
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/whatsnew.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/whatsnew.xml"/>
-  -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changelog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/changelog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resources.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/askforhelp.xml"/>
-
-</chapter>
Index: OK/introduction/ppc/changelog.xml
===================================================================
--- BOOK/introduction/ppc/changelog.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,58 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-intro-changelog-ppc">
-  <?dbhtml filename="changelog-ppc.html"?>
-
-  <title>Changelog for PowerPC</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/changelog.xml"
-  xpointer="xpointer(/sect1/para[1])"/>
-
-  <itemizedlist>
-    <title>Changelog Entries:</title>
-
-<!-- Changelog template
-
-    <listitem>
-      <para>Date</para>
-      <itemizedlist>
-        <listitem>
-          <para>[name] - Changelog entry.</para>
-        </listitem>
-        <listitem>
-          <para>[name] - Another changelog entry.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
--->
-   <listitem>
-      <para>12 June 2017</para>
-      <itemizedlist>
-        <listitem>
-          <para>[William Harrington] - Use --enable-stack-protector=no.
-          Using strong causes segfaults upon install with <command>zic</command>
-          and <command>localedef</command>.</para>
-        </listitem>
-      </itemizedlist>
-   </listitem>
-
-   <listitem>
-      <para>18 October 2014</para>
-      <itemizedlist>
-        <listitem>
-          <para>[William Harrington] - Changelog restarted, see the 3.0.0 book for the
-          old changelog.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-  </itemizedlist>
-
-</sect1>
Index: OK/introduction/ppc/whatsnew.xml
===================================================================
--- BOOK/introduction/ppc/whatsnew.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,41 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-intro-whatsnew-ppc">
-  <?dbhtml filename="whatsnew-ppc.html"?>
-
-  <title>What's new for PowerPC</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/whatsnew.xml"
-  xpointer="xpointer(/sect1/para[1])"/>
-
-  <itemizedlist>
-    <title>Upgraded to:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-  <itemizedlist>
-    <title>Added:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-  <itemizedlist>
-    <title>Removed:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-</sect1>
Index: OK/introduction/ppc64-64-chapter.xml
===================================================================
--- BOOK/introduction/ppc64-64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,25 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-intro" xreflabel="Introduction">
-  <?dbhtml dir="introduction"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Introduction</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/acknowledgements.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/how.xml"/>
-  <!-- Uncoment after the first CLFS release
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/whatsnew.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/whatsnew.xml"/>
-  -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changelog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64-64/changelog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resources.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/askforhelp.xml"/>
-
-</chapter>
Index: OK/introduction/ppc64-64/changelog.xml
===================================================================
--- BOOK/introduction/ppc64-64/changelog.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,48 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-intro-changelog-ppc64">
-  <?dbhtml filename="changelog-ppc64.html"?>
-
-  <title>Changelog for PowerPC64</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/changelog.xml"
-  xpointer="xpointer(/sect1/para[1])"/>
-
-  <itemizedlist>
-    <title>Changelog Entries:</title>
-
-<!-- Changelog template
-
-   <listitem>
-      <para>Date</para>
-      <itemizedlist>
-        <listitem>
-          <para>[name] - Changelog entry.</para>
-        </listitem>
-        <listitem>
-          <para>[name] - Another changelog entry.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
--->
-
-    <listitem>
-      <para>18 October 2014</para>
-      <itemizedlist>
-        <listitem>
-          <para>[William Harrington] - Changelog restarted, see the 3.0.0 book for the
-          old changelog.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-  </itemizedlist>
-
-</sect1>
Index: OK/introduction/ppc64-64/whatsnew.xml
===================================================================
--- BOOK/introduction/ppc64-64/whatsnew.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,41 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-intro-whatsnew-ppc">
-  <?dbhtml filename="whatsnew-ppc.html"?>
-
-  <title>What's new for PowerPC</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/whatsnew.xml"
-  xpointer="xpointer(/sect1/para[1])"/>
-
-  <itemizedlist>
-    <title>Upgraded to:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-  <itemizedlist>
-    <title>Added:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-  <itemizedlist>
-    <title>Removed:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-</sect1>
Index: OK/introduction/ppc64-chapter.xml
===================================================================
--- BOOK/introduction/ppc64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,25 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-intro" xreflabel="Introduction">
-  <?dbhtml dir="introduction"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Introduction</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/acknowledgements.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/how.xml"/>
-  <!-- Uncoment after the first CLFS release
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/whatsnew.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/whatsnew.xml"/>
-  -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changelog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/changelog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resources.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/askforhelp.xml"/>
-
-</chapter>
Index: OK/introduction/ppc64/changelog.xml
===================================================================
--- BOOK/introduction/ppc64/changelog.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,48 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-intro-changelog-ppc64">
-  <?dbhtml filename="changelog-ppc64.html"?>
-
-  <title>Changelog for PowerPC64</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/changelog.xml"
-  xpointer="xpointer(/sect1/para[1])"/>
-
-  <itemizedlist>
-    <title>Changelog Entries:</title>
-
-<!-- Changelog template
-
-    <listitem>
-      <para>Date</para>
-      <itemizedlist>
-        <listitem>
-          <para>[name] - Changelog entry.</para>
-        </listitem>
-        <listitem>
-          <para>[name] - Another changelog entry.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
--->
-
-    <listitem>
-      <para>18 October 2014</para>
-      <itemizedlist>
-        <listitem>
-          <para>[William Harrington] - Changelog restarted, see the 3.0.0 book for the
-          old changelog.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-  </itemizedlist>
-
-</sect1>
Index: OK/introduction/ppc64/whatsnew.xml
===================================================================
--- BOOK/introduction/ppc64/whatsnew.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,41 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-intro-whatsnew-ppc">
-  <?dbhtml filename="whatsnew-ppc.html"?>
-
-  <title>What's new for PowerPC</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/whatsnew.xml"
-  xpointer="xpointer(/sect1/para[1])"/>
-
-  <itemizedlist>
-    <title>Upgraded to:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-  <itemizedlist>
-    <title>Added:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-  <itemizedlist>
-    <title>Removed:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-</sect1>
Index: OK/introduction/sparc-chapter.xml
===================================================================
--- BOOK/introduction/sparc-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,26 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-intro" xreflabel="Introduction">
-  <?dbhtml dir="introduction"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Introduction</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/acknowledgements.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/how.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/buildinfo.xml"/>
-  <!-- Uncoment after the first CLFS release
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/whatsnew.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/whatsnew.xml"/>
-  -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changelog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/changelog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resources.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/askforhelp.xml"/>
-
-</chapter>
Index: OK/introduction/sparc/buildinfo.xml
===================================================================
--- BOOK/introduction/sparc/buildinfo.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,24 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-introduction-buildinfo">
-  <?dbhtml filename="build-info.html"?>
-
-  <title>Recommended Build Information</title>
-
-  <para>Sparc v8 and earlier</para>
-
-  <blockquote>
-
-    <para>Sparc v8 and earlier processors are not supported
-    by NPTL. Sparc v9 are supported by the Sparc 64 build instructions
-    which utilize NPTL. If you have an UltraSparc processor, you
-    have a Sparc v9 which is 64 Bit.</para>
-
-  </blockquote>
-
-</sect1>
Index: OK/introduction/sparc/changelog.xml
===================================================================
--- BOOK/introduction/sparc/changelog.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,48 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-intro-changelog-sparc">
-  <?dbhtml filename="changelog-sparc.html"?>
-
-  <title>Changelog for Sparc</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/changelog.xml"
-  xpointer="xpointer(/sect1/para[1])"/>
-
-  <itemizedlist>
-    <title>Changelog Entries:</title>
-
-<!-- Changelog template
-
-    <listitem>
-      <para>Date</para>
-      <itemizedlist>
-        <listitem>
-          <para>[name] - Changelog entry.</para>
-        </listitem>
-        <listitem>
-          <para>[name] - Another changelog entry.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
--->
-
-    <listitem>
-      <para>18 October 2014</para>
-      <itemizedlist>
-        <listitem>
-          <para>[William Harrington] - Changelog restarted, see the 3.0.0 book for the
-          old changelog.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-  </itemizedlist>
-
-</sect1>
Index: OK/introduction/sparc/whatsnew.xml
===================================================================
--- BOOK/introduction/sparc/whatsnew.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,41 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-intro-whatsnew-sparc">
-  <?dbhtml filename="whatsnew-sparc.html"?>
-
-  <title>What's new for Sparc</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/whatsnew.xml"
-  xpointer="xpointer(/sect1/para[1])"/>
-
-  <itemizedlist>
-    <title>Upgraded to:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-  <itemizedlist>
-    <title>Added:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-  <itemizedlist>
-    <title>Removed:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-</sect1>
Index: OK/introduction/sparc64-64-chapter.xml
===================================================================
--- BOOK/introduction/sparc64-64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,25 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-intro" xreflabel="Introduction">
-  <?dbhtml dir="introduction"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Introduction</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/acknowledgements.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/how.xml"/>
-  <!-- Uncoment after the first CLFS release
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/whatsnew.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64-64/whatsnew.xml"/>
-  -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changelog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64-64/changelog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resources.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/askforhelp.xml"/>
-
-</chapter>
Index: OK/introduction/sparc64-64/changelog.xml
===================================================================
--- BOOK/introduction/sparc64-64/changelog.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,48 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-intro-changelog-sparc64">
-  <?dbhtml filename="changelog-sparc64.html"?>
-
-  <title>Changelog for Sparc64-64</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/changelog.xml"
-  xpointer="xpointer(/sect1/para[1])"/>
-
-  <itemizedlist>
-    <title>Changelog Entries:</title>
-
-<!-- Changelog template
-
-    <listitem>
-      <para>Date</para>
-      <itemizedlist>
-        <listitem>
-          <para>[name] - Changelog entry.</para>
-        </listitem>
-        <listitem>
-          <para>[name] - Another changelog entry.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
--->
-
-    <listitem>
-      <para>18 October 2014</para>
-      <itemizedlist>
-        <listitem>
-          <para>[William Harrington] - Changelog restarted, see the 3.0.0 book for the
-          old changelog.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-  </itemizedlist>
-
-</sect1>
Index: OK/introduction/sparc64-64/whatsnew.xml
===================================================================
--- BOOK/introduction/sparc64-64/whatsnew.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,41 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-intro-whatsnew-sparc64">
-  <?dbhtml filename="whatsnew-sparc64.html"?>
-
-  <title>What's new for Sparc64</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/whatsnew.xml"
-  xpointer="xpointer(/sect1/para[1])"/>
-
-  <itemizedlist>
-    <title>Upgraded to:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-  <itemizedlist>
-    <title>Added:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-  <itemizedlist>
-    <title>Removed:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-</sect1>
Index: OK/introduction/sparc64-chapter.xml
===================================================================
--- BOOK/introduction/sparc64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,25 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-intro" xreflabel="Introduction">
-  <?dbhtml dir="introduction"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Introduction</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/acknowledgements.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/how.xml"/>
-  <!-- Uncoment after the first CLFS release
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/whatsnew.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/whatsnew.xml"/>
-  -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changelog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/changelog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resources.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/askforhelp.xml"/>
-
-</chapter>
Index: OK/introduction/sparc64/changelog.xml
===================================================================
--- BOOK/introduction/sparc64/changelog.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,48 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-intro-changelog-sparc64">
-  <?dbhtml filename="changelog-sparc64.html"?>
-
-  <title>Changelog for Sparc64</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/changelog.xml"
-  xpointer="xpointer(/sect1/para[1])"/>
-
-  <itemizedlist>
-    <title>Changelog Entries:</title>
-
-<!-- Changelog template
-
-    <listitem>
-      <para>Date</para>
-      <itemizedlist>
-        <listitem>
-          <para>[name] - Changelog entry.</para>
-        </listitem>
-        <listitem>
-          <para>[name] - Another changelog entry.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
--->
-
-    <listitem>
-      <para>18 October 2014</para>
-      <itemizedlist>
-        <listitem>
-          <para>[William Harrington] - Changelog restarted, see the 3.0.0 book for the
-          old changelog.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-  </itemizedlist>
-
-</sect1>
Index: OK/introduction/sparc64/whatsnew.xml
===================================================================
--- BOOK/introduction/sparc64/whatsnew.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,41 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-intro-whatsnew-sparc64">
-  <?dbhtml filename="whatsnew-sparc64.html"?>
-
-  <title>What's new for Sparc64 Multilib</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/whatsnew.xml"
-  xpointer="xpointer(/sect1/para[1])"/>
-
-  <itemizedlist>
-    <title>Upgraded to:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-  <itemizedlist>
-    <title>Added:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-  <itemizedlist>
-    <title>Removed:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-</sect1>
Index: OK/introduction/x86-chapter.xml
===================================================================
--- BOOK/introduction/x86-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,28 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-intro" xreflabel="Introduction">
-  <?dbhtml dir="introduction"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Introduction</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/acknowledgements.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/how.xml"/>
-  <!-- Uncoment after the first CLFS release
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/whatsnew.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/whatsnew.xml"/>
-  -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changelog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/changelog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resources.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/askforhelp.xml"/>
-  <!-- This page is only for published versions if the LiveCD is included
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/livecd.xml"/>
-  -->
-
-</chapter>
Index: OK/introduction/x86/changelog.xml
===================================================================
--- BOOK/introduction/x86/changelog.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,47 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-intro-changelog-x86">
-  <title>Changelog for x86</title>
-  <?dbhtml filename="changelog-x86.html"?>
-
-  <para>Below is a list of changes specific for this architecture made
-  since the previous release of the book. For general changes see
-  <xref linkend="ch-intro-changelog"/>,</para>
-
-  <itemizedlist>
-    <title>Changelog Entries:</title>
-
-<!-- Changelog template
-
-    <listitem>
-      <para>Date</para>
-      <itemizedlist>
-        <listitem>
-          <para>[name] - Changelog entry.</para>
-        </listitem>
-        <listitem>
-          <para>[name] - Another changelog entry.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
--->
-
-    <listitem>
-      <para>18 October 2014</para>
-      <itemizedlist>
-        <listitem>
-          <para>[William Harrington] - Changelog restarted, see the 3.0.0 book for the
-          old changelog.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-  </itemizedlist>
-
-</sect1>
Index: OK/introduction/x86/livecd.xml
===================================================================
--- BOOK/introduction/x86/livecd.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,101 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-intro-bootcd" arch="x86">
-  <?dbhtml filename="bootcd.html"?>
-
-  <title>About the Included CD</title>
-
-  <para os="a">For your convenience, we have included a CD with this book that
-  contains the source packages needed for creating a Linux From Scratch
-  system.  The CD is bootable and provides a stable working environment
-  for building CLFS. This book refers to this system as the
-  <quote>host system.</quote>  The CD images are actively maintained and
-  updated versions can be found at
-  <ulink url="ftp://ftp.lfs-matrix.de/pub/lfs-livecd/"/></para>
-
-  <para os="b">In addition to the tools required to build LFS, the host system
-  on the CD has a number of other helpful tools installed:</para>
-
-  <itemizedlist os="c">
-
-    <listitem>
-      <para>The X Window System Environment</para>
-    </listitem>
-
-    <listitem>
-      <para>Web Tools</para>
-      <itemizedlist>
-        <listitem>
-          <para>Wget (command line file retriever)</para>
-        </listitem>
-        <listitem>
-          <para>Lynx (text web browser)</para>
-        </listitem>
-        <listitem>
-          <para>Irssi (console IRC client)</para>
-        </listitem>
-        <listitem>
-          <para>Firefox (graphical web browser)</para>
-        </listitem>
-        <listitem>
-          <para>Xchat (X-based IRC client)</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>Text Editors</para>
-      <itemizedlist>
-        <listitem>
-          <para>Vim</para>
-        </listitem>
-        <listitem>
-          <para>Nano</para>
-        </listitem>
-        <listitem>
-          <para>Joe</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>Network Tools</para>
-      <itemizedlist>
-        <listitem>
-          <para>SSH Server and Client</para>
-        </listitem>
-        <listitem>
-          <para>NFS Server and Client</para>
-        </listitem>
-        <listitem>
-          <para>Smbmount (mount.cifs) for Windows shares</para>
-        </listitem>
-        <listitem>
-          <para>Subversion</para>
-        </listitem>
-        <listitem>
-          <para>Dhcpcd (DHCP client)</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>Filesystem Programs</para>
-      <itemizedlist>
-        <listitem>
-          <para>Reiserfsprogs</para>
-        </listitem>
-        <listitem>
-          <para>Xfsprogs</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-  </itemizedlist>
-
-</sect1>
Index: OK/introduction/x86/whatsnew.xml
===================================================================
--- BOOK/introduction/x86/whatsnew.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,40 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-intro-whatsnew-x86">
-  <title>What's New for x86</title>
-  <?dbhtml filename="whatsnew-x86.html"?>
-
-  <para>Below is a list of changes specifics for this architecture made
-  since the previous release of the book. For general changes see
-  <xref linkend="ch-intro-whatsnew"/>,</para>
-
-  <itemizedlist>
-    <title>Upgraded to:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-  <itemizedlist>
-    <title>Added:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-  <itemizedlist>
-    <title>Removed:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-</sect1>
Index: OK/introduction/x86_64-64-chapter.xml
===================================================================
--- BOOK/introduction/x86_64-64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,28 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-intro" xreflabel="Introduction">
-  <?dbhtml dir="introduction"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Introduction</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/acknowledgements.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/how.xml"/>
-  <!-- Uncoment after the first CLFS release
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/whatsnew.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/whatsnew.xml"/>
-  -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changelog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/changelog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resources.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/askforhelp.xml"/>
-  <!-- This page is only for published versions if the LiveCD is included
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/livecd.xml"/>
-  -->
-
-</chapter>
Index: OK/introduction/x86_64-64/changelog.xml
===================================================================
--- BOOK/introduction/x86_64-64/changelog.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,48 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-intro-changelog-x86_64-64">
-  <?dbhtml filename="changelog-x86_64-64.html"?>
-
-  <title>Changelog for x86_64-64</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/changelog.xml"
-  xpointer="xpointer(/sect1/para[1])"/>
-
-  <itemizedlist>
-    <title>Changelog Entries:</title>
-
-<!-- Changelog template
-
-    <listitem>
-      <para>Date</para>
-      <itemizedlist>
-        <listitem>
-          <para>[name] - Changelog entry.</para>
-        </listitem>
-        <listitem>
-          <para>[name] - Another changelog entry.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
--->
-
-    <listitem>
-      <para>18 October 2014</para>
-      <itemizedlist>
-        <listitem>
-          <para>[William Harrington] - Changelog restarted, see the 3.0.0 book for the
-          old changelog.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-  </itemizedlist>
-
-</sect1>
Index: OK/introduction/x86_64-64/whatsnew.xml
===================================================================
--- BOOK/introduction/x86_64-64/whatsnew.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,42 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-intro-whatsnew-x86_64">
-  <?dbhtml filename="whatsnew-x86_64.html"?>
-
-  <title>What's New for x86_64</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/whatsnew.xml"
-  xpointer="xpointer(/sect1/para[1])"/>
-
-  <itemizedlist>
-    <title>Upgraded to:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-
-  <itemizedlist>
-    <title>Added:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-  <itemizedlist>
-    <title>Removed:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-</sect1>
Index: OK/introduction/x86_64-chapter.xml
===================================================================
--- BOOK/introduction/x86_64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,28 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-intro" xreflabel="Introduction">
-  <?dbhtml dir="introduction"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Introduction</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/acknowledgements.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/how.xml"/>
-  <!-- Uncoment after the first CLFS release
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/whatsnew.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/whatsnew.xml"/>
-  -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changelog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/changelog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resources.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/askforhelp.xml"/>
-  <!-- This page is only for published versions if the LiveCD is included
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/livecd.xml"/>
-  -->
-
-</chapter>
Index: OK/introduction/x86_64/changelog.xml
===================================================================
--- BOOK/introduction/x86_64/changelog.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,48 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-intro-changelog-x86_64">
-  <?dbhtml filename="changelog-x86_64.html"?>
-
-  <title>Changelog for x86_64</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/changelog.xml"
-  xpointer="xpointer(/sect1/para[1])"/>
-
-  <itemizedlist>
-    <title>Changelog Entries:</title>
-
-<!-- Changelog template
-
-    <listitem>
-      <para>Date</para>
-      <itemizedlist>
-        <listitem>
-          <para>[name] - Changelog entry.</para>
-        </listitem>
-        <listitem>
-          <para>[name] - Another changelog entry.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
--->
-
-    <listitem>
-      <para>18 October 2014</para>
-      <itemizedlist>
-        <listitem>
-          <para>[William Harrington] - Changelog restarted, see the 3.0.0 book for the
-          old changelog.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-  </itemizedlist>
-
-</sect1>
Index: OK/introduction/x86_64/livecd.xml
===================================================================
--- BOOK/introduction/x86_64/livecd.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,27 +1,0 @@
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-intro-bootcd" arch="x86">
-  <?dbhtml filename="bootcd.html"?>
-
-  <title>About the Included CD</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/livecd.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <para>The CD also contains a 64bit kernel for building a 64bit system.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/livecd.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/livecd.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-</sect1>
Index: OK/introduction/x86_64/whatsnew.xml
===================================================================
--- BOOK/introduction/x86_64/whatsnew.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,42 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-intro-whatsnew-x86_64">
-  <?dbhtml filename="whatsnew-x86_64.html"?>
-
-  <title>What's New for x86_64 Multilib</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/whatsnew.xml"
-  xpointer="xpointer(/sect1/para[1])"/>
-
-  <itemizedlist>
-    <title>Upgraded to:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-
-  <itemizedlist>
-    <title>Added:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-  <itemizedlist>
-    <title>Removed:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-</sect1>
Index: OK/materials/common/introduction.xml
===================================================================
--- BOOK/materials/common/introduction.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,70 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-materials-introduction">
-  <?dbhtml filename="introduction.html"?>
-
-  <title>Introduction</title>
-
-  <para>This chapter includes a list of packages that need to be downloaded
-  for building a basic Linux system. The listed version numbers correspond
-  to versions of the software that are known to work, and this book is based
-  on their use. We highly recommend not using newer versions because the
-  build commands for one version may not work with a newer version. The
-  newest package versions may also have problems that require work-arounds.
-  These work-arounds will be developed and stabilized in the development
-  version of the book.</para>
-
-  <para>Download locations may not always be accessible. If a download
-  location has changed since this book was published, Google (<ulink
-  url="http://www.google.com/"/>) provides a useful search engine for
-  most packages. If this search is unsuccessful, try one of the
-  alternative means of downloading discussed at <ulink
-  url="&packages-root;"/>.</para>
-
-  <para>Create a directory called
-  <filename class="directory">${CLFS}/sources</filename> and use it to store
-  your sources and patches. All packages should be compiled there as well.
-  Using any other location for compiling may have unexpected results.</para>
-
-  <para>To create this directory, execute, as user <systemitem
-  class="username">root</systemitem>, the following command before
-  starting the download session:</para>
-
-<screen><userinput>mkdir -v ${CLFS}/sources</userinput></screen>
-
-  <para>Make this directory writable and sticky. When a directory is
-  marked <quote>sticky</quote>, that means that even if multiple users have
-  write permission on that directory, any file within that directory can only be
-  deleted or modified by its owner. The following command, run as
-  <systemitem class="username">root</systemitem>, will enable the
-  write and sticky modes:</para>
-
-<screen><userinput>chmod -v a+wt ${CLFS}/sources</userinput></screen>
-
-  <para>You can download all needed packages and patches into this directory
-either by using the links on the following pages in this section, or by passing
-the <ulink url="../dl.list">download list</ulink> to <command>wget</command>:</para>
-
-<screen><userinput>wget -i dl.list -P ${CLFS}/sources</userinput></screen>
-
-  <para>Verification of downloaded packages can be done by downloading the
-following MD5 or SHA1 checksum lists:</para>
-
-  <para><ulink url="&packages-root;MD5SUMS">MD5SUMS</ulink>:</para>
-
-<screen><userinput>pushd ${CLFS}/sources
-md5sum -c MD5SUMS
-popd</userinput></screen>
-
-  <para><ulink url="&packages-root;SHA1SUMS">SHA1SUMS</ulink>:</para>
-
-<screen><userinput>pushd ${CLFS}/sources
-sha1sum -c SHA1SUMS
-popd</userinput></screen>
-
-</sect1>
Index: OK/materials/common/packages.xml
===================================================================
--- BOOK/materials/common/packages.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,686 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-materials-packages-common">
-  <?dbhtml filename="packages.html"?>
-
-  <title>All Packages</title>
-
-  <para>Download or otherwise obtain the following packages:</para>
-
-  <variablelist role="materials">
-
-    <varlistentry>
-      <term>Acl (&acl-version;) - <token>&acl-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&acl-home;"/></para>
-        <para>Download: <ulink url="&acl-url;"/></para>
-        <para>MD5 sum: <literal>&acl-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Attr (&attr-version;) - <token>&attr-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&attr-home;"/></para>
-        <para>Download: <ulink url="&attr-url;"/></para>
-        <para>MD5 sum: <literal>&attr-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Autoconf (&autoconf-version;) - <token>&autoconf-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&autoconf-home;"/></para>
-        <para>Download: <ulink url="&autoconf-url;"/></para>
-        <para>MD5 sum: <literal>&autoconf-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Automake (&automake-version;) - <token>&automake-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&automake-home;"/></para>
-        <para>Download: <ulink url="&automake-url;"/></para>
-        <para>MD5 sum: <literal>&automake-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Bash (&bash-version;) - <token>&bash-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&bash-home;"/></para>
-        <para>Download: <ulink url="&bash-url;"/></para>
-        <para>MD5 sum: <literal>&bash-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Bc (&bc-version;) - <token>&bc-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&bc-home;"/></para>
-        <para>Download: <ulink url="&bc-url;"/></para>
-        <para>MD5 sum: <literal>&bc-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Binutils (&binutils-version;) - <token>&binutils-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&binutils-home;"/></para>
-        <para>Download: <ulink url="&binutils-url;"/></para>
-        <para>MD5 sum: <literal>&binutils-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Bison (&bison-version;) - <token>&bison-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&bison-home;"/></para>
-        <para>Download: <ulink url="&bison-url;"/></para>
-        <para>MD5 sum: <literal>&bison-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Boot-scripts for CLFS (&boot-scripts-clfs-version;) - <token>&boot-scripts-clfs-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&boot-scripts-clfs-home;"/></para>
-        <para>Download: <ulink url="&boot-scripts-clfs-url;"/></para>
-        <para>MD5 sum: <literal>&boot-scripts-clfs-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Bzip2 (&bzip2-version;) - <token>&bzip2-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&bzip2-home;"/></para>
-        <para>Download: <ulink url="&bzip2-url;"/></para>
-        <para>MD5 sum: <literal>&bzip2-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Check (&check-version;) - <token>&check-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&check-home;"/></para>
-        <para>Download: <ulink url="&check-url;"/></para>
-        <para>MD5 sum: <literal>&check-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>CLFS Network Scripts (&clfs-network-scripts-version;) - <token>&clfs-network-scripts-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&clfs-network-scripts-home;"/></para>
-        <para>Download: <ulink url="&clfs-network-scripts-url;"/></para>
-        <para>MD5 sum: <literal>&clfs-network-scripts-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Coreutils (&coreutils-version;) - <token>&coreutils-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&coreutils-home;"/></para>
-        <para>Download: <ulink url="&coreutils-url;"/></para>
-        <para>MD5 sum: <literal>&coreutils-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>D-Bus (&dbus-version;) - <token>&dbus-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&dbus-home;"/></para>
-        <para>Download: <ulink url="&dbus-url;"/></para>
-        <para>MD5 sum: <literal>&dbus-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>DejaGNU (&dejagnu-version;) - <token>&dejagnu-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&dejagnu-home;"/></para>
-        <para>Download: <ulink url="&dejagnu-url;"/></para>
-        <para>MD5 sum: <literal>&dejagnu-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>DHCPCD (&dhcpcd-version;) - <token>&dhcpcd-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&dhcpcd-home;"/></para>
-        <para>Download: <ulink url="&dhcpcd-url;"/></para>
-        <para>MD5 sum: <literal>&dhcpcd-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Diffutils (&diffutils-version;) - <token>&diffutils-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&diffutils-home;"/></para>
-        <para>Download: <ulink url="&diffutils-url;"/></para>
-        <para>MD5 sum: <literal>&diffutils-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>E2fsprogs (&e2fsprogs-version;) - <token>&e2fsprogs-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&e2fsprogs-home;"/></para>
-        <para>Download: <ulink url="&e2fsprogs-url;"/></para>
-        <para>MD5 sum: <literal>&e2fsprogs-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Eudev (&eudev-version;) - <token>&eudev-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&eudev-home;"/></para>
-        <para>Download: <ulink url="&eudev-url;"/></para>
-        <para>MD5 sum: <literal>&eudev-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Expat (&expat-version;) - <token>&expat-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&expat-home;"/></para>
-        <para>Download: <ulink url="&expat-url;"/></para>
-        <para>MD5 sum: <literal>&expat-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Expect (&expect-version;) - <token>&expect-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&expect-home;"/></para>
-        <para>Download: <ulink url="&expect-url;"/></para>
-        <para>MD5 sum: <literal>&expect-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>File (&file-version;) - <token>&file-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&file-home;"/></para>
-        <para>Download: <ulink url="&file-url;"/></para>
-        <para>MD5 sum: <literal>&file-md5;</literal></para>
-
-        <note>
-          <para>File (&file-version;) may no longer be available at the
-          listed location. The site administrators of the master download
-          location occasionally remove older versions when new ones are
-          released. An alternative download location that may have the
-          correct version available is <ulink
-          url="&packages-root;"/>.</para>
-        </note>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Findutils (&findutils-version;) - <token>&findutils-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&findutils-home;"/></para>
-        <para>Download: <ulink url="&findutils-url;"/></para>
-        <para>MD5 sum: <literal>&findutils-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Flex (&flex-version;) - <token>&flex-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&flex-home;"/></para>
-        <para>Download: <ulink url="&flex-url;"/></para>
-        <para>MD5 sum: <literal>&flex-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Gawk (&gawk-version;) - <token>&gawk-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&gawk-home;"/></para>
-        <para>Download: <ulink url="&gawk-url;"/></para>
-        <para>MD5 sum: <literal>&gawk-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>GCC (&gcc-version;) - <token>&gcc-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&gcc-home;"/></para>
-        <para>Download: <ulink url="&gcc-url;"/></para>
-        <para>MD5 sum: <literal>&gcc-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>GDBM (&gdbm-version;) - <token>&gdbm-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&gdbm-home;"/></para>
-        <para>Download: <ulink url="&gdbm-url;"/></para>
-        <para>MD5 sum: <literal>&gdbm-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Gettext (&gettext-version;) - <token>&gettext-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&gettext-home;"/></para>
-        <para>Download: <ulink url="&gettext-url;"/></para>
-        <para>MD5 sum: <literal>&gettext-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Glibc (&glibc-version;) - <token>&glibc-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&glibc-home;"/></para>
-        <para>Download: <ulink url="&glibc-url;"/></para>
-        <para>MD5 sum: <literal>&glibc-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>GMP (&gmp-version;) - <token>&gmp-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&gmp-home;"/></para>
-        <para>Download: <ulink url="&gmp-url;"/></para>
-        <para>MD5 sum: <literal>&gmp-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Gperf (&gperf-version;) - <token>&gperf-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&gperf-home;"/></para>
-        <para>Download: <ulink url="&gperf-url;"/></para>
-        <para>MD5 sum: <literal>&gperf-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Grep (&grep-version;) - <token>&grep-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&grep-home;"/></para>
-        <para>Download: <ulink url="&grep-url;"/></para>
-        <para>MD5 sum: <literal>&grep-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Groff (&groff-version;) - <token>&groff-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&groff-home;"/></para>
-        <para>Download: <ulink url="&groff-url;"/></para>
-        <para>MD5 sum: <literal>&groff-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Gzip (&gzip-version;) - <token>&gzip-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&gzip-home;"/></para>
-        <para>Download: <ulink url="&gzip-url;"/></para>
-        <para>MD5 sum: <literal>&gzip-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Iana-Etc (&iana-etc-version;) - <token>&iana-etc-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&iana-etc-home;"/></para>
-        <para>Download: <ulink url="&iana-etc-url;"/></para>
-        <para>MD5 sum: <literal>&iana-etc-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Intltool (&intltool-version;) - <token>&intltool-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&intltool-home;"/></para>
-        <para>Download: <ulink url="&intltool-url;"/></para>
-        <para>MD5 sum: <literal>&intltool-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>IPRoute2 (&iproute2-version;) - <token>&iproute2-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&iproute2-home;"/></para>
-        <para>Download: <ulink url="&iproute2-url;"/></para>
-        <para>MD5 sum: <literal>&iproute2-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>IPutils (&iputils-version;) - <token>&iputils-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&iputils-home;"/></para>
-        <para>Download: <ulink url="&iputils-url;"/></para>
-        <para>MD5 sum: <literal>&iputils-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>ISL (&isl-version;) - <token>&isl-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&isl-home;"/></para>
-        <para>Download: <ulink url="&isl-url;"/></para>
-        <para>MD5 sum: <literal>&isl-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Kbd (&kbd-version;) - <token>&kbd-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&kbd-home;"/></para>
-        <para>Download: <ulink url="&kbd-url;"/></para>
-        <para>MD5 sum: <literal>&kbd-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Kmod (&kmod-version;) - <token>&kmod-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&kmod-home;"/></para>
-        <para>Download: <ulink url="&kmod-url;"/></para>
-        <para>MD5 sum: <literal>&kmod-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Less (&less-version;) - <token>&less-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&less-home;"/></para>
-        <para>Download: <ulink url="&less-url;"/></para>
-        <para>MD5 sum: <literal>&less-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Libcap (&libcap-version;) - <token>&libcap-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&libcap-home;"/></para>
-        <para>Download: <ulink url="&libcap-url;"/></para>
-        <para>MD5 sum: <literal>&libcap-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Libpipeline (&libpipeline-version;) - <token>&libpipeline-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&libpipeline-home;"/></para>
-        <para>Download: <ulink url="&libpipeline-url;"/></para>
-        <para>MD5 sum: <literal>&libpipeline-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Libtool (&libtool-version;) - <token>&libtool-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&libtool-home;"/></para>
-        <para>Download: <ulink url="&libtool-url;"/></para>
-        <para>MD5 sum: <literal>&libtool-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Linux (&linux-version;) - <token>&linux-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&linux-home;"/></para>
-        <para>Download: <ulink url="&linux-url;"/></para>
-        <para>MD5 sum: <literal>&linux-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>M4 (&m4-version;) - <token>&m4-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&m4-home;"/></para>
-        <para>Download: <ulink url="&m4-url;"/></para>
-        <para>MD5 sum: <literal>&m4-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Make (&make-version;) - <token>&make-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&make-home;"/></para>
-        <para>Download: <ulink url="&make-url;"/></para>
-        <para>MD5 sum: <literal>&make-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Man-DB (&man-db-version;) - <token>&man-db-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&man-db-home;"/></para>
-        <para>Download: <ulink url="&man-db-url;"/></para>
-        <para>MD5 sum: <literal>&man-db-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Man-pages (&man-pages-version;) - <token>&man-pages-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&man-pages-home;"/></para>
-        <para>Download: <ulink url="&man-pages-url;"/></para>
-        <para>MD5 sum: <literal>&man-pages-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>MPC (&mpc-version;) - <token>&mpc-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&mpc-home;"/></para>
-        <para>Download: <ulink url="&mpc-url;"/></para>
-        <para>MD5 sum: <literal>&mpc-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>MPFR (&mpfr-version;) - <token>&mpfr-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&mpfr-home;"/></para>
-        <para>Download: <ulink url="&mpfr-url;"/></para>
-        <para>MD5 sum: <literal>&mpfr-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Ncurses (&ncurses-version;) - <token>&ncurses-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&ncurses-home;"/></para>
-        <para>Download: <ulink url="&ncurses-url;"/></para>
-        <para>MD5 sum: <literal>&ncurses-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Patch (&patch-version;) - <token>&patch-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&patch-home;"/></para>
-        <para>Download: <ulink url="&patch-url;"/></para>
-        <para>MD5 sum: <literal>&patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Perl (&perl-version;) - <token>&perl-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&perl-home;"/></para>
-        <para>Download: <ulink url="&perl-url;"/></para>
-        <para>MD5 sum: <literal>&perl-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Pkg-config-lite (&pkg-config-lite-version;) - <token>&pkg-config-lite-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&pkg-config-lite-home;"/></para>
-        <para>Download: <ulink url="&pkg-config-lite-url;"/></para>
-        <para>MD5 sum: <literal>&pkg-config-lite-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Procps-ng (&procps-ng-version;) - <token>&procps-ng-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&procps-ng-home;"/></para>
-        <para>Download: <ulink url="&procps-ng-url;"/></para>
-        <para>MD5 sum: <literal>&procps-ng-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Psmisc (&psmisc-version;) - <token>&psmisc-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&psmisc-home;"/></para>
-        <para>Download: <ulink url="&psmisc-url;"/></para>
-        <para>MD5 sum: <literal>&psmisc-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Readline (&readline-version;) - <token>&readline-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&readline-home;"/></para>
-        <para>Download: <ulink url="&readline-url;"/></para>
-        <para>MD5 sum: <literal>&readline-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Sed (&sed-version;) - <token>&sed-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&sed-home;"/></para>
-        <para>Download: <ulink url="&sed-url;"/></para>
-        <para>MD5 sum: <literal>&sed-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Shadow (&shadow-version;) - <token>&shadow-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&shadow-home;"/></para>
-        <para>Download: <ulink url="&shadow-url;"/></para>
-        <para>MD5 sum: <literal>&shadow-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Sysvinit (&sysvinit-version;) - <token>&sysvinit-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&sysvinit-home;"/></para>
-        <para>Download: <ulink url="&sysvinit-url;"/></para>
-        <para>MD5 sum: <literal>&sysvinit-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Systemd (&systemd-version;) - <token>&systemd-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&systemd-home;"/></para>
-        <para>Download: <ulink url="&systemd-url;"/></para>
-        <para>MD5 sum: <literal>&systemd-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Tar (&tar-version;) - <token>&tar-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&tar-home;"/></para>
-        <para>Download: <ulink url="&tar-url;"/></para>
-        <para>MD5 sum: <literal>&tar-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Tcl (&tcl-version;) - <token>&tcl-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&tcl-home;"/></para>
-        <para>Download: <ulink url="&tcl-url;"/></para>
-        <para>MD5 sum: <literal>&tcl-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Texinfo (&texinfo-version;) - <token>&texinfo-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&texinfo-home;"/></para>
-        <para>Download: <ulink url="&texinfo-url;"/></para>
-        <para>MD5 sum: <literal>&texinfo-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Time Zone Data (&tzdata-version;) - <token>&tzdata-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&tzdata-home;"/></para>
-        <para>Download: <ulink url="&tzdata-url;"/></para>
-        <para>MD5 sum: <literal>&tzdata-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Util-linux (&util-linux-version;) - <token>&util-linux-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&util-linux-url;"/></para>
-        <para>MD5 sum: <literal>&util-linux-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Vim (&vim-version;) - <token>&vim-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&vim-home;"/></para>
-        <para>Download: <ulink url="&vim-url;"/></para>
-        <para>MD5 sum: <literal>&vim-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>XML::Parser  (&xml-parser-version;) - <token>&xml-parser-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&xml-parser-home;"/></para>
-        <para>Download: <ulink url="&xml-parser-url;"/></para>
-        <para>MD5 sum: <literal>&xml-parser-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>XZ Utils  (&xz-version;) - <token>&xz-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&xz-home;"/></para>
-        <para>Download: <ulink url="&xz-url;"/></para>
-        <para>MD5 sum: <literal>&xz-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Zlib (&zlib-version;) - <token>&zlib-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&zlib-home;"/></para>
-        <para>Download: <ulink url="&zlib-url;"/></para>
-        <para>MD5 sum: <literal>&zlib-md5;</literal></para>
-
-        <note>
-          <para>Zlib (&zlib-version;) may no longer be available at the
-          listed location. The site administrators of the master download
-          location occasionally remove older versions when new ones are
-          released. An alternative download location that may have the
-          correct version available is <ulink
-          url="&packages-root;"/>.</para>
-        </note>
-      </listitem>
-    </varlistentry>
-
-  </variablelist>
-
-  <para os="a">Total size of these packages: about <returnvalue/></para>
-
-</sect1>
Index: OK/materials/common/patches.xml
===================================================================
--- BOOK/materials/common/patches.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,174 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-materials-patches-common">
-  <?dbhtml filename="patches.html"?>
-
-  <title>Needed Patches</title>
-
-  <para>In addition to the packages, several patches are also required.
-  These patches correct any mistakes in the packages that should be
-  fixed by the maintainer. The patches also make small modifications to
-  make the packages easier to work with. The following patches will be
-  needed to build a CLFS system:</para>
-
-  <variablelist role="materials">
-
-    <varlistentry>
-      <term>Automake Perl Patch - <token>&automake-perl-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&automake-perl-patch;"/></para>
-        <para>MD5 sum: <literal>&automake-perl-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-
-    <varlistentry>
-      <term>Bash Branch Update Patch - <token>&bash-branch_update-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&bash-branch_update-patch;"/></para>
-        <para>MD5 sum: <literal>&bash-branch_update-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-<!-- Binutils branch update area
-    <varlistentry>
-      <term>Binutils Branch Update Patch - <token>&binutils-branch_update-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&binutils-branch_update-patch;"/></para>
-        <para>MD5 sum: <literal>&binutils-branch_update-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
--->
-    <varlistentry>
-      <term>Coreutils Uname Patch - <token>&coreutils-uname-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&coreutils-uname-patch;"/></para>
-        <para>MD5 sum: <literal>&coreutils-uname-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-<!--GCC Branch Update Area
-    <varlistentry>
-      <term>GCC Branch Update Patch - <token>&gcc-branch_update-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&gcc-branch_update-patch;"/></para>
-        <para>MD5 sum: <literal>&gcc-branch_update-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
--->
-
-    <varlistentry>
-      <term>Iana-Etc Protocol and Port Numbers Update - <token>&iana-etc-numbers_update-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&iana-etc-numbers_update-patch;"/></para>
-        <para>MD5 sum: <literal>&iana-etc-numbers_update-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Intool Perl Fix - <token>&intltool-perl-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&intltool-perl-patch;"/></para>
-        <para>MD5 sum: <literal>&intltool-perl-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>IPUtils Fixes Patch - <token>&iputils-build-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&iputils-build-patch;"/></para>
-        <para>MD5 sum: <literal>&iputils-build-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Linux Sublevel Patch - <token>&linux-sublevel-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&kernel;linux/kernel/v&linux-dl-version;/&linux-sublevel-patch;"/></para>
-        <para>MD5 sum: <literal>&linux-sublevel-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>MPFR Fixes Patch - <token>&mpfr-fixes-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&mpfr-fixes-patch;"/></para>
-        <para>MD5 sum: <literal>&mpfr-fixes-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Ncurses Bash Patch - <token>&ncurses-bashfix-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&ncurses-bashfix-patch;"/></para>
-        <para>MD5 sum: <literal>&ncurses-bashfix-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-<!--Ncurses Branch Update Area
-    <varlistentry>
-      <term>Ncurses Branch Update Patch - <token>&ncurses-branch_update-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&ncurses-branch_update-patch;"/></para>
-        <para>MD5 sum: <literal>&ncurses-branch_update-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
--->
-
-    <varlistentry>
-      <term>Readline Branch Update - <token>&readline-branch_update-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&readline-branch_update-patch;"/></para>
-        <para>MD5 sum: <literal>&readline-branch_update-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Sysvinit Tools Updates Patch - <token>&sysvinit-tools_updates-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&sysvinit-tools_updates-patch;"/></para>
-        <para>MD5 sum: <literal>&sysvinit-tools_updates-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-<!-- Vim branch update patch area -->
-    <varlistentry>
-      <term>Vim Branch Update Patch - <token>&vim-branch_update-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&vim-branch_update-patch;"/></para>
-        <para>MD5 sum: <literal>&vim-branch_update-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-  </variablelist>
-
-  <para os="a">Total size of these patches: about <returnvalue/></para>
-
-  <para>In addition to the above required patches, there exist a number of
-  optional patches created by the CLFS community. These optional patches
-  solve minor problems or enable functionality that is not enabled by
-  default. Feel free to peruse the patches database located at
-  <ulink url="&patches-root;"/> and acquire any additional
-  patches to suit the system needs.</para>
-
-</sect1>
Index: OK/materials/mips-chapter.xml
===================================================================
--- BOOK/materials/mips-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-getting-materials" xreflabel="Packages and Patches">
-  <?dbhtml dir="materials"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Packages and Patches</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/packages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/packages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patches.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/patches.xml"/>
-
-</chapter>
Index: OK/materials/mips/packages.xml
===================================================================
--- BOOK/materials/mips/packages.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,48 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-materials-packages-mips">
-  <?dbhtml filename="packages-mips.html"?>
-
-  <title>Additional Packages for MIPS</title>
-
-  <variablelist role="materials">
-
-    <varlistentry os="arcload">
-      <term>ARCLoad (&arcload-version;) - <token>&arcload-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&arcload-home;"/></para>
-        <para>Download: <ulink url="&arcload-url;"/></para>
-        <para>MD5 sum: <literal>&arcload-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry os="colo">
-      <term>Colo (&colo-version;) - <token>&colo-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&colo-home;"/></para>
-        <para>Download: <ulink url="&colo-url;"/></para>
-        <para>MD5 sum: <literal>&colo-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry os="dvhtool">
-      <term>DVHtool (&dvhtool-version;) - <token>&dvhtool-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&dvhtool-home;"/></para>
-        <para>Download: <ulink url="&dvhtool-url;"/></para>
-        <para>MD5 sum: <literal>&dvhtool-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-  </variablelist>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/packages.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-</sect1>
Index: OK/materials/mips/patches.xml
===================================================================
--- BOOK/materials/mips/patches.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,42 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-materials-patches-mips">
-  <?dbhtml filename="patches-mips.html"?>
-
-  <title>Additional Patches for MIPS</title>
-
-  <variablelist role="materials">
-
-    <varlistentry os="colo-relocation-patch">
-      <term>Colo Relocation Patch - <token>&colo-relocation-patch-size;</token>:</term> <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&colo-relocation-patch;"/></para>
-        <para>MD5 sum: <literal>&colo-relocation-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry os="dvhtool-fixes-patch">
-      <term>Dvhtool Fixes - <token>&dvhtool-fixes-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&dvhtool-fixes-patch;"/></para>
-        <para>MD5 sum: <literal>&dvhtool-fixes-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/patches.xml"
-    xpointer="xpointer(//*[@os='gcc-specs-patch'])"/>
-
-  </variablelist>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/patches.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-</sect1>
Index: OK/materials/mips64-64-chapter.xml
===================================================================
--- BOOK/materials/mips64-64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-getting-materials" xreflabel="Packages and Patches">
-  <?dbhtml dir="materials"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Packages and Patches</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/packages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64-64/packages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patches.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64-64/patches.xml"/>
-
-</chapter>
Index: OK/materials/mips64-64/packages.xml
===================================================================
--- BOOK/materials/mips64-64/packages.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,21 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-materials-packages-mips64">
-  <?dbhtml filename="packages-mips64.html"?>
-
-  <title>Additional Packages for MIPS 64 Bit</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../mips/packages.xml"
-  xpointer="xpointer(//*[@role='materials'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/packages.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-</sect1>
Index: OK/materials/mips64-64/patches.xml
===================================================================
--- BOOK/materials/mips64-64/patches.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,41 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-materials-patches-mips64">
-  <?dbhtml filename="patches-mips64.html"?>
-
-  <title>Additional Patches for MIPS 64 Bit</title>
-
-  <variablelist role="materials">
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../mips/patches.xml"
-    xpointer="xpointer(//*[@os='colo-relocation-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../mips64/patches.xml"
-    xpointer="xpointer(//*[@os='colo-mips-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../mips/patches.xml"
-    xpointer="xpointer(//*[@os='dvhtool-fixes-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64-64/patches.xml"
-    xpointer="xpointer(//*[@os='gcc-pure64-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64-64/patches.xml"
-    xpointer="xpointer(//*[@os='gcc-specs_pure64-patch'])"/>
-
-  </variablelist>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/patches.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-</sect1>
Index: OK/materials/mips64-chapter.xml
===================================================================
--- BOOK/materials/mips64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-getting-materials" xreflabel="Packages and Patches">
-  <?dbhtml dir="materials"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Packages and Patches</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/packages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/packages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patches.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/patches.xml"/>
-
-</chapter>
Index: OK/materials/mips64/packages.xml
===================================================================
--- BOOK/materials/mips64/packages.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,21 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-materials-packages-mips64">
-  <?dbhtml filename="packages-mips64.html"?>
-
-  <title>Additional Packages for MIPS 64 Bit Multilib</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../mips/packages.xml"
-  xpointer="xpointer(//*[@role='materials'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/packages.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-</sect1>
Index: OK/materials/mips64/patches.xml
===================================================================
--- BOOK/materials/mips64/patches.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,45 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-materials-patches-mips64">
-  <?dbhtml filename="patches-mips64.html"?>
-
-  <title>Additional Patches for MIPS 64 Bit Multilib</title>
-
-  <variablelist role="materials">
-
-    <varlistentry os="colo-mips-patch">
-      <term>Colo Make Patch - <token>&colo-make-patch-size;</token>:</term> <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&colo-make-patch;"/></para>
-        <para>MD5 sum: <literal>&colo-make-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../mips/patches.xml"
-    xpointer="xpointer(//*[@os='colo-relocation-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../mips/patches.xml"
-    xpointer="xpointer(//*[@os='dvhtool-fixes-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/patches.xml"
-    xpointer="xpointer(//*[@os='gcc-specs-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64/patches.xml"
-    xpointer="xpointer(//*[@os='perl-multilib-patch'])"/>
-
-  </variablelist>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/patches.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-</sect1>
Index: OK/materials/ppc-chapter.xml
===================================================================
--- BOOK/materials/ppc-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-getting-materials" xreflabel="Packages and Patches">
-  <?dbhtml dir="materials"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Packages and Patches</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/packages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/packages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patches.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/patches.xml"/>
-
-</chapter>
Index: OK/materials/ppc/packages.xml
===================================================================
--- BOOK/materials/ppc/packages.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,57 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-materials-packages-ppc">
-  <?dbhtml filename="packages-ppc.html"?>
-
-  <title>Additional Packages for PowerPC</title>
-
-  <variablelist role="materials">
-
-    <varlistentry>
-      <term>Hfsutils (&hfsutils-version;) - <token>&hfsutils-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&hfsutils-home;"/></para>
-        <para>Download: <ulink url="&hfsutils-url;"/></para>
-        <para>MD5 sum: <literal>&hfsutils-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Parted (&parted-version;) - <token>&parted-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&parted-home;"/></para>
-        <para>Download: <ulink url="&parted-url;"/></para>
-        <para>MD5 sum: <literal>&parted-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Powerpc-utils (&powerpcutils-version;) - <token>&powerpcutils-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&powerpcutils-home;"/></para>
-        <para>Download: <ulink url="&powerpcutils-url;"/></para>
-        <para>MD5 sum: <literal>&powerpcutils-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Yaboot (&yaboot-version;) - <token>&yaboot-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&yaboot-home;"/></para>
-        <para>Download: <ulink url="&yaboot-url;"/></para>
-        <para>MD5 sum: <literal>&yaboot-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-  </variablelist>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/packages.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-</sect1>
Index: OK/materials/ppc/patches.xml
===================================================================
--- BOOK/materials/ppc/patches.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,70 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-materials-patches-ppc">
-  <?dbhtml filename="patches-ppc.html"?>
-
-  <title>Additional Patches for PowerPC</title>
-
-  <variablelist role="materials">
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/patches.xml"
-    xpointer="xpointer(//*[@os='gcc-specs-patch'])"/>
-
-    <varlistentry os="hfsutils-fixes-patch">
-      <term>HFS Utils Fixes Patch - <token>&hfsutils-fixes-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&hfsutils-fixes-patch;"/></para>
-        <para>MD5 sum: <literal>&hfsutils-fixes-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry os="powerpcutils-fixes-patch">
-      <term>Powerpc-utils Fixes Patch - <token>&powerpcutils-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&powerpcutils-patch;"/></para>
-        <para>MD5 sum: <literal>&powerpcutils-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry os="yaboot-ofpath_path-patch">
-      <term>Yaboot Ofpath_Path_Prefix Patch - <token>&yaboot-ofpath_path-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&yaboot-ofpath_path-patch;"/></para>
-        <para>MD5 sum: <literal>&yaboot-ofpath_path-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry os="yaboot-parted-patch">
-      <term>Yaboot Parted Patch - <token>&yaboot-parted-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&yaboot-parted-patch;"/></para>
-        <para>MD5 sum: <literal>&yaboot-parted-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry os="yaboot-stubfuncs-patch">
-      <term>Yaboot Stubfuncs Patch - <token>&yaboot-stubfuncs-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&yaboot-stubfuncs-patch;"/></para>
-        <para>MD5 sum: <literal>&yaboot-stubfuncs-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-  </variablelist>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/patches.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-</sect1>
Index: OK/materials/ppc64-64-chapter.xml
===================================================================
--- BOOK/materials/ppc64-64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-getting-materials" xreflabel="Packages and Patches">
-  <?dbhtml dir="materials"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Packages and Patches</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/packages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64-64/packages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patches.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64-64/patches.xml"/>
-
-</chapter>
Index: OK/materials/ppc64-64/packages.xml
===================================================================
--- BOOK/materials/ppc64-64/packages.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,21 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-materials-packages-ppc64">
-  <?dbhtml filename="packages-ppc64-64.html"?>
-
-  <title>Additional Packages for PowerPC64</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../ppc/packages.xml"
-  xpointer="xpointer(//*[@role='materials'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/packages.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-</sect1>
Index: OK/materials/ppc64-64/patches.xml
===================================================================
--- BOOK/materials/ppc64-64/patches.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,46 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-materials-patches-ppc64-64">
-  <?dbhtml filename="patches-ppc64-64.html"?>
-
-  <title>Additional Patches for PowerPC64</title>
-
-  <variablelist role="materials">
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64-64/patches.xml"
-    xpointer="xpointer(//*[@os='gcc-pure64-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64-64/patches.xml"
-    xpointer="xpointer(//*[@os='gcc-specs_pure64-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/patches.xml"
-    xpointer="xpointer(//*[@os='hfsutils-fixes-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/patches.xml"
-    xpointer="xpointer(//*[@os='powerpcutils-fixes-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/patches.xml"
-    xpointer="xpointer(//*[@os='yaboot-ofpath_path-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/patches.xml"
-    xpointer="xpointer(//*[@os='yaboot-stubfuncs-patch'])"/>
-
-  </variablelist>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/patches.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-</sect1>
-
Index: OK/materials/ppc64-chapter.xml
===================================================================
--- BOOK/materials/ppc64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-getting-materials" xreflabel="Packages and Patches">
-  <?dbhtml dir="materials"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Packages and Patches</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/packages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/packages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patches.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/patches.xml"/>
-
-</chapter>
Index: OK/materials/ppc64/packages.xml
===================================================================
--- BOOK/materials/ppc64/packages.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,21 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-materials-packages-ppc64">
-  <?dbhtml filename="packages-ppc64.html"?>
-
-  <title>Additional Packages for PowerPC64</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../ppc/packages.xml"
-  xpointer="xpointer(//*[@role='materials'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/packages.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-</sect1>
Index: OK/materials/ppc64/patches.xml
===================================================================
--- BOOK/materials/ppc64/patches.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,46 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-materials-patches-ppc64">
-  <?dbhtml filename="patches-ppc64.html"?>
-
-  <title>Additional Patches for PowerPC64</title>
-
-  <variablelist role="materials">
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/patches.xml"
-    xpointer="xpointer(//*[@os='gcc-specs-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/patches.xml"
-    xpointer="xpointer(//*[@os='hfsutils-fixes-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64/patches.xml"
-    xpointer="xpointer(//*[@os='perl-multilib-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/patches.xml"
-    xpointer="xpointer(//*[@os='powerpcutils-fixes-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/patches.xml"
-    xpointer="xpointer(//*[@os='yaboot-ofpath_path-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/patches.xml"
-    xpointer="xpointer(//*[@os='yaboot-stubfuncs-patch'])"/>
-
-  </variablelist>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/patches.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-</sect1>
-
Index: OK/materials/sparc-chapter.xml
===================================================================
--- BOOK/materials/sparc-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-getting-materials" xreflabel="Packages and Patches">
-  <?dbhtml dir="materials"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Packages and Patches</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/packages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/packages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patches.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/patches.xml"/>
-
-</chapter>
Index: OK/materials/sparc/packages.xml
===================================================================
--- BOOK/materials/sparc/packages.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,39 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-materials-packages-sparc">
-  <?dbhtml filename="packages-sparc.html"?>
-
-  <title>Additional Packages for Sparc</title>
-
-  <variablelist role="materials">
-
-    <varlistentry os="elftoaout">
-      <term>ELFtoaout (&elftoaout-version;) - <token>&elftoaout-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&elftoaout-home;"/></para>
-        <para>Download: <ulink url="&elftoaout-url;"/></para>
-        <para>MD5 sum: <literal>&elftoaout-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry os="silo">
-      <term>Silo (&silo-version;) - <token>&silo-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&silo-home;"/></para>
-        <para>Download: <ulink url="&silo-url;"/></para>
-        <para>MD5 sum: <literal>&silo-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-  </variablelist>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/packages.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-</sect1>
Index: OK/materials/sparc/patches.xml
===================================================================
--- BOOK/materials/sparc/patches.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,43 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-materials-patches-sparc">
-  <?dbhtml filename="patches-sparc.html"?>
-
-  <title>Additional Patches for Sparc</title>
-
-  <variablelist role="materials">
-
-    <varlistentry os="elftoaout-fixes-patch">
-      <term>Elftoaout Fixes Patch - <token>&elftoaout-fixes-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&elftoaout-fixes-patch;"/></para>
-        <para>MD5 sum: <literal>&elftoaout-fixes-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/patches.xml"
-    xpointer="xpointer(//*[@os='gcc-specs-patch'])"/>
-
-    <varlistentry os="silo-fixes-patch">
-      <term>Silo Fixes Patch - <token>&silo-fixes-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&silo-fixes-patch;"/></para>
-        <para>MD5 sum: <literal>&silo-fixes-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-  </variablelist>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/patches.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-</sect1>
Index: OK/materials/sparc64-64-chapter.xml
===================================================================
--- BOOK/materials/sparc64-64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-getting-materials" xreflabel="Packages and Patches">
-  <?dbhtml dir="materials"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Packages and Patches</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/packages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64-64/packages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patches.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64-64/patches.xml"/>
-
-</chapter>
Index: OK/materials/sparc64-64/packages.xml
===================================================================
--- BOOK/materials/sparc64-64/packages.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,21 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-materials-packages-sparc64">
-  <?dbhtml filename="packages-sparc64.html"?>
-
-  <title>Additional Packages for Sparc64</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../sparc/packages.xml"
-  xpointer="xpointer(//*[@role='materials'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/packages.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-</sect1>
Index: OK/materials/sparc64-64/patches.xml
===================================================================
--- BOOK/materials/sparc64-64/patches.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,37 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-materials-patches-sparc64">
-  <?dbhtml filename="patches-sparc64.html"?>
-
-  <title>Additional Patches for Sparc64</title>
-
-  <variablelist role="materials">
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../sparc/patches.xml"
-    xpointer="xpointer(//*[@os='elftoaout-fixes-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64-64/patches.xml"
-    xpointer="xpointer(//*[@os='gcc-pure64-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64-64/patches.xml"
-    xpointer="xpointer(//*[@os='gcc-specs_pure64-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../sparc/patches.xml"
-    xpointer="xpointer(//*[@os='silo-fixes-patch'])"/>
-
-  </variablelist>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/patches.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-</sect1>
Index: OK/materials/sparc64-chapter.xml
===================================================================
--- BOOK/materials/sparc64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-getting-materials" xreflabel="Packages and Patches">
-  <?dbhtml dir="materials"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Packages and Patches</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/packages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/packages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patches.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/patches.xml"/>
-
-</chapter>
Index: OK/materials/sparc64/packages.xml
===================================================================
--- BOOK/materials/sparc64/packages.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,21 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-materials-packages-sparc64">
-  <?dbhtml filename="packages-sparc64.html"?>
-
-  <title>Additional Packages for Sparc64 Multilib</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../sparc/packages.xml"
-  xpointer="xpointer(//*[@role='materials'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/packages.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-</sect1>
Index: OK/materials/sparc64/patches.xml
===================================================================
--- BOOK/materials/sparc64/patches.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,37 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-materials-patches-sparc64">
-  <?dbhtml filename="patches-sparc64.html"?>
-
-  <title>Additional Patches for Sparc64 Multilib</title>
-
-  <variablelist role="materials">
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../sparc/patches.xml"
-    xpointer="xpointer(//*[@os='elftoaout-fixes-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/patches.xml"
-    xpointer="xpointer(//*[@os='gcc-specs-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64/patches.xml"
-    xpointer="xpointer(//*[@os='perl-multilib-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../sparc/patches.xml"
-    xpointer="xpointer(//*[@os='silo-fixes-patch'])"/>
-
-  </variablelist>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/patches.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-</sect1>
Index: OK/materials/x86-chapter.xml
===================================================================
--- BOOK/materials/x86-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-getting-materials" xreflabel="Packages and Patches">
-  <?dbhtml dir="materials"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Packages and Patches</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/packages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/packages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patches.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/patches.xml"/>
-
-</chapter>
Index: OK/materials/x86/packages.xml
===================================================================
--- BOOK/materials/x86/packages.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,30 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-materials-packages-x86">
-  <?dbhtml filename="packages-x86.html"?>
-
-  <title>Additional Packages for x86</title>
-
-  <variablelist role="materials">
-
-    <varlistentry os="grub">
-      <term>GRUB (&grub-version;) - <token>&grub-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&grub-home;"/></para>
-        <para>Download: <ulink url="&grub-url;"/></para>
-        <para>MD5 sum: <literal>&grub-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-  </variablelist>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/packages.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-</sect1>
Index: OK/materials/x86/patches.xml
===================================================================
--- BOOK/materials/x86/patches.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,30 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-materials-patches-x86">
-  <?dbhtml filename="patches-x86.html"?>
-
-  <title>Additional Patches for x86</title>
-
-  <variablelist role="materials">
-
-    <varlistentry os="gcc-specs-patch">
-      <term>GCC Specs Patch - <token>&gcc-specs-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&gcc-specs-patch;"/></para>
-        <para>MD5 sum: <literal>&gcc-specs-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-  </variablelist>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/patches.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-</sect1>
Index: OK/materials/x86_64-64-chapter.xml
===================================================================
--- BOOK/materials/x86_64-64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-getting-materials" xreflabel="Packages and Patches">
-  <?dbhtml dir="materials"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Packages and Patches</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/packages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/packages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patches.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/patches.xml"/>
-
-</chapter>
Index: OK/materials/x86_64-64/packages.xml
===================================================================
--- BOOK/materials/x86_64-64/packages.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,25 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-materials-packages-x86_64">
-  <?dbhtml filename="packages-x86_64.html"?>
-
-  <title>Additional Packages for x86_64</title>
-
-  <variablelist role="materials">
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/packages.xml"
-    xpointer="xpointer(//*[@os='grub'])"/>
-
-  </variablelist>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/packages.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-</sect1>
Index: OK/materials/x86_64-64/patches.xml
===================================================================
--- BOOK/materials/x86_64-64/patches.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,39 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-materials-patches-x86_64">
-  <?dbhtml filename="patches-x86_64.html"?>
-
-  <title>Additional Patches for x86_64</title>
-
-  <variablelist role="materials">
-
-    <varlistentry os="gcc-pure64-patch">
-      <term>GCC Pure 64 Patch - <token>&gcc-pure64-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&gcc-pure64-patch;"/></para>
-        <para>MD5 sum: <literal>&gcc-pure64-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry os="gcc-specs_pure64-patch">
-      <term>GCC Specs Patch - <token>&gcc-specs_pure64-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&gcc-specs_pure64-patch;"/></para>
-        <para>MD5 sum: <literal>&gcc-specs_pure64-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-  </variablelist>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/patches.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-</sect1>
Index: OK/materials/x86_64-chapter.xml
===================================================================
--- BOOK/materials/x86_64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-getting-materials" xreflabel="Packages and Patches">
-  <?dbhtml dir="materials"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Packages and Patches</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/packages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/packages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patches.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/patches.xml"/>
-
-</chapter>
Index: OK/materials/x86_64/packages.xml
===================================================================
--- BOOK/materials/x86_64/packages.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,25 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-materials-packages-x86_64">
-  <?dbhtml filename="packages-x86_64.html"?>
-
-  <title>Additional Packages for x86_64 Multilib</title>
-
-  <variablelist role="materials">
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/packages.xml"
-    xpointer="xpointer(//*[@os='grub'])"/>
-
-  </variablelist>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/packages.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-</sect1>
Index: OK/materials/x86_64/patches.xml
===================================================================
--- BOOK/materials/x86_64/patches.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,34 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-materials-patches-x86_64">
-  <?dbhtml filename="patches-x86_64.html"?>
-
-  <title>Additional Patches for x86_64 Multilib</title>
-
-  <variablelist role="materials">
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/patches.xml"
-    xpointer="xpointer(//*[@os='gcc-specs-patch'])"/>
-
-    <varlistentry os="perl-multilib-patch">
-      <term>Perl Configure Multilib Patch - <token>&perl-multilib-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&perl-multilib-patch;"/></para>
-        <para>MD5 sum: <literal>&perl-multilib-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-  </variablelist>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/patches.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-</sect1>
Index: OK/mips-index.xml
===================================================================
--- BOOK/mips-index.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,84 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "general.ent">
-  %general-entities;
-]>
-<book>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/mips/bookinfo.xml"/>
-  <!--
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/dedication.xml"/>
-  -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/preface.xml"/>
-
-  <part id="part1">
-    <?dbhtml filename="part1.html"?>
-
-    <title>Introduction</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="introduction/mips-chapter.xml"/>
-
-  </part>
-
-  <part id="part2">
-    <?dbhtml filename="part2.html"?>
-
-    <title>Preparing for the Build</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="partitioning/mips-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="materials/mips-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/mips-chapter.xml"/>
-
-  </part>
-
-  <part id="part3">
-    <?dbhtml filename="part3.html"?>
-
-    <title>Make the Cross-Compile Tools</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cross-tools/mips-chapter.xml"/>
-
-  </part>
-
-  <part id="part4">
-    <?dbhtml filename="part4.html"?>
-
-    <title>Building the Basic Tools</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="temp-system/mips-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="boot/mips-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="chroot/mips-chapter.xml"/>
-
-  </part>
-
-  <part id="part5">
-    <?dbhtml filename="part5.html"?>
-
-    <title>Building the CLFS System</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="testsuite-tools/mips-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-system/mips-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="system-config/mips-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="network/mips-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bootable/mips-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="the-end/chapter.xml"/>
-
-  </part>
-
-  <part id="part6">
-    <?dbhtml filename="part6.html"?>
-
-    <title>Appendices</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/acronymlist.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/dependencies/common.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/dependencies/mips.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/rationale/common.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/rationale/mips.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/license.xml"/>
-
-  </part>
-
-  <index/>
-
-</book>
Index: OK/mips64-64-index.xml
===================================================================
--- BOOK/mips64-64-index.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,84 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "general.ent">
-  %general-entities;
-]>
-<book>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/mips64-64/bookinfo.xml"/>
-  <!--
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/dedication.xml"/>
-  -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/preface.xml"/>
-
-  <part id="part1">
-    <?dbhtml filename="part1.html"?>
-
-    <title>Introduction</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="introduction/mips64-64-chapter.xml"/>
-
-  </part>
-
-  <part id="part2">
-    <?dbhtml filename="part2.html"?>
-
-    <title>Preparing for the Build</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="partitioning/mips-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="materials/mips64-64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/mips64-64-chapter.xml"/>
-
-  </part>
-
-  <part id="part3">
-    <?dbhtml filename="part3.html"?>
-
-    <title>Make the Cross-Compile Tools</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cross-tools/mips64-64-chapter.xml"/>
-
-  </part>
-
-  <part id="part4">
-    <?dbhtml filename="part4.html"?>
-
-    <title>Building the Basic Tools</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="temp-system/mips64-64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="boot/mips64-64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="chroot/mips64-64-chapter.xml"/>
-
-  </part>
-
-  <part id="part5">
-    <?dbhtml filename="part5.html"?>
-
-    <title>Building the CLFS System</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="testsuite-tools/mips64-64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-system/mips64-64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="system-config/mips64-64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="network/mips64-64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bootable/mips64-64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="the-end/chapter.xml"/>
-
-  </part>
-
-  <part id="part6">
-    <?dbhtml filename="part6.html"?>
-
-    <title>Appendices</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/acronymlist.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/dependencies/common.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/dependencies/mips.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/rationale/common.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/rationale/mips.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/license.xml"/>
-
-  </part>
-
-  <index/>
-
-</book>
Index: OK/mips64-index.xml
===================================================================
--- BOOK/mips64-index.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,84 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "general.ent">
-  %general-entities;
-]>
-<book>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/mips64/bookinfo.xml"/>
-  <!--
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/dedication.xml"/>
-  -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/preface.xml"/>
-
-  <part id="part1">
-    <?dbhtml filename="part1.html"?>
-
-    <title>Introduction</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="introduction/mips64-chapter.xml"/>
-
-  </part>
-
-  <part id="part2">
-    <?dbhtml filename="part2.html"?>
-
-    <title>Preparing for the Build</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="partitioning/mips-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="materials/mips64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/mips64-chapter.xml"/>
-
-  </part>
-
-  <part id="part3">
-    <?dbhtml filename="part3.html"?>
-
-    <title>Make the Cross-Compile Tools</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cross-tools/mips64-chapter.xml"/>
-
-  </part>
-
-  <part id="part4">
-    <?dbhtml filename="part4.html"?>
-
-    <title>Building the Basic Tools</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="temp-system/mips64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="boot/mips64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="chroot/mips64-chapter.xml"/>
-
-  </part>
-
-  <part id="part5">
-    <?dbhtml filename="part5.html"?>
-
-    <title>Building the CLFS System</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="testsuite-tools/mips64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-system/mips64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="system-config/mips64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="network/mips64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bootable/mips64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="the-end/chapter.xml"/>
-
-  </part>
-
-  <part id="part6">
-    <?dbhtml filename="part6.html"?>
-
-    <title>Appendices</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/acronymlist.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/dependencies/common.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/dependencies/mips.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/rationale/common.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/rationale/mips.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/license.xml"/>
-
-  </part>
-
-  <index/>
-
-</book>
Index: OK/network/common/choose.xml
===================================================================
--- BOOK/network/common/choose.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,29 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-network-choose">
-  <?dbhtml filename="choose.html"?>
-
-  <title>Systemd Networking?</title>
-
-  <indexterm zone="ch-network-choose">
-    <primary sortas="d-network">network</primary>
-  <secondary>configuring</secondary></indexterm>
-
-  <para>This section only applies if a network card is to be configured. If
-  you do not need to configure a network interface you can skip on to
-  <xref linkend="chapter-bootable"/>.</para>
-
-  <para> There are two different ways you can proceed from this point
-  to configure your network. You can use systemd, or install the
-  CLFS-Network-Scripts.</para>
-
-  <para>To use systemd to configure a Network Interface, Follow <xref linkend="ch-systemd-network"/>.</para>
-
-  <para>To use CLFS-network-scripts to configure a Network Interface, Follow <xref linkend="ch-network-network-scripts"/>.</para>
-
-</sect1>
Index: OK/network/common/dhcpcd.xml
===================================================================
--- BOOK/network/common/dhcpcd.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,136 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-network-dhcpcd" role="wrap">
-  <?dbhtml filename="dhcpcd.html"?>
-
-  <title>DHCPCD-&dhcpcd-version;</title>
-
-  <indexterm zone="ch-network-dhcpcd">
-    <primary sortas="a-DHCPCD">DHCPCD</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The DHCPCD package provides a DHCP Client for network configuration.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of DHCPCD</title>
-
-    <para os="a">If you wish to configure your network to connect to a DHCP
-      server, you will first need to install a DHCP client. CLFS uses the
-      DHCPCD package for this.</para>
-
-    <para os="b">Prepare DHCPCD for compilation:</para>
-
-<screen os="c" role="nodump"><userinput>./configure \
-    --prefix=/usr \
-    --sbindir=/sbin \
-    --sysconfdir=/etc \
-    --dbdir=/var/lib/dhcpcd \
-    --libexecdir=/usr/lib/dhcpcd</userinput></screen>
-
-    <para os="d">Compile the package:</para>
-
-<screen os="e" role="nodump"><userinput>make</userinput></screen>
-
-    <para os="f">This package does not come with a test suite.</para>
-
-    <para os="g">Install the package:</para>
-
-<screen os="h" role="nodump"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="conf-dhcpcd" role="configuration">
-    <title>Creating the DHCP Network Interface Configuration File</title>
-
-    <para>The following is an example for the eth0 interface. Refer to the
-    dhcpcd.conf man page for more information. This step may be skipped if
-    default behavior of dhcpcd is required.</para>
-
-    <para>Create the <filename>/etc/dhcpcd.conf</filename> configuration file
-    using the following commands. Adjust appropriately for additional options:</para>
-
-<screen role="nodump"><userinput>cd /etc &amp;&amp;
-cat &gt; dhcpcd.conf &lt;&lt; "EOF"
-<literal># dhcpcd configuration eth0 interface
-# See dhcpcd.conf(5) for details.
-
-interface eth0
-# dhcpcd-run-hooks uses these options.
-option subnet_mask, routers, domain_name_servers
-
-# The default timeout for waiting for a DHCP response is 30 seconds
-# which may be too long or too short and can be changed here.
-timeout 16</literal>
-EOF</userinput></screen>
-
-    <para>To configure another Static Interface, Follow <xref linkend="ch-network-static"/>.</para>
-
-  </sect2>
-
-  <sect2>
-    <title>Configuring the Network Interface at boot</title>
-
-    <para>Enabling of the Network Interface configuration is
-    done per interface. To enable Network Interface
-    configuration at boot, run:</para>
-
-<screen role="nodump"><userinput>systemctl enable dhcpcd@eth0</userinput></screen>
-
-    <para>To disable previously enabled Network Interface
-    configuration at boot, run:</para>
-
-<screen role="nodump"><userinput>systemctl disable dhcpcd@eth0</userinput></screen>
-
-    <para>To manually start the Network Interface configuration,
-    run:</para>
-
-<screen role="nodump"><userinput>systemctl start dhcpcd@eth0</userinput></screen>
-
-    <para>Replace eth0 with the correct Network Interface
-    name as described on the beginning of this page.</para>
-
-  </sect2>
-
-  <sect2 id="contents-dhcpcd" role="content">
-    <title>Contents of dhcpcd</title>
-
-    <segmentedlist>
-      <segtitle>Installed files</segtitle>
-
-      <seglistitem>
-        <seg>dhcpcd</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="dhcpcd">
-        <term><command>dhcpcd</command></term>
-        <listitem>
-          <para>dhcpcd is an implementation of the DHCP client specified in
-          RFC 2131. It gets the host information from a DHCP server and
-          configures the network interface automatically.</para>
-          <indexterm zone="ch-network-dhcpcd">
-            <primary sortas="e-dhcpcd">dhcpcd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/network/common/hostname.xml
===================================================================
--- BOOK/network/common/hostname.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,30 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-network-hostname">
-  <?dbhtml filename="hostname.html"?>
-
-  <title>Configuring the system hostname</title>
-
-  <indexterm zone="ch-network-hostname">
-    <primary sortas="d-hostname">hostname</primary>
-  <secondary>configuring</secondary></indexterm>
-
-  <para>Systemd reads <filename>/etc/hostname</filename> to determine which
-  hostname should be set.</para>
-
-  <para>Create the <filename>/etc/hostname</filename> file and enter a hostname
-  by running:</para>
-
-<screen role="nodump"><userinput>echo "<replaceable>[clfs]</replaceable>" &gt; /etc/hostname</userinput></screen>
-
-  <para><replaceable>[clfs]</replaceable> needs to be replaced with the
-  name given to the computer. Do not enter the Fully Qualified
-  Domain Name (FQDN) here. That information will be put in the
-  <filename>/etc/hosts</filename> file in the next section.</para>
-
-</sect1>
Index: OK/network/common/hosts.xml
===================================================================
--- BOOK/network/common/hosts.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,87 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-network-hosts">
-  <?dbhtml filename="hosts.html"?>
-
-  <title>Customizing the /etc/hosts File</title>
-
-  <indexterm zone="ch-network-hosts">
-    <primary sortas="e-/etc/hosts">/etc/hosts</primary>
-  </indexterm>
-
-  <indexterm zone="ch-network-hosts">
-    <primary sortas="d-localnet">localnet</primary>
-  <secondary>/etc/hosts</secondary></indexterm>
-
-  <indexterm zone="ch-network-hosts">
-    <primary sortas="d-network">network</primary>
-  <secondary>/etc/hosts</secondary></indexterm>
-
-  <para>If a network card is to be configured, decide on the IP address,
-  fully-qualified domain name (FQDN), and possible aliases for use in the
-  <filename>/etc/hosts</filename> file. The syntax is:</para>
-
-<screen>&lt;IP address&gt; myhost.example.org aliases</screen>
-
-  <para>Unless the computer is to be visible to the Internet (i.e.,
-  there is a registered domain and a valid block of assigned IP
-  addresses&mdash;most users do not have this), make sure that the IP
-  address is in the private network IP address range. Valid ranges
-  are:</para>
-
-<screen><literal>Private Network Address Range       Normal Prefix
-10.0.0.1 - 10.255.255.254           8
-172.x.0.1 - 172.x.255.254           16
-192.168.y.1 - 192.168.y.254         24</literal></screen>
-
-  <para>x can be any number in the range 16-31. y can be any number in the
-  range 0-255.</para>
-
-  <para>A valid IP address could be 192.168.1.1. A valid FQDN for this
-  IP could be <uri>www.clfs.org</uri> (not recommended
-  because this is a valid registered domain address and could cause
-  domain name server issues).</para>
-
-  <para>Even if not using a network card, a valid FQDN is still required.
-  This is necessary for certain programs to operate correctly.</para>
-
-  <para>Create the <filename>/etc/hosts</filename> file by running:</para>
-
-<screen role="nodump"><userinput>cat &gt; /etc/hosts &lt;&lt; "EOF"
-<literal># Begin /etc/hosts (network card version)
-
-127.0.0.1 localhost
-::1       localhost
-<replaceable>[192.168.1.1]</replaceable> <replaceable>[&lt;HOSTNAME&gt;.example.org]</replaceable> <replaceable>[HOSTNAME]</replaceable> <replaceable>[alias ...]</replaceable>
-
-# End /etc/hosts (network card version)</literal>
-EOF</userinput></screen>
-
-  <para>The <replaceable>[192.168.1.1]</replaceable> and
-  <replaceable>[&lt;HOSTNAME&gt;.example.org]</replaceable>
-  values need to be changed for specific users or requirements (if
-  assigned an IP address by a network/system administrator and the
-  machine will be connected to an existing network). The optional
-  alias name(s) can be omitted.</para>
-
-  <para>If a network card is not going to be configured, create the
-  <filename>/etc/hosts</filename> file by running:</para>
-
-<screen role="nodump"><userinput>cat &gt; /etc/hosts &lt;&lt; "EOF"
-<literal># Begin /etc/hosts (no network card version)
-
-127.0.0.1 <replaceable>[&lt;HOSTNAME&gt;.example.org]</replaceable> <replaceable>[HOSTNAME]</replaceable> localhost
-::1       localhost
-
-# End /etc/hosts (no network card version)</literal>
-EOF</userinput></screen>
-
-<para>The ::1 entry is the IPv6 counterpart of 127.0.0.1 and represents the
-      IPv6 loopback interface.</para>
-
-</sect1>
Index: OK/network/common/network-scripts.xml
===================================================================
--- BOOK/network/common/network-scripts.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,94 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-network-network-scripts" role="wrap">
-  <?dbhtml filename="network-scripts.html"?>
-
-  <sect1info condition="script">
-    <productname>clfs-network-scripts</productname>
-    <productnumber>&clfs-network-scripts-version;</productnumber>
-    <address>&clfs-network-scripts-url;</address>
-  </sect1info>
-
-  <title>CLFS-Network-Scripts-&clfs-network-scripts-version;</title>
-
-  <indexterm zone="ch-network-network-scripts">
-    <primary sortas="a-Network-Scripts">Network-Scripts</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The CLFS-Network-Scripts package contains a set of scripts to
-    configure the network at bootup and deconfigure it at shutdown.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of CLFS-Network-Scripts</title>
-
-    <para>Install the package:</para>
-
-<screen role="nodump"><userinput remap="install">make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-network-scripts" role="content">
-    <title>Contents of CLFS-Network-Scripts</title>
-    <segmentedlist>
-      <segtitle>Installed scripts</segtitle>
-      <segtitle>Installed systemd units</segtitle>
-      <segtitle>Installed directories</segtitle>
-
-      <seglistitem>
-        <seg>ifdown, ifup, ipv4-static</seg>
-        <seg>ifupdown@.service, dhcpcd@.service, nscd.service</seg>
-        <seg>/etc/sysconfig, /lib/services, /lib/lsb (symbolic link)</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="ifdown-network-scripts">
-        <term><command>ifdown</command></term>
-        <listitem>
-          <para>Stops a network device.</para>
-          <indexterm zone="ch-network-network-scripts ifdown-network-scripts">
-            <primary sortas="d-ifdown">ifdown</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ifup-network-scripts">
-        <term><command>ifup</command></term>
-        <listitem>
-          <para>Initializes a network device.</para>
-          <indexterm zone="ch-network-network-scripts ifup-network-scripts">
-            <primary sortas="d-ifup">ifup</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ipv4-static-network-scripts">
-        <term><command>ipv4-static</command></term>
-        <listitem>
-          <para>Provides the functionality needed to assign a static Internet
-          Protocol (IP) address to a network interface.</para>
-          <indexterm zone="ch-network-network-scripts ipv4-static-network-scripts">
-            <primary sortas="d-ipv4-static">ipv4-static</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/network/common/resolv.xml
===================================================================
--- BOOK/network/common/resolv.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,50 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-network-resolv">
-  <?dbhtml filename="resolv.html"?>
-
-  <title>Creating the /etc/resolv.conf File</title>
-
-    <indexterm zone="ch-network-resolv">
-      <primary sortas="e-/etc/resolv.conf">/etc/resolv.conf</primary>
-    </indexterm>
-
-    <para>If the system is going to be connected to the Internet, it will
-    need some means of Domain Name Service (DNS) name resolution to
-    resolve Internet domain names to IP addresses, and vice versa. This is
-    best achieved by placing the IP address of the DNS server, available
-    from the ISP or network administrator, into
-    <filename>/etc/resolv.conf</filename>. If at least one of your network
-    interfaces is going to be configured by DHCP then you may not need to
-    create this file. By default DHCPCD will overwrite this file when it gets
-    a new lease from the DHCP server. If you wish to manually configure your
-    network interfaces or manually set your DNS using DHCP then create the
-    file by running the following:</para>
-
-<screen role="nodump"><userinput>cat &gt; /etc/resolv.conf &lt;&lt; "EOF"
-<literal># Begin /etc/resolv.conf
-
-domain <replaceable>[Your Domain Name]</replaceable>
-nameserver <replaceable>[IP address of your primary nameserver]</replaceable>
-nameserver <replaceable>[IP address of your secondary nameserver]</replaceable>
-
-# End /etc/resolv.conf</literal>
-EOF</userinput></screen>
-
-    <para>The <replaceable>domain</replaceable> statement can be omitted or
-    replaced with a <replaceable>search</replaceable> statement. See the man
-    page for resolv.conf for more details.</para>
-
-    <para>Replace <replaceable>[IP address of the nameserver]</replaceable>
-    with the IP address of the DNS most appropriate for the setup. There will
-    often be more than one entry (requirements demand secondary servers for
-    fallback capability). If you only need or want one DNS server, remove the
-    second <emphasis>nameserver</emphasis> line from the file. The IP address
-    may also be a router on the local network.</para>
-
-</sect1>
Index: OK/network/common/sysconfig-network.xml
===================================================================
--- BOOK/network/common/sysconfig-network.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,105 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-network-static">
-  <?dbhtml filename="network-static.html"?>
-
-  <title>Static Networking Configuration</title>
-
-  <sect2>
-    <title>Creating the Static Network Interface Configuration Files</title>
-
-    <para>Which interfaces are brought up and down by the network script
-    depends on the files and directories in the <filename
-    class="directory">/etc/sysconfig</filename> hierarchy.
-    This directory should contain a sub-directory for each interface to be
-    configured, such as <filename>ifconfig.xyz</filename>, where
-    <quote>xyz</quote> is a network interface name. Inside this directory
-    would be files defining the attributes to this interface, such as its IP
-    address(es), subnet masks, and so forth.</para>
-
-    <note><para>Udev may assign random Network Card Interface names
-    for some network cards such as enp2s1. If you are not sure what
-    your Network Card Interface name is, you can always run
-    <command>ip l</command> after you have booted your system. Again,
-    it is important that <filename>ifconfig.xyz</filename> is named
-    after correct Network Card Interface name (e.g.
-    <filename>ifconfig.enp2s1</filename> or
-    <filename>ifconfig.eth0</filename>) or systemd will fail to bring
-    up your network interface.</para></note>
-
-    <para>The following command creates a sample <filename>ipv4</filename>
-    file for the <emphasis>eth0</emphasis> device:</para>
-
-<screen role="nodump"><userinput>mkdir -pv /etc/sysconfig &amp;&amp;
-cd /etc/sysconfig &amp;&amp;
-cat &gt; ifconfig.eth0 &lt;&lt; "EOF"
-<literal>IFACE="eth0"
-SERVICE="ipv4-static"
-IP="192.168.1.1"
-GATEWAY="192.168.1.2"
-PREFIX="24"
-BROADCAST="192.168.1.255"</literal>
-EOF</userinput></screen>
-
-    <para os="var-ob">The values of these variables must be changed in every
-    file to match the proper setup.</para>
-
-    <para os="var-i">The <envar>IFACE</envar> variable defines the interface
-    name, for example, eth0. It is required for all network device configuration
-    files.</para>
-
-    <para os="var-s">The <envar>SERVICE</envar> variable defines the method used
-    for obtaining the IP address. The CLFS-Network-Scripts package has a modular
-    IP assignment format, and creating additional files in the <filename
-    class="directory">/lib/services</filename>
-    directory allows other IP assignment methods.</para>
-
-    <para>The <envar>GATEWAY</envar> variable should contain the default
-    gateway IP address, if one is present. If not, then comment out the
-    variable entirely.</para>
-
-    <para>The <envar>PREFIX</envar> variable needs to contain the number of
-    bits used in the subnet. Each octet in an IP address is 8 bits. If the
-    subnet's netmask is 255.255.255.0, then it is using the first three octets
-    (24 bits) to specify the network number. If the netmask is 255.255.255.240,
-    it would be using the first 28 bits.  Prefixes longer than 24 bits are
-    commonly used by DSL and cable-based Internet Service Providers (ISPs).
-    In this example (PREFIX=24), the netmask is 255.255.255.0. Adjust the
-    <envar>PREFIX</envar> variable according to your specific subnet.</para>
-
-    <para>For more information see the <command>ifup</command> man page.</para>
-
-    <para>To configure another DHCP Interface, Follow <xref linkend="ch-network-dhcpcd"/>.</para>
-
-  </sect2>
-
-  <sect2>
-    <title>Configuring the Network Interface at boot</title>
-
-    <para>Enabling of the Network Interface configuration is
-    done per interface. To enable Network Interface
-    configuration at boot, run:</para>
-
-<screen role="nodump"><userinput>systemctl enable ifupdown@eth0</userinput></screen>
-
-    <para>To disable previously enabled Network Interface
-    configuration at boot, run:</para>
-
-<screen role="nodump"><userinput>systemctl disable ifupdown@eth0</userinput></screen>
-
-    <para>To manually start the Network Interface configuration,
-    run:</para>
-
-<screen role="nodump"><userinput>systemctl start ifupdown@eth0</userinput></screen>
-
-    <para>Replace eth0 with the correct Network Interface
-    name as described on the beginning of this page.</para>
-
-  </sect2>
-
-</sect1>
Index: OK/network/common/systemd-network.xml
===================================================================
--- BOOK/network/common/systemd-network.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,111 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-systemd-network">
-  <?dbhtml filename="systemd-network.html"?>
-
-  <title>Networking Configuration with Systemd-networkd</title>
-
-  <sect2 role="interface-config">
-    <title>Network Interface Configuration</title>
-
-    <note><para>Udev may assign random Network Card Interface names
-    for some network cards such as enp2s1. If you are not sure what
-    your Network Card Interface name is, you can always run
-    <command>ip l</command> after you have booted your system. It is important
-    that the <envar>Name</envar> variable in
-    <filename>/etc/systemd/network</filename> contain the correct Network Card
-    Interface name (e.g. <envar>Name=enp2s1</envar> or
-    <envar>Name=eth0</envar>) or systemd will fail to bring
-    up your network interface.</para></note>
-
-    <sect3 role="static">
-      <title>Static Network Interface Configuration</title>
-
-      <para><command>systemd-networkd</command> uses
-      <filename>/etc/systemd/network</filename> for configuration files. Refer
-      to systemd.network(5) and systemd.netdev(5). Configure a network
-      interface with a config file. Adjust Name= as required:</para>
-
-<screen role="nodump"><userinput>cd /etc/systemd/network &amp;&amp;
-cat &gt; static.network &lt;&lt; "EOF"
-[Match]
-Name=enp2s0
-
-[Network]
-Address=192.168.1.1/24
-Gateway=192.168.1.2
-EOF</userinput></screen>
-
-      <para os="var-ob">The values of these variables must be changed in every
-      file to match the proper setup.</para>
-
-      <para os="var-i">The <envar>Name</envar> variable defines the interface
-      name, for example, eth0. It is required for all network device
-      configuration files.</para>
-
-      <para>The <envar>Gateway</envar> variable should contain the default
-      gateway IP address, if one is present. If not, then comment out the
-      variable entirely.</para>
-
-      <para>For more information see the <command>systemd.netdev</command> man page.</para>
-
-    </sect3>
-
-    <sect3 role="dhcp">
-      <title>Connecting to a network with DHCP</title>
-
-    <para><command>systemd-networkd</command> uses
-    <filename>/etc/systemd/network</filename> for configuration files. Refer
-    to <filename>systemd.network(5)</filename> and
-    <filename>systemd.netdev(5)</filename>. Configure a network interface
-    with a config file. Adjust Name= as required:</para>
-
-<screen role="nodump"><userinput>cd /etc/systemd/network &amp;&amp;
-cat &gt; dhcp.network &lt;&lt; "EOF"
-[Match]
-Name=enp2s0
-
-[Network]
-DHCP=yes
-EOF</userinput></screen>
-
-    <para><command>systemd-networkd</command> will automatically configure
-    <filename>/run/systemd/network/resolv.conf</filename> when using DHCP.
-    If you did not manually create <filename>/etc/resolv.conf</filename>,
-    create a symlink:</para>
-
-<screen role="nodump"><userinput>ln -sv /run/systemd/network/resolv.conf /etc</userinput></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="timesyncd">
-    <title>Using Timesyncd</title>
-
-    <para>Systemd includes a simple NTP client daemon,
-    <command>systemd-timesyncd</command>, though it is disabled by
-    default. If you want to enable it, you will first need to add a required
-    user and group:</para>
-
-<screen role="nodump"><userinput>groupadd -g &gid-systemd-timesync; systemd-timesync
-useradd -g systemd-timesync -u &uid-systemd-timesync; -d /dev/null -s /bin/false systemd-timesync</userinput></screen>
-
-    <para>Then, actually enable <command>systemd-timesyncd</command> so that
-    it will run on system boot:</para>
-
-<screen role="nodump"><userinput>systemctl enable systemd-timesyncd</userinput></screen>
-
-    <para>You can configure <command>systemd-timesyncd</command> by editing
-    <filename>/etc/systemd/timesyncd.conf</filename>.</para>
-
-  <para>Continue to <xref linkend="chapter-bootable"/>.</para>
-
-  </sect2>
-
-</sect1>
Index: OK/network/mips-chapter.xml
===================================================================
--- BOOK/network/mips-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,23 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-network" xreflabel="Networking Configuration">
-  <?dbhtml dir="network"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Networking Configuration</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/hostname.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/hosts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resolv.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd-network.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysconfig-network.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcpcd.xml"/>
-
-</chapter>
Index: OK/network/mips64-64-chapter.xml
===================================================================
--- BOOK/network/mips64-64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,23 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-network" xreflabel="Networking Configuration">
-  <?dbhtml dir="network"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Networking Configuration</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/hostname.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/hosts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resolv.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd-network.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysconfig-network.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcpcd.xml"/>
-
-</chapter>
Index: OK/network/mips64-chapter.xml
===================================================================
--- BOOK/network/mips64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,23 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-network" xreflabel="Networking Configuration">
-  <?dbhtml dir="network"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Networking Configuration</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/hostname.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/hosts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resolv.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd-network.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysconfig-network.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dhcpcd.xml"/>
-
-</chapter>
Index: OK/network/multilib/dhcpcd.xml
===================================================================
--- BOOK/network/multilib/dhcpcd.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,70 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-network-dhcpcd" role="wrap">
-  <?dbhtml filename="dhcpcd.html"?>
-
-  <title>DHCPCD-&dhcpcd-version;</title>
-
-  <indexterm zone="ch-network-dhcpcd">
-    <primary sortas="a-DHCPCD">DHCPCD</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/dhcpcd.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of DHCPCD</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/dhcpcd.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/dhcpcd.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-<screen os="c" role="nodump"><userinput>CC="gcc ${BUILD64}" ./configure \
-    --prefix=/usr \
-    --sbindir=/sbin \
-    --sysconfdir=/etc \
-    --dbdir=/var/lib/dhcpcd \
-    --libexecdir=/usr/lib64/dhcpcd \
-    --libdir=/usr/lib64</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/dhcpcd.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/dhcpcd.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/dhcpcd.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/dhcpcd.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/dhcpcd.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/dhcpcd.xml"
-  xpointer="xpointer(id('conf-dhcpcd'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/dhcpcd.xml"
-  xpointer="xpointer(id('contents-dhcpcd'))"/>
-
-</sect1>
Index: OK/network/ppc-chapter.xml
===================================================================
--- BOOK/network/ppc-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,23 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-network" xreflabel="Networking Configuration">
-  <?dbhtml dir="network"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Networking Configuration</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/hostname.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/hosts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resolv.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd-network.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysconfig-network.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcpcd.xml"/>
-
-</chapter>
Index: OK/network/ppc64-64-chapter.xml
===================================================================
--- BOOK/network/ppc64-64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,23 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-network" xreflabel="Networking Configuration">
-  <?dbhtml dir="network"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Networking Configuration</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/hostname.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/hosts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resolv.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd-network.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysconfig-network.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcpcd.xml"/>
-
-</chapter>
Index: OK/network/ppc64-chapter.xml
===================================================================
--- BOOK/network/ppc64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,23 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-network" xreflabel="Networking Configuration">
-  <?dbhtml dir="network"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Networking Configuration</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/hostname.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/hosts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resolv.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd-network.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysconfig-network.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dhcpcd.xml"/>
-
-</chapter>
Index: OK/network/sparc-chapter.xml
===================================================================
--- BOOK/network/sparc-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,23 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-network" xreflabel="Networking Configuration">
-  <?dbhtml dir="network"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Networking Configuration</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/hostname.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/hosts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resolv.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd-network.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysconfig-network.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcpcd.xml"/>
-
-</chapter>
Index: OK/network/sparc64-64-chapter.xml
===================================================================
--- BOOK/network/sparc64-64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,23 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-network" xreflabel="Networking Configuration">
-  <?dbhtml dir="network"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Networking Configuration</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/hostname.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/hosts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resolv.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd-network.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysconfig-network.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcpcd.xml"/>
-
-</chapter>
Index: OK/network/sparc64-chapter.xml
===================================================================
--- BOOK/network/sparc64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,23 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-network" xreflabel="Networking Configuration">
-  <?dbhtml dir="network"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Networking Configuration</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/hostname.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/hosts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resolv.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd-network.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysconfig-network.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dhcpcd.xml"/>
-
-</chapter>
Index: OK/network/x86-chapter.xml
===================================================================
--- BOOK/network/x86-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,23 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-network" xreflabel="Networking Configuration">
-  <?dbhtml dir="network"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Networking Configuration</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/hostname.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/hosts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resolv.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd-network.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysconfig-network.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcpcd.xml"/>
-
-</chapter>
Index: OK/network/x86_64-64-chapter.xml
===================================================================
--- BOOK/network/x86_64-64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,23 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-network" xreflabel="Networking Configuration">
-  <?dbhtml dir="network"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Networking Configuration</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/hostname.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/hosts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resolv.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd-network.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysconfig-network.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcpcd.xml"/>
-
-</chapter>
Index: OK/network/x86_64-chapter.xml
===================================================================
--- BOOK/network/x86_64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,23 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-network" xreflabel="Networking Configuration">
-  <?dbhtml dir="network"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Networking Configuration</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/hostname.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/hosts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resolv.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd-network.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysconfig-network.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dhcpcd.xml"/>
-
-</chapter>
Index: OK/obfuscate.sh
===================================================================
--- BOOK/obfuscate.sh	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,39 +1,0 @@
-#!/bin/bash
-
-# obfuscate.sh
-# obfuscate email addresses in XML/HTML
-# Script written (and slight perl modification) by Archaic <archaic AT linuxfromscratch D0T org>
-# Modified from "sed -i" to old style "sed -e" by Manuel Canales <manuel AT linuxfromscratch D0T org>
-# to prevent hangs on very long files, like nonckunked books.
-# Original Perl expression by Anderson Lizardo <lizardo AT linuxfromscratch D0T org>
-# Released under the GNU General Public License
-#
-# This script currently only seeks out mailto: addresses. If those same
-# addresses also appear in plaintext, we need to obfuscate those as well.
-#
-# This script was made for a very specific purpose so I was a bit lazy in
-# writing the regex's.
-#
-# Please send comments, enhancements, etc. to the above address
-
-#set -e  # Bail on all errors
-
-# First, ensure that we are given a file to process
-# if [ $# -lt 1 ]; then
-#   echo -e "\nYou must provide an input file."
-#   exit 1
-# fi
-
-# Nothing like a backup plan!
-#cp "$1" "$1".bak
-
-for i in `grep -o '"mailto:.*@.*"' ${1} |sed -e 's|^"mailto:||' -e 's|"$||'`; do
-  link=`echo $i | perl -pe 's/[^\n]/"\\\&#".ord($&)."\;"/ge'`
-  plaintext=`echo $i | sed -e 's|@| AT |' -e 's|\.| D0T |g'`
-  cp ${1}{,.tmp}
-  sed -e "s|mailto:$i|mailto:$link|" \
-      -e "s|$i|$plaintext|" ${1}.tmp > ${1}
-  rm ${1}.tmp
-done
-#rm $FILE.tmp
-#exit 0
Index: OK/packages.ent
===================================================================
--- BOOK/packages.ent	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,518 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!ENTITY packages-root "&clfs-root;files/packages/&generic-version;/">
-<!ENTITY extras-root "&clfs-root;files/extras/">
-
-<!-- Note: For empty *-home entities use " " not "" -->
-
-<!ENTITY acl-version "2.2.52">
-<!ENTITY acl-size "384 KB">
-<!ENTITY acl-url "&savannah;/releases/acl/acl-&acl-version;.src.tar.gz">
-<!ENTITY acl-md5 "a61415312426e9c2212bd7dc7929abda">
-<!ENTITY acl-home "http://savannah.nongnu.org/projects/acl">
-
-<!ENTITY attr-version "2.4.47">
-<!ENTITY attr-size "340 KB">
-<!ENTITY attr-url "&savannah;/releases/attr/attr-&attr-version;.src.tar.gz">
-<!ENTITY attr-md5 "84f58dec00b60f2dc8fd1c9709291cc7">
-<!ENTITY attr-home "http://savannah.nongnu.org/projects/attr">
-
-<!ENTITY arcload-version "0.5">
-<!ENTITY arcload-size "48 KB">
-<!ENTITY arcload-url "ftp://ftp.linux-mips.org/pub/linux/mips/people/skylark/arcload-&arcload-version;.tar.bz2">
-<!ENTITY arcload-md5 "b00e1c79074a13c2de97748f56f9bd1f">
-<!ENTITY arcload-home "http://www.linux-mips.org/wiki/ARCLoad">
-
-<!ENTITY autoconf-version "2.69">
-<!ENTITY autoconf-size "1,188 KB">
-<!ENTITY autoconf-url "&gnu;autoconf/autoconf-&autoconf-version;.tar.xz">
-<!ENTITY autoconf-md5 "50f97f4159805e374639a73e2636f22e">
-<!ENTITY autoconf-home "&gnu-software;autoconf/autoconf.html">
-
-<!ENTITY automake-version2 "1.15">
-<!ENTITY automake-version "&automake-version2;">
-<!ENTITY automake-size "1,497 KB">
-<!ENTITY automake-url "&gnu;automake/automake-&automake-version;.tar.xz">
-<!ENTITY automake-md5 "9a1ddb0e053474d9d1105cfe39b0c48d">
-<!ENTITY automake-home "&gnu-software;automake">
-
-<!ENTITY bash-version "4.4">
-<!ENTITY bash-size "9,377 KB">
-<!ENTITY bash-url "&gnu;bash/bash-&bash-version;.tar.gz">
-<!ENTITY bash-md5 "148888a7c95ac23705559b6f477dfe25">
-<!ENTITY bash-home "&gnu-software;bash">
-
-<!ENTITY bc-version "1.07.1">
-<!ENTITY bc-size "420 KB">
-<!ENTITY bc-url "&gnu;bc/bc-&bc-version;.tar.gz">
-<!ENTITY bc-md5 "cda93857418655ea43590736fc3ca9fc">
-<!ENTITY bc-home "&gnu-software;bc/">
-
-<!ENTITY binutils-version "2.28">
-<!ENTITY binutils-dir "&binutils-version;">
-<!ENTITY binutils-size "26,556 KB">
-<!ENTITY binutils-url "&gnu;binutils/binutils-&binutils-version;.tar.bz2">
-<!ENTITY binutils-md5 "9e8340c96626b469a603c15c9d843727">
-<!ENTITY binutils-home "http://sources.redhat.com/binutils">
-
-<!ENTITY bison-version "3.0.4">
-<!ENTITY bison-size "1,974 KB">
-<!ENTITY bison-url "&gnu;bison/bison-&bison-version;.tar.xz">
-<!ENTITY bison-md5 "c342201de104cc9ce0a21e0ad10d4021">
-<!ENTITY bison-home "&gnu-software;bison">
-
-<!ENTITY boot-scripts-clfs-version "3.0-20140710">
-<!ENTITY boot-scripts-clfs-size "22 KB">
-<!ENTITY boot-scripts-clfs-url "&packages-root;boot-scripts-cross-lfs-&boot-scripts-clfs-version;.tar.xz">
-<!ENTITY boot-scripts-clfs-md5 "bac3e8a54e5ab124a2df0713dc4e4ca4">
-<!ENTITY boot-scripts-clfs-home " ">
-
-<!ENTITY bzip2-version "1.0.6">
-<!ENTITY bzip2-size "764 KB">
-<!ENTITY bzip2-url "http://www.bzip.org/&bzip2-version;/bzip2-&bzip2-version;.tar.gz">
-<!ENTITY bzip2-md5 "00b516f4704d4a7cb50a1d97e6e8e15b">
-<!ENTITY bzip2-home "http://www.bzip.org/">
-
-<!ENTITY check-version "0.11.0">
-<!ENTITY check-size "754 KB">
-<!ENTITY check-url "https://github.com/libcheck/check/releases/download/&check-version;/check-&check-version;.tar.gz">
-<!ENTITY check-md5 "9b90522b31f5628c2e0f55dda348e558">
-<!ENTITY check-home "http://libcheck.github.io/check/">
-
-<!ENTITY clfs-network-scripts-version "20140224">
-<!ENTITY clfs-network-scripts-size "22 KB">
-<!ENTITY clfs-network-scripts-url "http://clfs.org/files/clfs-network-scripts-&clfs-network-scripts-version;.tar.xz">
-<!ENTITY clfs-network-scripts-md5 "831308d5e80bdaa3f494dc218ee43f78">
-<!ENTITY clfs-network-scripts-home " ">
-
-<!ENTITY colo-version "1.22">
-<!ENTITY colo-size "252 KB">
-<!ENTITY colo-url "http://www.colonel-panic.org/cobalt-mips/colo/colo-&colo-version;.tar.gz">
-<!ENTITY colo-md5 "52c16ad31f3b88f710f0fdb5abed0457">
-<!ENTITY colo-home "http://www.colonel-panic.org/cobalt-mips">
-
-<!ENTITY coreutils-version "8.27">
-<!ENTITY coreutils-size "5,286 KB">
-<!ENTITY coreutils-url "&gnu;coreutils/coreutils-&coreutils-version;.tar.xz">
-<!ENTITY coreutils-md5 "502795792c212932365e077946d353ae">
-<!ENTITY coreutils-home "&gnu-software;coreutils/coreutils.html">
-
-<!ENTITY dbus-version "1.10.18">
-<!ENTITY dbus-size "1,987 KB">
-<!ENTITY dbus-url "http://dbus.freedesktop.org/releases/dbus/dbus-&dbus-version;.tar.gz">
-<!ENTITY dbus-md5 "1209c455598165a0c5263d4201894179">
-<!ENTITY dbus-home "http://www.freedesktop.org/wiki/Software/dbus">
-
-<!ENTITY dejagnu-version "1.6">
-<!ENTITY dejagnu-size "524 KB">
-<!ENTITY dejagnu-url "&gnu;dejagnu/dejagnu-&dejagnu-version;.tar.gz">
-<!ENTITY dejagnu-md5 "1fdc2eb0d592c4f89d82d24dfdf02f0b">
-<!ENTITY dejagnu-home "&gnu-software;dejagnu">
-
-<!ENTITY dhcpcd-version "6.11.5">
-<!ENTITY dhcpcd-size "198 KB">
-<!ENTITY dhcpcd-url "http://roy.marples.name/downloads/dhcpcd/dhcpcd-&dhcpcd-version;.tar.xz">
-<!ENTITY dhcpcd-md5 "2465624b62c1154f0e89dc69c42c849b">
-<!ENTITY dhcpcd-home "http://roy.marples.name/projects/dhcpcd">
-
-<!ENTITY diffutils-version "3.6">
-<!ENTITY diffutils-size "1,398 KB">
-<!ENTITY diffutils-url "&gnu;diffutils/diffutils-&diffutils-version;.tar.xz">
-<!ENTITY diffutils-md5 "07cf286672ced26fba54cd0313bdc071">
-<!ENTITY diffutils-home "&gnu-software;diffutils">
-
-<!ENTITY dvhtool-version "1.0.1">
-<!ENTITY dvhtool-size "56 KB">
-<!ENTITY dvhtool-url "http://ftp.debian.org/debian/pool/main/d/dvhtool/dvhtool_&dvhtool-version;.orig.tar.gz">
-<!ENTITY dvhtool-md5 "4448c01e6a015685af90a79fbea8da4e">
-<!ENTITY dvhtool-home "http://packages.qa.debian.org/d/dvhtool.html">
-
-<!ENTITY e2fsprogs-version "1.43.4">
-<!ENTITY e2fsprogs-size "5,266 KB">
-<!ENTITY e2fsprogs-url "&kernel;linux/kernel/people/tytso/e2fsprogs/v&e2fsprogs-version;/e2fsprogs-&e2fsprogs-version;.tar.xz">
-<!ENTITY e2fsprogs-md5 "8903379ef0b902f4e29b6cafea359fe1">
-<!ENTITY e2fsprogs-home "http://e2fsprogs.sourceforge.net">
-
-<!ENTITY elftoaout-version "2.3">
-<!ENTITY elftoaout-size "16 KB">
-<!ENTITY elftoaout-url "http://gd.tuwien.ac.at/opsys/linux/Owl/pool/sources/elftoaout/elftoaout-&elftoaout-version;.tgz">
-<!ENTITY elftoaout-md5 "be3bd6f7ba8ae107cbdbaa820ba64f86">
-<!ENTITY elftoaout-home " ">
-
-<!ENTITY eudev-version "1.7">
-<!ENTITY eudev-size "1,756 KB">
-<!ENTITY eudev-url "http://dev.gentoo.org/~blueness/eudev/eudev-&eudev-version;.tar.gz">
-<!ENTITY eudev-md5 "80649a0350ff9620fc2da9562d9f2a6a">
-<!ENTITY eudev-home "https://wiki.gentoo.org/wiki/Eudev">
-
-<!ENTITY expat-version "2.2.0">
-<!ENTITY expat-size "414 KB">
-<!ENTITY expat-url "&sourceforge;expat/expat-&expat-version;.tar.bz2">
-<!ENTITY expat-md5 "2f47841c829facb346eb6e3fab5212e2">
-<!ENTITY expat-home "http://expat.sourceforge.net">
-
-<!ENTITY expect-version "5.45">
-<!ENTITY expect-size "616 KB">
-<!ENTITY expect-url "&sourceforge;project/expect/Expect/&expect-version;/expect&expect-version;.tar.gz">
-<!ENTITY expect-md5 "44e1a4f4c877e9ddc5a542dfa7ecc92b">
-<!ENTITY expect-home "http://expect.sourceforge.net">
-<!ENTITY expect-lib-version "5.43">
-
-<!ENTITY file-version "5.31">
-<!ENTITY file-size "792 KB">
-<!ENTITY file-url "ftp://ftp.astron.com/pub/file/file-&file-version;.tar.gz">
-<!--<!ENTITY file-url "&packages-root;file-&file-version;.tar.gz">-->
-<!ENTITY file-md5 "319627d20c9658eae85b056115b8c90a">
-<!ENTITY file-home "http://www.darwinsys.com/file">
-
-<!ENTITY findutils-version "4.6.0">
-<!ENTITY findutils-size "3,780 KB">
-<!ENTITY findutils-url "&gnu;findutils/findutils-&findutils-version;.tar.gz">
-<!ENTITY findutils-md5 "9936aa8009438ce185bea2694a997fc1">
-<!ENTITY findutils-home "&gnu-software;findutils">
-
-<!ENTITY flex-version "2.6.4">
-<!ENTITY flex-size "1,419 KB">
-<!ENTITY flex-url "https://github.com/westes/flex/releases/download/v&flex-version;/flex-&flex-version;.tar.gz">
-<!ENTITY flex-md5 "2882e3179748cc9f9c23ec593d6adc8d">
-<!ENTITY flex-home "https://github.com/westes/flex">
-
-<!ENTITY gawk-version "4.1.4">
-<!ENTITY gawk-size "2,368 KB">
-<!ENTITY gawk-url "&gnu;gawk/gawk-&gawk-version;.tar.xz">
-<!ENTITY gawk-md5 "4e7dbc81163e60fd4f0b52496e7542c9">
-<!ENTITY gawk-home "&gnu-software;gawk">
-
-<!ENTITY gcc-version "7.1.0">
-<!ENTITY gcc-size "84,304 KB">
-<!ENTITY gcc-url "ftp://gcc.gnu.org/pub/gcc/releases/gcc-&gcc-version;/gcc-&gcc-version;.tar.bz2">
-<!ENTITY gcc-md5 "6bf56a2bca9dac9dbbf8e8d1036964a8">
-<!ENTITY gcc-home "http://gcc.gnu.org">
-
-<!ENTITY gdbm-version "1.13">
-<!ENTITY gdbm-size "892 KB">
-<!ENTITY gdbm-url "&gnu;gdbm/gdbm-&gdbm-version;.tar.gz">
-<!ENTITY gdbm-md5 "8929dcda2a8de3fd2367bdbf66769376">
-<!ENTITY gdbm-home "&gnu-software;gdbm">
-
-<!ENTITY gettext-version "0.19.8.1">
-<!ENTITY gettext-size "7,210 KB">
-<!ENTITY gettext-url "&gnu;gettext/gettext-&gettext-version;.tar.xz">
-<!ENTITY gettext-md5 "df3f5690eaa30fd228537b00cb7b7590">
-<!ENTITY gettext-home "&gnu-software;gettext">
-
-<!ENTITY glibc-version "2.25">
-<!ENTITY glibc-size "13,874 KB">
-<!ENTITY glibc-url "&gnu;glibc/glibc-&glibc-version;.tar.xz">
-<!ENTITY glibc-md5 "1496c3bf41adf9db0ebd0af01f202eed">
-<!ENTITY glibc-home "&gnu-software;libc/">
-<!ENTITY glibc-ld-name "ld-&glibc-version;.so">
-<!ENTITY glibc-kernel-version "3.12.0">
-
-<!ENTITY gmp-version "6.1.2">
-<!ENTITY gmp-size "1,946 KB">
-<!ENTITY gmp-url "&gnu;gmp/gmp-&gmp-version;.tar.xz">
-<!ENTITY gmp-md5 "f58fa8001d60c4c77595fbbb62b63c1d">
-<!ENTITY gmp-home "https://gmplib.org/">
-
-<!ENTITY gperf-version "3.0.4">
-<!ENTITY gperf-size "968 KB">
-<!ENTITY gperf-url "&gnu;gperf/gperf-&gperf-version;.tar.gz">
-<!ENTITY gperf-md5 "c1f1db32fb6598d6a93e6e88796a8632">
-<!ENTITY gperf-home "&gnu-software;gperf">
-
-<!ENTITY grep-version "3.0">
-<!ENTITY grep-size "1,375 KB">
-<!ENTITY grep-url "&gnu;grep/grep-&grep-version;.tar.xz">
-<!ENTITY grep-md5 "fa07c1616adeb9c3262be5177d10ad4a">
-<!ENTITY grep-home "&gnu-software;grep">
-
-<!ENTITY groff-version "1.22.3">
-<!ENTITY groff-size "4,189 KB">
-<!ENTITY groff-url "&gnu;groff/groff-&groff-version;.tar.gz">
-<!ENTITY groff-md5 "cc825fa64bc7306a885f2fb2268d3ec5">
-<!ENTITY groff-home "&gnu-software;groff">
-
-<!ENTITY grub-version "2.00">
-<!ENTITY grub-size "5,020 KB">
-<!ENTITY grub-url "&gnu;grub/grub-&grub-version;.tar.xz">
-<!ENTITY grub-md5 "a1043102fbc7bcedbf53e7ee3d17ab91">
-<!ENTITY grub-home "&gnu-software;grub">
-
-<!ENTITY gzip-version "1.8">
-<!ENTITY gzip-size "728 KB">
-<!ENTITY gzip-url "&gnu;gzip/gzip-&gzip-version;.tar.xz">
-<!ENTITY gzip-md5 "f7caabb65cddc1a4165b398009bd05b9">
-<!ENTITY gzip-home "&gnu-software;gzip/gzip.html">
-
-<!ENTITY hfsutils-version "3.2.6">
-<!ENTITY hfsutils-size "204 KB">
-<!ENTITY hfsutils-url "ftp://ftp.mars.org/pub/hfs/hfsutils-&hfsutils-version;.tar.gz">
-<!ENTITY hfsutils-md5 "fa572afd6da969e25c1455f728750ec4">
-<!ENTITY hfsutils-home "http://www.mars.org/home/rob/proj/hfs">
-
-<!ENTITY iana-etc-version "2.30">
-<!ENTITY iana-etc-size "204 KB">
-<!ENTITY iana-etc-url "http://ftp.clfs.org/pub/clfs/conglomeration/iana-etc/iana-etc-&iana-etc-version;.tar.bz2">
-<!ENTITY iana-etc-md5 "3ba3afb1d1b261383d247f46cb135ee8">
-<!ENTITY iana-etc-home "https://www.archlinux.org/packages/core/any/iana-etc/">
-<!-- <!ENTITY iana-etc-home "http://sethwklein.net/iana-etc"> -->
-
-
-<!ENTITY intltool-version "0.51.0">
-<!ENTITY intltool-size "162 KB">
-<!ENTITY intltool-url "http://launchpad.net/intltool/trunk/&intltool-version;/+download/intltool-&intltool-version;.tar.gz">
-<!ENTITY intltool-md5 "12e517cac2b57a0121cda351570f1e63">
-<!ENTITY intltool-home "http://freedesktop.org/wiki/Software/intltool">
-
-<!ENTITY iproute2-version "4.9.0">
-<!ENTITY iproute2-size "613 KB">
-<!ENTITY iproute2-url "&kernel;linux/utils/net/iproute2/iproute2-&iproute2-version;.tar.xz">
-<!ENTITY iproute2-md5 "44a8371a4b2c40e48e4c9f98cbd41391">
-<!ENTITY iproute2-home "http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2">
-
-<!ENTITY iputils-version "s20150815">
-<!ENTITY iputils-size "152 KB">
-<!ENTITY iputils-url "&packages-root;iputils-&iputils-version;.tar.xz">
-<!ENTITY iputils-md5 "d184faea97095265452dce19ef98daf6">
-<!ENTITY iputils-home "http://www.linuxfoundation.org/collaborate/workgroups/networking/iputils">
-
-<!ENTITY isl-version "0.17.1">
-<!ENTITY isl-size "1,441 KB">
-<!ENTITY isl-url "http://isl.gforge.inria.fr/isl-&isl-version;.tar.xz">
-<!ENTITY isl-md5 "20b83900e234f982a566a3a6b3503bf1">
-<!ENTITY isl-home "http://isl.gforge.inria.fr">
-
-<!ENTITY kbd-version "2.0.4">
-<!ENTITY kbd-size "1,019 KB">
-<!ENTITY kbd-url "&kernel;linux/utils/kbd/kbd-&kbd-version;.tar.xz">
-<!ENTITY kbd-md5 "c1635a5a83b63aca7f97a3eab39ebaa6">
-<!ENTITY kbd-home "http://ftp.altlinux.org/pub/people/legion/kbd/">
-
-<!ENTITY kmod-version "24">
-<!ENTITY kmod-size "537 KB">
-<!ENTITY kmod-url "&kernel;linux/utils/kernel/kmod/kmod-&kmod-version;.tar.xz">
-<!ENTITY kmod-md5 "08297dfb6f2b3f625f928ca3278528af">
-<!ENTITY kmod-home "http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary">
-
-<!ENTITY less-version "491">
-<!ENTITY less-size "320 KB">
-<!ENTITY less-url "http://www.greenwoodsoftware.com/less/less-&less-version;.tar.gz">
-<!ENTITY less-md5 "81e260e8b12f253c31565acad6ee0e59">
-<!ENTITY less-home "http://www.greenwoodsoftware.com/less">
-
-<!ENTITY libcap-version "2.25">
-<!ENTITY libcap-size "64 KB">
-<!ENTITY libcap-url "&kernel;linux/libs/security/linux-privs/libcap2/libcap-&libcap-version;.tar.xz">
-<!ENTITY libcap-md5 "6666b839e5d46c2ad33fc8aa2ceb5f77">
-<!ENTITY libcap-home "http://sites.google.com/site/fullycapable/">
-
-<!ENTITY libpipeline-version "1.4.1">
-<!ENTITY libpipeline-size "805 KB">
-<!ENTITY libpipeline-url "&savannah;/releases/libpipeline/libpipeline-&libpipeline-version;.tar.gz">
-<!ENTITY libpipeline-md5 "e54590ec68d6c1239f67b5b44e92022c">
-<!ENTITY libpipeline-home "http://libpipeline.nongnu.org/">
-
-<!ENTITY libtool-version "2.4.6">
-<!ENTITY libtool-size "948 KB">
-<!ENTITY libtool-url "&gnu;libtool/libtool-&libtool-version;.tar.xz">
-<!ENTITY libtool-md5 "1bfb9b923f2c1339b4d2ce1807064aa5">
-<!ENTITY libtool-home "&gnu-software;libtool">
-
-<!ENTITY linux-dl-version "4.x">
-<!ENTITY linux-version "4.9">
-<!ENTITY linux-version2 "&linux-version;.21">
-<!ENTITY linux-size "93,192 KB">
-<!ENTITY linux-url "&kernel;linux/kernel/v&linux-dl-version;/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "0a68ef3615c64bd5ee54a3320e46667d">
-<!ENTITY linux-home "http://www.kernel.org">
-
-<!ENTITY m4-version "1.4.18">
-<!ENTITY m4-size "1,208 KB">
-<!ENTITY m4-url "&gnu;m4/m4-&m4-version;.tar.xz">
-<!ENTITY m4-md5 "730bb15d96fffe47e148d1e09235af82">
-<!ENTITY m4-home "&gnu-software;m4/m4.html">
-
-<!ENTITY make-version "4.2.1">
-<!ENTITY make-size "1,407 KB">
-<!ENTITY make-url "&gnu;make/make-&make-version;.tar.bz2">
-<!ENTITY make-md5 "15b012617e7c44c0ed482721629577ac">
-<!ENTITY make-home "&gnu-software;make">
-
-<!ENTITY man-db-version "2.7.6.1">
-<!ENTITY man-db-size "1,541 KB">
-<!ENTITY man-db-url "&packages-root;man-db-&man-db-version;.tar.xz">
-<!ENTITY man-db-md5 "2948d49d0ed7265f60f83aa4a9ac9268">
-<!ENTITY man-db-home "http://man-db.nongnu.org">
-
-<!ENTITY man-pages-version "4.09">
-<!ENTITY man-pages-size "1,522 KB">
-<!ENTITY man-pages-url "&kernel;linux/docs/man-pages/man-pages-&man-pages-version;.tar.xz">
-<!ENTITY man-pages-md5 "91c721409bbf823d8f62bee3a1fe8ae3">
-<!ENTITY man-pages-home "http://www.win.tue.nl/~aeb/linux/man">
-
-<!ENTITY mpc-version "1.0.3">
-<!ENTITY mpc-size "670 KB">
-<!ENTITY mpc-url "http://www.multiprecision.org/mpc/download/mpc-&mpc-version;.tar.gz">
-<!ENTITY mpc-md5 "d6a1d5f8ddea3abd2cc3e98f58352d26">
-<!ENTITY mpc-home "http://www.multiprecision.org/">
-
-<!ENTITY mpfr-version "3.1.5">
-<!ENTITY mpfr-size "1,127 KB">
-<!ENTITY mpfr-url "http://www.mpfr.org/mpfr-&mpfr-version;/mpfr-&mpfr-version;.tar.xz">
-<!ENTITY mpfr-md5 "c4ac246cf9795a4491e7766002cd528f">
-<!ENTITY mpfr-home "http://www.mpfr.org/">
-
-<!ENTITY ncurses-version "6.0">
-<!ENTITY ncurses-size "3,132 KB">
-<!ENTITY ncurses-url "&gnu;ncurses/ncurses-&ncurses-version;.tar.gz">
-<!ENTITY ncurses-md5 "ee13d052e1ead260d7c28071f46eefb1">
-<!ENTITY ncurses-home "&gnu-software;ncurses">
-
-<!ENTITY parted-version "3.1">
-<!ENTITY parted-size "1,492 KB">
-<!ENTITY parted-url "&gnu;parted/parted-&parted-version;.tar.xz">
-<!ENTITY parted-md5 "5d89d64d94bcfefa9ce8f59f4b81bdcb">
-<!ENTITY parted-home "&gnu-software;parted">
-
-<!ENTITY patch-version "2.7.5">
-<!ENTITY patch-size "728 KB">
-<!ENTITY patch-url "&gnu;patch/patch-&patch-version;.tar.xz">
-<!ENTITY patch-md5 "e3da7940431633fb65a01b91d3b7a27a">
-<!ENTITY patch-home "http://savannah.gnu.org/projects/patch">
-
-<!ENTITY perl-version "5.26.0">
-<!ENTITY perl-size "11,962 KB">
-<!ENTITY perl-url "http://www.cpan.org/src/5.0/perl-&perl-version;.tar.xz">
-<!ENTITY perl-md5 "8c6995718e4cb62188f0d5e3488cd91f">
-<!ENTITY perl-home "https://www.perl.org">
-
-<!ENTITY pkg-config-lite-version "0.28-1">
-<!ENTITY pkg-config-lite-size "384 KB">
-<!ENTITY pkg-config-lite-url "http://sourceforge.net/projects/pkgconfiglite/files/0.28-1/pkg-config-lite-&pkg-config-lite-version;.tar.gz">
-<!ENTITY pkg-config-lite-md5 "61f05feb6bab0a6bbfab4b6e3b2f44b6">
-<!ENTITY pkg-config-lite-home "http://sourceforge.net/projects/pkgconfiglite">
-
-<!ENTITY powerpcutils-version "1.1.3">
-<!ENTITY powerpcutils-size "28 KB">
-<!ENTITY powerpcutils-url "http://ftp.debian.org/debian/pool/main/p/powerpc-utils/powerpc-utils_&powerpcutils-version;.orig.tar.gz">
-<!ENTITY powerpcutils-md5 "d879b109bb8f0d726304b60b147bff13">
-<!ENTITY powerpcutils-home "http://packages.qa.debian.org/p/powerpc-utils.html">
-
-<!ENTITY procps-ng-version "3.3.12">
-<!ENTITY procps-ng-size "845 KB">
-<!ENTITY procps-ng-url "http://sourceforge.net/projects/procps-ng/files/Production/procps-ng-&procps-ng-version;.tar.xz">
-<!ENTITY procps-ng-md5 "957e42e8b193490b2111252e4a2b443c">
-<!ENTITY procps-ng-home "http://sourceforge.net/projects/procps-ng">
-
-<!ENTITY psmisc-version "22.21">
-<!ENTITY psmisc-size "458 KB">
-<!ENTITY psmisc-url "&sourceforge;psmisc/psmisc-&psmisc-version;.tar.gz">
-<!ENTITY psmisc-md5 "935c0fd6eb208288262b385fa656f1bf">
-<!ENTITY psmisc-home "http://psmisc.sourceforge.net">
-
-<!ENTITY readline-version "7.0">
-<!ENTITY readline-size "2,910 KB">
-<!ENTITY readline-url "&gnu;readline/readline-&readline-version;.tar.gz">
-<!ENTITY readline-md5 "205b03a87fc83dab653b628c59b9fc91">
-<!ENTITY readline-home "http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html">
-
-<!ENTITY sed-version "4.4">
-<!ENTITY sed-size "1,182 KB">
-<!ENTITY sed-url "&gnu;sed/sed-&sed-version;.tar.xz">
-<!ENTITY sed-md5 "e0c583d4c380059abd818cd540fe6938">
-<!ENTITY sed-home "&gnu-software;sed">
-
-<!ENTITY shadow-version "4.5">
-<!ENTITY shadow-size "1,627 KB">
-<!ENTITY shadow-url "https://github.com/shadow-maint/shadow/releases/download/&shadow-version;/shadow-&shadow-version;.tar.xz">
-<!ENTITY shadow-md5 "c350da50c2120de6bb29177699d89fe3">
-<!ENTITY shadow-home "http://pkg-shadow.alioth.debian.org">
-
-<!ENTITY silo-version "1.4.14">
-<!ENTITY silo-size "148 KB">
-<!ENTITY silo-url "&packages-root;silo-&silo-version;.tar.bz2">
-<!ENTITY silo-md5 "168182dfa0025914ceecac9591a6674c">
-<!ENTITY silo-home "">
-
-<!ENTITY sysvinit-version "2.88dsf">
-<!ENTITY sysvinit-size "104 KB">
-<!ENTITY sysvinit-url "&savannah;/releases/sysvinit/sysvinit-&sysvinit-version;.tar.bz2">
-<!ENTITY sysvinit-md5 "6eda8a97b86e0a6f59dabbf25202aa6f">
-<!ENTITY sysvinit-home "http://savannah.nongnu.org/projects/sysvinit">
-
-<!ENTITY systemd-version "233">
-<!ENTITY systemd-size "4,106 KB">
-<!ENTITY systemd-url "http://www.linuxfromscratch.org/~krejzi/systemd/systemd-&systemd-version;.tar.xz">
-<!ENTITY systemd-md5 "e67d7664714ff5efe5b59cddedbe26a4">
-<!ENTITY systemd-home "http://freedesktop.org/wiki/Software/systemd">
-
-<!ENTITY tar-version "1.29">
-<!ENTITY tar-size "1,996 KB">
-<!ENTITY tar-url "&gnu;tar/tar-&tar-version;.tar.xz">
-<!ENTITY tar-md5 "a1802fec550baaeecff6c381629653ef">
-<!ENTITY tar-home "&gnu-software;tar">
-
-<!ENTITY tcl-version2 "8.6">
-<!ENTITY tcl-version "&tcl-version2;.4">
-<!ENTITY tcl-size "8,857 KB">
-<!ENTITY tcl-url "&sourceforge;tcl/tcl-core&tcl-version;-src.tar.gz">
-<!ENTITY tcl-md5 "8b8c9d85469d8dbe32e51117b8ef11e3">
-<!ENTITY tcl-home "http://www.tcl.tk">
-
-<!ENTITY tzdata-version "2017b">
-<!ENTITY tzdata-size "324 KB">
-<!ENTITY tzdata-url "http://www.iana.org/time-zones/repository/releases/tzdata&tzdata-version;.tar.gz">
-<!ENTITY tzdata-md5 "50dc0dc50c68644c1f70804f2e7a1625">
-<!ENTITY tzdata-home "http://www.iana.org/time-zones">
-
-<!ENTITY texinfo-version "6.3">
-<!ENTITY texinfo-size "4,468 KB">
-<!ENTITY texinfo-url "&gnu;texinfo/texinfo-&texinfo-version;.tar.xz">
-<!ENTITY texinfo-md5 "32baefe5c7080dfb512a4eac5ce67b2a">
-<!ENTITY texinfo-home "&gnu-software;texinfo">
-
-<!ENTITY uname_hack-version "20080713">
-<!ENTITY uname_hack-size "4 KB">
-<!ENTITY uname_hack-url "&extras-root;uname_hack-&uname_hack-version;.tar.bz2">
-<!ENTITY uname_hack-md5 "dd7694f28ccc6e6bfb326b1790adb5e9">
-<!ENTITY uname_hack-home " ">
-
-<!ENTITY util-linux-major-version "2.29">
-<!ENTITY util-linux-version "&util-linux-major-version;.2">
-<!ENTITY util-linux-size "4,278 KB">
-<!ENTITY util-linux-url "&kernel;linux/utils/util-linux/v&util-linux-major-version;/util-linux-&util-linux-version;.tar.xz">
-<!ENTITY util-linux-md5 "63c40c2068fcbb7e1d5c1d281115d973">
-<!ENTITY util-linux-blkid-id "1.1.0">
-<!ENTITY util-linux-uuid-id "1.3.0">
-
-<!ENTITY vim-version "8.0">
-<!ENTITY vim-version2 "0597">
-<!ENTITY vim-size "10,867 KB">
-<!ENTITY vim-url "ftp://ftp.vim.org/pub/vim/unix/vim-&vim-version;.tar.bz2">
-<!ENTITY vim-md5 "b35e794140c196ff59b492b56c1e73db">
-<!ENTITY vim-home "http://www.vim.org">
-
-<!ENTITY xml-parser-version "2.44">
-<!ENTITY xml-parser-size "237 KB">
-<!ENTITY xml-parser-url "http://search.cpan.org/CPAN/authors/id/T/TO/TODDR/XML-Parser-&xml-parser-version;.tar.gz">
-<!ENTITY xml-parser-md5 "af4813fe3952362451201ced6fbce379">
-<!ENTITY xml-parser-home "https://github.com/chorny/XML-Parser">
-
-<!ENTITY xz-version "5.2.3">
-<!ENTITY xz-size "1,032 KB">
-<!ENTITY xz-url "http://tukaani.org/xz/xz-&xz-version;.tar.xz">
-<!ENTITY xz-md5 "60fb79cab777e3f71ca43d298adacbd5">
-<!ENTITY xz-home "http://tukaani.org/xz/">
-
-<!ENTITY yaboot-version "1.3.17">
-<!ENTITY yaboot-size "220 KB">
-<!ENTITY yaboot-url "http://yaboot.ozlabs.org/releases/yaboot-&yaboot-version;.tar.gz">
-<!ENTITY yaboot-md5 "f599f52d1887a86fd798252d2946f635">
-<!ENTITY yaboot-home "http://yaboot.ozlabs.org">
-
-<!ENTITY zlib-version "1.2.11">
-<!ENTITY zlib-size "468 KB">
-<!ENTITY zlib-url "http://zlib.net/zlib-&zlib-version;.tar.xz">
-<!ENTITY zlib-md5 "85adef240c5f370b308da8c938951a68">
-<!ENTITY zlib-home "http://www.zlib.net">
Index: OK/partitioning/common/aboutclfs.xml
===================================================================
--- BOOK/partitioning/common/aboutclfs.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,45 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-final-preps-aboutclfs">
-  <?dbhtml filename="aboutclfs.html"?>
-
-  <title>Setting The ${CLFS} Variable</title>
-
-  <para>Throughout this book, the environment variable <envar>CLFS</envar> will
-  be used several times. You should ensure that this variable is always defined
-  throughout the CLFS build process. It should be set to the name of the
-  directory where you will be building your CLFS system - we will use
-  <filename class="directory">/mnt/clfs</filename> as an example, but the
-  directory choice is up to you. If you are building CLFS on a separate
-  partition, this directory will be the mount point for the partition.
-  Choose a directory location and set the variable with the
-  following command:</para>
-
-<screen><userinput>export CLFS=<replaceable>/mnt/clfs</replaceable></userinput></screen>
-
-  <para>Having this variable set is beneficial in that commands such as
-  <command>install -dv ${CLFS}/tools</command> can be typed literally. The shell
-  will automatically replace <quote>${CLFS}</quote> with
-  <quote>/mnt/clfs</quote> (or whatever the variable was set to) when it
-  processes the command line.</para>
-
-  <para>Do not forget to check that <envar>${CLFS}</envar> is set whenever
-  you leave and reenter the current working environment (such as when doing a
-  <command>su</command> to <systemitem class="username">root</systemitem> or
-  another user). Check that the <envar>CLFS</envar> variable is set up
-  properly with:</para>
-
-<screen><userinput>echo ${CLFS}</userinput></screen>
-
-  <para>Make sure the output shows the path to your CLFS system's build
-  location, which is <filename class="directory">/mnt/clfs</filename> if the
-  provided example was followed. If the output is incorrect, use the command
-  given earlier on this  page to set <envar>${CLFS}</envar> to the correct
-  directory name.</para>
-
-</sect1>
Index: OK/partitioning/common/creatingfilesystem.xml
===================================================================
--- BOOK/partitioning/common/creatingfilesystem.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,72 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-partitioning-creatingfilesystem">
-  <?dbhtml filename="creatingfilesystem.html"?>
-
-  <title>Creating a File System on the Partition</title>
-
-  <para os="a">Now that a blank partition has been set up, the file system can be
-  created. The most widely-used system in the Linux world is the second
-  extended file system (ext2), but with newer high-capacity hard disks,
-  journaling file systems are becoming increasingly popular. We will create
-  an <systemitem class="filesystem">ext2</systemitem> file system.
-  Instructions for other file systems can be found at
-  <ulink url="&cblfs-root;index.php?section=6#File_System"/>.</para>
-
-  <para os="b">To create an <systemitem class="filesystem">ext2</systemitem> file
-  system on the CLFS partition, run the following as
-  <systemitem class="username">root</systemitem>:</para>
-
-<screen os="c"><userinput>mke2fs /dev/<replaceable>[xxx]</replaceable></userinput></screen>
-
-  <para os="d">Replace <replaceable>[xxx]</replaceable> with the name of the CLFS
-  partition (<filename class="devicefile">sda5</filename> in our previous
-  example).</para>
-
-  <note os="e">
-    <para>Some host distributions use custom features in their filesystem
-    creation tools (E2fsprogs). This can cause problems when booting into
-    your new CLFS system, as those features will not be supported by the
-    CLFS-installed E2fsprogs; you will get an error similar to
-    <computeroutput>unsupported filesystem features, upgrade your
-    e2fsprogs</computeroutput>. To check if your host system uses custom
-    enhancements, run the following command:</para>
-
-<screen os="f"><userinput>debugfs -R feature /dev/<replaceable>[xxx]</replaceable></userinput></screen>
-
-    <para>If the output contains features other than: dir_index; ext_attr; filetype;
-    large_file; resize_inode or sparse_super then your host system may have custom
-    enhancements. In that case, to avoid later problems, you should compile the
-    stock E2fsprogs package and use the resulting binaries to re-create the
-    filesystem on your CLFS partition. To do this, run the following commands
-    as <systemitem class="username">root</systemitem>:</para>
-
-<screen os="g"><userinput>cd /tmp
-tar xjf /path/to/sources/e2fsprogs-&e2fsprogs-version;.tar.bz2
-cd e2fsprogs-&e2fsprogs-version;
-mkdir build
-cd build
-../configure
-make #note that we intentionally don't 'make install' here!
-./misc/mke2fs /dev/<replaceable>[xxx]</replaceable>
-cd /tmp
-rm -rf e2fsprogs-&e2fsprogs-version;</userinput></screen>
-
-  </note>
-
-  <para os="h">If you created a swap partition, you will need to initialize it
-  for use by issuing the command below as
-  <systemitem class="username">root</systemitem>:</para>
-
-<screen os="i"><userinput>mkswap /dev/<replaceable>[yyy]</replaceable></userinput></screen>
-
-  <para os="j">Replace <replaceable>[yyy]</replaceable> with the name of the
-  swap partition. If you are using an existing swap partition, there is no
-  need to format it.</para>
-
-</sect1>
Index: OK/partitioning/common/creatingpartition.xml
===================================================================
--- BOOK/partitioning/common/creatingpartition.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,59 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-partitioning-creatingpartition">
-  <?dbhtml filename="creatingpartition.html"?>
-
-  <title>Creating a New Partition</title>
-
-  <para os="a">Like most other operating systems, CLFS is usually installed
-  on a dedicated partition. The recommended approach to building a CLFS
-  system is to use an available empty partition or, if you have enough
-  unpartitioned space, to create one. However, if you're building for a
-  different architecture you can simply build everything in
-  <quote>/mnt/clfs</quote> (or whatever directory you want to use) and
-  transfer it to your target machine. If you do not plan to use a separate
-  partition for building CLFS, you can skip the rest of this chapter and
-  continue on to <xref linkend="chapter-getting-materials"/>.</para>
-
-  <para os="b">A minimal system requires around 6 gigabytes (GB).
-  This is enough to store all the source tarballs and compile the packages. The CLFS
-  system itself will not take up this  much room. A large portion of this requirement
-  is to provide sufficient free temporary storage. Compiling packages can require a
-  lot of disk space which will be reclaimed after the package is installed. If the
-  CLFS system is intended to be the primary Linux system,  additional software will
-  probably be installed which will require additional space (2-10 GB). </para>
-
-  <para os="c">Because there is not always enough Random Access Memory (RAM)
-  available for compilation processes, it is a good idea to use a small disk
-  partition as swap space. This is used by the kernel to store seldom-used
-  data and leave more memory available for active processes. The swap
-  partition for a CLFS system can be the same as the one used by the host
-  system, in which case it is not necessary to create another one.</para>
-
-  <para os="d">As the <systemitem class="username">root</systemitem> user,
-  start a disk partitioning program such as <command>cfdisk</command>
-  or <command>fdisk</command> with a command line option naming the hard
-  disk on which the new partition will be created&mdash;for example
-  <filename class="devicefile">/dev/sda</filename> for the primary
-  Integrated Drive Electronics (IDE) or Serial ATA (SATA) disk. Create a Linux
-  native partition and a swap partition, if needed. Please refer to
-  <filename>cfdisk(8)</filename> or <filename>fdisk(8)</filename> if you
-  do not yet know how to use the programs.</para>
-
-  <para os="e">Remember the designation of the new partition (e.g.,
-  <filename class="devicefile">sda5</filename>). This book will refer to
-  this as the CLFS partition. Also, remember the designation of the swap
-  partition. These names will be needed later for the
-  <filename>/etc/fstab</filename> file.</para>
-
-  <note><para>SYSTEMD does not support a configuration with a separate
-  <filename class="directory">/usr</filename> filesystem. An initramfs which
-  mounts a separate <filename class="directory">/usr</filename> is required.
-  </para></note>
-
-</sect1>
Index: OK/partitioning/common/introduction.xml
===================================================================
--- BOOK/partitioning/common/introduction.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,17 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-partitioning-introduction">
-  <?dbhtml filename="introduction.html"?>
-
-  <title>Introduction</title>
-
-  <para>In this chapter, the partition which will host the CLFS system is
-  prepared. We will create the partition itself, create a file system
-  on it, and mount it.</para>
-
-</sect1>
Index: OK/partitioning/common/mounting.xml
===================================================================
--- BOOK/partitioning/common/mounting.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,58 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-partitioning-mounting">
-  <?dbhtml filename="mounting.html"?>
-
-  <title>Mounting the New Partition</title>
-
-  <para>Now that a file system has been created, the partition needs to
-  be made accessible. In order to do this, the partition needs to be
-  mounted at a chosen mount point.</para>
-
-  <para>As the <systemitem class="username">root</systemitem> user, ensure the
-  <envar>CLFS</envar> variable is set, if you haven't already:</para>
-
-<screen><userinput>export CLFS=<replaceable>/mnt/clfs</replaceable></userinput></screen>
-
-  <para>Next, create the mount point and mount the CLFS file system by
-  running the following commands as
-  <systemitem class="username">root</systemitem>:</para>
-
-<screen><userinput>mkdir -pv ${CLFS}
-mount -v /dev/<replaceable>[xxx]</replaceable> ${CLFS}</userinput></screen>
-
-  <para>Replace <replaceable>[xxx]</replaceable> with the designation of
-  the CLFS partition.</para>
-
-  <para>If using multiple partitions for CLFS (e.g., one for <filename
-  class="directory">/</filename> and another for <filename
-  class="directory">/usr</filename>), mount them as
-  <systemitem class="username">root</systemitem> using:</para>
-
-<screen><userinput>mkdir -pv ${CLFS}
-mount -v /dev/<replaceable>[xxx]</replaceable> ${CLFS}
-mkdir -v ${CLFS}/usr
-mount -v /dev/<replaceable>[yyy]</replaceable> ${CLFS}/usr</userinput></screen>
-
-  <para>Replace <replaceable>[xxx]</replaceable> and
-  <replaceable>[yyy]</replaceable> with the appropriate partition
-  names.</para>
-
-  <para>Ensure that this new partition is not mounted with permissions
-  that are too restrictive (such as the <option>nosuid</option>,
-  <option>nodev</option>, or <option>noatime</option> options).
-  Run <command>mount | grep ${CLFS}</command> to see
-  what options are set for the mounted CLFS partition. If
-  <option>nosuid</option>, <option>nodev</option>, and/or
-  <option>noatime</option> are set, the partition will need to be
-  remounted.</para>
-
-  <para>Now that there is an established place to work, it is time to
-  download the packages.</para>
-
-</sect1>
Index: OK/partitioning/mips-chapter.xml
===================================================================
--- BOOK/partitioning/mips-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-partitioning" xreflabel="Preparing a New Partition">
-  <?dbhtml dir="partitioning"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Preparing a New Partition</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/aboutclfs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/creatingpartition.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/creatingfilesystem.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mounting.xml"/>
-
-</chapter>
Index: OK/partitioning/mips/creatingfilesystem.xml
===================================================================
--- BOOK/partitioning/mips/creatingfilesystem.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,53 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-partitioning-creatingfilesystem">
-  <?dbhtml filename="creatingfilesystem.html"?>
-
-  <title>Creating a File System on the Partition</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/creatingfilesystem.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/creatingfilesystem.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/creatingfilesystem.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/creatingfilesystem.xml"
-  xpointer="xpointer(//*[@os='d'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/creatingfilesystem.xml"
-  xpointer="xpointer(//*[@os='e'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/creatingfilesystem.xml"
-  xpointer="xpointer(//*[@os='h'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/creatingfilesystem.xml"
-  xpointer="xpointer(//*[@os='i'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/creatingfilesystem.xml"
-  xpointer="xpointer(//*[@os='j'])"/>
-
-  <para>The commands listed below are specific to the Cobalt MIPS systems,
-  they have a special requirement to have a ext2 Revision 0 for the boot
-  partition. To make sure you satify this requirement, use the commands listed:</para>
-
-<screen><userinput>mke2fs -r 0 /dev/hda1
-mke2fs /dev/hda2
-mkswap /dev/hda3</userinput></screen>
-
-</sect1>
Index: OK/partitioning/mips/creatingpartition.xml
===================================================================
--- BOOK/partitioning/mips/creatingpartition.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,52 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-partitioning-creatingpartition">
-  <?dbhtml filename="creatingpartition.html"?>
-
-  <title>Creating a New Partition</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/creatingpartition.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/creatingpartition.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/creatingpartition.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/creatingpartition.xml"
-  xpointer="xpointer(//*[@os='d'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/creatingpartition.xml"
-  xpointer="xpointer(//*[@os='e'])"/>
-
-  <para>On a Cobalt RaQ2/Cube2 we use the existing firmware for a boot
-  loader&mdash;it requires an <systemitem class="filesystem">ext2</systemitem>
-  revision 0 partition to boot from. Here is the recommended partition layout
-  for a Cobalt RaQ2/Cube2 system:</para>
-
-  <itemizedlist>
-    <listitem>
-      <para>The first partition should be 50-100 MB.</para>
-    </listitem>
-    <listitem>
-      <para>The second partition should be all the remaining space minus the
-      amount of RAM in the system.</para>
-    </listitem>
-    <listitem>
-      <para>The third partition is going to be your swap partition, which will
-      be the same size as the amount as the RAM installed in the system.</para>
-    </listitem>
-  </itemizedlist>
-
-</sect1>
Index: OK/partitioning/ppc-chapter.xml
===================================================================
--- BOOK/partitioning/ppc-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-partitioning" xreflabel="Preparing a New Partition">
-  <?dbhtml dir="partitioning"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Preparing a New Partition</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/aboutclfs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/creatingpartition.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingfilesystem.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mounting.xml"/>
-
-</chapter>
Index: OK/partitioning/ppc/creatingpartition.xml
===================================================================
--- BOOK/partitioning/ppc/creatingpartition.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,48 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-partitioning-creatingpartition">
-  <?dbhtml filename="creatingpartition.html"?>
-
-  <title>Creating a New Partition</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/creatingpartition.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/creatingpartition.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/creatingpartition.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-  <para os="c1">Open Firmware and the Mac OS's impose certain requirements on
-  partitioning.  This is discussed in <xref linkend="appendixe" role="."/>.
-  In particular, you cannot use <command>fdisk</command>, you will need an
-  <literal>apple_bootstrap</literal> partition, and that should precede any
-  OSX partition.</para>
-
-  <para os="d">Start a disk partitioning program such as <command>parted</command>
-  with a command line option naming the hard
-  disk on which the new partition will be created&mdash;for example
-  <filename class="devicefile">/dev/hda</filename> for the primary
-  Integrated Drive Electronics (IDE) disk. Create at least an apple bootstrap
-  partition, a Linux native partition, and a swap partition, if needed. Please
-  refer to <filename>parted(8)</filename> if you do not yet know how to use the
-  programs.</para>
-
-  <para os="e">Remember the designation of the new partition (e.g.,
-  <filename class="devicefile">hda5</filename>). This book will refer to
-  this as the CLFS partition. Also remember the designation of the swap
-  partition. These names will be needed later for the
-  <filename>/etc/fstab</filename> file. You will also need to know the
-  designation of the apple_bootstrap partition for the <filename>yaboot.conf
-  </filename> when you set this up before you run <command>ybin</command>.</para>
-
-</sect1>
Index: OK/partitioning/ppc64-64-chapter.xml
===================================================================
--- BOOK/partitioning/ppc64-64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-partitioning" xreflabel="Preparing a New Partition">
-  <?dbhtml dir="partitioning"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Preparing a New Partition</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/aboutclfs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingpartition.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingfilesystem.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mounting.xml"/>
-
-</chapter>
Index: OK/partitioning/ppc64-chapter.xml
===================================================================
--- BOOK/partitioning/ppc64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-partitioning" xreflabel="Preparing a New Partition">
-  <?dbhtml dir="partitioning"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Preparing a New Partition</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/aboutclfs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingpartition.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingfilesystem.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mounting.xml"/>
-
-</chapter>
Index: OK/partitioning/sparc-chapter.xml
===================================================================
--- BOOK/partitioning/sparc-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-partitioning" xreflabel="Preparing a New Partition">
-  <?dbhtml dir="partitioning"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Preparing a New Partition</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/aboutclfs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/creatingpartition.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingfilesystem.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mounting.xml"/>
-
-</chapter>
Index: OK/partitioning/sparc/creatingpartition.xml
===================================================================
--- BOOK/partitioning/sparc/creatingpartition.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,43 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-partitioning-creatingpartition">
-  <?dbhtml filename="creatingpartition.html"?>
-
-  <title>Creating a New Partition</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/creatingpartition.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/creatingpartition.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/creatingpartition.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/creatingpartition.xml"
-  xpointer="xpointer(//*[@os='d'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/creatingpartition.xml"
-  xpointer="xpointer(//*[@os='e'])"/>
-
-  <para>On a Sparc system we have to create a special partition first. This
-  partition is called <quote>Whole disk</quote>, and must be the 3rd partition
-  on the disk. The other partitions are virtual slices of this
-  <quote>Whole disk</quote> partition. </para>
-
-  <para>There are some limitations on the first partition of
-  <filename class="devicefile">hda</filename> or <filename
-  class="devicefile">sda</filename> on the system. This partition must be less
-  than 2 gigabytes, and it must be root.</para>
-
-</sect1>
Index: OK/partitioning/sparc64-chapter.xml
===================================================================
--- BOOK/partitioning/sparc64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-partitioning" xreflabel="Preparing a New Partition">
-  <?dbhtml dir="partitioning"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Preparing a New Partition</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/aboutclfs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/creatingpartition.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingfilesystem.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mounting.xml"/>
-
-</chapter>
Index: OK/partitioning/x86-chapter.xml
===================================================================
--- BOOK/partitioning/x86-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-partitioning" xreflabel="Preparing a New Partition">
-  <?dbhtml dir="partitioning"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Preparing a New Partition</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/aboutclfs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingpartition.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingfilesystem.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mounting.xml"/>
-
-</chapter>
Index: OK/patches.ent
===================================================================
--- BOOK/patches.ent	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,148 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!ENTITY patches-root "http://patches.clfs.org/dev/">
-
-<!-- Start of Common Patches -->
-
-<!ENTITY automake-perl-patch "automake-&automake-version;-perl_5_26-1.patch">
-<!ENTITY automake-perl-patch-md5 "99dd9d0a31f4a51fbe77bbc13aa9d783">
-<!ENTITY automake-perl-patch-size "0.685 KB">
-
-<!ENTITY bash-branch_update-patch "bash-&bash-version;-branch_update-1.patch">
-<!ENTITY bash-branch_update-patch-md5 "9f59bec94bfd1023d9c6a76b49187420">
-<!ENTITY bash-branch_update-patch-size "17 KB">
-
-<!-- Binutils branch update area
-<!ENTITY binutils-branch_update-patch "binutils-&binutils-version;-branch_update-1.patch">
-<!ENTITY binutils-branch_update-patch-md5 "4fcdd8ef88fe07db8616e91a14bc5ac8">
-<!ENTITY binutils-branch_update-patch-size "5,268 KB">
--->
-
-<!ENTITY coreutils-uname-patch "coreutils-&coreutils-version;-uname-1.patch">
-<!ENTITY coreutils-uname-patch-md5 "e9bc0459d313f677cebc2095c3b18818">
-<!ENTITY coreutils-uname-patch-size "5.020 KB">
-
-<!ENTITY gcc-specs-patch "gcc-&gcc-version;-specs-1.patch">
-<!ENTITY gcc-specs-patch-md5 "9f4efe1ae2cb46e6ad41b2ba2a24e5d8">
-<!ENTITY gcc-specs-patch-size "21 KB">
-
-<!--GCC Branch Update Area
-<!ENTITY gcc-branch_update-patch "gcc-&gcc-version;-branch_update-1.patch">
-<!ENTITY gcc-branch_update-patch-md5 "0ce406be87a6504a7539ab45f7abf781">
-<!ENTITY gcc-branch_update-patch-size "1,251 KB">
--->
-
-<!ENTITY iana-etc-numbers_update-date "20140202">
-<!ENTITY iana-etc-numbers_update-patch "iana-etc-&iana-etc-version;-numbers_update-&iana-etc-numbers_update-date;-2.patch.xz">
-<!ENTITY iana-etc-numbers_update-patch-md5 "b0e7051fef0b3ba064209a5f3d23bd2a">
-<!ENTITY iana-etc-numbers_update-patch-size "282 KB">
-
-<!ENTITY intltool-perl-patch "intltool-&intltool-version;-perl-5.22-compatibility.patch">
-<!ENTITY intltool-perl-patch-size "2.390 KB">
-<!ENTITY intltool-perl-patch-md5 "476b85e0c100eb2c8fbd74825cb4761e">
-
-<!ENTITY iputils-build-patch "iputils-&iputils-version;-build-1.patch">
-<!ENTITY iputils-build-patch-md5 "113c166a13d33a3ec10e1ec65542bdc3">
-<!ENTITY iputils-build-patch-size "47 KB">
-
-<!ENTITY linux-sublevel-patch "patch-&linux-version2;.xz">
-<!ENTITY linux-sublevel-patch-md5 "59351116e4dfdb9072dd8cccd15e1800">
-<!ENTITY linux-sublevel-patch-size "465 KB">
-
-<!ENTITY mpfr-fixes-patch "mpfr-&mpfr-version;-fixes-1.patch">
-<!ENTITY mpfr-fixes-patch-md5 "c9e1bfc93ee8d90226772b628ab77f38">
-<!ENTITY mpfr-fixes-patch-size "5.101 KB">
-
-<!ENTITY ncurses-bashfix-patch "ncurses-&ncurses-version;-bash_fix-1.patch">
-<!ENTITY ncurses-bashfix-patch-md5 "e3b6d45ce0f0b87e0df98e5bc0d09415">
-<!ENTITY ncurses-bashfix-patch-size ".743 KB">
-
-<!--Ncurses Branch Update Area
-<!ENTITY ncurses-branch_update-patch "ncurses-&ncurses-version;-branch_update-4.patch">
-<!ENTITY ncurses-branch_update-patch-md5 "c2b2dc2d31b02c218359e6218f12a72c">
-<!ENTITY ncurses-branch_update-patch-size "2,492 KB">
--->
-
-<!ENTITY readline-branch_update-patch "readline-&readline-version;-branch_update-1.patch">
-<!ENTITY readline-branch_update-patch-md5 "8b429202ce52362ae927f36a48461c23">
-<!ENTITY readline-branch_update-patch-size "3.049 KB">
-
-<!ENTITY sysvinit-tools_updates-patch "sysvinit-&sysvinit-version;-tools_updates-1.patch">
-<!ENTITY sysvinit-tools_updates-patch-md5 "c3f6981c46868b68bfd58921570ea51f">
-<!ENTITY sysvinit-tools_updates-patch-size "2.339 KB">
-
-<!-- Vim branch update patch area -->
-
-<!ENTITY vim-branch_update-patch "vim-&vim-version;-branch_update-1.patch">
-<!ENTITY vim-branch_update-patch-md5 "5a076d526aee80e1d32decf46b5287f9">
-<!ENTITY vim-branch_update-patch-size "961 KB">
-
-<!-- Start of multilib patches -->
-
-<!ENTITY perl-multilib-patch "perl-&perl-version;-Configure_multilib-1.patch">
-<!ENTITY perl-multilib-patch-md5 "87bbdf3d6414916f9e89531a2d4bfefa">
-<!ENTITY perl-multilib-patch-size "2.030 KB">
-
-<!-- Start of Pure64 patches -->
-
-<!ENTITY gcc-pure64-patch "gcc-&gcc-version;-pure64-1.patch">
-<!ENTITY gcc-pure64-patch-md5 "5dd40881cfdc18efecb70a8e024b5fc0">
-<!ENTITY gcc-pure64-patch-size "9.124 KB">
-
-<!ENTITY gcc-specs_pure64-patch "gcc-&gcc-version;-pure64_specs-1.patch">
-<!ENTITY gcc-specs_pure64-patch-md5 "4450a0fa28ec9454df8c229d4c194720">
-<!ENTITY gcc-specs_pure64-patch-size "20 KB">
-
-<!-- Start of mips/mips64 patches -->
-
-<!ENTITY colo-make-patch "colo-&colo-version;-make_fix-1.patch">
-<!ENTITY colo-make-patch-md5 "b89575a0e385b5366b19a6b5f176d49b">
-<!ENTITY colo-make-patch-size "2.8 KB">
-
-<!ENTITY colo-relocation-patch "colo-&colo-version;-relocation_fix-1.patch">
-<!ENTITY colo-relocation-patch-md5 "e0607ee1071f2f805ffa1ef1c5b1a766">
-<!ENTITY colo-relocation-patch-size ".749 KB">
-
-<!ENTITY dvhtool-fixes-patch "dvhtool-&dvhtool-version;-fixes-1.patch">
-<!ENTITY dvhtool-fixes-patch-md5 "a521b380354b6a0c96b2d6308372749d">
-<!ENTITY dvhtool-fixes-patch-size "6.3 KB">
-
-<!-- Start of ppc/ppc64 patches -->
-
-<!ENTITY gcc-nof-patch "gcc-&gcc-version;-powerpc64_multilib-1.patch">
-<!ENTITY gcc-nof-patch-md5 "cb19503a9c3e4d155dec55a8a74292ee">
-<!ENTITY gcc-nof-patch-size "1 KB">
-
-<!ENTITY gcc-ppc_fixes-patch "gcc-&gcc-version;-ppc_fixes-1.patch">
-<!ENTITY gcc-ppc_fixes-patch-md5 "dbe990d4886c85fa250c8141488cb263">
-<!ENTITY gcc-ppc_fixes-patch-size "2 KB">
-
-<!ENTITY hfsutils-fixes-patch "hfsutils-&hfsutils-version;-fixes-1.patch">
-<!ENTITY hfsutils-fixes-patch-md5 "8519f11aada2f393609d529621a9f1b1">
-<!ENTITY hfsutils-fixes-patch-size "1.1 KB">
-
-<!ENTITY powerpcutils-patch "powerpc-utils_&powerpcutils-version;-fixes-2.patch">
-<!ENTITY powerpcutils-patch-md5 "d2776b1a4977c5711037b8f1402f792a">
-<!ENTITY powerpcutils-patch-size "22 KB">
-
-<!ENTITY yaboot-ofpath_path-patch "yaboot-&yaboot-version;-ofpath_path_prefix-1.patch">
-<!ENTITY yaboot-ofpath_path-patch-md5 "3faf70e0cb4e4f62a1e8815c3452ab38">
-<!ENTITY yaboot-ofpath_path-patch-size ".830 KB">
-
-<!ENTITY yaboot-parted-patch "yaboot-&yaboot-version;-parted-1.patch">
-<!ENTITY yaboot-parted-patch-md5 "af05081b2056f0070b8b057acc32fea5">
-<!ENTITY yaboot-parted-patch-size "1.245 KB">
-
-<!ENTITY yaboot-stubfuncs-patch "yaboot-&yaboot-version;-stubfuncs-1.patch">
-<!ENTITY yaboot-stubfuncs-patch-md5 "b5cc91f9904383c24848040bfe6f11ae">
-<!ENTITY yaboot-stubfuncs-patch-size "4.2 KB">
-
-<!-- Start of sparc/sparc64 patches -->
-
-<!ENTITY elftoaout-fixes-patch "elftoaout-&elftoaout-version;-64bit_fixes-1.patch">
-<!ENTITY elftoaout-fixes-patch-md5 "485e77cf2ed082d3d0ea99c703f1f14b">
-<!ENTITY elftoaout-fixes-patch-size "6.7 KB">
-
-<!ENTITY silo-fixes-patch "silo-&silo-version;-fixes-3.patch">
-<!ENTITY silo-fixes-patch-md5 "a7619f75c9cf888104b434c21d31117a">
-<!ENTITY silo-fixes-patch-size "32 KB">
Index: OK/ppc-index.xml
===================================================================
--- BOOK/ppc-index.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,86 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "general.ent">
-  %general-entities;
-]>
-
-<book>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/ppc/bookinfo.xml"/>
-  <!--
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/dedication.xml"/>
-  -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/preface.xml"/>
-
-  <part id="part1">
-    <?dbhtml filename="part1.html"?>
-
-    <title>Introduction</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="introduction/ppc-chapter.xml"/>
-
-  </part>
-
-  <part id="part2">
-    <?dbhtml filename="part2.html"?>
-
-    <title>Preparing for the Build</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="partitioning/ppc-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="materials/ppc-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/ppc-chapter.xml"/>
-
-  </part>
-
-  <part id="part3">
-    <?dbhtml filename="part3.html"?>
-
-    <title>Make the Cross-Compile Tools</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cross-tools/ppc-chapter.xml"/>
-
-  </part>
-
-  <part id="part4">
-    <?dbhtml filename="part4.html"?>
-
-    <title>Building the Basic Tools</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="temp-system/ppc-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="boot/ppc-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="chroot/ppc-chapter.xml"/>
-
-  </part>
-
-  <part id="part5">
-    <?dbhtml filename="part5.html"?>
-
-    <title>Building the CLFS System</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="testsuite-tools/ppc-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-system/ppc-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="system-config/ppc-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="network/ppc-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bootable/ppc-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="the-end/chapter.xml"/>
-
-  </part>
-
-  <part id="part6">
-    <?dbhtml filename="part6.html"?>
-
-    <title>Appendices</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/acronymlist.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/dependencies/common.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/dependencies/ppc.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/rationale/common.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/ppc/macmiscellany.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/license.xml"/>
-
-  </part>
-
-  <index/>
-
-</book>
Index: OK/ppc64-64-index.xml
===================================================================
--- BOOK/ppc64-64-index.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,86 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "general.ent">
-  %general-entities;
-]>
-
-<book>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/ppc64-64/bookinfo.xml"/>
-  <!--
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/dedication.xml"/>
-  -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/preface.xml"/>
-
-  <part id="part1">
-    <?dbhtml filename="part1.html"?>
-
-    <title>Introduction</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="introduction/ppc-chapter.xml"/>
-
-  </part>
-
-  <part id="part2">
-    <?dbhtml filename="part2.html"?>
-
-    <title>Preparing for the Build</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="partitioning/ppc-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="materials/ppc64-64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/ppc64-64-chapter.xml"/>
-
-  </part>
-
-  <part id="part3">
-    <?dbhtml filename="part3.html"?>
-
-    <title>Make the Cross-Compile Tools</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cross-tools/ppc64-64-chapter.xml"/>
-
-  </part>
-
-  <part id="part4">
-    <?dbhtml filename="part4.html"?>
-
-    <title>Building the Basic Tools</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="temp-system/ppc64-64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="boot/ppc64-64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="chroot/ppc64-64-chapter.xml"/>
-
-  </part>
-
-  <part id="part5">
-    <?dbhtml filename="part5.html"?>
-
-    <title>Building the CLFS System</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="testsuite-tools/ppc64-64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-system/ppc64-64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="system-config/ppc64-64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="network/ppc64-64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bootable/ppc64-64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="the-end/chapter.xml"/>
-
-  </part>
-
-  <part id="part6">
-    <?dbhtml filename="part6.html"?>
-
-    <title>Appendices</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/acronymlist.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/dependencies/common.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/dependencies/ppc.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/rationale/common.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/ppc/macmiscellany.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/license.xml"/>
-
-  </part>
-
-  <index/>
-
-</book>
Index: OK/ppc64-index.xml
===================================================================
--- BOOK/ppc64-index.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,86 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "general.ent">
-  %general-entities;
-]>
-
-<book>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/ppc64/bookinfo.xml"/>
-  <!--
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/dedication.xml"/>
-  -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/preface.xml"/>
-
-  <part id="part1">
-    <?dbhtml filename="part1.html"?>
-
-    <title>Introduction</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="introduction/ppc64-chapter.xml"/>
-
-  </part>
-
-  <part id="part2">
-    <?dbhtml filename="part2.html"?>
-
-    <title>Preparing for the Build</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="partitioning/ppc64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="materials/ppc64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/ppc64-chapter.xml"/>
-
-  </part>
-
-  <part id="part3">
-    <?dbhtml filename="part3.html"?>
-
-    <title>Make the Cross-Compile Tools</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cross-tools/ppc64-chapter.xml"/>
-
-  </part>
-
-  <part id="part4">
-    <?dbhtml filename="part4.html"?>
-
-    <title>Building the Basic Tools</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="temp-system/ppc64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="boot/ppc64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="chroot/ppc64-chapter.xml"/>
-
-  </part>
-
-  <part id="part5">
-    <?dbhtml filename="part5.html"?>
-
-    <title>Building the CLFS System</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="testsuite-tools/ppc64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-system/ppc64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="system-config/ppc64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="network/ppc64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bootable/ppc64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="the-end/chapter.xml"/>
-
-  </part>
-
-  <part id="part6">
-    <?dbhtml filename="part6.html"?>
-
-    <title>Appendices</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/acronymlist.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/dependencies/common.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/dependencies/ppc.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/rationale/common.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/ppc/macmiscellany.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/license.xml"/>
-
-  </part>
-
-  <index/>
-
-</book>
Index: OK/prologue/common/audience.xml
===================================================================
--- BOOK/prologue/common/audience.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,88 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="pre-audience">
-  <?dbhtml filename="audience.html"?>
-
-  <title>Audience</title>
-
-  <para>There are many reasons why somebody would want to read this book.
-  The principal reason is to install a Linux system from the  source code.
-  A question many people raise is, <quote>why go through all the hassle of
-  manually building a Linux system from scratch when you can just download
-  and install an existing one?</quote> That is a good question and is the
-  impetus for this section of the book.</para>
-
-  <para>One important reason for the existence of CLFS is to help people
-  understand how a Linux system works.  Building an CLFS system helps
-  demonstrate what makes Linux tick, and how things work together and
-  depend on each other. One of the best things this learning experience
-  provides is the ability to customize Linux to your own
-  tastes and needs.</para>
-
-  <para>A key benefit of CLFS is that it allows users to have more control
-  over their system without any reliance on a Linux implementation designed
-  by someone else.  With CLFS, <emphasis>you</emphasis> are in the driver's
-  seat and dictate every aspect of the system, such as the directory layout
-  and bootscript setup. You also dictate where, why, and how programs are
-  installed.</para>
-
-  <para>Another benefit of CLFS is the ability to create a very compact
-  Linux system. When installing a regular distribution, one is often forced
-  to include several programs which are probably never used. These programs
-  waste disk space or CPU cycles.  It is not difficult to build an CLFS
-  system of less than 100 megabytes (MB), which is substantially smaller
-  than the majority of existing installations.  Does this still sound like a
-  lot of space? A few of us have been working on creating a very small
-  embedded CLFS system. We successfully built a system that was specialized
-  to run the Apache web server with approximately 8MB of disk space used.
-  Further stripping could bring this down to 5 MB or less. Try that with a
-  regular distribution! This is only one of the many benefits of designing
-  your own Linux implementation.</para>
-
-  <para>We could compare Linux distributions to a hamburger purchased at
-  a fast-food restaurant&mdash;you have no idea what might be in what you
-  are eating. CLFS, on the other hand, does not give you a hamburger.
-  Rather, CLFS provides the recipe to make the exact hamburger desired.
-  This allows users to review the recipe, omit unwanted ingredients, and
-  add your own ingredients to enhance the flavor of the burger. When you
-  are satisfied with the recipe, move on to preparing it. It can be made
-  to exact specifications&mdash;broil it, bake it, deep-fry it, or
-  barbecue it.</para>
-
-  <para>Another analogy that we can use is that of comparing CLFS with a
-  finished house. CLFS provides the skeletal plan of a house, but it is up
-  to you to build it. CLFS maintains the freedom to adjust plans throughout
-  the process, customizing it to the needs and preferences of the user.</para>
-
-  <para>Security is an additional advantage of a custom built Linux system.
-  By compiling the entire system from source code, you are empowered to
-  audit everything and apply all the security patches desired. It is no
-  longer necessary to wait for somebody else to compile binary packages
-  that fix a security hole. Unless you examine the patch and implement it
-  yourself, you have no guarantee that the new binary package was built
-  correctly and adequately fixes the problem.</para>
-
-  <para>The goal of Cross Linux From Scratch is to build a complete and
-  usable foundation-level system. Readers who do not wish to build their
-  own Linux system from scratch may not benefit from the information in this
-  book. If you only want to know what happens while the computer boots,
-  we recommend the <quote>From Power Up To Bash Prompt</quote> HOWTO
-  located at <ulink url="http://axiom.anu.edu.au/~okeefe/p2b/"/> or on
-  The Linux Documentation Project's (TLDP) website at <ulink
-  url="http://www.tldp.org/HOWTO/From-PowerUp-To-Bash-Prompt-HOWTO.html"/>.
-  The HOWTO builds a system which is similar to that of this book, but it
-  focuses strictly on creating a system capable of booting to a BASH prompt.
-  Consider your objective. If you wish to build a Linux system and learn
-  along the way, this book is your best choice.</para>
-
-  <para>There are too many good reasons to build your own CLFS system to
-  list them all here. This section is only the tip of the iceberg. As
-  you continue in your CLFS experience, you will find the power that
-  information and knowledge truly bring.</para>
-
-</sect1>
Index: OK/prologue/common/dedication.xml
===================================================================
--- BOOK/prologue/common/dedication.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,11 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE dedication PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<dedication>
-  <title>Dedication</title>
-  <para>This book is dedicated</para>
-</dedication>
Index: OK/prologue/common/errata.xml
===================================================================
--- BOOK/prologue/common/errata.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,23 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="pre-errata">
-  <?dbhtml filename="errata.html"?>
-
-  <title>Errata</title>
-
-  <para>The software used to create a CLFS system is constantly being
-  updated and enhanced. Security warnings and bug fixes may become
-  available after the CLFS book has been released. Some host systems may
-  also have problems building CLFS. To check whether the package versions
-  or instructions in this release of CLFS need any modifications to
-  accommodate security vulnerabilities, other bug fixes, or host-specific
-  issues, please visit <ulink url="&errata;"/> before proceeding with your
-  build. You should note any changes shown and apply them to the relevant
-  section of the book as you progress with building the CLFS system.</para>
-
-</sect1>
Index: OK/prologue/common/foreword.xml
===================================================================
--- BOOK/prologue/common/foreword.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,54 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="pre-foreword">
-  <?dbhtml filename="foreword.html"?>
-
-  <title>Foreword</title>
-
-  <para>The Linux From Scratch Project has seen many changes in the
-  few years of its existence.  I personally became involved with the
-  project in 1999, around the time of the 2.x releases.  At that time,
-  the build process was to create static binaries with the host system,
-  then chroot and build the final binaries on top of the static ones.</para>
-
-  <para>Later came the use of the /static directory to hold the initial
-  static builds, keeping them separated from the final system, then
-  the PureLFS process developed by Ryan Oliver and Greg Schafer,
-  introducing a new toolchain build process that divorces even our initial
-  builds from the host.  Finally, LFS 6 brought Linux Kernel 2.6, the
-  udev dynamic device structure, sanitized kernel headers, and other
-  improvements to the Linux From Scratch system.</para>
-
-  <para>The one "flaw" in LFS is that it has always been based on an x86
-  class processor.  With the advent of the Athlon 64 and Intel EM64T
-  processors, the x86-only LFS is no longer ideal. Throughout this time,
-  Ryan Oliver developed and documented a process by which you could
-  build Linux for any system and from any system, by use of
-  cross-compilation techniques.  Thus, the Cross-Compiled LFS (CLFS) was
-  born.</para>
-
-  <para>CLFS follows the same guiding principles the LFS project has
-  always followed, e.g., knowing your system inside and out by virtue
-  of having built the system yourself.  Additionally, during a CLFS
-  build, you will learn advanced techniques such as cross-build toolchains,
-  multilib support (32 &amp; 64-bit libraries side-by-side), alternative
-  architectures such as Sparc, MIPS, and much more.</para>
-
-  <para>We hope you enjoy building your own CLFS system, and the benefits
-  that come from a system tailored to your needs.</para>
-
-<literallayout>--
-Jeremy Utley, CLFS 1.x Release Manager (Page Author)
-Jonathan Norman, Release Manager
-Jim Gifford, CLFS Project Co-leader
-Ryan Oliver, CLFS Project Co-leader
-Joe Ciccone, CLFS Project Co-leader
-Jonathan Norman, Justin Knierim, Chris Staub, Matt Darcy, Ken Moffat,
-Manuel Canales Esparcia, Nathan Coulson and William Harrington - CLFS Developers</literallayout>
-
-</sect1>
Index: OK/prologue/common/hostreqs.xml
===================================================================
--- BOOK/prologue/common/hostreqs.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,148 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="pre-hostreqs">
-  <?dbhtml filename="hostreqs.html"?>
-
-  <title>Host System Requirements</title>
-
-    <para>You should be able to build a CLFS system from just about any
-    Unix-type operating system. Your host system should have the following
-    software with the minimum versions indicated. Also note that many
-    distributions will place software headers into separate packages, often in
-    the form of <quote>[package-name]-devel</quote> or
-    <quote>[package-name]-dev</quote>. Be sure to install those if
-    your distribution provides them.</para>
-
-  <itemizedlist spacing="compact">
-
-    <listitem>
-      <para><emphasis role="strong">Bash-2.05a</emphasis></para>
-    </listitem>
-
-    <listitem>
-      <para><emphasis role="strong">Binutils-2.12</emphasis> (Versions
-      greater than &binutils-version; are not recommended as they have
-      not been tested)</para>
-    </listitem>
-
-    <listitem>
-      <para><emphasis role="strong">Bison-1.875</emphasis></para>
-    </listitem>
-
-    <listitem>
-      <para><emphasis role="strong">Bzip2-1.0.2</emphasis></para>
-    </listitem>
-
-    <listitem>
-      <para><emphasis role="strong">Coreutils-5.0</emphasis></para>
-    </listitem>
-
-    <listitem>
-      <para><emphasis role="strong">Diffutils-2.8</emphasis></para>
-    </listitem>
-
-    <listitem>
-      <para><emphasis role="strong">Findutils-4.1.20</emphasis></para>
-    </listitem>
-
-    <listitem>
-      <para><emphasis role="strong">Gawk-3.1.5</emphasis></para>
-    </listitem>
-
-    <listitem>
-      <para><emphasis role="strong">GCC-4.1.2</emphasis> and the C++ compiler,
-      <command>g++</command> (Versions greater than &gcc-version; are not
-      recommended as they have not been tested)</para>
-    </listitem>
-
-    <listitem>
-      <para><emphasis role="strong">Glibc-2.2.5</emphasis> (Versions
-      greater than &glibc-version; are not recommended as they have
-      not been tested)</para>
-    </listitem>
-
-    <listitem>
-      <para><emphasis role="strong">Grep-2.5</emphasis></para>
-    </listitem>
-
-    <listitem>
-      <para><emphasis role="strong">Gzip-1.2.4</emphasis></para>
-    </listitem>
-
-    <listitem>
-      <para><emphasis role="strong">Make-3.80</emphasis></para>
-    </listitem>
-
-    <listitem>
-      <para><emphasis role="strong">Ncurses-5.3</emphasis></para>
-    </listitem>
-
-    <listitem>
-      <para><emphasis role="strong">Patch-2.5.4</emphasis></para>
-    </listitem>
-
-    <listitem>
-      <para><emphasis role="strong">Sed-3.0.2</emphasis></para>
-    </listitem>
-
-    <listitem>
-      <para><emphasis role="strong">Tar-1.22</emphasis></para>
-    </listitem>
-
-    <listitem>
-      <para><emphasis role="strong">Texinfo-4.7</emphasis></para>
-    </listitem>
-
-    <listitem>
-      <para><emphasis role="strong">XZ Utils-4.999.8beta</emphasis></para>
-    </listitem>
-
-  </itemizedlist>
-
-  <para>To see whether your host system has all the appropriate versions,
-  create and run the following script. Read the output carefully for any
-  errors, and make sure to install any packages that are reported as not found.</para>
-
-<screen role="nodump"><userinput>cat &gt; version-check.sh &lt;&lt; "EOF"
-<literal>#!/bin/bash
-
-# Simple script to list version numbers of critical development tools
-
-bash --version | head -n1 | cut -d" " -f2-4
-echo -n "Binutils: "; ld --version | head -n1 | cut -d" " -f3-
-bison --version | head -n1
-bzip2 --version 2&gt;&amp;1 &lt; /dev/null | head -n1 | cut -d" " -f1,6-
-echo -n "Coreutils: "; chown --version | head -n1 | cut -d")" -f2
-diff --version | head -n1
-find --version | head -n1
-gawk --version | head -n1
-gcc --version | head -n1
-g++ --version | head -n1
-ldd $(which ${SHELL}) | grep libc.so | cut -d ' ' -f 3 | ${SHELL} | head -n 1 | cut -d ' ' -f 1-7
-grep --version | head -n1
-gzip --version | head -n1
-make --version | head -n1
-tic -V
-patch --version | head -n1
-sed --version | head -n1
-tar --version | head -n1
-makeinfo --version | head -n1
-xz --version | head -n1
-echo 'int main(){}' | gcc -v -o /dev/null -x c - &gt; dummy.log 2>&amp;1
-if ! grep -q ' error' dummy.log; then
-  echo "Compilation successful" &amp;&amp; rm dummy.log
-else
-  echo 1>&amp;2  "Compilation FAILED - more development packages may need to be \
-installed. If you like, you can also view dummy.log for more details."
-fi</literal>
-EOF
-
-bash version-check.sh 2>errors.log &amp;&amp;
-[ -s errors.log ] &amp;&amp; echo -e "\nThe following packages could not be found:\n$(cat errors.log)"</userinput></screen>
-
-</sect1>
Index: OK/prologue/common/organization.xml
===================================================================
--- BOOK/prologue/common/organization.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,74 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-<sect1 id="pre-organization">
-  <?dbhtml filename="organization.html"?>
-
-  <title>Structure</title>
-
-  <para>This book is divided into the following parts.</para>
-
-  <sect2>
-    <title>Part I - Introduction</title>
-
-    <para>Part I explains a few important notes on how to proceed with the
-    Cross-LFS installation. This section also provides meta-information about
-    the book.</para>
-
-  </sect2>
-
-  <sect2>
-    <title>Part II - Preparing for the Build</title>
-
-    <para>Part II describes how to prepare for the building
-    process&mdash;making a partition and downloading the packages.</para>
-
-  </sect2>
-
-  <sect2>
-    <title>Part III - Make the Cross-Compile Tools</title>
-
-    <para>Part III shows you how to make a set of Cross-Compiler
-          tools. These tools can run on your host system but allow you to
-          build packages that will run on your target system.</para>
-
-  </sect2>
-
-  <sect2>
-    <title>Part IV - Building the Basic Tools</title>
-
-    <para>Part IV explains how to build a tool chain designed
-          to operate on your target system. These are the tools
-          that will allow you to build a working system on your
-          target computer.</para>
-
-  </sect2>
-
-  <sect2>
-    <title>Part V - Building the CLFS System</title>
-
-    <para>Part V guides the reader through the building of the CLFS
-    system&mdash;compiling and installing all the packages one by one,
-    setting up the boot scripts, and installing the kernel. The resulting
-    Linux system is the foundation on which other software can be built to
-    expand the system as desired. At the end of this book, there is an
-    easy to use reference listing all of the programs, libraries, and
-    important files that have been installed.</para>
-
-  </sect2>
-
-  <sect2>
-    <title>Appendices</title>
-
-    <para>The appendices contain information that doesn't really fit anywhere
-    else in the book. Appendix A contains definitions of acronyms and
-    terms used in the book; Appendices B and C have information about
-    package dependencies and the build order. Some architectures may have
-    additional appendices for arch-specific issues.</para>
-
-  </sect2>
-
-</sect1>
Index: OK/prologue/common/prerequisites.xml
===================================================================
--- BOOK/prologue/common/prerequisites.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,58 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="pre-prerequisites">
-  <?dbhtml filename="prerequisites.html"?>
-
-  <title>Prerequisites</title>
-
-  <para>Building a CLFS system is not a simple task. It requires a certain
-  level of existing knowledge of Unix system administration in order to
-  resolve problems, and correctly execute the commands listed. In particular,
-  as an absolute minimum, the reader should already have the ability to use
-  the command line (shell) to copy or move files and directories, list
-  directory and file contents, and change the current directory. It is also
-  expected that the reader has a reasonable knowledge of using and installing
-  Linux software. A basic knowledge of the architectures being used in
-  the Cross LFS process and the host operating systems in use is also
-  required.</para>
-
-  <para>Because the CLFS book assumes <emphasis>at least</emphasis> this basic
-  level of skill, the various CLFS support forums are unlikely to be able to
-  provide you with much assistance in these areas. Your questions regarding
-  such basic knowledge will likely go unanswered, or you will be referred to
-  the CLFS essential pre-reading list.</para>
-
-  <para>Before building a CLFS system, we recommend reading the following
-  HOWTOs:</para>
-
-  <itemizedlist>
-    <listitem>
-      <para remap="verbatim">Software-Building-HOWTO
-      <ulink url="http://www.tldp.org/HOWTO/Software-Building-HOWTO.html"/></para>
-
-      <para>This is a comprehensive guide to building and installing
-      <quote>generic</quote> Unix software distributions under Linux.</para>
-    </listitem>
-    <listitem>
-      <para remap="verbatim">The Linux Users' Guide
-      <ulink url="http://www.tldp.org/pub/Linux/docs/ldp-archived/users-guide/"/></para>
-
-      <para>This guide covers the usage of assorted Linux software.</para>
-    </listitem>
-    <listitem>
-      <para remap="verbatim">The Essential Pre-Reading Hint
-      <ulink url="&hints-root;Essential_Prereading"/></para>
-
-      <para>This is a hint written specifically for users new to Linux.
-      It includes a list of links to excellent sources of information on a
-      wide range of topics. Anyone attempting to install CLFS should have an
-      understanding of many of the topics in this hint.</para>
-    </listitem>
-  </itemizedlist>
-
-</sect1>
Index: OK/prologue/common/typography.xml
===================================================================
--- BOOK/prologue/common/typography.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,80 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="pre-typography">
-  <?dbhtml filename="typography.html"?>
-
-  <title>Typography</title>
-
-  <para>To make things easier to follow, there are a few typographical
-  conventions used throughout this book. This section contains some
-  examples of the typographical format found throughout Cross-Compiled
-  Linux From Scratch.</para>
-
-<screen role="nodump"><userinput>./configure --prefix=/usr</userinput></screen>
-
-  <para>This form of text is designed to be typed exactly as seen unless
-  otherwise noted in the surrounding text. It is also used in the
-  explanation sections to identify which of the commands is being
-  referenced.</para>
-
-<screen><computeroutput>install-info: unknown option '--dir-file=/mnt/clfs/usr/info/dir'</computeroutput></screen>
-
-  <para>This form of text (fixed-width text) shows screen output,
-  probably as the result of commands issued.  This format is also used
-  to show filenames, such as <filename>/etc/ld.so.conf</filename>.</para>
-
-  <para><emphasis>Emphasis</emphasis></para>
-
-  <para>This form of text is used for several purposes in the book.
-  Its main purpose is to emphasize important points or items.</para>
-
-  <para><ulink url="&clfs-root;"/></para>
-
-  <para>This format is used for hyperlinks, both within the CLFS
-  community and to external pages. It includes HOWTOs, download locations,
-  and websites.</para>
-
-<screen role="nodump"><userinput>cat &gt; ${CLFS}/etc/group &lt;&lt; "EOF"
-<literal>root:x:0:
-bin:x:1:
-......</literal>
-EOF</userinput></screen>
-
-  <para>This format is used when creating configuration files. The first
-  command tells the system to create the file
-  <filename>${CLFS}/etc/group</filename> from whatever is typed on the
-  following lines until the sequence end of file (EOF) is encountered.
-  Therefore, this entire section is generally typed as seen.</para>
-
-  <para><replaceable>[REPLACED TEXT]</replaceable></para>
-
-  <para>This format is used to encapsulate text that is not to be typed
-  as seen or copied-and-pasted.</para>
-
-  <para><filename>passwd(5)</filename></para>
-
-  <para>This format is used to refer to a specific manual page (hereinafter
-  referred to simply as a <quote>man</quote> page). The number inside
-  parentheses indicates a specific section inside of <command>man</command>.
-  For example, <command>passwd</command> has two man pages. Per CLFS
-  installation instructions, those two man pages will be located at
-  <filename>/usr/share/man/man1/passwd.1</filename> and
-  <filename>/usr/share/man/man5/passwd.5</filename>. Both man pages have
-  different information in them. When the book uses
-  <filename>passwd(5)</filename> it is specifically referring to
-  <filename>/usr/share/man/man5/passwd.5</filename>.
-  <command>man passwd</command> will print the first man page it finds
-  that matches <quote>passwd</quote>, which will be
-  <filename>/usr/share/man/man1/passwd.1</filename>. For this example,
-  you will need to run <command>man 5 passwd</command> in order to read
-  the specific page being referred to. It should be noted that most man
-  pages do not have duplicate page names in different sections. Therefore,
-  <command>man <replaceable>[program name]</replaceable></command> is
-  generally sufficient.</para>
-
-</sect1>
Index: OK/prologue/mips/bookinfo.xml
===================================================================
--- BOOK/prologue/mips/bookinfo.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,28 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<bookinfo>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/title)"/>
-  
-  <subtitle>Version &version-mips;</subtitle>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/copyright)"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(bookinfo/bibliosource)"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/legalnotice)"/>
-
-</bookinfo>
Index: OK/prologue/mips64-64/bookinfo.xml
===================================================================
--- BOOK/prologue/mips64-64/bookinfo.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,28 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<bookinfo>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/title)"/>
-  
-  <subtitle>Version &version-mips64-64;</subtitle>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/copyright)"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(bookinfo/bibliosource)"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/legalnotice)"/>
-
-</bookinfo>
Index: OK/prologue/mips64/bookinfo.xml
===================================================================
--- BOOK/prologue/mips64/bookinfo.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,28 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<bookinfo>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/title)"/>
-  
-  <subtitle>Version &version-mips64;</subtitle>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/copyright)"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(bookinfo/bibliosource)"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/legalnotice)"/>
-
-</bookinfo>
Index: OK/prologue/ppc/bookinfo.xml
===================================================================
--- BOOK/prologue/ppc/bookinfo.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,28 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<bookinfo>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/title)"/>
-  
-  <subtitle>Version &version-ppc;</subtitle>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/copyright)"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(bookinfo/bibliosource)"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/legalnotice)"/>
-
-</bookinfo>
Index: OK/prologue/ppc64-64/bookinfo.xml
===================================================================
--- BOOK/prologue/ppc64-64/bookinfo.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,28 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<bookinfo>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/title)"/>
-
-  <subtitle>Version &version-ppc64-64;</subtitle>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/copyright)"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(bookinfo/bibliosource)"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/legalnotice)"/>
-
-</bookinfo>
Index: OK/prologue/ppc64/bookinfo.xml
===================================================================
--- BOOK/prologue/ppc64/bookinfo.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,28 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<bookinfo>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/title)"/>
-  
-  <subtitle>Version &version-ppc64;</subtitle>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/copyright)"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(bookinfo/bibliosource)"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/legalnotice)"/>
-
-</bookinfo>
Index: OK/prologue/preface.xml
===================================================================
--- BOOK/prologue/preface.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,22 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE preface PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<preface id="preface">
-  <?dbhtml dir="prologue"?>
-  <?dbhtml filename="preface.html"?>
-
-  <title>Preface</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/foreword.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/audience.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/prerequisites.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/hostreqs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/typography.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/organization.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/errata.xml"/>
-
-</preface>
Index: OK/prologue/sparc/bookinfo.xml
===================================================================
--- BOOK/prologue/sparc/bookinfo.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,28 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<bookinfo>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/title)"/>
-  
-  <subtitle>Version &version-sparc;</subtitle>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/copyright)"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(bookinfo/bibliosource)"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/legalnotice)"/>
-
-</bookinfo>
Index: OK/prologue/sparc64-64/bookinfo.xml
===================================================================
--- BOOK/prologue/sparc64-64/bookinfo.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,28 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<bookinfo>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/title)"/>
-
-  <subtitle>Version &version-sparc64-64;</subtitle>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/copyright)"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(bookinfo/bibliosource)"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/legalnotice)"/>
-
-</bookinfo>
Index: OK/prologue/sparc64/bookinfo.xml
===================================================================
--- BOOK/prologue/sparc64/bookinfo.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,28 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<bookinfo>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/title)"/>
-
-  <subtitle>Version &version-sparc64;</subtitle>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/copyright)"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(bookinfo/bibliosource)"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/legalnotice)"/>
-
-</bookinfo>
Index: OK/prologue/x86/bookinfo.xml
===================================================================
--- BOOK/prologue/x86/bookinfo.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,82 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<bookinfo>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../index.xml"
-  xpointer="xpointer(/bookinfo/title)"/>
-
-  <subtitle>Version &version-x86;</subtitle>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../index.xml"
-  xpointer="xpointer(/bookinfo/copyright)"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../index.xml"
-  xpointer="xpointer(bookinfo/bibliosource)"/>
-
-  <legalnotice>
-    <para>Copyright &copy; 2005-&year;, Joe Ciccone, Jim Gifford, &amp; Ryan Oliver</para>
-
-    <para>All rights reserved.</para>
-
-    <para>This material may be distributed only subject to the terms and
-    conditions set forth in the <xref linkend="license"/> v1.0 or later
-    (the latest version is presently available at <ulink
-    url="http://www.opencontent.org/openpub/"/>).</para>
-
-    <!-- Modifications and limitations to the OPL (see section VI)
-    can be place here, if needed. -->
-
-    <para><trademark class='registered'>Linux</trademark> is a registered
-    trademark of Linus Torvalds.</para>
-
-    <para>This book is based on the "Linux From Scratch" book, that was
-    released under the following license:</para>
-
-    <para>Copyright &copy; 1999&ndash;&year;, Gerard Beekmans</para>
-
-    <para>All rights reserved.</para>
-
-    <para>Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:</para>
-
-    <itemizedlist>
-      <listitem>
-        <para>Redistributions in any form must retain the above copyright
-        notice, this list of conditions and the following disclaimer</para>
-      </listitem>
-      <listitem>
-        <para>Neither the name of <quote>Linux From Scratch</quote> nor the
-        names of its contributors may be used to endorse or promote products
-        derived from  this material without specific prior written
-        permission</para>
-      </listitem>
-      <listitem>
-        <para>Any material derived from Linux From Scratch must contain
-        a reference to the <quote>Linux From Scratch</quote> project</para>
-      </listitem>
-    </itemizedlist>
-
-    <para>THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-    <quote>AS IS</quote> AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-    BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-    FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR
-    CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-    EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-    PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-    OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-    OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-    ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</para>
-
-  </legalnotice>
-
-</bookinfo>
Index: OK/prologue/x86_64-64/bookinfo.xml
===================================================================
--- BOOK/prologue/x86_64-64/bookinfo.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,28 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<bookinfo>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/title)"/>
-
-  <subtitle>Version &version-x86_64-64;</subtitle>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/copyright)"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(bookinfo/bibliosource)"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/legalnotice)"/>
-
-</bookinfo>
Index: OK/prologue/x86_64/bookinfo.xml
===================================================================
--- BOOK/prologue/x86_64/bookinfo.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,28 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<bookinfo>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/title)"/>
-
-  <subtitle>Version &version-x86_64;</subtitle>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/copyright)"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(bookinfo/bibliosource)"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/legalnotice)"/>
-
-</bookinfo>
Index: OK/schema/docbook/4.5/rng/calstblx.rnc
===================================================================
--- BOOK/schema/docbook/4.5/rng/calstblx.rnc	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,164 +1,0 @@
-# ......................................................................
-
-# DocBook CALS Table Model V4.5 ........................................
-
-# File calstblx.mod ....................................................
-
-# Copyright 1992-2002 HaL Computer Systems, Inc.,
-# O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software
-# Corporation, Norman Walsh, Sun Microsystems, Inc., and the
-# Organization for the Advancement of Structured Information
-# Standards (OASIS).
-# 
-# This DTD is based on the CALS Table Model
-# PUBLIC "-//USA-DOD//DTD Table Model 951010//EN"
-# 
-# $Id: calstblx.dtd 6340 2006-10-03 13:23:24Z nwalsh $
-# 
-# Permission to use, copy, modify and distribute the DocBook DTD
-# and its accompanying documentation for any purpose and without fee
-# is hereby granted in perpetuity, provided that the above copyright
-# notice and this paragraph appear in all copies.  The copyright
-# holders make no representation about the suitability of the DTD for
-# any purpose.  It is provided "as is" without expressed or implied
-# warranty.
-# 
-# If you modify the DocBook DTD in any way, except for declaring and
-# referencing additional sets of general entities and declaring
-# additional notations, label your DTD as a variant of DocBook.  See
-# the maintenance documentation for more information.
-# 
-# Please direct all questions, bug reports, or suggestions for
-# changes to the docbook@lists.oasis-open.org mailing list. For more
-# information, see http://www.oasis-open.org/docbook/.
-
-# ......................................................................
-
-# This module contains the definitions for the CALS Table Model
-# converted to XML. It has been modified slightly for use in the
-# combined HTML/CALS models supported by DocBook V4.5.
-
-# These definitions are not directly related to the table model, but are
-# used in the default CALS table model and are usually defined elsewhere
-# (and prior to the inclusion of this table module) in a CALS DTD.
-
-# no if zero(s),
-# yes if any other digits value
-
-yesorno = string
-titles = title?
-# default for use in entry content
-
-# The parameter entities as defined below provide the CALS table model
-# as published (as part of the Example DTD) in MIL-HDBK-28001.
-# 
-# These following declarations provide the CALS-compliant default definitions
-# for these entities.  However, these entities can and should be redefined
-# (by giving the appropriate parameter entity declaration(s) prior to the
-# reference to this Table Model declaration set entity) to fit the needs
-# of the current application.
-tbl.table-titles.mdl = titles
-tbl.table-main.mdl = tgroup+ | graphic+
-tbl.tgroup.mdl = colspec*, spanspec*, thead?, tfoot?, tbody
-tbl.tgroup.att = attribute tgroupstyle { text }?
-tbl.row.mdl = (entry | entrytbl)+
-tbl.entrytbl.mdl = colspec*, spanspec*, thead?, tbody
-# =====  Element and attribute declarations follow. =====
-
-# doc:A formal table in a document.
-table = element table { table.attlist, tbl.table.mdl }
-table.attlist &=
-  attribute frame { tbl.frame.attval }?,
-  attribute colsep { yesorno }?,
-  attribute rowsep { yesorno }?,
-  tbl.table.att,
-  bodyatt,
-  secur
-# doc:A wrapper for the main content of a table, or part of a table.
-tgroup = element tgroup { tgroup.attlist, tbl.tgroup.mdl }
-tgroup.attlist &=
-  attribute cols { text },
-  tbl.tgroup.att,
-  attribute colsep { yesorno }?,
-  attribute rowsep { yesorno }?,
-  attribute align { "left" | "right" | "center" | "justify" | "char" }?,
-  attribute char { text }?,
-  attribute charoff { text }?,
-  secur
-# doc:Specifications for a column in a table.
-colspec = element colspec { colspec.attlist, empty }
-colspec.attlist &=
-  attribute colnum { text }?,
-  attribute colname { text }?,
-  attribute colwidth { text }?,
-  attribute colsep { yesorno }?,
-  attribute rowsep { yesorno }?,
-  attribute align { "left" | "right" | "center" | "justify" | "char" }?,
-  attribute char { text }?,
-  attribute charoff { text }?
-# doc:Formatting information for a spanned column in a table.
-spanspec = element spanspec { spanspec.attlist, empty }
-spanspec.attlist &=
-  attribute namest { text },
-  attribute nameend { text },
-  attribute spanname { text },
-  attribute colsep { yesorno }?,
-  attribute rowsep { yesorno }?,
-  attribute align { "left" | "right" | "center" | "justify" | "char" }?,
-  attribute char { text }?,
-  attribute charoff { text }?
-# doc:A table header consisting of one or more rows.
-thead = element thead { thead.attlist, tbl.hdft.mdl }
-thead.attlist &=
-  attribute valign { "top" | "middle" | "bottom" }?,
-  secur
-# doc:A table footer consisting of one or more rows.
-tfoot = element tfoot { tfoot.attlist, tbl.hdft.mdl }
-tfoot.attlist &=
-  attribute valign { "top" | "middle" | "bottom" }?,
-  secur
-# doc:A wrapper for the rows of a table or informal table.
-tbody = element tbody { tbody.attlist, tbl.tbody.mdl }
-tbody.attlist &=
-  attribute valign { "top" | "middle" | "bottom" }?,
-  secur
-# doc:A row in a table.
-row = element row { row.attlist, tbl.row.mdl }
-row.attlist &=
-  attribute rowsep { yesorno }?,
-  attribute valign { "top" | "middle" | "bottom" }?,
-  secur
-# doc:A subtable appearing in place of an Entry in a table.
-entrytbl = element entrytbl { entrytbl.attlist, tbl.entrytbl.mdl }
-entrytbl.attlist &=
-  attribute cols { text },
-  tbl.tgroup.att,
-  attribute colname { text }?,
-  attribute spanname { text }?,
-  attribute namest { text }?,
-  attribute nameend { text }?,
-  attribute colsep { yesorno }?,
-  attribute rowsep { yesorno }?,
-  attribute align { "left" | "right" | "center" | "justify" | "char" }?,
-  attribute char { text }?,
-  attribute charoff { text }?,
-  secur
-# doc:A cell in a table.
-entry = element entry { entry.attlist, tbl.entry.mdl* }
-entry.attlist &=
-  attribute colname { text }?,
-  attribute namest { text }?,
-  attribute nameend { text }?,
-  attribute spanname { text }?,
-  attribute morerows { text }?,
-  attribute colsep { yesorno }?,
-  attribute rowsep { yesorno }?,
-  attribute align { "left" | "right" | "center" | "justify" | "char" }?,
-  attribute char { text }?,
-  attribute charoff { text }?,
-  attribute rotate { yesorno }?,
-  attribute valign { "top" | "middle" | "bottom" }?,
-  secur
-# End of DocBook CALS Table Model V4.5 .................................
-
-# ......................................................................
Index: OK/schema/docbook/4.5/rng/calstblx.rng
===================================================================
--- BOOK/schema/docbook/4.5/rng/calstblx.rng	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,477 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- ...................................................................... -->
-<!-- DocBook CALS Table Model V4.5 ........................................ -->
-<!-- File calstblx.mod .................................................... -->
-<!--
-  Copyright 1992-2002 HaL Computer Systems, Inc.,
-  O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software
-  Corporation, Norman Walsh, Sun Microsystems, Inc., and the
-  Organization for the Advancement of Structured Information
-  Standards (OASIS).
-  
-  This DTD is based on the CALS Table Model
-  PUBLIC "-//USA-DOD//DTD Table Model 951010//EN"
-  
-  $Id: calstblx.dtd 6340 2006-10-03 13:23:24Z nwalsh $
-  
-  Permission to use, copy, modify and distribute the DocBook DTD
-  and its accompanying documentation for any purpose and without fee
-  is hereby granted in perpetuity, provided that the above copyright
-  notice and this paragraph appear in all copies.  The copyright
-  holders make no representation about the suitability of the DTD for
-  any purpose.  It is provided "as is" without expressed or implied
-  warranty.
-  
-  If you modify the DocBook DTD in any way, except for declaring and
-  referencing additional sets of general entities and declaring
-  additional notations, label your DTD as a variant of DocBook.  See
-  the maintenance documentation for more information.
-  
-  Please direct all questions, bug reports, or suggestions for
-  changes to the docbook@lists.oasis-open.org mailing list. For more
-  information, see http://www.oasis-open.org/docbook/.
--->
-<!-- ...................................................................... -->
-<!--
-  This module contains the definitions for the CALS Table Model
-  converted to XML. It has been modified slightly for use in the
-  combined HTML/CALS models supported by DocBook V4.5.
--->
-<!--
-  These definitions are not directly related to the table model, but are
-  used in the default CALS table model and are usually defined elsewhere
-  (and prior to the inclusion of this table module) in a CALS DTD.
--->
-<!--
-  no if zero(s),
-  yes if any other digits value
--->
-<grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="">
-  <define name="yesorno">
-    <data type="string"/>
-  </define>
-  <define name="titles">
-    <optional>
-      <ref name="title"/>
-    </optional>
-  </define>
-  <!-- default for use in entry content -->
-  <!--
-    The parameter entities as defined below provide the CALS table model
-    as published (as part of the Example DTD) in MIL-HDBK-28001.
-    
-    These following declarations provide the CALS-compliant default definitions
-    for these entities.  However, these entities can and should be redefined
-    (by giving the appropriate parameter entity declaration(s) prior to the
-    reference to this Table Model declaration set entity) to fit the needs
-    of the current application.
-  -->
-  <define name="tbl.table-titles.mdl">
-    <ref name="titles"/>
-  </define>
-  <define name="tbl.table-main.mdl">
-    <choice>
-      <oneOrMore>
-        <ref name="tgroup"/>
-      </oneOrMore>
-      <oneOrMore>
-        <ref name="graphic"/>
-      </oneOrMore>
-    </choice>
-  </define>
-  <define name="tbl.tgroup.mdl">
-    <zeroOrMore>
-      <ref name="colspec"/>
-    </zeroOrMore>
-    <zeroOrMore>
-      <ref name="spanspec"/>
-    </zeroOrMore>
-    <optional>
-      <ref name="thead"/>
-    </optional>
-    <optional>
-      <ref name="tfoot"/>
-    </optional>
-    <ref name="tbody"/>
-  </define>
-  <define name="tbl.tgroup.att">
-    <optional>
-      <attribute name="tgroupstyle"/>
-    </optional>
-  </define>
-  <define name="tbl.row.mdl">
-    <oneOrMore>
-      <choice>
-        <ref name="entry"/>
-        <ref name="entrytbl"/>
-      </choice>
-    </oneOrMore>
-  </define>
-  <define name="tbl.entrytbl.mdl">
-    <zeroOrMore>
-      <ref name="colspec"/>
-    </zeroOrMore>
-    <zeroOrMore>
-      <ref name="spanspec"/>
-    </zeroOrMore>
-    <optional>
-      <ref name="thead"/>
-    </optional>
-    <ref name="tbody"/>
-  </define>
-  <!-- =====  Element and attribute declarations follow. ===== -->
-  <!-- doc:A formal table in a document. -->
-  <define name="table">
-    <element name="table">
-      <ref name="table.attlist"/>
-      <ref name="tbl.table.mdl"/>
-    </element>
-  </define>
-  <define name="table.attlist" combine="interleave">
-    <optional>
-      <attribute name="frame">
-        <choice>
-          <ref name="tbl.frame.attval"/>
-        </choice>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="colsep">
-        <ref name="yesorno"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="rowsep">
-        <ref name="yesorno"/>
-      </attribute>
-    </optional>
-    <ref name="tbl.table.att"/>
-    <ref name="bodyatt"/>
-    <ref name="secur"/>
-  </define>
-  <!-- doc:A wrapper for the main content of a table, or part of a table. -->
-  <define name="tgroup">
-    <element name="tgroup">
-      <ref name="tgroup.attlist"/>
-      <ref name="tbl.tgroup.mdl"/>
-    </element>
-  </define>
-  <define name="tgroup.attlist" combine="interleave">
-    <attribute name="cols"/>
-    <ref name="tbl.tgroup.att"/>
-    <optional>
-      <attribute name="colsep">
-        <ref name="yesorno"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="rowsep">
-        <ref name="yesorno"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="align">
-        <choice>
-          <value>left</value>
-          <value>right</value>
-          <value>center</value>
-          <value>justify</value>
-          <value>char</value>
-        </choice>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="char"/>
-    </optional>
-    <optional>
-      <attribute name="charoff"/>
-    </optional>
-    <ref name="secur"/>
-  </define>
-  <!-- doc:Specifications for a column in a table. -->
-  <define name="colspec">
-    <element name="colspec">
-      <ref name="colspec.attlist"/>
-      <empty/>
-    </element>
-  </define>
-  <define name="colspec.attlist" combine="interleave">
-    <optional>
-      <attribute name="colnum"/>
-    </optional>
-    <optional>
-      <attribute name="colname"/>
-    </optional>
-    <optional>
-      <attribute name="colwidth"/>
-    </optional>
-    <optional>
-      <attribute name="colsep">
-        <ref name="yesorno"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="rowsep">
-        <ref name="yesorno"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="align">
-        <choice>
-          <value>left</value>
-          <value>right</value>
-          <value>center</value>
-          <value>justify</value>
-          <value>char</value>
-        </choice>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="char"/>
-    </optional>
-    <optional>
-      <attribute name="charoff"/>
-    </optional>
-  </define>
-  <!-- doc:Formatting information for a spanned column in a table. -->
-  <define name="spanspec">
-    <element name="spanspec">
-      <ref name="spanspec.attlist"/>
-      <empty/>
-    </element>
-  </define>
-  <define name="spanspec.attlist" combine="interleave">
-    <attribute name="namest"/>
-    <attribute name="nameend"/>
-    <attribute name="spanname"/>
-    <optional>
-      <attribute name="colsep">
-        <ref name="yesorno"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="rowsep">
-        <ref name="yesorno"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="align">
-        <choice>
-          <value>left</value>
-          <value>right</value>
-          <value>center</value>
-          <value>justify</value>
-          <value>char</value>
-        </choice>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="char"/>
-    </optional>
-    <optional>
-      <attribute name="charoff"/>
-    </optional>
-  </define>
-  <!-- doc:A table header consisting of one or more rows. -->
-  <define name="thead">
-    <element name="thead">
-      <ref name="thead.attlist"/>
-      <ref name="tbl.hdft.mdl"/>
-    </element>
-  </define>
-  <define name="thead.attlist" combine="interleave">
-    <optional>
-      <attribute name="valign">
-        <choice>
-          <value>top</value>
-          <value>middle</value>
-          <value>bottom</value>
-        </choice>
-      </attribute>
-    </optional>
-    <ref name="secur"/>
-  </define>
-  <!-- doc:A table footer consisting of one or more rows. -->
-  <define name="tfoot">
-    <element name="tfoot">
-      <ref name="tfoot.attlist"/>
-      <ref name="tbl.hdft.mdl"/>
-    </element>
-  </define>
-  <define name="tfoot.attlist" combine="interleave">
-    <optional>
-      <attribute name="valign">
-        <choice>
-          <value>top</value>
-          <value>middle</value>
-          <value>bottom</value>
-        </choice>
-      </attribute>
-    </optional>
-    <ref name="secur"/>
-  </define>
-  <!-- doc:A wrapper for the rows of a table or informal table. -->
-  <define name="tbody">
-    <element name="tbody">
-      <ref name="tbody.attlist"/>
-      <ref name="tbl.tbody.mdl"/>
-    </element>
-  </define>
-  <define name="tbody.attlist" combine="interleave">
-    <optional>
-      <attribute name="valign">
-        <choice>
-          <value>top</value>
-          <value>middle</value>
-          <value>bottom</value>
-        </choice>
-      </attribute>
-    </optional>
-    <ref name="secur"/>
-  </define>
-  <!-- doc:A row in a table. -->
-  <define name="row">
-    <element name="row">
-      <ref name="row.attlist"/>
-      <ref name="tbl.row.mdl"/>
-    </element>
-  </define>
-  <define name="row.attlist" combine="interleave">
-    <optional>
-      <attribute name="rowsep">
-        <ref name="yesorno"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="valign">
-        <choice>
-          <value>top</value>
-          <value>middle</value>
-          <value>bottom</value>
-        </choice>
-      </attribute>
-    </optional>
-    <ref name="secur"/>
-  </define>
-  <!-- doc:A subtable appearing in place of an Entry in a table. -->
-  <define name="entrytbl">
-    <element name="entrytbl">
-      <ref name="entrytbl.attlist"/>
-      <ref name="tbl.entrytbl.mdl"/>
-    </element>
-  </define>
-  <define name="entrytbl.attlist" combine="interleave">
-    <attribute name="cols"/>
-    <ref name="tbl.tgroup.att"/>
-    <optional>
-      <attribute name="colname"/>
-    </optional>
-    <optional>
-      <attribute name="spanname"/>
-    </optional>
-    <optional>
-      <attribute name="namest"/>
-    </optional>
-    <optional>
-      <attribute name="nameend"/>
-    </optional>
-    <optional>
-      <attribute name="colsep">
-        <ref name="yesorno"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="rowsep">
-        <ref name="yesorno"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="align">
-        <choice>
-          <value>left</value>
-          <value>right</value>
-          <value>center</value>
-          <value>justify</value>
-          <value>char</value>
-        </choice>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="char"/>
-    </optional>
-    <optional>
-      <attribute name="charoff"/>
-    </optional>
-    <ref name="secur"/>
-  </define>
-  <!-- doc:A cell in a table. -->
-  <define name="entry">
-    <element name="entry">
-      <ref name="entry.attlist"/>
-      <zeroOrMore>
-        <ref name="tbl.entry.mdl"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <define name="entry.attlist" combine="interleave">
-    <optional>
-      <attribute name="colname"/>
-    </optional>
-    <optional>
-      <attribute name="namest"/>
-    </optional>
-    <optional>
-      <attribute name="nameend"/>
-    </optional>
-    <optional>
-      <attribute name="spanname"/>
-    </optional>
-    <optional>
-      <attribute name="morerows"/>
-    </optional>
-    <optional>
-      <attribute name="colsep">
-        <ref name="yesorno"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="rowsep">
-        <ref name="yesorno"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="align">
-        <choice>
-          <value>left</value>
-          <value>right</value>
-          <value>center</value>
-          <value>justify</value>
-          <value>char</value>
-        </choice>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="char"/>
-    </optional>
-    <optional>
-      <attribute name="charoff"/>
-    </optional>
-    <optional>
-      <attribute name="rotate">
-        <ref name="yesorno"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="valign">
-        <choice>
-          <value>top</value>
-          <value>middle</value>
-          <value>bottom</value>
-        </choice>
-      </attribute>
-    </optional>
-    <ref name="secur"/>
-  </define>
-</grammar>
-<!-- End of DocBook CALS Table Model V4.5 ................................. -->
-<!-- ...................................................................... -->
Index: OK/schema/docbook/4.5/rng/dbhierx.rnc
===================================================================
--- BOOK/schema/docbook/4.5/rng/dbhierx.rnc	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,1549 +1,0 @@
-# ......................................................................
-
-# DocBook document hierarchy module V4.5 ...............................
-
-# File dbhierx.mod .....................................................
-
-# Copyright 1992-2004 HaL Computer Systems, Inc.,
-# O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software
-# Corporation, Norman Walsh, Sun Microsystems, Inc., and the
-# Organization for the Advancement of Structured Information
-# Standards (OASIS).
-# 
-# $Id: dbhierx.mod 6340 2006-10-03 13:23:24Z nwalsh $
-# 
-# Permission to use, copy, modify and distribute the DocBook DTD
-# and its accompanying documentation for any purpose and without fee
-# is hereby granted in perpetuity, provided that the above copyright
-# notice and this paragraph appear in all copies.  The copyright
-# holders make no representation about the suitability of the DTD for
-# any purpose.  It is provided "as is" without expressed or implied
-# warranty.
-# 
-# If you modify the DocBook DTD in any way, except for declaring and
-# referencing additional sets of general entities and declaring
-# additional notations, label your DTD as a variant of DocBook.  See
-# the maintenance documentation for more information.
-# 
-# Please direct all questions, bug reports, or suggestions for
-# changes to the docbook@lists.oasis-open.org mailing list. For more
-# information, see http://www.oasis-open.org/docbook/.
-
-# ......................................................................
-
-# This module contains the definitions for the overall document
-# hierarchies of DocBook documents.  It covers computer documentation
-# manuals and manual fragments, as well as reference entries (such as
-# man pages) and technical journals or anthologies containing
-# articles.
-# 
-# This module depends on the DocBook information pool module.  All
-# elements and entities referenced but not defined here are assumed
-# to be defined in the information pool module.
-# 
-# In DTD driver files referring to this module, please use an entity
-# declaration that uses the public identifier shown below:
-# 
-# <!ENTITY % dbhier PUBLIC
-# "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.5//EN"
-# "dbhierx.mod">
-# %dbhier;
-# 
-# See the documentation for detailed information on the parameter
-# entity and module scheme used in DocBook, customizing DocBook and
-# planning for interchange, and changes made since the last release
-# of DocBook.
-
-# ......................................................................
-
-# Entities for module inclusions .......................................
-
-# ......................................................................
-
-# Entities for element classes .........................................
-
-local.appendix.class = notAllowed
-appendix.class = appendix | local.appendix.class
-local.article.class = notAllowed
-article.class = article | local.article.class
-local.book.class = notAllowed
-book.class = book | local.book.class
-local.chapter.class = notAllowed
-chapter.class = chapter | local.chapter.class
-local.index.class = notAllowed
-index.class = index | setindex | local.index.class
-local.refentry.class = notAllowed
-refentry.class = refentry | local.refentry.class
-local.section.class = notAllowed
-section.class = section | local.section.class
-local.nav.class = notAllowed
-nav.class =
-  toc | lot | index | glossary | bibliography | local.nav.class
-# Redeclaration placeholder ............................................
-
-# For redeclaring entities that are declared after this point while
-# retaining their references to the entities that are declared before
-# this point
-
-# ......................................................................
-
-# Entities for element mixtures ........................................
-local.divcomponent.mix = notAllowed
-divcomponent.mix =
-  list.class
-  | admon.class
-  | linespecific.class
-  | synop.class
-  | para.class
-  | informal.class
-  | formal.class
-  | compound.class
-  | genobj.class
-  | descobj.class
-  | ndxterm.class
-  | beginpage
-  | forms.hook
-  | local.divcomponent.mix
-local.refcomponent.mix = notAllowed
-refcomponent.mix =
-  list.class
-  | admon.class
-  | linespecific.class
-  | synop.class
-  | para.class
-  | informal.class
-  | formal.class
-  | compound.class
-  | genobj.class
-  | descobj.class
-  | ndxterm.class
-  | beginpage
-  | forms.hook
-  | local.refcomponent.mix
-local.indexdivcomponent.mix = notAllowed
-indexdivcomponent.mix =
-  itemizedlist
-  | orderedlist
-  | variablelist
-  | simplelist
-  | linespecific.class
-  | synop.class
-  | para.class
-  | informal.class
-  | anchor
-  | remark
-  | link.char.class
-  | beginpage
-  | local.indexdivcomponent.mix
-local.refname.char.mix = notAllowed
-refname.char.mix = text | tech.char.class | local.refname.char.mix
-local.partcontent.mix = notAllowed
-partcontent.mix =
-  appendix.class
-  | chapter.class
-  | nav.class
-  | article.class
-  | preface
-  | refentry.class
-  | reference
-  | local.partcontent.mix
-local.refinline.char.mix = notAllowed
-refinline.char.mix =
-  text
-  | xref.char.class
-  | gen.char.class
-  | link.char.class
-  | tech.char.class
-  | base.char.class
-  | docinfo.char.class
-  | other.char.class
-  | ndxterm.class
-  | beginpage
-  | local.refinline.char.mix
-local.refclass.char.mix = notAllowed
-refclass.char.mix = text | application | local.refclass.char.mix
-# Redeclaration placeholder 2 ..........................................
-
-# For redeclaring entities that are declared after this point while
-# retaining their references to the entities that are declared before
-# this point
-
-# ......................................................................
-
-# Entities for content models ..........................................
-div.title.content = title, subtitle?, titleabbrev?
-bookcomponent.title.content = title, subtitle?, titleabbrev?
-sect.title.content = title, subtitle?, titleabbrev?
-refsect.title.content = title, subtitle?, titleabbrev?
-bookcomponent.content =
-  (divcomponent.mix+,
-   (sect1* | refentry.class* | simplesect* | section.class*))
-  | (sect1+ | refentry.class+ | simplesect+ | section.class+)
-# ......................................................................
-
-# Set and SetInfo ......................................................
-local.set.attrib = empty
-set.role.attrib = role.attrib
-# doc:A collection of books.
-set =
-  element set {
-    set.attlist,
-    div.title.content?,
-    setinfo?,
-    toc?,
-    (set | book.class)+,
-    setindex?
-  }
-# end of set.element
-
-# FPI: SGML formal public identifier
-set.attlist &=
-  attribute fpi { text }?,
-  status.attrib,
-  common.attrib,
-  set.role.attrib,
-  local.set.attrib
-# end of set.attlist
-
-# end of set.module
-local.setinfo.attrib = empty
-setinfo.role.attrib = role.attrib
-# doc:Meta-information for a Set.
-setinfo = element setinfo { setinfo.attlist, info.class+ }
-# end of setinfo.element
-
-# Contents: IDs of the ToC, Books, and SetIndex that comprise
-# the set, in the order of their appearance
-setinfo.attlist &=
-  attribute contents { xsd:IDREFS }?,
-  common.attrib,
-  setinfo.role.attrib,
-  local.setinfo.attrib
-# end of setinfo.attlist
-
-# end of setinfo.module
-
-# end of set.content.module
-
-# ......................................................................
-
-# Book and BookInfo ....................................................
-local.book.attrib = empty
-book.role.attrib = role.attrib
-# doc:A book.
-book =
-  element book {
-    book.attlist,
-    div.title.content?,
-    bookinfo?,
-    (dedication
-     | toc
-     | lot
-     | glossary
-     | bibliography
-     | preface
-     | chapter.class
-     | reference
-     | part
-     | article.class
-     | appendix.class
-     | index.class
-     | colophon)*
-  }
-# end of book.element
-
-# FPI: SGML formal public identifier
-book.attlist &=
-  attribute fpi { text }?,
-  label.attrib,
-  status.attrib,
-  common.attrib,
-  book.role.attrib,
-  local.book.attrib
-# end of book.attlist
-
-# end of book.module
-local.bookinfo.attrib = empty
-bookinfo.role.attrib = role.attrib
-# doc:Meta-information for a Book.
-bookinfo = element bookinfo { bookinfo.attlist, info.class+ }
-# end of bookinfo.element
-
-# Contents: IDs of the ToC, LoTs, Prefaces, Parts, Chapters,
-# Appendixes, References, GLossary, Bibliography, and indexes
-# comprising the Book, in the order of their appearance
-bookinfo.attlist &=
-  attribute contents { xsd:IDREFS }?,
-  common.attrib,
-  bookinfo.role.attrib,
-  local.bookinfo.attrib
-# end of bookinfo.attlist
-
-# end of bookinfo.module
-
-# end of book.content.module
-
-# ......................................................................
-
-# Dedication, ToC, and LoT .............................................
-local.dedication.attrib = empty
-dedication.role.attrib = role.attrib
-# doc:A wrapper for the dedication section of a book.
-dedication =
-  element dedication {
-    dedication.attlist, sect.title.content?, legalnotice.mix+
-  }
-# end of dedication.element
-dedication.attlist &=
-  status.attrib,
-  common.attrib,
-  dedication.role.attrib,
-  local.dedication.attrib
-# end of dedication.attlist
-
-# end of dedication.module
-local.colophon.attrib = empty
-colophon.role.attrib = role.attrib
-# doc:Text at the back of a book describing facts about its production.
-colophon =
-  element colophon {
-    colophon.attlist, sect.title.content?, textobject.mix+
-  }
-# end of colophon.element
-colophon.attlist &=
-  status.attrib,
-  common.attrib,
-  colophon.role.attrib,
-  local.colophon.attrib
-# end of colophon.attlist
-
-# end of colophon.module
-local.toc.attrib = empty
-toc.role.attrib = role.attrib
-# doc:A table of contents.
-toc =
-  element toc {
-    toc.attlist,
-    beginpage?,
-    bookcomponent.title.content?,
-    tocfront*,
-    (tocpart | tocchap)*,
-    tocback*
-  }
-# end of toc.element
-toc.attlist &=
-  pagenum.attrib, common.attrib, toc.role.attrib, local.toc.attrib
-# end of toc.attlist
-
-# end of toc.module
-local.tocfront.attrib = empty
-tocfront.role.attrib = role.attrib
-# doc:An entry in a table of contents for a front matter component.
-tocfront = element tocfront { tocfront.attlist, para.char.mix* }
-# end of tocfront.element
-
-# to element that this entry represents
-tocfront.attlist &=
-  label.attrib,
-  linkend.attrib,
-  pagenum.attrib,
-  common.attrib,
-  tocfront.role.attrib,
-  local.tocfront.attrib
-# end of tocfront.attlist
-
-# end of tocfront.module
-local.tocentry.attrib = empty
-tocentry.role.attrib = role.attrib
-# doc:A component title in a table of contents.
-tocentry = element tocentry { tocentry.attlist, para.char.mix* }
-# end of tocentry.element
-
-# to element that this entry represents
-tocentry.attlist &=
-  linkend.attrib,
-  pagenum.attrib,
-  common.attrib,
-  tocentry.role.attrib,
-  local.tocentry.attrib
-# end of tocentry.attlist
-
-# end of tocentry.module
-local.tocpart.attrib = empty
-tocpart.role.attrib = role.attrib
-# doc:An entry in a table of contents for a part of a book.
-tocpart = element tocpart { tocpart.attlist, tocentry+, tocchap* }
-# end of tocpart.element
-tocpart.attlist &=
-  common.attrib, tocpart.role.attrib, local.tocpart.attrib
-# end of tocpart.attlist
-
-# end of tocpart.module
-local.tocchap.attrib = empty
-tocchap.role.attrib = role.attrib
-# doc:An entry in a table of contents for a component in the body of a document.
-tocchap = element tocchap { tocchap.attlist, tocentry+, toclevel1* }
-# end of tocchap.element
-tocchap.attlist &=
-  label.attrib, common.attrib, tocchap.role.attrib, local.tocchap.attrib
-# end of tocchap.attlist
-
-# end of tocchap.module
-local.toclevel1.attrib = empty
-toclevel1.role.attrib = role.attrib
-# doc:A top-level entry within a table of contents entry for a chapter-like component.
-toclevel1 =
-  element toclevel1 { toclevel1.attlist, tocentry+, toclevel2* }
-# end of toclevel1.element
-toclevel1.attlist &=
-  common.attrib, toclevel1.role.attrib, local.toclevel1.attrib
-# end of toclevel1.attlist
-
-# end of toclevel1.module
-local.toclevel2.attrib = empty
-toclevel2.role.attrib = role.attrib
-# doc:A second-level entry within a table of contents entry for a chapter-like component.
-toclevel2 =
-  element toclevel2 { toclevel2.attlist, tocentry+, toclevel3* }
-# end of toclevel2.element
-toclevel2.attlist &=
-  common.attrib, toclevel2.role.attrib, local.toclevel2.attrib
-# end of toclevel2.attlist
-
-# end of toclevel2.module
-local.toclevel3.attrib = empty
-toclevel3.role.attrib = role.attrib
-# doc:A third-level entry within a table of contents entry for a chapter-like component.
-toclevel3 =
-  element toclevel3 { toclevel3.attlist, tocentry+, toclevel4* }
-# end of toclevel3.element
-toclevel3.attlist &=
-  common.attrib, toclevel3.role.attrib, local.toclevel3.attrib
-# end of toclevel3.attlist
-
-# end of toclevel3.module
-local.toclevel4.attrib = empty
-toclevel4.role.attrib = role.attrib
-# doc:A fourth-level entry within a table of contents entry for a chapter-like component.
-toclevel4 =
-  element toclevel4 { toclevel4.attlist, tocentry+, toclevel5* }
-# end of toclevel4.element
-toclevel4.attlist &=
-  common.attrib, toclevel4.role.attrib, local.toclevel4.attrib
-# end of toclevel4.attlist
-
-# end of toclevel4.module
-local.toclevel5.attrib = empty
-toclevel5.role.attrib = role.attrib
-# doc:A fifth-level entry within a table of contents entry for a chapter-like component.
-toclevel5 = element toclevel5 { toclevel5.attlist, tocentry+ }
-# end of toclevel5.element
-toclevel5.attlist &=
-  common.attrib, toclevel5.role.attrib, local.toclevel5.attrib
-# end of toclevel5.attlist
-
-# end of toclevel5.module
-local.tocback.attrib = empty
-tocback.role.attrib = role.attrib
-# doc:An entry in a table of contents for a back matter component.
-tocback = element tocback { tocback.attlist, para.char.mix* }
-# end of tocback.element
-
-# to element that this entry represents
-tocback.attlist &=
-  label.attrib,
-  linkend.attrib,
-  pagenum.attrib,
-  common.attrib,
-  tocback.role.attrib,
-  local.tocback.attrib
-# end of tocback.attlist
-
-# end of tocback.module
-
-# end of toc.content.module
-local.lot.attrib = empty
-lot.role.attrib = role.attrib
-# doc:A list of the titles of formal objects (as tables or figures) in a document.
-lot =
-  element lot {
-    lot.attlist, beginpage?, bookcomponent.title.content?, lotentry*
-  }
-# end of lot.element
-lot.attlist &=
-  label.attrib, common.attrib, lot.role.attrib, local.lot.attrib
-# end of lot.attlist
-
-# end of lot.module
-local.lotentry.attrib = empty
-lotentry.role.attrib = role.attrib
-# doc:An entry in a list of titles.
-lotentry = element lotentry { lotentry.attlist, para.char.mix* }
-# end of lotentry.element
-
-# SrcCredit: Information about the source of the entry,
-# as for a list of illustrations
-
-# linkend: to element that this entry represents
-lotentry.attlist &=
-  linkend.attrib,
-  pagenum.attrib,
-  attribute srccredit { text }?,
-  common.attrib,
-  lotentry.role.attrib,
-  local.lotentry.attrib
-# end of lotentry.attlist
-
-# end of lotentry.module
-
-# end of lot.content.module
-
-# ......................................................................
-
-# Appendix, Chapter, Part, Preface, Reference, PartIntro ...............
-local.appendix.attrib = empty
-appendix.role.attrib = role.attrib
-# doc:An appendix in a Book or Article.
-appendix =
-  element appendix {
-    appendix.attlist,
-    beginpage?,
-    appendixinfo?,
-    bookcomponent.title.content,
-    nav.class*,
-    tocchap?,
-    bookcomponent.content,
-    nav.class*
-  }
-# end of appendix.element
-appendix.attlist &=
-  label.attrib,
-  status.attrib,
-  common.attrib,
-  appendix.role.attrib,
-  local.appendix.attrib
-# end of appendix.attlist
-
-# end of appendix.module
-local.chapter.attrib = empty
-chapter.role.attrib = role.attrib
-# doc:A chapter, as of a book.
-chapter =
-  element chapter {
-    chapter.attlist,
-    beginpage?,
-    chapterinfo?,
-    bookcomponent.title.content,
-    nav.class*,
-    tocchap?,
-    bookcomponent.content,
-    nav.class*
-  }
-# end of chapter.element
-chapter.attlist &=
-  label.attrib,
-  status.attrib,
-  common.attrib,
-  chapter.role.attrib,
-  local.chapter.attrib
-# end of chapter.attlist
-
-# end of chapter.module
-
-# Note that Part was to have its content model reduced in V4.5.  This
-# change will not be made after all.
-local.part.attrib = empty
-part.role.attrib = role.attrib
-# doc:A division in a book.
-part =
-  element part {
-    part.attlist,
-    beginpage?,
-    partinfo?,
-    bookcomponent.title.content,
-    partintro?,
-    partcontent.mix+
-  }
-# end of part.element
-part.attlist &=
-  label.attrib,
-  status.attrib,
-  common.attrib,
-  part.role.attrib,
-  local.part.attrib
-# end of part.attlist
-
-# ELEMENT PartIntro (defined below)
-
-# end of part.module
-local.preface.attrib = empty
-preface.role.attrib = role.attrib
-# doc:Introductory matter preceding the first chapter of a book.
-preface =
-  element preface {
-    preface.attlist,
-    beginpage?,
-    prefaceinfo?,
-    bookcomponent.title.content,
-    nav.class*,
-    tocchap?,
-    bookcomponent.content,
-    nav.class*
-  }
-# end of preface.element
-preface.attlist &=
-  status.attrib,
-  common.attrib,
-  preface.role.attrib,
-  local.preface.attrib
-# end of preface.attlist
-
-# end of preface.module
-local.reference.attrib = empty
-reference.role.attrib = role.attrib
-# doc:A collection of reference entries.
-reference =
-  element reference {
-    reference.attlist,
-    beginpage?,
-    referenceinfo?,
-    bookcomponent.title.content,
-    partintro?,
-    refentry.class+
-  }
-# end of reference.element
-reference.attlist &=
-  label.attrib,
-  status.attrib,
-  common.attrib,
-  reference.role.attrib,
-  local.reference.attrib
-# end of reference.attlist
-
-# ELEMENT PartIntro (defined below)
-
-# end of reference.module
-local.partintro.attrib = empty
-partintro.role.attrib = role.attrib
-# doc:An introduction to the contents of a part.
-partintro =
-  element partintro {
-    partintro.attlist, div.title.content?, bookcomponent.content
-  }
-# end of partintro.element
-partintro.attlist &=
-  label.attrib,
-  common.attrib,
-  partintro.role.attrib,
-  local.partintro.attrib
-# end of partintro.attlist
-
-# end of partintro.module
-
-# ......................................................................
-
-# Other Info elements ..................................................
-local.appendixinfo.attrib = empty
-appendixinfo.role.attrib = role.attrib
-# doc:Meta-information for an Appendix.
-appendixinfo =
-  element appendixinfo { appendixinfo.attlist, info.class+ }
-# end of appendixinfo.element
-appendixinfo.attlist &=
-  common.attrib, appendixinfo.role.attrib, local.appendixinfo.attrib
-# end of appendixinfo.attlist
-
-# end of appendixinfo.module
-local.bibliographyinfo.attrib = empty
-bibliographyinfo.role.attrib = role.attrib
-# doc:Meta-information for a Bibliography.
-bibliographyinfo =
-  element bibliographyinfo { bibliographyinfo.attlist, info.class+ }
-# end of bibliographyinfo.element
-bibliographyinfo.attlist &=
-  common.attrib,
-  bibliographyinfo.role.attrib,
-  local.bibliographyinfo.attrib
-# end of bibliographyinfo.attlist
-
-# end of bibliographyinfo.module
-local.chapterinfo.attrib = empty
-chapterinfo.role.attrib = role.attrib
-# doc:Meta-information for a Chapter.
-chapterinfo = element chapterinfo { chapterinfo.attlist, info.class+ }
-# end of chapterinfo.element
-chapterinfo.attlist &=
-  common.attrib, chapterinfo.role.attrib, local.chapterinfo.attrib
-# end of chapterinfo.attlist
-
-# end of chapterinfo.module
-local.glossaryinfo.attrib = empty
-glossaryinfo.role.attrib = role.attrib
-# doc:Meta-information for a Glossary.
-glossaryinfo =
-  element glossaryinfo { glossaryinfo.attlist, info.class+ }
-# end of glossaryinfo.element
-glossaryinfo.attlist &=
-  common.attrib, glossaryinfo.role.attrib, local.glossaryinfo.attrib
-# end of glossaryinfo.attlist
-
-# end of glossaryinfo.module
-local.indexinfo.attrib = empty
-indexinfo.role.attrib = role.attrib
-# doc:Meta-information for an Index.
-indexinfo = element indexinfo { indexinfo.attlist, info.class+ }
-# end of indexinfo.element
-indexinfo.attlist &=
-  common.attrib, indexinfo.role.attrib, local.indexinfo.attrib
-# end of indexinfo.attlist
-
-# end of indexinfo.module
-local.setindexinfo.attrib = empty
-setindexinfo.role.attrib = role.attrib
-# doc:Meta-information for a SetIndex.
-setindexinfo =
-  element setindexinfo { setindexinfo.attlist, info.class+ }
-# end of setindexinfo.element
-setindexinfo.attlist &=
-  common.attrib, setindexinfo.role.attrib, local.setindexinfo.attrib
-# end of setindexinfo.attlist
-
-# end of setindexinfo.module
-local.partinfo.attrib = empty
-partinfo.role.attrib = role.attrib
-# doc:Meta-information for a Part.
-partinfo = element partinfo { partinfo.attlist, info.class+ }
-# end of partinfo.element
-partinfo.attlist &=
-  common.attrib, partinfo.role.attrib, local.partinfo.attrib
-# end of partinfo.attlist
-
-# end of partinfo.module
-local.prefaceinfo.attrib = empty
-prefaceinfo.role.attrib = role.attrib
-# doc:Meta-information for a Preface.
-prefaceinfo = element prefaceinfo { prefaceinfo.attlist, info.class+ }
-# end of prefaceinfo.element
-prefaceinfo.attlist &=
-  common.attrib, prefaceinfo.role.attrib, local.prefaceinfo.attrib
-# end of prefaceinfo.attlist
-
-# end of prefaceinfo.module
-local.refentryinfo.attrib = empty
-refentryinfo.role.attrib = role.attrib
-# doc:Meta-information for a Refentry.
-refentryinfo =
-  element refentryinfo { refentryinfo.attlist, info.class+ }
-# end of refentryinfo.element
-refentryinfo.attlist &=
-  common.attrib, refentryinfo.role.attrib, local.refentryinfo.attrib
-# end of refentryinfo.attlist
-
-# end of refentryinfo.module
-local.refsectioninfo.attrib = empty
-refsectioninfo.role.attrib = role.attrib
-# doc:Meta-information for a refsection.
-refsectioninfo =
-  element refsectioninfo { refsectioninfo.attlist, info.class+ }
-# end of refsectioninfo.element
-refsectioninfo.attlist &=
-  common.attrib, refsectioninfo.role.attrib, local.refsectioninfo.attrib
-# end of refsectioninfo.attlist
-
-# end of refsectioninfo.module
-local.refsect1info.attrib = empty
-refsect1info.role.attrib = role.attrib
-# doc:Meta-information for a RefSect1.
-refsect1info =
-  element refsect1info { refsect1info.attlist, info.class+ }
-# end of refsect1info.element
-refsect1info.attlist &=
-  common.attrib, refsect1info.role.attrib, local.refsect1info.attrib
-# end of refsect1info.attlist
-
-# end of refsect1info.module
-local.refsect2info.attrib = empty
-refsect2info.role.attrib = role.attrib
-# doc:Meta-information for a RefSect2.
-refsect2info =
-  element refsect2info { refsect2info.attlist, info.class+ }
-# end of refsect2info.element
-refsect2info.attlist &=
-  common.attrib, refsect2info.role.attrib, local.refsect2info.attrib
-# end of refsect2info.attlist
-
-# end of refsect2info.module
-local.refsect3info.attrib = empty
-refsect3info.role.attrib = role.attrib
-# doc:Meta-information for a RefSect3.
-refsect3info =
-  element refsect3info { refsect3info.attlist, info.class+ }
-# end of refsect3info.element
-refsect3info.attlist &=
-  common.attrib, refsect3info.role.attrib, local.refsect3info.attrib
-# end of refsect3info.attlist
-
-# end of refsect3info.module
-local.refsynopsisdivinfo.attrib = empty
-refsynopsisdivinfo.role.attrib = role.attrib
-# doc:Meta-information for a RefSynopsisDiv.
-refsynopsisdivinfo =
-  element refsynopsisdivinfo { refsynopsisdivinfo.attlist, info.class+ }
-# end of refsynopsisdivinfo.element
-refsynopsisdivinfo.attlist &=
-  common.attrib,
-  refsynopsisdivinfo.role.attrib,
-  local.refsynopsisdivinfo.attrib
-# end of refsynopsisdivinfo.attlist
-
-# end of refsynopsisdivinfo.module
-local.referenceinfo.attrib = empty
-referenceinfo.role.attrib = role.attrib
-# doc:Meta-information for a Reference.
-referenceinfo =
-  element referenceinfo { referenceinfo.attlist, info.class+ }
-# end of referenceinfo.element
-referenceinfo.attlist &=
-  common.attrib, referenceinfo.role.attrib, local.referenceinfo.attrib
-# end of referenceinfo.attlist
-
-# end of referenceinfo.module
-local.sect1info.attrib = empty
-sect1info.role.attrib = role.attrib
-# doc:Meta-information for a Sect1.
-sect1info = element sect1info { sect1info.attlist, info.class+ }
-# end of sect1info.element
-sect1info.attlist &=
-  common.attrib, sect1info.role.attrib, local.sect1info.attrib
-# end of sect1info.attlist
-local.sect2info.attrib = empty
-sect2info.role.attrib = role.attrib
-# doc:Meta-information for a Sect2.
-sect2info = element sect2info { sect2info.attlist, info.class+ }
-# end of sect2info.element
-sect2info.attlist &=
-  common.attrib, sect2info.role.attrib, local.sect2info.attrib
-# end of sect2info.attlist
-local.sect3info.attrib = empty
-sect3info.role.attrib = role.attrib
-# doc:Meta-information for a Sect3.
-sect3info = element sect3info { sect3info.attlist, info.class+ }
-# end of sect3info.element
-sect3info.attlist &=
-  common.attrib, sect3info.role.attrib, local.sect3info.attrib
-# end of sect3info.attlist
-local.sect4info.attrib = empty
-sect4info.role.attrib = role.attrib
-# doc:Meta-information for a Sect4.
-sect4info = element sect4info { sect4info.attlist, info.class+ }
-# end of sect4info.element
-sect4info.attlist &=
-  common.attrib, sect4info.role.attrib, local.sect4info.attrib
-# end of sect4info.attlist
-local.sect5info.attrib = empty
-sect5info.role.attrib = role.attrib
-# doc:Meta-information for a Sect5.
-sect5info = element sect5info { sect5info.attlist, info.class+ }
-# end of sect5info.element
-sect5info.attlist &=
-  common.attrib, sect5info.role.attrib, local.sect5info.attrib
-# end of sect5info.attlist
-
-# ......................................................................
-
-# Section (parallel to Sect*) .........................................
-local.section.attrib = empty
-section.role.attrib = role.attrib
-# doc:A recursive section.
-section =
-  element section {
-    section.attlist,
-    sectioninfo?,
-    sect.title.content,
-    nav.class*,
-    ((divcomponent.mix+,
-      (refentry.class* | section.class* | simplesect*))
-     | refentry.class+
-     | section.class+
-     | simplesect+),
-    nav.class*
-  }
-# end of section.element
-section.attlist &=
-  label.attrib,
-  status.attrib,
-  common.attrib,
-  section.role.attrib,
-  local.section.attrib
-# end of section.attlist
-
-# end of section.module
-sectioninfo.role.attrib = role.attrib
-local.sectioninfo.attrib = empty
-# doc:Meta-information for a recursive section.
-sectioninfo = element sectioninfo { sectioninfo.attlist, info.class+ }
-# end of sectioninfo.element
-sectioninfo.attlist &=
-  common.attrib, sectioninfo.role.attrib, local.sectioninfo.attrib
-# end of sectioninfo.attlist
-
-# end of sectioninfo.module
-
-# end of section.content.module
-
-# ......................................................................
-
-# Sect1, Sect2, Sect3, Sect4, Sect5 ....................................
-local.sect1.attrib = empty
-sect1.role.attrib = role.attrib
-# doc:A top-level section of document.
-sect1 =
-  element sect1 {
-    sect1.attlist,
-    sect1info?,
-    sect.title.content,
-    nav.class*,
-    ((divcomponent.mix+, (refentry.class* | sect2* | simplesect*))
-     | refentry.class+
-     | sect2+
-     | simplesect+),
-    nav.class*
-  }
-# end of sect1.element
-
-# Renderas: Indicates the format in which the heading should
-# appear
-sect1.attlist &=
-  attribute renderas { "sect2" | "sect3" | "sect4" | "sect5" }?,
-  label.attrib,
-  status.attrib,
-  common.attrib,
-  sect1.role.attrib,
-  local.sect1.attrib
-# end of sect1.attlist
-
-# end of sect1.module
-local.sect2.attrib = empty
-sect2.role.attrib = role.attrib
-# doc:A subsection within a Sect1.
-sect2 =
-  element sect2 {
-    sect2.attlist,
-    sect2info?,
-    sect.title.content,
-    nav.class*,
-    ((divcomponent.mix+, (refentry.class* | sect3* | simplesect*))
-     | refentry.class+
-     | sect3+
-     | simplesect+),
-    nav.class*
-  }
-# end of sect2.element
-
-# Renderas: Indicates the format in which the heading should
-# appear
-sect2.attlist &=
-  attribute renderas { "sect1" | "sect3" | "sect4" | "sect5" }?,
-  label.attrib,
-  status.attrib,
-  common.attrib,
-  sect2.role.attrib,
-  local.sect2.attrib
-# end of sect2.attlist
-
-# end of sect2.module
-local.sect3.attrib = empty
-sect3.role.attrib = role.attrib
-# doc:A subsection within a Sect2.
-sect3 =
-  element sect3 {
-    sect3.attlist,
-    sect3info?,
-    sect.title.content,
-    nav.class*,
-    ((divcomponent.mix+, (refentry.class* | sect4* | simplesect*))
-     | refentry.class+
-     | sect4+
-     | simplesect+),
-    nav.class*
-  }
-# end of sect3.element
-
-# Renderas: Indicates the format in which the heading should
-# appear
-sect3.attlist &=
-  attribute renderas { "sect1" | "sect2" | "sect4" | "sect5" }?,
-  label.attrib,
-  status.attrib,
-  common.attrib,
-  sect3.role.attrib,
-  local.sect3.attrib
-# end of sect3.attlist
-
-# end of sect3.module
-local.sect4.attrib = empty
-sect4.role.attrib = role.attrib
-# doc:A subsection within a Sect3.
-sect4 =
-  element sect4 {
-    sect4.attlist,
-    sect4info?,
-    sect.title.content,
-    nav.class*,
-    ((divcomponent.mix+, (refentry.class* | sect5* | simplesect*))
-     | refentry.class+
-     | sect5+
-     | simplesect+),
-    nav.class*
-  }
-# end of sect4.element
-
-# Renderas: Indicates the format in which the heading should
-# appear
-sect4.attlist &=
-  attribute renderas { "sect1" | "sect2" | "sect3" | "sect5" }?,
-  label.attrib,
-  status.attrib,
-  common.attrib,
-  sect4.role.attrib,
-  local.sect4.attrib
-# end of sect4.attlist
-
-# end of sect4.module
-local.sect5.attrib = empty
-sect5.role.attrib = role.attrib
-# doc:A subsection within a Sect4.
-sect5 =
-  element sect5 {
-    sect5.attlist,
-    sect5info?,
-    sect.title.content,
-    nav.class*,
-    ((divcomponent.mix+, (refentry.class* | simplesect*))
-     | refentry.class+
-     | simplesect+),
-    nav.class*
-  }
-# end of sect5.element
-
-# Renderas: Indicates the format in which the heading should
-# appear
-sect5.attlist &=
-  attribute renderas { "sect1" | "sect2" | "sect3" | "sect4" }?,
-  label.attrib,
-  status.attrib,
-  common.attrib,
-  sect5.role.attrib,
-  local.sect5.attrib
-# end of sect5.attlist
-
-# end of sect5.module
-local.simplesect.attrib = empty
-simplesect.role.attrib = role.attrib
-# doc:A section of a document with no subdivisions.
-simplesect =
-  element simplesect {
-    simplesect.attlist, sect.title.content, divcomponent.mix+
-  }
-# end of simplesect.element
-simplesect.attlist &=
-  common.attrib, simplesect.role.attrib, local.simplesect.attrib
-# end of simplesect.attlist
-
-# end of simplesect.module
-
-# ......................................................................
-
-# Bibliography .........................................................
-local.bibliography.attrib = empty
-bibliography.role.attrib = role.attrib
-# doc:A bibliography.
-bibliography =
-  element bibliography {
-    bibliography.attlist,
-    bibliographyinfo?,
-    bookcomponent.title.content?,
-    component.mix*,
-    (bibliodiv+ | (biblioentry | bibliomixed)+)
-  }
-# end of bibliography.element
-bibliography.attlist &=
-  status.attrib,
-  common.attrib,
-  bibliography.role.attrib,
-  local.bibliography.attrib
-# end of bibliography.attlist
-
-# end of bibliography.module
-local.bibliodiv.attrib = empty
-bibliodiv.role.attrib = role.attrib
-# doc:A section of a Bibliography.
-bibliodiv =
-  element bibliodiv {
-    bibliodiv.attlist,
-    sect.title.content?,
-    component.mix*,
-    (biblioentry | bibliomixed)+
-  }
-# end of bibliodiv.element
-bibliodiv.attlist &=
-  status.attrib,
-  common.attrib,
-  bibliodiv.role.attrib,
-  local.bibliodiv.attrib
-# end of bibliodiv.attlist
-
-# end of bibliodiv.module
-
-# end of bibliography.content.module
-
-# ......................................................................
-
-# Glossary .............................................................
-local.glossary.attrib = empty
-glossary.role.attrib = role.attrib
-# doc:A glossary.
-glossary =
-  element glossary {
-    glossary.attlist,
-    glossaryinfo?,
-    bookcomponent.title.content?,
-    component.mix*,
-    (glossdiv+ | glossentry+),
-    bibliography?
-  }
-# end of glossary.element
-glossary.attlist &=
-  status.attrib,
-  common.attrib,
-  glossary.role.attrib,
-  local.glossary.attrib
-# end of glossary.attlist
-
-# end of glossary.module
-local.glossdiv.attrib = empty
-glossdiv.role.attrib = role.attrib
-# doc:A division in a Glossary.
-glossdiv =
-  element glossdiv {
-    glossdiv.attlist, sect.title.content, component.mix*, glossentry+
-  }
-# end of glossdiv.element
-glossdiv.attlist &=
-  status.attrib,
-  common.attrib,
-  glossdiv.role.attrib,
-  local.glossdiv.attrib
-# end of glossdiv.attlist
-
-# end of glossdiv.module
-
-# end of glossary.content.module
-
-# ......................................................................
-
-# Index and SetIndex ...................................................
-local.indexes.attrib = empty
-indexes.role.attrib = role.attrib
-# doc:An index.
-index =
-  element index {
-    index.attlist,
-    indexinfo?,
-    bookcomponent.title.content?,
-    component.mix*,
-    (indexdiv* | indexentry*)
-  }
-# end of index.element
-index.attlist &=
-  attribute type { text }?,
-  common.attrib,
-  indexes.role.attrib,
-  local.indexes.attrib
-# end of index.attlist
-
-# doc:An index to a set of books.
-setindex =
-  element setindex {
-    setindex.attlist,
-    setindexinfo?,
-    bookcomponent.title.content?,
-    component.mix*,
-    (indexdiv* | indexentry*)
-  }
-# end of setindex.element
-setindex.attlist &=
-  common.attrib, indexes.role.attrib, local.indexes.attrib
-# end of setindex.attlist
-
-# end of indexes.module
-
-# SegmentedList in this content is useful for marking up permuted
-# indices.
-local.indexdiv.attrib = empty
-indexdiv.role.attrib = role.attrib
-# doc:A division in an index.
-indexdiv =
-  element indexdiv {
-    indexdiv.attlist,
-    sect.title.content?,
-    (indexdivcomponent.mix*, (indexentry+ | segmentedlist))
-  }
-# end of indexdiv.element
-indexdiv.attlist &=
-  common.attrib, indexdiv.role.attrib, local.indexdiv.attrib
-# end of indexdiv.attlist
-
-# end of indexdiv.module
-
-# Index entries appear in the index, not the text.
-local.indexentry.attrib = empty
-indexentry.role.attrib = role.attrib
-# doc:An entry in an index.
-indexentry =
-  element indexentry {
-    indexentry.attlist,
-    primaryie,
-    (seeie | seealsoie)*,
-    (secondaryie, (seeie | seealsoie | tertiaryie)*)*
-  }
-# end of indexentry.element
-indexentry.attlist &=
-  common.attrib, indexentry.role.attrib, local.indexentry.attrib
-# end of indexentry.attlist
-
-# end of indexentry.module
-local.primsecterie.attrib = empty
-primsecterie.role.attrib = role.attrib
-# doc:A primary term in an index entry, not in the text.
-primaryie = element primaryie { primaryie.attlist, ndxterm.char.mix* }
-# end of primaryie.element
-
-# to IndexTerms that these entries represent
-primaryie.attlist &=
-  linkends.attrib,
-  common.attrib,
-  primsecterie.role.attrib,
-  local.primsecterie.attrib
-# end of primaryie.attlist
-
-# doc:A secondary term in an index entry, rather than in the text.
-secondaryie =
-  element secondaryie { secondaryie.attlist, ndxterm.char.mix* }
-# end of secondaryie.element
-
-# to IndexTerms that these entries represent
-secondaryie.attlist &=
-  linkends.attrib,
-  common.attrib,
-  primsecterie.role.attrib,
-  local.primsecterie.attrib
-# end of secondaryie.attlist
-
-# doc:A tertiary term in an index entry, rather than in the text.
-tertiaryie =
-  element tertiaryie { tertiaryie.attlist, ndxterm.char.mix* }
-# end of tertiaryie.element
-
-# to IndexTerms that these entries represent
-tertiaryie.attlist &=
-  linkends.attrib,
-  common.attrib,
-  primsecterie.role.attrib,
-  local.primsecterie.attrib
-# end of tertiaryie.attlist
-
-# end of primsecterie.module
-local.seeie.attrib = empty
-seeie.role.attrib = role.attrib
-# doc:A See entry in an index, rather than in the text.
-seeie = element seeie { seeie.attlist, ndxterm.char.mix* }
-# end of seeie.element
-
-# to IndexEntry to look up
-seeie.attlist &=
-  linkend.attrib, common.attrib, seeie.role.attrib, local.seeie.attrib
-# end of seeie.attlist
-
-# end of seeie.module
-local.seealsoie.attrib = empty
-seealsoie.role.attrib = role.attrib
-# doc:A See also entry in an index, rather than in the text.
-seealsoie = element seealsoie { seealsoie.attlist, ndxterm.char.mix* }
-# end of seealsoie.element
-
-# to related IndexEntries
-seealsoie.attlist &=
-  linkends.attrib,
-  common.attrib,
-  seealsoie.role.attrib,
-  local.seealsoie.attrib
-# end of seealsoie.attlist
-
-# end of seealsoie.module
-
-# end of index.content.module
-
-# ......................................................................
-
-# RefEntry .............................................................
-local.refentry.attrib = empty
-refentry.role.attrib = role.attrib
-# doc:A reference page (originally a UNIX man-style reference page).
-refentry =
-  element refentry {
-    refentry.attlist,
-    beginpage?,
-    ndxterm.class*,
-    refentryinfo?,
-    refmeta?,
-    (remark | link.char.class)*,
-    refnamediv+,
-    refsynopsisdiv?,
-    (refsect1+ | refsection+)
-  }
-# end of refentry.element
-refentry.attlist &=
-  status.attrib,
-  common.attrib,
-  refentry.role.attrib,
-  local.refentry.attrib
-# end of refentry.attlist
-
-# end of refentry.module
-local.refmeta.attrib = empty
-refmeta.role.attrib = role.attrib
-# doc:Meta-information for a reference entry.
-refmeta =
-  element refmeta {
-    refmeta.attlist,
-    ndxterm.class*,
-    refentrytitle,
-    manvolnum?,
-    refmiscinfo*,
-    ndxterm.class*
-  }
-# end of refmeta.element
-refmeta.attlist &=
-  common.attrib, refmeta.role.attrib, local.refmeta.attrib
-# end of refmeta.attlist
-
-# end of refmeta.module
-local.refmiscinfo.attrib = empty
-refmiscinfo.role.attrib = role.attrib
-# doc:Meta-information for a reference entry other than the title and volume number.
-refmiscinfo =
-  element refmiscinfo { refmiscinfo.attlist, docinfo.char.mix* }
-# end of refmiscinfo.element
-
-# Class: Freely assignable parameter; no default
-refmiscinfo.attlist &=
-  attribute class { text }?,
-  common.attrib,
-  refmiscinfo.role.attrib,
-  local.refmiscinfo.attrib
-# end of refmiscinfo.attlist
-
-# end of refmiscinfo.module
-local.refnamediv.attrib = empty
-refnamediv.role.attrib = role.attrib
-# doc:The name, purpose, and classification of a reference page.
-refnamediv =
-  element refnamediv {
-    refnamediv.attlist,
-    refdescriptor?,
-    refname+,
-    refpurpose,
-    refclass*,
-    (remark | link.char.class)*
-  }
-# end of refnamediv.element
-refnamediv.attlist &=
-  common.attrib, refnamediv.role.attrib, local.refnamediv.attrib
-# end of refnamediv.attlist
-
-# end of refnamediv.module
-local.refdescriptor.attrib = empty
-refdescriptor.role.attrib = role.attrib
-# doc:A description of the topic of a reference page.
-refdescriptor =
-  element refdescriptor { refdescriptor.attlist, refname.char.mix* }
-# end of refdescriptor.element
-refdescriptor.attlist &=
-  common.attrib, refdescriptor.role.attrib, local.refdescriptor.attrib
-# end of refdescriptor.attlist
-
-# end of refdescriptor.module
-local.refname.attrib = empty
-refname.role.attrib = role.attrib
-# doc:The name of (one of) the subject(s) of a reference page.
-refname = element refname { refname.attlist, refname.char.mix* }
-# end of refname.element
-refname.attlist &=
-  common.attrib, refname.role.attrib, local.refname.attrib
-# end of refname.attlist
-
-# end of refname.module
-local.refpurpose.attrib = empty
-refpurpose.role.attrib = role.attrib
-# doc:A short (one sentence) synopsis of the topic of a reference page.
-refpurpose =
-  element refpurpose { refpurpose.attlist, refinline.char.mix* }
-# end of refpurpose.element
-refpurpose.attlist &=
-  common.attrib, refpurpose.role.attrib, local.refpurpose.attrib
-# end of refpurpose.attlist
-
-# end of refpurpose.module
-local.refclass.attrib = empty
-refclass.role.attrib = role.attrib
-# doc:The scope or other indication of applicability of a reference entry.
-refclass = element refclass { refclass.attlist, refclass.char.mix* }
-# end of refclass.element
-refclass.attlist &=
-  common.attrib, refclass.role.attrib, local.refclass.attrib
-# end of refclass.attlist
-
-# end of refclass.module
-local.refsynopsisdiv.attrib = empty
-refsynopsisdiv.role.attrib = role.attrib
-# doc:A syntactic synopsis of the subject of the reference page.
-refsynopsisdiv =
-  element refsynopsisdiv {
-    refsynopsisdiv.attlist,
-    refsynopsisdivinfo?,
-    refsect.title.content?,
-    ((refcomponent.mix+, refsect2*) | refsect2+)
-  }
-# end of refsynopsisdiv.element
-refsynopsisdiv.attlist &=
-  common.attrib, refsynopsisdiv.role.attrib, local.refsynopsisdiv.attrib
-# end of refsynopsisdiv.attlist
-
-# end of refsynopsisdiv.module
-local.refsection.attrib = empty
-refsection.role.attrib = role.attrib
-# doc:A recursive section in a refentry.
-refsection =
-  element refsection {
-    refsection.attlist,
-    refsectioninfo?,
-    refsect.title.content,
-    ((refcomponent.mix+, refsection*) | refsection+)
-  }
-# end of refsection.element
-refsection.attlist &=
-  status.attrib,
-  common.attrib,
-  refsection.role.attrib,
-  local.refsection.attrib
-# end of refsection.attlist
-
-# end of refsection.module
-local.refsect1.attrib = empty
-refsect1.role.attrib = role.attrib
-# doc:A major subsection of a reference entry.
-refsect1 =
-  element refsect1 {
-    refsect1.attlist,
-    refsect1info?,
-    refsect.title.content,
-    ((refcomponent.mix+, refsect2*) | refsect2+)
-  }
-# end of refsect1.element
-refsect1.attlist &=
-  status.attrib,
-  common.attrib,
-  refsect1.role.attrib,
-  local.refsect1.attrib
-# end of refsect1.attlist
-
-# end of refsect1.module
-local.refsect2.attrib = empty
-refsect2.role.attrib = role.attrib
-# doc:A subsection of a RefSect1.
-refsect2 =
-  element refsect2 {
-    refsect2.attlist,
-    refsect2info?,
-    refsect.title.content,
-    ((refcomponent.mix+, refsect3*) | refsect3+)
-  }
-# end of refsect2.element
-refsect2.attlist &=
-  status.attrib,
-  common.attrib,
-  refsect2.role.attrib,
-  local.refsect2.attrib
-# end of refsect2.attlist
-
-# end of refsect2.module
-local.refsect3.attrib = empty
-refsect3.role.attrib = role.attrib
-# doc:A subsection of a RefSect2.
-refsect3 =
-  element refsect3 {
-    refsect3.attlist,
-    refsect3info?,
-    refsect.title.content,
-    refcomponent.mix+
-  }
-# end of refsect3.element
-refsect3.attlist &=
-  status.attrib,
-  common.attrib,
-  refsect3.role.attrib,
-  local.refsect3.attrib
-# end of refsect3.attlist
-
-# end of refsect3.module
-
-# end of refentry.content.module
-
-# ......................................................................
-
-# Article ..............................................................
-
-# An Article is a chapter-level, stand-alone document that is often,
-# but need not be, collected into a Book.
-local.article.attrib = empty
-article.role.attrib = role.attrib
-# doc:An article.
-article =
-  element article {
-    article.attlist,
-    div.title.content?,
-    articleinfo?,
-    tocchap?,
-    lot*,
-    bookcomponent.content,
-    (nav.class | appendix.class | colophon | ackno)*
-  }
-# end of article.element
-
-# Class: Indicates the type of a particular article;
-# all articles have the same structure and general purpose.
-# No default.
-
-# ParentBook: ID of the enclosing Book
-article.attlist &=
-  attribute class {
-    "journalarticle"
-    | "productsheet"
-    | "whitepaper"
-    | "techreport"
-    | "specification"
-    | "faq"
-  }?,
-  attribute parentbook { xsd:IDREF }?,
-  status.attrib,
-  common.attrib,
-  article.role.attrib,
-  local.article.attrib
-# end of article.attlist
-
-# end of article.module
-
-# End of DocBook document hierarchy module V4.5 ........................
-
-# ......................................................................
Index: OK/schema/docbook/4.5/rng/dbhierx.rng
===================================================================
--- BOOK/schema/docbook/4.5/rng/dbhierx.rng	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,2978 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- ...................................................................... -->
-<!-- DocBook document hierarchy module V4.5 ............................... -->
-<!-- File dbhierx.mod ..................................................... -->
-<!--
-  Copyright 1992-2004 HaL Computer Systems, Inc.,
-  O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software
-  Corporation, Norman Walsh, Sun Microsystems, Inc., and the
-  Organization for the Advancement of Structured Information
-  Standards (OASIS).
-  
-  $Id: dbhierx.mod 6340 2006-10-03 13:23:24Z nwalsh $
-  
-  Permission to use, copy, modify and distribute the DocBook DTD
-  and its accompanying documentation for any purpose and without fee
-  is hereby granted in perpetuity, provided that the above copyright
-  notice and this paragraph appear in all copies.  The copyright
-  holders make no representation about the suitability of the DTD for
-  any purpose.  It is provided "as is" without expressed or implied
-  warranty.
-  
-  If you modify the DocBook DTD in any way, except for declaring and
-  referencing additional sets of general entities and declaring
-  additional notations, label your DTD as a variant of DocBook.  See
-  the maintenance documentation for more information.
-  
-  Please direct all questions, bug reports, or suggestions for
-  changes to the docbook@lists.oasis-open.org mailing list. For more
-  information, see http://www.oasis-open.org/docbook/.
--->
-<!-- ...................................................................... -->
-<!--
-  This module contains the definitions for the overall document
-  hierarchies of DocBook documents.  It covers computer documentation
-  manuals and manual fragments, as well as reference entries (such as
-  man pages) and technical journals or anthologies containing
-  articles.
-  
-  This module depends on the DocBook information pool module.  All
-  elements and entities referenced but not defined here are assumed
-  to be defined in the information pool module.
-  
-  In DTD driver files referring to this module, please use an entity
-  declaration that uses the public identifier shown below:
-  
-  <!ENTITY % dbhier PUBLIC
-  "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.5//EN"
-  "dbhierx.mod">
-  %dbhier;
-  
-  See the documentation for detailed information on the parameter
-  entity and module scheme used in DocBook, customizing DocBook and
-  planning for interchange, and changes made since the last release
-  of DocBook.
--->
-<!-- ...................................................................... -->
-<!-- Entities for module inclusions ....................................... -->
-<!-- ...................................................................... -->
-<!-- Entities for element classes ......................................... -->
-<grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-  <define name="local.appendix.class">
-    <notAllowed/>
-  </define>
-  <define name="appendix.class">
-    <choice>
-      <ref name="appendix"/>
-      <ref name="local.appendix.class"/>
-    </choice>
-  </define>
-  <define name="local.article.class">
-    <notAllowed/>
-  </define>
-  <define name="article.class">
-    <choice>
-      <ref name="article"/>
-      <ref name="local.article.class"/>
-    </choice>
-  </define>
-  <define name="local.book.class">
-    <notAllowed/>
-  </define>
-  <define name="book.class">
-    <choice>
-      <ref name="book"/>
-      <ref name="local.book.class"/>
-    </choice>
-  </define>
-  <define name="local.chapter.class">
-    <notAllowed/>
-  </define>
-  <define name="chapter.class">
-    <choice>
-      <ref name="chapter"/>
-      <ref name="local.chapter.class"/>
-    </choice>
-  </define>
-  <define name="local.index.class">
-    <notAllowed/>
-  </define>
-  <define name="index.class">
-    <choice>
-      <ref name="index"/>
-      <ref name="setindex"/>
-      <ref name="local.index.class"/>
-    </choice>
-  </define>
-  <define name="local.refentry.class">
-    <notAllowed/>
-  </define>
-  <define name="refentry.class">
-    <choice>
-      <ref name="refentry"/>
-      <ref name="local.refentry.class"/>
-    </choice>
-  </define>
-  <define name="local.section.class">
-    <notAllowed/>
-  </define>
-  <define name="section.class">
-    <choice>
-      <ref name="section"/>
-      <ref name="local.section.class"/>
-    </choice>
-  </define>
-  <define name="local.nav.class">
-    <notAllowed/>
-  </define>
-  <define name="nav.class">
-    <choice>
-      <ref name="toc"/>
-      <ref name="lot"/>
-      <ref name="index"/>
-      <ref name="glossary"/>
-      <ref name="bibliography"/>
-      <ref name="local.nav.class"/>
-    </choice>
-  </define>
-  <!-- Redeclaration placeholder ............................................ -->
-  <!--
-    For redeclaring entities that are declared after this point while
-    retaining their references to the entities that are declared before
-    this point
-  -->
-  <!-- ...................................................................... -->
-  <!-- Entities for element mixtures ........................................ -->
-  <define name="local.divcomponent.mix">
-    <notAllowed/>
-  </define>
-  <define name="divcomponent.mix">
-    <choice>
-      <ref name="list.class"/>
-      <ref name="admon.class"/>
-      <ref name="linespecific.class"/>
-      <ref name="synop.class"/>
-      <ref name="para.class"/>
-      <ref name="informal.class"/>
-      <ref name="formal.class"/>
-      <ref name="compound.class"/>
-      <ref name="genobj.class"/>
-      <ref name="descobj.class"/>
-      <ref name="ndxterm.class"/>
-      <ref name="beginpage"/>
-      <ref name="forms.hook"/>
-      <ref name="local.divcomponent.mix"/>
-    </choice>
-  </define>
-  <define name="local.refcomponent.mix">
-    <notAllowed/>
-  </define>
-  <define name="refcomponent.mix">
-    <choice>
-      <ref name="list.class"/>
-      <ref name="admon.class"/>
-      <ref name="linespecific.class"/>
-      <ref name="synop.class"/>
-      <ref name="para.class"/>
-      <ref name="informal.class"/>
-      <ref name="formal.class"/>
-      <ref name="compound.class"/>
-      <ref name="genobj.class"/>
-      <ref name="descobj.class"/>
-      <ref name="ndxterm.class"/>
-      <ref name="beginpage"/>
-      <ref name="forms.hook"/>
-      <ref name="local.refcomponent.mix"/>
-    </choice>
-  </define>
-  <define name="local.indexdivcomponent.mix">
-    <notAllowed/>
-  </define>
-  <define name="indexdivcomponent.mix">
-    <choice>
-      <ref name="itemizedlist"/>
-      <ref name="orderedlist"/>
-      <ref name="variablelist"/>
-      <ref name="simplelist"/>
-      <ref name="linespecific.class"/>
-      <ref name="synop.class"/>
-      <ref name="para.class"/>
-      <ref name="informal.class"/>
-      <ref name="anchor"/>
-      <ref name="remark"/>
-      <ref name="link.char.class"/>
-      <ref name="beginpage"/>
-      <ref name="local.indexdivcomponent.mix"/>
-    </choice>
-  </define>
-  <define name="local.refname.char.mix">
-    <notAllowed/>
-  </define>
-  <define name="refname.char.mix">
-    <choice>
-      <text/>
-      <ref name="tech.char.class"/>
-      <ref name="local.refname.char.mix"/>
-    </choice>
-  </define>
-  <define name="local.partcontent.mix">
-    <notAllowed/>
-  </define>
-  <define name="partcontent.mix">
-    <choice>
-      <ref name="appendix.class"/>
-      <ref name="chapter.class"/>
-      <ref name="nav.class"/>
-      <ref name="article.class"/>
-      <ref name="preface"/>
-      <ref name="refentry.class"/>
-      <ref name="reference"/>
-      <ref name="local.partcontent.mix"/>
-    </choice>
-  </define>
-  <define name="local.refinline.char.mix">
-    <notAllowed/>
-  </define>
-  <define name="refinline.char.mix">
-    <choice>
-      <text/>
-      <ref name="xref.char.class"/>
-      <ref name="gen.char.class"/>
-      <ref name="link.char.class"/>
-      <ref name="tech.char.class"/>
-      <ref name="base.char.class"/>
-      <ref name="docinfo.char.class"/>
-      <ref name="other.char.class"/>
-      <ref name="ndxterm.class"/>
-      <ref name="beginpage"/>
-      <ref name="local.refinline.char.mix"/>
-    </choice>
-  </define>
-  <define name="local.refclass.char.mix">
-    <notAllowed/>
-  </define>
-  <define name="refclass.char.mix">
-    <choice>
-      <text/>
-      <ref name="application"/>
-      <ref name="local.refclass.char.mix"/>
-    </choice>
-  </define>
-  <!-- Redeclaration placeholder 2 .......................................... -->
-  <!--
-    For redeclaring entities that are declared after this point while
-    retaining their references to the entities that are declared before
-    this point
-  -->
-  <!-- ...................................................................... -->
-  <!-- Entities for content models .......................................... -->
-  <define name="div.title.content">
-    <ref name="title"/>
-    <optional>
-      <ref name="subtitle"/>
-    </optional>
-    <optional>
-      <ref name="titleabbrev"/>
-    </optional>
-  </define>
-  <define name="bookcomponent.title.content">
-    <ref name="title"/>
-    <optional>
-      <ref name="subtitle"/>
-    </optional>
-    <optional>
-      <ref name="titleabbrev"/>
-    </optional>
-  </define>
-  <define name="sect.title.content">
-    <ref name="title"/>
-    <optional>
-      <ref name="subtitle"/>
-    </optional>
-    <optional>
-      <ref name="titleabbrev"/>
-    </optional>
-  </define>
-  <define name="refsect.title.content">
-    <ref name="title"/>
-    <optional>
-      <ref name="subtitle"/>
-    </optional>
-    <optional>
-      <ref name="titleabbrev"/>
-    </optional>
-  </define>
-  <define name="bookcomponent.content">
-    <choice>
-      <group>
-        <oneOrMore>
-          <ref name="divcomponent.mix"/>
-        </oneOrMore>
-        <choice>
-          <zeroOrMore>
-            <ref name="sect1"/>
-          </zeroOrMore>
-          <zeroOrMore>
-            <ref name="refentry.class"/>
-          </zeroOrMore>
-          <zeroOrMore>
-            <ref name="simplesect"/>
-          </zeroOrMore>
-          <zeroOrMore>
-            <ref name="section.class"/>
-          </zeroOrMore>
-        </choice>
-      </group>
-      <choice>
-        <oneOrMore>
-          <ref name="sect1"/>
-        </oneOrMore>
-        <oneOrMore>
-          <ref name="refentry.class"/>
-        </oneOrMore>
-        <oneOrMore>
-          <ref name="simplesect"/>
-        </oneOrMore>
-        <oneOrMore>
-          <ref name="section.class"/>
-        </oneOrMore>
-      </choice>
-    </choice>
-  </define>
-  <!-- ...................................................................... -->
-  <!-- Set and SetInfo ...................................................... -->
-  <define name="local.set.attrib">
-    <empty/>
-  </define>
-  <define name="set.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A collection of books. -->
-  <define name="set">
-    <element name="set">
-      <ref name="set.attlist"/>
-      <optional>
-        <ref name="div.title.content"/>
-      </optional>
-      <optional>
-        <ref name="setinfo"/>
-      </optional>
-      <optional>
-        <ref name="toc"/>
-      </optional>
-      <oneOrMore>
-        <choice>
-          <ref name="set"/>
-          <ref name="book.class"/>
-        </choice>
-      </oneOrMore>
-      <optional>
-        <ref name="setindex"/>
-      </optional>
-    </element>
-  </define>
-  <!-- end of set.element -->
-  <!-- FPI: SGML formal public identifier -->
-  <define name="set.attlist" combine="interleave">
-    <optional>
-      <attribute name="fpi"/>
-    </optional>
-    <ref name="status.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="set.role.attrib"/>
-    <ref name="local.set.attrib"/>
-  </define>
-  <!-- end of set.attlist -->
-  <!-- end of set.module -->
-  <define name="local.setinfo.attrib">
-    <empty/>
-  </define>
-  <define name="setinfo.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:Meta-information for a Set. -->
-  <define name="setinfo">
-    <element name="setinfo">
-      <ref name="setinfo.attlist"/>
-      <oneOrMore>
-        <ref name="info.class"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of setinfo.element -->
-  <!--
-    Contents: IDs of the ToC, Books, and SetIndex that comprise
-    the set, in the order of their appearance
-  -->
-  <define name="setinfo.attlist" combine="interleave">
-    <optional>
-      <attribute name="contents">
-        <data type="IDREFS"/>
-      </attribute>
-    </optional>
-    <ref name="common.attrib"/>
-    <ref name="setinfo.role.attrib"/>
-    <ref name="local.setinfo.attrib"/>
-  </define>
-  <!-- end of setinfo.attlist -->
-  <!-- end of setinfo.module -->
-  <!-- end of set.content.module -->
-  <!-- ...................................................................... -->
-  <!-- Book and BookInfo .................................................... -->
-  <define name="local.book.attrib">
-    <empty/>
-  </define>
-  <define name="book.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A book. -->
-  <define name="book">
-    <element name="book">
-      <ref name="book.attlist"/>
-      <optional>
-        <ref name="div.title.content"/>
-      </optional>
-      <optional>
-        <ref name="bookinfo"/>
-      </optional>
-      <zeroOrMore>
-        <choice>
-          <ref name="dedication"/>
-          <ref name="toc"/>
-          <ref name="lot"/>
-          <ref name="glossary"/>
-          <ref name="bibliography"/>
-          <ref name="preface"/>
-          <ref name="chapter.class"/>
-          <ref name="reference"/>
-          <ref name="part"/>
-          <ref name="article.class"/>
-          <ref name="appendix.class"/>
-          <ref name="index.class"/>
-          <ref name="colophon"/>
-        </choice>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of book.element -->
-  <!-- FPI: SGML formal public identifier -->
-  <define name="book.attlist" combine="interleave">
-    <optional>
-      <attribute name="fpi"/>
-    </optional>
-    <ref name="label.attrib"/>
-    <ref name="status.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="book.role.attrib"/>
-    <ref name="local.book.attrib"/>
-  </define>
-  <!-- end of book.attlist -->
-  <!-- end of book.module -->
-  <define name="local.bookinfo.attrib">
-    <empty/>
-  </define>
-  <define name="bookinfo.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:Meta-information for a Book. -->
-  <define name="bookinfo">
-    <element name="bookinfo">
-      <ref name="bookinfo.attlist"/>
-      <oneOrMore>
-        <ref name="info.class"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of bookinfo.element -->
-  <!--
-    Contents: IDs of the ToC, LoTs, Prefaces, Parts, Chapters,
-    Appendixes, References, GLossary, Bibliography, and indexes
-    comprising the Book, in the order of their appearance
-  -->
-  <define name="bookinfo.attlist" combine="interleave">
-    <optional>
-      <attribute name="contents">
-        <data type="IDREFS"/>
-      </attribute>
-    </optional>
-    <ref name="common.attrib"/>
-    <ref name="bookinfo.role.attrib"/>
-    <ref name="local.bookinfo.attrib"/>
-  </define>
-  <!-- end of bookinfo.attlist -->
-  <!-- end of bookinfo.module -->
-  <!-- end of book.content.module -->
-  <!-- ...................................................................... -->
-  <!-- Dedication, ToC, and LoT ............................................. -->
-  <define name="local.dedication.attrib">
-    <empty/>
-  </define>
-  <define name="dedication.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A wrapper for the dedication section of a book. -->
-  <define name="dedication">
-    <element name="dedication">
-      <ref name="dedication.attlist"/>
-      <optional>
-        <ref name="sect.title.content"/>
-      </optional>
-      <oneOrMore>
-        <ref name="legalnotice.mix"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of dedication.element -->
-  <define name="dedication.attlist" combine="interleave">
-    <ref name="status.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="dedication.role.attrib"/>
-    <ref name="local.dedication.attrib"/>
-  </define>
-  <!-- end of dedication.attlist -->
-  <!-- end of dedication.module -->
-  <define name="local.colophon.attrib">
-    <empty/>
-  </define>
-  <define name="colophon.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:Text at the back of a book describing facts about its production. -->
-  <define name="colophon">
-    <element name="colophon">
-      <ref name="colophon.attlist"/>
-      <optional>
-        <ref name="sect.title.content"/>
-      </optional>
-      <oneOrMore>
-        <ref name="textobject.mix"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of colophon.element -->
-  <define name="colophon.attlist" combine="interleave">
-    <ref name="status.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="colophon.role.attrib"/>
-    <ref name="local.colophon.attrib"/>
-  </define>
-  <!-- end of colophon.attlist -->
-  <!-- end of colophon.module -->
-  <define name="local.toc.attrib">
-    <empty/>
-  </define>
-  <define name="toc.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A table of contents. -->
-  <define name="toc">
-    <element name="toc">
-      <ref name="toc.attlist"/>
-      <optional>
-        <ref name="beginpage"/>
-      </optional>
-      <optional>
-        <ref name="bookcomponent.title.content"/>
-      </optional>
-      <zeroOrMore>
-        <ref name="tocfront"/>
-      </zeroOrMore>
-      <zeroOrMore>
-        <choice>
-          <ref name="tocpart"/>
-          <ref name="tocchap"/>
-        </choice>
-      </zeroOrMore>
-      <zeroOrMore>
-        <ref name="tocback"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of toc.element -->
-  <define name="toc.attlist" combine="interleave">
-    <ref name="pagenum.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="toc.role.attrib"/>
-    <ref name="local.toc.attrib"/>
-  </define>
-  <!-- end of toc.attlist -->
-  <!-- end of toc.module -->
-  <define name="local.tocfront.attrib">
-    <empty/>
-  </define>
-  <define name="tocfront.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:An entry in a table of contents for a front matter component. -->
-  <define name="tocfront">
-    <element name="tocfront">
-      <ref name="tocfront.attlist"/>
-      <zeroOrMore>
-        <ref name="para.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of tocfront.element -->
-  <!-- to element that this entry represents -->
-  <define name="tocfront.attlist" combine="interleave">
-    <ref name="label.attrib"/>
-    <ref name="linkend.attrib"/>
-    <ref name="pagenum.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="tocfront.role.attrib"/>
-    <ref name="local.tocfront.attrib"/>
-  </define>
-  <!-- end of tocfront.attlist -->
-  <!-- end of tocfront.module -->
-  <define name="local.tocentry.attrib">
-    <empty/>
-  </define>
-  <define name="tocentry.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A component title in a table of contents. -->
-  <define name="tocentry">
-    <element name="tocentry">
-      <ref name="tocentry.attlist"/>
-      <zeroOrMore>
-        <ref name="para.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of tocentry.element -->
-  <!-- to element that this entry represents -->
-  <define name="tocentry.attlist" combine="interleave">
-    <ref name="linkend.attrib"/>
-    <ref name="pagenum.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="tocentry.role.attrib"/>
-    <ref name="local.tocentry.attrib"/>
-  </define>
-  <!-- end of tocentry.attlist -->
-  <!-- end of tocentry.module -->
-  <define name="local.tocpart.attrib">
-    <empty/>
-  </define>
-  <define name="tocpart.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:An entry in a table of contents for a part of a book. -->
-  <define name="tocpart">
-    <element name="tocpart">
-      <ref name="tocpart.attlist"/>
-      <oneOrMore>
-        <ref name="tocentry"/>
-      </oneOrMore>
-      <zeroOrMore>
-        <ref name="tocchap"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of tocpart.element -->
-  <define name="tocpart.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="tocpart.role.attrib"/>
-    <ref name="local.tocpart.attrib"/>
-  </define>
-  <!-- end of tocpart.attlist -->
-  <!-- end of tocpart.module -->
-  <define name="local.tocchap.attrib">
-    <empty/>
-  </define>
-  <define name="tocchap.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:An entry in a table of contents for a component in the body of a document. -->
-  <define name="tocchap">
-    <element name="tocchap">
-      <ref name="tocchap.attlist"/>
-      <oneOrMore>
-        <ref name="tocentry"/>
-      </oneOrMore>
-      <zeroOrMore>
-        <ref name="toclevel1"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of tocchap.element -->
-  <define name="tocchap.attlist" combine="interleave">
-    <ref name="label.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="tocchap.role.attrib"/>
-    <ref name="local.tocchap.attrib"/>
-  </define>
-  <!-- end of tocchap.attlist -->
-  <!-- end of tocchap.module -->
-  <define name="local.toclevel1.attrib">
-    <empty/>
-  </define>
-  <define name="toclevel1.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A top-level entry within a table of contents entry for a chapter-like component. -->
-  <define name="toclevel1">
-    <element name="toclevel1">
-      <ref name="toclevel1.attlist"/>
-      <oneOrMore>
-        <ref name="tocentry"/>
-      </oneOrMore>
-      <zeroOrMore>
-        <ref name="toclevel2"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of toclevel1.element -->
-  <define name="toclevel1.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="toclevel1.role.attrib"/>
-    <ref name="local.toclevel1.attrib"/>
-  </define>
-  <!-- end of toclevel1.attlist -->
-  <!-- end of toclevel1.module -->
-  <define name="local.toclevel2.attrib">
-    <empty/>
-  </define>
-  <define name="toclevel2.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A second-level entry within a table of contents entry for a chapter-like component. -->
-  <define name="toclevel2">
-    <element name="toclevel2">
-      <ref name="toclevel2.attlist"/>
-      <oneOrMore>
-        <ref name="tocentry"/>
-      </oneOrMore>
-      <zeroOrMore>
-        <ref name="toclevel3"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of toclevel2.element -->
-  <define name="toclevel2.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="toclevel2.role.attrib"/>
-    <ref name="local.toclevel2.attrib"/>
-  </define>
-  <!-- end of toclevel2.attlist -->
-  <!-- end of toclevel2.module -->
-  <define name="local.toclevel3.attrib">
-    <empty/>
-  </define>
-  <define name="toclevel3.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A third-level entry within a table of contents entry for a chapter-like component. -->
-  <define name="toclevel3">
-    <element name="toclevel3">
-      <ref name="toclevel3.attlist"/>
-      <oneOrMore>
-        <ref name="tocentry"/>
-      </oneOrMore>
-      <zeroOrMore>
-        <ref name="toclevel4"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of toclevel3.element -->
-  <define name="toclevel3.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="toclevel3.role.attrib"/>
-    <ref name="local.toclevel3.attrib"/>
-  </define>
-  <!-- end of toclevel3.attlist -->
-  <!-- end of toclevel3.module -->
-  <define name="local.toclevel4.attrib">
-    <empty/>
-  </define>
-  <define name="toclevel4.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A fourth-level entry within a table of contents entry for a chapter-like component. -->
-  <define name="toclevel4">
-    <element name="toclevel4">
-      <ref name="toclevel4.attlist"/>
-      <oneOrMore>
-        <ref name="tocentry"/>
-      </oneOrMore>
-      <zeroOrMore>
-        <ref name="toclevel5"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of toclevel4.element -->
-  <define name="toclevel4.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="toclevel4.role.attrib"/>
-    <ref name="local.toclevel4.attrib"/>
-  </define>
-  <!-- end of toclevel4.attlist -->
-  <!-- end of toclevel4.module -->
-  <define name="local.toclevel5.attrib">
-    <empty/>
-  </define>
-  <define name="toclevel5.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A fifth-level entry within a table of contents entry for a chapter-like component. -->
-  <define name="toclevel5">
-    <element name="toclevel5">
-      <ref name="toclevel5.attlist"/>
-      <oneOrMore>
-        <ref name="tocentry"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of toclevel5.element -->
-  <define name="toclevel5.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="toclevel5.role.attrib"/>
-    <ref name="local.toclevel5.attrib"/>
-  </define>
-  <!-- end of toclevel5.attlist -->
-  <!-- end of toclevel5.module -->
-  <define name="local.tocback.attrib">
-    <empty/>
-  </define>
-  <define name="tocback.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:An entry in a table of contents for a back matter component. -->
-  <define name="tocback">
-    <element name="tocback">
-      <ref name="tocback.attlist"/>
-      <zeroOrMore>
-        <ref name="para.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of tocback.element -->
-  <!-- to element that this entry represents -->
-  <define name="tocback.attlist" combine="interleave">
-    <ref name="label.attrib"/>
-    <ref name="linkend.attrib"/>
-    <ref name="pagenum.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="tocback.role.attrib"/>
-    <ref name="local.tocback.attrib"/>
-  </define>
-  <!-- end of tocback.attlist -->
-  <!-- end of tocback.module -->
-  <!-- end of toc.content.module -->
-  <define name="local.lot.attrib">
-    <empty/>
-  </define>
-  <define name="lot.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A list of the titles of formal objects (as tables or figures) in a document. -->
-  <define name="lot">
-    <element name="lot">
-      <ref name="lot.attlist"/>
-      <optional>
-        <ref name="beginpage"/>
-      </optional>
-      <optional>
-        <ref name="bookcomponent.title.content"/>
-      </optional>
-      <zeroOrMore>
-        <ref name="lotentry"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of lot.element -->
-  <define name="lot.attlist" combine="interleave">
-    <ref name="label.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="lot.role.attrib"/>
-    <ref name="local.lot.attrib"/>
-  </define>
-  <!-- end of lot.attlist -->
-  <!-- end of lot.module -->
-  <define name="local.lotentry.attrib">
-    <empty/>
-  </define>
-  <define name="lotentry.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:An entry in a list of titles. -->
-  <define name="lotentry">
-    <element name="lotentry">
-      <ref name="lotentry.attlist"/>
-      <zeroOrMore>
-        <ref name="para.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of lotentry.element -->
-  <!--
-    SrcCredit: Information about the source of the entry,
-    as for a list of illustrations
-  -->
-  <!--  linkend: to element that this entry represents -->
-  <define name="lotentry.attlist" combine="interleave">
-    <ref name="linkend.attrib"/>
-    <ref name="pagenum.attrib"/>
-    <optional>
-      <attribute name="srccredit"/>
-    </optional>
-    <ref name="common.attrib"/>
-    <ref name="lotentry.role.attrib"/>
-    <ref name="local.lotentry.attrib"/>
-  </define>
-  <!-- end of lotentry.attlist -->
-  <!-- end of lotentry.module -->
-  <!-- end of lot.content.module -->
-  <!-- ...................................................................... -->
-  <!-- Appendix, Chapter, Part, Preface, Reference, PartIntro ............... -->
-  <define name="local.appendix.attrib">
-    <empty/>
-  </define>
-  <define name="appendix.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:An appendix in a Book or Article. -->
-  <define name="appendix">
-    <element name="appendix">
-      <ref name="appendix.attlist"/>
-      <optional>
-        <ref name="beginpage"/>
-      </optional>
-      <optional>
-        <ref name="appendixinfo"/>
-      </optional>
-      <ref name="bookcomponent.title.content"/>
-      <zeroOrMore>
-        <ref name="nav.class"/>
-      </zeroOrMore>
-      <optional>
-        <ref name="tocchap"/>
-      </optional>
-      <ref name="bookcomponent.content"/>
-      <zeroOrMore>
-        <ref name="nav.class"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of appendix.element -->
-  <define name="appendix.attlist" combine="interleave">
-    <ref name="label.attrib"/>
-    <ref name="status.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="appendix.role.attrib"/>
-    <ref name="local.appendix.attrib"/>
-  </define>
-  <!-- end of appendix.attlist -->
-  <!-- end of appendix.module -->
-  <define name="local.chapter.attrib">
-    <empty/>
-  </define>
-  <define name="chapter.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A chapter, as of a book. -->
-  <define name="chapter">
-    <element name="chapter">
-      <ref name="chapter.attlist"/>
-      <optional>
-        <ref name="beginpage"/>
-      </optional>
-      <optional>
-        <ref name="chapterinfo"/>
-      </optional>
-      <ref name="bookcomponent.title.content"/>
-      <zeroOrMore>
-        <ref name="nav.class"/>
-      </zeroOrMore>
-      <optional>
-        <ref name="tocchap"/>
-      </optional>
-      <ref name="bookcomponent.content"/>
-      <zeroOrMore>
-        <ref name="nav.class"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of chapter.element -->
-  <define name="chapter.attlist" combine="interleave">
-    <ref name="label.attrib"/>
-    <ref name="status.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="chapter.role.attrib"/>
-    <ref name="local.chapter.attrib"/>
-  </define>
-  <!-- end of chapter.attlist -->
-  <!-- end of chapter.module -->
-  <!--
-    Note that Part was to have its content model reduced in V4.5.  This
-    change will not be made after all.
-  -->
-  <define name="local.part.attrib">
-    <empty/>
-  </define>
-  <define name="part.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A division in a book. -->
-  <define name="part">
-    <element name="part">
-      <ref name="part.attlist"/>
-      <optional>
-        <ref name="beginpage"/>
-      </optional>
-      <optional>
-        <ref name="partinfo"/>
-      </optional>
-      <ref name="bookcomponent.title.content"/>
-      <optional>
-        <ref name="partintro"/>
-      </optional>
-      <oneOrMore>
-        <ref name="partcontent.mix"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of part.element -->
-  <define name="part.attlist" combine="interleave">
-    <ref name="label.attrib"/>
-    <ref name="status.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="part.role.attrib"/>
-    <ref name="local.part.attrib"/>
-  </define>
-  <!-- end of part.attlist -->
-  <!-- ELEMENT PartIntro (defined below) -->
-  <!-- end of part.module -->
-  <define name="local.preface.attrib">
-    <empty/>
-  </define>
-  <define name="preface.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:Introductory matter preceding the first chapter of a book. -->
-  <define name="preface">
-    <element name="preface">
-      <ref name="preface.attlist"/>
-      <optional>
-        <ref name="beginpage"/>
-      </optional>
-      <optional>
-        <ref name="prefaceinfo"/>
-      </optional>
-      <ref name="bookcomponent.title.content"/>
-      <zeroOrMore>
-        <ref name="nav.class"/>
-      </zeroOrMore>
-      <optional>
-        <ref name="tocchap"/>
-      </optional>
-      <ref name="bookcomponent.content"/>
-      <zeroOrMore>
-        <ref name="nav.class"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of preface.element -->
-  <define name="preface.attlist" combine="interleave">
-    <ref name="status.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="preface.role.attrib"/>
-    <ref name="local.preface.attrib"/>
-  </define>
-  <!-- end of preface.attlist -->
-  <!-- end of preface.module -->
-  <define name="local.reference.attrib">
-    <empty/>
-  </define>
-  <define name="reference.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A collection of reference entries. -->
-  <define name="reference">
-    <element name="reference">
-      <ref name="reference.attlist"/>
-      <optional>
-        <ref name="beginpage"/>
-      </optional>
-      <optional>
-        <ref name="referenceinfo"/>
-      </optional>
-      <ref name="bookcomponent.title.content"/>
-      <optional>
-        <ref name="partintro"/>
-      </optional>
-      <oneOrMore>
-        <ref name="refentry.class"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of reference.element -->
-  <define name="reference.attlist" combine="interleave">
-    <ref name="label.attrib"/>
-    <ref name="status.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="reference.role.attrib"/>
-    <ref name="local.reference.attrib"/>
-  </define>
-  <!-- end of reference.attlist -->
-  <!-- ELEMENT PartIntro (defined below) -->
-  <!-- end of reference.module -->
-  <define name="local.partintro.attrib">
-    <empty/>
-  </define>
-  <define name="partintro.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:An introduction to the contents of a part. -->
-  <define name="partintro">
-    <element name="partintro">
-      <ref name="partintro.attlist"/>
-      <optional>
-        <ref name="div.title.content"/>
-      </optional>
-      <ref name="bookcomponent.content"/>
-    </element>
-  </define>
-  <!-- end of partintro.element -->
-  <define name="partintro.attlist" combine="interleave">
-    <ref name="label.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="partintro.role.attrib"/>
-    <ref name="local.partintro.attrib"/>
-  </define>
-  <!-- end of partintro.attlist -->
-  <!-- end of partintro.module -->
-  <!-- ...................................................................... -->
-  <!-- Other Info elements .................................................. -->
-  <define name="local.appendixinfo.attrib">
-    <empty/>
-  </define>
-  <define name="appendixinfo.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:Meta-information for an Appendix. -->
-  <define name="appendixinfo">
-    <element name="appendixinfo">
-      <ref name="appendixinfo.attlist"/>
-      <oneOrMore>
-        <ref name="info.class"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of appendixinfo.element -->
-  <define name="appendixinfo.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="appendixinfo.role.attrib"/>
-    <ref name="local.appendixinfo.attrib"/>
-  </define>
-  <!-- end of appendixinfo.attlist -->
-  <!-- end of appendixinfo.module -->
-  <define name="local.bibliographyinfo.attrib">
-    <empty/>
-  </define>
-  <define name="bibliographyinfo.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:Meta-information for a Bibliography. -->
-  <define name="bibliographyinfo">
-    <element name="bibliographyinfo">
-      <ref name="bibliographyinfo.attlist"/>
-      <oneOrMore>
-        <ref name="info.class"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of bibliographyinfo.element -->
-  <define name="bibliographyinfo.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="bibliographyinfo.role.attrib"/>
-    <ref name="local.bibliographyinfo.attrib"/>
-  </define>
-  <!-- end of bibliographyinfo.attlist -->
-  <!-- end of bibliographyinfo.module -->
-  <define name="local.chapterinfo.attrib">
-    <empty/>
-  </define>
-  <define name="chapterinfo.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:Meta-information for a Chapter. -->
-  <define name="chapterinfo">
-    <element name="chapterinfo">
-      <ref name="chapterinfo.attlist"/>
-      <oneOrMore>
-        <ref name="info.class"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of chapterinfo.element -->
-  <define name="chapterinfo.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="chapterinfo.role.attrib"/>
-    <ref name="local.chapterinfo.attrib"/>
-  </define>
-  <!-- end of chapterinfo.attlist -->
-  <!-- end of chapterinfo.module -->
-  <define name="local.glossaryinfo.attrib">
-    <empty/>
-  </define>
-  <define name="glossaryinfo.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:Meta-information for a Glossary. -->
-  <define name="glossaryinfo">
-    <element name="glossaryinfo">
-      <ref name="glossaryinfo.attlist"/>
-      <oneOrMore>
-        <ref name="info.class"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of glossaryinfo.element -->
-  <define name="glossaryinfo.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="glossaryinfo.role.attrib"/>
-    <ref name="local.glossaryinfo.attrib"/>
-  </define>
-  <!-- end of glossaryinfo.attlist -->
-  <!-- end of glossaryinfo.module -->
-  <define name="local.indexinfo.attrib">
-    <empty/>
-  </define>
-  <define name="indexinfo.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:Meta-information for an Index. -->
-  <define name="indexinfo">
-    <element name="indexinfo">
-      <ref name="indexinfo.attlist"/>
-      <oneOrMore>
-        <ref name="info.class"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of indexinfo.element -->
-  <define name="indexinfo.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="indexinfo.role.attrib"/>
-    <ref name="local.indexinfo.attrib"/>
-  </define>
-  <!-- end of indexinfo.attlist -->
-  <!-- end of indexinfo.module -->
-  <define name="local.setindexinfo.attrib">
-    <empty/>
-  </define>
-  <define name="setindexinfo.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:Meta-information for a SetIndex. -->
-  <define name="setindexinfo">
-    <element name="setindexinfo">
-      <ref name="setindexinfo.attlist"/>
-      <oneOrMore>
-        <ref name="info.class"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of setindexinfo.element -->
-  <define name="setindexinfo.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="setindexinfo.role.attrib"/>
-    <ref name="local.setindexinfo.attrib"/>
-  </define>
-  <!-- end of setindexinfo.attlist -->
-  <!-- end of setindexinfo.module -->
-  <define name="local.partinfo.attrib">
-    <empty/>
-  </define>
-  <define name="partinfo.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:Meta-information for a Part. -->
-  <define name="partinfo">
-    <element name="partinfo">
-      <ref name="partinfo.attlist"/>
-      <oneOrMore>
-        <ref name="info.class"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of partinfo.element -->
-  <define name="partinfo.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="partinfo.role.attrib"/>
-    <ref name="local.partinfo.attrib"/>
-  </define>
-  <!-- end of partinfo.attlist -->
-  <!-- end of partinfo.module -->
-  <define name="local.prefaceinfo.attrib">
-    <empty/>
-  </define>
-  <define name="prefaceinfo.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:Meta-information for a Preface. -->
-  <define name="prefaceinfo">
-    <element name="prefaceinfo">
-      <ref name="prefaceinfo.attlist"/>
-      <oneOrMore>
-        <ref name="info.class"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of prefaceinfo.element -->
-  <define name="prefaceinfo.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="prefaceinfo.role.attrib"/>
-    <ref name="local.prefaceinfo.attrib"/>
-  </define>
-  <!-- end of prefaceinfo.attlist -->
-  <!-- end of prefaceinfo.module -->
-  <define name="local.refentryinfo.attrib">
-    <empty/>
-  </define>
-  <define name="refentryinfo.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:Meta-information for a Refentry. -->
-  <define name="refentryinfo">
-    <element name="refentryinfo">
-      <ref name="refentryinfo.attlist"/>
-      <oneOrMore>
-        <ref name="info.class"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of refentryinfo.element -->
-  <define name="refentryinfo.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="refentryinfo.role.attrib"/>
-    <ref name="local.refentryinfo.attrib"/>
-  </define>
-  <!-- end of refentryinfo.attlist -->
-  <!-- end of refentryinfo.module -->
-  <define name="local.refsectioninfo.attrib">
-    <empty/>
-  </define>
-  <define name="refsectioninfo.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:Meta-information for a refsection. -->
-  <define name="refsectioninfo">
-    <element name="refsectioninfo">
-      <ref name="refsectioninfo.attlist"/>
-      <oneOrMore>
-        <ref name="info.class"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of refsectioninfo.element -->
-  <define name="refsectioninfo.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="refsectioninfo.role.attrib"/>
-    <ref name="local.refsectioninfo.attrib"/>
-  </define>
-  <!-- end of refsectioninfo.attlist -->
-  <!-- end of refsectioninfo.module -->
-  <define name="local.refsect1info.attrib">
-    <empty/>
-  </define>
-  <define name="refsect1info.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:Meta-information for a RefSect1. -->
-  <define name="refsect1info">
-    <element name="refsect1info">
-      <ref name="refsect1info.attlist"/>
-      <oneOrMore>
-        <ref name="info.class"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of refsect1info.element -->
-  <define name="refsect1info.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="refsect1info.role.attrib"/>
-    <ref name="local.refsect1info.attrib"/>
-  </define>
-  <!-- end of refsect1info.attlist -->
-  <!-- end of refsect1info.module -->
-  <define name="local.refsect2info.attrib">
-    <empty/>
-  </define>
-  <define name="refsect2info.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:Meta-information for a RefSect2. -->
-  <define name="refsect2info">
-    <element name="refsect2info">
-      <ref name="refsect2info.attlist"/>
-      <oneOrMore>
-        <ref name="info.class"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of refsect2info.element -->
-  <define name="refsect2info.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="refsect2info.role.attrib"/>
-    <ref name="local.refsect2info.attrib"/>
-  </define>
-  <!-- end of refsect2info.attlist -->
-  <!-- end of refsect2info.module -->
-  <define name="local.refsect3info.attrib">
-    <empty/>
-  </define>
-  <define name="refsect3info.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:Meta-information for a RefSect3. -->
-  <define name="refsect3info">
-    <element name="refsect3info">
-      <ref name="refsect3info.attlist"/>
-      <oneOrMore>
-        <ref name="info.class"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of refsect3info.element -->
-  <define name="refsect3info.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="refsect3info.role.attrib"/>
-    <ref name="local.refsect3info.attrib"/>
-  </define>
-  <!-- end of refsect3info.attlist -->
-  <!-- end of refsect3info.module -->
-  <define name="local.refsynopsisdivinfo.attrib">
-    <empty/>
-  </define>
-  <define name="refsynopsisdivinfo.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:Meta-information for a RefSynopsisDiv. -->
-  <define name="refsynopsisdivinfo">
-    <element name="refsynopsisdivinfo">
-      <ref name="refsynopsisdivinfo.attlist"/>
-      <oneOrMore>
-        <ref name="info.class"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of refsynopsisdivinfo.element -->
-  <define name="refsynopsisdivinfo.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="refsynopsisdivinfo.role.attrib"/>
-    <ref name="local.refsynopsisdivinfo.attrib"/>
-  </define>
-  <!-- end of refsynopsisdivinfo.attlist -->
-  <!-- end of refsynopsisdivinfo.module -->
-  <define name="local.referenceinfo.attrib">
-    <empty/>
-  </define>
-  <define name="referenceinfo.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:Meta-information for a Reference. -->
-  <define name="referenceinfo">
-    <element name="referenceinfo">
-      <ref name="referenceinfo.attlist"/>
-      <oneOrMore>
-        <ref name="info.class"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of referenceinfo.element -->
-  <define name="referenceinfo.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="referenceinfo.role.attrib"/>
-    <ref name="local.referenceinfo.attrib"/>
-  </define>
-  <!-- end of referenceinfo.attlist -->
-  <!-- end of referenceinfo.module -->
-  <define name="local.sect1info.attrib">
-    <empty/>
-  </define>
-  <define name="sect1info.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:Meta-information for a Sect1. -->
-  <define name="sect1info">
-    <element name="sect1info">
-      <ref name="sect1info.attlist"/>
-      <oneOrMore>
-        <ref name="info.class"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of sect1info.element -->
-  <define name="sect1info.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="sect1info.role.attrib"/>
-    <ref name="local.sect1info.attrib"/>
-  </define>
-  <!-- end of sect1info.attlist -->
-  <define name="local.sect2info.attrib">
-    <empty/>
-  </define>
-  <define name="sect2info.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:Meta-information for a Sect2. -->
-  <define name="sect2info">
-    <element name="sect2info">
-      <ref name="sect2info.attlist"/>
-      <oneOrMore>
-        <ref name="info.class"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of sect2info.element -->
-  <define name="sect2info.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="sect2info.role.attrib"/>
-    <ref name="local.sect2info.attrib"/>
-  </define>
-  <!-- end of sect2info.attlist -->
-  <define name="local.sect3info.attrib">
-    <empty/>
-  </define>
-  <define name="sect3info.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:Meta-information for a Sect3. -->
-  <define name="sect3info">
-    <element name="sect3info">
-      <ref name="sect3info.attlist"/>
-      <oneOrMore>
-        <ref name="info.class"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of sect3info.element -->
-  <define name="sect3info.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="sect3info.role.attrib"/>
-    <ref name="local.sect3info.attrib"/>
-  </define>
-  <!-- end of sect3info.attlist -->
-  <define name="local.sect4info.attrib">
-    <empty/>
-  </define>
-  <define name="sect4info.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:Meta-information for a Sect4. -->
-  <define name="sect4info">
-    <element name="sect4info">
-      <ref name="sect4info.attlist"/>
-      <oneOrMore>
-        <ref name="info.class"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of sect4info.element -->
-  <define name="sect4info.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="sect4info.role.attrib"/>
-    <ref name="local.sect4info.attrib"/>
-  </define>
-  <!-- end of sect4info.attlist -->
-  <define name="local.sect5info.attrib">
-    <empty/>
-  </define>
-  <define name="sect5info.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:Meta-information for a Sect5. -->
-  <define name="sect5info">
-    <element name="sect5info">
-      <ref name="sect5info.attlist"/>
-      <oneOrMore>
-        <ref name="info.class"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of sect5info.element -->
-  <define name="sect5info.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="sect5info.role.attrib"/>
-    <ref name="local.sect5info.attrib"/>
-  </define>
-  <!-- end of sect5info.attlist -->
-  <!-- ...................................................................... -->
-  <!-- Section (parallel to Sect*) ......................................... -->
-  <define name="local.section.attrib">
-    <empty/>
-  </define>
-  <define name="section.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A recursive section. -->
-  <define name="section">
-    <element name="section">
-      <ref name="section.attlist"/>
-      <optional>
-        <ref name="sectioninfo"/>
-      </optional>
-      <ref name="sect.title.content"/>
-      <zeroOrMore>
-        <ref name="nav.class"/>
-      </zeroOrMore>
-      <choice>
-        <group>
-          <oneOrMore>
-            <ref name="divcomponent.mix"/>
-          </oneOrMore>
-          <choice>
-            <zeroOrMore>
-              <ref name="refentry.class"/>
-            </zeroOrMore>
-            <zeroOrMore>
-              <ref name="section.class"/>
-            </zeroOrMore>
-            <zeroOrMore>
-              <ref name="simplesect"/>
-            </zeroOrMore>
-          </choice>
-        </group>
-        <oneOrMore>
-          <ref name="refentry.class"/>
-        </oneOrMore>
-        <oneOrMore>
-          <ref name="section.class"/>
-        </oneOrMore>
-        <oneOrMore>
-          <ref name="simplesect"/>
-        </oneOrMore>
-      </choice>
-      <zeroOrMore>
-        <ref name="nav.class"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of section.element -->
-  <define name="section.attlist" combine="interleave">
-    <ref name="label.attrib"/>
-    <ref name="status.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="section.role.attrib"/>
-    <ref name="local.section.attrib"/>
-  </define>
-  <!-- end of section.attlist -->
-  <!-- end of section.module -->
-  <define name="sectioninfo.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <define name="local.sectioninfo.attrib">
-    <empty/>
-  </define>
-  <!-- doc:Meta-information for a recursive section. -->
-  <define name="sectioninfo">
-    <element name="sectioninfo">
-      <ref name="sectioninfo.attlist"/>
-      <oneOrMore>
-        <ref name="info.class"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of sectioninfo.element -->
-  <define name="sectioninfo.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="sectioninfo.role.attrib"/>
-    <ref name="local.sectioninfo.attrib"/>
-  </define>
-  <!-- end of sectioninfo.attlist -->
-  <!-- end of sectioninfo.module -->
-  <!-- end of section.content.module -->
-  <!-- ...................................................................... -->
-  <!-- Sect1, Sect2, Sect3, Sect4, Sect5 .................................... -->
-  <define name="local.sect1.attrib">
-    <empty/>
-  </define>
-  <define name="sect1.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A top-level section of document. -->
-  <define name="sect1">
-    <element name="sect1">
-      <ref name="sect1.attlist"/>
-      <optional>
-        <ref name="sect1info"/>
-      </optional>
-      <ref name="sect.title.content"/>
-      <zeroOrMore>
-        <ref name="nav.class"/>
-      </zeroOrMore>
-      <choice>
-        <group>
-          <oneOrMore>
-            <ref name="divcomponent.mix"/>
-          </oneOrMore>
-          <choice>
-            <zeroOrMore>
-              <ref name="refentry.class"/>
-            </zeroOrMore>
-            <zeroOrMore>
-              <ref name="sect2"/>
-            </zeroOrMore>
-            <zeroOrMore>
-              <ref name="simplesect"/>
-            </zeroOrMore>
-          </choice>
-        </group>
-        <oneOrMore>
-          <ref name="refentry.class"/>
-        </oneOrMore>
-        <oneOrMore>
-          <ref name="sect2"/>
-        </oneOrMore>
-        <oneOrMore>
-          <ref name="simplesect"/>
-        </oneOrMore>
-      </choice>
-      <zeroOrMore>
-        <ref name="nav.class"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of sect1.element -->
-  <!--
-    Renderas: Indicates the format in which the heading should
-    appear
-  -->
-  <define name="sect1.attlist" combine="interleave">
-    <optional>
-      <attribute name="renderas">
-        <choice>
-          <value>sect2</value>
-          <value>sect3</value>
-          <value>sect4</value>
-          <value>sect5</value>
-        </choice>
-      </attribute>
-    </optional>
-    <ref name="label.attrib"/>
-    <ref name="status.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="sect1.role.attrib"/>
-    <ref name="local.sect1.attrib"/>
-  </define>
-  <!-- end of sect1.attlist -->
-  <!-- end of sect1.module -->
-  <define name="local.sect2.attrib">
-    <empty/>
-  </define>
-  <define name="sect2.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A subsection within a Sect1. -->
-  <define name="sect2">
-    <element name="sect2">
-      <ref name="sect2.attlist"/>
-      <optional>
-        <ref name="sect2info"/>
-      </optional>
-      <ref name="sect.title.content"/>
-      <zeroOrMore>
-        <ref name="nav.class"/>
-      </zeroOrMore>
-      <choice>
-        <group>
-          <oneOrMore>
-            <ref name="divcomponent.mix"/>
-          </oneOrMore>
-          <choice>
-            <zeroOrMore>
-              <ref name="refentry.class"/>
-            </zeroOrMore>
-            <zeroOrMore>
-              <ref name="sect3"/>
-            </zeroOrMore>
-            <zeroOrMore>
-              <ref name="simplesect"/>
-            </zeroOrMore>
-          </choice>
-        </group>
-        <oneOrMore>
-          <ref name="refentry.class"/>
-        </oneOrMore>
-        <oneOrMore>
-          <ref name="sect3"/>
-        </oneOrMore>
-        <oneOrMore>
-          <ref name="simplesect"/>
-        </oneOrMore>
-      </choice>
-      <zeroOrMore>
-        <ref name="nav.class"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of sect2.element -->
-  <!--
-    Renderas: Indicates the format in which the heading should
-    appear
-  -->
-  <define name="sect2.attlist" combine="interleave">
-    <optional>
-      <attribute name="renderas">
-        <choice>
-          <value>sect1</value>
-          <value>sect3</value>
-          <value>sect4</value>
-          <value>sect5</value>
-        </choice>
-      </attribute>
-    </optional>
-    <ref name="label.attrib"/>
-    <ref name="status.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="sect2.role.attrib"/>
-    <ref name="local.sect2.attrib"/>
-  </define>
-  <!-- end of sect2.attlist -->
-  <!-- end of sect2.module -->
-  <define name="local.sect3.attrib">
-    <empty/>
-  </define>
-  <define name="sect3.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A subsection within a Sect2. -->
-  <define name="sect3">
-    <element name="sect3">
-      <ref name="sect3.attlist"/>
-      <optional>
-        <ref name="sect3info"/>
-      </optional>
-      <ref name="sect.title.content"/>
-      <zeroOrMore>
-        <ref name="nav.class"/>
-      </zeroOrMore>
-      <choice>
-        <group>
-          <oneOrMore>
-            <ref name="divcomponent.mix"/>
-          </oneOrMore>
-          <choice>
-            <zeroOrMore>
-              <ref name="refentry.class"/>
-            </zeroOrMore>
-            <zeroOrMore>
-              <ref name="sect4"/>
-            </zeroOrMore>
-            <zeroOrMore>
-              <ref name="simplesect"/>
-            </zeroOrMore>
-          </choice>
-        </group>
-        <oneOrMore>
-          <ref name="refentry.class"/>
-        </oneOrMore>
-        <oneOrMore>
-          <ref name="sect4"/>
-        </oneOrMore>
-        <oneOrMore>
-          <ref name="simplesect"/>
-        </oneOrMore>
-      </choice>
-      <zeroOrMore>
-        <ref name="nav.class"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of sect3.element -->
-  <!--
-    Renderas: Indicates the format in which the heading should
-    appear
-  -->
-  <define name="sect3.attlist" combine="interleave">
-    <optional>
-      <attribute name="renderas">
-        <choice>
-          <value>sect1</value>
-          <value>sect2</value>
-          <value>sect4</value>
-          <value>sect5</value>
-        </choice>
-      </attribute>
-    </optional>
-    <ref name="label.attrib"/>
-    <ref name="status.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="sect3.role.attrib"/>
-    <ref name="local.sect3.attrib"/>
-  </define>
-  <!-- end of sect3.attlist -->
-  <!-- end of sect3.module -->
-  <define name="local.sect4.attrib">
-    <empty/>
-  </define>
-  <define name="sect4.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A subsection within a Sect3. -->
-  <define name="sect4">
-    <element name="sect4">
-      <ref name="sect4.attlist"/>
-      <optional>
-        <ref name="sect4info"/>
-      </optional>
-      <ref name="sect.title.content"/>
-      <zeroOrMore>
-        <ref name="nav.class"/>
-      </zeroOrMore>
-      <choice>
-        <group>
-          <oneOrMore>
-            <ref name="divcomponent.mix"/>
-          </oneOrMore>
-          <choice>
-            <zeroOrMore>
-              <ref name="refentry.class"/>
-            </zeroOrMore>
-            <zeroOrMore>
-              <ref name="sect5"/>
-            </zeroOrMore>
-            <zeroOrMore>
-              <ref name="simplesect"/>
-            </zeroOrMore>
-          </choice>
-        </group>
-        <oneOrMore>
-          <ref name="refentry.class"/>
-        </oneOrMore>
-        <oneOrMore>
-          <ref name="sect5"/>
-        </oneOrMore>
-        <oneOrMore>
-          <ref name="simplesect"/>
-        </oneOrMore>
-      </choice>
-      <zeroOrMore>
-        <ref name="nav.class"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of sect4.element -->
-  <!--
-    Renderas: Indicates the format in which the heading should
-    appear
-  -->
-  <define name="sect4.attlist" combine="interleave">
-    <optional>
-      <attribute name="renderas">
-        <choice>
-          <value>sect1</value>
-          <value>sect2</value>
-          <value>sect3</value>
-          <value>sect5</value>
-        </choice>
-      </attribute>
-    </optional>
-    <ref name="label.attrib"/>
-    <ref name="status.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="sect4.role.attrib"/>
-    <ref name="local.sect4.attrib"/>
-  </define>
-  <!-- end of sect4.attlist -->
-  <!-- end of sect4.module -->
-  <define name="local.sect5.attrib">
-    <empty/>
-  </define>
-  <define name="sect5.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A subsection within a Sect4. -->
-  <define name="sect5">
-    <element name="sect5">
-      <ref name="sect5.attlist"/>
-      <optional>
-        <ref name="sect5info"/>
-      </optional>
-      <ref name="sect.title.content"/>
-      <zeroOrMore>
-        <ref name="nav.class"/>
-      </zeroOrMore>
-      <choice>
-        <group>
-          <oneOrMore>
-            <ref name="divcomponent.mix"/>
-          </oneOrMore>
-          <choice>
-            <zeroOrMore>
-              <ref name="refentry.class"/>
-            </zeroOrMore>
-            <zeroOrMore>
-              <ref name="simplesect"/>
-            </zeroOrMore>
-          </choice>
-        </group>
-        <oneOrMore>
-          <ref name="refentry.class"/>
-        </oneOrMore>
-        <oneOrMore>
-          <ref name="simplesect"/>
-        </oneOrMore>
-      </choice>
-      <zeroOrMore>
-        <ref name="nav.class"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of sect5.element -->
-  <!--
-    Renderas: Indicates the format in which the heading should
-    appear
-  -->
-  <define name="sect5.attlist" combine="interleave">
-    <optional>
-      <attribute name="renderas">
-        <choice>
-          <value>sect1</value>
-          <value>sect2</value>
-          <value>sect3</value>
-          <value>sect4</value>
-        </choice>
-      </attribute>
-    </optional>
-    <ref name="label.attrib"/>
-    <ref name="status.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="sect5.role.attrib"/>
-    <ref name="local.sect5.attrib"/>
-  </define>
-  <!-- end of sect5.attlist -->
-  <!-- end of sect5.module -->
-  <define name="local.simplesect.attrib">
-    <empty/>
-  </define>
-  <define name="simplesect.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A section of a document with no subdivisions. -->
-  <define name="simplesect">
-    <element name="simplesect">
-      <ref name="simplesect.attlist"/>
-      <ref name="sect.title.content"/>
-      <oneOrMore>
-        <ref name="divcomponent.mix"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of simplesect.element -->
-  <define name="simplesect.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="simplesect.role.attrib"/>
-    <ref name="local.simplesect.attrib"/>
-  </define>
-  <!-- end of simplesect.attlist -->
-  <!-- end of simplesect.module -->
-  <!-- ...................................................................... -->
-  <!-- Bibliography ......................................................... -->
-  <define name="local.bibliography.attrib">
-    <empty/>
-  </define>
-  <define name="bibliography.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A bibliography. -->
-  <define name="bibliography">
-    <element name="bibliography">
-      <ref name="bibliography.attlist"/>
-      <optional>
-        <ref name="bibliographyinfo"/>
-      </optional>
-      <optional>
-        <ref name="bookcomponent.title.content"/>
-      </optional>
-      <zeroOrMore>
-        <ref name="component.mix"/>
-      </zeroOrMore>
-      <choice>
-        <oneOrMore>
-          <ref name="bibliodiv"/>
-        </oneOrMore>
-        <oneOrMore>
-          <choice>
-            <ref name="biblioentry"/>
-            <ref name="bibliomixed"/>
-          </choice>
-        </oneOrMore>
-      </choice>
-    </element>
-  </define>
-  <!-- end of bibliography.element -->
-  <define name="bibliography.attlist" combine="interleave">
-    <ref name="status.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="bibliography.role.attrib"/>
-    <ref name="local.bibliography.attrib"/>
-  </define>
-  <!-- end of bibliography.attlist -->
-  <!-- end of bibliography.module -->
-  <define name="local.bibliodiv.attrib">
-    <empty/>
-  </define>
-  <define name="bibliodiv.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A section of a Bibliography. -->
-  <define name="bibliodiv">
-    <element name="bibliodiv">
-      <ref name="bibliodiv.attlist"/>
-      <optional>
-        <ref name="sect.title.content"/>
-      </optional>
-      <zeroOrMore>
-        <ref name="component.mix"/>
-      </zeroOrMore>
-      <oneOrMore>
-        <choice>
-          <ref name="biblioentry"/>
-          <ref name="bibliomixed"/>
-        </choice>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of bibliodiv.element -->
-  <define name="bibliodiv.attlist" combine="interleave">
-    <ref name="status.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="bibliodiv.role.attrib"/>
-    <ref name="local.bibliodiv.attrib"/>
-  </define>
-  <!-- end of bibliodiv.attlist -->
-  <!-- end of bibliodiv.module -->
-  <!-- end of bibliography.content.module -->
-  <!-- ...................................................................... -->
-  <!-- Glossary ............................................................. -->
-  <define name="local.glossary.attrib">
-    <empty/>
-  </define>
-  <define name="glossary.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A glossary. -->
-  <define name="glossary">
-    <element name="glossary">
-      <ref name="glossary.attlist"/>
-      <optional>
-        <ref name="glossaryinfo"/>
-      </optional>
-      <optional>
-        <ref name="bookcomponent.title.content"/>
-      </optional>
-      <zeroOrMore>
-        <ref name="component.mix"/>
-      </zeroOrMore>
-      <choice>
-        <oneOrMore>
-          <ref name="glossdiv"/>
-        </oneOrMore>
-        <oneOrMore>
-          <ref name="glossentry"/>
-        </oneOrMore>
-      </choice>
-      <optional>
-        <ref name="bibliography"/>
-      </optional>
-    </element>
-  </define>
-  <!-- end of glossary.element -->
-  <define name="glossary.attlist" combine="interleave">
-    <ref name="status.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="glossary.role.attrib"/>
-    <ref name="local.glossary.attrib"/>
-  </define>
-  <!-- end of glossary.attlist -->
-  <!-- end of glossary.module -->
-  <define name="local.glossdiv.attrib">
-    <empty/>
-  </define>
-  <define name="glossdiv.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A division in a Glossary. -->
-  <define name="glossdiv">
-    <element name="glossdiv">
-      <ref name="glossdiv.attlist"/>
-      <ref name="sect.title.content"/>
-      <zeroOrMore>
-        <ref name="component.mix"/>
-      </zeroOrMore>
-      <oneOrMore>
-        <ref name="glossentry"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of glossdiv.element -->
-  <define name="glossdiv.attlist" combine="interleave">
-    <ref name="status.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="glossdiv.role.attrib"/>
-    <ref name="local.glossdiv.attrib"/>
-  </define>
-  <!-- end of glossdiv.attlist -->
-  <!-- end of glossdiv.module -->
-  <!-- end of glossary.content.module -->
-  <!-- ...................................................................... -->
-  <!-- Index and SetIndex ................................................... -->
-  <define name="local.indexes.attrib">
-    <empty/>
-  </define>
-  <define name="indexes.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:An index. -->
-  <define name="index">
-    <element name="index">
-      <ref name="index.attlist"/>
-      <optional>
-        <ref name="indexinfo"/>
-      </optional>
-      <optional>
-        <ref name="bookcomponent.title.content"/>
-      </optional>
-      <zeroOrMore>
-        <ref name="component.mix"/>
-      </zeroOrMore>
-      <choice>
-        <zeroOrMore>
-          <ref name="indexdiv"/>
-        </zeroOrMore>
-        <zeroOrMore>
-          <ref name="indexentry"/>
-        </zeroOrMore>
-      </choice>
-    </element>
-  </define>
-  <!-- end of index.element -->
-  <define name="index.attlist" combine="interleave">
-    <optional>
-      <attribute name="type"/>
-    </optional>
-    <ref name="common.attrib"/>
-    <ref name="indexes.role.attrib"/>
-    <ref name="local.indexes.attrib"/>
-  </define>
-  <!-- end of index.attlist -->
-  <!-- doc:An index to a set of books. -->
-  <define name="setindex">
-    <element name="setindex">
-      <ref name="setindex.attlist"/>
-      <optional>
-        <ref name="setindexinfo"/>
-      </optional>
-      <optional>
-        <ref name="bookcomponent.title.content"/>
-      </optional>
-      <zeroOrMore>
-        <ref name="component.mix"/>
-      </zeroOrMore>
-      <choice>
-        <zeroOrMore>
-          <ref name="indexdiv"/>
-        </zeroOrMore>
-        <zeroOrMore>
-          <ref name="indexentry"/>
-        </zeroOrMore>
-      </choice>
-    </element>
-  </define>
-  <!-- end of setindex.element -->
-  <define name="setindex.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="indexes.role.attrib"/>
-    <ref name="local.indexes.attrib"/>
-  </define>
-  <!-- end of setindex.attlist -->
-  <!-- end of indexes.module -->
-  <!--
-    SegmentedList in this content is useful for marking up permuted
-    indices.
-  -->
-  <define name="local.indexdiv.attrib">
-    <empty/>
-  </define>
-  <define name="indexdiv.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A division in an index. -->
-  <define name="indexdiv">
-    <element name="indexdiv">
-      <ref name="indexdiv.attlist"/>
-      <optional>
-        <ref name="sect.title.content"/>
-      </optional>
-      <group>
-        <zeroOrMore>
-          <ref name="indexdivcomponent.mix"/>
-        </zeroOrMore>
-        <choice>
-          <oneOrMore>
-            <ref name="indexentry"/>
-          </oneOrMore>
-          <ref name="segmentedlist"/>
-        </choice>
-      </group>
-    </element>
-  </define>
-  <!-- end of indexdiv.element -->
-  <define name="indexdiv.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="indexdiv.role.attrib"/>
-    <ref name="local.indexdiv.attrib"/>
-  </define>
-  <!-- end of indexdiv.attlist -->
-  <!-- end of indexdiv.module -->
-  <!-- Index entries appear in the index, not the text. -->
-  <define name="local.indexentry.attrib">
-    <empty/>
-  </define>
-  <define name="indexentry.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:An entry in an index. -->
-  <define name="indexentry">
-    <element name="indexentry">
-      <ref name="indexentry.attlist"/>
-      <ref name="primaryie"/>
-      <zeroOrMore>
-        <choice>
-          <ref name="seeie"/>
-          <ref name="seealsoie"/>
-        </choice>
-      </zeroOrMore>
-      <zeroOrMore>
-        <ref name="secondaryie"/>
-        <zeroOrMore>
-          <choice>
-            <ref name="seeie"/>
-            <ref name="seealsoie"/>
-            <ref name="tertiaryie"/>
-          </choice>
-        </zeroOrMore>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of indexentry.element -->
-  <define name="indexentry.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="indexentry.role.attrib"/>
-    <ref name="local.indexentry.attrib"/>
-  </define>
-  <!-- end of indexentry.attlist -->
-  <!-- end of indexentry.module -->
-  <define name="local.primsecterie.attrib">
-    <empty/>
-  </define>
-  <define name="primsecterie.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A primary term in an index entry, not in the text. -->
-  <define name="primaryie">
-    <element name="primaryie">
-      <ref name="primaryie.attlist"/>
-      <zeroOrMore>
-        <ref name="ndxterm.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of primaryie.element -->
-  <!-- to IndexTerms that these entries represent -->
-  <define name="primaryie.attlist" combine="interleave">
-    <ref name="linkends.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="primsecterie.role.attrib"/>
-    <ref name="local.primsecterie.attrib"/>
-  </define>
-  <!-- end of primaryie.attlist -->
-  <!-- doc:A secondary term in an index entry, rather than in the text. -->
-  <define name="secondaryie">
-    <element name="secondaryie">
-      <ref name="secondaryie.attlist"/>
-      <zeroOrMore>
-        <ref name="ndxterm.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of secondaryie.element -->
-  <!-- to IndexTerms that these entries represent -->
-  <define name="secondaryie.attlist" combine="interleave">
-    <ref name="linkends.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="primsecterie.role.attrib"/>
-    <ref name="local.primsecterie.attrib"/>
-  </define>
-  <!-- end of secondaryie.attlist -->
-  <!-- doc:A tertiary term in an index entry, rather than in the text. -->
-  <define name="tertiaryie">
-    <element name="tertiaryie">
-      <ref name="tertiaryie.attlist"/>
-      <zeroOrMore>
-        <ref name="ndxterm.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of tertiaryie.element -->
-  <!-- to IndexTerms that these entries represent -->
-  <define name="tertiaryie.attlist" combine="interleave">
-    <ref name="linkends.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="primsecterie.role.attrib"/>
-    <ref name="local.primsecterie.attrib"/>
-  </define>
-  <!-- end of tertiaryie.attlist -->
-  <!-- end of primsecterie.module -->
-  <define name="local.seeie.attrib">
-    <empty/>
-  </define>
-  <define name="seeie.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A See entry in an index, rather than in the text. -->
-  <define name="seeie">
-    <element name="seeie">
-      <ref name="seeie.attlist"/>
-      <zeroOrMore>
-        <ref name="ndxterm.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of seeie.element -->
-  <!-- to IndexEntry to look up -->
-  <define name="seeie.attlist" combine="interleave">
-    <ref name="linkend.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="seeie.role.attrib"/>
-    <ref name="local.seeie.attrib"/>
-  </define>
-  <!-- end of seeie.attlist -->
-  <!-- end of seeie.module -->
-  <define name="local.seealsoie.attrib">
-    <empty/>
-  </define>
-  <define name="seealsoie.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A See also entry in an index, rather than in the text. -->
-  <define name="seealsoie">
-    <element name="seealsoie">
-      <ref name="seealsoie.attlist"/>
-      <zeroOrMore>
-        <ref name="ndxterm.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of seealsoie.element -->
-  <!-- to related IndexEntries -->
-  <define name="seealsoie.attlist" combine="interleave">
-    <ref name="linkends.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="seealsoie.role.attrib"/>
-    <ref name="local.seealsoie.attrib"/>
-  </define>
-  <!-- end of seealsoie.attlist -->
-  <!-- end of seealsoie.module -->
-  <!-- end of index.content.module -->
-  <!-- ...................................................................... -->
-  <!-- RefEntry ............................................................. -->
-  <define name="local.refentry.attrib">
-    <empty/>
-  </define>
-  <define name="refentry.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A reference page (originally a UNIX man-style reference page). -->
-  <define name="refentry">
-    <element name="refentry">
-      <ref name="refentry.attlist"/>
-      <optional>
-        <ref name="beginpage"/>
-      </optional>
-      <zeroOrMore>
-        <ref name="ndxterm.class"/>
-      </zeroOrMore>
-      <optional>
-        <ref name="refentryinfo"/>
-      </optional>
-      <optional>
-        <ref name="refmeta"/>
-      </optional>
-      <zeroOrMore>
-        <choice>
-          <ref name="remark"/>
-          <ref name="link.char.class"/>
-        </choice>
-      </zeroOrMore>
-      <oneOrMore>
-        <ref name="refnamediv"/>
-      </oneOrMore>
-      <optional>
-        <ref name="refsynopsisdiv"/>
-      </optional>
-      <choice>
-        <oneOrMore>
-          <ref name="refsect1"/>
-        </oneOrMore>
-        <oneOrMore>
-          <ref name="refsection"/>
-        </oneOrMore>
-      </choice>
-    </element>
-  </define>
-  <!-- end of refentry.element -->
-  <define name="refentry.attlist" combine="interleave">
-    <ref name="status.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="refentry.role.attrib"/>
-    <ref name="local.refentry.attrib"/>
-  </define>
-  <!-- end of refentry.attlist -->
-  <!-- end of refentry.module -->
-  <define name="local.refmeta.attrib">
-    <empty/>
-  </define>
-  <define name="refmeta.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:Meta-information for a reference entry. -->
-  <define name="refmeta">
-    <element name="refmeta">
-      <ref name="refmeta.attlist"/>
-      <zeroOrMore>
-        <ref name="ndxterm.class"/>
-      </zeroOrMore>
-      <ref name="refentrytitle"/>
-      <optional>
-        <ref name="manvolnum"/>
-      </optional>
-      <zeroOrMore>
-        <ref name="refmiscinfo"/>
-      </zeroOrMore>
-      <zeroOrMore>
-        <ref name="ndxterm.class"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of refmeta.element -->
-  <define name="refmeta.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="refmeta.role.attrib"/>
-    <ref name="local.refmeta.attrib"/>
-  </define>
-  <!-- end of refmeta.attlist -->
-  <!-- end of refmeta.module -->
-  <define name="local.refmiscinfo.attrib">
-    <empty/>
-  </define>
-  <define name="refmiscinfo.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:Meta-information for a reference entry other than the title and volume number. -->
-  <define name="refmiscinfo">
-    <element name="refmiscinfo">
-      <ref name="refmiscinfo.attlist"/>
-      <zeroOrMore>
-        <ref name="docinfo.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of refmiscinfo.element -->
-  <!-- Class: Freely assignable parameter; no default -->
-  <define name="refmiscinfo.attlist" combine="interleave">
-    <optional>
-      <attribute name="class"/>
-    </optional>
-    <ref name="common.attrib"/>
-    <ref name="refmiscinfo.role.attrib"/>
-    <ref name="local.refmiscinfo.attrib"/>
-  </define>
-  <!-- end of refmiscinfo.attlist -->
-  <!-- end of refmiscinfo.module -->
-  <define name="local.refnamediv.attrib">
-    <empty/>
-  </define>
-  <define name="refnamediv.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The name, purpose, and classification of a reference page. -->
-  <define name="refnamediv">
-    <element name="refnamediv">
-      <ref name="refnamediv.attlist"/>
-      <optional>
-        <ref name="refdescriptor"/>
-      </optional>
-      <oneOrMore>
-        <ref name="refname"/>
-      </oneOrMore>
-      <ref name="refpurpose"/>
-      <zeroOrMore>
-        <ref name="refclass"/>
-      </zeroOrMore>
-      <zeroOrMore>
-        <choice>
-          <ref name="remark"/>
-          <ref name="link.char.class"/>
-        </choice>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of refnamediv.element -->
-  <define name="refnamediv.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="refnamediv.role.attrib"/>
-    <ref name="local.refnamediv.attrib"/>
-  </define>
-  <!-- end of refnamediv.attlist -->
-  <!-- end of refnamediv.module -->
-  <define name="local.refdescriptor.attrib">
-    <empty/>
-  </define>
-  <define name="refdescriptor.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A description of the topic of a reference page. -->
-  <define name="refdescriptor">
-    <element name="refdescriptor">
-      <ref name="refdescriptor.attlist"/>
-      <zeroOrMore>
-        <ref name="refname.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of refdescriptor.element -->
-  <define name="refdescriptor.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="refdescriptor.role.attrib"/>
-    <ref name="local.refdescriptor.attrib"/>
-  </define>
-  <!-- end of refdescriptor.attlist -->
-  <!-- end of refdescriptor.module -->
-  <define name="local.refname.attrib">
-    <empty/>
-  </define>
-  <define name="refname.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The name of (one of) the subject(s) of a reference page. -->
-  <define name="refname">
-    <element name="refname">
-      <ref name="refname.attlist"/>
-      <zeroOrMore>
-        <ref name="refname.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of refname.element -->
-  <define name="refname.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="refname.role.attrib"/>
-    <ref name="local.refname.attrib"/>
-  </define>
-  <!-- end of refname.attlist -->
-  <!-- end of refname.module -->
-  <define name="local.refpurpose.attrib">
-    <empty/>
-  </define>
-  <define name="refpurpose.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A short (one sentence) synopsis of the topic of a reference page. -->
-  <define name="refpurpose">
-    <element name="refpurpose">
-      <ref name="refpurpose.attlist"/>
-      <zeroOrMore>
-        <ref name="refinline.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of refpurpose.element -->
-  <define name="refpurpose.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="refpurpose.role.attrib"/>
-    <ref name="local.refpurpose.attrib"/>
-  </define>
-  <!-- end of refpurpose.attlist -->
-  <!-- end of refpurpose.module -->
-  <define name="local.refclass.attrib">
-    <empty/>
-  </define>
-  <define name="refclass.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The scope or other indication of applicability of a reference entry. -->
-  <define name="refclass">
-    <element name="refclass">
-      <ref name="refclass.attlist"/>
-      <zeroOrMore>
-        <ref name="refclass.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of refclass.element -->
-  <define name="refclass.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="refclass.role.attrib"/>
-    <ref name="local.refclass.attrib"/>
-  </define>
-  <!-- end of refclass.attlist -->
-  <!-- end of refclass.module -->
-  <define name="local.refsynopsisdiv.attrib">
-    <empty/>
-  </define>
-  <define name="refsynopsisdiv.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A syntactic synopsis of the subject of the reference page. -->
-  <define name="refsynopsisdiv">
-    <element name="refsynopsisdiv">
-      <ref name="refsynopsisdiv.attlist"/>
-      <optional>
-        <ref name="refsynopsisdivinfo"/>
-      </optional>
-      <optional>
-        <ref name="refsect.title.content"/>
-      </optional>
-      <choice>
-        <group>
-          <oneOrMore>
-            <ref name="refcomponent.mix"/>
-          </oneOrMore>
-          <zeroOrMore>
-            <ref name="refsect2"/>
-          </zeroOrMore>
-        </group>
-        <oneOrMore>
-          <ref name="refsect2"/>
-        </oneOrMore>
-      </choice>
-    </element>
-  </define>
-  <!-- end of refsynopsisdiv.element -->
-  <define name="refsynopsisdiv.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="refsynopsisdiv.role.attrib"/>
-    <ref name="local.refsynopsisdiv.attrib"/>
-  </define>
-  <!-- end of refsynopsisdiv.attlist -->
-  <!-- end of refsynopsisdiv.module -->
-  <define name="local.refsection.attrib">
-    <empty/>
-  </define>
-  <define name="refsection.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A recursive section in a refentry. -->
-  <define name="refsection">
-    <element name="refsection">
-      <ref name="refsection.attlist"/>
-      <optional>
-        <ref name="refsectioninfo"/>
-      </optional>
-      <ref name="refsect.title.content"/>
-      <choice>
-        <group>
-          <oneOrMore>
-            <ref name="refcomponent.mix"/>
-          </oneOrMore>
-          <zeroOrMore>
-            <ref name="refsection"/>
-          </zeroOrMore>
-        </group>
-        <oneOrMore>
-          <ref name="refsection"/>
-        </oneOrMore>
-      </choice>
-    </element>
-  </define>
-  <!-- end of refsection.element -->
-  <define name="refsection.attlist" combine="interleave">
-    <ref name="status.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="refsection.role.attrib"/>
-    <ref name="local.refsection.attrib"/>
-  </define>
-  <!-- end of refsection.attlist -->
-  <!-- end of refsection.module -->
-  <define name="local.refsect1.attrib">
-    <empty/>
-  </define>
-  <define name="refsect1.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A major subsection of a reference entry. -->
-  <define name="refsect1">
-    <element name="refsect1">
-      <ref name="refsect1.attlist"/>
-      <optional>
-        <ref name="refsect1info"/>
-      </optional>
-      <ref name="refsect.title.content"/>
-      <choice>
-        <group>
-          <oneOrMore>
-            <ref name="refcomponent.mix"/>
-          </oneOrMore>
-          <zeroOrMore>
-            <ref name="refsect2"/>
-          </zeroOrMore>
-        </group>
-        <oneOrMore>
-          <ref name="refsect2"/>
-        </oneOrMore>
-      </choice>
-    </element>
-  </define>
-  <!-- end of refsect1.element -->
-  <define name="refsect1.attlist" combine="interleave">
-    <ref name="status.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="refsect1.role.attrib"/>
-    <ref name="local.refsect1.attrib"/>
-  </define>
-  <!-- end of refsect1.attlist -->
-  <!-- end of refsect1.module -->
-  <define name="local.refsect2.attrib">
-    <empty/>
-  </define>
-  <define name="refsect2.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A subsection of a RefSect1. -->
-  <define name="refsect2">
-    <element name="refsect2">
-      <ref name="refsect2.attlist"/>
-      <optional>
-        <ref name="refsect2info"/>
-      </optional>
-      <ref name="refsect.title.content"/>
-      <choice>
-        <group>
-          <oneOrMore>
-            <ref name="refcomponent.mix"/>
-          </oneOrMore>
-          <zeroOrMore>
-            <ref name="refsect3"/>
-          </zeroOrMore>
-        </group>
-        <oneOrMore>
-          <ref name="refsect3"/>
-        </oneOrMore>
-      </choice>
-    </element>
-  </define>
-  <!-- end of refsect2.element -->
-  <define name="refsect2.attlist" combine="interleave">
-    <ref name="status.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="refsect2.role.attrib"/>
-    <ref name="local.refsect2.attrib"/>
-  </define>
-  <!-- end of refsect2.attlist -->
-  <!-- end of refsect2.module -->
-  <define name="local.refsect3.attrib">
-    <empty/>
-  </define>
-  <define name="refsect3.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A subsection of a RefSect2. -->
-  <define name="refsect3">
-    <element name="refsect3">
-      <ref name="refsect3.attlist"/>
-      <optional>
-        <ref name="refsect3info"/>
-      </optional>
-      <ref name="refsect.title.content"/>
-      <oneOrMore>
-        <ref name="refcomponent.mix"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of refsect3.element -->
-  <define name="refsect3.attlist" combine="interleave">
-    <ref name="status.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="refsect3.role.attrib"/>
-    <ref name="local.refsect3.attrib"/>
-  </define>
-  <!-- end of refsect3.attlist -->
-  <!-- end of refsect3.module -->
-  <!-- end of refentry.content.module -->
-  <!-- ...................................................................... -->
-  <!-- Article .............................................................. -->
-  <!--
-    An Article is a chapter-level, stand-alone document that is often,
-    but need not be, collected into a Book.
-  -->
-  <define name="local.article.attrib">
-    <empty/>
-  </define>
-  <define name="article.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:An article. -->
-  <define name="article">
-    <element name="article">
-      <ref name="article.attlist"/>
-      <optional>
-        <ref name="div.title.content"/>
-      </optional>
-      <optional>
-        <ref name="articleinfo"/>
-      </optional>
-      <optional>
-        <ref name="tocchap"/>
-      </optional>
-      <zeroOrMore>
-        <ref name="lot"/>
-      </zeroOrMore>
-      <ref name="bookcomponent.content"/>
-      <zeroOrMore>
-        <choice>
-          <ref name="nav.class"/>
-          <ref name="appendix.class"/>
-          <ref name="colophon"/>
-          <ref name="ackno"/>
-        </choice>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of article.element -->
-  <!--
-    Class: Indicates the type of a particular article;
-    all articles have the same structure and general purpose.
-    No default.
-  -->
-  <!-- ParentBook: ID of the enclosing Book -->
-  <define name="article.attlist" combine="interleave">
-    <optional>
-      <attribute name="class">
-        <choice>
-          <value>journalarticle</value>
-          <value>productsheet</value>
-          <value>whitepaper</value>
-          <value>techreport</value>
-          <value>specification</value>
-          <value>faq</value>
-        </choice>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="parentbook">
-        <data type="IDREF"/>
-      </attribute>
-    </optional>
-    <ref name="status.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="article.role.attrib"/>
-    <ref name="local.article.attrib"/>
-  </define>
-</grammar>
-<!-- end of article.attlist -->
-<!-- end of article.module -->
-<!-- End of DocBook document hierarchy module V4.5 ........................ -->
-<!-- ...................................................................... -->
Index: OK/schema/docbook/4.5/rng/dbnotnx.rnc
===================================================================
--- BOOK/schema/docbook/4.5/rng/dbnotnx.rnc	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,85 +1,0 @@
-# ......................................................................
-
-# DocBook notations module V4.5 ........................................
-
-# File dbnotnx.mod .....................................................
-
-# Copyright 1992-2004 HaL Computer Systems, Inc.,
-# O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software
-# Corporation, Norman Walsh, Sun Microsystems, Inc., and the
-# Organization for the Advancement of Structured Information
-# Standards (OASIS).
-# 
-# $Id: dbnotnx.mod 6340 2006-10-03 13:23:24Z nwalsh $
-# 
-# Permission to use, copy, modify and distribute the DocBook DTD
-# and its accompanying documentation for any purpose and without fee
-# is hereby granted in perpetuity, provided that the above copyright
-# notice and this paragraph appear in all copies.  The copyright
-# holders make no representation about the suitability of the DTD for
-# any purpose.  It is provided "as is" without expressed or implied
-# warranty.
-# 
-# If you modify the DocBook DTD in any way, except for declaring and
-# referencing additional sets of general entities and declaring
-# additional notations, label your DTD as a variant of DocBook.  See
-# the maintenance documentation for more information.
-# 
-# Please direct all questions, bug reports, or suggestions for
-# changes to the docbook@lists.oasis-open.org mailing list. For more
-# information, see http://www.oasis-open.org/docbook/.
-
-# ......................................................................
-
-# This module contains the notation declarations used by DocBook.
-# 
-# In DTD driver files referring to this module, please use an entity
-# declaration that uses the public identifier shown below:
-# 
-# <!ENTITY % dbnotn PUBLIC
-# "-//OASIS//ENTITIES DocBook Notations V4.5//EN"
-# "dbnotnx.mod">
-# %dbnotn;
-# 
-# See the documentation for detailed information on the parameter
-# entity and module scheme used in DocBook, customizing DocBook and
-# planning for interchange, and changes made since the last release
-# of DocBook.
-
-local.notation.class = notAllowed
-notation.class =
-  "BMP"
-  | "CGM-CHAR"
-  | "CGM-BINARY"
-  | "CGM-CLEAR"
-  | "DITROFF"
-  | "DVI"
-  | "EPS"
-  | "EQN"
-  | "FAX"
-  | "GIF"
-  | "GIF87a"
-  | "GIF89a"
-  | "JPG"
-  | "JPEG"
-  | "IGES"
-  | "PCX"
-  | "PIC"
-  | "PNG"
-  | "PS"
-  | "SGML"
-  | "TBL"
-  | "TEX"
-  | "TIFF"
-  | "WMF"
-  | "WPG"
-  | "SVG"
-  | "PDF"
-  | "SWF"
-  | "linespecific"
-  | local.notation.class
-# WordPerfect Graphic format
-
-# End of DocBook notations module V4.5 .................................
-
-# ......................................................................
Index: OK/schema/docbook/4.5/rng/dbnotnx.rng
===================================================================
--- BOOK/schema/docbook/4.5/rng/dbnotnx.rng	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,89 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- ...................................................................... -->
-<!-- DocBook notations module V4.5 ........................................ -->
-<!-- File dbnotnx.mod ..................................................... -->
-<!--
-  Copyright 1992-2004 HaL Computer Systems, Inc.,
-  O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software
-  Corporation, Norman Walsh, Sun Microsystems, Inc., and the
-  Organization for the Advancement of Structured Information
-  Standards (OASIS).
-  
-  $Id: dbnotnx.mod 6340 2006-10-03 13:23:24Z nwalsh $
-  
-  Permission to use, copy, modify and distribute the DocBook DTD
-  and its accompanying documentation for any purpose and without fee
-  is hereby granted in perpetuity, provided that the above copyright
-  notice and this paragraph appear in all copies.  The copyright
-  holders make no representation about the suitability of the DTD for
-  any purpose.  It is provided "as is" without expressed or implied
-  warranty.
-  
-  If you modify the DocBook DTD in any way, except for declaring and
-  referencing additional sets of general entities and declaring
-  additional notations, label your DTD as a variant of DocBook.  See
-  the maintenance documentation for more information.
-  
-  Please direct all questions, bug reports, or suggestions for
-  changes to the docbook@lists.oasis-open.org mailing list. For more
-  information, see http://www.oasis-open.org/docbook/.
--->
-<!-- ...................................................................... -->
-<!--
-  This module contains the notation declarations used by DocBook.
-  
-  In DTD driver files referring to this module, please use an entity
-  declaration that uses the public identifier shown below:
-  
-  <!ENTITY % dbnotn PUBLIC
-  "-//OASIS//ENTITIES DocBook Notations V4.5//EN"
-  "dbnotnx.mod">
-  %dbnotn;
-  
-  See the documentation for detailed information on the parameter
-  entity and module scheme used in DocBook, customizing DocBook and
-  planning for interchange, and changes made since the last release
-  of DocBook.
--->
-<grammar xmlns="http://relaxng.org/ns/structure/1.0">
-  <define name="local.notation.class">
-    <notAllowed/>
-  </define>
-  <define name="notation.class">
-    <choice>
-      <value>BMP</value>
-      <value>CGM-CHAR</value>
-      <value>CGM-BINARY</value>
-      <value>CGM-CLEAR</value>
-      <value>DITROFF</value>
-      <value>DVI</value>
-      <value>EPS</value>
-      <value>EQN</value>
-      <value>FAX</value>
-      <value>GIF</value>
-      <value>GIF87a</value>
-      <value>GIF89a</value>
-      <value>JPG</value>
-      <value>JPEG</value>
-      <value>IGES</value>
-      <value>PCX</value>
-      <value>PIC</value>
-      <value>PNG</value>
-      <value>PS</value>
-      <value>SGML</value>
-      <value>TBL</value>
-      <value>TEX</value>
-      <value>TIFF</value>
-      <value>WMF</value>
-      <value>WPG</value>
-      <value>SVG</value>
-      <value>PDF</value>
-      <value>SWF</value>
-      <value>linespecific</value>
-      <ref name="local.notation.class"/>
-    </choice>
-  </define>
-</grammar>
-<!-- WordPerfect Graphic format -->
-<!-- End of DocBook notations module V4.5 ................................. -->
-<!-- ...................................................................... -->
Index: OK/schema/docbook/4.5/rng/dbpoolx.rnc
===================================================================
--- BOOK/schema/docbook/4.5/rng/dbpoolx.rnc	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,5785 +1,0 @@
-# ......................................................................
-
-# DocBook XML information pool module V4.5 .............................
-
-# File dbpoolx.mod .....................................................
-
-# Copyright 1992-2004 HaL Computer Systems, Inc.,
-# O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software
-# Corporation, Norman Walsh, Sun Microsystems, Inc., and the
-# Organization for the Advancement of Structured Information
-# Standards (OASIS).
-# 
-# $Id: dbpoolx.mod 6340 2006-10-03 13:23:24Z nwalsh $
-# 
-# Permission to use, copy, modify and distribute the DocBook XML DTD
-# and its accompanying documentation for any purpose and without fee
-# is hereby granted in perpetuity, provided that the above copyright
-# notice and this paragraph appear in all copies.  The copyright
-# holders make no representation about the suitability of the DTD for
-# any purpose.  It is provided "as is" without expressed or implied
-# warranty.
-# 
-# If you modify the DocBook XML DTD in any way, except for declaring and
-# referencing additional sets of general entities and declaring
-# additional notations, label your DTD as a variant of DocBook.  See
-# the maintenance documentation for more information.
-# 
-# Please direct all questions, bug reports, or suggestions for
-# changes to the docbook@lists.oasis-open.org mailing list. For more
-# information, see http://www.oasis-open.org/docbook/.
-
-# ......................................................................
-
-# This module contains the definitions for the objects, inline
-# elements, and so on that are available to be used as the main
-# content of DocBook documents.  Some elements are useful for general
-# publishing, and others are useful specifically for computer
-# documentation.
-# 
-# This module has the following dependencies on other modules:
-# 
-# o It assumes that a %notation.class; entity is defined by the
-#   driver file or other high-level module.  This entity is
-#   referenced in the NOTATION attributes for the graphic-related and
-#   ModeSpec elements.
-# 
-# o It assumes that an appropriately parameterized table module is
-#   available for use with the table-related elements.
-# 
-# In DTD driver files referring to this module, please use an entity
-# declaration that uses the public identifier shown below:
-# 
-# <!ENTITY % dbpool PUBLIC
-# "-//OASIS//ELEMENTS DocBook XML Information Pool V4.5//EN"
-# "dbpoolx.mod">
-# %dbpool;
-# 
-# See the documentation for detailed information on the parameter
-# entity and module scheme used in DocBook, customizing DocBook and
-# planning for interchange, and changes made since the last release
-# of DocBook.
-
-# ......................................................................
-
-# Forms entities .......................................................
-
-# These PEs provide the hook by which the forms module can be inserted
-
-# into the DTD.
-
-namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
-
-forminlines.hook = notAllowed
-forms.hook = notAllowed
-# ......................................................................
-
-# General-purpose semantics entities ...................................
-yesorno.attvals = string
-# ......................................................................
-
-# Entities for module inclusions .......................................
-
-# ......................................................................
-
-# Entities for element classes and mixtures ............................
-
-# "Ubiquitous" classes: ndxterm.class and beginpage
-local.ndxterm.class = notAllowed
-ndxterm.class = indexterm | local.ndxterm.class
-# Object-level classes .................................................
-local.list.class = notAllowed
-list.class =
-  calloutlist
-  | glosslist
-  | bibliolist
-  | itemizedlist
-  | orderedlist
-  | segmentedlist
-  | simplelist
-  | variablelist
-  | local.list.class
-local.admon.class = notAllowed
-admon.class =
-  caution | important | note | tip | warning | local.admon.class
-local.linespecific.class = notAllowed
-linespecific.class =
-  literallayout
-  | programlisting
-  | programlistingco
-  | screen
-  | screenco
-  | screenshot
-  | local.linespecific.class
-local.method.synop.class = notAllowed
-method.synop.class =
-  constructorsynopsis
-  | destructorsynopsis
-  | methodsynopsis
-  | local.method.synop.class
-local.synop.class = notAllowed
-synop.class =
-  synopsis
-  | cmdsynopsis
-  | funcsynopsis
-  | classsynopsis
-  | fieldsynopsis
-  | method.synop.class
-  | local.synop.class
-local.para.class = notAllowed
-para.class = formalpara | para | simpara | local.para.class
-local.informal.class = notAllowed
-informal.class =
-  address
-  | blockquote
-  | graphic
-  | graphicco
-  | mediaobject
-  | mediaobjectco
-  | informalequation
-  | informalexample
-  | informalfigure
-  | informaltable
-  | local.informal.class
-local.formal.class = notAllowed
-formal.class = equation | example | figure | table | local.formal.class
-# The DocBook TC may produce an official EBNF module for DocBook.
-
-# This PE provides the hook by which it can be inserted into the DTD.
-ebnf.block.hook = notAllowed
-local.compound.class = notAllowed
-compound.class =
-  msgset
-  | procedure
-  | sidebar
-  | qandaset
-  | task
-  | ebnf.block.hook
-  | local.compound.class
-local.genobj.class = notAllowed
-genobj.class =
-  anchor | bridgehead | remark | highlights | local.genobj.class
-local.descobj.class = notAllowed
-descobj.class = abstract | authorblurb | epigraph | local.descobj.class
-# Character-level classes ..............................................
-local.xref.char.class = notAllowed
-xref.char.class = footnoteref | xref | biblioref | local.xref.char.class
-local.gen.char.class = notAllowed
-gen.char.class =
-  abbrev
-  | acronym
-  | citation
-  | citerefentry
-  | citetitle
-  | citebiblioid
-  | emphasis
-  | firstterm
-  | foreignphrase
-  | glossterm
-  | termdef
-  | footnote
-  | phrase
-  | orgname
-  | quote
-  | trademark
-  | wordasword
-  | personname
-  | local.gen.char.class
-local.link.char.class = notAllowed
-link.char.class = link | olink | ulink | local.link.char.class
-# The DocBook TC may produce an official EBNF module for DocBook.
-
-# This PE provides the hook by which it can be inserted into the DTD.
-ebnf.inline.hook = notAllowed
-local.tech.char.class = notAllowed
-tech.char.class =
-  action
-  | application
-  | classname
-  | methodname
-  | interfacename
-  | exceptionname
-  | ooclass
-  | oointerface
-  | ooexception
-  | package
-  | command
-  | computeroutput
-  | database
-  | email
-  | envar
-  | errorcode
-  | errorname
-  | errortype
-  | errortext
-  | filename
-  | function
-  | guibutton
-  | guiicon
-  | guilabel
-  | guimenu
-  | guimenuitem
-  | guisubmenu
-  | hardware
-  | interface
-  | keycap
-  | keycode
-  | keycombo
-  | keysym
-  | literal
-  | code
-  | constant
-  | markup
-  | medialabel
-  | menuchoice
-  | mousebutton
-  | option
-  | optional
-  | parameter
-  | prompt
-  | property
-  | replaceable
-  | returnvalue
-  | sgmltag
-  | structfield
-  | structname
-  | symbol
-  | systemitem
-  | uri
-  | \token
-  | type
-  | userinput
-  | varname
-  | ebnf.inline.hook
-  | local.tech.char.class
-local.base.char.class = notAllowed
-base.char.class = anchor | local.base.char.class
-local.docinfo.char.class = notAllowed
-docinfo.char.class =
-  author
-  | authorinitials
-  | corpauthor
-  | corpcredit
-  | modespec
-  | othercredit
-  | productname
-  | productnumber
-  | revhistory
-  | local.docinfo.char.class
-local.other.char.class = notAllowed
-other.char.class =
-  remark | subscript | superscript | local.other.char.class
-local.inlineobj.char.class = notAllowed
-inlineobj.char.class =
-  inlinegraphic
-  | inlinemediaobject
-  | inlineequation
-  | local.inlineobj.char.class
-# ......................................................................
-
-# Entities for content models ..........................................
-formalobject.title.content = title, titleabbrev?
-# Redeclaration placeholder ............................................
-
-# For redeclaring entities that are declared after this point while
-# retaining their references to the entities that are declared before
-# this point
-
-# Object-level mixtures ................................................
-
-#                       list admn line synp para infm form cmpd gen  desc
-# Component mixture       X    X    X    X    X    X    X    X    X    X
-# Sidebar mixture         X    X    X    X    X    X    X    a    X
-# Footnote mixture        X         X    X    X    X
-# Example mixture         X         X    X    X    X
-# Highlights mixture      X    X              X
-# Paragraph mixture       X         X    X         X
-# Admonition mixture      X         X    X    X    X    X    b    c
-# Figure mixture                    X    X         X
-# Table entry mixture     X    X    X         X    d
-# Glossary def mixture    X         X    X    X    X         e
-# Legal notice mixture    X    X    X         X    f
-# 
-# a. Just Procedure; not Sidebar itself or MsgSet.
-# b. No MsgSet.
-# c. No Highlights.
-# d. Just Graphic; no other informal objects.
-# e. No Anchor, BridgeHead, or Highlights.
-# f. Just BlockQuote; no other informal objects.
-local.component.mix = notAllowed
-component.mix =
-  list.class
-  | admon.class
-  | linespecific.class
-  | synop.class
-  | para.class
-  | informal.class
-  | formal.class
-  | compound.class
-  | genobj.class
-  | descobj.class
-  | ndxterm.class
-  | beginpage
-  | forms.hook
-  | local.component.mix
-local.sidebar.mix = notAllowed
-sidebar.mix =
-  list.class
-  | admon.class
-  | linespecific.class
-  | synop.class
-  | para.class
-  | informal.class
-  | formal.class
-  | procedure
-  | genobj.class
-  | ndxterm.class
-  | beginpage
-  | forms.hook
-  | local.sidebar.mix
-local.qandaset.mix = notAllowed
-qandaset.mix =
-  list.class
-  | admon.class
-  | linespecific.class
-  | synop.class
-  | para.class
-  | informal.class
-  | formal.class
-  | procedure
-  | genobj.class
-  | ndxterm.class
-  | forms.hook
-  | local.qandaset.mix
-local.revdescription.mix = notAllowed
-revdescription.mix =
-  list.class
-  | admon.class
-  | linespecific.class
-  | synop.class
-  | para.class
-  | informal.class
-  | formal.class
-  | procedure
-  | genobj.class
-  | ndxterm.class
-  | local.revdescription.mix
-local.footnote.mix = notAllowed
-footnote.mix =
-  list.class
-  | linespecific.class
-  | synop.class
-  | para.class
-  | informal.class
-  | local.footnote.mix
-local.example.mix = notAllowed
-example.mix =
-  list.class
-  | linespecific.class
-  | synop.class
-  | para.class
-  | informal.class
-  | ndxterm.class
-  | beginpage
-  | procedure
-  | forms.hook
-  | local.example.mix
-local.highlights.mix = notAllowed
-highlights.mix =
-  list.class
-  | admon.class
-  | para.class
-  | ndxterm.class
-  | local.highlights.mix
-# %formal.class; is explicitly excluded from many contexts in which
-# paragraphs are used
-local.para.mix = notAllowed
-para.mix =
-  list.class
-  | admon.class
-  | linespecific.class
-  | informal.class
-  | formal.class
-  | local.para.mix
-local.admon.mix = notAllowed
-admon.mix =
-  list.class
-  | linespecific.class
-  | synop.class
-  | para.class
-  | informal.class
-  | formal.class
-  | procedure
-  | sidebar
-  | anchor
-  | bridgehead
-  | remark
-  | ndxterm.class
-  | beginpage
-  | forms.hook
-  | local.admon.mix
-local.figure.mix = notAllowed
-figure.mix =
-  linespecific.class
-  | synop.class
-  | informal.class
-  | ndxterm.class
-  | beginpage
-  | forms.hook
-  | local.figure.mix
-local.tabentry.mix = notAllowed
-tabentry.mix =
-  list.class
-  | admon.class
-  | linespecific.class
-  | para.class
-  | graphic
-  | mediaobject
-  | forms.hook
-  | local.tabentry.mix
-local.glossdef.mix = notAllowed
-glossdef.mix =
-  list.class
-  | linespecific.class
-  | synop.class
-  | para.class
-  | informal.class
-  | formal.class
-  | remark
-  | ndxterm.class
-  | beginpage
-  | local.glossdef.mix
-local.legalnotice.mix = notAllowed
-legalnotice.mix =
-  list.class
-  | admon.class
-  | linespecific.class
-  | para.class
-  | blockquote
-  | ndxterm.class
-  | beginpage
-  | local.legalnotice.mix
-local.textobject.mix = notAllowed
-textobject.mix =
-  list.class
-  | admon.class
-  | linespecific.class
-  | para.class
-  | blockquote
-  | local.textobject.mix
-local.mediaobject.mix = notAllowed
-mediaobject.mix =
-  videoobject
-  | audioobject
-  | imageobject
-  | imageobjectco
-  | textobject
-  | local.mediaobject.mix
-local.listpreamble.mix = notAllowed
-listpreamble.mix =
-  admon.class
-  | linespecific.class
-  | synop.class
-  | para.class
-  | informal.class
-  | genobj.class
-  | descobj.class
-  | ndxterm.class
-  | beginpage
-  | forms.hook
-  | local.listpreamble.mix
-# Character-level mixtures .............................................
-
-# sgml.features
-
-# not [sgml.features[
-
-# ]] not sgml.features
-
-#                     #PCD xref word link cptr base dnfo othr inob (synop)
-# para.char.mix         X    X    X    X    X    X    X    X    X
-# title.char.mix        X    X    X    X    X    X    X    X    X
-# ndxterm.char.mix      X    X    X    X    X    X    X    X    a
-# cptr.char.mix         X              X    X    X         X    a
-# smallcptr.char.mix    X                   b                   a
-# word.char.mix         X         c    X         X         X    a
-# docinfo.char.mix      X         d    X    b              X    a
-# 
-# a. Just InlineGraphic; no InlineEquation.
-# b. Just Replaceable; no other computer terms.
-# c. Just Emphasis and Trademark; no other word elements.
-# d. Just Acronym, Emphasis, and Trademark; no other word elements.
-local.para.char.mix = notAllowed
-para.char.mix =
-  text
-  | xref.char.class
-  | gen.char.class
-  | link.char.class
-  | tech.char.class
-  | base.char.class
-  | docinfo.char.class
-  | other.char.class
-  | inlineobj.char.class
-  | synop.class
-  | ndxterm.class
-  | beginpage
-  | forminlines.hook
-  | local.para.char.mix
-local.title.char.mix = notAllowed
-title.char.mix =
-  text
-  | xref.char.class
-  | gen.char.class
-  | link.char.class
-  | tech.char.class
-  | base.char.class
-  | docinfo.char.class
-  | other.char.class
-  | inlineobj.char.class
-  | ndxterm.class
-  | local.title.char.mix
-local.ndxterm.char.mix = notAllowed
-ndxterm.char.mix =
-  text
-  | xref.char.class
-  | gen.char.class
-  | link.char.class
-  | tech.char.class
-  | base.char.class
-  | docinfo.char.class
-  | other.char.class
-  | inlinegraphic
-  | inlinemediaobject
-  | local.ndxterm.char.mix
-local.cptr.char.mix = notAllowed
-cptr.char.mix =
-  text
-  | link.char.class
-  | tech.char.class
-  | base.char.class
-  | other.char.class
-  | inlinegraphic
-  | inlinemediaobject
-  | ndxterm.class
-  | beginpage
-  | local.cptr.char.mix
-local.smallcptr.char.mix = notAllowed
-smallcptr.char.mix =
-  text
-  | replaceable
-  | inlinegraphic
-  | inlinemediaobject
-  | ndxterm.class
-  | beginpage
-  | local.smallcptr.char.mix
-local.word.char.mix = notAllowed
-word.char.mix =
-  text
-  | acronym
-  | emphasis
-  | trademark
-  | link.char.class
-  | base.char.class
-  | other.char.class
-  | inlinegraphic
-  | inlinemediaobject
-  | ndxterm.class
-  | beginpage
-  | local.word.char.mix
-local.docinfo.char.mix = notAllowed
-docinfo.char.mix =
-  text
-  | link.char.class
-  | emphasis
-  | trademark
-  | replaceable
-  | other.char.class
-  | inlinegraphic
-  | inlinemediaobject
-  | ndxterm.class
-  | local.docinfo.char.mix
-# ENTITY % bibliocomponent.mix (see Bibliographic section, below)
-
-# ENTITY % person.ident.mix (see Bibliographic section, below)
-
-# ......................................................................
-
-# Entities for attributes and attribute components .....................
-
-# Effectivity attributes ...............................................
-
-# Arch: Computer or chip architecture to which element applies; no
-# default
-arch.attrib = attribute arch { text }?
-# Condition: General-purpose effectivity attribute
-condition.attrib = attribute condition { text }?
-# Conformance: Standards conformance characteristics
-conformance.attrib = attribute conformance { xsd:NMTOKENS }?
-# OS: Operating system to which element applies; no default
-os.attrib = attribute os { text }?
-# Revision: Editorial revision to which element belongs; no default
-revision.attrib = attribute revision { text }?
-# Security: Security classification; no default
-security.attrib = attribute security { text }?
-# UserLevel: Level of user experience to which element applies; no
-# default
-userlevel.attrib = attribute userlevel { text }?
-# Vendor: Computer vendor to which element applies; no default
-vendor.attrib = attribute vendor { text }?
-# Wordsize: Computer word size (32 bit, 64 bit, etc.); no default
-wordsize.attrib = attribute wordsize { text }?
-local.effectivity.attrib = empty
-effectivity.attrib =
-  arch.attrib,
-  condition.attrib,
-  conformance.attrib,
-  os.attrib,
-  revision.attrib,
-  security.attrib,
-  userlevel.attrib,
-  vendor.attrib,
-  wordsize.attrib,
-  local.effectivity.attrib
-# Common attributes ....................................................
-
-# Id: Unique identifier of element; no default
-id.attrib = attribute id { xsd:ID }?
-# Id: Unique identifier of element; a value must be supplied; no
-# default
-idreq.attrib = attribute id { xsd:ID }
-# Lang: Indicator of language in which element is written, for
-# translation, character set management, etc.; no default
-lang.attrib = attribute lang { text }?
-# Remap: Previous role of element before conversion; no default
-remap.attrib = attribute remap { text }?
-# Role: New role of element in local environment; no default
-role.attrib = attribute role { text }?
-# XRefLabel: Alternate labeling string for XRef text generation;
-# default is usually title or other appropriate label text already
-# contained in element
-xreflabel.attrib = attribute xreflabel { text }?
-# RevisionFlag: Revision status of element; default is that element
-# wasn't revised
-revisionflag.attrib =
-  attribute revisionflag { "changed" | "added" | "deleted" | "off" }?
-local.common.attrib = empty
-# dir: Bidirectional override
-dir.attrib = attribute dir { "ltr" | "rtl" | "lro" | "rlo" }?
-# xml:base: base URI
-xml-base.attrib = attribute xml:base { text }?
-# Role is included explicitly on each element
-common.attrib =
-  id.attrib,
-  lang.attrib,
-  remap.attrib,
-  xreflabel.attrib,
-  revisionflag.attrib,
-  effectivity.attrib,
-  dir.attrib,
-  xml-base.attrib,
-  local.common.attrib
-# Role is included explicitly on each element
-idreq.common.attrib =
-  idreq.attrib,
-  lang.attrib,
-  remap.attrib,
-  xreflabel.attrib,
-  revisionflag.attrib,
-  effectivity.attrib,
-  dir.attrib,
-  xml-base.attrib,
-  local.common.attrib
-# Semi-common attributes and other attribute entities ..................
-local.graphics.attrib = empty
-# EntityRef: Name of an external entity containing the content
-# of the graphic
-
-# FileRef: Filename, qualified by a pathname if desired,
-# designating the file containing the content of the graphic
-
-# Format: Notation of the element content, if any
-
-# SrcCredit: Information about the source of the Graphic
-
-# Width: Same as CALS reprowid (desired width)
-
-# Depth: Same as CALS reprodep (desired depth)
-
-# Align: Same as CALS hplace with 'none' removed; #IMPLIED means
-# application-specific
-
-# Scale: Conflation of CALS hscale and vscale
-
-# Scalefit: Same as CALS scalefit
-graphics.attrib =
-  attribute entityref { xsd:ENTITY }?,
-  attribute fileref { text }?,
-  attribute format { notation.class }?,
-  attribute srccredit { text }?,
-  attribute width { text }?,
-  attribute contentwidth { text }?,
-  attribute depth { text }?,
-  attribute contentdepth { text }?,
-  attribute align { "left" | "right" | "center" }?,
-  attribute valign { "top" | "middle" | "bottom" }?,
-  attribute scale { text }?,
-  attribute scalefit { yesorno.attvals }?,
-  local.graphics.attrib
-local.keyaction.attrib = empty
-# Action: Key combination type; default is unspecified if one
-# child element, Simul if there is more than one; if value is
-# Other, the OtherAction attribute must have a nonempty value
-
-# OtherAction: User-defined key combination type
-keyaction.attrib =
-  attribute action {
-    "click" | "double-click" | "press" | "seq" | "simul" | "other"
-  }?,
-  attribute otheraction { text }?,
-  local.keyaction.attrib
-# Label: Identifying number or string; default is usually the
-# appropriate number or string autogenerated by a formatter
-label.attrib = attribute label { text }?
-# xml:space: whitespace treatment
-xml-space.attrib = attribute xml:space { "preserve" }?
-# Format: whether element is assumed to contain significant white
-# space
-linespecific.attrib =
-  [ a:defaultValue = "linespecific" ]
-  attribute format { "linespecific" }?,
-  xml-space.attrib,
-  attribute linenumbering { "numbered" | "unnumbered" }?,
-  attribute continuation { "continues" | "restarts" }?,
-  attribute startinglinenumber { text }?,
-  attribute language { text }?
-# Linkend: link to related information; no default
-linkend.attrib = attribute linkend { xsd:IDREF }?
-# Linkend: required link to related information
-linkendreq.attrib = attribute linkend { xsd:IDREF }
-# Linkends: link to one or more sets of related information; no
-# default
-linkends.attrib = attribute linkends { xsd:IDREFS }?
-local.mark.attrib = empty
-mark.attrib =
-  attribute mark { text }?,
-  local.mark.attrib
-# MoreInfo: whether element's content has an associated RefEntry
-moreinfo.attrib =
-  [ a:defaultValue = "none" ]
-  attribute moreinfo { "refentry" | "none" }?
-# Pagenum: number of page on which element appears; no default
-pagenum.attrib = attribute pagenum { text }?
-local.status.attrib = empty
-# Status: Editorial or publication status of the element
-# it applies to, such as "in review" or "approved for distribution"
-status.attrib =
-  attribute status { text }?,
-  local.status.attrib
-# Width: width of the longest line in the element to which it
-# pertains, in number of characters
-width.attrib = attribute width { text }?
-# ......................................................................
-
-# Title elements .......................................................
-local.title.attrib = empty
-title.role.attrib = role.attrib
-# doc:The text of the title of a section of a document or of a formal block-level element.
-title = element title { title.attlist, title.char.mix* }
-# end of title.element
-title.attlist &=
-  pagenum.attrib, common.attrib, title.role.attrib, local.title.attrib
-# end of title.attlist
-
-# end of title.module
-local.titleabbrev.attrib = empty
-titleabbrev.role.attrib = role.attrib
-# doc:The abbreviation of a Title.
-titleabbrev =
-  element titleabbrev { titleabbrev.attlist, title.char.mix* }
-# end of titleabbrev.element
-titleabbrev.attlist &=
-  common.attrib, titleabbrev.role.attrib, local.titleabbrev.attrib
-# end of titleabbrev.attlist
-
-# end of titleabbrev.module
-local.subtitle.attrib = empty
-subtitle.role.attrib = role.attrib
-# doc:The subtitle of a document.
-subtitle = element subtitle { subtitle.attlist, title.char.mix* }
-# end of subtitle.element
-subtitle.attlist &=
-  common.attrib, subtitle.role.attrib, local.subtitle.attrib
-# end of subtitle.attlist
-
-# end of subtitle.module
-
-# ......................................................................
-
-# Bibliographic entities and elements ..................................
-
-# The bibliographic elements are typically used in the document
-# hierarchy. They do not appear in content models of information
-# pool elements.  See also the document information elements,
-# below.
-local.person.ident.mix = notAllowed
-person.ident.mix =
-  honorific
-  | firstname
-  | surname
-  | lineage
-  | othername
-  | affiliation
-  | authorblurb
-  | contrib
-  | local.person.ident.mix
-local.bibliocomponent.mix = notAllowed
-bibliocomponent.mix =
-  abbrev
-  | abstract
-  | address
-  | artpagenums
-  | author
-  | authorgroup
-  | authorinitials
-  | bibliomisc
-  | biblioset
-  | collab
-  | confgroup
-  | contractnum
-  | contractsponsor
-  | copyright
-  | corpauthor
-  | corpname
-  | corpcredit
-  | date
-  | edition
-  | editor
-  | invpartnumber
-  | isbn
-  | issn
-  | issuenum
-  | orgname
-  | biblioid
-  | citebiblioid
-  | bibliosource
-  | bibliorelation
-  | bibliocoverage
-  | othercredit
-  | pagenums
-  | printhistory
-  | productname
-  | productnumber
-  | pubdate
-  | publisher
-  | publishername
-  | pubsnumber
-  | releaseinfo
-  | revhistory
-  | seriesvolnums
-  | subtitle
-  | title
-  | titleabbrev
-  | volumenum
-  | citetitle
-  | personname
-  | person.ident.mix
-  | ndxterm.class
-  | local.bibliocomponent.mix
-# I don't think this is well placed, but it needs to be here because of
-
-# the reference to bibliocomponent.mix
-local.info.class = notAllowed
-info.class =
-  graphic
-  | mediaobject
-  | legalnotice
-  | modespec
-  | subjectset
-  | keywordset
-  | itermset
-  | bibliocomponent.mix
-  | local.info.class
-# BiblioList ........................
-local.bibliolist.attrib = empty
-bibliolist.role.attrib = role.attrib
-# doc:A wrapper for a set of bibliography entries.
-bibliolist =
-  element bibliolist {
-    bibliolist.attlist,
-    blockinfo?,
-    formalobject.title.content?,
-    (biblioentry | bibliomixed)+
-  }
-# end of bibliolist.element
-bibliolist.attlist &=
-  common.attrib, bibliolist.role.attrib, local.bibliolist.attrib
-# end of bibliolist.attlist
-
-# end of bibliolist.module
-local.biblioentry.attrib = empty
-biblioentry.role.attrib = role.attrib
-# doc:An entry in a Bibliography.
-biblioentry =
-  element biblioentry {
-    biblioentry.attlist, (articleinfo | bibliocomponent.mix)+
-  }
-# end of biblioentry.element
-biblioentry.attlist &=
-  common.attrib, biblioentry.role.attrib, local.biblioentry.attrib
-# end of biblioentry.attlist
-
-# end of biblioentry.module
-local.bibliomixed.attrib = empty
-bibliomixed.role.attrib = role.attrib
-# doc:An entry in a Bibliography.
-bibliomixed =
-  element bibliomixed {
-    bibliomixed.attlist, (text | bibliocomponent.mix | bibliomset)*
-  }
-# end of bibliomixed.element
-bibliomixed.attlist &=
-  common.attrib, bibliomixed.role.attrib, local.bibliomixed.attrib
-# end of bibliomixed.attlist
-
-# end of bibliomixed.module
-local.articleinfo.attrib = empty
-articleinfo.role.attrib = role.attrib
-# doc:Meta-information for an Article.
-articleinfo = element articleinfo { articleinfo.attlist, info.class+ }
-# end of articleinfo.element
-articleinfo.attlist &=
-  common.attrib, articleinfo.role.attrib, local.articleinfo.attrib
-# end of articleinfo.attlist
-
-# end of articleinfo.module
-local.biblioset.attrib = empty
-biblioset.role.attrib = role.attrib
-# doc:A "raw" container for related bibliographic information.
-biblioset =
-  element biblioset { biblioset.attlist, bibliocomponent.mix+ }
-# end of biblioset.element
-
-# Relation: Relationship of elements contained within BiblioSet
-biblioset.attlist &=
-  attribute relation { text }?,
-  common.attrib,
-  biblioset.role.attrib,
-  local.biblioset.attrib
-# end of biblioset.attlist
-
-# end of biblioset.module
-bibliomset.role.attrib = role.attrib
-local.bibliomset.attrib = empty
-# doc:A "cooked" container for related bibliographic information.
-bibliomset =
-  element bibliomset {
-    bibliomset.attlist, (text | bibliocomponent.mix | bibliomset)*
-  }
-# end of bibliomset.element
-
-# Relation: Relationship of elements contained within BiblioMSet
-bibliomset.attlist &=
-  attribute relation { text }?,
-  common.attrib,
-  bibliomset.role.attrib,
-  local.bibliomset.attrib
-# end of bibliomset.attlist
-
-# end of bibliomset.module
-local.bibliomisc.attrib = empty
-bibliomisc.role.attrib = role.attrib
-# doc:Untyped bibliographic information.
-bibliomisc = element bibliomisc { bibliomisc.attlist, para.char.mix* }
-# end of bibliomisc.element
-bibliomisc.attlist &=
-  common.attrib, bibliomisc.role.attrib, local.bibliomisc.attrib
-# end of bibliomisc.attlist
-
-# end of bibliomisc.module
-
-# ......................................................................
-
-# Subject, Keyword, and ITermSet elements ..............................
-local.subjectset.attrib = empty
-subjectset.role.attrib = role.attrib
-# doc:A set of terms describing the subject matter of a document.
-subjectset = element subjectset { subjectset.attlist, subject+ }
-# end of subjectset.element
-
-# Scheme: Controlled vocabulary employed in SubjectTerms
-subjectset.attlist &=
-  attribute scheme { xsd:NMTOKEN }?,
-  common.attrib,
-  subjectset.role.attrib,
-  local.subjectset.attrib
-# end of subjectset.attlist
-
-# end of subjectset.module
-local.subject.attrib = empty
-subject.role.attrib = role.attrib
-# doc:One of a group of terms describing the subject matter of a document.
-subject = element subject { subject.attlist, subjectterm+ }
-# end of subject.element
-
-# Weight: Ranking of this group of SubjectTerms relative
-# to others, 0 is low, no highest value specified
-subject.attlist &=
-  attribute weight { text }?,
-  common.attrib,
-  subject.role.attrib,
-  local.subject.attrib
-# end of subject.attlist
-
-# end of subject.module
-local.subjectterm.attrib = empty
-subjectterm.role.attrib = role.attrib
-# doc:A term in a group of terms describing the subject matter of a document.
-subjectterm = element subjectterm { subjectterm.attlist, text }
-# end of subjectterm.element
-subjectterm.attlist &=
-  common.attrib, subjectterm.role.attrib, local.subjectterm.attrib
-# end of subjectterm.attlist
-
-# end of subjectterm.module
-
-# end of subjectset.content.module
-local.keywordset.attrib = empty
-keywordset.role.attrib = role.attrib
-# doc:A set of keywords describing the content of a document.
-keywordset = element keywordset { keywordset.attlist, keyword+ }
-# end of keywordset.element
-keywordset.attlist &=
-  common.attrib, keywordset.role.attrib, local.keywordset.attrib
-# end of keywordset.attlist
-
-# end of keywordset.module
-local.keyword.attrib = empty
-keyword.role.attrib = role.attrib
-# doc:One of a set of keywords describing the content of a document.
-keyword = element keyword { keyword.attlist, text }
-# end of keyword.element
-keyword.attlist &=
-  common.attrib, keyword.role.attrib, local.keyword.attrib
-# end of keyword.attlist
-
-# end of keyword.module
-
-# end of keywordset.content.module
-local.itermset.attrib = empty
-itermset.role.attrib = role.attrib
-# doc:A set of index terms in the meta-information of a document.
-itermset = element itermset { itermset.attlist, indexterm+ }
-# end of itermset.element
-itermset.attlist &=
-  common.attrib, itermset.role.attrib, local.itermset.attrib
-# end of itermset.attlist
-
-# end of itermset.module
-
-# Bibliographic info for "blocks"
-local.blockinfo.attrib = empty
-blockinfo.role.attrib = role.attrib
-# doc:Meta-information for a block element.
-blockinfo = element blockinfo { blockinfo.attlist, info.class+ }
-# end of blockinfo.element
-blockinfo.attlist &=
-  common.attrib, blockinfo.role.attrib, local.blockinfo.attrib
-# end of blockinfo.attlist
-
-# end of blockinfo.module
-
-# ......................................................................
-
-# Compound (section-ish) elements ......................................
-
-# Message set ......................
-local.msgset.attrib = empty
-msgset.role.attrib = role.attrib
-# doc:A detailed set of messages, usually error messages.
-msgset =
-  element msgset {
-    msgset.attlist,
-    blockinfo?,
-    formalobject.title.content?,
-    (msgentry+ | simplemsgentry+)
-  }
-# end of msgset.element
-msgset.attlist &= common.attrib, msgset.role.attrib, local.msgset.attrib
-# end of msgset.attlist
-
-# end of msgset.module
-local.msgentry.attrib = empty
-msgentry.role.attrib = role.attrib
-# doc:A wrapper for an entry in a message set.
-msgentry =
-  element msgentry { msgentry.attlist, msg+, msginfo?, msgexplan* }
-# end of msgentry.element
-msgentry.attlist &=
-  common.attrib, msgentry.role.attrib, local.msgentry.attrib
-# end of msgentry.attlist
-
-# end of msgentry.module
-local.simplemsgentry.attrib = empty
-simplemsgentry.role.attrib = role.attrib
-# doc:A wrapper for a simpler entry in a message set.
-simplemsgentry =
-  element simplemsgentry { simplemsgentry.attlist, msgtext, msgexplan+ }
-# end of simplemsgentry.element
-simplemsgentry.attlist &=
-  attribute audience { text }?,
-  attribute level { text }?,
-  attribute origin { text }?,
-  common.attrib,
-  simplemsgentry.role.attrib,
-  local.simplemsgentry.attrib
-# end of simplemsgentry.attlist
-
-# end of simplemsgentry.module
-local.msg.attrib = empty
-msg.role.attrib = role.attrib
-# doc:A message in a message set.
-msg = element msg { msg.attlist, title?, msgmain, (msgsub | msgrel)* }
-# end of msg.element
-msg.attlist &= common.attrib, msg.role.attrib, local.msg.attrib
-# end of msg.attlist
-
-# end of msg.module
-local.msgmain.attrib = empty
-msgmain.role.attrib = role.attrib
-# doc:The primary component of a message in a message set.
-msgmain = element msgmain { msgmain.attlist, title?, msgtext }
-# end of msgmain.element
-msgmain.attlist &=
-  common.attrib, msgmain.role.attrib, local.msgmain.attrib
-# end of msgmain.attlist
-
-# end of msgmain.module
-local.msgsub.attrib = empty
-msgsub.role.attrib = role.attrib
-# doc:A subcomponent of a message in a message set.
-msgsub = element msgsub { msgsub.attlist, title?, msgtext }
-# end of msgsub.element
-msgsub.attlist &= common.attrib, msgsub.role.attrib, local.msgsub.attrib
-# end of msgsub.attlist
-
-# end of msgsub.module
-local.msgrel.attrib = empty
-msgrel.role.attrib = role.attrib
-# doc:A related component of a message in a message set.
-msgrel = element msgrel { msgrel.attlist, title?, msgtext }
-# end of msgrel.element
-msgrel.attlist &= common.attrib, msgrel.role.attrib, local.msgrel.attrib
-# end of msgrel.attlist
-
-# end of msgrel.module
-
-# MsgText (defined in the Inlines section, below)
-local.msginfo.attrib = empty
-msginfo.role.attrib = role.attrib
-# doc:Information about a message in a message set.
-msginfo =
-  element msginfo { msginfo.attlist, (msglevel | msgorig | msgaud)* }
-# end of msginfo.element
-msginfo.attlist &=
-  common.attrib, msginfo.role.attrib, local.msginfo.attrib
-# end of msginfo.attlist
-
-# end of msginfo.module
-local.msglevel.attrib = empty
-msglevel.role.attrib = role.attrib
-# doc:The level of importance or severity of a message in a message set.
-msglevel = element msglevel { msglevel.attlist, smallcptr.char.mix* }
-# end of msglevel.element
-msglevel.attlist &=
-  common.attrib, msglevel.role.attrib, local.msglevel.attrib
-# end of msglevel.attlist
-
-# end of msglevel.module
-local.msgorig.attrib = empty
-msgorig.role.attrib = role.attrib
-# doc:The origin of a message in a message set.
-msgorig = element msgorig { msgorig.attlist, smallcptr.char.mix* }
-# end of msgorig.element
-msgorig.attlist &=
-  common.attrib, msgorig.role.attrib, local.msgorig.attrib
-# end of msgorig.attlist
-
-# end of msgorig.module
-local.msgaud.attrib = empty
-msgaud.role.attrib = role.attrib
-# doc:The audience to which a message in a message set is relevant.
-msgaud = element msgaud { msgaud.attlist, para.char.mix* }
-# end of msgaud.element
-msgaud.attlist &= common.attrib, msgaud.role.attrib, local.msgaud.attrib
-# end of msgaud.attlist
-
-# end of msgaud.module
-local.msgexplan.attrib = empty
-msgexplan.role.attrib = role.attrib
-# doc:Explanatory material relating to a message in a message set.
-msgexplan =
-  element msgexplan { msgexplan.attlist, title?, component.mix+ }
-# end of msgexplan.element
-msgexplan.attlist &=
-  common.attrib, msgexplan.role.attrib, local.msgexplan.attrib
-# end of msgexplan.attlist
-
-# end of msgexplan.module
-
-# end of msgset.content.module
-local.task.attrib = empty
-task.role.attrib = role.attrib
-# doc:A task to be completed.
-task =
-  element task {
-    task.attlist,
-    blockinfo?,
-    ndxterm.class*,
-    formalobject.title.content,
-    tasksummary?,
-    taskprerequisites?,
-    procedure,
-    example*,
-    taskrelated?
-  }
-# end of task.element
-task.attlist &= common.attrib, task.role.attrib, local.task.attrib
-# end of task.attlist
-
-# end of task.module
-local.tasksummary.attrib = empty
-tasksummary.role.attrib = role.attrib
-# doc:A summary of a task.
-tasksummary =
-  element tasksummary {
-    tasksummary.attlist,
-    blockinfo?,
-    formalobject.title.content?,
-    component.mix+
-  }
-# end of tasksummary.element
-tasksummary.attlist &=
-  common.attrib, tasksummary.role.attrib, local.tasksummary.attrib
-# end of tasksummary.attlist
-
-# end of tasksummary.module
-local.taskprerequisites.attrib = empty
-taskprerequisites.role.attrib = role.attrib
-# doc:The prerequisites for a task.
-taskprerequisites =
-  element taskprerequisites {
-    taskprerequisites.attlist,
-    blockinfo?,
-    formalobject.title.content?,
-    component.mix+
-  }
-# end of taskprerequisites.element
-taskprerequisites.attlist &=
-  common.attrib,
-  taskprerequisites.role.attrib,
-  local.taskprerequisites.attrib
-# end of taskprerequisites.attlist
-
-# end of taskprerequisites.module
-local.taskrelated.attrib = empty
-taskrelated.role.attrib = role.attrib
-# doc:Information related to a task.
-taskrelated =
-  element taskrelated {
-    taskrelated.attlist,
-    blockinfo?,
-    formalobject.title.content?,
-    component.mix+
-  }
-# end of taskrelated.element
-taskrelated.attlist &=
-  common.attrib, taskrelated.role.attrib, local.taskrelated.attrib
-# end of taskrelated.attlist
-
-# end of taskrelated.module
-
-# end of task.content.module
-
-# QandASet ........................
-local.qandaset.attrib = empty
-qandaset.role.attrib = role.attrib
-# doc:A question-and-answer set.
-qandaset =
-  element qandaset {
-    qandaset.attlist,
-    blockinfo?,
-    formalobject.title.content?,
-    qandaset.mix*,
-    (qandadiv+ | qandaentry+)
-  }
-# end of qandaset.element
-qandaset.attlist &=
-  attribute defaultlabel { "qanda" | "number" | "none" }?,
-  common.attrib,
-  qandaset.role.attrib,
-  local.qandaset.attrib
-# end of qandaset.attlist
-
-# end of qandaset.module
-local.qandadiv.attrib = empty
-qandadiv.role.attrib = role.attrib
-# doc:A titled division in a QandASet.
-qandadiv =
-  element qandadiv {
-    qandadiv.attlist,
-    blockinfo?,
-    formalobject.title.content?,
-    qandaset.mix*,
-    (qandadiv+ | qandaentry+)
-  }
-# end of qandadiv.element
-qandadiv.attlist &=
-  common.attrib, qandadiv.role.attrib, local.qandadiv.attrib
-# end of qandadiv.attlist
-
-# end of qandadiv.module
-local.qandaentry.attrib = empty
-qandaentry.role.attrib = role.attrib
-# doc:A question/answer set within a QandASet.
-qandaentry =
-  element qandaentry {
-    qandaentry.attlist, blockinfo?, revhistory?, question, answer*
-  }
-# end of qandaentry.element
-qandaentry.attlist &=
-  common.attrib, qandaentry.role.attrib, local.qandaentry.attrib
-# end of qandaentry.attlist
-
-# end of qandaentry.module
-local.question.attrib = empty
-question.role.attrib = role.attrib
-# doc:A question in a QandASet.
-question = element question { question.attlist, label?, qandaset.mix+ }
-# end of question.element
-question.attlist &=
-  common.attrib, question.role.attrib, local.question.attrib
-# end of question.attlist
-
-# end of question.module
-local.answer.attrib = empty
-answer.role.attrib = role.attrib
-# doc:An answer to a question posed in a QandASet.
-answer =
-  element answer { answer.attlist, label?, qandaset.mix*, qandaentry* }
-# end of answer.element
-answer.attlist &= common.attrib, answer.role.attrib, local.answer.attrib
-# end of answer.attlist
-
-# end of answer.module
-local.label.attrib = empty
-label.role.attrib = role.attrib
-# doc:A label on a Question or Answer.
-label = element label { label.attlist, word.char.mix* }
-# end of label.element
-label.attlist &= common.attrib, label.role.attrib, local.label.attrib
-# end of label.attlist
-
-# end of label.module
-
-# end of qandaset.content.module
-
-# Procedure ........................
-local.procedure.attrib = empty
-procedure.role.attrib = role.attrib
-# doc:A list of operations to be performed in a well-defined sequence.
-procedure =
-  element procedure {
-    procedure.attlist,
-    blockinfo?,
-    formalobject.title.content?,
-    component.mix*,
-    step+
-  }
-# end of procedure.element
-procedure.attlist &=
-  common.attrib, procedure.role.attrib, local.procedure.attrib
-# end of procedure.attlist
-
-# end of procedure.module
-local.step.attrib = empty
-step.role.attrib = role.attrib
-# doc:A unit of action in a procedure.
-step =
-  element step {
-    step.attlist,
-    title?,
-    ((component.mix+,
-      ((substeps | stepalternatives), component.mix*)?)
-     | ((substeps | stepalternatives), component.mix*))
-  }
-# end of step.element
-
-# Performance: Whether the Step must be performed
-
-# not #REQUIRED!
-step.attlist &=
-  [ a:defaultValue = "required" ]
-  attribute performance { "optional" | "required" }?,
-  common.attrib,
-  step.role.attrib,
-  local.step.attrib
-# end of step.attlist
-
-# end of step.module
-local.substeps.attrib = empty
-substeps.role.attrib = role.attrib
-# doc:A wrapper for steps that occur within steps in a procedure.
-substeps = element substeps { substeps.attlist, step+ }
-# end of substeps.element
-
-# Performance: whether entire set of substeps must be performed
-
-# not #REQUIRED!
-substeps.attlist &=
-  [ a:defaultValue = "required" ]
-  attribute performance { "optional" | "required" }?,
-  common.attrib,
-  substeps.role.attrib,
-  local.substeps.attrib
-# end of substeps.attlist
-
-# end of substeps.module
-local.stepalternatives.attrib = empty
-stepalternatives.role.attrib = role.attrib
-# doc:Alternative steps in a procedure.
-stepalternatives =
-  element stepalternatives { stepalternatives.attlist, step+ }
-# end of stepalternatives.element
-
-# Performance: Whether (one of) the alternatives must be performed
-
-# not #REQUIRED!
-stepalternatives.attlist &=
-  [ a:defaultValue = "required" ]
-  attribute performance { "optional" | "required" }?,
-  common.attrib,
-  stepalternatives.role.attrib,
-  local.stepalternatives.attrib
-# end of stepalternatives.attlist
-
-# end of stepalternatives.module
-
-# end of procedure.content.module
-
-# Sidebar ..........................
-local.sidebarinfo.attrib = empty
-sidebarinfo.role.attrib = role.attrib
-# doc:Meta-information for a Sidebar.
-sidebarinfo = element sidebarinfo { sidebarinfo.attlist, info.class+ }
-# end of sidebarinfo.element
-sidebarinfo.attlist &=
-  common.attrib, sidebarinfo.role.attrib, local.sidebarinfo.attrib
-# end of sidebarinfo.attlist
-
-# end of sidebarinfo.module
-local.sidebar.attrib = empty
-sidebar.role.attrib = role.attrib
-# doc:A portion of a document that is isolated from the main narrative flow.
-sidebar =
-  element sidebar {
-    sidebar.attlist,
-    sidebarinfo?,
-    formalobject.title.content?,
-    sidebar.mix+
-  }
-# end of sidebar.element
-sidebar.attlist &=
-  common.attrib, sidebar.role.attrib, local.sidebar.attrib
-# end of sidebar.attlist
-
-# end of sidebar.module
-
-# end of sidebar.content.model
-
-# ......................................................................
-
-# Paragraph-related elements ...........................................
-local.abstract.attrib = empty
-abstract.role.attrib = role.attrib
-# doc:A summary.
-abstract = element abstract { abstract.attlist, title?, para.class+ }
-# end of abstract.element
-abstract.attlist &=
-  common.attrib, abstract.role.attrib, local.abstract.attrib
-# end of abstract.attlist
-
-# end of abstract.module
-local.authorblurb.attrib = empty
-authorblurb.role.attrib = role.attrib
-# doc:A short description or note about an author.
-authorblurb =
-  element authorblurb { authorblurb.attlist, title?, para.class+ }
-# end of authorblurb.element
-authorblurb.attlist &=
-  common.attrib, authorblurb.role.attrib, local.authorblurb.attrib
-# end of authorblurb.attlist
-
-# end of authorblurb.module
-local.personblurb.attrib = empty
-personblurb.role.attrib = role.attrib
-# doc:A short description or note about a person.
-personblurb =
-  element personblurb { personblurb.attlist, title?, para.class+ }
-# end of personblurb.element
-personblurb.attlist &=
-  common.attrib, personblurb.role.attrib, local.personblurb.attrib
-# end of personblurb.attlist
-
-# end of personblurb.module
-local.blockquote.attrib = empty
-blockquote.role.attrib = role.attrib
-# doc:A quotation set off from the main text.
-blockquote =
-  element blockquote {
-    blockquote.attlist, blockinfo?, title?, attribution?, component.mix+
-  }
-# end of blockquote.element
-blockquote.attlist &=
-  common.attrib, blockquote.role.attrib, local.blockquote.attrib
-# end of blockquote.attlist
-
-# end of blockquote.module
-local.attribution.attrib = empty
-attribution.role.attrib = role.attrib
-# doc:The source of a block quote or epigraph.
-attribution =
-  element attribution { attribution.attlist, para.char.mix* }
-# end of attribution.element
-attribution.attlist &=
-  common.attrib, attribution.role.attrib, local.attribution.attrib
-# end of attribution.attlist
-
-# end of attribution.module
-local.bridgehead.attrib = empty
-bridgehead.role.attrib = role.attrib
-# doc:A free-floating heading.
-bridgehead = element bridgehead { bridgehead.attlist, title.char.mix* }
-# end of bridgehead.element
-
-# Renderas: Indicates the format in which the BridgeHead
-# should appear
-bridgehead.attlist &=
-  attribute renderas {
-    "other" | "sect1" | "sect2" | "sect3" | "sect4" | "sect5"
-  }?,
-  common.attrib,
-  bridgehead.role.attrib,
-  local.bridgehead.attrib
-# end of bridgehead.attlist
-
-# end of bridgehead.module
-local.remark.attrib = empty
-remark.role.attrib = role.attrib
-# doc:A remark (or comment) intended for presentation in a draft manuscript.
-remark = element remark { remark.attlist, para.char.mix* }
-# end of remark.element
-remark.attlist &= common.attrib, remark.role.attrib, local.remark.attrib
-# end of remark.attlist
-
-# end of remark.module
-local.epigraph.attrib = empty
-epigraph.role.attrib = role.attrib
-# doc:A short inscription at the beginning of a document or component.
-epigraph =
-  element epigraph {
-    epigraph.attlist, attribution?, (para.class | literallayout)+
-  }
-# end of epigraph.element
-epigraph.attlist &=
-  common.attrib, epigraph.role.attrib, local.epigraph.attrib
-# end of epigraph.attlist
-
-# Attribution (defined above)
-
-# end of epigraph.module
-local.footnote.attrib = empty
-footnote.role.attrib = role.attrib
-# doc:A footnote.
-footnote = element footnote { footnote.attlist, footnote.mix+ }
-# end of footnote.element
-footnote.attlist &=
-  label.attrib,
-  common.attrib,
-  footnote.role.attrib,
-  local.footnote.attrib
-# end of footnote.attlist
-
-# end of footnote.module
-local.highlights.attrib = empty
-highlights.role.attrib = role.attrib
-# doc:A summary of the main points of the discussed component.
-highlights = element highlights { highlights.attlist, highlights.mix+ }
-# end of highlights.element
-highlights.attlist &=
-  common.attrib, highlights.role.attrib, local.highlights.attrib
-# end of highlights.attlist
-
-# end of highlights.module
-local.formalpara.attrib = empty
-formalpara.role.attrib = role.attrib
-# doc:A paragraph with a title.
-formalpara =
-  element formalpara { formalpara.attlist, title, ndxterm.class*, para }
-# end of formalpara.element
-formalpara.attlist &=
-  common.attrib, formalpara.role.attrib, local.formalpara.attrib
-# end of formalpara.attlist
-
-# end of formalpara.module
-local.para.attrib = empty
-para.role.attrib = role.attrib
-# doc:A paragraph.
-para = element para { para.attlist, (para.char.mix | para.mix)* }
-# end of para.element
-para.attlist &= common.attrib, para.role.attrib, local.para.attrib
-# end of para.attlist
-
-# end of para.module
-local.simpara.attrib = empty
-simpara.role.attrib = role.attrib
-# doc:A paragraph that contains only text and inline markup, no block elements.
-simpara = element simpara { simpara.attlist, para.char.mix* }
-# end of simpara.element
-simpara.attlist &=
-  common.attrib, simpara.role.attrib, local.simpara.attrib
-# end of simpara.attlist
-
-# end of simpara.module
-local.admon.attrib = empty
-admon.role.attrib = role.attrib
-# doc:A note of caution.
-caution = element caution { caution.attlist, title?, admon.mix+ }
-# end of caution.element
-caution.attlist &= common.attrib, admon.role.attrib, local.admon.attrib
-# end of caution.attlist
-
-# doc:An admonition set off from the text.
-important = element important { important.attlist, title?, admon.mix+ }
-# end of important.element
-important.attlist &=
-  common.attrib, admon.role.attrib, local.admon.attrib
-# end of important.attlist
-
-# doc:A message set off from the text.
-note = element note { note.attlist, title?, admon.mix+ }
-# end of note.element
-note.attlist &= common.attrib, admon.role.attrib, local.admon.attrib
-# end of note.attlist
-
-# doc:A suggestion to the user, set off from the text.
-tip = element tip { tip.attlist, title?, admon.mix+ }
-# end of tip.element
-tip.attlist &= common.attrib, admon.role.attrib, local.admon.attrib
-# end of tip.attlist
-
-# doc:An admonition set off from the text.
-warning = element warning { warning.attlist, title?, admon.mix+ }
-# end of warning.element
-warning.attlist &= common.attrib, admon.role.attrib, local.admon.attrib
-# end of warning.attlist
-
-# end of admon.module
-
-# ......................................................................
-
-# Lists ................................................................
-
-# GlossList ........................
-local.glosslist.attrib = empty
-glosslist.role.attrib = role.attrib
-# doc:A wrapper for a set of GlossEntrys.
-glosslist =
-  element glosslist {
-    glosslist.attlist,
-    blockinfo?,
-    formalobject.title.content?,
-    glossentry+
-  }
-# end of glosslist.element
-glosslist.attlist &=
-  common.attrib, glosslist.role.attrib, local.glosslist.attrib
-# end of glosslist.attlist
-
-# end of glosslist.module
-local.glossentry.attrib = empty
-glossentry.role.attrib = role.attrib
-# doc:An entry in a Glossary or GlossList.
-glossentry =
-  element glossentry {
-    glossentry.attlist,
-    glossterm,
-    acronym?,
-    abbrev?,
-    ndxterm.class*,
-    revhistory?,
-    (glosssee | glossdef+)
-  }
-# end of glossentry.element
-
-# SortAs: String by which the GlossEntry is to be sorted
-# (alphabetized) in lieu of its proper content
-glossentry.attlist &=
-  attribute sortas { text }?,
-  common.attrib,
-  glossentry.role.attrib,
-  local.glossentry.attrib
-# end of glossentry.attlist
-
-# end of glossentry.module
-
-# GlossTerm (defined in the Inlines section, below)
-local.glossdef.attrib = empty
-glossdef.role.attrib = role.attrib
-# doc:A definition in a GlossEntry.
-glossdef =
-  element glossdef { glossdef.attlist, glossdef.mix+, glossseealso* }
-# end of glossdef.element
-
-# Subject: List of subjects; keywords for the definition
-glossdef.attlist &=
-  attribute subject { text }?,
-  common.attrib,
-  glossdef.role.attrib,
-  local.glossdef.attrib
-# end of glossdef.attlist
-
-# end of glossdef.module
-local.glosssee.attrib = empty
-glosssee.role.attrib = role.attrib
-# doc:A cross-reference from one GlossEntry to another.
-glosssee = element glosssee { glosssee.attlist, para.char.mix* }
-# end of glosssee.element
-
-# OtherTerm: Reference to the GlossEntry whose GlossTerm
-# should be displayed at the point of the GlossSee
-glosssee.attlist &=
-  attribute otherterm { xsd:IDREF }?,
-  common.attrib,
-  glosssee.role.attrib,
-  local.glosssee.attrib
-# end of glosssee.attlist
-
-# end of glosssee.module
-local.glossseealso.attrib = empty
-glossseealso.role.attrib = role.attrib
-# doc:A cross-reference from one GlossEntry to another.
-glossseealso =
-  element glossseealso { glossseealso.attlist, para.char.mix* }
-# end of glossseealso.element
-
-# OtherTerm: Reference to the GlossEntry whose GlossTerm
-# should be displayed at the point of the GlossSeeAlso
-glossseealso.attlist &=
-  attribute otherterm { xsd:IDREF }?,
-  common.attrib,
-  glossseealso.role.attrib,
-  local.glossseealso.attrib
-# end of glossseealso.attlist
-
-# end of glossseealso.module
-
-# end of glossentry.content.module
-
-# ItemizedList and OrderedList .....
-local.itemizedlist.attrib = empty
-itemizedlist.role.attrib = role.attrib
-# doc:A list in which each entry is marked with a bullet or other dingbat.
-itemizedlist =
-  element itemizedlist {
-    itemizedlist.attlist,
-    blockinfo?,
-    formalobject.title.content?,
-    listpreamble.mix*,
-    listitem+
-  }
-# end of itemizedlist.element
-
-# Spacing: Whether the vertical space in the list should be
-# compressed
-
-# Mark: Keyword, e.g., bullet, dash, checkbox, none;
-# list of keywords and defaults are implementation specific
-itemizedlist.attlist &=
-  attribute spacing { "normal" | "compact" }?,
-  mark.attrib,
-  common.attrib,
-  itemizedlist.role.attrib,
-  local.itemizedlist.attrib
-# end of itemizedlist.attlist
-
-# end of itemizedlist.module
-local.orderedlist.attrib = empty
-orderedlist.role.attrib = role.attrib
-# doc:A list in which each entry is marked with a sequentially incremented label.
-orderedlist =
-  element orderedlist {
-    orderedlist.attlist,
-    blockinfo?,
-    formalobject.title.content?,
-    listpreamble.mix*,
-    listitem+
-  }
-# end of orderedlist.element
-
-# Numeration: Style of ListItem numbered; default is expected
-# to be Arabic
-
-# InheritNum: Specifies for a nested list that the numbering
-# of ListItems should include the number of the item
-# within which they are nested (e.g., 1a and 1b within 1,
-# rather than a and b)
-
-# Continuation: Where list numbering begins afresh (Restarts,
-# the default) or continues that of the immediately preceding
-# list (Continues)
-
-# Spacing: Whether the vertical space in the list should be
-# compressed
-orderedlist.attlist &=
-  attribute numeration {
-    "arabic" | "upperalpha" | "loweralpha" | "upperroman" | "lowerroman"
-  }?,
-  [ a:defaultValue = "ignore" ]
-  attribute inheritnum { "inherit" | "ignore" }?,
-  [ a:defaultValue = "restarts" ]
-  attribute continuation { "continues" | "restarts" }?,
-  attribute spacing { "normal" | "compact" }?,
-  common.attrib,
-  orderedlist.role.attrib,
-  local.orderedlist.attrib
-# end of orderedlist.attlist
-
-# end of orderedlist.module
-local.listitem.attrib = empty
-listitem.role.attrib = role.attrib
-# doc:A wrapper for the elements of a list item.
-listitem = element listitem { listitem.attlist, component.mix+ }
-# end of listitem.element
-
-# Override: Indicates the mark to be used for this ListItem
-# instead of the default mark or the mark specified by
-# the Mark attribute on the enclosing ItemizedList
-listitem.attlist &=
-  attribute override { text }?,
-  common.attrib,
-  listitem.role.attrib,
-  local.listitem.attrib
-# end of listitem.attlist
-
-# end of listitem.module
-
-# SegmentedList ....................
-local.segmentedlist.attrib = empty
-segmentedlist.role.attrib = role.attrib
-# doc:A segmented list, a list of sets of elements.
-segmentedlist =
-  element segmentedlist {
-    segmentedlist.attlist,
-    formalobject.title.content?,
-    segtitle+,
-    seglistitem+
-  }
-# end of segmentedlist.element
-segmentedlist.attlist &=
-  common.attrib, segmentedlist.role.attrib, local.segmentedlist.attrib
-# end of segmentedlist.attlist
-
-# end of segmentedlist.module
-local.segtitle.attrib = empty
-segtitle.role.attrib = role.attrib
-# doc:The title of an element of a list item in a segmented list.
-segtitle = element segtitle { segtitle.attlist, title.char.mix* }
-# end of segtitle.element
-segtitle.attlist &=
-  common.attrib, segtitle.role.attrib, local.segtitle.attrib
-# end of segtitle.attlist
-
-# end of segtitle.module
-local.seglistitem.attrib = empty
-seglistitem.role.attrib = role.attrib
-# doc:A list item in a segmented list.
-seglistitem = element seglistitem { seglistitem.attlist, seg+ }
-# end of seglistitem.element
-seglistitem.attlist &=
-  common.attrib, seglistitem.role.attrib, local.seglistitem.attrib
-# end of seglistitem.attlist
-
-# end of seglistitem.module
-local.seg.attrib = empty
-seg.role.attrib = role.attrib
-# doc:An element of a list item in a segmented list.
-seg = element seg { seg.attlist, para.char.mix* }
-# end of seg.element
-seg.attlist &= common.attrib, seg.role.attrib, local.seg.attrib
-# end of seg.attlist
-
-# end of seg.module
-
-# end of segmentedlist.content.module
-
-# SimpleList .......................
-local.simplelist.attrib = empty
-simplelist.role.attrib = role.attrib
-# doc:An undecorated list of single words or short phrases.
-simplelist = element simplelist { simplelist.attlist, member+ }
-# end of simplelist.element
-
-# Columns: The number of columns the array should contain
-
-# Type: How the Members of the SimpleList should be
-# formatted: Inline (members separated with commas etc.
-# inline), Vert (top to bottom in n Columns), or Horiz (in
-# the direction of text flow) in n Columns.  If Column
-# is 1 or implied, Type=Vert and Type=Horiz give the same
-# results.
-simplelist.attlist &=
-  attribute columns { text }?,
-  [ a:defaultValue = "vert" ]
-  attribute type { "inline" | "vert" | "horiz" }?,
-  common.attrib,
-  simplelist.role.attrib,
-  local.simplelist.attrib
-# end of simplelist.attlist
-
-# end of simplelist.module
-local.member.attrib = empty
-member.role.attrib = role.attrib
-# doc:An element of a simple list.
-member = element member { member.attlist, para.char.mix* }
-# end of member.element
-member.attlist &= common.attrib, member.role.attrib, local.member.attrib
-# end of member.attlist
-
-# end of member.module
-
-# end of simplelist.content.module
-
-# VariableList .....................
-local.variablelist.attrib = empty
-variablelist.role.attrib = role.attrib
-# doc:A list in which each entry is composed of a set of one or more terms and an associated description.
-variablelist =
-  element variablelist {
-    variablelist.attlist,
-    blockinfo?,
-    formalobject.title.content?,
-    listpreamble.mix*,
-    varlistentry+
-  }
-# end of variablelist.element
-
-# TermLength: Length beyond which the presentation engine
-# may consider the Term too long and select an alternate
-# presentation of the Term and, or, its associated ListItem.
-variablelist.attlist &=
-  attribute termlength { text }?,
-  attribute spacing { "normal" | "compact" }?,
-  common.attrib,
-  variablelist.role.attrib,
-  local.variablelist.attrib
-# end of variablelist.attlist
-
-# end of variablelist.module
-local.varlistentry.attrib = empty
-varlistentry.role.attrib = role.attrib
-# doc:A wrapper for a set of terms and the associated description in a variable list.
-varlistentry =
-  element varlistentry { varlistentry.attlist, term+, listitem }
-# end of varlistentry.element
-varlistentry.attlist &=
-  common.attrib, varlistentry.role.attrib, local.varlistentry.attrib
-# end of varlistentry.attlist
-
-# end of varlistentry.module
-local.term.attrib = empty
-term.role.attrib = role.attrib
-# doc:The word or phrase being defined or described in a variable list.
-term = element term { term.attlist, para.char.mix* }
-# end of term.element
-term.attlist &= common.attrib, term.role.attrib, local.term.attrib
-# end of term.attlist
-
-# end of term.module
-
-# ListItem (defined above)
-
-# end of variablelist.content.module
-
-# CalloutList ......................
-local.calloutlist.attrib = empty
-calloutlist.role.attrib = role.attrib
-# doc:A list of Callouts.
-calloutlist =
-  element calloutlist {
-    calloutlist.attlist, formalobject.title.content?, callout+
-  }
-# end of calloutlist.element
-calloutlist.attlist &=
-  common.attrib, calloutlist.role.attrib, local.calloutlist.attrib
-# end of calloutlist.attlist
-
-# end of calloutlist.module
-local.callout.attrib = empty
-callout.role.attrib = role.attrib
-# doc:A &ldquo;called out&rdquo; description of a marked Area.
-callout = element callout { callout.attlist, component.mix+ }
-# end of callout.element
-
-# AreaRefs: IDs of one or more Areas or AreaSets described
-# by this Callout
-callout.attlist &=
-  attribute arearefs { xsd:IDREFS },
-  common.attrib,
-  callout.role.attrib,
-  local.callout.attrib
-# end of callout.attlist
-
-# end of callout.module
-
-# end of calloutlist.content.module
-
-# ......................................................................
-
-# Objects ..............................................................
-
-# Examples etc. ....................
-local.example.attrib = empty
-example.role.attrib = role.attrib
-# doc:A formal example, with a title.
-example =
-  element example {
-    example.attlist,
-    blockinfo?,
-    formalobject.title.content,
-    example.mix+
-  }
-# end of example.element
-example.attlist &=
-  attribute floatstyle { text }?,
-  label.attrib,
-  width.attrib,
-  common.attrib,
-  example.role.attrib,
-  local.example.attrib
-# end of example.attlist
-
-# end of example.module
-local.informalexample.attrib = empty
-informalexample.role.attrib = role.attrib
-# doc:A displayed example without a title.
-informalexample =
-  element informalexample {
-    informalexample.attlist, blockinfo?, example.mix+
-  }
-# end of informalexample.element
-informalexample.attlist &=
-  attribute floatstyle { text }?,
-  width.attrib,
-  common.attrib,
-  informalexample.role.attrib,
-  local.informalexample.attrib
-# end of informalexample.attlist
-
-# end of informalexample.module
-local.programlistingco.attrib = empty
-programlistingco.role.attrib = role.attrib
-# doc:A program listing with associated areas used in callouts.
-programlistingco =
-  element programlistingco {
-    programlistingco.attlist, areaspec, programlisting, calloutlist*
-  }
-# end of programlistingco.element
-programlistingco.attlist &=
-  common.attrib,
-  programlistingco.role.attrib,
-  local.programlistingco.attrib
-# end of programlistingco.attlist
-
-# CalloutList (defined above in Lists)
-
-# end of informalexample.module
-local.areaspec.attrib = empty
-areaspec.role.attrib = role.attrib
-# doc:A collection of regions in a graphic or code example.
-areaspec = element areaspec { areaspec.attlist, (area | areaset)+ }
-# end of areaspec.element
-
-# Units: global unit of measure in which coordinates in
-# this spec are expressed:
-# 
-# - CALSPair "x1,y1 x2,y2": lower-left and upper-right
-# coordinates in a rectangle describing repro area in which
-# graphic is placed, where X and Y dimensions are each some
-# number 0..10000 (taken from CALS graphic attributes)
-# 
-# - LineColumn "line column": line number and column number
-# at which to start callout text in "linespecific" content
-# 
-# - LineRange "startline endline": whole lines from startline
-# to endline in "linespecific" content
-# 
-# - LineColumnPair "line1 col1 line2 col2": starting and ending
-# points of area in "linespecific" content that starts at
-# first position and ends at second position (including the
-# beginnings of any intervening lines)
-# 
-# - Other: directive to look at value of OtherUnits attribute
-# to get implementation-specific keyword
-# 
-# The default is implementation-specific; usually dependent on
-# the parent element (GraphicCO gets CALSPair, ProgramListingCO
-# and ScreenCO get LineColumn)
-
-# OtherUnits: User-defined units
-areaspec.attlist &=
-  attribute units {
-    "calspair" | "linecolumn" | "linerange" | "linecolumnpair" | "other"
-  }?,
-  attribute otherunits { xsd:NMTOKEN }?,
-  common.attrib,
-  areaspec.role.attrib,
-  local.areaspec.attrib
-# end of areaspec.attlist
-
-# end of areaspec.module
-local.area.attrib = empty
-area.role.attrib = role.attrib
-# doc:A region defined for a Callout in a graphic or code example.
-area = element area { area.attlist, empty }
-# end of area.element
-
-# bug number/symbol override or initialization
-
-# to any related information
-
-# Units: unit of measure in which coordinates in this
-# area are expressed; inherits from AreaSet and AreaSpec
-
-# OtherUnits: User-defined units
-area.attlist &=
-  label.attrib,
-  linkends.attrib,
-  attribute units {
-    "calspair" | "linecolumn" | "linerange" | "linecolumnpair" | "other"
-  }?,
-  attribute otherunits { xsd:NMTOKEN }?,
-  attribute coords { text },
-  idreq.common.attrib,
-  area.role.attrib,
-  local.area.attrib
-# end of area.attlist
-
-# end of area.module
-local.areaset.attrib = empty
-areaset.role.attrib = role.attrib
-# doc:A set of related areas in a graphic or code example.
-areaset = element areaset { areaset.attlist, area+ }
-# end of areaset.element
-
-# bug number/symbol override or initialization
-
-# Units: unit of measure in which coordinates in this
-# area are expressed; inherits from AreaSpec
-areaset.attlist &=
-  label.attrib,
-  attribute units {
-    "calspair" | "linecolumn" | "linerange" | "linecolumnpair" | "other"
-  }?,
-  attribute otherunits { xsd:NMTOKEN }?,
-  attribute coords { text },
-  idreq.common.attrib,
-  areaset.role.attrib,
-  local.areaset.attrib
-# end of areaset.attlist
-
-# end of areaset.module
-
-# end of areaspec.content.module
-local.programlisting.attrib = empty
-programlisting.role.attrib = role.attrib
-# doc:A literal listing of all or part of a program.
-programlisting =
-  element programlisting {
-    programlisting.attlist,
-    (para.char.mix | co | coref | lineannotation | textobject)*
-  }
-# end of programlisting.element
-programlisting.attlist &=
-  width.attrib,
-  linespecific.attrib,
-  common.attrib,
-  programlisting.role.attrib,
-  local.programlisting.attrib
-# end of programlisting.attlist
-
-# end of programlisting.module
-local.literallayout.attrib = empty
-literallayout.role.attrib = role.attrib
-# doc:A block of text in which line breaks and white space are to be reproduced faithfully.
-literallayout =
-  element literallayout {
-    literallayout.attlist,
-    (para.char.mix | co | coref | textobject | lineannotation)*
-  }
-# end of literallayout.element
-literallayout.attlist &=
-  width.attrib,
-  linespecific.attrib,
-  [ a:defaultValue = "normal" ]
-  attribute class { "monospaced" | "normal" }?,
-  common.attrib,
-  literallayout.role.attrib,
-  local.literallayout.attrib
-# end of literallayout.attlist
-
-# LineAnnotation (defined in the Inlines section, below)
-
-# end of literallayout.module
-local.screenco.attrib = empty
-screenco.role.attrib = role.attrib
-# doc:A screen with associated areas used in callouts.
-screenco =
-  element screenco { screenco.attlist, areaspec, screen, calloutlist* }
-# end of screenco.element
-screenco.attlist &=
-  common.attrib, screenco.role.attrib, local.screenco.attrib
-# end of screenco.attlist
-
-# AreaSpec (defined above)
-
-# CalloutList (defined above in Lists)
-
-# end of screenco.module
-local.screen.attrib = empty
-screen.role.attrib = role.attrib
-# doc:Text that a user sees or might see on a computer screen.
-screen =
-  element screen {
-    screen.attlist,
-    (para.char.mix | co | coref | textobject | lineannotation)*
-  }
-# end of screen.element
-screen.attlist &=
-  width.attrib,
-  linespecific.attrib,
-  common.attrib,
-  screen.role.attrib,
-  local.screen.attrib
-# end of screen.attlist
-
-# end of screen.module
-local.screenshot.attrib = empty
-screenshot.role.attrib = role.attrib
-# doc:A representation of what the user sees or might see on a computer screen.
-screenshot =
-  element screenshot {
-    screenshot.attlist,
-    screeninfo?,
-    (graphic | graphicco | mediaobject | mediaobjectco)
-  }
-# end of screenshot.element
-screenshot.attlist &=
-  common.attrib, screenshot.role.attrib, local.screenshot.attrib
-# end of screenshot.attlist
-
-# end of screenshot.module
-local.screeninfo.attrib = empty
-screeninfo.role.attrib = role.attrib
-# doc:Information about how a screen shot was produced.
-screeninfo = element screeninfo { screeninfo.attlist, para.char.mix* }
-# end of screeninfo.element
-screeninfo.attlist &=
-  common.attrib, screeninfo.role.attrib, local.screeninfo.attrib
-# end of screeninfo.attlist
-
-# end of screeninfo.module
-
-# end of screenshot.content.module
-
-# Figures etc. .....................
-local.figure.attrib = empty
-figure.role.attrib = role.attrib
-# doc:A formal figure, generally an illustration, with a title.
-figure =
-  element figure {
-    figure.attlist,
-    blockinfo?,
-    formalobject.title.content,
-    (figure.mix | link.char.class)+
-  }
-# end of figure.element
-
-# Float: Whether the Figure is supposed to be rendered
-# where convenient (yes (1) value) or at the place it occurs
-# in the text (no (0) value, the default)
-figure.attlist &=
-  [ a:defaultValue = "0" ] attribute float { yesorno.attvals }?,
-  attribute floatstyle { text }?,
-  attribute pgwide { yesorno.attvals }?,
-  label.attrib,
-  common.attrib,
-  figure.role.attrib,
-  local.figure.attrib
-# end of figure.attlist
-
-# end of figure.module
-local.informalfigure.attrib = empty
-informalfigure.role.attrib = role.attrib
-# doc:A untitled figure.
-informalfigure =
-  element informalfigure {
-    informalfigure.attlist, blockinfo?, (figure.mix | link.char.class)+
-  }
-# end of informalfigure.element
-
-# Float: Whether the Figure is supposed to be rendered
-# where convenient (yes (1) value) or at the place it occurs
-# in the text (no (0) value, the default)
-informalfigure.attlist &=
-  [ a:defaultValue = "0" ] attribute float { yesorno.attvals }?,
-  attribute floatstyle { text }?,
-  attribute pgwide { yesorno.attvals }?,
-  label.attrib,
-  common.attrib,
-  informalfigure.role.attrib,
-  local.informalfigure.attrib
-# end of informalfigure.attlist
-
-# end of informalfigure.module
-local.graphicco.attrib = empty
-graphicco.role.attrib = role.attrib
-# doc:A graphic that contains callout areas.
-graphicco =
-  element graphicco {
-    graphicco.attlist, areaspec, graphic, calloutlist*
-  }
-# end of graphicco.element
-graphicco.attlist &=
-  common.attrib, graphicco.role.attrib, local.graphicco.attrib
-# end of graphicco.attlist
-
-# AreaSpec (defined above in Examples)
-
-# CalloutList (defined above in Lists)
-
-# end of graphicco.module
-
-# Graphical data can be the content of Graphic, or you can reference
-# an external file either as an entity (Entitref) or a filename
-# (Fileref).
-local.graphic.attrib = empty
-graphic.role.attrib = role.attrib
-# doc:A displayed graphical object (not an inline).
-graphic = element graphic { graphic.attlist, empty }
-# end of graphic.element
-graphic.attlist &=
-  graphics.attrib,
-  common.attrib,
-  graphic.role.attrib,
-  local.graphic.attrib
-# end of graphic.attlist
-
-# end of graphic.module
-local.inlinegraphic.attrib = empty
-inlinegraphic.role.attrib = role.attrib
-# doc:An object containing or pointing to graphical data that will be rendered inline.
-inlinegraphic = element inlinegraphic { inlinegraphic.attlist, empty }
-# end of inlinegraphic.element
-inlinegraphic.attlist &=
-  graphics.attrib,
-  common.attrib,
-  inlinegraphic.role.attrib,
-  local.inlinegraphic.attrib
-# end of inlinegraphic.attlist
-
-# end of inlinegraphic.module
-local.mediaobject.attrib = empty
-mediaobject.role.attrib = role.attrib
-# doc:A displayed media object (video, audio, image, etc.).
-mediaobject =
-  element mediaobject {
-    mediaobject.attlist, objectinfo?, mediaobject.mix+, caption?
-  }
-# end of mediaobject.element
-mediaobject.attlist &=
-  common.attrib, mediaobject.role.attrib, local.mediaobject.attrib
-# end of mediaobject.attlist
-
-# end of mediaobject.module
-local.inlinemediaobject.attrib = empty
-inlinemediaobject.role.attrib = role.attrib
-# doc:An inline media object (video, audio, image, and so on).
-inlinemediaobject =
-  element inlinemediaobject {
-    inlinemediaobject.attlist, objectinfo?, mediaobject.mix+
-  }
-# end of inlinemediaobject.element
-inlinemediaobject.attlist &=
-  common.attrib,
-  inlinemediaobject.role.attrib,
-  local.inlinemediaobject.attrib
-# end of inlinemediaobject.attlist
-
-# end of inlinemediaobject.module
-local.videoobject.attrib = empty
-videoobject.role.attrib = role.attrib
-# doc:A wrapper for video data and its associated meta-information.
-videoobject =
-  element videoobject { videoobject.attlist, objectinfo?, videodata }
-# end of videoobject.element
-videoobject.attlist &=
-  common.attrib, videoobject.role.attrib, local.videoobject.attrib
-# end of videoobject.attlist
-
-# end of videoobject.module
-local.audioobject.attrib = empty
-audioobject.role.attrib = role.attrib
-# doc:A wrapper for audio data and its associated meta-information.
-audioobject =
-  element audioobject { audioobject.attlist, objectinfo?, audiodata }
-# end of audioobject.element
-audioobject.attlist &=
-  common.attrib, audioobject.role.attrib, local.audioobject.attrib
-# end of audioobject.attlist
-
-# end of audioobject.module
-local.imageobject.attrib = empty
-imageobject.role.attrib = role.attrib
-# doc:A wrapper for image data and its associated meta-information.
-imageobject =
-  element imageobject { imageobject.attlist, objectinfo?, imagedata }
-# end of imageobject.element
-imageobject.attlist &=
-  common.attrib, imageobject.role.attrib, local.imageobject.attrib
-# end of imageobject.attlist
-
-# end of imageobject.module
-local.textobject.attrib = empty
-textobject.role.attrib = role.attrib
-# doc:A wrapper for a text description of an object and its associated meta-information.
-textobject =
-  element textobject {
-    textobject.attlist,
-    objectinfo?,
-    (phrase | textdata | textobject.mix+)
-  }
-# end of textobject.element
-textobject.attlist &=
-  common.attrib, textobject.role.attrib, local.textobject.attrib
-# end of textobject.attlist
-
-# end of textobject.module
-local.objectinfo.attrib = empty
-objectinfo.role.attrib = role.attrib
-# doc:Meta-information for an object.
-objectinfo = element objectinfo { objectinfo.attlist, info.class+ }
-# end of objectinfo.element
-objectinfo.attlist &=
-  common.attrib, objectinfo.role.attrib, local.objectinfo.attrib
-# end of objectinfo.attlist
-
-# end of objectinfo.module
-
-# EntityRef: Name of an external entity containing the content
-# of the object data
-
-# FileRef: Filename, qualified by a pathname if desired,
-# designating the file containing the content of the object data
-
-# Format: Notation of the element content, if any
-
-# SrcCredit: Information about the source of the image
-local.objectdata.attrib = empty
-objectdata.attrib =
-  attribute entityref { xsd:ENTITY }?,
-  attribute fileref { text }?,
-  attribute format { notation.class }?,
-  attribute srccredit { text }?,
-  local.objectdata.attrib
-local.videodata.attrib = empty
-videodata.role.attrib = role.attrib
-# doc:Pointer to external video data.
-videodata = element videodata { videodata.attlist, empty }
-# end of videodata.element
-
-# Width: Same as CALS reprowid (desired width)
-
-# Depth: Same as CALS reprodep (desired depth)
-
-# Align: Same as CALS hplace with 'none' removed; #IMPLIED means
-# application-specific
-
-# Scale: Conflation of CALS hscale and vscale
-
-# Scalefit: Same as CALS scalefit
-videodata.attlist &=
-  attribute width { text }?,
-  attribute contentwidth { text }?,
-  attribute depth { text }?,
-  attribute contentdepth { text }?,
-  attribute align { "left" | "right" | "center" }?,
-  attribute valign { "top" | "middle" | "bottom" }?,
-  attribute scale { text }?,
-  attribute scalefit { yesorno.attvals }?,
-  objectdata.attrib,
-  common.attrib,
-  videodata.role.attrib,
-  local.videodata.attrib
-# end of videodata.attlist
-
-# end of videodata.module
-local.audiodata.attrib = empty
-audiodata.role.attrib = role.attrib
-# doc:Pointer to external audio data.
-audiodata = element audiodata { audiodata.attlist, empty }
-# end of audiodata.element
-audiodata.attlist &=
-  objectdata.attrib,
-  common.attrib,
-  audiodata.role.attrib,
-  local.audiodata.attrib
-# end of audiodata.attlist
-
-# end of audiodata.module
-local.imagedata.attrib = empty
-imagedata.role.attrib = role.attrib
-# doc:Pointer to external image data.
-imagedata = element imagedata { imagedata.attlist, empty }
-# end of imagedata.element
-
-# Width: Same as CALS reprowid (desired width)
-
-# Depth: Same as CALS reprodep (desired depth)
-
-# Align: Same as CALS hplace with 'none' removed; #IMPLIED means
-# application-specific
-
-# Scale: Conflation of CALS hscale and vscale
-
-# Scalefit: Same as CALS scalefit
-imagedata.attlist &=
-  attribute width { text }?,
-  attribute contentwidth { text }?,
-  attribute depth { text }?,
-  attribute contentdepth { text }?,
-  attribute align { "left" | "right" | "center" }?,
-  attribute valign { "top" | "middle" | "bottom" }?,
-  attribute scale { text }?,
-  attribute scalefit { yesorno.attvals }?,
-  objectdata.attrib,
-  common.attrib,
-  imagedata.role.attrib,
-  local.imagedata.attrib
-# end of imagedata.attlist
-
-# end of imagedata.module
-local.textdata.attrib = empty
-textdata.role.attrib = role.attrib
-# doc:Pointer to external text data.
-textdata = element textdata { textdata.attlist, empty }
-# end of textdata.element
-textdata.attlist &=
-  attribute encoding { text }?,
-  objectdata.attrib,
-  common.attrib,
-  textdata.role.attrib,
-  local.textdata.attrib
-# end of textdata.attlist
-
-# end of textdata.module
-local.mediaobjectco.attrib = empty
-mediaobjectco.role.attrib = role.attrib
-# doc:A media object that contains callouts.
-mediaobjectco =
-  element mediaobjectco {
-    mediaobjectco.attlist,
-    objectinfo?,
-    imageobjectco,
-    (imageobjectco | textobject)*
-  }
-# end of mediaobjectco.element
-mediaobjectco.attlist &=
-  common.attrib, mediaobjectco.role.attrib, local.mediaobjectco.attrib
-# end of mediaobjectco.attlist
-
-# end of mediaobjectco.module
-local.imageobjectco.attrib = empty
-imageobjectco.role.attrib = role.attrib
-# doc:A wrapper for an image object with callouts.
-imageobjectco =
-  element imageobjectco {
-    imageobjectco.attlist, areaspec, imageobject, calloutlist*
-  }
-# end of imageobjectco.element
-imageobjectco.attlist &=
-  common.attrib, imageobjectco.role.attrib, local.imageobjectco.attrib
-# end of imageobjectco.attlist
-
-# end of imageobjectco.module
-
-# end of mediaobject.content.module
-
-# Equations ........................
-
-# This PE provides a mechanism for replacing equation content,
-
-# perhaps adding a new or different model (e.g., MathML)
-equation.content = alt?, (graphic+ | mediaobject+ | mathphrase+)
-inlineequation.content =
-  alt?, (graphic+ | inlinemediaobject+ | mathphrase+)
-local.equation.attrib = empty
-equation.role.attrib = role.attrib
-# doc:A displayed mathematical equation.
-equation =
-  element equation {
-    equation.attlist,
-    blockinfo?,
-    formalobject.title.content?,
-    (informalequation | equation.content)
-  }
-# end of equation.element
-equation.attlist &=
-  attribute floatstyle { text }?,
-  label.attrib,
-  common.attrib,
-  equation.role.attrib,
-  local.equation.attrib
-# end of equation.attlist
-
-# end of equation.module
-local.informalequation.attrib = empty
-informalequation.role.attrib = role.attrib
-# doc:A displayed mathematical equation without a title.
-informalequation =
-  element informalequation {
-    informalequation.attlist, blockinfo?, equation.content
-  }
-# end of informalequation.element
-informalequation.attlist &=
-  attribute floatstyle { text }?,
-  common.attrib,
-  informalequation.role.attrib,
-  local.informalequation.attrib
-# end of informalequation.attlist
-
-# end of informalequation.module
-local.inlineequation.attrib = empty
-inlineequation.role.attrib = role.attrib
-# doc:A mathematical equation or expression occurring inline.
-inlineequation =
-  element inlineequation {
-    inlineequation.attlist, inlineequation.content
-  }
-# end of inlineequation.element
-inlineequation.attlist &=
-  common.attrib, inlineequation.role.attrib, local.inlineequation.attrib
-# end of inlineequation.attlist
-
-# end of inlineequation.module
-local.alt.attrib = empty
-alt.role.attrib = role.attrib
-# doc:Text representation for a graphical element.
-alt = element alt { alt.attlist, text }
-# end of alt.element
-alt.attlist &= common.attrib, alt.role.attrib, local.alt.attrib
-# end of alt.attlist
-
-# end of alt.module
-local.mathphrase.attrib = empty
-mathphrase.role.attrib = role.attrib
-# doc:A mathematical phrase, an expression that can be represented with ordinary text and a small amount of markup.
-mathphrase =
-  element mathphrase {
-    mathphrase.attlist, (text | subscript | superscript | emphasis)*
-  }
-# end of mathphrase.element
-mathphrase.attlist &=
-  common.attrib, mathphrase.role.attrib, local.mathphrase.attrib
-# end of mathphrase.attlist
-
-# end of mathphrase.module
-
-# Tables ...........................
-
-# Choose a table model. CALS or OASIS XML Exchange
-
-# Do we allow the HTML table model as well?
-
-# ======================================================
-
-# xhtmltbl.mod defines HTML tables and sets parameter
-# entities so that, when the CALS table module is read,
-# we end up allowing any table to be CALS or HTML.
-# i.e. This include must come first!
-
-# ======================================================
-include "htmltblx.rnc"
-# end of allow.html.tables
-
-# Add label and role attributes to table and informaltable
-
-# Add common attributes to Table, TGroup, TBody, THead, TFoot, Row,
-# EntryTbl, and Entry (and InformalTable element).
-
-# Content model for Table.
-
-# Allow either objects or inlines; beware of REs between elements.
-
-# Reference CALS Table Model
-include "calstblx.rnc"
-# end of table.module
-
-# Note that InformalTable is dependent on some of the entity
-# declarations that customize Table.
-local.informaltable.attrib = empty
-# the following entity may have been declared by the XHTML table module
-
-# doc:A table without a title.
-informaltable =
-  element informaltable {
-    informaltable.attlist, blockinfo?, informal.tbl.table.mdl
-  }
-# end of informaltable.element
-
-# Frame, Colsep, and Rowsep must be repeated because
-# they are not in entities in the table module.
-
-# includes TabStyle, ToCentry, ShortEntry,
-# Orient, PgWide
-
-# includes Label
-
-# includes common attributes
-informaltable.attlist &=
-  attribute frame { tbl.frame.attval }?,
-  attribute colsep { yesorno.attvals }?,
-  attribute rowsep { yesorno.attvals }?,
-  common.table.attribs,
-  tbl.table.att,
-  local.informaltable.attrib
-# end of informaltable.attlist
-
-# end of informaltable.module
-local.caption.attrib = empty
-caption.role.attrib = role.attrib
-# doc:A caption.
-caption = element caption { caption.attlist, (text | textobject.mix)* }
-# end of caption.element
-
-# attrs comes from HTML tables ...
-
-# common.attrib, but without ID because ID is in attrs
-caption.attlist.content =
-  caption.role.attrib,
-  attrs,
-  attribute align { "top" | "bottom" | "left" | "right" }?,
-  local.caption.attrib
-caption.attlist &= caption.attlist.content
-# end of caption.attlist
-
-# end of caption.module
-
-# ......................................................................
-
-# Synopses .............................................................
-
-# Synopsis .........................
-local.synopsis.attrib = empty
-synopsis.role.attrib = role.attrib
-# doc:A general-purpose element for representing the syntax of commands or functions.
-synopsis =
-  element synopsis {
-    synopsis.attlist,
-    (para.char.mix
-     | graphic
-     | mediaobject
-     | co
-     | coref
-     | textobject
-     | lineannotation)*
-  }
-# end of synopsis.element
-synopsis.attlist &=
-  label.attrib,
-  linespecific.attrib,
-  common.attrib,
-  synopsis.role.attrib,
-  local.synopsis.attrib
-# end of synopsis.attlist
-
-# LineAnnotation (defined in the Inlines section, below)
-
-# end of synopsis.module
-
-# CmdSynopsis ......................
-local.cmdsynopsis.attrib = empty
-cmdsynopsis.role.attrib = role.attrib
-# doc:A syntax summary for a software command.
-cmdsynopsis =
-  element cmdsynopsis {
-    cmdsynopsis.attlist, (command | arg | group | sbr)+, synopfragment*
-  }
-# end of cmdsynopsis.element
-
-# Sepchar: Character that should separate command and all
-# top-level arguments; alternate value might be e.g., &Delta;
-cmdsynopsis.attlist &=
-  label.attrib,
-  [ a:defaultValue = " " ] attribute sepchar { text }?,
-  attribute cmdlength { text }?,
-  common.attrib,
-  cmdsynopsis.role.attrib,
-  local.cmdsynopsis.attrib
-# end of cmdsynopsis.attlist
-
-# end of cmdsynopsis.module
-local.arg.attrib = empty
-arg.role.attrib = role.attrib
-# doc:An argument in a CmdSynopsis.
-arg =
-  element arg {
-    arg.attlist,
-    (text
-     | arg
-     | group
-     | option
-     | synopfragmentref
-     | replaceable
-     | sbr)*
-  }
-# end of arg.element
-
-# Choice: Whether Arg must be supplied: Opt (optional to
-# supply, e.g. [arg]; the default), Req (required to supply,
-# e.g. {arg}), or Plain (required to supply, e.g. arg)
-
-# Rep: whether Arg is repeatable: Norepeat (e.g. arg without
-# ellipsis; the default), or Repeat (e.g. arg...)
-arg.attlist &=
-  [ a:defaultValue = "opt" ]
-  attribute choice { "opt" | "req" | "plain" }?,
-  [ a:defaultValue = "norepeat" ]
-  attribute rep { "norepeat" | "repeat" }?,
-  common.attrib,
-  arg.role.attrib,
-  local.arg.attrib
-# end of arg.attlist
-
-# end of arg.module
-local.group.attrib = empty
-group.role.attrib = role.attrib
-# doc:A group of elements in a CmdSynopsis.
-group =
-  element group {
-    group.attlist,
-    (arg | group | option | synopfragmentref | replaceable | sbr)+
-  }
-# end of group.element
-
-# Choice: Whether Group must be supplied: Opt (optional to
-# supply, e.g.  [g1|g2|g3]; the default), Req (required to
-# supply, e.g.  {g1|g2|g3}), Plain (required to supply,
-# e.g.  g1|g2|g3), OptMult (can supply zero or more, e.g.
-# [[g1|g2|g3]]), or ReqMult (must supply one or more, e.g.
-# {{g1|g2|g3}})
-
-# Rep: whether Group is repeatable: Norepeat (e.g. group
-# without ellipsis; the default), or Repeat (e.g. group...)
-group.attlist &=
-  [ a:defaultValue = "opt" ]
-  attribute choice { "opt" | "req" | "plain" }?,
-  [ a:defaultValue = "norepeat" ]
-  attribute rep { "norepeat" | "repeat" }?,
-  common.attrib,
-  group.role.attrib,
-  local.group.attrib
-# end of group.attlist
-
-# end of group.module
-local.sbr.attrib = empty
-# Synopsis break
-sbr.role.attrib = role.attrib
-# doc:An explicit line break in a command synopsis.
-sbr = element sbr { sbr.attlist, empty }
-# end of sbr.element
-sbr.attlist &= common.attrib, sbr.role.attrib, local.sbr.attrib
-# end of sbr.attlist
-
-# end of sbr.module
-local.synopfragmentref.attrib = empty
-synopfragmentref.role.attrib = role.attrib
-# doc:A reference to a fragment of a command synopsis.
-synopfragmentref =
-  element synopfragmentref { synopfragmentref.attlist, text }
-# end of synopfragmentref.element
-
-# to SynopFragment of complex synopsis
-# material for separate referencing
-synopfragmentref.attlist &=
-  linkendreq.attrib,
-  common.attrib,
-  synopfragmentref.role.attrib,
-  local.synopfragmentref.attrib
-# end of synopfragmentref.attlist
-
-# end of synopfragmentref.module
-local.synopfragment.attrib = empty
-synopfragment.role.attrib = role.attrib
-# doc:A portion of a CmdSynopsis broken out from the main body of the synopsis.
-synopfragment =
-  element synopfragment { synopfragment.attlist, (arg | group)+ }
-# end of synopfragment.element
-synopfragment.attlist &=
-  idreq.common.attrib,
-  synopfragment.role.attrib,
-  local.synopfragment.attrib
-# end of synopfragment.attlist
-
-# end of synopfragment.module
-
-# Command (defined in the Inlines section, below)
-
-# Option (defined in the Inlines section, below)
-
-# Replaceable (defined in the Inlines section, below)
-
-# end of cmdsynopsis.content.module
-
-# FuncSynopsis .....................
-local.funcsynopsis.attrib = empty
-funcsynopsis.role.attrib = role.attrib
-# doc:The syntax summary for a function definition.
-funcsynopsis =
-  element funcsynopsis {
-    funcsynopsis.attlist, (funcsynopsisinfo | funcprototype)+
-  }
-# end of funcsynopsis.element
-funcsynopsis.attlist &=
-  label.attrib,
-  common.attrib,
-  funcsynopsis.role.attrib,
-  local.funcsynopsis.attrib
-# end of funcsynopsis.attlist
-
-# end of funcsynopsis.module
-local.funcsynopsisinfo.attrib = empty
-funcsynopsisinfo.role.attrib = role.attrib
-# doc:Information supplementing the FuncDefs of a FuncSynopsis.
-funcsynopsisinfo =
-  element funcsynopsisinfo {
-    funcsynopsisinfo.attlist,
-    (cptr.char.mix | textobject | lineannotation)*
-  }
-# end of funcsynopsisinfo.element
-funcsynopsisinfo.attlist &=
-  linespecific.attrib,
-  common.attrib,
-  funcsynopsisinfo.role.attrib,
-  local.funcsynopsisinfo.attrib
-# end of funcsynopsisinfo.attlist
-
-# end of funcsynopsisinfo.module
-local.funcprototype.attrib = empty
-funcprototype.role.attrib = role.attrib
-# doc:The prototype of a function.
-funcprototype =
-  element funcprototype {
-    funcprototype.attlist,
-    modifier*,
-    funcdef,
-    (void | varargs | (paramdef+, varargs?)),
-    modifier*
-  }
-# end of funcprototype.element
-funcprototype.attlist &=
-  common.attrib, funcprototype.role.attrib, local.funcprototype.attrib
-# end of funcprototype.attlist
-
-# end of funcprototype.module
-local.funcdef.attrib = empty
-funcdef.role.attrib = role.attrib
-# doc:A function (subroutine) name and its return type.
-funcdef =
-  element funcdef {
-    funcdef.attlist, (text | type | replaceable | function)*
-  }
-# end of funcdef.element
-funcdef.attlist &=
-  common.attrib, funcdef.role.attrib, local.funcdef.attrib
-# end of funcdef.attlist
-
-# end of funcdef.module
-local.void.attrib = empty
-void.role.attrib = role.attrib
-# doc:An empty element in a function synopsis indicating that the function in question takes no arguments.
-void = element void { void.attlist, empty }
-# end of void.element
-void.attlist &= common.attrib, void.role.attrib, local.void.attrib
-# end of void.attlist
-
-# end of void.module
-local.varargs.attrib = empty
-varargs.role.attrib = role.attrib
-# doc:An empty element in a function synopsis indicating a variable number of arguments.
-varargs = element varargs { varargs.attlist, empty }
-# end of varargs.element
-varargs.attlist &=
-  common.attrib, varargs.role.attrib, local.varargs.attrib
-# end of varargs.attlist
-
-# end of varargs.module
-
-# Processing assumes that only one Parameter will appear in a
-# ParamDef, and that FuncParams will be used at most once, for
-# providing information on the "inner parameters" for parameters that
-# are pointers to functions.
-local.paramdef.attrib = empty
-paramdef.role.attrib = role.attrib
-# doc:Information about a function parameter in a programming language.
-paramdef =
-  element paramdef {
-    paramdef.attlist,
-    (text | initializer | type | replaceable | parameter | funcparams)*
-  }
-# end of paramdef.element
-paramdef.attlist &=
-  attribute choice { "opt" | "req" }?,
-  common.attrib,
-  paramdef.role.attrib,
-  local.paramdef.attrib
-# end of paramdef.attlist
-
-# end of paramdef.module
-local.funcparams.attrib = empty
-funcparams.role.attrib = role.attrib
-# doc:Parameters for a function referenced through a function pointer in a synopsis.
-funcparams = element funcparams { funcparams.attlist, cptr.char.mix* }
-# end of funcparams.element
-funcparams.attlist &=
-  common.attrib, funcparams.role.attrib, local.funcparams.attrib
-# end of funcparams.attlist
-
-# end of funcparams.module
-
-# LineAnnotation (defined in the Inlines section, below)
-
-# Replaceable (defined in the Inlines section, below)
-
-# Function (defined in the Inlines section, below)
-
-# Parameter (defined in the Inlines section, below)
-
-# end of funcsynopsis.content.module
-
-# ClassSynopsis .....................
-local.classsynopsis.attrib = empty
-classsynopsis.role.attrib = role.attrib
-# doc:The syntax summary for a class definition.
-classsynopsis =
-  element classsynopsis {
-    classsynopsis.attlist,
-    (ooclass | oointerface | ooexception)+,
-    (classsynopsisinfo | fieldsynopsis | method.synop.class)*
-  }
-# end of classsynopsis.element
-classsynopsis.attlist &=
-  attribute language { text }?,
-  [ a:defaultValue = "class" ]
-  attribute class { "class" | "interface" }?,
-  common.attrib,
-  classsynopsis.role.attrib,
-  local.classsynopsis.attrib
-# end of classsynopsis.attlist
-
-# end of classsynopsis.module
-local.classsynopsisinfo.attrib = empty
-classsynopsisinfo.role.attrib = role.attrib
-# doc:Information supplementing the contents of a ClassSynopsis.
-classsynopsisinfo =
-  element classsynopsisinfo {
-    classsynopsisinfo.attlist,
-    (cptr.char.mix | textobject | lineannotation)*
-  }
-# end of classsynopsisinfo.element
-classsynopsisinfo.attlist &=
-  linespecific.attrib,
-  common.attrib,
-  classsynopsisinfo.role.attrib,
-  local.classsynopsisinfo.attrib
-# end of classsynopsisinfo.attlist
-
-# end of classsynopsisinfo.module
-local.ooclass.attrib = empty
-ooclass.role.attrib = role.attrib
-# doc:A class in an object-oriented programming language.
-ooclass =
-  element ooclass { ooclass.attlist, (modifier | package)*, classname }
-# end of ooclass.element
-ooclass.attlist &=
-  common.attrib, ooclass.role.attrib, local.ooclass.attrib
-# end of ooclass.attlist
-
-# end of ooclass.module
-local.oointerface.attrib = empty
-oointerface.role.attrib = role.attrib
-# doc:An interface in an object-oriented programming language.
-oointerface =
-  element oointerface {
-    oointerface.attlist, (modifier | package)*, interfacename
-  }
-# end of oointerface.element
-oointerface.attlist &=
-  common.attrib, oointerface.role.attrib, local.oointerface.attrib
-# end of oointerface.attlist
-
-# end of oointerface.module
-local.ooexception.attrib = empty
-ooexception.role.attrib = role.attrib
-# doc:An exception in an object-oriented programming language.
-ooexception =
-  element ooexception {
-    ooexception.attlist, (modifier | package)*, exceptionname
-  }
-# end of ooexception.element
-ooexception.attlist &=
-  common.attrib, ooexception.role.attrib, local.ooexception.attrib
-# end of ooexception.attlist
-
-# end of ooexception.module
-local.modifier.attrib = empty
-modifier.role.attrib = role.attrib
-# doc:Modifiers in a synopsis.
-modifier = element modifier { modifier.attlist, smallcptr.char.mix* }
-# end of modifier.element
-modifier.attlist &=
-  common.attrib, modifier.role.attrib, local.modifier.attrib
-# end of modifier.attlist
-
-# end of modifier.module
-local.interfacename.attrib = empty
-interfacename.role.attrib = role.attrib
-# doc:The name of an interface.
-interfacename =
-  element interfacename { interfacename.attlist, cptr.char.mix* }
-# end of interfacename.element
-interfacename.attlist &=
-  common.attrib, interfacename.role.attrib, local.interfacename.attrib
-# end of interfacename.attlist
-
-# end of interfacename.module
-local.exceptionname.attrib = empty
-exceptionname.role.attrib = role.attrib
-# doc:The name of an exception.
-exceptionname =
-  element exceptionname { exceptionname.attlist, smallcptr.char.mix* }
-# end of exceptionname.element
-exceptionname.attlist &=
-  common.attrib, exceptionname.role.attrib, local.exceptionname.attrib
-# end of exceptionname.attlist
-
-# end of exceptionname.module
-local.fieldsynopsis.attrib = empty
-fieldsynopsis.role.attrib = role.attrib
-# doc:The name of a field in a class definition.
-fieldsynopsis =
-  element fieldsynopsis {
-    fieldsynopsis.attlist, modifier*, type?, varname, initializer?
-  }
-# end of fieldsynopsis.element
-fieldsynopsis.attlist &=
-  attribute language { text }?,
-  common.attrib,
-  fieldsynopsis.role.attrib,
-  local.fieldsynopsis.attrib
-# end of fieldsynopsis.attlist
-
-# end of fieldsynopsis.module
-local.initializer.attrib = empty
-initializer.role.attrib = role.attrib
-# doc:The initializer for a FieldSynopsis.
-initializer =
-  element initializer { initializer.attlist, smallcptr.char.mix* }
-# end of initializer.element
-initializer.attlist &=
-  common.attrib, initializer.role.attrib, local.initializer.attrib
-# end of initializer.attlist
-
-# end of initializer.module
-local.constructorsynopsis.attrib = empty
-constructorsynopsis.role.attrib = role.attrib
-# doc:A syntax summary for a constructor.
-constructorsynopsis =
-  element constructorsynopsis {
-    constructorsynopsis.attlist,
-    modifier*,
-    methodname?,
-    (methodparam+ | void?),
-    exceptionname*
-  }
-# end of constructorsynopsis.element
-constructorsynopsis.attlist &=
-  attribute language { text }?,
-  common.attrib,
-  constructorsynopsis.role.attrib,
-  local.constructorsynopsis.attrib
-# end of constructorsynopsis.attlist
-
-# end of constructorsynopsis.module
-local.destructorsynopsis.attrib = empty
-destructorsynopsis.role.attrib = role.attrib
-# doc:A syntax summary for a destructor.
-destructorsynopsis =
-  element destructorsynopsis {
-    destructorsynopsis.attlist,
-    modifier*,
-    methodname?,
-    (methodparam+ | void?),
-    exceptionname*
-  }
-# end of destructorsynopsis.element
-destructorsynopsis.attlist &=
-  attribute language { text }?,
-  common.attrib,
-  destructorsynopsis.role.attrib,
-  local.destructorsynopsis.attrib
-# end of destructorsynopsis.attlist
-
-# end of destructorsynopsis.module
-local.methodsynopsis.attrib = empty
-methodsynopsis.role.attrib = role.attrib
-# doc:A syntax summary for a method.
-methodsynopsis =
-  element methodsynopsis {
-    methodsynopsis.attlist,
-    modifier*,
-    (type | void)?,
-    methodname,
-    (methodparam+ | void?),
-    exceptionname*,
-    modifier*
-  }
-# end of methodsynopsis.element
-methodsynopsis.attlist &=
-  attribute language { text }?,
-  common.attrib,
-  methodsynopsis.role.attrib,
-  local.methodsynopsis.attrib
-# end of methodsynopsis.attlist
-
-# end of methodsynopsis.module
-local.methodname.attrib = empty
-methodname.role.attrib = role.attrib
-# doc:The name of a method.
-methodname =
-  element methodname { methodname.attlist, smallcptr.char.mix* }
-# end of methodname.element
-methodname.attlist &=
-  common.attrib, methodname.role.attrib, local.methodname.attrib
-# end of methodname.attlist
-
-# end of methodname.module
-local.methodparam.attrib = empty
-methodparam.role.attrib = role.attrib
-# doc:Parameters to a method.
-methodparam =
-  element methodparam {
-    methodparam.attlist,
-    modifier*,
-    type?,
-    ((parameter, initializer?) | funcparams),
-    modifier*
-  }
-# end of methodparam.element
-methodparam.attlist &=
-  [ a:defaultValue = "req" ]
-  attribute choice { "opt" | "req" | "plain" }?,
-  [ a:defaultValue = "norepeat" ]
-  attribute rep { "norepeat" | "repeat" }?,
-  common.attrib,
-  methodparam.role.attrib,
-  local.methodparam.attrib
-# end of methodparam.attlist
-
-# end of methodparam.module
-
-# end of classsynopsis.content.module
-
-# ......................................................................
-
-# Document information entities and elements ...........................
-
-# The document information elements include some elements that are
-# currently used only in the document hierarchy module. They are
-# defined here so that they will be available for use in customized
-# document hierarchies.
-
-# ..................................
-
-# Ackno ............................
-local.ackno.attrib = empty
-ackno.role.attrib = role.attrib
-# doc:Acknowledgements in an Article.
-ackno = element ackno { ackno.attlist, docinfo.char.mix* }
-# end of ackno.element
-ackno.attlist &= common.attrib, ackno.role.attrib, local.ackno.attrib
-# end of ackno.attlist
-
-# end of ackno.module
-
-# Address ..........................
-local.address.attrib = empty
-address.role.attrib = role.attrib
-# doc:A real-world address, generally a postal address.
-address =
-  element address {
-    address.attlist,
-    (text
-     | personname
-     | person.ident.mix
-     | street
-     | pob
-     | postcode
-     | city
-     | state
-     | country
-     | phone
-     | fax
-     | email
-     | otheraddr)*
-  }
-# end of address.element
-address.attlist &=
-  linespecific.attrib,
-  common.attrib,
-  address.role.attrib,
-  local.address.attrib
-# end of address.attlist
-
-# end of address.module
-local.street.attrib = empty
-street.role.attrib = role.attrib
-# doc:A street address in an address.
-street = element street { street.attlist, docinfo.char.mix* }
-# end of street.element
-street.attlist &= common.attrib, street.role.attrib, local.street.attrib
-# end of street.attlist
-
-# end of street.module
-local.pob.attrib = empty
-pob.role.attrib = role.attrib
-# doc:A post office box in an address.
-pob = element pob { pob.attlist, docinfo.char.mix* }
-# end of pob.element
-pob.attlist &= common.attrib, pob.role.attrib, local.pob.attrib
-# end of pob.attlist
-
-# end of pob.module
-local.postcode.attrib = empty
-postcode.role.attrib = role.attrib
-# doc:A postal code in an address.
-postcode = element postcode { postcode.attlist, docinfo.char.mix* }
-# end of postcode.element
-postcode.attlist &=
-  common.attrib, postcode.role.attrib, local.postcode.attrib
-# end of postcode.attlist
-
-# end of postcode.module
-local.city.attrib = empty
-city.role.attrib = role.attrib
-# doc:The name of a city in an address.
-city = element city { city.attlist, docinfo.char.mix* }
-# end of city.element
-city.attlist &= common.attrib, city.role.attrib, local.city.attrib
-# end of city.attlist
-
-# end of city.module
-local.state.attrib = empty
-state.role.attrib = role.attrib
-# doc:A state or province in an address.
-state = element state { state.attlist, docinfo.char.mix* }
-# end of state.element
-state.attlist &= common.attrib, state.role.attrib, local.state.attrib
-# end of state.attlist
-
-# end of state.module
-local.country.attrib = empty
-country.role.attrib = role.attrib
-# doc:The name of a country.
-country = element country { country.attlist, docinfo.char.mix* }
-# end of country.element
-country.attlist &=
-  common.attrib, country.role.attrib, local.country.attrib
-# end of country.attlist
-
-# end of country.module
-local.phone.attrib = empty
-phone.role.attrib = role.attrib
-# doc:A telephone number.
-phone = element phone { phone.attlist, docinfo.char.mix* }
-# end of phone.element
-phone.attlist &= common.attrib, phone.role.attrib, local.phone.attrib
-# end of phone.attlist
-
-# end of phone.module
-local.fax.attrib = empty
-fax.role.attrib = role.attrib
-# doc:A fax number.
-fax = element fax { fax.attlist, docinfo.char.mix* }
-# end of fax.element
-fax.attlist &= common.attrib, fax.role.attrib, local.fax.attrib
-# end of fax.attlist
-
-# end of fax.module
-
-# Email (defined in the Inlines section, below)
-local.otheraddr.attrib = empty
-otheraddr.role.attrib = role.attrib
-# doc:Uncategorized information in address.
-otheraddr = element otheraddr { otheraddr.attlist, docinfo.char.mix* }
-# end of otheraddr.element
-otheraddr.attlist &=
-  common.attrib, otheraddr.role.attrib, local.otheraddr.attrib
-# end of otheraddr.attlist
-
-# end of otheraddr.module
-
-# end of address.content.module
-
-# Affiliation ......................
-local.affiliation.attrib = empty
-affiliation.role.attrib = role.attrib
-# doc:The institutional affiliation of an individual.
-affiliation =
-  element affiliation {
-    affiliation.attlist,
-    shortaffil?,
-    jobtitle*,
-    orgname?,
-    orgdiv*,
-    address*
-  }
-# end of affiliation.element
-affiliation.attlist &=
-  common.attrib, affiliation.role.attrib, local.affiliation.attrib
-# end of affiliation.attlist
-
-# end of affiliation.module
-local.shortaffil.attrib = empty
-shortaffil.role.attrib = role.attrib
-# doc:A brief description of an affiliation.
-shortaffil =
-  element shortaffil { shortaffil.attlist, docinfo.char.mix* }
-# end of shortaffil.element
-shortaffil.attlist &=
-  common.attrib, shortaffil.role.attrib, local.shortaffil.attrib
-# end of shortaffil.attlist
-
-# end of shortaffil.module
-local.jobtitle.attrib = empty
-jobtitle.role.attrib = role.attrib
-# doc:The title of an individual in an organization.
-jobtitle = element jobtitle { jobtitle.attlist, docinfo.char.mix* }
-# end of jobtitle.element
-jobtitle.attlist &=
-  common.attrib, jobtitle.role.attrib, local.jobtitle.attrib
-# end of jobtitle.attlist
-
-# end of jobtitle.module
-
-# OrgName (defined elsewhere in this section)
-local.orgdiv.attrib = empty
-orgdiv.role.attrib = role.attrib
-# doc:A division of an organization.
-orgdiv = element orgdiv { orgdiv.attlist, docinfo.char.mix* }
-# end of orgdiv.element
-orgdiv.attlist &= common.attrib, orgdiv.role.attrib, local.orgdiv.attrib
-# end of orgdiv.attlist
-
-# end of orgdiv.module
-
-# Address (defined elsewhere in this section)
-
-# end of affiliation.content.module
-
-# ArtPageNums ......................
-local.artpagenums.attrib = empty
-artpagenums.role.attrib = role.attrib
-# doc:The page numbers of an article as published.
-artpagenums =
-  element artpagenums { artpagenums.attlist, docinfo.char.mix* }
-# end of artpagenums.element
-artpagenums.attlist &=
-  common.attrib, artpagenums.role.attrib, local.artpagenums.attrib
-# end of artpagenums.attlist
-
-# end of artpagenums.module
-
-# PersonName
-local.personname.attrib = empty
-personname.role.attrib = role.attrib
-# doc:The personal name of an individual.
-personname =
-  element personname {
-    personname.attlist,
-    (honorific | firstname | surname | lineage | othername)+
-  }
-# end of personname.element
-personname.attlist &=
-  common.attrib, personname.role.attrib, local.personname.attrib
-# end of personname.attlist
-
-# end of personname.module
-
-# Author ...........................
-local.author.attrib = empty
-author.role.attrib = role.attrib
-# doc:The name of an individual author.
-author =
-  element author {
-    author.attlist,
-    (personname | person.ident.mix+),
-    (personblurb | email | address)*
-  }
-# end of author.element
-author.attlist &= common.attrib, author.role.attrib, local.author.attrib
-# end of author.attlist
-
-# (see "Personal identity elements" for %person.ident.mix;)
-
-# end of author.module
-
-# AuthorGroup ......................
-local.authorgroup.attrib = empty
-authorgroup.role.attrib = role.attrib
-# doc:Wrapper for author information when a document has multiple authors or collabarators.
-authorgroup =
-  element authorgroup {
-    authorgroup.attlist,
-    (author | editor | collab | corpauthor | corpcredit | othercredit)+
-  }
-# end of authorgroup.element
-authorgroup.attlist &=
-  common.attrib, authorgroup.role.attrib, local.authorgroup.attrib
-# end of authorgroup.attlist
-
-# end of authorgroup.module
-
-# Author (defined elsewhere in this section)
-
-# Editor (defined elsewhere in this section)
-local.collab.attrib = empty
-collab.role.attrib = role.attrib
-# doc:Identifies a collaborator.
-collab = element collab { collab.attlist, collabname, affiliation* }
-# end of collab.element
-collab.attlist &= common.attrib, collab.role.attrib, local.collab.attrib
-# end of collab.attlist
-
-# end of collab.module
-local.collabname.attrib = empty
-collabname.role.attrib = role.attrib
-# doc:The name of a collaborator.
-collabname =
-  element collabname { collabname.attlist, docinfo.char.mix* }
-# end of collabname.element
-collabname.attlist &=
-  common.attrib, collabname.role.attrib, local.collabname.attrib
-# end of collabname.attlist
-
-# end of collabname.module
-
-# Affiliation (defined elsewhere in this section)
-
-# end of collab.content.module
-
-# CorpAuthor (defined elsewhere in this section)
-
-# OtherCredit (defined elsewhere in this section)
-
-# end of authorgroup.content.module
-
-# AuthorInitials ...................
-local.authorinitials.attrib = empty
-authorinitials.role.attrib = role.attrib
-# doc:The initials or other short identifier for an author.
-authorinitials =
-  element authorinitials { authorinitials.attlist, docinfo.char.mix* }
-# end of authorinitials.element
-authorinitials.attlist &=
-  common.attrib, authorinitials.role.attrib, local.authorinitials.attrib
-# end of authorinitials.attlist
-
-# end of authorinitials.module
-
-# ConfGroup ........................
-local.confgroup.attrib = empty
-confgroup.role.attrib = role.attrib
-# doc:A wrapper for document meta-information about a conference.
-confgroup =
-  element confgroup {
-    confgroup.attlist,
-    (confdates | conftitle | confnum | address | confsponsor)*
-  }
-# end of confgroup.element
-confgroup.attlist &=
-  common.attrib, confgroup.role.attrib, local.confgroup.attrib
-# end of confgroup.attlist
-
-# end of confgroup.module
-local.confdates.attrib = empty
-confdates.role.attrib = role.attrib
-# doc:The dates of a conference for which a document was written.
-confdates = element confdates { confdates.attlist, docinfo.char.mix* }
-# end of confdates.element
-confdates.attlist &=
-  common.attrib, confdates.role.attrib, local.confdates.attrib
-# end of confdates.attlist
-
-# end of confdates.module
-local.conftitle.attrib = empty
-conftitle.role.attrib = role.attrib
-# doc:The title of a conference for which a document was written.
-conftitle = element conftitle { conftitle.attlist, docinfo.char.mix* }
-# end of conftitle.element
-conftitle.attlist &=
-  common.attrib, conftitle.role.attrib, local.conftitle.attrib
-# end of conftitle.attlist
-
-# end of conftitle.module
-local.confnum.attrib = empty
-confnum.role.attrib = role.attrib
-# doc:An identifier, frequently numerical, associated with a conference for which a document was written.
-confnum = element confnum { confnum.attlist, docinfo.char.mix* }
-# end of confnum.element
-confnum.attlist &=
-  common.attrib, confnum.role.attrib, local.confnum.attrib
-# end of confnum.attlist
-
-# end of confnum.module
-
-# Address (defined elsewhere in this section)
-local.confsponsor.attrib = empty
-confsponsor.role.attrib = role.attrib
-# doc:The sponsor of a conference for which a document was written.
-confsponsor =
-  element confsponsor { confsponsor.attlist, docinfo.char.mix* }
-# end of confsponsor.element
-confsponsor.attlist &=
-  common.attrib, confsponsor.role.attrib, local.confsponsor.attrib
-# end of confsponsor.attlist
-
-# end of confsponsor.module
-
-# end of confgroup.content.module
-
-# ContractNum ......................
-local.contractnum.attrib = empty
-contractnum.role.attrib = role.attrib
-# doc:The contract number of a document.
-contractnum =
-  element contractnum { contractnum.attlist, docinfo.char.mix* }
-# end of contractnum.element
-contractnum.attlist &=
-  common.attrib, contractnum.role.attrib, local.contractnum.attrib
-# end of contractnum.attlist
-
-# end of contractnum.module
-
-# ContractSponsor ..................
-local.contractsponsor.attrib = empty
-contractsponsor.role.attrib = role.attrib
-# doc:The sponsor of a contract.
-contractsponsor =
-  element contractsponsor { contractsponsor.attlist, docinfo.char.mix* }
-# end of contractsponsor.element
-contractsponsor.attlist &=
-  common.attrib,
-  contractsponsor.role.attrib,
-  local.contractsponsor.attrib
-# end of contractsponsor.attlist
-
-# end of contractsponsor.module
-
-# Copyright ........................
-local.copyright.attrib = empty
-copyright.role.attrib = role.attrib
-# doc:Copyright information about a document.
-copyright = element copyright { copyright.attlist, year+, holder* }
-# end of copyright.element
-copyright.attlist &=
-  common.attrib, copyright.role.attrib, local.copyright.attrib
-# end of copyright.attlist
-
-# end of copyright.module
-local.year.attrib = empty
-year.role.attrib = role.attrib
-# doc:The year of publication of a document.
-year = element year { year.attlist, docinfo.char.mix* }
-# end of year.element
-year.attlist &= common.attrib, year.role.attrib, local.year.attrib
-# end of year.attlist
-
-# end of year.module
-local.holder.attrib = empty
-holder.role.attrib = role.attrib
-# doc:The name of the individual or organization that holds a copyright.
-holder = element holder { holder.attlist, docinfo.char.mix* }
-# end of holder.element
-holder.attlist &= common.attrib, holder.role.attrib, local.holder.attrib
-# end of holder.attlist
-
-# end of holder.module
-
-# end of copyright.content.module
-
-# CorpAuthor .......................
-local.corpauthor.attrib = empty
-corpauthor.role.attrib = role.attrib
-# doc:A corporate author, as opposed to an individual.
-corpauthor =
-  element corpauthor { corpauthor.attlist, docinfo.char.mix* }
-# end of corpauthor.element
-corpauthor.attlist &=
-  common.attrib, corpauthor.role.attrib, local.corpauthor.attrib
-# end of corpauthor.attlist
-
-# end of corpauthor.module
-
-# CorpCredit ......................
-local.corpcredit.attrib = empty
-corpcredit.role.attrib = role.attrib
-# doc:A corporation or organization credited in a document.
-corpcredit =
-  element corpcredit { corpcredit.attlist, docinfo.char.mix* }
-# end of corpcredit.element
-corpcredit.attlist &=
-  attribute class {
-    "graphicdesigner"
-    | "productioneditor"
-    | "copyeditor"
-    | "technicaleditor"
-    | "translator"
-    | "other"
-  }?,
-  common.attrib,
-  corpcredit.role.attrib,
-  local.corpcredit.attrib
-# end of corpcredit.attlist
-
-# end of corpcredit.module
-
-# CorpName .........................
-local.corpname.attrib = empty
-# doc:The name of a corporation.
-corpname = element corpname { corpname.attlist, docinfo.char.mix* }
-# end of corpname.element
-corpname.role.attrib = role.attrib
-corpname.attlist &=
-  common.attrib, corpname.role.attrib, local.corpname.attrib
-# end of corpname.attlist
-
-# end of corpname.module
-
-# Date .............................
-local.date.attrib = empty
-date.role.attrib = role.attrib
-# doc:The date of publication or revision of a document.
-date = element date { date.attlist, docinfo.char.mix* }
-# end of date.element
-date.attlist &= common.attrib, date.role.attrib, local.date.attrib
-# end of date.attlist
-
-# end of date.module
-
-# Edition ..........................
-local.edition.attrib = empty
-edition.role.attrib = role.attrib
-# doc:The name or number of an edition of a document.
-edition = element edition { edition.attlist, docinfo.char.mix* }
-# end of edition.element
-edition.attlist &=
-  common.attrib, edition.role.attrib, local.edition.attrib
-# end of edition.attlist
-
-# end of edition.module
-
-# Editor ...........................
-local.editor.attrib = empty
-editor.role.attrib = role.attrib
-# doc:The name of the editor of a document.
-editor =
-  element editor {
-    editor.attlist,
-    (personname | person.ident.mix+),
-    (personblurb | email | address)*
-  }
-# end of editor.element
-editor.attlist &= common.attrib, editor.role.attrib, local.editor.attrib
-# end of editor.attlist
-
-# (see "Personal identity elements" for %person.ident.mix;)
-
-# end of editor.module
-
-# ISBN .............................
-local.isbn.attrib = empty
-isbn.role.attrib = role.attrib
-# doc:The International Standard Book Number of a document.
-isbn = element isbn { isbn.attlist, docinfo.char.mix* }
-# end of isbn.element
-isbn.attlist &= common.attrib, isbn.role.attrib, local.isbn.attrib
-# end of isbn.attlist
-
-# end of isbn.module
-
-# ISSN .............................
-local.issn.attrib = empty
-issn.role.attrib = role.attrib
-# doc:The International Standard Serial Number of a periodical.
-issn = element issn { issn.attlist, docinfo.char.mix* }
-# end of issn.element
-issn.attlist &= common.attrib, issn.role.attrib, local.issn.attrib
-# end of issn.attlist
-
-# end of issn.module
-
-# BiblioId .................
-biblio.class.attrib =
-  attribute class {
-    "uri"
-    | "doi"
-    | "isbn"
-    | "isrn"
-    | "issn"
-    | "libraryofcongress"
-    | "pubnumber"
-    | "other"
-  }?,
-  attribute otherclass { text }?
-local.biblioid.attrib = empty
-biblioid.role.attrib = role.attrib
-# doc:An identifier for a document.
-biblioid = element biblioid { biblioid.attlist, docinfo.char.mix* }
-# end of biblioid.element
-biblioid.attlist &=
-  biblio.class.attrib,
-  common.attrib,
-  biblioid.role.attrib,
-  local.biblioid.attrib
-# end of biblioid.attlist
-
-# end of biblioid.module
-
-# CiteBiblioId .................
-local.citebiblioid.attrib = empty
-citebiblioid.role.attrib = role.attrib
-# doc:A citation of a bibliographic identifier.
-citebiblioid =
-  element citebiblioid { citebiblioid.attlist, docinfo.char.mix* }
-# end of citebiblioid.element
-citebiblioid.attlist &=
-  biblio.class.attrib,
-  common.attrib,
-  citebiblioid.role.attrib,
-  local.citebiblioid.attrib
-# end of citebiblioid.attlist
-
-# end of citebiblioid.module
-
-# BiblioSource .................
-local.bibliosource.attrib = empty
-bibliosource.role.attrib = role.attrib
-# doc:The source of a document.
-bibliosource =
-  element bibliosource { bibliosource.attlist, docinfo.char.mix* }
-# end of bibliosource.element
-bibliosource.attlist &=
-  biblio.class.attrib,
-  common.attrib,
-  bibliosource.role.attrib,
-  local.bibliosource.attrib
-# end of bibliosource.attlist
-
-# end of bibliosource.module
-
-# BiblioRelation .................
-local.bibliorelation.attrib = empty
-local.bibliorelation.types = notAllowed
-bibliorelation.type.attrib =
-  attribute type {
-    "isversionof"
-    | "hasversion"
-    | "isreplacedby"
-    | "replaces"
-    | "isrequiredby"
-    | "requires"
-    | "ispartof"
-    | "haspart"
-    | "isreferencedby"
-    | "references"
-    | "isformatof"
-    | "hasformat"
-    | "othertype"
-    | local.bibliorelation.types
-  }?,
-  attribute othertype { text }?
-bibliorelation.role.attrib = role.attrib
-# doc:The relationship of a document to another.
-bibliorelation =
-  element bibliorelation { bibliorelation.attlist, docinfo.char.mix* }
-# end of bibliorelation.element
-bibliorelation.attlist &=
-  biblio.class.attrib,
-  bibliorelation.type.attrib,
-  common.attrib,
-  bibliorelation.role.attrib,
-  local.bibliorelation.attrib
-# end of bibliorelation.attlist
-
-# end of bibliorelation.module
-
-# BiblioCoverage .................
-local.bibliocoverage.attrib = empty
-bibliocoverage.role.attrib = role.attrib
-# doc:The spatial or temporal coverage of a document.
-bibliocoverage =
-  element bibliocoverage { bibliocoverage.attlist, docinfo.char.mix* }
-# end of bibliocoverage.element
-bibliocoverage.attlist &=
-  attribute spatial {
-    "dcmipoint" | "iso3166" | "dcmibox" | "tgn" | "otherspatial"
-  }?,
-  attribute otherspatial { text }?,
-  attribute temporal { "dcmiperiod" | "w3c-dtf" | "othertemporal" }?,
-  attribute othertemporal { text }?,
-  common.attrib,
-  bibliocoverage.role.attrib,
-  local.bibliocoverage.attrib
-# end of bibliocoverage.attlist
-
-# end of bibliocoverage.module
-
-# InvPartNumber ....................
-local.invpartnumber.attrib = empty
-invpartnumber.role.attrib = role.attrib
-# doc:An inventory part number.
-invpartnumber =
-  element invpartnumber { invpartnumber.attlist, docinfo.char.mix* }
-# end of invpartnumber.element
-invpartnumber.attlist &=
-  common.attrib, invpartnumber.role.attrib, local.invpartnumber.attrib
-# end of invpartnumber.attlist
-
-# end of invpartnumber.module
-
-# IssueNum .........................
-local.issuenum.attrib = empty
-issuenum.role.attrib = role.attrib
-# doc:The number of an issue of a journal.
-issuenum = element issuenum { issuenum.attlist, docinfo.char.mix* }
-# end of issuenum.element
-issuenum.attlist &=
-  common.attrib, issuenum.role.attrib, local.issuenum.attrib
-# end of issuenum.attlist
-
-# end of issuenum.module
-
-# LegalNotice ......................
-local.legalnotice.attrib = empty
-legalnotice.role.attrib = role.attrib
-# doc:A statement of legal obligations or requirements.
-legalnotice =
-  element legalnotice {
-    legalnotice.attlist, blockinfo?, title?, legalnotice.mix+
-  }
-# end of legalnotice.element
-legalnotice.attlist &=
-  common.attrib, legalnotice.role.attrib, local.legalnotice.attrib
-# end of legalnotice.attlist
-
-# end of legalnotice.module
-
-# ModeSpec .........................
-local.modespec.attrib = empty
-modespec.role.attrib = role.attrib
-# doc:Application-specific information necessary for the completion of an OLink.
-modespec = element modespec { modespec.attlist, docinfo.char.mix* }
-# end of modespec.element
-
-# Application: Type of action required for completion
-# of the links to which the ModeSpec is relevant (e.g.,
-# retrieval query)
-modespec.attlist &=
-  attribute application { notation.class }?,
-  common.attrib,
-  modespec.role.attrib,
-  local.modespec.attrib
-# end of modespec.attlist
-
-# end of modespec.module
-
-# OrgName ..........................
-local.orgname.attrib = empty
-orgname.role.attrib = role.attrib
-# doc:The name of an organization other than a corporation.
-orgname = element orgname { orgname.attlist, docinfo.char.mix* }
-# end of orgname.element
-orgname.attlist &=
-  common.attrib,
-  attribute class {
-    "corporation" | "nonprofit" | "consortium" | "informal" | "other"
-  }?,
-  attribute otherclass { text }?,
-  orgname.role.attrib,
-  local.orgname.attrib
-# end of orgname.attlist
-
-# end of orgname.module
-
-# OtherCredit ......................
-local.othercredit.attrib = empty
-othercredit.role.attrib = role.attrib
-# doc:A person or entity, other than an author or editor, credited in a document.
-othercredit =
-  element othercredit {
-    othercredit.attlist,
-    (personname | person.ident.mix+),
-    (personblurb | email | address)*
-  }
-# end of othercredit.element
-othercredit.attlist &=
-  attribute class {
-    "graphicdesigner"
-    | "productioneditor"
-    | "copyeditor"
-    | "technicaleditor"
-    | "translator"
-    | "other"
-  }?,
-  common.attrib,
-  othercredit.role.attrib,
-  local.othercredit.attrib
-# end of othercredit.attlist
-
-# (see "Personal identity elements" for %person.ident.mix;)
-
-# end of othercredit.module
-
-# PageNums .........................
-local.pagenums.attrib = empty
-pagenums.role.attrib = role.attrib
-# doc:The numbers of the pages in a book, for use in a bibliographic entry.
-pagenums = element pagenums { pagenums.attlist, docinfo.char.mix* }
-# end of pagenums.element
-pagenums.attlist &=
-  common.attrib, pagenums.role.attrib, local.pagenums.attrib
-# end of pagenums.attlist
-
-# end of pagenums.module
-
-# Personal identity elements .......
-
-# These elements are used only within Author, Editor, and
-# OtherCredit.
-local.contrib.attrib = empty
-contrib.role.attrib = role.attrib
-# doc:A summary of the contributions made to a document by a credited source.
-contrib = element contrib { contrib.attlist, docinfo.char.mix* }
-# end of contrib.element
-contrib.attlist &=
-  common.attrib, contrib.role.attrib, local.contrib.attrib
-# end of contrib.attlist
-
-# end of contrib.module
-local.firstname.attrib = empty
-firstname.role.attrib = role.attrib
-# doc:The first name of a person.
-firstname = element firstname { firstname.attlist, docinfo.char.mix* }
-# end of firstname.element
-firstname.attlist &=
-  common.attrib, firstname.role.attrib, local.firstname.attrib
-# end of firstname.attlist
-
-# end of firstname.module
-local.honorific.attrib = empty
-honorific.role.attrib = role.attrib
-# doc:The title of a person.
-honorific = element honorific { honorific.attlist, docinfo.char.mix* }
-# end of honorific.element
-honorific.attlist &=
-  common.attrib, honorific.role.attrib, local.honorific.attrib
-# end of honorific.attlist
-
-# end of honorific.module
-local.lineage.attrib = empty
-lineage.role.attrib = role.attrib
-# doc:The portion of a person's name indicating a relationship to ancestors.
-lineage = element lineage { lineage.attlist, docinfo.char.mix* }
-# end of lineage.element
-lineage.attlist &=
-  common.attrib, lineage.role.attrib, local.lineage.attrib
-# end of lineage.attlist
-
-# end of lineage.module
-local.othername.attrib = empty
-othername.role.attrib = role.attrib
-# doc:A component of a persons name that is not a first name, surname, or lineage.
-othername = element othername { othername.attlist, docinfo.char.mix* }
-# end of othername.element
-othername.attlist &=
-  common.attrib, othername.role.attrib, local.othername.attrib
-# end of othername.attlist
-
-# end of othername.module
-local.surname.attrib = empty
-surname.role.attrib = role.attrib
-# doc:A family name; in western cultures the last name.
-surname = element surname { surname.attlist, docinfo.char.mix* }
-# end of surname.element
-surname.attlist &=
-  common.attrib, surname.role.attrib, local.surname.attrib
-# end of surname.attlist
-
-# end of surname.module
-
-# end of person.ident.module
-
-# PrintHistory .....................
-local.printhistory.attrib = empty
-printhistory.role.attrib = role.attrib
-# doc:The printing history of a document.
-printhistory =
-  element printhistory { printhistory.attlist, para.class+ }
-# end of printhistory.element
-printhistory.attlist &=
-  common.attrib, printhistory.role.attrib, local.printhistory.attrib
-# end of printhistory.attlist
-
-# end of printhistory.module
-
-# ProductName ......................
-local.productname.attrib = empty
-productname.role.attrib = role.attrib
-# doc:The formal name of a product.
-productname =
-  element productname { productname.attlist, para.char.mix* }
-# end of productname.element
-
-# Class: More precisely identifies the item the element names
-productname.attlist &=
-  [ a:defaultValue = "trade" ]
-  attribute class { "service" | "trade" | "registered" | "copyright" }?,
-  common.attrib,
-  productname.role.attrib,
-  local.productname.attrib
-# end of productname.attlist
-
-# end of productname.module
-
-# ProductNumber ....................
-local.productnumber.attrib = empty
-productnumber.role.attrib = role.attrib
-# doc:A number assigned to a product.
-productnumber =
-  element productnumber { productnumber.attlist, docinfo.char.mix* }
-# end of productnumber.element
-productnumber.attlist &=
-  common.attrib, productnumber.role.attrib, local.productnumber.attrib
-# end of productnumber.attlist
-
-# end of productnumber.module
-
-# PubDate ..........................
-local.pubdate.attrib = empty
-pubdate.role.attrib = role.attrib
-# doc:The date of publication of a document.
-pubdate = element pubdate { pubdate.attlist, docinfo.char.mix* }
-# end of pubdate.element
-pubdate.attlist &=
-  common.attrib, pubdate.role.attrib, local.pubdate.attrib
-# end of pubdate.attlist
-
-# end of pubdate.module
-
-# Publisher ........................
-local.publisher.attrib = empty
-publisher.role.attrib = role.attrib
-# doc:The publisher of a document.
-publisher =
-  element publisher { publisher.attlist, publishername, address* }
-# end of publisher.element
-publisher.attlist &=
-  common.attrib, publisher.role.attrib, local.publisher.attrib
-# end of publisher.attlist
-
-# end of publisher.module
-local.publishername.attrib = empty
-publishername.role.attrib = role.attrib
-# doc:The name of the publisher of a document.
-publishername =
-  element publishername { publishername.attlist, docinfo.char.mix* }
-# end of publishername.element
-publishername.attlist &=
-  common.attrib, publishername.role.attrib, local.publishername.attrib
-# end of publishername.attlist
-
-# end of publishername.module
-
-# Address (defined elsewhere in this section)
-
-# end of publisher.content.module
-
-# PubsNumber .......................
-local.pubsnumber.attrib = empty
-pubsnumber.role.attrib = role.attrib
-# doc:A number assigned to a publication other than an ISBN or ISSN or inventory part number.
-pubsnumber =
-  element pubsnumber { pubsnumber.attlist, docinfo.char.mix* }
-# end of pubsnumber.element
-pubsnumber.attlist &=
-  common.attrib, pubsnumber.role.attrib, local.pubsnumber.attrib
-# end of pubsnumber.attlist
-
-# end of pubsnumber.module
-
-# ReleaseInfo ......................
-local.releaseinfo.attrib = empty
-releaseinfo.role.attrib = role.attrib
-# doc:Information about a particular release of a document.
-releaseinfo =
-  element releaseinfo { releaseinfo.attlist, docinfo.char.mix* }
-# end of releaseinfo.element
-releaseinfo.attlist &=
-  common.attrib, releaseinfo.role.attrib, local.releaseinfo.attrib
-# end of releaseinfo.attlist
-
-# end of releaseinfo.module
-
-# RevHistory .......................
-local.revhistory.attrib = empty
-revhistory.role.attrib = role.attrib
-# doc:A history of the revisions to a document.
-revhistory = element revhistory { revhistory.attlist, revision+ }
-# end of revhistory.element
-revhistory.attlist &=
-  common.attrib, revhistory.role.attrib, local.revhistory.attrib
-# end of revhistory.attlist
-
-# end of revhistory.module
-local.revision.attrib = empty
-revision.role.attrib = role.attrib
-# doc:An entry describing a single revision in the history of the revisions to a document.
-revision =
-  element revision {
-    revision.attlist,
-    revnumber?,
-    date,
-    (author | authorinitials)*,
-    (revremark | revdescription)?
-  }
-# end of revision.element
-revision.attlist &=
-  common.attrib, revision.role.attrib, local.revision.attrib
-# end of revision.attlist
-
-# end of revision.module
-local.revnumber.attrib = empty
-revnumber.role.attrib = role.attrib
-# doc:A document revision number.
-revnumber = element revnumber { revnumber.attlist, docinfo.char.mix* }
-# end of revnumber.element
-revnumber.attlist &=
-  common.attrib, revnumber.role.attrib, local.revnumber.attrib
-# end of revnumber.attlist
-
-# end of revnumber.module
-
-# Date (defined elsewhere in this section)
-
-# AuthorInitials (defined elsewhere in this section)
-local.revremark.attrib = empty
-revremark.role.attrib = role.attrib
-# doc:A description of a revision to a document.
-revremark = element revremark { revremark.attlist, docinfo.char.mix* }
-# end of revremark.element
-revremark.attlist &=
-  common.attrib, revremark.role.attrib, local.revremark.attrib
-# end of revremark.attlist
-
-# end of revremark.module
-local.revdescription.attrib = empty
-revdescription.role.attrib = role.attrib
-# doc:A extended description of a revision to a document.
-revdescription =
-  element revdescription { revdescription.attlist, revdescription.mix+ }
-# end of revdescription.element
-revdescription.attlist &=
-  common.attrib, revdescription.role.attrib, local.revdescription.attrib
-# end of revdescription.attlist
-
-# end of revdescription.module
-
-# end of revhistory.content.module
-
-# SeriesVolNums ....................
-local.seriesvolnums.attrib = empty
-seriesvolnums.role.attrib = role.attrib
-# doc:Numbers of the volumes in a series of books.
-seriesvolnums =
-  element seriesvolnums { seriesvolnums.attlist, docinfo.char.mix* }
-# end of seriesvolnums.element
-seriesvolnums.attlist &=
-  common.attrib, seriesvolnums.role.attrib, local.seriesvolnums.attrib
-# end of seriesvolnums.attlist
-
-# end of seriesvolnums.module
-
-# VolumeNum ........................
-local.volumenum.attrib = empty
-volumenum.role.attrib = role.attrib
-# doc:The volume number of a document in a set (as of books in a set or articles in a journal).
-volumenum = element volumenum { volumenum.attlist, docinfo.char.mix* }
-# end of volumenum.element
-volumenum.attlist &=
-  common.attrib, volumenum.role.attrib, local.volumenum.attrib
-# end of volumenum.attlist
-
-# end of volumenum.module
-
-# ..................................
-
-# end of docinfo.content.module
-
-# ......................................................................
-
-# Inline, link, and ubiquitous elements ................................
-
-# Technical and computer terms .........................................
-local.accel.attrib = empty
-accel.role.attrib = role.attrib
-# doc:A graphical user interface (GUI) keyboard shortcut.
-accel = element accel { accel.attlist, smallcptr.char.mix* }
-# end of accel.element
-accel.attlist &= common.attrib, accel.role.attrib, local.accel.attrib
-# end of accel.attlist
-
-# end of accel.module
-local.action.attrib = empty
-action.role.attrib = role.attrib
-# doc:A response to a user event.
-action = element action { action.attlist, cptr.char.mix* }
-# end of action.element
-action.attlist &=
-  moreinfo.attrib,
-  common.attrib,
-  action.role.attrib,
-  local.action.attrib
-# end of action.attlist
-
-# end of action.module
-local.application.attrib = empty
-application.role.attrib = role.attrib
-# doc:The name of a software program.
-application =
-  element application { application.attlist, para.char.mix* }
-# end of application.element
-application.attlist &=
-  attribute class { "hardware" | "software" }?,
-  moreinfo.attrib,
-  common.attrib,
-  application.role.attrib,
-  local.application.attrib
-# end of application.attlist
-
-# end of application.module
-local.classname.attrib = empty
-classname.role.attrib = role.attrib
-# doc:The name of a class, in the object-oriented programming sense.
-classname = element classname { classname.attlist, smallcptr.char.mix* }
-# end of classname.element
-classname.attlist &=
-  common.attrib, classname.role.attrib, local.classname.attrib
-# end of classname.attlist
-
-# end of classname.module
-local.package.attrib = empty
-package.role.attrib = role.attrib
-# doc:A package.
-package = element package { package.attlist, smallcptr.char.mix* }
-# end of package.element
-package.attlist &=
-  common.attrib, package.role.attrib, local.package.attrib
-# end of package.attlist
-
-# end of package.module
-local.co.attrib = empty
-# CO is a callout area of the LineColumn unit type (a single character
-# position); the position is directly indicated by the location of CO.
-co.role.attrib = role.attrib
-# doc:The location of a callout embedded in text.
-co = element co { co.attlist, empty }
-# end of co.element
-
-# bug number/symbol override or initialization
-
-# to any related information
-co.attlist &=
-  label.attrib,
-  linkends.attrib,
-  idreq.common.attrib,
-  co.role.attrib,
-  local.co.attrib
-# end of co.attlist
-
-# end of co.module
-local.coref.attrib = empty
-# COREF is a reference to a CO
-coref.role.attrib = role.attrib
-# doc:A cross reference to a co.
-coref = element coref { coref.attlist, empty }
-# end of coref.element
-
-# bug number/symbol override or initialization
-
-# to any related information
-coref.attlist &=
-  label.attrib,
-  linkendreq.attrib,
-  common.attrib,
-  coref.role.attrib,
-  local.coref.attrib
-# end of coref.attlist
-
-# end of coref.module
-local.command.attrib = empty
-command.role.attrib = role.attrib
-# doc:The name of an executable program or other software command.
-command = element command { command.attlist, cptr.char.mix* }
-# end of command.element
-command.attlist &=
-  moreinfo.attrib,
-  common.attrib,
-  command.role.attrib,
-  local.command.attrib
-# end of command.attlist
-
-# end of command.module
-local.computeroutput.attrib = empty
-computeroutput.role.attrib = role.attrib
-# doc:Data, generally text, displayed or presented by a computer.
-computeroutput =
-  element computeroutput {
-    computeroutput.attlist, (cptr.char.mix | co)*
-  }
-# end of computeroutput.element
-computeroutput.attlist &=
-  moreinfo.attrib,
-  common.attrib,
-  computeroutput.role.attrib,
-  local.computeroutput.attrib
-# end of computeroutput.attlist
-
-# end of computeroutput.module
-local.database.attrib = empty
-database.role.attrib = role.attrib
-# doc:The name of a database, or part of a database.
-database = element database { database.attlist, cptr.char.mix* }
-# end of database.element
-
-# Class: Type of database the element names; no default
-database.attlist &=
-  attribute class {
-    "name"
-    | "table"
-    | "field"
-    | "key1"
-    | "key2"
-    | "record"
-    | "index"
-    | "view"
-    | "primarykey"
-    | "secondarykey"
-    | "foreignkey"
-    | "altkey"
-    | "procedure"
-    | "datatype"
-    | "constraint"
-    | "rule"
-    | "user"
-    | "group"
-  }?,
-  moreinfo.attrib,
-  common.attrib,
-  database.role.attrib,
-  local.database.attrib
-# end of database.attlist
-
-# end of database.module
-local.email.attrib = empty
-email.role.attrib = role.attrib
-# doc:An email address.
-email = element email { email.attlist, docinfo.char.mix* }
-# end of email.element
-email.attlist &= common.attrib, email.role.attrib, local.email.attrib
-# end of email.attlist
-
-# end of email.module
-local.envar.attrib = empty
-envar.role.attrib = role.attrib
-# doc:A software environment variable.
-envar = element envar { envar.attlist, smallcptr.char.mix* }
-# end of envar.element
-envar.attlist &= common.attrib, envar.role.attrib, local.envar.attrib
-# end of envar.attlist
-
-# end of envar.module
-local.errorcode.attrib = empty
-errorcode.role.attrib = role.attrib
-# doc:An error code.
-errorcode = element errorcode { errorcode.attlist, smallcptr.char.mix* }
-# end of errorcode.element
-errorcode.attlist &=
-  moreinfo.attrib,
-  common.attrib,
-  errorcode.role.attrib,
-  local.errorcode.attrib
-# end of errorcode.attlist
-
-# end of errorcode.module
-local.errorname.attrib = empty
-errorname.role.attrib = role.attrib
-# doc:An error name.
-errorname = element errorname { errorname.attlist, smallcptr.char.mix* }
-# end of errorname.element
-errorname.attlist &=
-  common.attrib, errorname.role.attrib, local.errorname.attrib
-# end of errorname.attlist
-
-# end of errorname.module
-local.errortext.attrib = empty
-errortext.role.attrib = role.attrib
-# doc:An error message..
-errortext = element errortext { errortext.attlist, smallcptr.char.mix* }
-# end of errortext.element
-errortext.attlist &=
-  common.attrib, errortext.role.attrib, local.errortext.attrib
-# end of errortext.attlist
-
-# end of errortext.module
-local.errortype.attrib = empty
-errortype.role.attrib = role.attrib
-# doc:The classification of an error message.
-errortype = element errortype { errortype.attlist, smallcptr.char.mix* }
-# end of errortype.element
-errortype.attlist &=
-  common.attrib, errortype.role.attrib, local.errortype.attrib
-# end of errortype.attlist
-
-# end of errortype.module
-local.filename.attrib = empty
-filename.role.attrib = role.attrib
-# doc:The name of a file.
-filename = element filename { filename.attlist, cptr.char.mix* }
-# end of filename.element
-
-# Class: Type of filename the element names; no default
-
-# Path: Search path (possibly system-specific) in which
-# file can be found
-filename.attlist &=
-  attribute class {
-    "headerfile"
-    | "partition"
-    | "devicefile"
-    | "libraryfile"
-    | "directory"
-    | "extension"
-    | "symlink"
-  }?,
-  attribute path { text }?,
-  moreinfo.attrib,
-  common.attrib,
-  filename.role.attrib,
-  local.filename.attrib
-# end of filename.attlist
-
-# end of filename.module
-local.function.attrib = empty
-function.role.attrib = role.attrib
-# doc:The name of a function or subroutine, as in a programming language.
-function = element function { function.attlist, cptr.char.mix* }
-# end of function.element
-function.attlist &=
-  moreinfo.attrib,
-  common.attrib,
-  function.role.attrib,
-  local.function.attrib
-# end of function.attlist
-
-# end of function.module
-local.guibutton.attrib = empty
-guibutton.role.attrib = role.attrib
-# doc:The text on a button in a GUI.
-guibutton =
-  element guibutton {
-    guibutton.attlist,
-    (smallcptr.char.mix | accel | superscript | subscript)*
-  }
-# end of guibutton.element
-guibutton.attlist &=
-  moreinfo.attrib,
-  common.attrib,
-  guibutton.role.attrib,
-  local.guibutton.attrib
-# end of guibutton.attlist
-
-# end of guibutton.module
-local.guiicon.attrib = empty
-guiicon.role.attrib = role.attrib
-# doc:Graphic and/or text appearing as a icon in a GUI.
-guiicon =
-  element guiicon {
-    guiicon.attlist,
-    (smallcptr.char.mix | accel | superscript | subscript)*
-  }
-# end of guiicon.element
-guiicon.attlist &=
-  moreinfo.attrib,
-  common.attrib,
-  guiicon.role.attrib,
-  local.guiicon.attrib
-# end of guiicon.attlist
-
-# end of guiicon.module
-local.guilabel.attrib = empty
-guilabel.role.attrib = role.attrib
-# doc:The text of a label in a GUI.
-guilabel =
-  element guilabel {
-    guilabel.attlist,
-    (smallcptr.char.mix | accel | superscript | subscript)*
-  }
-# end of guilabel.element
-guilabel.attlist &=
-  moreinfo.attrib,
-  common.attrib,
-  guilabel.role.attrib,
-  local.guilabel.attrib
-# end of guilabel.attlist
-
-# end of guilabel.module
-local.guimenu.attrib = empty
-guimenu.role.attrib = role.attrib
-# doc:The name of a menu in a GUI.
-guimenu =
-  element guimenu {
-    guimenu.attlist,
-    (smallcptr.char.mix | accel | superscript | subscript)*
-  }
-# end of guimenu.element
-guimenu.attlist &=
-  moreinfo.attrib,
-  common.attrib,
-  guimenu.role.attrib,
-  local.guimenu.attrib
-# end of guimenu.attlist
-
-# end of guimenu.module
-local.guimenuitem.attrib = empty
-guimenuitem.role.attrib = role.attrib
-# doc:The name of a terminal menu item in a GUI.
-guimenuitem =
-  element guimenuitem {
-    guimenuitem.attlist,
-    (smallcptr.char.mix | accel | superscript | subscript)*
-  }
-# end of guimenuitem.element
-guimenuitem.attlist &=
-  moreinfo.attrib,
-  common.attrib,
-  guimenuitem.role.attrib,
-  local.guimenuitem.attrib
-# end of guimenuitem.attlist
-
-# end of guimenuitem.module
-local.guisubmenu.attrib = empty
-guisubmenu.role.attrib = role.attrib
-# doc:The name of a submenu in a GUI.
-guisubmenu =
-  element guisubmenu {
-    guisubmenu.attlist,
-    (smallcptr.char.mix | accel | superscript | subscript)*
-  }
-# end of guisubmenu.element
-guisubmenu.attlist &=
-  moreinfo.attrib,
-  common.attrib,
-  guisubmenu.role.attrib,
-  local.guisubmenu.attrib
-# end of guisubmenu.attlist
-
-# end of guisubmenu.module
-local.hardware.attrib = empty
-hardware.role.attrib = role.attrib
-# doc:A physical part of a computer system.
-hardware = element hardware { hardware.attlist, cptr.char.mix* }
-# end of hardware.element
-hardware.attlist &=
-  moreinfo.attrib,
-  common.attrib,
-  hardware.role.attrib,
-  local.hardware.attrib
-# end of hardware.attlist
-
-# end of hardware.module
-local.interface.attrib = empty
-interface.role.attrib = role.attrib
-# doc:An element of a GUI.
-interface =
-  element interface { interface.attlist, (smallcptr.char.mix | accel)* }
-# end of interface.element
-
-# Class: Type of the Interface item; no default
-interface.attlist &=
-  moreinfo.attrib,
-  common.attrib,
-  interface.role.attrib,
-  local.interface.attrib
-# end of interface.attlist
-
-# end of interface.module
-local.keycap.attrib = empty
-keycap.role.attrib = role.attrib
-# doc:The text printed on a key on a keyboard.
-keycap = element keycap { keycap.attlist, cptr.char.mix* }
-# end of keycap.element
-keycap.attlist &=
-  attribute function {
-    "alt"
-    | "control"
-    | "shift"
-    | "meta"
-    | "escape"
-    | "enter"
-    | "tab"
-    | "backspace"
-    | "command"
-    | "option"
-    | "space"
-    | "delete"
-    | "insert"
-    | "up"
-    | "down"
-    | "left"
-    | "right"
-    | "home"
-    | "end"
-    | "pageup"
-    | "pagedown"
-    | "other"
-  }?,
-  attribute otherfunction { text }?,
-  moreinfo.attrib,
-  common.attrib,
-  keycap.role.attrib,
-  local.keycap.attrib
-# end of keycap.attlist
-
-# end of keycap.module
-local.keycode.attrib = empty
-keycode.role.attrib = role.attrib
-# doc:The internal, frequently numeric, identifier for a key on a keyboard.
-keycode = element keycode { keycode.attlist, smallcptr.char.mix* }
-# end of keycode.element
-keycode.attlist &=
-  common.attrib, keycode.role.attrib, local.keycode.attrib
-# end of keycode.attlist
-
-# end of keycode.module
-local.keycombo.attrib = empty
-keycombo.role.attrib = role.attrib
-# doc:A combination of input actions.
-keycombo =
-  element keycombo {
-    keycombo.attlist, (keycap | keycombo | keysym | mousebutton)+
-  }
-# end of keycombo.element
-keycombo.attlist &=
-  keyaction.attrib,
-  moreinfo.attrib,
-  common.attrib,
-  keycombo.role.attrib,
-  local.keycombo.attrib
-# end of keycombo.attlist
-
-# end of keycombo.module
-local.keysym.attrib = empty
-keysysm.role.attrib = role.attrib
-# doc:The symbolic name of a key on a keyboard.
-keysym = element keysym { keysym.attlist, smallcptr.char.mix* }
-# end of keysym.element
-keysym.attlist &=
-  common.attrib, keysysm.role.attrib, local.keysym.attrib
-# end of keysym.attlist
-
-# end of keysym.module
-local.lineannotation.attrib = empty
-lineannotation.role.attrib = role.attrib
-# doc:A comment on a line in a verbatim listing.
-lineannotation =
-  element lineannotation { lineannotation.attlist, para.char.mix* }
-# end of lineannotation.element
-lineannotation.attlist &=
-  common.attrib, lineannotation.role.attrib, local.lineannotation.attrib
-# end of lineannotation.attlist
-
-# end of lineannotation.module
-local.literal.attrib = empty
-literal.role.attrib = role.attrib
-# doc:Inline text that is some literal value.
-literal = element literal { literal.attlist, cptr.char.mix* }
-# end of literal.element
-literal.attlist &=
-  moreinfo.attrib,
-  common.attrib,
-  literal.role.attrib,
-  local.literal.attrib
-# end of literal.attlist
-
-# end of literal.module
-local.code.attrib = empty
-code.role.attrib = role.attrib
-# doc:An inline code fragment.
-code = element code { code.attlist, cptr.char.mix* }
-# end of code.element
-code.attlist &=
-  attribute language { text }?,
-  common.attrib,
-  code.role.attrib,
-  local.code.attrib
-# end of code.attlist
-
-# end of code.module
-local.constant.attrib = empty
-constant.role.attrib = role.attrib
-# doc:A programming or system constant.
-constant = element constant { constant.attlist, smallcptr.char.mix* }
-# end of constant.element
-constant.attlist &=
-  attribute class { "limit" }?,
-  common.attrib,
-  constant.role.attrib,
-  local.constant.attrib
-# end of constant.attlist
-
-# end of constant.module
-local.varname.attrib = empty
-varname.role.attrib = role.attrib
-# doc:The name of a variable.
-varname = element varname { varname.attlist, smallcptr.char.mix* }
-# end of varname.element
-varname.attlist &=
-  common.attrib, varname.role.attrib, local.varname.attrib
-# end of varname.attlist
-
-# end of varname.module
-local.markup.attrib = empty
-markup.role.attrib = role.attrib
-# doc:A string of formatting markup in text that is to be represented literally.
-markup = element markup { markup.attlist, smallcptr.char.mix* }
-# end of markup.element
-markup.attlist &= common.attrib, markup.role.attrib, local.markup.attrib
-# end of markup.attlist
-
-# end of markup.module
-local.medialabel.attrib = empty
-medialabel.role.attrib = role.attrib
-# doc:A name that identifies the physical medium on which some information resides.
-medialabel =
-  element medialabel { medialabel.attlist, smallcptr.char.mix* }
-# end of medialabel.element
-
-# Class: Type of medium named by the element; no default
-medialabel.attlist &=
-  attribute class { "cartridge" | "cdrom" | "disk" | "tape" }?,
-  common.attrib,
-  medialabel.role.attrib,
-  local.medialabel.attrib
-# end of medialabel.attlist
-
-# end of medialabel.module
-local.menuchoice.attrib = empty
-menuchoice.role.attrib = role.attrib
-# doc:A selection or series of selections from a menu.
-menuchoice =
-  element menuchoice {
-    menuchoice.attlist,
-    shortcut?,
-    (guibutton
-     | guiicon
-     | guilabel
-     | guimenu
-     | guimenuitem
-     | guisubmenu
-     | interface)+
-  }
-# end of menuchoice.element
-menuchoice.attlist &=
-  moreinfo.attrib,
-  common.attrib,
-  menuchoice.role.attrib,
-  local.menuchoice.attrib
-# end of menuchoice.attlist
-
-# end of menuchoice.module
-
-# See also KeyCombo
-local.shortcut.attrib = empty
-shortcut.role.attrib = role.attrib
-# doc:A key combination for an action that is also accessible through a menu.
-shortcut =
-  element shortcut {
-    shortcut.attlist, (keycap | keycombo | keysym | mousebutton)+
-  }
-# end of shortcut.element
-shortcut.attlist &=
-  keyaction.attrib,
-  moreinfo.attrib,
-  common.attrib,
-  shortcut.role.attrib,
-  local.shortcut.attrib
-# end of shortcut.attlist
-
-# end of shortcut.module
-
-# end of menuchoice.content.module
-local.mousebutton.attrib = empty
-mousebutton.role.attrib = role.attrib
-# doc:The conventional name of a mouse button.
-mousebutton =
-  element mousebutton { mousebutton.attlist, smallcptr.char.mix* }
-# end of mousebutton.element
-mousebutton.attlist &=
-  moreinfo.attrib,
-  common.attrib,
-  mousebutton.role.attrib,
-  local.mousebutton.attrib
-# end of mousebutton.attlist
-
-# end of mousebutton.module
-local.msgtext.attrib = empty
-msgtext.role.attrib = role.attrib
-# doc:The actual text of a message component in a message set.
-msgtext = element msgtext { msgtext.attlist, component.mix+ }
-# end of msgtext.element
-msgtext.attlist &=
-  common.attrib, msgtext.role.attrib, local.msgtext.attrib
-# end of msgtext.attlist
-
-# end of msgtext.module
-local.option.attrib = empty
-option.role.attrib = role.attrib
-# doc:An option for a software command.
-option = element option { option.attlist, cptr.char.mix* }
-# end of option.element
-option.attlist &= common.attrib, option.role.attrib, local.option.attrib
-# end of option.attlist
-
-# end of option.module
-local.optional.attrib = empty
-optional.role.attrib = role.attrib
-# doc:Optional information.
-optional = element optional { optional.attlist, cptr.char.mix* }
-# end of optional.element
-optional.attlist &=
-  common.attrib, optional.role.attrib, local.optional.attrib
-# end of optional.attlist
-
-# end of optional.module
-local.parameter.attrib = empty
-parameter.role.attrib = role.attrib
-# doc:A value or a symbolic reference to a value.
-parameter = element parameter { parameter.attlist, cptr.char.mix* }
-# end of parameter.element
-
-# Class: Type of the Parameter; no default
-parameter.attlist &=
-  attribute class { "command" | "function" | "option" }?,
-  moreinfo.attrib,
-  common.attrib,
-  parameter.role.attrib,
-  local.parameter.attrib
-# end of parameter.attlist
-
-# end of parameter.module
-local.prompt.attrib = empty
-prompt.role.attrib = role.attrib
-# doc:A character or string indicating the start of an input field in a  computer display.
-prompt = element prompt { prompt.attlist, (smallcptr.char.mix | co)* }
-# end of prompt.element
-prompt.attlist &=
-  moreinfo.attrib,
-  common.attrib,
-  prompt.role.attrib,
-  local.prompt.attrib
-# end of prompt.attlist
-
-# end of prompt.module
-local.property.attrib = empty
-property.role.attrib = role.attrib
-# doc:A unit of data associated with some part of a computer system.
-property = element property { property.attlist, cptr.char.mix* }
-# end of property.element
-property.attlist &=
-  moreinfo.attrib,
-  common.attrib,
-  property.role.attrib,
-  local.property.attrib
-# end of property.attlist
-
-# end of property.module
-local.replaceable.attrib = empty
-replaceable.role.attrib = role.attrib
-# doc:Content that may or must be replaced by the user.
-replaceable =
-  element replaceable {
-    replaceable.attlist,
-    (text
-     | link.char.class
-     | optional
-     | base.char.class
-     | other.char.class
-     | inlinegraphic
-     | inlinemediaobject
-     | co)*
-  }
-# end of replaceable.element
-
-# Class: Type of information the element represents; no
-# default
-replaceable.attlist &=
-  attribute class { "command" | "function" | "option" | "parameter" }?,
-  common.attrib,
-  replaceable.role.attrib,
-  local.replaceable.attrib
-# end of replaceable.attlist
-
-# end of replaceable.module
-local.returnvalue.attrib = empty
-returnvalue.role.attrib = role.attrib
-# doc:The value returned by a function.
-returnvalue =
-  element returnvalue { returnvalue.attlist, smallcptr.char.mix* }
-# end of returnvalue.element
-returnvalue.attlist &=
-  common.attrib, returnvalue.role.attrib, local.returnvalue.attrib
-# end of returnvalue.attlist
-
-# end of returnvalue.module
-local.sgmltag.attrib = empty
-sgmltag.role.attrib = role.attrib
-# doc:A component of SGML markup.
-sgmltag = element sgmltag { sgmltag.attlist, smallcptr.char.mix* }
-# end of sgmltag.element
-
-# Class: Type of SGML construct the element names; no default
-sgmltag.attlist &=
-  attribute class {
-    "attribute"
-    | "attvalue"
-    | "element"
-    | "endtag"
-    | "emptytag"
-    | "genentity"
-    | "numcharref"
-    | "paramentity"
-    | "pi"
-    | "xmlpi"
-    | "starttag"
-    | "sgmlcomment"
-    | "prefix"
-    | "namespace"
-    | "localname"
-  }?,
-  attribute namespace { text }?,
-  common.attrib,
-  sgmltag.role.attrib,
-  local.sgmltag.attrib
-# end of sgmltag.attlist
-
-# end of sgmltag.module
-local.structfield.attrib = empty
-structfield.role.attrib = role.attrib
-# doc:A field in a structure (in the programming language sense).
-structfield =
-  element structfield { structfield.attlist, smallcptr.char.mix* }
-# end of structfield.element
-structfield.attlist &=
-  common.attrib, structfield.role.attrib, local.structfield.attrib
-# end of structfield.attlist
-
-# end of structfield.module
-local.structname.attrib = empty
-structname.role.attrib = role.attrib
-# doc:The name of a structure (in the programming language sense).
-structname =
-  element structname { structname.attlist, smallcptr.char.mix* }
-# end of structname.element
-structname.attlist &=
-  common.attrib, structname.role.attrib, local.structname.attrib
-# end of structname.attlist
-
-# end of structname.module
-local.symbol.attrib = empty
-symbol.role.attrib = role.attrib
-# doc:A name that is replaced by a value before processing.
-symbol = element symbol { symbol.attlist, smallcptr.char.mix* }
-# end of symbol.element
-
-# Class: Type of symbol; no default
-symbol.attlist &=
-  attribute class { "limit" }?,
-  common.attrib,
-  symbol.role.attrib,
-  local.symbol.attrib
-# end of symbol.attlist
-
-# end of symbol.module
-local.systemitem.attrib = empty
-systemitem.role.attrib = role.attrib
-# doc:A system-related item or term.
-systemitem =
-  element systemitem {
-    systemitem.attlist, (cptr.char.mix | acronym | co)*
-  }
-# end of systemitem.element
-
-# Class: Type of system item the element names; no default
-systemitem.attlist &=
-  attribute class {
-    "constant"
-    | "daemon"
-    | "domainname"
-    | "etheraddress"
-    | "event"
-    | "eventhandler"
-    | "filesystem"
-    | "fqdomainname"
-    | "groupname"
-    | "ipaddress"
-    | "library"
-    | "macro"
-    | "netmask"
-    | "newsgroup"
-    | "osname"
-    | "protocol"
-    | "resource"
-    | "systemname"
-    | "username"
-    | "process"
-    | "server"
-    | "service"
-  }?,
-  moreinfo.attrib,
-  common.attrib,
-  systemitem.role.attrib,
-  local.systemitem.attrib
-# end of systemitem.attlist
-
-# end of systemitem.module
-local.uri.attrib = empty
-uri.role.attrib = role.attrib
-# doc:A Uniform Resource Identifier.
-uri = element uri { uri.attlist, smallcptr.char.mix* }
-# end of uri.element
-
-# Type: Type of URI; no default
-uri.attlist &=
-  attribute type { text }?,
-  common.attrib,
-  uri.role.attrib,
-  local.uri.attrib
-# end of uri.attlist
-
-# end of uri.module
-local.token.attrib = empty
-token.role.attrib = role.attrib
-# doc:A unit of information.
-\token = element token { token.attlist, smallcptr.char.mix* }
-# end of token.element
-token.attlist &= common.attrib, token.role.attrib, local.token.attrib
-# end of token.attlist
-
-# end of token.module
-local.type.attrib = empty
-type.role.attrib = role.attrib
-# doc:The classification of a value.
-type = element type { type.attlist, smallcptr.char.mix* }
-# end of type.element
-type.attlist &= common.attrib, type.role.attrib, local.type.attrib
-# end of type.attlist
-
-# end of type.module
-local.userinput.attrib = empty
-userinput.role.attrib = role.attrib
-# doc:Data entered by the user.
-userinput =
-  element userinput { userinput.attlist, (cptr.char.mix | co)* }
-# end of userinput.element
-userinput.attlist &=
-  moreinfo.attrib,
-  common.attrib,
-  userinput.role.attrib,
-  local.userinput.attrib
-# end of userinput.attlist
-
-# end of userinput.module
-local.termdef.attrib = empty
-termdef.role.attrib = role.attrib
-# doc:An inline definition of a term.
-termdef = element termdef { termdef.attlist, para.char.mix* }
-# end of termdef.element
-termdef.attlist &=
-  common.attrib, termdef.role.attrib, local.termdef.attrib
-# end of termdef.attlist
-
-# end of termdef.module
-
-# General words and phrases ............................................
-local.abbrev.attrib = empty
-abbrev.role.attrib = role.attrib
-# doc:An abbreviation, especially one followed by a period.
-abbrev = element abbrev { abbrev.attlist, word.char.mix* }
-# end of abbrev.element
-abbrev.attlist &= common.attrib, abbrev.role.attrib, local.abbrev.attrib
-# end of abbrev.attlist
-
-# end of abbrev.module
-local.acronym.attrib = empty
-acronym.role.attrib = role.attrib
-# doc:An often pronounceable word made from the initial (or selected) letters of a name or phrase.
-acronym = element acronym { acronym.attlist, word.char.mix* }
-# end of acronym.element
-acronym.attlist &=
-  common.attrib, acronym.role.attrib, local.acronym.attrib
-# end of acronym.attlist
-
-# end of acronym.module
-local.citation.attrib = empty
-citation.role.attrib = role.attrib
-# doc:An inline bibliographic reference to another published work.
-citation = element citation { citation.attlist, para.char.mix* }
-# end of citation.element
-citation.attlist &=
-  common.attrib, citation.role.attrib, local.citation.attrib
-# end of citation.attlist
-
-# end of citation.module
-local.citerefentry.attrib = empty
-citerefentry.role.attrib = role.attrib
-# doc:A citation to a reference page.
-citerefentry =
-  element citerefentry {
-    citerefentry.attlist, refentrytitle, manvolnum?
-  }
-# end of citerefentry.element
-citerefentry.attlist &=
-  common.attrib, citerefentry.role.attrib, local.citerefentry.attrib
-# end of citerefentry.attlist
-
-# end of citerefentry.module
-local.refentrytitle.attrib = empty
-refentrytitle.role.attrib = role.attrib
-# doc:The title of a reference page.
-refentrytitle =
-  element refentrytitle { refentrytitle.attlist, para.char.mix* }
-# end of refentrytitle.element
-refentrytitle.attlist &=
-  common.attrib, refentrytitle.role.attrib, local.refentrytitle.attrib
-# end of refentrytitle.attlist
-
-# end of refentrytitle.module
-local.manvolnum.attrib = empty
-namvolnum.role.attrib = role.attrib
-# doc:A reference volume number.
-manvolnum = element manvolnum { manvolnum.attlist, word.char.mix* }
-# end of manvolnum.element
-manvolnum.attlist &=
-  common.attrib, namvolnum.role.attrib, local.manvolnum.attrib
-# end of manvolnum.attlist
-
-# end of manvolnum.module
-local.citetitle.attrib = empty
-citetitle.role.attrib = role.attrib
-# doc:The title of a cited work.
-citetitle = element citetitle { citetitle.attlist, para.char.mix* }
-# end of citetitle.element
-
-# Pubwork: Genre of published work cited; no default
-citetitle.attlist &=
-  attribute pubwork {
-    "article"
-    | "book"
-    | "chapter"
-    | "part"
-    | "refentry"
-    | "section"
-    | "journal"
-    | "series"
-    | "set"
-    | "manuscript"
-    | "cdrom"
-    | "dvd"
-    | "wiki"
-    | "gopher"
-    | "bbs"
-    | "emailmessage"
-    | "webpage"
-    | "newsposting"
-  }?,
-  common.attrib,
-  citetitle.role.attrib,
-  local.citetitle.attrib
-# end of citetitle.attlist
-
-# end of citetitle.module
-local.emphasis.attrib = empty
-emphasis.role.attrib = role.attrib
-# doc:Emphasized text.
-emphasis = element emphasis { emphasis.attlist, para.char.mix* }
-# end of emphasis.element
-emphasis.attlist &=
-  common.attrib, emphasis.role.attrib, local.emphasis.attrib
-# end of emphasis.attlist
-
-# end of emphasis.module
-local.foreignphrase.attrib = empty
-foreignphrase.role.attrib = role.attrib
-# doc:A word or phrase in a language other than the primary language of the document.
-foreignphrase =
-  element foreignphrase { foreignphrase.attlist, para.char.mix* }
-# end of foreignphrase.element
-foreignphrase.attlist &=
-  common.attrib, foreignphrase.role.attrib, local.foreignphrase.attrib
-# end of foreignphrase.attlist
-
-# end of foreignphrase.module
-local.glossterm.attrib = empty
-glossterm.role.attrib = role.attrib
-# doc:A glossary term.
-glossterm = element glossterm { glossterm.attlist, para.char.mix* }
-# end of glossterm.element
-
-# to GlossEntry if Glossterm used in text
-
-# BaseForm: Provides the form of GlossTerm to be used
-# for indexing
-glossterm.attlist &=
-  attribute baseform { text }?,
-  linkend.attrib,
-  common.attrib,
-  glossterm.role.attrib,
-  local.glossterm.attrib
-# end of glossterm.attlist
-
-# end of glossterm.module
-local.firstterm.attrib = empty
-firstterm.role.attrib = role.attrib
-# doc:The first occurrence of a term.
-firstterm = element firstterm { firstterm.attlist, para.char.mix* }
-# end of firstterm.element
-
-# to GlossEntry or other explanation
-firstterm.attlist &=
-  attribute baseform { text }?,
-  linkend.attrib,
-  common.attrib,
-  firstterm.role.attrib,
-  local.firstterm.attrib
-# end of firstterm.attlist
-
-# end of firstterm.module
-local.phrase.attrib = empty
-phrase.role.attrib = role.attrib
-# doc:A span of text.
-phrase = element phrase { phrase.attlist, para.char.mix* }
-# end of phrase.element
-phrase.attlist &= common.attrib, phrase.role.attrib, local.phrase.attrib
-# end of phrase.attlist
-
-# end of phrase.module
-local.quote.attrib = empty
-quote.role.attrib = role.attrib
-# doc:An inline quotation.
-quote = element quote { quote.attlist, para.char.mix* }
-# end of quote.element
-quote.attlist &= common.attrib, quote.role.attrib, local.quote.attrib
-# end of quote.attlist
-
-# end of quote.module
-local.ssscript.attrib = empty
-ssscript.role.attrib = role.attrib
-# doc:A subscript (as in H{^2}O, the molecular formula for water).
-subscript =
-  element subscript {
-    subscript.attlist,
-    (text
-     | link.char.class
-     | emphasis
-     | replaceable
-     | symbol
-     | inlinegraphic
-     | inlinemediaobject
-     | base.char.class
-     | other.char.class)*
-  }
-# end of subscript.element
-subscript.attlist &=
-  common.attrib, ssscript.role.attrib, local.ssscript.attrib
-# end of subscript.attlist
-
-# doc:A superscript (as in x^2, the mathematical notation for x multiplied by itself).
-superscript =
-  element superscript {
-    superscript.attlist,
-    (text
-     | link.char.class
-     | emphasis
-     | replaceable
-     | symbol
-     | inlinegraphic
-     | inlinemediaobject
-     | base.char.class
-     | other.char.class)*
-  }
-# end of superscript.element
-superscript.attlist &=
-  common.attrib, ssscript.role.attrib, local.ssscript.attrib
-# end of superscript.attlist
-
-# end of ssscript.module
-local.trademark.attrib = empty
-trademark.role.attrib = role.attrib
-# doc:A trademark.
-trademark =
-  element trademark {
-    trademark.attlist,
-    (text
-     | link.char.class
-     | tech.char.class
-     | base.char.class
-     | other.char.class
-     | inlinegraphic
-     | inlinemediaobject
-     | emphasis)*
-  }
-# end of trademark.element
-
-# Class: More precisely identifies the item the element names
-trademark.attlist &=
-  [ a:defaultValue = "trade" ]
-  attribute class { "service" | "trade" | "registered" | "copyright" }?,
-  common.attrib,
-  trademark.role.attrib,
-  local.trademark.attrib
-# end of trademark.attlist
-
-# end of trademark.module
-local.wordasword.attrib = empty
-wordasword.role.attrib = role.attrib
-# doc:A word meant specifically as a word and not representing anything else.
-wordasword = element wordasword { wordasword.attlist, word.char.mix* }
-# end of wordasword.element
-wordasword.attlist &=
-  common.attrib, wordasword.role.attrib, local.wordasword.attrib
-# end of wordasword.attlist
-
-# end of wordasword.module
-
-# Links and cross-references ...........................................
-local.link.attrib = empty
-link.role.attrib = role.attrib
-# doc:A hypertext link.
-link = element link { link.attlist, para.char.mix* }
-# end of link.element
-
-# Endterm: ID of element containing text that is to be
-# fetched from elsewhere in the document to appear as
-# the content of this element
-
-# to linked-to object
-
-# Type: Freely assignable parameter
-link.attlist &=
-  attribute endterm { xsd:IDREF }?,
-  attribute xrefstyle { text }?,
-  attribute type { text }?,
-  linkendreq.attrib,
-  common.attrib,
-  link.role.attrib,
-  local.link.attrib
-# end of link.attlist
-
-# end of link.module
-local.olink.attrib = empty
-olink.role.attrib = role.attrib
-# doc:A link that addresses its target indirectly, through an entity.
-olink = element olink { olink.attlist, para.char.mix* }
-# end of olink.element
-
-# TargetDocEnt: Name of an entity to be the target of the link
-
-# LinkMode: ID of a ModeSpec containing instructions for
-# operating on the entity named by TargetDocEnt
-
-# LocalInfo: Information that may be passed to ModeSpec
-
-# Type: Freely assignable parameter
-olink.attlist &=
-  attribute targetdocent { xsd:ENTITY }?,
-  attribute linkmode { xsd:IDREF }?,
-  attribute localinfo { text }?,
-  attribute type { text }?,
-  attribute targetdoc { text }?,
-  attribute targetptr { text }?,
-  attribute xrefstyle { text }?,
-  common.attrib,
-  olink.role.attrib,
-  local.olink.attrib
-# end of olink.attlist
-
-# end of olink.module
-local.ulink.attrib = empty
-ulink.role.attrib = role.attrib
-# doc:A link that addresses its target by means of a URL (Uniform Resource Locator).
-ulink = element ulink { ulink.attlist, para.char.mix* }
-# end of ulink.element
-
-# URL: uniform resource locator; the target of the ULink
-
-# Type: Freely assignable parameter
-ulink.attlist &=
-  attribute url { text },
-  attribute type { text }?,
-  attribute xrefstyle { text }?,
-  common.attrib,
-  ulink.role.attrib,
-  local.ulink.attrib
-# end of ulink.attlist
-
-# end of ulink.module
-local.footnoteref.attrib = empty
-footnoteref.role.attrib = role.attrib
-# doc:A cross reference to a footnote (a footnote mark).
-footnoteref = element footnoteref { footnoteref.attlist, empty }
-# end of footnoteref.element
-
-# to footnote content supplied elsewhere
-footnoteref.attlist &=
-  linkendreq.attrib,
-  label.attrib,
-  common.attrib,
-  footnoteref.role.attrib,
-  local.footnoteref.attrib
-# end of footnoteref.attlist
-
-# end of footnoteref.module
-local.xref.attrib = empty
-xref.role.attrib = role.attrib
-# doc:A cross reference to another part of the document.
-xref = element xref { xref.attlist, empty }
-# end of xref.element
-
-# Endterm: ID of element containing text that is to be
-# fetched from elsewhere in the document to appear as
-# the content of this element
-
-# to linked-to object
-xref.attlist &=
-  attribute endterm { xsd:IDREF }?,
-  attribute xrefstyle { text }?,
-  common.attrib,
-  linkendreq.attrib,
-  xref.role.attrib,
-  local.xref.attrib
-# end of xref.attlist
-
-# end of xref.module
-local.biblioref.attrib = empty
-biblioref.role.attrib = role.attrib
-# doc:A cross reference to a bibliographic entry.
-biblioref = element biblioref { biblioref.attlist, empty }
-# end of biblioref.element
-biblioref.attlist &=
-  attribute endterm { xsd:IDREF }?,
-  attribute xrefstyle { text }?,
-  attribute units { text }?,
-  attribute begin { text }?,
-  attribute end { text }?,
-  common.attrib,
-  linkendreq.attrib,
-  biblioref.role.attrib,
-  local.biblioref.attrib
-# end of biblioref.attlist
-
-# end of biblioref.module
-
-# Ubiquitous elements ..................................................
-local.anchor.attrib = empty
-anchor.role.attrib = role.attrib
-# doc:A spot in the document.
-anchor = element anchor { anchor.attlist, empty }
-# end of anchor.element
-
-# required
-
-# replaces Lang
-anchor.attlist &=
-  idreq.attrib,
-  pagenum.attrib,
-  remap.attrib,
-  xreflabel.attrib,
-  revisionflag.attrib,
-  effectivity.attrib,
-  anchor.role.attrib,
-  local.anchor.attrib
-# end of anchor.attlist
-
-# end of anchor.module
-local.beginpage.attrib = empty
-beginpage.role.attrib = role.attrib
-# doc:The location of a page break in a print version of the document.
-beginpage = element beginpage { beginpage.attlist, empty }
-# end of beginpage.element
-
-# PageNum: Number of page that begins at this point
-beginpage.attlist &=
-  pagenum.attrib,
-  common.attrib,
-  beginpage.role.attrib,
-  local.beginpage.attrib
-# end of beginpage.attlist
-
-# end of beginpage.module
-
-# IndexTerms appear in the text flow for generating or linking an
-# index.
-local.indexterm.attrib = empty
-indexterm.role.attrib = role.attrib
-# doc:A wrapper for terms to be indexed.
-indexterm =
-  element indexterm {
-    indexterm.attlist,
-    primary?,
-    ((secondary,
-      ((tertiary, (see | seealso+)?)
-       | see
-       | seealso+)?)
-     | see
-     | seealso+)?
-  }
-# end of indexterm.element
-
-# Scope: Indicates which generated indices the IndexTerm
-# should appear in: Global (whole document set), Local (this
-# document only), or All (both)
-
-# Significance: Whether this IndexTerm is the most pertinent
-# of its series (Preferred) or not (Normal, the default)
-
-# Class: Indicates type of IndexTerm; default is Singular,
-# or EndOfRange if StartRef is supplied; StartOfRange value
-# must be supplied explicitly on starts of ranges
-
-# StartRef: ID of the IndexTerm that starts the indexing
-# range ended by this IndexTerm
-
-# Zone: IDs of the elements to which the IndexTerm applies,
-# and indicates that the IndexTerm applies to those entire
-# elements rather than the point at which the IndexTerm
-# occurs
-indexterm.attlist &=
-  pagenum.attrib,
-  attribute scope { "all" | "global" | "local" }?,
-  [ a:defaultValue = "normal" ]
-  attribute significance { "preferred" | "normal" }?,
-  attribute class { "singular" | "startofrange" | "endofrange" }?,
-  attribute startref { xsd:IDREF }?,
-  attribute zone { xsd:IDREFS }?,
-  attribute type { text }?,
-  common.attrib,
-  indexterm.role.attrib,
-  local.indexterm.attrib
-# end of indexterm.attlist
-
-# end of indexterm.module
-local.primsecter.attrib = empty
-primsecter.role.attrib = role.attrib
-# doc:The primary word or phrase under which an index term should be sorted.
-primary = element primary { primary.attlist, ndxterm.char.mix* }
-# end of primary.element
-
-# SortAs: Alternate sort string for index sorting, e.g.,
-# "fourteen" for an element containing "14"
-primary.attlist &=
-  attribute sortas { text }?,
-  common.attrib,
-  primsecter.role.attrib,
-  local.primsecter.attrib
-# end of primary.attlist
-
-# doc:A secondary word or phrase in an index term.
-secondary = element secondary { secondary.attlist, ndxterm.char.mix* }
-# end of secondary.element
-
-# SortAs: Alternate sort string for index sorting, e.g.,
-# "fourteen" for an element containing "14"
-secondary.attlist &=
-  attribute sortas { text }?,
-  common.attrib,
-  primsecter.role.attrib,
-  local.primsecter.attrib
-# end of secondary.attlist
-
-# doc:A tertiary word or phrase in an index term.
-tertiary = element tertiary { tertiary.attlist, ndxterm.char.mix* }
-# end of tertiary.element
-
-# SortAs: Alternate sort string for index sorting, e.g.,
-# "fourteen" for an element containing "14"
-tertiary.attlist &=
-  attribute sortas { text }?,
-  common.attrib,
-  primsecter.role.attrib,
-  local.primsecter.attrib
-# end of tertiary.attlist
-
-# end of primsecter.module
-local.seeseealso.attrib = empty
-seeseealso.role.attrib = role.attrib
-# doc:Part of an index term directing the reader instead to another entry in the index.
-see = element see { see.attlist, ndxterm.char.mix* }
-# end of see.element
-see.attlist &=
-  common.attrib, seeseealso.role.attrib, local.seeseealso.attrib
-# end of see.attlist
-
-# doc:Part of an index term directing the reader also to another entry in the index.
-seealso = element seealso { seealso.attlist, ndxterm.char.mix* }
-# end of seealso.element
-seealso.attlist &=
-  common.attrib, seeseealso.role.attrib, local.seeseealso.attrib
-# end of seealso.attlist
-
-# end of seeseealso.module
-
-# end of indexterm.content.module
-
-# End of DocBook XML information pool module V4.5 ......................
-
-# ......................................................................
Index: OK/schema/docbook/4.5/rng/dbpoolx.rng
===================================================================
--- BOOK/schema/docbook/4.5/rng/dbpoolx.rng	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,10774 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- ...................................................................... -->
-<!-- DocBook XML information pool module V4.5 ............................. -->
-<!-- File dbpoolx.mod ..................................................... -->
-<!--
-  Copyright 1992-2004 HaL Computer Systems, Inc.,
-  O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software
-  Corporation, Norman Walsh, Sun Microsystems, Inc., and the
-  Organization for the Advancement of Structured Information
-  Standards (OASIS).
-  
-  $Id: dbpoolx.mod 6340 2006-10-03 13:23:24Z nwalsh $
-  
-  Permission to use, copy, modify and distribute the DocBook XML DTD
-  and its accompanying documentation for any purpose and without fee
-  is hereby granted in perpetuity, provided that the above copyright
-  notice and this paragraph appear in all copies.  The copyright
-  holders make no representation about the suitability of the DTD for
-  any purpose.  It is provided "as is" without expressed or implied
-  warranty.
-  
-  If you modify the DocBook XML DTD in any way, except for declaring and
-  referencing additional sets of general entities and declaring
-  additional notations, label your DTD as a variant of DocBook.  See
-  the maintenance documentation for more information.
-  
-  Please direct all questions, bug reports, or suggestions for
-  changes to the docbook@lists.oasis-open.org mailing list. For more
-  information, see http://www.oasis-open.org/docbook/.
--->
-<!-- ...................................................................... -->
-<!--
-  This module contains the definitions for the objects, inline
-  elements, and so on that are available to be used as the main
-  content of DocBook documents.  Some elements are useful for general
-  publishing, and others are useful specifically for computer
-  documentation.
-  
-  This module has the following dependencies on other modules:
-  
-  o It assumes that a %notation.class; entity is defined by the
-    driver file or other high-level module.  This entity is
-    referenced in the NOTATION attributes for the graphic-related and
-    ModeSpec elements.
-  
-  o It assumes that an appropriately parameterized table module is
-    available for use with the table-related elements.
-  
-  In DTD driver files referring to this module, please use an entity
-  declaration that uses the public identifier shown below:
-  
-  <!ENTITY % dbpool PUBLIC
-  "-//OASIS//ELEMENTS DocBook XML Information Pool V4.5//EN"
-  "dbpoolx.mod">
-  %dbpool;
-  
-  See the documentation for detailed information on the parameter
-  entity and module scheme used in DocBook, customizing DocBook and
-  planning for interchange, and changes made since the last release
-  of DocBook.
--->
-<!-- ...................................................................... -->
-<!-- Forms entities ....................................................... -->
-<!-- These PEs provide the hook by which the forms module can be inserted -->
-<!-- into the DTD. -->
-<grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-  <define name="forminlines.hook">
-    <notAllowed/>
-  </define>
-  <define name="forms.hook">
-    <notAllowed/>
-  </define>
-  <!-- ...................................................................... -->
-  <!-- General-purpose semantics entities ................................... -->
-  <define name="yesorno.attvals">
-    <data type="string" datatypeLibrary=""/>
-  </define>
-  <!-- ...................................................................... -->
-  <!-- Entities for module inclusions ....................................... -->
-  <!-- ...................................................................... -->
-  <!-- Entities for element classes and mixtures ............................ -->
-  <!-- "Ubiquitous" classes: ndxterm.class and beginpage -->
-  <define name="local.ndxterm.class">
-    <notAllowed/>
-  </define>
-  <define name="ndxterm.class">
-    <choice>
-      <ref name="indexterm"/>
-      <ref name="local.ndxterm.class"/>
-    </choice>
-  </define>
-  <!-- Object-level classes ................................................. -->
-  <define name="local.list.class">
-    <notAllowed/>
-  </define>
-  <define name="list.class">
-    <choice>
-      <ref name="calloutlist"/>
-      <ref name="glosslist"/>
-      <ref name="bibliolist"/>
-      <ref name="itemizedlist"/>
-      <ref name="orderedlist"/>
-      <ref name="segmentedlist"/>
-      <ref name="simplelist"/>
-      <ref name="variablelist"/>
-      <ref name="local.list.class"/>
-    </choice>
-  </define>
-  <define name="local.admon.class">
-    <notAllowed/>
-  </define>
-  <define name="admon.class">
-    <choice>
-      <ref name="caution"/>
-      <ref name="important"/>
-      <ref name="note"/>
-      <ref name="tip"/>
-      <ref name="warning"/>
-      <ref name="local.admon.class"/>
-    </choice>
-  </define>
-  <define name="local.linespecific.class">
-    <notAllowed/>
-  </define>
-  <define name="linespecific.class">
-    <choice>
-      <ref name="literallayout"/>
-      <ref name="programlisting"/>
-      <ref name="programlistingco"/>
-      <ref name="screen"/>
-      <ref name="screenco"/>
-      <ref name="screenshot"/>
-      <ref name="local.linespecific.class"/>
-    </choice>
-  </define>
-  <define name="local.method.synop.class">
-    <notAllowed/>
-  </define>
-  <define name="method.synop.class">
-    <choice>
-      <ref name="constructorsynopsis"/>
-      <ref name="destructorsynopsis"/>
-      <ref name="methodsynopsis"/>
-      <ref name="local.method.synop.class"/>
-    </choice>
-  </define>
-  <define name="local.synop.class">
-    <notAllowed/>
-  </define>
-  <define name="synop.class">
-    <choice>
-      <ref name="synopsis"/>
-      <ref name="cmdsynopsis"/>
-      <ref name="funcsynopsis"/>
-      <ref name="classsynopsis"/>
-      <ref name="fieldsynopsis"/>
-      <ref name="method.synop.class"/>
-      <ref name="local.synop.class"/>
-    </choice>
-  </define>
-  <define name="local.para.class">
-    <notAllowed/>
-  </define>
-  <define name="para.class">
-    <choice>
-      <ref name="formalpara"/>
-      <ref name="para"/>
-      <ref name="simpara"/>
-      <ref name="local.para.class"/>
-    </choice>
-  </define>
-  <define name="local.informal.class">
-    <notAllowed/>
-  </define>
-  <define name="informal.class">
-    <choice>
-      <ref name="address"/>
-      <ref name="blockquote"/>
-      <ref name="graphic"/>
-      <ref name="graphicco"/>
-      <ref name="mediaobject"/>
-      <ref name="mediaobjectco"/>
-      <ref name="informalequation"/>
-      <ref name="informalexample"/>
-      <ref name="informalfigure"/>
-      <ref name="informaltable"/>
-      <ref name="local.informal.class"/>
-    </choice>
-  </define>
-  <define name="local.formal.class">
-    <notAllowed/>
-  </define>
-  <define name="formal.class">
-    <choice>
-      <ref name="equation"/>
-      <ref name="example"/>
-      <ref name="figure"/>
-      <ref name="table"/>
-      <ref name="local.formal.class"/>
-    </choice>
-  </define>
-  <!-- The DocBook TC may produce an official EBNF module for DocBook. -->
-  <!-- This PE provides the hook by which it can be inserted into the DTD. -->
-  <define name="ebnf.block.hook">
-    <notAllowed/>
-  </define>
-  <define name="local.compound.class">
-    <notAllowed/>
-  </define>
-  <define name="compound.class">
-    <choice>
-      <ref name="msgset"/>
-      <ref name="procedure"/>
-      <ref name="sidebar"/>
-      <ref name="qandaset"/>
-      <ref name="task"/>
-      <ref name="ebnf.block.hook"/>
-      <ref name="local.compound.class"/>
-    </choice>
-  </define>
-  <define name="local.genobj.class">
-    <notAllowed/>
-  </define>
-  <define name="genobj.class">
-    <choice>
-      <ref name="anchor"/>
-      <ref name="bridgehead"/>
-      <ref name="remark"/>
-      <ref name="highlights"/>
-      <ref name="local.genobj.class"/>
-    </choice>
-  </define>
-  <define name="local.descobj.class">
-    <notAllowed/>
-  </define>
-  <define name="descobj.class">
-    <choice>
-      <ref name="abstract"/>
-      <ref name="authorblurb"/>
-      <ref name="epigraph"/>
-      <ref name="local.descobj.class"/>
-    </choice>
-  </define>
-  <!-- Character-level classes .............................................. -->
-  <define name="local.xref.char.class">
-    <notAllowed/>
-  </define>
-  <define name="xref.char.class">
-    <choice>
-      <ref name="footnoteref"/>
-      <ref name="xref"/>
-      <ref name="biblioref"/>
-      <ref name="local.xref.char.class"/>
-    </choice>
-  </define>
-  <define name="local.gen.char.class">
-    <notAllowed/>
-  </define>
-  <define name="gen.char.class">
-    <choice>
-      <ref name="abbrev"/>
-      <ref name="acronym"/>
-      <ref name="citation"/>
-      <ref name="citerefentry"/>
-      <ref name="citetitle"/>
-      <ref name="citebiblioid"/>
-      <ref name="emphasis"/>
-      <ref name="firstterm"/>
-      <ref name="foreignphrase"/>
-      <ref name="glossterm"/>
-      <ref name="termdef"/>
-      <ref name="footnote"/>
-      <ref name="phrase"/>
-      <ref name="orgname"/>
-      <ref name="quote"/>
-      <ref name="trademark"/>
-      <ref name="wordasword"/>
-      <ref name="personname"/>
-      <ref name="local.gen.char.class"/>
-    </choice>
-  </define>
-  <define name="local.link.char.class">
-    <notAllowed/>
-  </define>
-  <define name="link.char.class">
-    <choice>
-      <ref name="link"/>
-      <ref name="olink"/>
-      <ref name="ulink"/>
-      <ref name="local.link.char.class"/>
-    </choice>
-  </define>
-  <!-- The DocBook TC may produce an official EBNF module for DocBook. -->
-  <!-- This PE provides the hook by which it can be inserted into the DTD. -->
-  <define name="ebnf.inline.hook">
-    <notAllowed/>
-  </define>
-  <define name="local.tech.char.class">
-    <notAllowed/>
-  </define>
-  <define name="tech.char.class">
-    <choice>
-      <ref name="action"/>
-      <ref name="application"/>
-      <ref name="classname"/>
-      <ref name="methodname"/>
-      <ref name="interfacename"/>
-      <ref name="exceptionname"/>
-      <ref name="ooclass"/>
-      <ref name="oointerface"/>
-      <ref name="ooexception"/>
-      <ref name="package"/>
-      <ref name="command"/>
-      <ref name="computeroutput"/>
-      <ref name="database"/>
-      <ref name="email"/>
-      <ref name="envar"/>
-      <ref name="errorcode"/>
-      <ref name="errorname"/>
-      <ref name="errortype"/>
-      <ref name="errortext"/>
-      <ref name="filename"/>
-      <ref name="function"/>
-      <ref name="guibutton"/>
-      <ref name="guiicon"/>
-      <ref name="guilabel"/>
-      <ref name="guimenu"/>
-      <ref name="guimenuitem"/>
-      <ref name="guisubmenu"/>
-      <ref name="hardware"/>
-      <ref name="interface"/>
-      <ref name="keycap"/>
-      <ref name="keycode"/>
-      <ref name="keycombo"/>
-      <ref name="keysym"/>
-      <ref name="literal"/>
-      <ref name="code"/>
-      <ref name="constant"/>
-      <ref name="markup"/>
-      <ref name="medialabel"/>
-      <ref name="menuchoice"/>
-      <ref name="mousebutton"/>
-      <ref name="option"/>
-      <ref name="optional"/>
-      <ref name="parameter"/>
-      <ref name="prompt"/>
-      <ref name="property"/>
-      <ref name="replaceable"/>
-      <ref name="returnvalue"/>
-      <ref name="sgmltag"/>
-      <ref name="structfield"/>
-      <ref name="structname"/>
-      <ref name="symbol"/>
-      <ref name="systemitem"/>
-      <ref name="uri"/>
-      <ref name="token"/>
-      <ref name="type"/>
-      <ref name="userinput"/>
-      <ref name="varname"/>
-      <ref name="ebnf.inline.hook"/>
-      <ref name="local.tech.char.class"/>
-    </choice>
-  </define>
-  <define name="local.base.char.class">
-    <notAllowed/>
-  </define>
-  <define name="base.char.class">
-    <choice>
-      <ref name="anchor"/>
-      <ref name="local.base.char.class"/>
-    </choice>
-  </define>
-  <define name="local.docinfo.char.class">
-    <notAllowed/>
-  </define>
-  <define name="docinfo.char.class">
-    <choice>
-      <ref name="author"/>
-      <ref name="authorinitials"/>
-      <ref name="corpauthor"/>
-      <ref name="corpcredit"/>
-      <ref name="modespec"/>
-      <ref name="othercredit"/>
-      <ref name="productname"/>
-      <ref name="productnumber"/>
-      <ref name="revhistory"/>
-      <ref name="local.docinfo.char.class"/>
-    </choice>
-  </define>
-  <define name="local.other.char.class">
-    <notAllowed/>
-  </define>
-  <define name="other.char.class">
-    <choice>
-      <ref name="remark"/>
-      <ref name="subscript"/>
-      <ref name="superscript"/>
-      <ref name="local.other.char.class"/>
-    </choice>
-  </define>
-  <define name="local.inlineobj.char.class">
-    <notAllowed/>
-  </define>
-  <define name="inlineobj.char.class">
-    <choice>
-      <ref name="inlinegraphic"/>
-      <ref name="inlinemediaobject"/>
-      <ref name="inlineequation"/>
-      <ref name="local.inlineobj.char.class"/>
-    </choice>
-  </define>
-  <!-- ...................................................................... -->
-  <!-- Entities for content models .......................................... -->
-  <define name="formalobject.title.content">
-    <ref name="title"/>
-    <optional>
-      <ref name="titleabbrev"/>
-    </optional>
-  </define>
-  <!-- Redeclaration placeholder ............................................ -->
-  <!--
-    For redeclaring entities that are declared after this point while
-    retaining their references to the entities that are declared before
-    this point
-  -->
-  <!-- Object-level mixtures ................................................ -->
-  <!--
-                          list admn line synp para infm form cmpd gen  desc
-    Component mixture       X    X    X    X    X    X    X    X    X    X
-    Sidebar mixture         X    X    X    X    X    X    X    a    X
-    Footnote mixture        X         X    X    X    X
-    Example mixture         X         X    X    X    X
-    Highlights mixture      X    X              X
-    Paragraph mixture       X         X    X         X
-    Admonition mixture      X         X    X    X    X    X    b    c
-    Figure mixture                    X    X         X
-    Table entry mixture     X    X    X         X    d
-    Glossary def mixture    X         X    X    X    X         e
-    Legal notice mixture    X    X    X         X    f
-    
-    a. Just Procedure; not Sidebar itself or MsgSet.
-    b. No MsgSet.
-    c. No Highlights.
-    d. Just Graphic; no other informal objects.
-    e. No Anchor, BridgeHead, or Highlights.
-    f. Just BlockQuote; no other informal objects.
-  -->
-  <define name="local.component.mix">
-    <notAllowed/>
-  </define>
-  <define name="component.mix">
-    <choice>
-      <ref name="list.class"/>
-      <ref name="admon.class"/>
-      <ref name="linespecific.class"/>
-      <ref name="synop.class"/>
-      <ref name="para.class"/>
-      <ref name="informal.class"/>
-      <ref name="formal.class"/>
-      <ref name="compound.class"/>
-      <ref name="genobj.class"/>
-      <ref name="descobj.class"/>
-      <ref name="ndxterm.class"/>
-      <ref name="beginpage"/>
-      <ref name="forms.hook"/>
-      <ref name="local.component.mix"/>
-    </choice>
-  </define>
-  <define name="local.sidebar.mix">
-    <notAllowed/>
-  </define>
-  <define name="sidebar.mix">
-    <choice>
-      <ref name="list.class"/>
-      <ref name="admon.class"/>
-      <ref name="linespecific.class"/>
-      <ref name="synop.class"/>
-      <ref name="para.class"/>
-      <ref name="informal.class"/>
-      <ref name="formal.class"/>
-      <ref name="procedure"/>
-      <ref name="genobj.class"/>
-      <ref name="ndxterm.class"/>
-      <ref name="beginpage"/>
-      <ref name="forms.hook"/>
-      <ref name="local.sidebar.mix"/>
-    </choice>
-  </define>
-  <define name="local.qandaset.mix">
-    <notAllowed/>
-  </define>
-  <define name="qandaset.mix">
-    <choice>
-      <ref name="list.class"/>
-      <ref name="admon.class"/>
-      <ref name="linespecific.class"/>
-      <ref name="synop.class"/>
-      <ref name="para.class"/>
-      <ref name="informal.class"/>
-      <ref name="formal.class"/>
-      <ref name="procedure"/>
-      <ref name="genobj.class"/>
-      <ref name="ndxterm.class"/>
-      <ref name="forms.hook"/>
-      <ref name="local.qandaset.mix"/>
-    </choice>
-  </define>
-  <define name="local.revdescription.mix">
-    <notAllowed/>
-  </define>
-  <define name="revdescription.mix">
-    <choice>
-      <ref name="list.class"/>
-      <ref name="admon.class"/>
-      <ref name="linespecific.class"/>
-      <ref name="synop.class"/>
-      <ref name="para.class"/>
-      <ref name="informal.class"/>
-      <ref name="formal.class"/>
-      <ref name="procedure"/>
-      <ref name="genobj.class"/>
-      <ref name="ndxterm.class"/>
-      <ref name="local.revdescription.mix"/>
-    </choice>
-  </define>
-  <define name="local.footnote.mix">
-    <notAllowed/>
-  </define>
-  <define name="footnote.mix">
-    <choice>
-      <ref name="list.class"/>
-      <ref name="linespecific.class"/>
-      <ref name="synop.class"/>
-      <ref name="para.class"/>
-      <ref name="informal.class"/>
-      <ref name="local.footnote.mix"/>
-    </choice>
-  </define>
-  <define name="local.example.mix">
-    <notAllowed/>
-  </define>
-  <define name="example.mix">
-    <choice>
-      <ref name="list.class"/>
-      <ref name="linespecific.class"/>
-      <ref name="synop.class"/>
-      <ref name="para.class"/>
-      <ref name="informal.class"/>
-      <ref name="ndxterm.class"/>
-      <ref name="beginpage"/>
-      <ref name="procedure"/>
-      <ref name="forms.hook"/>
-      <ref name="local.example.mix"/>
-    </choice>
-  </define>
-  <define name="local.highlights.mix">
-    <notAllowed/>
-  </define>
-  <define name="highlights.mix">
-    <choice>
-      <ref name="list.class"/>
-      <ref name="admon.class"/>
-      <ref name="para.class"/>
-      <ref name="ndxterm.class"/>
-      <ref name="local.highlights.mix"/>
-    </choice>
-  </define>
-  <!--
-    %formal.class; is explicitly excluded from many contexts in which
-    paragraphs are used
-  -->
-  <define name="local.para.mix">
-    <notAllowed/>
-  </define>
-  <define name="para.mix">
-    <choice>
-      <ref name="list.class"/>
-      <ref name="admon.class"/>
-      <ref name="linespecific.class"/>
-      <ref name="informal.class"/>
-      <ref name="formal.class"/>
-      <ref name="local.para.mix"/>
-    </choice>
-  </define>
-  <define name="local.admon.mix">
-    <notAllowed/>
-  </define>
-  <define name="admon.mix">
-    <choice>
-      <ref name="list.class"/>
-      <ref name="linespecific.class"/>
-      <ref name="synop.class"/>
-      <ref name="para.class"/>
-      <ref name="informal.class"/>
-      <ref name="formal.class"/>
-      <ref name="procedure"/>
-      <ref name="sidebar"/>
-      <ref name="anchor"/>
-      <ref name="bridgehead"/>
-      <ref name="remark"/>
-      <ref name="ndxterm.class"/>
-      <ref name="beginpage"/>
-      <ref name="forms.hook"/>
-      <ref name="local.admon.mix"/>
-    </choice>
-  </define>
-  <define name="local.figure.mix">
-    <notAllowed/>
-  </define>
-  <define name="figure.mix">
-    <choice>
-      <ref name="linespecific.class"/>
-      <ref name="synop.class"/>
-      <ref name="informal.class"/>
-      <ref name="ndxterm.class"/>
-      <ref name="beginpage"/>
-      <ref name="forms.hook"/>
-      <ref name="local.figure.mix"/>
-    </choice>
-  </define>
-  <define name="local.tabentry.mix">
-    <notAllowed/>
-  </define>
-  <define name="tabentry.mix">
-    <choice>
-      <ref name="list.class"/>
-      <ref name="admon.class"/>
-      <ref name="linespecific.class"/>
-      <ref name="para.class"/>
-      <ref name="graphic"/>
-      <ref name="mediaobject"/>
-      <ref name="forms.hook"/>
-      <ref name="local.tabentry.mix"/>
-    </choice>
-  </define>
-  <define name="local.glossdef.mix">
-    <notAllowed/>
-  </define>
-  <define name="glossdef.mix">
-    <choice>
-      <ref name="list.class"/>
-      <ref name="linespecific.class"/>
-      <ref name="synop.class"/>
-      <ref name="para.class"/>
-      <ref name="informal.class"/>
-      <ref name="formal.class"/>
-      <ref name="remark"/>
-      <ref name="ndxterm.class"/>
-      <ref name="beginpage"/>
-      <ref name="local.glossdef.mix"/>
-    </choice>
-  </define>
-  <define name="local.legalnotice.mix">
-    <notAllowed/>
-  </define>
-  <define name="legalnotice.mix">
-    <choice>
-      <ref name="list.class"/>
-      <ref name="admon.class"/>
-      <ref name="linespecific.class"/>
-      <ref name="para.class"/>
-      <ref name="blockquote"/>
-      <ref name="ndxterm.class"/>
-      <ref name="beginpage"/>
-      <ref name="local.legalnotice.mix"/>
-    </choice>
-  </define>
-  <define name="local.textobject.mix">
-    <notAllowed/>
-  </define>
-  <define name="textobject.mix">
-    <choice>
-      <ref name="list.class"/>
-      <ref name="admon.class"/>
-      <ref name="linespecific.class"/>
-      <ref name="para.class"/>
-      <ref name="blockquote"/>
-      <ref name="local.textobject.mix"/>
-    </choice>
-  </define>
-  <define name="local.mediaobject.mix">
-    <notAllowed/>
-  </define>
-  <define name="mediaobject.mix">
-    <choice>
-      <ref name="videoobject"/>
-      <ref name="audioobject"/>
-      <ref name="imageobject"/>
-      <ref name="imageobjectco"/>
-      <ref name="textobject"/>
-      <ref name="local.mediaobject.mix"/>
-    </choice>
-  </define>
-  <define name="local.listpreamble.mix">
-    <notAllowed/>
-  </define>
-  <define name="listpreamble.mix">
-    <choice>
-      <ref name="admon.class"/>
-      <ref name="linespecific.class"/>
-      <ref name="synop.class"/>
-      <ref name="para.class"/>
-      <ref name="informal.class"/>
-      <ref name="genobj.class"/>
-      <ref name="descobj.class"/>
-      <ref name="ndxterm.class"/>
-      <ref name="beginpage"/>
-      <ref name="forms.hook"/>
-      <ref name="local.listpreamble.mix"/>
-    </choice>
-  </define>
-  <!-- Character-level mixtures ............................................. -->
-  <!-- sgml.features -->
-  <!-- not [sgml.features[ -->
-  <!-- ]] not sgml.features -->
-  <!--
-                        #PCD xref word link cptr base dnfo othr inob (synop)
-    para.char.mix         X    X    X    X    X    X    X    X    X
-    title.char.mix        X    X    X    X    X    X    X    X    X
-    ndxterm.char.mix      X    X    X    X    X    X    X    X    a
-    cptr.char.mix         X              X    X    X         X    a
-    smallcptr.char.mix    X                   b                   a
-    word.char.mix         X         c    X         X         X    a
-    docinfo.char.mix      X         d    X    b              X    a
-    
-    a. Just InlineGraphic; no InlineEquation.
-    b. Just Replaceable; no other computer terms.
-    c. Just Emphasis and Trademark; no other word elements.
-    d. Just Acronym, Emphasis, and Trademark; no other word elements.
-  -->
-  <define name="local.para.char.mix">
-    <notAllowed/>
-  </define>
-  <define name="para.char.mix">
-    <choice>
-      <text/>
-      <ref name="xref.char.class"/>
-      <ref name="gen.char.class"/>
-      <ref name="link.char.class"/>
-      <ref name="tech.char.class"/>
-      <ref name="base.char.class"/>
-      <ref name="docinfo.char.class"/>
-      <ref name="other.char.class"/>
-      <ref name="inlineobj.char.class"/>
-      <ref name="synop.class"/>
-      <ref name="ndxterm.class"/>
-      <ref name="beginpage"/>
-      <ref name="forminlines.hook"/>
-      <ref name="local.para.char.mix"/>
-    </choice>
-  </define>
-  <define name="local.title.char.mix">
-    <notAllowed/>
-  </define>
-  <define name="title.char.mix">
-    <choice>
-      <text/>
-      <ref name="xref.char.class"/>
-      <ref name="gen.char.class"/>
-      <ref name="link.char.class"/>
-      <ref name="tech.char.class"/>
-      <ref name="base.char.class"/>
-      <ref name="docinfo.char.class"/>
-      <ref name="other.char.class"/>
-      <ref name="inlineobj.char.class"/>
-      <ref name="ndxterm.class"/>
-      <ref name="local.title.char.mix"/>
-    </choice>
-  </define>
-  <define name="local.ndxterm.char.mix">
-    <notAllowed/>
-  </define>
-  <define name="ndxterm.char.mix">
-    <choice>
-      <text/>
-      <ref name="xref.char.class"/>
-      <ref name="gen.char.class"/>
-      <ref name="link.char.class"/>
-      <ref name="tech.char.class"/>
-      <ref name="base.char.class"/>
-      <ref name="docinfo.char.class"/>
-      <ref name="other.char.class"/>
-      <ref name="inlinegraphic"/>
-      <ref name="inlinemediaobject"/>
-      <ref name="local.ndxterm.char.mix"/>
-    </choice>
-  </define>
-  <define name="local.cptr.char.mix">
-    <notAllowed/>
-  </define>
-  <define name="cptr.char.mix">
-    <choice>
-      <text/>
-      <ref name="link.char.class"/>
-      <ref name="tech.char.class"/>
-      <ref name="base.char.class"/>
-      <ref name="other.char.class"/>
-      <ref name="inlinegraphic"/>
-      <ref name="inlinemediaobject"/>
-      <ref name="ndxterm.class"/>
-      <ref name="beginpage"/>
-      <ref name="local.cptr.char.mix"/>
-    </choice>
-  </define>
-  <define name="local.smallcptr.char.mix">
-    <notAllowed/>
-  </define>
-  <define name="smallcptr.char.mix">
-    <choice>
-      <text/>
-      <ref name="replaceable"/>
-      <ref name="inlinegraphic"/>
-      <ref name="inlinemediaobject"/>
-      <ref name="ndxterm.class"/>
-      <ref name="beginpage"/>
-      <ref name="local.smallcptr.char.mix"/>
-    </choice>
-  </define>
-  <define name="local.word.char.mix">
-    <notAllowed/>
-  </define>
-  <define name="word.char.mix">
-    <choice>
-      <text/>
-      <ref name="acronym"/>
-      <ref name="emphasis"/>
-      <ref name="trademark"/>
-      <ref name="link.char.class"/>
-      <ref name="base.char.class"/>
-      <ref name="other.char.class"/>
-      <ref name="inlinegraphic"/>
-      <ref name="inlinemediaobject"/>
-      <ref name="ndxterm.class"/>
-      <ref name="beginpage"/>
-      <ref name="local.word.char.mix"/>
-    </choice>
-  </define>
-  <define name="local.docinfo.char.mix">
-    <notAllowed/>
-  </define>
-  <define name="docinfo.char.mix">
-    <choice>
-      <text/>
-      <ref name="link.char.class"/>
-      <ref name="emphasis"/>
-      <ref name="trademark"/>
-      <ref name="replaceable"/>
-      <ref name="other.char.class"/>
-      <ref name="inlinegraphic"/>
-      <ref name="inlinemediaobject"/>
-      <ref name="ndxterm.class"/>
-      <ref name="local.docinfo.char.mix"/>
-    </choice>
-  </define>
-  <!-- ENTITY % bibliocomponent.mix (see Bibliographic section, below) -->
-  <!-- ENTITY % person.ident.mix (see Bibliographic section, below) -->
-  <!-- ...................................................................... -->
-  <!-- Entities for attributes and attribute components ..................... -->
-  <!-- Effectivity attributes ............................................... -->
-  <!--
-    Arch: Computer or chip architecture to which element applies; no
-    default
-  -->
-  <define name="arch.attrib">
-    <optional>
-      <attribute name="arch"/>
-    </optional>
-  </define>
-  <!-- Condition: General-purpose effectivity attribute -->
-  <define name="condition.attrib">
-    <optional>
-      <attribute name="condition"/>
-    </optional>
-  </define>
-  <!-- Conformance: Standards conformance characteristics -->
-  <define name="conformance.attrib">
-    <optional>
-      <attribute name="conformance">
-        <data type="NMTOKENS"/>
-      </attribute>
-    </optional>
-  </define>
-  <!-- OS: Operating system to which element applies; no default -->
-  <define name="os.attrib">
-    <optional>
-      <attribute name="os"/>
-    </optional>
-  </define>
-  <!-- Revision: Editorial revision to which element belongs; no default -->
-  <define name="revision.attrib">
-    <optional>
-      <attribute name="revision"/>
-    </optional>
-  </define>
-  <!-- Security: Security classification; no default -->
-  <define name="security.attrib">
-    <optional>
-      <attribute name="security"/>
-    </optional>
-  </define>
-  <!--
-    UserLevel: Level of user experience to which element applies; no
-    default
-  -->
-  <define name="userlevel.attrib">
-    <optional>
-      <attribute name="userlevel"/>
-    </optional>
-  </define>
-  <!-- Vendor: Computer vendor to which element applies; no default -->
-  <define name="vendor.attrib">
-    <optional>
-      <attribute name="vendor"/>
-    </optional>
-  </define>
-  <!-- Wordsize: Computer word size (32 bit, 64 bit, etc.); no default -->
-  <define name="wordsize.attrib">
-    <optional>
-      <attribute name="wordsize"/>
-    </optional>
-  </define>
-  <define name="local.effectivity.attrib">
-    <empty/>
-  </define>
-  <define name="effectivity.attrib">
-    <ref name="arch.attrib"/>
-    <ref name="condition.attrib"/>
-    <ref name="conformance.attrib"/>
-    <ref name="os.attrib"/>
-    <ref name="revision.attrib"/>
-    <ref name="security.attrib"/>
-    <ref name="userlevel.attrib"/>
-    <ref name="vendor.attrib"/>
-    <ref name="wordsize.attrib"/>
-    <ref name="local.effectivity.attrib"/>
-  </define>
-  <!-- Common attributes .................................................... -->
-  <!-- Id: Unique identifier of element; no default -->
-  <define name="id.attrib">
-    <optional>
-      <attribute name="id">
-        <data type="ID"/>
-      </attribute>
-    </optional>
-  </define>
-  <!--
-    Id: Unique identifier of element; a value must be supplied; no
-    default
-  -->
-  <define name="idreq.attrib">
-    <attribute name="id">
-      <data type="ID"/>
-    </attribute>
-  </define>
-  <!--
-    Lang: Indicator of language in which element is written, for
-    translation, character set management, etc.; no default
-  -->
-  <define name="lang.attrib">
-    <optional>
-      <attribute name="lang"/>
-    </optional>
-  </define>
-  <!-- Remap: Previous role of element before conversion; no default -->
-  <define name="remap.attrib">
-    <optional>
-      <attribute name="remap"/>
-    </optional>
-  </define>
-  <!-- Role: New role of element in local environment; no default -->
-  <define name="role.attrib">
-    <optional>
-      <attribute name="role"/>
-    </optional>
-  </define>
-  <!--
-    XRefLabel: Alternate labeling string for XRef text generation;
-    default is usually title or other appropriate label text already
-    contained in element
-  -->
-  <define name="xreflabel.attrib">
-    <optional>
-      <attribute name="xreflabel"/>
-    </optional>
-  </define>
-  <!--
-    RevisionFlag: Revision status of element; default is that element
-    wasn't revised
-  -->
-  <define name="revisionflag.attrib">
-    <optional>
-      <attribute name="revisionflag">
-        <choice>
-          <value>changed</value>
-          <value>added</value>
-          <value>deleted</value>
-          <value>off</value>
-        </choice>
-      </attribute>
-    </optional>
-  </define>
-  <define name="local.common.attrib">
-    <empty/>
-  </define>
-  <!-- dir: Bidirectional override -->
-  <define name="dir.attrib">
-    <optional>
-      <attribute name="dir">
-        <choice>
-          <value>ltr</value>
-          <value>rtl</value>
-          <value>lro</value>
-          <value>rlo</value>
-        </choice>
-      </attribute>
-    </optional>
-  </define>
-  <!-- xml:base: base URI -->
-  <define name="xml-base.attrib">
-    <optional>
-      <attribute name="xml:base"/>
-    </optional>
-  </define>
-  <!-- Role is included explicitly on each element -->
-  <define name="common.attrib">
-    <ref name="id.attrib"/>
-    <ref name="lang.attrib"/>
-    <ref name="remap.attrib"/>
-    <ref name="xreflabel.attrib"/>
-    <ref name="revisionflag.attrib"/>
-    <ref name="effectivity.attrib"/>
-    <ref name="dir.attrib"/>
-    <ref name="xml-base.attrib"/>
-    <ref name="local.common.attrib"/>
-  </define>
-  <!-- Role is included explicitly on each element -->
-  <define name="idreq.common.attrib">
-    <ref name="idreq.attrib"/>
-    <ref name="lang.attrib"/>
-    <ref name="remap.attrib"/>
-    <ref name="xreflabel.attrib"/>
-    <ref name="revisionflag.attrib"/>
-    <ref name="effectivity.attrib"/>
-    <ref name="dir.attrib"/>
-    <ref name="xml-base.attrib"/>
-    <ref name="local.common.attrib"/>
-  </define>
-  <!-- Semi-common attributes and other attribute entities .................. -->
-  <define name="local.graphics.attrib">
-    <empty/>
-  </define>
-  <!--
-    EntityRef: Name of an external entity containing the content
-    of the graphic
-  -->
-  <!--
-    FileRef: Filename, qualified by a pathname if desired,
-    designating the file containing the content of the graphic
-  -->
-  <!-- Format: Notation of the element content, if any -->
-  <!-- SrcCredit: Information about the source of the Graphic -->
-  <!-- Width: Same as CALS reprowid (desired width) -->
-  <!-- Depth: Same as CALS reprodep (desired depth) -->
-  <!--
-    Align: Same as CALS hplace with 'none' removed; #IMPLIED means
-    application-specific
-  -->
-  <!-- Scale: Conflation of CALS hscale and vscale -->
-  <!-- Scalefit: Same as CALS scalefit -->
-  <define name="graphics.attrib">
-    <optional>
-      <attribute name="entityref">
-        <data type="ENTITY"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="fileref"/>
-    </optional>
-    <optional>
-      <attribute name="format">
-        <choice>
-          <ref name="notation.class"/>
-        </choice>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="srccredit"/>
-    </optional>
-    <optional>
-      <attribute name="width"/>
-    </optional>
-    <optional>
-      <attribute name="contentwidth"/>
-    </optional>
-    <optional>
-      <attribute name="depth"/>
-    </optional>
-    <optional>
-      <attribute name="contentdepth"/>
-    </optional>
-    <optional>
-      <attribute name="align">
-        <choice>
-          <value>left</value>
-          <value>right</value>
-          <value>center</value>
-        </choice>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="valign">
-        <choice>
-          <value>top</value>
-          <value>middle</value>
-          <value>bottom</value>
-        </choice>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="scale"/>
-    </optional>
-    <optional>
-      <attribute name="scalefit">
-        <ref name="yesorno.attvals"/>
-      </attribute>
-    </optional>
-    <ref name="local.graphics.attrib"/>
-  </define>
-  <define name="local.keyaction.attrib">
-    <empty/>
-  </define>
-  <!--
-    Action: Key combination type; default is unspecified if one
-    child element, Simul if there is more than one; if value is
-    Other, the OtherAction attribute must have a nonempty value
-  -->
-  <!-- OtherAction: User-defined key combination type -->
-  <define name="keyaction.attrib">
-    <optional>
-      <attribute name="action">
-        <choice>
-          <value>click</value>
-          <value>double-click</value>
-          <value>press</value>
-          <value>seq</value>
-          <value>simul</value>
-          <value>other</value>
-        </choice>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="otheraction"/>
-    </optional>
-    <ref name="local.keyaction.attrib"/>
-  </define>
-  <!--
-    Label: Identifying number or string; default is usually the
-    appropriate number or string autogenerated by a formatter
-  -->
-  <define name="label.attrib">
-    <optional>
-      <attribute name="label"/>
-    </optional>
-  </define>
-  <!-- xml:space: whitespace treatment -->
-  <define name="xml-space.attrib">
-    <optional>
-      <attribute name="xml:space">
-        <choice>
-          <value>preserve</value>
-        </choice>
-      </attribute>
-    </optional>
-  </define>
-  <!--
-    Format: whether element is assumed to contain significant white
-    space
-  -->
-  <define name="linespecific.attrib">
-    <optional>
-      <attribute name="format" a:defaultValue="linespecific">
-        <choice>
-          <value>linespecific</value>
-        </choice>
-      </attribute>
-    </optional>
-    <ref name="xml-space.attrib"/>
-    <optional>
-      <attribute name="linenumbering">
-        <choice>
-          <value>numbered</value>
-          <value>unnumbered</value>
-        </choice>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="continuation">
-        <choice>
-          <value>continues</value>
-          <value>restarts</value>
-        </choice>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="startinglinenumber"/>
-    </optional>
-    <optional>
-      <attribute name="language"/>
-    </optional>
-  </define>
-  <!-- Linkend: link to related information; no default -->
-  <define name="linkend.attrib">
-    <optional>
-      <attribute name="linkend">
-        <data type="IDREF"/>
-      </attribute>
-    </optional>
-  </define>
-  <!-- Linkend: required link to related information -->
-  <define name="linkendreq.attrib">
-    <attribute name="linkend">
-      <data type="IDREF"/>
-    </attribute>
-  </define>
-  <!--
-    Linkends: link to one or more sets of related information; no
-    default
-  -->
-  <define name="linkends.attrib">
-    <optional>
-      <attribute name="linkends">
-        <data type="IDREFS"/>
-      </attribute>
-    </optional>
-  </define>
-  <define name="local.mark.attrib">
-    <empty/>
-  </define>
-  <define name="mark.attrib">
-    <optional>
-      <attribute name="mark"/>
-    </optional>
-    <ref name="local.mark.attrib"/>
-  </define>
-  <!-- MoreInfo: whether element's content has an associated RefEntry -->
-  <define name="moreinfo.attrib">
-    <optional>
-      <attribute name="moreinfo" a:defaultValue="none">
-        <choice>
-          <value>refentry</value>
-          <value>none</value>
-        </choice>
-      </attribute>
-    </optional>
-  </define>
-  <!-- Pagenum: number of page on which element appears; no default -->
-  <define name="pagenum.attrib">
-    <optional>
-      <attribute name="pagenum"/>
-    </optional>
-  </define>
-  <define name="local.status.attrib">
-    <empty/>
-  </define>
-  <!--
-    Status: Editorial or publication status of the element
-    it applies to, such as "in review" or "approved for distribution"
-  -->
-  <define name="status.attrib">
-    <optional>
-      <attribute name="status"/>
-    </optional>
-    <ref name="local.status.attrib"/>
-  </define>
-  <!--
-    Width: width of the longest line in the element to which it
-    pertains, in number of characters
-  -->
-  <define name="width.attrib">
-    <optional>
-      <attribute name="width"/>
-    </optional>
-  </define>
-  <!-- ...................................................................... -->
-  <!-- Title elements ....................................................... -->
-  <define name="local.title.attrib">
-    <empty/>
-  </define>
-  <define name="title.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The text of the title of a section of a document or of a formal block-level element. -->
-  <define name="title">
-    <element name="title">
-      <ref name="title.attlist"/>
-      <zeroOrMore>
-        <ref name="title.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of title.element -->
-  <define name="title.attlist" combine="interleave">
-    <ref name="pagenum.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="title.role.attrib"/>
-    <ref name="local.title.attrib"/>
-  </define>
-  <!-- end of title.attlist -->
-  <!-- end of title.module -->
-  <define name="local.titleabbrev.attrib">
-    <empty/>
-  </define>
-  <define name="titleabbrev.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The abbreviation of a Title. -->
-  <define name="titleabbrev">
-    <element name="titleabbrev">
-      <ref name="titleabbrev.attlist"/>
-      <zeroOrMore>
-        <ref name="title.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of titleabbrev.element -->
-  <define name="titleabbrev.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="titleabbrev.role.attrib"/>
-    <ref name="local.titleabbrev.attrib"/>
-  </define>
-  <!-- end of titleabbrev.attlist -->
-  <!-- end of titleabbrev.module -->
-  <define name="local.subtitle.attrib">
-    <empty/>
-  </define>
-  <define name="subtitle.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The subtitle of a document. -->
-  <define name="subtitle">
-    <element name="subtitle">
-      <ref name="subtitle.attlist"/>
-      <zeroOrMore>
-        <ref name="title.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of subtitle.element -->
-  <define name="subtitle.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="subtitle.role.attrib"/>
-    <ref name="local.subtitle.attrib"/>
-  </define>
-  <!-- end of subtitle.attlist -->
-  <!-- end of subtitle.module -->
-  <!-- ...................................................................... -->
-  <!-- Bibliographic entities and elements .................................. -->
-  <!--
-    The bibliographic elements are typically used in the document
-    hierarchy. They do not appear in content models of information
-    pool elements.  See also the document information elements,
-    below.
-  -->
-  <define name="local.person.ident.mix">
-    <notAllowed/>
-  </define>
-  <define name="person.ident.mix">
-    <choice>
-      <ref name="honorific"/>
-      <ref name="firstname"/>
-      <ref name="surname"/>
-      <ref name="lineage"/>
-      <ref name="othername"/>
-      <ref name="affiliation"/>
-      <ref name="authorblurb"/>
-      <ref name="contrib"/>
-      <ref name="local.person.ident.mix"/>
-    </choice>
-  </define>
-  <define name="local.bibliocomponent.mix">
-    <notAllowed/>
-  </define>
-  <define name="bibliocomponent.mix">
-    <choice>
-      <ref name="abbrev"/>
-      <ref name="abstract"/>
-      <ref name="address"/>
-      <ref name="artpagenums"/>
-      <ref name="author"/>
-      <ref name="authorgroup"/>
-      <ref name="authorinitials"/>
-      <ref name="bibliomisc"/>
-      <ref name="biblioset"/>
-      <ref name="collab"/>
-      <ref name="confgroup"/>
-      <ref name="contractnum"/>
-      <ref name="contractsponsor"/>
-      <ref name="copyright"/>
-      <ref name="corpauthor"/>
-      <ref name="corpname"/>
-      <ref name="corpcredit"/>
-      <ref name="date"/>
-      <ref name="edition"/>
-      <ref name="editor"/>
-      <ref name="invpartnumber"/>
-      <ref name="isbn"/>
-      <ref name="issn"/>
-      <ref name="issuenum"/>
-      <ref name="orgname"/>
-      <ref name="biblioid"/>
-      <ref name="citebiblioid"/>
-      <ref name="bibliosource"/>
-      <ref name="bibliorelation"/>
-      <ref name="bibliocoverage"/>
-      <ref name="othercredit"/>
-      <ref name="pagenums"/>
-      <ref name="printhistory"/>
-      <ref name="productname"/>
-      <ref name="productnumber"/>
-      <ref name="pubdate"/>
-      <ref name="publisher"/>
-      <ref name="publishername"/>
-      <ref name="pubsnumber"/>
-      <ref name="releaseinfo"/>
-      <ref name="revhistory"/>
-      <ref name="seriesvolnums"/>
-      <ref name="subtitle"/>
-      <ref name="title"/>
-      <ref name="titleabbrev"/>
-      <ref name="volumenum"/>
-      <ref name="citetitle"/>
-      <ref name="personname"/>
-      <ref name="person.ident.mix"/>
-      <ref name="ndxterm.class"/>
-      <ref name="local.bibliocomponent.mix"/>
-    </choice>
-  </define>
-  <!-- I don't think this is well placed, but it needs to be here because of -->
-  <!-- the reference to bibliocomponent.mix -->
-  <define name="local.info.class">
-    <notAllowed/>
-  </define>
-  <define name="info.class">
-    <choice>
-      <ref name="graphic"/>
-      <ref name="mediaobject"/>
-      <ref name="legalnotice"/>
-      <ref name="modespec"/>
-      <ref name="subjectset"/>
-      <ref name="keywordset"/>
-      <ref name="itermset"/>
-      <ref name="bibliocomponent.mix"/>
-      <ref name="local.info.class"/>
-    </choice>
-  </define>
-  <!-- BiblioList ........................ -->
-  <define name="local.bibliolist.attrib">
-    <empty/>
-  </define>
-  <define name="bibliolist.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A wrapper for a set of bibliography entries. -->
-  <define name="bibliolist">
-    <element name="bibliolist">
-      <ref name="bibliolist.attlist"/>
-      <optional>
-        <ref name="blockinfo"/>
-      </optional>
-      <optional>
-        <ref name="formalobject.title.content"/>
-      </optional>
-      <oneOrMore>
-        <choice>
-          <ref name="biblioentry"/>
-          <ref name="bibliomixed"/>
-        </choice>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of bibliolist.element -->
-  <define name="bibliolist.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="bibliolist.role.attrib"/>
-    <ref name="local.bibliolist.attrib"/>
-  </define>
-  <!-- end of bibliolist.attlist -->
-  <!-- end of bibliolist.module -->
-  <define name="local.biblioentry.attrib">
-    <empty/>
-  </define>
-  <define name="biblioentry.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:An entry in a Bibliography. -->
-  <define name="biblioentry">
-    <element name="biblioentry">
-      <ref name="biblioentry.attlist"/>
-      <oneOrMore>
-        <choice>
-          <ref name="articleinfo"/>
-          <ref name="bibliocomponent.mix"/>
-        </choice>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of biblioentry.element -->
-  <define name="biblioentry.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="biblioentry.role.attrib"/>
-    <ref name="local.biblioentry.attrib"/>
-  </define>
-  <!-- end of biblioentry.attlist -->
-  <!-- end of biblioentry.module -->
-  <define name="local.bibliomixed.attrib">
-    <empty/>
-  </define>
-  <define name="bibliomixed.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:An entry in a Bibliography. -->
-  <define name="bibliomixed">
-    <element name="bibliomixed">
-      <ref name="bibliomixed.attlist"/>
-      <zeroOrMore>
-        <choice>
-          <text/>
-          <ref name="bibliocomponent.mix"/>
-          <ref name="bibliomset"/>
-        </choice>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of bibliomixed.element -->
-  <define name="bibliomixed.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="bibliomixed.role.attrib"/>
-    <ref name="local.bibliomixed.attrib"/>
-  </define>
-  <!-- end of bibliomixed.attlist -->
-  <!-- end of bibliomixed.module -->
-  <define name="local.articleinfo.attrib">
-    <empty/>
-  </define>
-  <define name="articleinfo.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:Meta-information for an Article. -->
-  <define name="articleinfo">
-    <element name="articleinfo">
-      <ref name="articleinfo.attlist"/>
-      <oneOrMore>
-        <ref name="info.class"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of articleinfo.element -->
-  <define name="articleinfo.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="articleinfo.role.attrib"/>
-    <ref name="local.articleinfo.attrib"/>
-  </define>
-  <!-- end of articleinfo.attlist -->
-  <!-- end of articleinfo.module -->
-  <define name="local.biblioset.attrib">
-    <empty/>
-  </define>
-  <define name="biblioset.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A "raw" container for related bibliographic information. -->
-  <define name="biblioset">
-    <element name="biblioset">
-      <ref name="biblioset.attlist"/>
-      <oneOrMore>
-        <ref name="bibliocomponent.mix"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of biblioset.element -->
-  <!-- Relation: Relationship of elements contained within BiblioSet -->
-  <define name="biblioset.attlist" combine="interleave">
-    <optional>
-      <attribute name="relation"/>
-    </optional>
-    <ref name="common.attrib"/>
-    <ref name="biblioset.role.attrib"/>
-    <ref name="local.biblioset.attrib"/>
-  </define>
-  <!-- end of biblioset.attlist -->
-  <!-- end of biblioset.module -->
-  <define name="bibliomset.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <define name="local.bibliomset.attrib">
-    <empty/>
-  </define>
-  <!-- doc:A "cooked" container for related bibliographic information. -->
-  <define name="bibliomset">
-    <element name="bibliomset">
-      <ref name="bibliomset.attlist"/>
-      <zeroOrMore>
-        <choice>
-          <text/>
-          <ref name="bibliocomponent.mix"/>
-          <ref name="bibliomset"/>
-        </choice>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of bibliomset.element -->
-  <!-- Relation: Relationship of elements contained within BiblioMSet -->
-  <define name="bibliomset.attlist" combine="interleave">
-    <optional>
-      <attribute name="relation"/>
-    </optional>
-    <ref name="common.attrib"/>
-    <ref name="bibliomset.role.attrib"/>
-    <ref name="local.bibliomset.attrib"/>
-  </define>
-  <!-- end of bibliomset.attlist -->
-  <!-- end of bibliomset.module -->
-  <define name="local.bibliomisc.attrib">
-    <empty/>
-  </define>
-  <define name="bibliomisc.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:Untyped bibliographic information. -->
-  <define name="bibliomisc">
-    <element name="bibliomisc">
-      <ref name="bibliomisc.attlist"/>
-      <zeroOrMore>
-        <ref name="para.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of bibliomisc.element -->
-  <define name="bibliomisc.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="bibliomisc.role.attrib"/>
-    <ref name="local.bibliomisc.attrib"/>
-  </define>
-  <!-- end of bibliomisc.attlist -->
-  <!-- end of bibliomisc.module -->
-  <!-- ...................................................................... -->
-  <!-- Subject, Keyword, and ITermSet elements .............................. -->
-  <define name="local.subjectset.attrib">
-    <empty/>
-  </define>
-  <define name="subjectset.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A set of terms describing the subject matter of a document. -->
-  <define name="subjectset">
-    <element name="subjectset">
-      <ref name="subjectset.attlist"/>
-      <oneOrMore>
-        <ref name="subject"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of subjectset.element -->
-  <!-- Scheme: Controlled vocabulary employed in SubjectTerms -->
-  <define name="subjectset.attlist" combine="interleave">
-    <optional>
-      <attribute name="scheme">
-        <data type="NMTOKEN"/>
-      </attribute>
-    </optional>
-    <ref name="common.attrib"/>
-    <ref name="subjectset.role.attrib"/>
-    <ref name="local.subjectset.attrib"/>
-  </define>
-  <!-- end of subjectset.attlist -->
-  <!-- end of subjectset.module -->
-  <define name="local.subject.attrib">
-    <empty/>
-  </define>
-  <define name="subject.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:One of a group of terms describing the subject matter of a document. -->
-  <define name="subject">
-    <element name="subject">
-      <ref name="subject.attlist"/>
-      <oneOrMore>
-        <ref name="subjectterm"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of subject.element -->
-  <!--
-    Weight: Ranking of this group of SubjectTerms relative
-    to others, 0 is low, no highest value specified
-  -->
-  <define name="subject.attlist" combine="interleave">
-    <optional>
-      <attribute name="weight"/>
-    </optional>
-    <ref name="common.attrib"/>
-    <ref name="subject.role.attrib"/>
-    <ref name="local.subject.attrib"/>
-  </define>
-  <!-- end of subject.attlist -->
-  <!-- end of subject.module -->
-  <define name="local.subjectterm.attrib">
-    <empty/>
-  </define>
-  <define name="subjectterm.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A term in a group of terms describing the subject matter of a document. -->
-  <define name="subjectterm">
-    <element name="subjectterm">
-      <ref name="subjectterm.attlist"/>
-      <text/>
-    </element>
-  </define>
-  <!-- end of subjectterm.element -->
-  <define name="subjectterm.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="subjectterm.role.attrib"/>
-    <ref name="local.subjectterm.attrib"/>
-  </define>
-  <!-- end of subjectterm.attlist -->
-  <!-- end of subjectterm.module -->
-  <!-- end of subjectset.content.module -->
-  <define name="local.keywordset.attrib">
-    <empty/>
-  </define>
-  <define name="keywordset.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A set of keywords describing the content of a document. -->
-  <define name="keywordset">
-    <element name="keywordset">
-      <ref name="keywordset.attlist"/>
-      <oneOrMore>
-        <ref name="keyword"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of keywordset.element -->
-  <define name="keywordset.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="keywordset.role.attrib"/>
-    <ref name="local.keywordset.attrib"/>
-  </define>
-  <!-- end of keywordset.attlist -->
-  <!-- end of keywordset.module -->
-  <define name="local.keyword.attrib">
-    <empty/>
-  </define>
-  <define name="keyword.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:One of a set of keywords describing the content of a document. -->
-  <define name="keyword">
-    <element name="keyword">
-      <ref name="keyword.attlist"/>
-      <text/>
-    </element>
-  </define>
-  <!-- end of keyword.element -->
-  <define name="keyword.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="keyword.role.attrib"/>
-    <ref name="local.keyword.attrib"/>
-  </define>
-  <!-- end of keyword.attlist -->
-  <!-- end of keyword.module -->
-  <!-- end of keywordset.content.module -->
-  <define name="local.itermset.attrib">
-    <empty/>
-  </define>
-  <define name="itermset.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A set of index terms in the meta-information of a document. -->
-  <define name="itermset">
-    <element name="itermset">
-      <ref name="itermset.attlist"/>
-      <oneOrMore>
-        <ref name="indexterm"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of itermset.element -->
-  <define name="itermset.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="itermset.role.attrib"/>
-    <ref name="local.itermset.attrib"/>
-  </define>
-  <!-- end of itermset.attlist -->
-  <!-- end of itermset.module -->
-  <!-- Bibliographic info for "blocks" -->
-  <define name="local.blockinfo.attrib">
-    <empty/>
-  </define>
-  <define name="blockinfo.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:Meta-information for a block element. -->
-  <define name="blockinfo">
-    <element name="blockinfo">
-      <ref name="blockinfo.attlist"/>
-      <oneOrMore>
-        <ref name="info.class"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of blockinfo.element -->
-  <define name="blockinfo.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="blockinfo.role.attrib"/>
-    <ref name="local.blockinfo.attrib"/>
-  </define>
-  <!-- end of blockinfo.attlist -->
-  <!-- end of blockinfo.module -->
-  <!-- ...................................................................... -->
-  <!-- Compound (section-ish) elements ...................................... -->
-  <!-- Message set ...................... -->
-  <define name="local.msgset.attrib">
-    <empty/>
-  </define>
-  <define name="msgset.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A detailed set of messages, usually error messages. -->
-  <define name="msgset">
-    <element name="msgset">
-      <ref name="msgset.attlist"/>
-      <optional>
-        <ref name="blockinfo"/>
-      </optional>
-      <optional>
-        <ref name="formalobject.title.content"/>
-      </optional>
-      <choice>
-        <oneOrMore>
-          <ref name="msgentry"/>
-        </oneOrMore>
-        <oneOrMore>
-          <ref name="simplemsgentry"/>
-        </oneOrMore>
-      </choice>
-    </element>
-  </define>
-  <!-- end of msgset.element -->
-  <define name="msgset.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="msgset.role.attrib"/>
-    <ref name="local.msgset.attrib"/>
-  </define>
-  <!-- end of msgset.attlist -->
-  <!-- end of msgset.module -->
-  <define name="local.msgentry.attrib">
-    <empty/>
-  </define>
-  <define name="msgentry.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A wrapper for an entry in a message set. -->
-  <define name="msgentry">
-    <element name="msgentry">
-      <ref name="msgentry.attlist"/>
-      <oneOrMore>
-        <ref name="msg"/>
-      </oneOrMore>
-      <optional>
-        <ref name="msginfo"/>
-      </optional>
-      <zeroOrMore>
-        <ref name="msgexplan"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of msgentry.element -->
-  <define name="msgentry.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="msgentry.role.attrib"/>
-    <ref name="local.msgentry.attrib"/>
-  </define>
-  <!-- end of msgentry.attlist -->
-  <!-- end of msgentry.module -->
-  <define name="local.simplemsgentry.attrib">
-    <empty/>
-  </define>
-  <define name="simplemsgentry.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A wrapper for a simpler entry in a message set. -->
-  <define name="simplemsgentry">
-    <element name="simplemsgentry">
-      <ref name="simplemsgentry.attlist"/>
-      <ref name="msgtext"/>
-      <oneOrMore>
-        <ref name="msgexplan"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of simplemsgentry.element -->
-  <define name="simplemsgentry.attlist" combine="interleave">
-    <optional>
-      <attribute name="audience"/>
-    </optional>
-    <optional>
-      <attribute name="level"/>
-    </optional>
-    <optional>
-      <attribute name="origin"/>
-    </optional>
-    <ref name="common.attrib"/>
-    <ref name="simplemsgentry.role.attrib"/>
-    <ref name="local.simplemsgentry.attrib"/>
-  </define>
-  <!-- end of simplemsgentry.attlist -->
-  <!-- end of simplemsgentry.module -->
-  <define name="local.msg.attrib">
-    <empty/>
-  </define>
-  <define name="msg.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A message in a message set. -->
-  <define name="msg">
-    <element name="msg">
-      <ref name="msg.attlist"/>
-      <optional>
-        <ref name="title"/>
-      </optional>
-      <ref name="msgmain"/>
-      <zeroOrMore>
-        <choice>
-          <ref name="msgsub"/>
-          <ref name="msgrel"/>
-        </choice>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of msg.element -->
-  <define name="msg.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="msg.role.attrib"/>
-    <ref name="local.msg.attrib"/>
-  </define>
-  <!-- end of msg.attlist -->
-  <!-- end of msg.module -->
-  <define name="local.msgmain.attrib">
-    <empty/>
-  </define>
-  <define name="msgmain.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The primary component of a message in a message set. -->
-  <define name="msgmain">
-    <element name="msgmain">
-      <ref name="msgmain.attlist"/>
-      <optional>
-        <ref name="title"/>
-      </optional>
-      <ref name="msgtext"/>
-    </element>
-  </define>
-  <!-- end of msgmain.element -->
-  <define name="msgmain.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="msgmain.role.attrib"/>
-    <ref name="local.msgmain.attrib"/>
-  </define>
-  <!-- end of msgmain.attlist -->
-  <!-- end of msgmain.module -->
-  <define name="local.msgsub.attrib">
-    <empty/>
-  </define>
-  <define name="msgsub.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A subcomponent of a message in a message set. -->
-  <define name="msgsub">
-    <element name="msgsub">
-      <ref name="msgsub.attlist"/>
-      <optional>
-        <ref name="title"/>
-      </optional>
-      <ref name="msgtext"/>
-    </element>
-  </define>
-  <!-- end of msgsub.element -->
-  <define name="msgsub.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="msgsub.role.attrib"/>
-    <ref name="local.msgsub.attrib"/>
-  </define>
-  <!-- end of msgsub.attlist -->
-  <!-- end of msgsub.module -->
-  <define name="local.msgrel.attrib">
-    <empty/>
-  </define>
-  <define name="msgrel.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A related component of a message in a message set. -->
-  <define name="msgrel">
-    <element name="msgrel">
-      <ref name="msgrel.attlist"/>
-      <optional>
-        <ref name="title"/>
-      </optional>
-      <ref name="msgtext"/>
-    </element>
-  </define>
-  <!-- end of msgrel.element -->
-  <define name="msgrel.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="msgrel.role.attrib"/>
-    <ref name="local.msgrel.attrib"/>
-  </define>
-  <!-- end of msgrel.attlist -->
-  <!-- end of msgrel.module -->
-  <!--  MsgText (defined in the Inlines section, below) -->
-  <define name="local.msginfo.attrib">
-    <empty/>
-  </define>
-  <define name="msginfo.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:Information about a message in a message set. -->
-  <define name="msginfo">
-    <element name="msginfo">
-      <ref name="msginfo.attlist"/>
-      <zeroOrMore>
-        <choice>
-          <ref name="msglevel"/>
-          <ref name="msgorig"/>
-          <ref name="msgaud"/>
-        </choice>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of msginfo.element -->
-  <define name="msginfo.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="msginfo.role.attrib"/>
-    <ref name="local.msginfo.attrib"/>
-  </define>
-  <!-- end of msginfo.attlist -->
-  <!-- end of msginfo.module -->
-  <define name="local.msglevel.attrib">
-    <empty/>
-  </define>
-  <define name="msglevel.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The level of importance or severity of a message in a message set. -->
-  <define name="msglevel">
-    <element name="msglevel">
-      <ref name="msglevel.attlist"/>
-      <zeroOrMore>
-        <ref name="smallcptr.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of msglevel.element -->
-  <define name="msglevel.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="msglevel.role.attrib"/>
-    <ref name="local.msglevel.attrib"/>
-  </define>
-  <!-- end of msglevel.attlist -->
-  <!-- end of msglevel.module -->
-  <define name="local.msgorig.attrib">
-    <empty/>
-  </define>
-  <define name="msgorig.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The origin of a message in a message set. -->
-  <define name="msgorig">
-    <element name="msgorig">
-      <ref name="msgorig.attlist"/>
-      <zeroOrMore>
-        <ref name="smallcptr.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of msgorig.element -->
-  <define name="msgorig.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="msgorig.role.attrib"/>
-    <ref name="local.msgorig.attrib"/>
-  </define>
-  <!-- end of msgorig.attlist -->
-  <!-- end of msgorig.module -->
-  <define name="local.msgaud.attrib">
-    <empty/>
-  </define>
-  <define name="msgaud.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The audience to which a message in a message set is relevant. -->
-  <define name="msgaud">
-    <element name="msgaud">
-      <ref name="msgaud.attlist"/>
-      <zeroOrMore>
-        <ref name="para.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of msgaud.element -->
-  <define name="msgaud.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="msgaud.role.attrib"/>
-    <ref name="local.msgaud.attrib"/>
-  </define>
-  <!-- end of msgaud.attlist -->
-  <!-- end of msgaud.module -->
-  <define name="local.msgexplan.attrib">
-    <empty/>
-  </define>
-  <define name="msgexplan.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:Explanatory material relating to a message in a message set. -->
-  <define name="msgexplan">
-    <element name="msgexplan">
-      <ref name="msgexplan.attlist"/>
-      <optional>
-        <ref name="title"/>
-      </optional>
-      <oneOrMore>
-        <ref name="component.mix"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of msgexplan.element -->
-  <define name="msgexplan.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="msgexplan.role.attrib"/>
-    <ref name="local.msgexplan.attrib"/>
-  </define>
-  <!-- end of msgexplan.attlist -->
-  <!-- end of msgexplan.module -->
-  <!-- end of msgset.content.module -->
-  <define name="local.task.attrib">
-    <empty/>
-  </define>
-  <define name="task.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A task to be completed. -->
-  <define name="task">
-    <element name="task">
-      <ref name="task.attlist"/>
-      <optional>
-        <ref name="blockinfo"/>
-      </optional>
-      <zeroOrMore>
-        <ref name="ndxterm.class"/>
-      </zeroOrMore>
-      <ref name="formalobject.title.content"/>
-      <optional>
-        <ref name="tasksummary"/>
-      </optional>
-      <optional>
-        <ref name="taskprerequisites"/>
-      </optional>
-      <ref name="procedure"/>
-      <zeroOrMore>
-        <ref name="example"/>
-      </zeroOrMore>
-      <optional>
-        <ref name="taskrelated"/>
-      </optional>
-    </element>
-  </define>
-  <!-- end of task.element -->
-  <define name="task.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="task.role.attrib"/>
-    <ref name="local.task.attrib"/>
-  </define>
-  <!-- end of task.attlist -->
-  <!-- end of task.module -->
-  <define name="local.tasksummary.attrib">
-    <empty/>
-  </define>
-  <define name="tasksummary.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A summary of a task. -->
-  <define name="tasksummary">
-    <element name="tasksummary">
-      <ref name="tasksummary.attlist"/>
-      <optional>
-        <ref name="blockinfo"/>
-      </optional>
-      <optional>
-        <ref name="formalobject.title.content"/>
-      </optional>
-      <oneOrMore>
-        <ref name="component.mix"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of tasksummary.element -->
-  <define name="tasksummary.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="tasksummary.role.attrib"/>
-    <ref name="local.tasksummary.attrib"/>
-  </define>
-  <!-- end of tasksummary.attlist -->
-  <!-- end of tasksummary.module -->
-  <define name="local.taskprerequisites.attrib">
-    <empty/>
-  </define>
-  <define name="taskprerequisites.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The prerequisites for a task. -->
-  <define name="taskprerequisites">
-    <element name="taskprerequisites">
-      <ref name="taskprerequisites.attlist"/>
-      <optional>
-        <ref name="blockinfo"/>
-      </optional>
-      <optional>
-        <ref name="formalobject.title.content"/>
-      </optional>
-      <oneOrMore>
-        <ref name="component.mix"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of taskprerequisites.element -->
-  <define name="taskprerequisites.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="taskprerequisites.role.attrib"/>
-    <ref name="local.taskprerequisites.attrib"/>
-  </define>
-  <!-- end of taskprerequisites.attlist -->
-  <!-- end of taskprerequisites.module -->
-  <define name="local.taskrelated.attrib">
-    <empty/>
-  </define>
-  <define name="taskrelated.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:Information related to a task. -->
-  <define name="taskrelated">
-    <element name="taskrelated">
-      <ref name="taskrelated.attlist"/>
-      <optional>
-        <ref name="blockinfo"/>
-      </optional>
-      <optional>
-        <ref name="formalobject.title.content"/>
-      </optional>
-      <oneOrMore>
-        <ref name="component.mix"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of taskrelated.element -->
-  <define name="taskrelated.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="taskrelated.role.attrib"/>
-    <ref name="local.taskrelated.attrib"/>
-  </define>
-  <!-- end of taskrelated.attlist -->
-  <!-- end of taskrelated.module -->
-  <!-- end of task.content.module -->
-  <!-- QandASet ........................ -->
-  <define name="local.qandaset.attrib">
-    <empty/>
-  </define>
-  <define name="qandaset.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A question-and-answer set. -->
-  <define name="qandaset">
-    <element name="qandaset">
-      <ref name="qandaset.attlist"/>
-      <optional>
-        <ref name="blockinfo"/>
-      </optional>
-      <optional>
-        <ref name="formalobject.title.content"/>
-      </optional>
-      <zeroOrMore>
-        <ref name="qandaset.mix"/>
-      </zeroOrMore>
-      <choice>
-        <oneOrMore>
-          <ref name="qandadiv"/>
-        </oneOrMore>
-        <oneOrMore>
-          <ref name="qandaentry"/>
-        </oneOrMore>
-      </choice>
-    </element>
-  </define>
-  <!-- end of qandaset.element -->
-  <define name="qandaset.attlist" combine="interleave">
-    <optional>
-      <attribute name="defaultlabel">
-        <choice>
-          <value>qanda</value>
-          <value>number</value>
-          <value>none</value>
-        </choice>
-      </attribute>
-    </optional>
-    <ref name="common.attrib"/>
-    <ref name="qandaset.role.attrib"/>
-    <ref name="local.qandaset.attrib"/>
-  </define>
-  <!-- end of qandaset.attlist -->
-  <!-- end of qandaset.module -->
-  <define name="local.qandadiv.attrib">
-    <empty/>
-  </define>
-  <define name="qandadiv.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A titled division in a QandASet. -->
-  <define name="qandadiv">
-    <element name="qandadiv">
-      <ref name="qandadiv.attlist"/>
-      <optional>
-        <ref name="blockinfo"/>
-      </optional>
-      <optional>
-        <ref name="formalobject.title.content"/>
-      </optional>
-      <zeroOrMore>
-        <ref name="qandaset.mix"/>
-      </zeroOrMore>
-      <choice>
-        <oneOrMore>
-          <ref name="qandadiv"/>
-        </oneOrMore>
-        <oneOrMore>
-          <ref name="qandaentry"/>
-        </oneOrMore>
-      </choice>
-    </element>
-  </define>
-  <!-- end of qandadiv.element -->
-  <define name="qandadiv.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="qandadiv.role.attrib"/>
-    <ref name="local.qandadiv.attrib"/>
-  </define>
-  <!-- end of qandadiv.attlist -->
-  <!-- end of qandadiv.module -->
-  <define name="local.qandaentry.attrib">
-    <empty/>
-  </define>
-  <define name="qandaentry.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A question/answer set within a QandASet. -->
-  <define name="qandaentry">
-    <element name="qandaentry">
-      <ref name="qandaentry.attlist"/>
-      <optional>
-        <ref name="blockinfo"/>
-      </optional>
-      <optional>
-        <ref name="revhistory"/>
-      </optional>
-      <ref name="question"/>
-      <zeroOrMore>
-        <ref name="answer"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of qandaentry.element -->
-  <define name="qandaentry.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="qandaentry.role.attrib"/>
-    <ref name="local.qandaentry.attrib"/>
-  </define>
-  <!-- end of qandaentry.attlist -->
-  <!-- end of qandaentry.module -->
-  <define name="local.question.attrib">
-    <empty/>
-  </define>
-  <define name="question.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A question in a QandASet. -->
-  <define name="question">
-    <element name="question">
-      <ref name="question.attlist"/>
-      <optional>
-        <ref name="label"/>
-      </optional>
-      <oneOrMore>
-        <ref name="qandaset.mix"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of question.element -->
-  <define name="question.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="question.role.attrib"/>
-    <ref name="local.question.attrib"/>
-  </define>
-  <!-- end of question.attlist -->
-  <!-- end of question.module -->
-  <define name="local.answer.attrib">
-    <empty/>
-  </define>
-  <define name="answer.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:An answer to a question posed in a QandASet. -->
-  <define name="answer">
-    <element name="answer">
-      <ref name="answer.attlist"/>
-      <optional>
-        <ref name="label"/>
-      </optional>
-      <zeroOrMore>
-        <ref name="qandaset.mix"/>
-      </zeroOrMore>
-      <zeroOrMore>
-        <ref name="qandaentry"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of answer.element -->
-  <define name="answer.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="answer.role.attrib"/>
-    <ref name="local.answer.attrib"/>
-  </define>
-  <!-- end of answer.attlist -->
-  <!-- end of answer.module -->
-  <define name="local.label.attrib">
-    <empty/>
-  </define>
-  <define name="label.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A label on a Question or Answer. -->
-  <define name="label">
-    <element name="label">
-      <ref name="label.attlist"/>
-      <zeroOrMore>
-        <ref name="word.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of label.element -->
-  <define name="label.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="label.role.attrib"/>
-    <ref name="local.label.attrib"/>
-  </define>
-  <!-- end of label.attlist -->
-  <!-- end of label.module -->
-  <!-- end of qandaset.content.module -->
-  <!-- Procedure ........................ -->
-  <define name="local.procedure.attrib">
-    <empty/>
-  </define>
-  <define name="procedure.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A list of operations to be performed in a well-defined sequence. -->
-  <define name="procedure">
-    <element name="procedure">
-      <ref name="procedure.attlist"/>
-      <optional>
-        <ref name="blockinfo"/>
-      </optional>
-      <optional>
-        <ref name="formalobject.title.content"/>
-      </optional>
-      <zeroOrMore>
-        <ref name="component.mix"/>
-      </zeroOrMore>
-      <oneOrMore>
-        <ref name="step"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of procedure.element -->
-  <define name="procedure.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="procedure.role.attrib"/>
-    <ref name="local.procedure.attrib"/>
-  </define>
-  <!-- end of procedure.attlist -->
-  <!-- end of procedure.module -->
-  <define name="local.step.attrib">
-    <empty/>
-  </define>
-  <define name="step.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A unit of action in a procedure. -->
-  <define name="step">
-    <element name="step">
-      <ref name="step.attlist"/>
-      <optional>
-        <ref name="title"/>
-      </optional>
-      <choice>
-        <group>
-          <oneOrMore>
-            <ref name="component.mix"/>
-          </oneOrMore>
-          <optional>
-            <choice>
-              <ref name="substeps"/>
-              <ref name="stepalternatives"/>
-            </choice>
-            <zeroOrMore>
-              <ref name="component.mix"/>
-            </zeroOrMore>
-          </optional>
-        </group>
-        <group>
-          <choice>
-            <ref name="substeps"/>
-            <ref name="stepalternatives"/>
-          </choice>
-          <zeroOrMore>
-            <ref name="component.mix"/>
-          </zeroOrMore>
-        </group>
-      </choice>
-    </element>
-  </define>
-  <!-- end of step.element -->
-  <!-- Performance: Whether the Step must be performed -->
-  <!-- not #REQUIRED! -->
-  <define name="step.attlist" combine="interleave">
-    <optional>
-      <attribute name="performance" a:defaultValue="required">
-        <choice>
-          <value>optional</value>
-          <value>required</value>
-        </choice>
-      </attribute>
-    </optional>
-    <ref name="common.attrib"/>
-    <ref name="step.role.attrib"/>
-    <ref name="local.step.attrib"/>
-  </define>
-  <!-- end of step.attlist -->
-  <!-- end of step.module -->
-  <define name="local.substeps.attrib">
-    <empty/>
-  </define>
-  <define name="substeps.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A wrapper for steps that occur within steps in a procedure. -->
-  <define name="substeps">
-    <element name="substeps">
-      <ref name="substeps.attlist"/>
-      <oneOrMore>
-        <ref name="step"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of substeps.element -->
-  <!-- Performance: whether entire set of substeps must be performed -->
-  <!-- not #REQUIRED! -->
-  <define name="substeps.attlist" combine="interleave">
-    <optional>
-      <attribute name="performance" a:defaultValue="required">
-        <choice>
-          <value>optional</value>
-          <value>required</value>
-        </choice>
-      </attribute>
-    </optional>
-    <ref name="common.attrib"/>
-    <ref name="substeps.role.attrib"/>
-    <ref name="local.substeps.attrib"/>
-  </define>
-  <!-- end of substeps.attlist -->
-  <!-- end of substeps.module -->
-  <define name="local.stepalternatives.attrib">
-    <empty/>
-  </define>
-  <define name="stepalternatives.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:Alternative steps in a procedure. -->
-  <define name="stepalternatives">
-    <element name="stepalternatives">
-      <ref name="stepalternatives.attlist"/>
-      <oneOrMore>
-        <ref name="step"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of stepalternatives.element -->
-  <!-- Performance: Whether (one of) the alternatives must be performed -->
-  <!-- not #REQUIRED! -->
-  <define name="stepalternatives.attlist" combine="interleave">
-    <optional>
-      <attribute name="performance" a:defaultValue="required">
-        <choice>
-          <value>optional</value>
-          <value>required</value>
-        </choice>
-      </attribute>
-    </optional>
-    <ref name="common.attrib"/>
-    <ref name="stepalternatives.role.attrib"/>
-    <ref name="local.stepalternatives.attrib"/>
-  </define>
-  <!-- end of stepalternatives.attlist -->
-  <!-- end of stepalternatives.module -->
-  <!-- end of procedure.content.module -->
-  <!-- Sidebar .......................... -->
-  <define name="local.sidebarinfo.attrib">
-    <empty/>
-  </define>
-  <define name="sidebarinfo.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:Meta-information for a Sidebar. -->
-  <define name="sidebarinfo">
-    <element name="sidebarinfo">
-      <ref name="sidebarinfo.attlist"/>
-      <oneOrMore>
-        <ref name="info.class"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of sidebarinfo.element -->
-  <define name="sidebarinfo.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="sidebarinfo.role.attrib"/>
-    <ref name="local.sidebarinfo.attrib"/>
-  </define>
-  <!-- end of sidebarinfo.attlist -->
-  <!-- end of sidebarinfo.module -->
-  <define name="local.sidebar.attrib">
-    <empty/>
-  </define>
-  <define name="sidebar.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A portion of a document that is isolated from the main narrative flow. -->
-  <define name="sidebar">
-    <element name="sidebar">
-      <ref name="sidebar.attlist"/>
-      <optional>
-        <ref name="sidebarinfo"/>
-      </optional>
-      <optional>
-        <ref name="formalobject.title.content"/>
-      </optional>
-      <oneOrMore>
-        <ref name="sidebar.mix"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of sidebar.element -->
-  <define name="sidebar.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="sidebar.role.attrib"/>
-    <ref name="local.sidebar.attrib"/>
-  </define>
-  <!-- end of sidebar.attlist -->
-  <!-- end of sidebar.module -->
-  <!-- end of sidebar.content.model -->
-  <!-- ...................................................................... -->
-  <!-- Paragraph-related elements ........................................... -->
-  <define name="local.abstract.attrib">
-    <empty/>
-  </define>
-  <define name="abstract.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A summary. -->
-  <define name="abstract">
-    <element name="abstract">
-      <ref name="abstract.attlist"/>
-      <optional>
-        <ref name="title"/>
-      </optional>
-      <oneOrMore>
-        <ref name="para.class"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of abstract.element -->
-  <define name="abstract.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="abstract.role.attrib"/>
-    <ref name="local.abstract.attrib"/>
-  </define>
-  <!-- end of abstract.attlist -->
-  <!-- end of abstract.module -->
-  <define name="local.authorblurb.attrib">
-    <empty/>
-  </define>
-  <define name="authorblurb.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A short description or note about an author. -->
-  <define name="authorblurb">
-    <element name="authorblurb">
-      <ref name="authorblurb.attlist"/>
-      <optional>
-        <ref name="title"/>
-      </optional>
-      <oneOrMore>
-        <ref name="para.class"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of authorblurb.element -->
-  <define name="authorblurb.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="authorblurb.role.attrib"/>
-    <ref name="local.authorblurb.attrib"/>
-  </define>
-  <!-- end of authorblurb.attlist -->
-  <!-- end of authorblurb.module -->
-  <define name="local.personblurb.attrib">
-    <empty/>
-  </define>
-  <define name="personblurb.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A short description or note about a person. -->
-  <define name="personblurb">
-    <element name="personblurb">
-      <ref name="personblurb.attlist"/>
-      <optional>
-        <ref name="title"/>
-      </optional>
-      <oneOrMore>
-        <ref name="para.class"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of personblurb.element -->
-  <define name="personblurb.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="personblurb.role.attrib"/>
-    <ref name="local.personblurb.attrib"/>
-  </define>
-  <!-- end of personblurb.attlist -->
-  <!-- end of personblurb.module -->
-  <define name="local.blockquote.attrib">
-    <empty/>
-  </define>
-  <define name="blockquote.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A quotation set off from the main text. -->
-  <define name="blockquote">
-    <element name="blockquote">
-      <ref name="blockquote.attlist"/>
-      <optional>
-        <ref name="blockinfo"/>
-      </optional>
-      <optional>
-        <ref name="title"/>
-      </optional>
-      <optional>
-        <ref name="attribution"/>
-      </optional>
-      <oneOrMore>
-        <ref name="component.mix"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of blockquote.element -->
-  <define name="blockquote.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="blockquote.role.attrib"/>
-    <ref name="local.blockquote.attrib"/>
-  </define>
-  <!-- end of blockquote.attlist -->
-  <!-- end of blockquote.module -->
-  <define name="local.attribution.attrib">
-    <empty/>
-  </define>
-  <define name="attribution.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The source of a block quote or epigraph. -->
-  <define name="attribution">
-    <element name="attribution">
-      <ref name="attribution.attlist"/>
-      <zeroOrMore>
-        <ref name="para.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of attribution.element -->
-  <define name="attribution.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="attribution.role.attrib"/>
-    <ref name="local.attribution.attrib"/>
-  </define>
-  <!-- end of attribution.attlist -->
-  <!-- end of attribution.module -->
-  <define name="local.bridgehead.attrib">
-    <empty/>
-  </define>
-  <define name="bridgehead.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A free-floating heading. -->
-  <define name="bridgehead">
-    <element name="bridgehead">
-      <ref name="bridgehead.attlist"/>
-      <zeroOrMore>
-        <ref name="title.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of bridgehead.element -->
-  <!--
-    Renderas: Indicates the format in which the BridgeHead
-    should appear
-  -->
-  <define name="bridgehead.attlist" combine="interleave">
-    <optional>
-      <attribute name="renderas">
-        <choice>
-          <value>other</value>
-          <value>sect1</value>
-          <value>sect2</value>
-          <value>sect3</value>
-          <value>sect4</value>
-          <value>sect5</value>
-        </choice>
-      </attribute>
-    </optional>
-    <ref name="common.attrib"/>
-    <ref name="bridgehead.role.attrib"/>
-    <ref name="local.bridgehead.attrib"/>
-  </define>
-  <!-- end of bridgehead.attlist -->
-  <!-- end of bridgehead.module -->
-  <define name="local.remark.attrib">
-    <empty/>
-  </define>
-  <define name="remark.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A remark (or comment) intended for presentation in a draft manuscript. -->
-  <define name="remark">
-    <element name="remark">
-      <ref name="remark.attlist"/>
-      <zeroOrMore>
-        <ref name="para.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of remark.element -->
-  <define name="remark.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="remark.role.attrib"/>
-    <ref name="local.remark.attrib"/>
-  </define>
-  <!-- end of remark.attlist -->
-  <!-- end of remark.module -->
-  <define name="local.epigraph.attrib">
-    <empty/>
-  </define>
-  <define name="epigraph.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A short inscription at the beginning of a document or component. -->
-  <define name="epigraph">
-    <element name="epigraph">
-      <ref name="epigraph.attlist"/>
-      <optional>
-        <ref name="attribution"/>
-      </optional>
-      <oneOrMore>
-        <choice>
-          <ref name="para.class"/>
-          <ref name="literallayout"/>
-        </choice>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of epigraph.element -->
-  <define name="epigraph.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="epigraph.role.attrib"/>
-    <ref name="local.epigraph.attrib"/>
-  </define>
-  <!-- end of epigraph.attlist -->
-  <!--  Attribution (defined above) -->
-  <!-- end of epigraph.module -->
-  <define name="local.footnote.attrib">
-    <empty/>
-  </define>
-  <define name="footnote.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A footnote. -->
-  <define name="footnote">
-    <element name="footnote">
-      <ref name="footnote.attlist"/>
-      <oneOrMore>
-        <ref name="footnote.mix"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of footnote.element -->
-  <define name="footnote.attlist" combine="interleave">
-    <ref name="label.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="footnote.role.attrib"/>
-    <ref name="local.footnote.attrib"/>
-  </define>
-  <!-- end of footnote.attlist -->
-  <!-- end of footnote.module -->
-  <define name="local.highlights.attrib">
-    <empty/>
-  </define>
-  <define name="highlights.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A summary of the main points of the discussed component. -->
-  <define name="highlights">
-    <element name="highlights">
-      <ref name="highlights.attlist"/>
-      <oneOrMore>
-        <ref name="highlights.mix"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of highlights.element -->
-  <define name="highlights.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="highlights.role.attrib"/>
-    <ref name="local.highlights.attrib"/>
-  </define>
-  <!-- end of highlights.attlist -->
-  <!-- end of highlights.module -->
-  <define name="local.formalpara.attrib">
-    <empty/>
-  </define>
-  <define name="formalpara.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A paragraph with a title. -->
-  <define name="formalpara">
-    <element name="formalpara">
-      <ref name="formalpara.attlist"/>
-      <ref name="title"/>
-      <zeroOrMore>
-        <ref name="ndxterm.class"/>
-      </zeroOrMore>
-      <ref name="para"/>
-    </element>
-  </define>
-  <!-- end of formalpara.element -->
-  <define name="formalpara.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="formalpara.role.attrib"/>
-    <ref name="local.formalpara.attrib"/>
-  </define>
-  <!-- end of formalpara.attlist -->
-  <!-- end of formalpara.module -->
-  <define name="local.para.attrib">
-    <empty/>
-  </define>
-  <define name="para.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A paragraph. -->
-  <define name="para">
-    <element name="para">
-      <ref name="para.attlist"/>
-      <zeroOrMore>
-        <choice>
-          <ref name="para.char.mix"/>
-          <ref name="para.mix"/>
-        </choice>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of para.element -->
-  <define name="para.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="para.role.attrib"/>
-    <ref name="local.para.attrib"/>
-  </define>
-  <!-- end of para.attlist -->
-  <!-- end of para.module -->
-  <define name="local.simpara.attrib">
-    <empty/>
-  </define>
-  <define name="simpara.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A paragraph that contains only text and inline markup, no block elements. -->
-  <define name="simpara">
-    <element name="simpara">
-      <ref name="simpara.attlist"/>
-      <zeroOrMore>
-        <ref name="para.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of simpara.element -->
-  <define name="simpara.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="simpara.role.attrib"/>
-    <ref name="local.simpara.attrib"/>
-  </define>
-  <!-- end of simpara.attlist -->
-  <!-- end of simpara.module -->
-  <define name="local.admon.attrib">
-    <empty/>
-  </define>
-  <define name="admon.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A note of caution. -->
-  <define name="caution">
-    <element name="caution">
-      <ref name="caution.attlist"/>
-      <optional>
-        <ref name="title"/>
-      </optional>
-      <oneOrMore>
-        <ref name="admon.mix"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of caution.element -->
-  <define name="caution.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="admon.role.attrib"/>
-    <ref name="local.admon.attrib"/>
-  </define>
-  <!-- end of caution.attlist -->
-  <!-- doc:An admonition set off from the text. -->
-  <define name="important">
-    <element name="important">
-      <ref name="important.attlist"/>
-      <optional>
-        <ref name="title"/>
-      </optional>
-      <oneOrMore>
-        <ref name="admon.mix"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of important.element -->
-  <define name="important.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="admon.role.attrib"/>
-    <ref name="local.admon.attrib"/>
-  </define>
-  <!-- end of important.attlist -->
-  <!-- doc:A message set off from the text. -->
-  <define name="note">
-    <element name="note">
-      <ref name="note.attlist"/>
-      <optional>
-        <ref name="title"/>
-      </optional>
-      <oneOrMore>
-        <ref name="admon.mix"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of note.element -->
-  <define name="note.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="admon.role.attrib"/>
-    <ref name="local.admon.attrib"/>
-  </define>
-  <!-- end of note.attlist -->
-  <!-- doc:A suggestion to the user, set off from the text. -->
-  <define name="tip">
-    <element name="tip">
-      <ref name="tip.attlist"/>
-      <optional>
-        <ref name="title"/>
-      </optional>
-      <oneOrMore>
-        <ref name="admon.mix"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of tip.element -->
-  <define name="tip.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="admon.role.attrib"/>
-    <ref name="local.admon.attrib"/>
-  </define>
-  <!-- end of tip.attlist -->
-  <!-- doc:An admonition set off from the text. -->
-  <define name="warning">
-    <element name="warning">
-      <ref name="warning.attlist"/>
-      <optional>
-        <ref name="title"/>
-      </optional>
-      <oneOrMore>
-        <ref name="admon.mix"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of warning.element -->
-  <define name="warning.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="admon.role.attrib"/>
-    <ref name="local.admon.attrib"/>
-  </define>
-  <!-- end of warning.attlist -->
-  <!-- end of admon.module -->
-  <!-- ...................................................................... -->
-  <!-- Lists ................................................................ -->
-  <!-- GlossList ........................ -->
-  <define name="local.glosslist.attrib">
-    <empty/>
-  </define>
-  <define name="glosslist.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A wrapper for a set of GlossEntrys. -->
-  <define name="glosslist">
-    <element name="glosslist">
-      <ref name="glosslist.attlist"/>
-      <optional>
-        <ref name="blockinfo"/>
-      </optional>
-      <optional>
-        <ref name="formalobject.title.content"/>
-      </optional>
-      <oneOrMore>
-        <ref name="glossentry"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of glosslist.element -->
-  <define name="glosslist.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="glosslist.role.attrib"/>
-    <ref name="local.glosslist.attrib"/>
-  </define>
-  <!-- end of glosslist.attlist -->
-  <!-- end of glosslist.module -->
-  <define name="local.glossentry.attrib">
-    <empty/>
-  </define>
-  <define name="glossentry.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:An entry in a Glossary or GlossList. -->
-  <define name="glossentry">
-    <element name="glossentry">
-      <ref name="glossentry.attlist"/>
-      <ref name="glossterm"/>
-      <optional>
-        <ref name="acronym"/>
-      </optional>
-      <optional>
-        <ref name="abbrev"/>
-      </optional>
-      <zeroOrMore>
-        <ref name="ndxterm.class"/>
-      </zeroOrMore>
-      <optional>
-        <ref name="revhistory"/>
-      </optional>
-      <choice>
-        <ref name="glosssee"/>
-        <oneOrMore>
-          <ref name="glossdef"/>
-        </oneOrMore>
-      </choice>
-    </element>
-  </define>
-  <!-- end of glossentry.element -->
-  <!--
-    SortAs: String by which the GlossEntry is to be sorted
-    (alphabetized) in lieu of its proper content
-  -->
-  <define name="glossentry.attlist" combine="interleave">
-    <optional>
-      <attribute name="sortas"/>
-    </optional>
-    <ref name="common.attrib"/>
-    <ref name="glossentry.role.attrib"/>
-    <ref name="local.glossentry.attrib"/>
-  </define>
-  <!-- end of glossentry.attlist -->
-  <!-- end of glossentry.module -->
-  <!--  GlossTerm (defined in the Inlines section, below) -->
-  <define name="local.glossdef.attrib">
-    <empty/>
-  </define>
-  <define name="glossdef.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A definition in a GlossEntry. -->
-  <define name="glossdef">
-    <element name="glossdef">
-      <ref name="glossdef.attlist"/>
-      <oneOrMore>
-        <ref name="glossdef.mix"/>
-      </oneOrMore>
-      <zeroOrMore>
-        <ref name="glossseealso"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of glossdef.element -->
-  <!-- Subject: List of subjects; keywords for the definition -->
-  <define name="glossdef.attlist" combine="interleave">
-    <optional>
-      <attribute name="subject"/>
-    </optional>
-    <ref name="common.attrib"/>
-    <ref name="glossdef.role.attrib"/>
-    <ref name="local.glossdef.attrib"/>
-  </define>
-  <!-- end of glossdef.attlist -->
-  <!-- end of glossdef.module -->
-  <define name="local.glosssee.attrib">
-    <empty/>
-  </define>
-  <define name="glosssee.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A cross-reference from one GlossEntry to another. -->
-  <define name="glosssee">
-    <element name="glosssee">
-      <ref name="glosssee.attlist"/>
-      <zeroOrMore>
-        <ref name="para.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of glosssee.element -->
-  <!--
-    OtherTerm: Reference to the GlossEntry whose GlossTerm
-    should be displayed at the point of the GlossSee
-  -->
-  <define name="glosssee.attlist" combine="interleave">
-    <optional>
-      <attribute name="otherterm">
-        <data type="IDREF"/>
-      </attribute>
-    </optional>
-    <ref name="common.attrib"/>
-    <ref name="glosssee.role.attrib"/>
-    <ref name="local.glosssee.attrib"/>
-  </define>
-  <!-- end of glosssee.attlist -->
-  <!-- end of glosssee.module -->
-  <define name="local.glossseealso.attrib">
-    <empty/>
-  </define>
-  <define name="glossseealso.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A cross-reference from one GlossEntry to another. -->
-  <define name="glossseealso">
-    <element name="glossseealso">
-      <ref name="glossseealso.attlist"/>
-      <zeroOrMore>
-        <ref name="para.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of glossseealso.element -->
-  <!--
-    OtherTerm: Reference to the GlossEntry whose GlossTerm
-    should be displayed at the point of the GlossSeeAlso
-  -->
-  <define name="glossseealso.attlist" combine="interleave">
-    <optional>
-      <attribute name="otherterm">
-        <data type="IDREF"/>
-      </attribute>
-    </optional>
-    <ref name="common.attrib"/>
-    <ref name="glossseealso.role.attrib"/>
-    <ref name="local.glossseealso.attrib"/>
-  </define>
-  <!-- end of glossseealso.attlist -->
-  <!-- end of glossseealso.module -->
-  <!-- end of glossentry.content.module -->
-  <!-- ItemizedList and OrderedList ..... -->
-  <define name="local.itemizedlist.attrib">
-    <empty/>
-  </define>
-  <define name="itemizedlist.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A list in which each entry is marked with a bullet or other dingbat. -->
-  <define name="itemizedlist">
-    <element name="itemizedlist">
-      <ref name="itemizedlist.attlist"/>
-      <optional>
-        <ref name="blockinfo"/>
-      </optional>
-      <optional>
-        <ref name="formalobject.title.content"/>
-      </optional>
-      <zeroOrMore>
-        <ref name="listpreamble.mix"/>
-      </zeroOrMore>
-      <oneOrMore>
-        <ref name="listitem"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of itemizedlist.element -->
-  <!--
-    Spacing: Whether the vertical space in the list should be
-    compressed
-  -->
-  <!--
-    Mark: Keyword, e.g., bullet, dash, checkbox, none;
-    list of keywords and defaults are implementation specific
-  -->
-  <define name="itemizedlist.attlist" combine="interleave">
-    <optional>
-      <attribute name="spacing">
-        <choice>
-          <value>normal</value>
-          <value>compact</value>
-        </choice>
-      </attribute>
-    </optional>
-    <ref name="mark.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="itemizedlist.role.attrib"/>
-    <ref name="local.itemizedlist.attrib"/>
-  </define>
-  <!-- end of itemizedlist.attlist -->
-  <!-- end of itemizedlist.module -->
-  <define name="local.orderedlist.attrib">
-    <empty/>
-  </define>
-  <define name="orderedlist.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A list in which each entry is marked with a sequentially incremented label. -->
-  <define name="orderedlist">
-    <element name="orderedlist">
-      <ref name="orderedlist.attlist"/>
-      <optional>
-        <ref name="blockinfo"/>
-      </optional>
-      <optional>
-        <ref name="formalobject.title.content"/>
-      </optional>
-      <zeroOrMore>
-        <ref name="listpreamble.mix"/>
-      </zeroOrMore>
-      <oneOrMore>
-        <ref name="listitem"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of orderedlist.element -->
-  <!--
-    Numeration: Style of ListItem numbered; default is expected
-    to be Arabic
-  -->
-  <!--
-    InheritNum: Specifies for a nested list that the numbering
-    of ListItems should include the number of the item
-    within which they are nested (e.g., 1a and 1b within 1,
-    rather than a and b)
-  -->
-  <!--
-    Continuation: Where list numbering begins afresh (Restarts,
-    the default) or continues that of the immediately preceding
-    list (Continues)
-  -->
-  <!--
-    Spacing: Whether the vertical space in the list should be
-    compressed
-  -->
-  <define name="orderedlist.attlist" combine="interleave">
-    <optional>
-      <attribute name="numeration">
-        <choice>
-          <value>arabic</value>
-          <value>upperalpha</value>
-          <value>loweralpha</value>
-          <value>upperroman</value>
-          <value>lowerroman</value>
-        </choice>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="inheritnum" a:defaultValue="ignore">
-        <choice>
-          <value>inherit</value>
-          <value>ignore</value>
-        </choice>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="continuation" a:defaultValue="restarts">
-        <choice>
-          <value>continues</value>
-          <value>restarts</value>
-        </choice>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="spacing">
-        <choice>
-          <value>normal</value>
-          <value>compact</value>
-        </choice>
-      </attribute>
-    </optional>
-    <ref name="common.attrib"/>
-    <ref name="orderedlist.role.attrib"/>
-    <ref name="local.orderedlist.attrib"/>
-  </define>
-  <!-- end of orderedlist.attlist -->
-  <!-- end of orderedlist.module -->
-  <define name="local.listitem.attrib">
-    <empty/>
-  </define>
-  <define name="listitem.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A wrapper for the elements of a list item. -->
-  <define name="listitem">
-    <element name="listitem">
-      <ref name="listitem.attlist"/>
-      <oneOrMore>
-        <ref name="component.mix"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of listitem.element -->
-  <!--
-    Override: Indicates the mark to be used for this ListItem
-    instead of the default mark or the mark specified by
-    the Mark attribute on the enclosing ItemizedList
-  -->
-  <define name="listitem.attlist" combine="interleave">
-    <optional>
-      <attribute name="override"/>
-    </optional>
-    <ref name="common.attrib"/>
-    <ref name="listitem.role.attrib"/>
-    <ref name="local.listitem.attrib"/>
-  </define>
-  <!-- end of listitem.attlist -->
-  <!-- end of listitem.module -->
-  <!-- SegmentedList .................... -->
-  <define name="local.segmentedlist.attrib">
-    <empty/>
-  </define>
-  <define name="segmentedlist.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A segmented list, a list of sets of elements. -->
-  <define name="segmentedlist">
-    <element name="segmentedlist">
-      <ref name="segmentedlist.attlist"/>
-      <optional>
-        <ref name="formalobject.title.content"/>
-      </optional>
-      <oneOrMore>
-        <ref name="segtitle"/>
-      </oneOrMore>
-      <oneOrMore>
-        <ref name="seglistitem"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of segmentedlist.element -->
-  <define name="segmentedlist.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="segmentedlist.role.attrib"/>
-    <ref name="local.segmentedlist.attrib"/>
-  </define>
-  <!-- end of segmentedlist.attlist -->
-  <!-- end of segmentedlist.module -->
-  <define name="local.segtitle.attrib">
-    <empty/>
-  </define>
-  <define name="segtitle.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The title of an element of a list item in a segmented list. -->
-  <define name="segtitle">
-    <element name="segtitle">
-      <ref name="segtitle.attlist"/>
-      <zeroOrMore>
-        <ref name="title.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of segtitle.element -->
-  <define name="segtitle.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="segtitle.role.attrib"/>
-    <ref name="local.segtitle.attrib"/>
-  </define>
-  <!-- end of segtitle.attlist -->
-  <!-- end of segtitle.module -->
-  <define name="local.seglistitem.attrib">
-    <empty/>
-  </define>
-  <define name="seglistitem.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A list item in a segmented list. -->
-  <define name="seglistitem">
-    <element name="seglistitem">
-      <ref name="seglistitem.attlist"/>
-      <oneOrMore>
-        <ref name="seg"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of seglistitem.element -->
-  <define name="seglistitem.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="seglistitem.role.attrib"/>
-    <ref name="local.seglistitem.attrib"/>
-  </define>
-  <!-- end of seglistitem.attlist -->
-  <!-- end of seglistitem.module -->
-  <define name="local.seg.attrib">
-    <empty/>
-  </define>
-  <define name="seg.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:An element of a list item in a segmented list. -->
-  <define name="seg">
-    <element name="seg">
-      <ref name="seg.attlist"/>
-      <zeroOrMore>
-        <ref name="para.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of seg.element -->
-  <define name="seg.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="seg.role.attrib"/>
-    <ref name="local.seg.attrib"/>
-  </define>
-  <!-- end of seg.attlist -->
-  <!-- end of seg.module -->
-  <!-- end of segmentedlist.content.module -->
-  <!-- SimpleList ....................... -->
-  <define name="local.simplelist.attrib">
-    <empty/>
-  </define>
-  <define name="simplelist.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:An undecorated list of single words or short phrases. -->
-  <define name="simplelist">
-    <element name="simplelist">
-      <ref name="simplelist.attlist"/>
-      <oneOrMore>
-        <ref name="member"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of simplelist.element -->
-  <!-- Columns: The number of columns the array should contain -->
-  <!--
-    Type: How the Members of the SimpleList should be
-    formatted: Inline (members separated with commas etc.
-    inline), Vert (top to bottom in n Columns), or Horiz (in
-    the direction of text flow) in n Columns.  If Column
-    is 1 or implied, Type=Vert and Type=Horiz give the same
-    results.
-  -->
-  <define name="simplelist.attlist" combine="interleave">
-    <optional>
-      <attribute name="columns"/>
-    </optional>
-    <optional>
-      <attribute name="type" a:defaultValue="vert">
-        <choice>
-          <value>inline</value>
-          <value>vert</value>
-          <value>horiz</value>
-        </choice>
-      </attribute>
-    </optional>
-    <ref name="common.attrib"/>
-    <ref name="simplelist.role.attrib"/>
-    <ref name="local.simplelist.attrib"/>
-  </define>
-  <!-- end of simplelist.attlist -->
-  <!-- end of simplelist.module -->
-  <define name="local.member.attrib">
-    <empty/>
-  </define>
-  <define name="member.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:An element of a simple list. -->
-  <define name="member">
-    <element name="member">
-      <ref name="member.attlist"/>
-      <zeroOrMore>
-        <ref name="para.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of member.element -->
-  <define name="member.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="member.role.attrib"/>
-    <ref name="local.member.attrib"/>
-  </define>
-  <!-- end of member.attlist -->
-  <!-- end of member.module -->
-  <!-- end of simplelist.content.module -->
-  <!-- VariableList ..................... -->
-  <define name="local.variablelist.attrib">
-    <empty/>
-  </define>
-  <define name="variablelist.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A list in which each entry is composed of a set of one or more terms and an associated description. -->
-  <define name="variablelist">
-    <element name="variablelist">
-      <ref name="variablelist.attlist"/>
-      <optional>
-        <ref name="blockinfo"/>
-      </optional>
-      <optional>
-        <ref name="formalobject.title.content"/>
-      </optional>
-      <zeroOrMore>
-        <ref name="listpreamble.mix"/>
-      </zeroOrMore>
-      <oneOrMore>
-        <ref name="varlistentry"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of variablelist.element -->
-  <!--
-    TermLength: Length beyond which the presentation engine
-    may consider the Term too long and select an alternate
-    presentation of the Term and, or, its associated ListItem.
-  -->
-  <define name="variablelist.attlist" combine="interleave">
-    <optional>
-      <attribute name="termlength"/>
-    </optional>
-    <optional>
-      <attribute name="spacing">
-        <choice>
-          <value>normal</value>
-          <value>compact</value>
-        </choice>
-      </attribute>
-    </optional>
-    <ref name="common.attrib"/>
-    <ref name="variablelist.role.attrib"/>
-    <ref name="local.variablelist.attrib"/>
-  </define>
-  <!-- end of variablelist.attlist -->
-  <!-- end of variablelist.module -->
-  <define name="local.varlistentry.attrib">
-    <empty/>
-  </define>
-  <define name="varlistentry.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A wrapper for a set of terms and the associated description in a variable list. -->
-  <define name="varlistentry">
-    <element name="varlistentry">
-      <ref name="varlistentry.attlist"/>
-      <oneOrMore>
-        <ref name="term"/>
-      </oneOrMore>
-      <ref name="listitem"/>
-    </element>
-  </define>
-  <!-- end of varlistentry.element -->
-  <define name="varlistentry.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="varlistentry.role.attrib"/>
-    <ref name="local.varlistentry.attrib"/>
-  </define>
-  <!-- end of varlistentry.attlist -->
-  <!-- end of varlistentry.module -->
-  <define name="local.term.attrib">
-    <empty/>
-  </define>
-  <define name="term.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The word or phrase being defined or described in a variable list. -->
-  <define name="term">
-    <element name="term">
-      <ref name="term.attlist"/>
-      <zeroOrMore>
-        <ref name="para.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of term.element -->
-  <define name="term.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="term.role.attrib"/>
-    <ref name="local.term.attrib"/>
-  </define>
-  <!-- end of term.attlist -->
-  <!-- end of term.module -->
-  <!--  ListItem (defined above) -->
-  <!-- end of variablelist.content.module -->
-  <!-- CalloutList ...................... -->
-  <define name="local.calloutlist.attrib">
-    <empty/>
-  </define>
-  <define name="calloutlist.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A list of Callouts. -->
-  <define name="calloutlist">
-    <element name="calloutlist">
-      <ref name="calloutlist.attlist"/>
-      <optional>
-        <ref name="formalobject.title.content"/>
-      </optional>
-      <oneOrMore>
-        <ref name="callout"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of calloutlist.element -->
-  <define name="calloutlist.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="calloutlist.role.attrib"/>
-    <ref name="local.calloutlist.attrib"/>
-  </define>
-  <!-- end of calloutlist.attlist -->
-  <!-- end of calloutlist.module -->
-  <define name="local.callout.attrib">
-    <empty/>
-  </define>
-  <define name="callout.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A &ldquo;called out&rdquo; description of a marked Area. -->
-  <define name="callout">
-    <element name="callout">
-      <ref name="callout.attlist"/>
-      <oneOrMore>
-        <ref name="component.mix"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of callout.element -->
-  <!--
-    AreaRefs: IDs of one or more Areas or AreaSets described
-    by this Callout
-  -->
-  <define name="callout.attlist" combine="interleave">
-    <attribute name="arearefs">
-      <data type="IDREFS"/>
-    </attribute>
-    <ref name="common.attrib"/>
-    <ref name="callout.role.attrib"/>
-    <ref name="local.callout.attrib"/>
-  </define>
-  <!-- end of callout.attlist -->
-  <!-- end of callout.module -->
-  <!-- end of calloutlist.content.module -->
-  <!-- ...................................................................... -->
-  <!-- Objects .............................................................. -->
-  <!-- Examples etc. .................... -->
-  <define name="local.example.attrib">
-    <empty/>
-  </define>
-  <define name="example.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A formal example, with a title. -->
-  <define name="example">
-    <element name="example">
-      <ref name="example.attlist"/>
-      <optional>
-        <ref name="blockinfo"/>
-      </optional>
-      <ref name="formalobject.title.content"/>
-      <oneOrMore>
-        <ref name="example.mix"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of example.element -->
-  <define name="example.attlist" combine="interleave">
-    <optional>
-      <attribute name="floatstyle"/>
-    </optional>
-    <ref name="label.attrib"/>
-    <ref name="width.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="example.role.attrib"/>
-    <ref name="local.example.attrib"/>
-  </define>
-  <!-- end of example.attlist -->
-  <!-- end of example.module -->
-  <define name="local.informalexample.attrib">
-    <empty/>
-  </define>
-  <define name="informalexample.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A displayed example without a title. -->
-  <define name="informalexample">
-    <element name="informalexample">
-      <ref name="informalexample.attlist"/>
-      <optional>
-        <ref name="blockinfo"/>
-      </optional>
-      <oneOrMore>
-        <ref name="example.mix"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of informalexample.element -->
-  <define name="informalexample.attlist" combine="interleave">
-    <optional>
-      <attribute name="floatstyle"/>
-    </optional>
-    <ref name="width.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="informalexample.role.attrib"/>
-    <ref name="local.informalexample.attrib"/>
-  </define>
-  <!-- end of informalexample.attlist -->
-  <!-- end of informalexample.module -->
-  <define name="local.programlistingco.attrib">
-    <empty/>
-  </define>
-  <define name="programlistingco.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A program listing with associated areas used in callouts. -->
-  <define name="programlistingco">
-    <element name="programlistingco">
-      <ref name="programlistingco.attlist"/>
-      <ref name="areaspec"/>
-      <ref name="programlisting"/>
-      <zeroOrMore>
-        <ref name="calloutlist"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of programlistingco.element -->
-  <define name="programlistingco.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="programlistingco.role.attrib"/>
-    <ref name="local.programlistingco.attrib"/>
-  </define>
-  <!-- end of programlistingco.attlist -->
-  <!--  CalloutList (defined above in Lists) -->
-  <!-- end of informalexample.module -->
-  <define name="local.areaspec.attrib">
-    <empty/>
-  </define>
-  <define name="areaspec.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A collection of regions in a graphic or code example. -->
-  <define name="areaspec">
-    <element name="areaspec">
-      <ref name="areaspec.attlist"/>
-      <oneOrMore>
-        <choice>
-          <ref name="area"/>
-          <ref name="areaset"/>
-        </choice>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of areaspec.element -->
-  <!--
-    Units: global unit of measure in which coordinates in
-    this spec are expressed:
-    
-    - CALSPair "x1,y1 x2,y2": lower-left and upper-right
-    coordinates in a rectangle describing repro area in which
-    graphic is placed, where X and Y dimensions are each some
-    number 0..10000 (taken from CALS graphic attributes)
-    
-    - LineColumn "line column": line number and column number
-    at which to start callout text in "linespecific" content
-    
-    - LineRange "startline endline": whole lines from startline
-    to endline in "linespecific" content
-    
-    - LineColumnPair "line1 col1 line2 col2": starting and ending
-    points of area in "linespecific" content that starts at
-    first position and ends at second position (including the
-    beginnings of any intervening lines)
-    
-    - Other: directive to look at value of OtherUnits attribute
-    to get implementation-specific keyword
-    
-    The default is implementation-specific; usually dependent on
-    the parent element (GraphicCO gets CALSPair, ProgramListingCO
-    and ScreenCO get LineColumn)
-  -->
-  <!-- OtherUnits: User-defined units -->
-  <define name="areaspec.attlist" combine="interleave">
-    <optional>
-      <attribute name="units">
-        <choice>
-          <value>calspair</value>
-          <value>linecolumn</value>
-          <value>linerange</value>
-          <value>linecolumnpair</value>
-          <value>other</value>
-        </choice>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="otherunits">
-        <data type="NMTOKEN"/>
-      </attribute>
-    </optional>
-    <ref name="common.attrib"/>
-    <ref name="areaspec.role.attrib"/>
-    <ref name="local.areaspec.attrib"/>
-  </define>
-  <!-- end of areaspec.attlist -->
-  <!-- end of areaspec.module -->
-  <define name="local.area.attrib">
-    <empty/>
-  </define>
-  <define name="area.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A region defined for a Callout in a graphic or code example. -->
-  <define name="area">
-    <element name="area">
-      <ref name="area.attlist"/>
-      <empty/>
-    </element>
-  </define>
-  <!-- end of area.element -->
-  <!-- bug number/symbol override or initialization -->
-  <!-- to any related information -->
-  <!--
-    Units: unit of measure in which coordinates in this
-    area are expressed; inherits from AreaSet and AreaSpec
-  -->
-  <!-- OtherUnits: User-defined units -->
-  <define name="area.attlist" combine="interleave">
-    <ref name="label.attrib"/>
-    <ref name="linkends.attrib"/>
-    <optional>
-      <attribute name="units">
-        <choice>
-          <value>calspair</value>
-          <value>linecolumn</value>
-          <value>linerange</value>
-          <value>linecolumnpair</value>
-          <value>other</value>
-        </choice>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="otherunits">
-        <data type="NMTOKEN"/>
-      </attribute>
-    </optional>
-    <attribute name="coords"/>
-    <ref name="idreq.common.attrib"/>
-    <ref name="area.role.attrib"/>
-    <ref name="local.area.attrib"/>
-  </define>
-  <!-- end of area.attlist -->
-  <!-- end of area.module -->
-  <define name="local.areaset.attrib">
-    <empty/>
-  </define>
-  <define name="areaset.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A set of related areas in a graphic or code example. -->
-  <define name="areaset">
-    <element name="areaset">
-      <ref name="areaset.attlist"/>
-      <oneOrMore>
-        <ref name="area"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of areaset.element -->
-  <!-- bug number/symbol override or initialization -->
-  <!--
-    Units: unit of measure in which coordinates in this
-    area are expressed; inherits from AreaSpec
-  -->
-  <define name="areaset.attlist" combine="interleave">
-    <ref name="label.attrib"/>
-    <optional>
-      <attribute name="units">
-        <choice>
-          <value>calspair</value>
-          <value>linecolumn</value>
-          <value>linerange</value>
-          <value>linecolumnpair</value>
-          <value>other</value>
-        </choice>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="otherunits">
-        <data type="NMTOKEN"/>
-      </attribute>
-    </optional>
-    <attribute name="coords"/>
-    <ref name="idreq.common.attrib"/>
-    <ref name="areaset.role.attrib"/>
-    <ref name="local.areaset.attrib"/>
-  </define>
-  <!-- end of areaset.attlist -->
-  <!-- end of areaset.module -->
-  <!-- end of areaspec.content.module -->
-  <define name="local.programlisting.attrib">
-    <empty/>
-  </define>
-  <define name="programlisting.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A literal listing of all or part of a program. -->
-  <define name="programlisting">
-    <element name="programlisting">
-      <ref name="programlisting.attlist"/>
-      <zeroOrMore>
-        <choice>
-          <ref name="para.char.mix"/>
-          <ref name="co"/>
-          <ref name="coref"/>
-          <ref name="lineannotation"/>
-          <ref name="textobject"/>
-        </choice>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of programlisting.element -->
-  <define name="programlisting.attlist" combine="interleave">
-    <ref name="width.attrib"/>
-    <ref name="linespecific.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="programlisting.role.attrib"/>
-    <ref name="local.programlisting.attrib"/>
-  </define>
-  <!-- end of programlisting.attlist -->
-  <!-- end of programlisting.module -->
-  <define name="local.literallayout.attrib">
-    <empty/>
-  </define>
-  <define name="literallayout.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A block of text in which line breaks and white space are to be reproduced faithfully. -->
-  <define name="literallayout">
-    <element name="literallayout">
-      <ref name="literallayout.attlist"/>
-      <zeroOrMore>
-        <choice>
-          <ref name="para.char.mix"/>
-          <ref name="co"/>
-          <ref name="coref"/>
-          <ref name="textobject"/>
-          <ref name="lineannotation"/>
-        </choice>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of literallayout.element -->
-  <define name="literallayout.attlist" combine="interleave">
-    <ref name="width.attrib"/>
-    <ref name="linespecific.attrib"/>
-    <optional>
-      <attribute name="class" a:defaultValue="normal">
-        <choice>
-          <value>monospaced</value>
-          <value>normal</value>
-        </choice>
-      </attribute>
-    </optional>
-    <ref name="common.attrib"/>
-    <ref name="literallayout.role.attrib"/>
-    <ref name="local.literallayout.attrib"/>
-  </define>
-  <!-- end of literallayout.attlist -->
-  <!--  LineAnnotation (defined in the Inlines section, below) -->
-  <!-- end of literallayout.module -->
-  <define name="local.screenco.attrib">
-    <empty/>
-  </define>
-  <define name="screenco.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A screen with associated areas used in callouts. -->
-  <define name="screenco">
-    <element name="screenco">
-      <ref name="screenco.attlist"/>
-      <ref name="areaspec"/>
-      <ref name="screen"/>
-      <zeroOrMore>
-        <ref name="calloutlist"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of screenco.element -->
-  <define name="screenco.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="screenco.role.attrib"/>
-    <ref name="local.screenco.attrib"/>
-  </define>
-  <!-- end of screenco.attlist -->
-  <!--  AreaSpec (defined above) -->
-  <!--  CalloutList (defined above in Lists) -->
-  <!-- end of screenco.module -->
-  <define name="local.screen.attrib">
-    <empty/>
-  </define>
-  <define name="screen.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:Text that a user sees or might see on a computer screen. -->
-  <define name="screen">
-    <element name="screen">
-      <ref name="screen.attlist"/>
-      <zeroOrMore>
-        <choice>
-          <ref name="para.char.mix"/>
-          <ref name="co"/>
-          <ref name="coref"/>
-          <ref name="textobject"/>
-          <ref name="lineannotation"/>
-        </choice>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of screen.element -->
-  <define name="screen.attlist" combine="interleave">
-    <ref name="width.attrib"/>
-    <ref name="linespecific.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="screen.role.attrib"/>
-    <ref name="local.screen.attrib"/>
-  </define>
-  <!-- end of screen.attlist -->
-  <!-- end of screen.module -->
-  <define name="local.screenshot.attrib">
-    <empty/>
-  </define>
-  <define name="screenshot.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A representation of what the user sees or might see on a computer screen. -->
-  <define name="screenshot">
-    <element name="screenshot">
-      <ref name="screenshot.attlist"/>
-      <optional>
-        <ref name="screeninfo"/>
-      </optional>
-      <choice>
-        <ref name="graphic"/>
-        <ref name="graphicco"/>
-        <ref name="mediaobject"/>
-        <ref name="mediaobjectco"/>
-      </choice>
-    </element>
-  </define>
-  <!-- end of screenshot.element -->
-  <define name="screenshot.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="screenshot.role.attrib"/>
-    <ref name="local.screenshot.attrib"/>
-  </define>
-  <!-- end of screenshot.attlist -->
-  <!-- end of screenshot.module -->
-  <define name="local.screeninfo.attrib">
-    <empty/>
-  </define>
-  <define name="screeninfo.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:Information about how a screen shot was produced. -->
-  <define name="screeninfo">
-    <element name="screeninfo">
-      <ref name="screeninfo.attlist"/>
-      <zeroOrMore>
-        <ref name="para.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of screeninfo.element -->
-  <define name="screeninfo.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="screeninfo.role.attrib"/>
-    <ref name="local.screeninfo.attrib"/>
-  </define>
-  <!-- end of screeninfo.attlist -->
-  <!-- end of screeninfo.module -->
-  <!-- end of screenshot.content.module -->
-  <!-- Figures etc. ..................... -->
-  <define name="local.figure.attrib">
-    <empty/>
-  </define>
-  <define name="figure.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A formal figure, generally an illustration, with a title. -->
-  <define name="figure">
-    <element name="figure">
-      <ref name="figure.attlist"/>
-      <optional>
-        <ref name="blockinfo"/>
-      </optional>
-      <ref name="formalobject.title.content"/>
-      <oneOrMore>
-        <choice>
-          <ref name="figure.mix"/>
-          <ref name="link.char.class"/>
-        </choice>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of figure.element -->
-  <!--
-    Float: Whether the Figure is supposed to be rendered
-    where convenient (yes (1) value) or at the place it occurs
-    in the text (no (0) value, the default)
-  -->
-  <define name="figure.attlist" combine="interleave">
-    <optional>
-      <attribute name="float" a:defaultValue="0">
-        <ref name="yesorno.attvals"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="floatstyle"/>
-    </optional>
-    <optional>
-      <attribute name="pgwide">
-        <ref name="yesorno.attvals"/>
-      </attribute>
-    </optional>
-    <ref name="label.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="figure.role.attrib"/>
-    <ref name="local.figure.attrib"/>
-  </define>
-  <!-- end of figure.attlist -->
-  <!-- end of figure.module -->
-  <define name="local.informalfigure.attrib">
-    <empty/>
-  </define>
-  <define name="informalfigure.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A untitled figure. -->
-  <define name="informalfigure">
-    <element name="informalfigure">
-      <ref name="informalfigure.attlist"/>
-      <optional>
-        <ref name="blockinfo"/>
-      </optional>
-      <oneOrMore>
-        <choice>
-          <ref name="figure.mix"/>
-          <ref name="link.char.class"/>
-        </choice>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of informalfigure.element -->
-  <!--
-    Float: Whether the Figure is supposed to be rendered
-    where convenient (yes (1) value) or at the place it occurs
-    in the text (no (0) value, the default)
-  -->
-  <define name="informalfigure.attlist" combine="interleave">
-    <optional>
-      <attribute name="float" a:defaultValue="0">
-        <ref name="yesorno.attvals"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="floatstyle"/>
-    </optional>
-    <optional>
-      <attribute name="pgwide">
-        <ref name="yesorno.attvals"/>
-      </attribute>
-    </optional>
-    <ref name="label.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="informalfigure.role.attrib"/>
-    <ref name="local.informalfigure.attrib"/>
-  </define>
-  <!-- end of informalfigure.attlist -->
-  <!-- end of informalfigure.module -->
-  <define name="local.graphicco.attrib">
-    <empty/>
-  </define>
-  <define name="graphicco.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A graphic that contains callout areas. -->
-  <define name="graphicco">
-    <element name="graphicco">
-      <ref name="graphicco.attlist"/>
-      <ref name="areaspec"/>
-      <ref name="graphic"/>
-      <zeroOrMore>
-        <ref name="calloutlist"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of graphicco.element -->
-  <define name="graphicco.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="graphicco.role.attrib"/>
-    <ref name="local.graphicco.attrib"/>
-  </define>
-  <!-- end of graphicco.attlist -->
-  <!--  AreaSpec (defined above in Examples) -->
-  <!--  CalloutList (defined above in Lists) -->
-  <!-- end of graphicco.module -->
-  <!--
-    Graphical data can be the content of Graphic, or you can reference
-    an external file either as an entity (Entitref) or a filename
-    (Fileref).
-  -->
-  <define name="local.graphic.attrib">
-    <empty/>
-  </define>
-  <define name="graphic.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A displayed graphical object (not an inline). -->
-  <define name="graphic">
-    <element name="graphic">
-      <ref name="graphic.attlist"/>
-      <empty/>
-    </element>
-  </define>
-  <!-- end of graphic.element -->
-  <define name="graphic.attlist" combine="interleave">
-    <ref name="graphics.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="graphic.role.attrib"/>
-    <ref name="local.graphic.attrib"/>
-  </define>
-  <!-- end of graphic.attlist -->
-  <!-- end of graphic.module -->
-  <define name="local.inlinegraphic.attrib">
-    <empty/>
-  </define>
-  <define name="inlinegraphic.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:An object containing or pointing to graphical data that will be rendered inline. -->
-  <define name="inlinegraphic">
-    <element name="inlinegraphic">
-      <ref name="inlinegraphic.attlist"/>
-      <empty/>
-    </element>
-  </define>
-  <!-- end of inlinegraphic.element -->
-  <define name="inlinegraphic.attlist" combine="interleave">
-    <ref name="graphics.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="inlinegraphic.role.attrib"/>
-    <ref name="local.inlinegraphic.attrib"/>
-  </define>
-  <!-- end of inlinegraphic.attlist -->
-  <!-- end of inlinegraphic.module -->
-  <define name="local.mediaobject.attrib">
-    <empty/>
-  </define>
-  <define name="mediaobject.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A displayed media object (video, audio, image, etc.). -->
-  <define name="mediaobject">
-    <element name="mediaobject">
-      <ref name="mediaobject.attlist"/>
-      <optional>
-        <ref name="objectinfo"/>
-      </optional>
-      <oneOrMore>
-        <ref name="mediaobject.mix"/>
-      </oneOrMore>
-      <optional>
-        <ref name="caption"/>
-      </optional>
-    </element>
-  </define>
-  <!-- end of mediaobject.element -->
-  <define name="mediaobject.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="mediaobject.role.attrib"/>
-    <ref name="local.mediaobject.attrib"/>
-  </define>
-  <!-- end of mediaobject.attlist -->
-  <!-- end of mediaobject.module -->
-  <define name="local.inlinemediaobject.attrib">
-    <empty/>
-  </define>
-  <define name="inlinemediaobject.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:An inline media object (video, audio, image, and so on). -->
-  <define name="inlinemediaobject">
-    <element name="inlinemediaobject">
-      <ref name="inlinemediaobject.attlist"/>
-      <optional>
-        <ref name="objectinfo"/>
-      </optional>
-      <oneOrMore>
-        <ref name="mediaobject.mix"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of inlinemediaobject.element -->
-  <define name="inlinemediaobject.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="inlinemediaobject.role.attrib"/>
-    <ref name="local.inlinemediaobject.attrib"/>
-  </define>
-  <!-- end of inlinemediaobject.attlist -->
-  <!-- end of inlinemediaobject.module -->
-  <define name="local.videoobject.attrib">
-    <empty/>
-  </define>
-  <define name="videoobject.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A wrapper for video data and its associated meta-information. -->
-  <define name="videoobject">
-    <element name="videoobject">
-      <ref name="videoobject.attlist"/>
-      <optional>
-        <ref name="objectinfo"/>
-      </optional>
-      <ref name="videodata"/>
-    </element>
-  </define>
-  <!-- end of videoobject.element -->
-  <define name="videoobject.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="videoobject.role.attrib"/>
-    <ref name="local.videoobject.attrib"/>
-  </define>
-  <!-- end of videoobject.attlist -->
-  <!-- end of videoobject.module -->
-  <define name="local.audioobject.attrib">
-    <empty/>
-  </define>
-  <define name="audioobject.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A wrapper for audio data and its associated meta-information. -->
-  <define name="audioobject">
-    <element name="audioobject">
-      <ref name="audioobject.attlist"/>
-      <optional>
-        <ref name="objectinfo"/>
-      </optional>
-      <ref name="audiodata"/>
-    </element>
-  </define>
-  <!-- end of audioobject.element -->
-  <define name="audioobject.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="audioobject.role.attrib"/>
-    <ref name="local.audioobject.attrib"/>
-  </define>
-  <!-- end of audioobject.attlist -->
-  <!-- end of audioobject.module -->
-  <define name="local.imageobject.attrib">
-    <empty/>
-  </define>
-  <define name="imageobject.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A wrapper for image data and its associated meta-information. -->
-  <define name="imageobject">
-    <element name="imageobject">
-      <ref name="imageobject.attlist"/>
-      <optional>
-        <ref name="objectinfo"/>
-      </optional>
-      <ref name="imagedata"/>
-    </element>
-  </define>
-  <!-- end of imageobject.element -->
-  <define name="imageobject.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="imageobject.role.attrib"/>
-    <ref name="local.imageobject.attrib"/>
-  </define>
-  <!-- end of imageobject.attlist -->
-  <!-- end of imageobject.module -->
-  <define name="local.textobject.attrib">
-    <empty/>
-  </define>
-  <define name="textobject.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A wrapper for a text description of an object and its associated meta-information. -->
-  <define name="textobject">
-    <element name="textobject">
-      <ref name="textobject.attlist"/>
-      <optional>
-        <ref name="objectinfo"/>
-      </optional>
-      <choice>
-        <ref name="phrase"/>
-        <ref name="textdata"/>
-        <oneOrMore>
-          <ref name="textobject.mix"/>
-        </oneOrMore>
-      </choice>
-    </element>
-  </define>
-  <!-- end of textobject.element -->
-  <define name="textobject.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="textobject.role.attrib"/>
-    <ref name="local.textobject.attrib"/>
-  </define>
-  <!-- end of textobject.attlist -->
-  <!-- end of textobject.module -->
-  <define name="local.objectinfo.attrib">
-    <empty/>
-  </define>
-  <define name="objectinfo.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:Meta-information for an object. -->
-  <define name="objectinfo">
-    <element name="objectinfo">
-      <ref name="objectinfo.attlist"/>
-      <oneOrMore>
-        <ref name="info.class"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of objectinfo.element -->
-  <define name="objectinfo.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="objectinfo.role.attrib"/>
-    <ref name="local.objectinfo.attrib"/>
-  </define>
-  <!-- end of objectinfo.attlist -->
-  <!-- end of objectinfo.module -->
-  <!--
-    EntityRef: Name of an external entity containing the content
-    of the object data
-  -->
-  <!--
-    FileRef: Filename, qualified by a pathname if desired,
-    designating the file containing the content of the object data
-  -->
-  <!-- Format: Notation of the element content, if any -->
-  <!-- SrcCredit: Information about the source of the image -->
-  <define name="local.objectdata.attrib">
-    <empty/>
-  </define>
-  <define name="objectdata.attrib">
-    <optional>
-      <attribute name="entityref">
-        <data type="ENTITY"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="fileref"/>
-    </optional>
-    <optional>
-      <attribute name="format">
-        <choice>
-          <ref name="notation.class"/>
-        </choice>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="srccredit"/>
-    </optional>
-    <ref name="local.objectdata.attrib"/>
-  </define>
-  <define name="local.videodata.attrib">
-    <empty/>
-  </define>
-  <define name="videodata.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:Pointer to external video data. -->
-  <define name="videodata">
-    <element name="videodata">
-      <ref name="videodata.attlist"/>
-      <empty/>
-    </element>
-  </define>
-  <!-- end of videodata.element -->
-  <!-- Width: Same as CALS reprowid (desired width) -->
-  <!-- Depth: Same as CALS reprodep (desired depth) -->
-  <!--
-    Align: Same as CALS hplace with 'none' removed; #IMPLIED means
-    application-specific
-  -->
-  <!-- Scale: Conflation of CALS hscale and vscale -->
-  <!-- Scalefit: Same as CALS scalefit -->
-  <define name="videodata.attlist" combine="interleave">
-    <optional>
-      <attribute name="width"/>
-    </optional>
-    <optional>
-      <attribute name="contentwidth"/>
-    </optional>
-    <optional>
-      <attribute name="depth"/>
-    </optional>
-    <optional>
-      <attribute name="contentdepth"/>
-    </optional>
-    <optional>
-      <attribute name="align">
-        <choice>
-          <value>left</value>
-          <value>right</value>
-          <value>center</value>
-        </choice>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="valign">
-        <choice>
-          <value>top</value>
-          <value>middle</value>
-          <value>bottom</value>
-        </choice>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="scale"/>
-    </optional>
-    <optional>
-      <attribute name="scalefit">
-        <ref name="yesorno.attvals"/>
-      </attribute>
-    </optional>
-    <ref name="objectdata.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="videodata.role.attrib"/>
-    <ref name="local.videodata.attrib"/>
-  </define>
-  <!-- end of videodata.attlist -->
-  <!-- end of videodata.module -->
-  <define name="local.audiodata.attrib">
-    <empty/>
-  </define>
-  <define name="audiodata.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:Pointer to external audio data. -->
-  <define name="audiodata">
-    <element name="audiodata">
-      <ref name="audiodata.attlist"/>
-      <empty/>
-    </element>
-  </define>
-  <!-- end of audiodata.element -->
-  <define name="audiodata.attlist" combine="interleave">
-    <ref name="objectdata.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="audiodata.role.attrib"/>
-    <ref name="local.audiodata.attrib"/>
-  </define>
-  <!-- end of audiodata.attlist -->
-  <!-- end of audiodata.module -->
-  <define name="local.imagedata.attrib">
-    <empty/>
-  </define>
-  <define name="imagedata.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:Pointer to external image data. -->
-  <define name="imagedata">
-    <element name="imagedata">
-      <ref name="imagedata.attlist"/>
-      <empty/>
-    </element>
-  </define>
-  <!-- end of imagedata.element -->
-  <!-- Width: Same as CALS reprowid (desired width) -->
-  <!-- Depth: Same as CALS reprodep (desired depth) -->
-  <!--
-    Align: Same as CALS hplace with 'none' removed; #IMPLIED means
-    application-specific
-  -->
-  <!-- Scale: Conflation of CALS hscale and vscale -->
-  <!-- Scalefit: Same as CALS scalefit -->
-  <define name="imagedata.attlist" combine="interleave">
-    <optional>
-      <attribute name="width"/>
-    </optional>
-    <optional>
-      <attribute name="contentwidth"/>
-    </optional>
-    <optional>
-      <attribute name="depth"/>
-    </optional>
-    <optional>
-      <attribute name="contentdepth"/>
-    </optional>
-    <optional>
-      <attribute name="align">
-        <choice>
-          <value>left</value>
-          <value>right</value>
-          <value>center</value>
-        </choice>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="valign">
-        <choice>
-          <value>top</value>
-          <value>middle</value>
-          <value>bottom</value>
-        </choice>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="scale"/>
-    </optional>
-    <optional>
-      <attribute name="scalefit">
-        <ref name="yesorno.attvals"/>
-      </attribute>
-    </optional>
-    <ref name="objectdata.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="imagedata.role.attrib"/>
-    <ref name="local.imagedata.attrib"/>
-  </define>
-  <!-- end of imagedata.attlist -->
-  <!-- end of imagedata.module -->
-  <define name="local.textdata.attrib">
-    <empty/>
-  </define>
-  <define name="textdata.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:Pointer to external text data. -->
-  <define name="textdata">
-    <element name="textdata">
-      <ref name="textdata.attlist"/>
-      <empty/>
-    </element>
-  </define>
-  <!-- end of textdata.element -->
-  <define name="textdata.attlist" combine="interleave">
-    <optional>
-      <attribute name="encoding"/>
-    </optional>
-    <ref name="objectdata.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="textdata.role.attrib"/>
-    <ref name="local.textdata.attrib"/>
-  </define>
-  <!-- end of textdata.attlist -->
-  <!-- end of textdata.module -->
-  <define name="local.mediaobjectco.attrib">
-    <empty/>
-  </define>
-  <define name="mediaobjectco.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A media object that contains callouts. -->
-  <define name="mediaobjectco">
-    <element name="mediaobjectco">
-      <ref name="mediaobjectco.attlist"/>
-      <optional>
-        <ref name="objectinfo"/>
-      </optional>
-      <ref name="imageobjectco"/>
-      <zeroOrMore>
-        <choice>
-          <ref name="imageobjectco"/>
-          <ref name="textobject"/>
-        </choice>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of mediaobjectco.element -->
-  <define name="mediaobjectco.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="mediaobjectco.role.attrib"/>
-    <ref name="local.mediaobjectco.attrib"/>
-  </define>
-  <!-- end of mediaobjectco.attlist -->
-  <!-- end of mediaobjectco.module -->
-  <define name="local.imageobjectco.attrib">
-    <empty/>
-  </define>
-  <define name="imageobjectco.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A wrapper for an image object with callouts. -->
-  <define name="imageobjectco">
-    <element name="imageobjectco">
-      <ref name="imageobjectco.attlist"/>
-      <ref name="areaspec"/>
-      <ref name="imageobject"/>
-      <zeroOrMore>
-        <ref name="calloutlist"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of imageobjectco.element -->
-  <define name="imageobjectco.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="imageobjectco.role.attrib"/>
-    <ref name="local.imageobjectco.attrib"/>
-  </define>
-  <!-- end of imageobjectco.attlist -->
-  <!-- end of imageobjectco.module -->
-  <!-- end of mediaobject.content.module -->
-  <!-- Equations ........................ -->
-  <!-- This PE provides a mechanism for replacing equation content, -->
-  <!-- perhaps adding a new or different model (e.g., MathML) -->
-  <define name="equation.content">
-    <optional>
-      <ref name="alt"/>
-    </optional>
-    <choice>
-      <oneOrMore>
-        <ref name="graphic"/>
-      </oneOrMore>
-      <oneOrMore>
-        <ref name="mediaobject"/>
-      </oneOrMore>
-      <oneOrMore>
-        <ref name="mathphrase"/>
-      </oneOrMore>
-    </choice>
-  </define>
-  <define name="inlineequation.content">
-    <optional>
-      <ref name="alt"/>
-    </optional>
-    <choice>
-      <oneOrMore>
-        <ref name="graphic"/>
-      </oneOrMore>
-      <oneOrMore>
-        <ref name="inlinemediaobject"/>
-      </oneOrMore>
-      <oneOrMore>
-        <ref name="mathphrase"/>
-      </oneOrMore>
-    </choice>
-  </define>
-  <define name="local.equation.attrib">
-    <empty/>
-  </define>
-  <define name="equation.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A displayed mathematical equation. -->
-  <define name="equation">
-    <element name="equation">
-      <ref name="equation.attlist"/>
-      <optional>
-        <ref name="blockinfo"/>
-      </optional>
-      <optional>
-        <ref name="formalobject.title.content"/>
-      </optional>
-      <choice>
-        <ref name="informalequation"/>
-        <ref name="equation.content"/>
-      </choice>
-    </element>
-  </define>
-  <!-- end of equation.element -->
-  <define name="equation.attlist" combine="interleave">
-    <optional>
-      <attribute name="floatstyle"/>
-    </optional>
-    <ref name="label.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="equation.role.attrib"/>
-    <ref name="local.equation.attrib"/>
-  </define>
-  <!-- end of equation.attlist -->
-  <!-- end of equation.module -->
-  <define name="local.informalequation.attrib">
-    <empty/>
-  </define>
-  <define name="informalequation.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A displayed mathematical equation without a title. -->
-  <define name="informalequation">
-    <element name="informalequation">
-      <ref name="informalequation.attlist"/>
-      <optional>
-        <ref name="blockinfo"/>
-      </optional>
-      <ref name="equation.content"/>
-    </element>
-  </define>
-  <!-- end of informalequation.element -->
-  <define name="informalequation.attlist" combine="interleave">
-    <optional>
-      <attribute name="floatstyle"/>
-    </optional>
-    <ref name="common.attrib"/>
-    <ref name="informalequation.role.attrib"/>
-    <ref name="local.informalequation.attrib"/>
-  </define>
-  <!-- end of informalequation.attlist -->
-  <!-- end of informalequation.module -->
-  <define name="local.inlineequation.attrib">
-    <empty/>
-  </define>
-  <define name="inlineequation.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A mathematical equation or expression occurring inline. -->
-  <define name="inlineequation">
-    <element name="inlineequation">
-      <ref name="inlineequation.attlist"/>
-      <ref name="inlineequation.content"/>
-    </element>
-  </define>
-  <!-- end of inlineequation.element -->
-  <define name="inlineequation.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="inlineequation.role.attrib"/>
-    <ref name="local.inlineequation.attrib"/>
-  </define>
-  <!-- end of inlineequation.attlist -->
-  <!-- end of inlineequation.module -->
-  <define name="local.alt.attrib">
-    <empty/>
-  </define>
-  <define name="alt.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:Text representation for a graphical element. -->
-  <define name="alt">
-    <element name="alt">
-      <ref name="alt.attlist"/>
-      <text/>
-    </element>
-  </define>
-  <!-- end of alt.element -->
-  <define name="alt.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="alt.role.attrib"/>
-    <ref name="local.alt.attrib"/>
-  </define>
-  <!-- end of alt.attlist -->
-  <!-- end of alt.module -->
-  <define name="local.mathphrase.attrib">
-    <empty/>
-  </define>
-  <define name="mathphrase.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A mathematical phrase, an expression that can be represented with ordinary text and a small amount of markup. -->
-  <define name="mathphrase">
-    <element name="mathphrase">
-      <ref name="mathphrase.attlist"/>
-      <zeroOrMore>
-        <choice>
-          <text/>
-          <ref name="subscript"/>
-          <ref name="superscript"/>
-          <ref name="emphasis"/>
-        </choice>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of mathphrase.element -->
-  <define name="mathphrase.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="mathphrase.role.attrib"/>
-    <ref name="local.mathphrase.attrib"/>
-  </define>
-  <!-- end of mathphrase.attlist -->
-  <!-- end of mathphrase.module -->
-  <!-- Tables ........................... -->
-  <!-- Choose a table model. CALS or OASIS XML Exchange -->
-  <!-- Do we allow the HTML table model as well? -->
-  <!-- ====================================================== -->
-  <!--
-    xhtmltbl.mod defines HTML tables and sets parameter
-    entities so that, when the CALS table module is read,
-    we end up allowing any table to be CALS or HTML.
-    i.e. This include must come first!
-  -->
-  <!-- ====================================================== -->
-  <include href="htmltblx.rng"/>
-  <!-- end of allow.html.tables -->
-  <!-- Add label and role attributes to table and informaltable -->
-  <!--
-    Add common attributes to Table, TGroup, TBody, THead, TFoot, Row,
-    EntryTbl, and Entry (and InformalTable element).
-  -->
-  <!-- Content model for Table. -->
-  <!-- Allow either objects or inlines; beware of REs between elements. -->
-  <!-- Reference CALS Table Model -->
-  <include href="calstblx.rng"/>
-  <!-- end of table.module -->
-  <!--
-    Note that InformalTable is dependent on some of the entity
-    declarations that customize Table.
-  -->
-  <define name="local.informaltable.attrib">
-    <empty/>
-  </define>
-  <!-- the following entity may have been declared by the XHTML table module -->
-  <!-- doc:A table without a title. -->
-  <define name="informaltable">
-    <element name="informaltable">
-      <ref name="informaltable.attlist"/>
-      <optional>
-        <ref name="blockinfo"/>
-      </optional>
-      <ref name="informal.tbl.table.mdl"/>
-    </element>
-  </define>
-  <!-- end of informaltable.element -->
-  <!--
-    Frame, Colsep, and Rowsep must be repeated because
-    they are not in entities in the table module.
-  -->
-  <!--
-    includes TabStyle, ToCentry, ShortEntry,
-    Orient, PgWide
-  -->
-  <!-- includes Label -->
-  <!-- includes common attributes -->
-  <define name="informaltable.attlist" combine="interleave">
-    <optional>
-      <attribute name="frame">
-        <choice>
-          <ref name="tbl.frame.attval"/>
-        </choice>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="colsep">
-        <ref name="yesorno.attvals"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="rowsep">
-        <ref name="yesorno.attvals"/>
-      </attribute>
-    </optional>
-    <ref name="common.table.attribs"/>
-    <ref name="tbl.table.att"/>
-    <ref name="local.informaltable.attrib"/>
-  </define>
-  <!-- end of informaltable.attlist -->
-  <!-- end of informaltable.module -->
-  <define name="local.caption.attrib">
-    <empty/>
-  </define>
-  <define name="caption.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A caption. -->
-  <define name="caption">
-    <element name="caption">
-      <ref name="caption.attlist"/>
-      <zeroOrMore>
-        <choice>
-          <text/>
-          <ref name="textobject.mix"/>
-        </choice>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of caption.element -->
-  <!-- attrs comes from HTML tables ... -->
-  <!-- common.attrib, but without ID because ID is in attrs -->
-  <define name="caption.attlist.content">
-    <ref name="caption.role.attrib"/>
-    <ref name="attrs"/>
-    <optional>
-      <attribute name="align">
-        <choice>
-          <value>top</value>
-          <value>bottom</value>
-          <value>left</value>
-          <value>right</value>
-        </choice>
-      </attribute>
-    </optional>
-    <ref name="local.caption.attrib"/>
-  </define>
-  <define name="caption.attlist" combine="interleave">
-    <ref name="caption.attlist.content"/>
-  </define>
-  <!-- end of caption.attlist -->
-  <!-- end of caption.module -->
-  <!-- ...................................................................... -->
-  <!-- Synopses ............................................................. -->
-  <!-- Synopsis ......................... -->
-  <define name="local.synopsis.attrib">
-    <empty/>
-  </define>
-  <define name="synopsis.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A general-purpose element for representing the syntax of commands or functions. -->
-  <define name="synopsis">
-    <element name="synopsis">
-      <ref name="synopsis.attlist"/>
-      <zeroOrMore>
-        <choice>
-          <ref name="para.char.mix"/>
-          <ref name="graphic"/>
-          <ref name="mediaobject"/>
-          <ref name="co"/>
-          <ref name="coref"/>
-          <ref name="textobject"/>
-          <ref name="lineannotation"/>
-        </choice>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of synopsis.element -->
-  <define name="synopsis.attlist" combine="interleave">
-    <ref name="label.attrib"/>
-    <ref name="linespecific.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="synopsis.role.attrib"/>
-    <ref name="local.synopsis.attrib"/>
-  </define>
-  <!-- end of synopsis.attlist -->
-  <!--  LineAnnotation (defined in the Inlines section, below) -->
-  <!-- end of synopsis.module -->
-  <!-- CmdSynopsis ...................... -->
-  <define name="local.cmdsynopsis.attrib">
-    <empty/>
-  </define>
-  <define name="cmdsynopsis.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A syntax summary for a software command. -->
-  <define name="cmdsynopsis">
-    <element name="cmdsynopsis">
-      <ref name="cmdsynopsis.attlist"/>
-      <oneOrMore>
-        <choice>
-          <ref name="command"/>
-          <ref name="arg"/>
-          <ref name="group"/>
-          <ref name="sbr"/>
-        </choice>
-      </oneOrMore>
-      <zeroOrMore>
-        <ref name="synopfragment"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of cmdsynopsis.element -->
-  <!--
-    Sepchar: Character that should separate command and all
-    top-level arguments; alternate value might be e.g., &Delta;
-  -->
-  <define name="cmdsynopsis.attlist" combine="interleave">
-    <ref name="label.attrib"/>
-    <optional>
-      <attribute name="sepchar" a:defaultValue=" "/>
-    </optional>
-    <optional>
-      <attribute name="cmdlength"/>
-    </optional>
-    <ref name="common.attrib"/>
-    <ref name="cmdsynopsis.role.attrib"/>
-    <ref name="local.cmdsynopsis.attrib"/>
-  </define>
-  <!-- end of cmdsynopsis.attlist -->
-  <!-- end of cmdsynopsis.module -->
-  <define name="local.arg.attrib">
-    <empty/>
-  </define>
-  <define name="arg.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:An argument in a CmdSynopsis. -->
-  <define name="arg">
-    <element name="arg">
-      <ref name="arg.attlist"/>
-      <zeroOrMore>
-        <choice>
-          <text/>
-          <ref name="arg"/>
-          <ref name="group"/>
-          <ref name="option"/>
-          <ref name="synopfragmentref"/>
-          <ref name="replaceable"/>
-          <ref name="sbr"/>
-        </choice>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of arg.element -->
-  <!--
-    Choice: Whether Arg must be supplied: Opt (optional to
-    supply, e.g. [arg]; the default), Req (required to supply,
-    e.g. {arg}), or Plain (required to supply, e.g. arg)
-  -->
-  <!--
-    Rep: whether Arg is repeatable: Norepeat (e.g. arg without
-    ellipsis; the default), or Repeat (e.g. arg...)
-  -->
-  <define name="arg.attlist" combine="interleave">
-    <optional>
-      <attribute name="choice" a:defaultValue="opt">
-        <choice>
-          <value>opt</value>
-          <value>req</value>
-          <value>plain</value>
-        </choice>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="rep" a:defaultValue="norepeat">
-        <choice>
-          <value>norepeat</value>
-          <value>repeat</value>
-        </choice>
-      </attribute>
-    </optional>
-    <ref name="common.attrib"/>
-    <ref name="arg.role.attrib"/>
-    <ref name="local.arg.attrib"/>
-  </define>
-  <!-- end of arg.attlist -->
-  <!-- end of arg.module -->
-  <define name="local.group.attrib">
-    <empty/>
-  </define>
-  <define name="group.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A group of elements in a CmdSynopsis. -->
-  <define name="group">
-    <element name="group">
-      <ref name="group.attlist"/>
-      <oneOrMore>
-        <choice>
-          <ref name="arg"/>
-          <ref name="group"/>
-          <ref name="option"/>
-          <ref name="synopfragmentref"/>
-          <ref name="replaceable"/>
-          <ref name="sbr"/>
-        </choice>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of group.element -->
-  <!--
-    Choice: Whether Group must be supplied: Opt (optional to
-    supply, e.g.  [g1|g2|g3]; the default), Req (required to
-    supply, e.g.  {g1|g2|g3}), Plain (required to supply,
-    e.g.  g1|g2|g3), OptMult (can supply zero or more, e.g.
-    [[g1|g2|g3]]), or ReqMult (must supply one or more, e.g.
-    {{g1|g2|g3}})
-  -->
-  <!--
-    Rep: whether Group is repeatable: Norepeat (e.g. group
-    without ellipsis; the default), or Repeat (e.g. group...)
-  -->
-  <define name="group.attlist" combine="interleave">
-    <optional>
-      <attribute name="choice" a:defaultValue="opt">
-        <choice>
-          <value>opt</value>
-          <value>req</value>
-          <value>plain</value>
-        </choice>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="rep" a:defaultValue="norepeat">
-        <choice>
-          <value>norepeat</value>
-          <value>repeat</value>
-        </choice>
-      </attribute>
-    </optional>
-    <ref name="common.attrib"/>
-    <ref name="group.role.attrib"/>
-    <ref name="local.group.attrib"/>
-  </define>
-  <!-- end of group.attlist -->
-  <!-- end of group.module -->
-  <define name="local.sbr.attrib">
-    <empty/>
-  </define>
-  <!-- Synopsis break -->
-  <define name="sbr.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:An explicit line break in a command synopsis. -->
-  <define name="sbr">
-    <element name="sbr">
-      <ref name="sbr.attlist"/>
-      <empty/>
-    </element>
-  </define>
-  <!-- end of sbr.element -->
-  <define name="sbr.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="sbr.role.attrib"/>
-    <ref name="local.sbr.attrib"/>
-  </define>
-  <!-- end of sbr.attlist -->
-  <!-- end of sbr.module -->
-  <define name="local.synopfragmentref.attrib">
-    <empty/>
-  </define>
-  <define name="synopfragmentref.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A reference to a fragment of a command synopsis. -->
-  <define name="synopfragmentref">
-    <element name="synopfragmentref">
-      <ref name="synopfragmentref.attlist"/>
-      <text/>
-    </element>
-  </define>
-  <!-- end of synopfragmentref.element -->
-  <!--
-    to SynopFragment of complex synopsis
-    material for separate referencing
-  -->
-  <define name="synopfragmentref.attlist" combine="interleave">
-    <ref name="linkendreq.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="synopfragmentref.role.attrib"/>
-    <ref name="local.synopfragmentref.attrib"/>
-  </define>
-  <!-- end of synopfragmentref.attlist -->
-  <!-- end of synopfragmentref.module -->
-  <define name="local.synopfragment.attrib">
-    <empty/>
-  </define>
-  <define name="synopfragment.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A portion of a CmdSynopsis broken out from the main body of the synopsis. -->
-  <define name="synopfragment">
-    <element name="synopfragment">
-      <ref name="synopfragment.attlist"/>
-      <oneOrMore>
-        <choice>
-          <ref name="arg"/>
-          <ref name="group"/>
-        </choice>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of synopfragment.element -->
-  <define name="synopfragment.attlist" combine="interleave">
-    <ref name="idreq.common.attrib"/>
-    <ref name="synopfragment.role.attrib"/>
-    <ref name="local.synopfragment.attrib"/>
-  </define>
-  <!-- end of synopfragment.attlist -->
-  <!-- end of synopfragment.module -->
-  <!--  Command (defined in the Inlines section, below) -->
-  <!--  Option (defined in the Inlines section, below) -->
-  <!--  Replaceable (defined in the Inlines section, below) -->
-  <!-- end of cmdsynopsis.content.module -->
-  <!-- FuncSynopsis ..................... -->
-  <define name="local.funcsynopsis.attrib">
-    <empty/>
-  </define>
-  <define name="funcsynopsis.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The syntax summary for a function definition. -->
-  <define name="funcsynopsis">
-    <element name="funcsynopsis">
-      <ref name="funcsynopsis.attlist"/>
-      <oneOrMore>
-        <choice>
-          <ref name="funcsynopsisinfo"/>
-          <ref name="funcprototype"/>
-        </choice>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of funcsynopsis.element -->
-  <define name="funcsynopsis.attlist" combine="interleave">
-    <ref name="label.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="funcsynopsis.role.attrib"/>
-    <ref name="local.funcsynopsis.attrib"/>
-  </define>
-  <!-- end of funcsynopsis.attlist -->
-  <!-- end of funcsynopsis.module -->
-  <define name="local.funcsynopsisinfo.attrib">
-    <empty/>
-  </define>
-  <define name="funcsynopsisinfo.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:Information supplementing the FuncDefs of a FuncSynopsis. -->
-  <define name="funcsynopsisinfo">
-    <element name="funcsynopsisinfo">
-      <ref name="funcsynopsisinfo.attlist"/>
-      <zeroOrMore>
-        <choice>
-          <ref name="cptr.char.mix"/>
-          <ref name="textobject"/>
-          <ref name="lineannotation"/>
-        </choice>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of funcsynopsisinfo.element -->
-  <define name="funcsynopsisinfo.attlist" combine="interleave">
-    <ref name="linespecific.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="funcsynopsisinfo.role.attrib"/>
-    <ref name="local.funcsynopsisinfo.attrib"/>
-  </define>
-  <!-- end of funcsynopsisinfo.attlist -->
-  <!-- end of funcsynopsisinfo.module -->
-  <define name="local.funcprototype.attrib">
-    <empty/>
-  </define>
-  <define name="funcprototype.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The prototype of a function. -->
-  <define name="funcprototype">
-    <element name="funcprototype">
-      <ref name="funcprototype.attlist"/>
-      <zeroOrMore>
-        <ref name="modifier"/>
-      </zeroOrMore>
-      <ref name="funcdef"/>
-      <choice>
-        <ref name="void"/>
-        <ref name="varargs"/>
-        <group>
-          <oneOrMore>
-            <ref name="paramdef"/>
-          </oneOrMore>
-          <optional>
-            <ref name="varargs"/>
-          </optional>
-        </group>
-      </choice>
-      <zeroOrMore>
-        <ref name="modifier"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of funcprototype.element -->
-  <define name="funcprototype.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="funcprototype.role.attrib"/>
-    <ref name="local.funcprototype.attrib"/>
-  </define>
-  <!-- end of funcprototype.attlist -->
-  <!-- end of funcprototype.module -->
-  <define name="local.funcdef.attrib">
-    <empty/>
-  </define>
-  <define name="funcdef.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A function (subroutine) name and its return type. -->
-  <define name="funcdef">
-    <element name="funcdef">
-      <ref name="funcdef.attlist"/>
-      <zeroOrMore>
-        <choice>
-          <text/>
-          <ref name="type"/>
-          <ref name="replaceable"/>
-          <ref name="function"/>
-        </choice>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of funcdef.element -->
-  <define name="funcdef.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="funcdef.role.attrib"/>
-    <ref name="local.funcdef.attrib"/>
-  </define>
-  <!-- end of funcdef.attlist -->
-  <!-- end of funcdef.module -->
-  <define name="local.void.attrib">
-    <empty/>
-  </define>
-  <define name="void.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:An empty element in a function synopsis indicating that the function in question takes no arguments. -->
-  <define name="void">
-    <element name="void">
-      <ref name="void.attlist"/>
-      <empty/>
-    </element>
-  </define>
-  <!-- end of void.element -->
-  <define name="void.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="void.role.attrib"/>
-    <ref name="local.void.attrib"/>
-  </define>
-  <!-- end of void.attlist -->
-  <!-- end of void.module -->
-  <define name="local.varargs.attrib">
-    <empty/>
-  </define>
-  <define name="varargs.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:An empty element in a function synopsis indicating a variable number of arguments. -->
-  <define name="varargs">
-    <element name="varargs">
-      <ref name="varargs.attlist"/>
-      <empty/>
-    </element>
-  </define>
-  <!-- end of varargs.element -->
-  <define name="varargs.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="varargs.role.attrib"/>
-    <ref name="local.varargs.attrib"/>
-  </define>
-  <!-- end of varargs.attlist -->
-  <!-- end of varargs.module -->
-  <!--
-    Processing assumes that only one Parameter will appear in a
-    ParamDef, and that FuncParams will be used at most once, for
-    providing information on the "inner parameters" for parameters that
-    are pointers to functions.
-  -->
-  <define name="local.paramdef.attrib">
-    <empty/>
-  </define>
-  <define name="paramdef.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:Information about a function parameter in a programming language. -->
-  <define name="paramdef">
-    <element name="paramdef">
-      <ref name="paramdef.attlist"/>
-      <zeroOrMore>
-        <choice>
-          <text/>
-          <ref name="initializer"/>
-          <ref name="type"/>
-          <ref name="replaceable"/>
-          <ref name="parameter"/>
-          <ref name="funcparams"/>
-        </choice>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of paramdef.element -->
-  <define name="paramdef.attlist" combine="interleave">
-    <optional>
-      <attribute name="choice">
-        <choice>
-          <value>opt</value>
-          <value>req</value>
-        </choice>
-      </attribute>
-    </optional>
-    <ref name="common.attrib"/>
-    <ref name="paramdef.role.attrib"/>
-    <ref name="local.paramdef.attrib"/>
-  </define>
-  <!-- end of paramdef.attlist -->
-  <!-- end of paramdef.module -->
-  <define name="local.funcparams.attrib">
-    <empty/>
-  </define>
-  <define name="funcparams.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:Parameters for a function referenced through a function pointer in a synopsis. -->
-  <define name="funcparams">
-    <element name="funcparams">
-      <ref name="funcparams.attlist"/>
-      <zeroOrMore>
-        <ref name="cptr.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of funcparams.element -->
-  <define name="funcparams.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="funcparams.role.attrib"/>
-    <ref name="local.funcparams.attrib"/>
-  </define>
-  <!-- end of funcparams.attlist -->
-  <!-- end of funcparams.module -->
-  <!--  LineAnnotation (defined in the Inlines section, below) -->
-  <!--  Replaceable (defined in the Inlines section, below) -->
-  <!--  Function (defined in the Inlines section, below) -->
-  <!--  Parameter (defined in the Inlines section, below) -->
-  <!-- end of funcsynopsis.content.module -->
-  <!-- ClassSynopsis ..................... -->
-  <define name="local.classsynopsis.attrib">
-    <empty/>
-  </define>
-  <define name="classsynopsis.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The syntax summary for a class definition. -->
-  <define name="classsynopsis">
-    <element name="classsynopsis">
-      <ref name="classsynopsis.attlist"/>
-      <oneOrMore>
-        <choice>
-          <ref name="ooclass"/>
-          <ref name="oointerface"/>
-          <ref name="ooexception"/>
-        </choice>
-      </oneOrMore>
-      <zeroOrMore>
-        <choice>
-          <ref name="classsynopsisinfo"/>
-          <ref name="fieldsynopsis"/>
-          <ref name="method.synop.class"/>
-        </choice>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of classsynopsis.element -->
-  <define name="classsynopsis.attlist" combine="interleave">
-    <optional>
-      <attribute name="language"/>
-    </optional>
-    <optional>
-      <attribute name="class" a:defaultValue="class">
-        <choice>
-          <value>class</value>
-          <value>interface</value>
-        </choice>
-      </attribute>
-    </optional>
-    <ref name="common.attrib"/>
-    <ref name="classsynopsis.role.attrib"/>
-    <ref name="local.classsynopsis.attrib"/>
-  </define>
-  <!-- end of classsynopsis.attlist -->
-  <!-- end of classsynopsis.module -->
-  <define name="local.classsynopsisinfo.attrib">
-    <empty/>
-  </define>
-  <define name="classsynopsisinfo.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:Information supplementing the contents of a ClassSynopsis. -->
-  <define name="classsynopsisinfo">
-    <element name="classsynopsisinfo">
-      <ref name="classsynopsisinfo.attlist"/>
-      <zeroOrMore>
-        <choice>
-          <ref name="cptr.char.mix"/>
-          <ref name="textobject"/>
-          <ref name="lineannotation"/>
-        </choice>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of classsynopsisinfo.element -->
-  <define name="classsynopsisinfo.attlist" combine="interleave">
-    <ref name="linespecific.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="classsynopsisinfo.role.attrib"/>
-    <ref name="local.classsynopsisinfo.attrib"/>
-  </define>
-  <!-- end of classsynopsisinfo.attlist -->
-  <!-- end of classsynopsisinfo.module -->
-  <define name="local.ooclass.attrib">
-    <empty/>
-  </define>
-  <define name="ooclass.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A class in an object-oriented programming language. -->
-  <define name="ooclass">
-    <element name="ooclass">
-      <ref name="ooclass.attlist"/>
-      <zeroOrMore>
-        <choice>
-          <ref name="modifier"/>
-          <ref name="package"/>
-        </choice>
-      </zeroOrMore>
-      <ref name="classname"/>
-    </element>
-  </define>
-  <!-- end of ooclass.element -->
-  <define name="ooclass.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="ooclass.role.attrib"/>
-    <ref name="local.ooclass.attrib"/>
-  </define>
-  <!-- end of ooclass.attlist -->
-  <!-- end of ooclass.module -->
-  <define name="local.oointerface.attrib">
-    <empty/>
-  </define>
-  <define name="oointerface.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:An interface in an object-oriented programming language. -->
-  <define name="oointerface">
-    <element name="oointerface">
-      <ref name="oointerface.attlist"/>
-      <zeroOrMore>
-        <choice>
-          <ref name="modifier"/>
-          <ref name="package"/>
-        </choice>
-      </zeroOrMore>
-      <ref name="interfacename"/>
-    </element>
-  </define>
-  <!-- end of oointerface.element -->
-  <define name="oointerface.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="oointerface.role.attrib"/>
-    <ref name="local.oointerface.attrib"/>
-  </define>
-  <!-- end of oointerface.attlist -->
-  <!-- end of oointerface.module -->
-  <define name="local.ooexception.attrib">
-    <empty/>
-  </define>
-  <define name="ooexception.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:An exception in an object-oriented programming language. -->
-  <define name="ooexception">
-    <element name="ooexception">
-      <ref name="ooexception.attlist"/>
-      <zeroOrMore>
-        <choice>
-          <ref name="modifier"/>
-          <ref name="package"/>
-        </choice>
-      </zeroOrMore>
-      <ref name="exceptionname"/>
-    </element>
-  </define>
-  <!-- end of ooexception.element -->
-  <define name="ooexception.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="ooexception.role.attrib"/>
-    <ref name="local.ooexception.attrib"/>
-  </define>
-  <!-- end of ooexception.attlist -->
-  <!-- end of ooexception.module -->
-  <define name="local.modifier.attrib">
-    <empty/>
-  </define>
-  <define name="modifier.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:Modifiers in a synopsis. -->
-  <define name="modifier">
-    <element name="modifier">
-      <ref name="modifier.attlist"/>
-      <zeroOrMore>
-        <ref name="smallcptr.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of modifier.element -->
-  <define name="modifier.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="modifier.role.attrib"/>
-    <ref name="local.modifier.attrib"/>
-  </define>
-  <!-- end of modifier.attlist -->
-  <!-- end of modifier.module -->
-  <define name="local.interfacename.attrib">
-    <empty/>
-  </define>
-  <define name="interfacename.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The name of an interface. -->
-  <define name="interfacename">
-    <element name="interfacename">
-      <ref name="interfacename.attlist"/>
-      <zeroOrMore>
-        <ref name="cptr.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of interfacename.element -->
-  <define name="interfacename.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="interfacename.role.attrib"/>
-    <ref name="local.interfacename.attrib"/>
-  </define>
-  <!-- end of interfacename.attlist -->
-  <!-- end of interfacename.module -->
-  <define name="local.exceptionname.attrib">
-    <empty/>
-  </define>
-  <define name="exceptionname.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The name of an exception. -->
-  <define name="exceptionname">
-    <element name="exceptionname">
-      <ref name="exceptionname.attlist"/>
-      <zeroOrMore>
-        <ref name="smallcptr.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of exceptionname.element -->
-  <define name="exceptionname.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="exceptionname.role.attrib"/>
-    <ref name="local.exceptionname.attrib"/>
-  </define>
-  <!-- end of exceptionname.attlist -->
-  <!-- end of exceptionname.module -->
-  <define name="local.fieldsynopsis.attrib">
-    <empty/>
-  </define>
-  <define name="fieldsynopsis.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The name of a field in a class definition. -->
-  <define name="fieldsynopsis">
-    <element name="fieldsynopsis">
-      <ref name="fieldsynopsis.attlist"/>
-      <zeroOrMore>
-        <ref name="modifier"/>
-      </zeroOrMore>
-      <optional>
-        <ref name="type"/>
-      </optional>
-      <ref name="varname"/>
-      <optional>
-        <ref name="initializer"/>
-      </optional>
-    </element>
-  </define>
-  <!-- end of fieldsynopsis.element -->
-  <define name="fieldsynopsis.attlist" combine="interleave">
-    <optional>
-      <attribute name="language"/>
-    </optional>
-    <ref name="common.attrib"/>
-    <ref name="fieldsynopsis.role.attrib"/>
-    <ref name="local.fieldsynopsis.attrib"/>
-  </define>
-  <!-- end of fieldsynopsis.attlist -->
-  <!-- end of fieldsynopsis.module -->
-  <define name="local.initializer.attrib">
-    <empty/>
-  </define>
-  <define name="initializer.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The initializer for a FieldSynopsis. -->
-  <define name="initializer">
-    <element name="initializer">
-      <ref name="initializer.attlist"/>
-      <zeroOrMore>
-        <ref name="smallcptr.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of initializer.element -->
-  <define name="initializer.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="initializer.role.attrib"/>
-    <ref name="local.initializer.attrib"/>
-  </define>
-  <!-- end of initializer.attlist -->
-  <!-- end of initializer.module -->
-  <define name="local.constructorsynopsis.attrib">
-    <empty/>
-  </define>
-  <define name="constructorsynopsis.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A syntax summary for a constructor. -->
-  <define name="constructorsynopsis">
-    <element name="constructorsynopsis">
-      <ref name="constructorsynopsis.attlist"/>
-      <zeroOrMore>
-        <ref name="modifier"/>
-      </zeroOrMore>
-      <optional>
-        <ref name="methodname"/>
-      </optional>
-      <choice>
-        <oneOrMore>
-          <ref name="methodparam"/>
-        </oneOrMore>
-        <optional>
-          <ref name="void"/>
-        </optional>
-      </choice>
-      <zeroOrMore>
-        <ref name="exceptionname"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of constructorsynopsis.element -->
-  <define name="constructorsynopsis.attlist" combine="interleave">
-    <optional>
-      <attribute name="language"/>
-    </optional>
-    <ref name="common.attrib"/>
-    <ref name="constructorsynopsis.role.attrib"/>
-    <ref name="local.constructorsynopsis.attrib"/>
-  </define>
-  <!-- end of constructorsynopsis.attlist -->
-  <!-- end of constructorsynopsis.module -->
-  <define name="local.destructorsynopsis.attrib">
-    <empty/>
-  </define>
-  <define name="destructorsynopsis.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A syntax summary for a destructor. -->
-  <define name="destructorsynopsis">
-    <element name="destructorsynopsis">
-      <ref name="destructorsynopsis.attlist"/>
-      <zeroOrMore>
-        <ref name="modifier"/>
-      </zeroOrMore>
-      <optional>
-        <ref name="methodname"/>
-      </optional>
-      <choice>
-        <oneOrMore>
-          <ref name="methodparam"/>
-        </oneOrMore>
-        <optional>
-          <ref name="void"/>
-        </optional>
-      </choice>
-      <zeroOrMore>
-        <ref name="exceptionname"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of destructorsynopsis.element -->
-  <define name="destructorsynopsis.attlist" combine="interleave">
-    <optional>
-      <attribute name="language"/>
-    </optional>
-    <ref name="common.attrib"/>
-    <ref name="destructorsynopsis.role.attrib"/>
-    <ref name="local.destructorsynopsis.attrib"/>
-  </define>
-  <!-- end of destructorsynopsis.attlist -->
-  <!-- end of destructorsynopsis.module -->
-  <define name="local.methodsynopsis.attrib">
-    <empty/>
-  </define>
-  <define name="methodsynopsis.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A syntax summary for a method. -->
-  <define name="methodsynopsis">
-    <element name="methodsynopsis">
-      <ref name="methodsynopsis.attlist"/>
-      <zeroOrMore>
-        <ref name="modifier"/>
-      </zeroOrMore>
-      <optional>
-        <choice>
-          <ref name="type"/>
-          <ref name="void"/>
-        </choice>
-      </optional>
-      <ref name="methodname"/>
-      <choice>
-        <oneOrMore>
-          <ref name="methodparam"/>
-        </oneOrMore>
-        <optional>
-          <ref name="void"/>
-        </optional>
-      </choice>
-      <zeroOrMore>
-        <ref name="exceptionname"/>
-      </zeroOrMore>
-      <zeroOrMore>
-        <ref name="modifier"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of methodsynopsis.element -->
-  <define name="methodsynopsis.attlist" combine="interleave">
-    <optional>
-      <attribute name="language"/>
-    </optional>
-    <ref name="common.attrib"/>
-    <ref name="methodsynopsis.role.attrib"/>
-    <ref name="local.methodsynopsis.attrib"/>
-  </define>
-  <!-- end of methodsynopsis.attlist -->
-  <!-- end of methodsynopsis.module -->
-  <define name="local.methodname.attrib">
-    <empty/>
-  </define>
-  <define name="methodname.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The name of a method. -->
-  <define name="methodname">
-    <element name="methodname">
-      <ref name="methodname.attlist"/>
-      <zeroOrMore>
-        <ref name="smallcptr.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of methodname.element -->
-  <define name="methodname.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="methodname.role.attrib"/>
-    <ref name="local.methodname.attrib"/>
-  </define>
-  <!-- end of methodname.attlist -->
-  <!-- end of methodname.module -->
-  <define name="local.methodparam.attrib">
-    <empty/>
-  </define>
-  <define name="methodparam.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:Parameters to a method. -->
-  <define name="methodparam">
-    <element name="methodparam">
-      <ref name="methodparam.attlist"/>
-      <zeroOrMore>
-        <ref name="modifier"/>
-      </zeroOrMore>
-      <optional>
-        <ref name="type"/>
-      </optional>
-      <choice>
-        <group>
-          <ref name="parameter"/>
-          <optional>
-            <ref name="initializer"/>
-          </optional>
-        </group>
-        <ref name="funcparams"/>
-      </choice>
-      <zeroOrMore>
-        <ref name="modifier"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of methodparam.element -->
-  <define name="methodparam.attlist" combine="interleave">
-    <optional>
-      <attribute name="choice" a:defaultValue="req">
-        <choice>
-          <value>opt</value>
-          <value>req</value>
-          <value>plain</value>
-        </choice>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="rep" a:defaultValue="norepeat">
-        <choice>
-          <value>norepeat</value>
-          <value>repeat</value>
-        </choice>
-      </attribute>
-    </optional>
-    <ref name="common.attrib"/>
-    <ref name="methodparam.role.attrib"/>
-    <ref name="local.methodparam.attrib"/>
-  </define>
-  <!-- end of methodparam.attlist -->
-  <!-- end of methodparam.module -->
-  <!-- end of classsynopsis.content.module -->
-  <!-- ...................................................................... -->
-  <!-- Document information entities and elements ........................... -->
-  <!--
-    The document information elements include some elements that are
-    currently used only in the document hierarchy module. They are
-    defined here so that they will be available for use in customized
-    document hierarchies.
-  -->
-  <!-- .................................. -->
-  <!-- Ackno ............................ -->
-  <define name="local.ackno.attrib">
-    <empty/>
-  </define>
-  <define name="ackno.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:Acknowledgements in an Article. -->
-  <define name="ackno">
-    <element name="ackno">
-      <ref name="ackno.attlist"/>
-      <zeroOrMore>
-        <ref name="docinfo.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of ackno.element -->
-  <define name="ackno.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="ackno.role.attrib"/>
-    <ref name="local.ackno.attrib"/>
-  </define>
-  <!-- end of ackno.attlist -->
-  <!-- end of ackno.module -->
-  <!-- Address .......................... -->
-  <define name="local.address.attrib">
-    <empty/>
-  </define>
-  <define name="address.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A real-world address, generally a postal address. -->
-  <define name="address">
-    <element name="address">
-      <ref name="address.attlist"/>
-      <zeroOrMore>
-        <choice>
-          <text/>
-          <ref name="personname"/>
-          <ref name="person.ident.mix"/>
-          <ref name="street"/>
-          <ref name="pob"/>
-          <ref name="postcode"/>
-          <ref name="city"/>
-          <ref name="state"/>
-          <ref name="country"/>
-          <ref name="phone"/>
-          <ref name="fax"/>
-          <ref name="email"/>
-          <ref name="otheraddr"/>
-        </choice>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of address.element -->
-  <define name="address.attlist" combine="interleave">
-    <ref name="linespecific.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="address.role.attrib"/>
-    <ref name="local.address.attrib"/>
-  </define>
-  <!-- end of address.attlist -->
-  <!-- end of address.module -->
-  <define name="local.street.attrib">
-    <empty/>
-  </define>
-  <define name="street.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A street address in an address. -->
-  <define name="street">
-    <element name="street">
-      <ref name="street.attlist"/>
-      <zeroOrMore>
-        <ref name="docinfo.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of street.element -->
-  <define name="street.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="street.role.attrib"/>
-    <ref name="local.street.attrib"/>
-  </define>
-  <!-- end of street.attlist -->
-  <!-- end of street.module -->
-  <define name="local.pob.attrib">
-    <empty/>
-  </define>
-  <define name="pob.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A post office box in an address. -->
-  <define name="pob">
-    <element name="pob">
-      <ref name="pob.attlist"/>
-      <zeroOrMore>
-        <ref name="docinfo.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of pob.element -->
-  <define name="pob.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="pob.role.attrib"/>
-    <ref name="local.pob.attrib"/>
-  </define>
-  <!-- end of pob.attlist -->
-  <!-- end of pob.module -->
-  <define name="local.postcode.attrib">
-    <empty/>
-  </define>
-  <define name="postcode.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A postal code in an address. -->
-  <define name="postcode">
-    <element name="postcode">
-      <ref name="postcode.attlist"/>
-      <zeroOrMore>
-        <ref name="docinfo.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of postcode.element -->
-  <define name="postcode.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="postcode.role.attrib"/>
-    <ref name="local.postcode.attrib"/>
-  </define>
-  <!-- end of postcode.attlist -->
-  <!-- end of postcode.module -->
-  <define name="local.city.attrib">
-    <empty/>
-  </define>
-  <define name="city.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The name of a city in an address. -->
-  <define name="city">
-    <element name="city">
-      <ref name="city.attlist"/>
-      <zeroOrMore>
-        <ref name="docinfo.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of city.element -->
-  <define name="city.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="city.role.attrib"/>
-    <ref name="local.city.attrib"/>
-  </define>
-  <!-- end of city.attlist -->
-  <!-- end of city.module -->
-  <define name="local.state.attrib">
-    <empty/>
-  </define>
-  <define name="state.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A state or province in an address. -->
-  <define name="state">
-    <element name="state">
-      <ref name="state.attlist"/>
-      <zeroOrMore>
-        <ref name="docinfo.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of state.element -->
-  <define name="state.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="state.role.attrib"/>
-    <ref name="local.state.attrib"/>
-  </define>
-  <!-- end of state.attlist -->
-  <!-- end of state.module -->
-  <define name="local.country.attrib">
-    <empty/>
-  </define>
-  <define name="country.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The name of a country. -->
-  <define name="country">
-    <element name="country">
-      <ref name="country.attlist"/>
-      <zeroOrMore>
-        <ref name="docinfo.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of country.element -->
-  <define name="country.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="country.role.attrib"/>
-    <ref name="local.country.attrib"/>
-  </define>
-  <!-- end of country.attlist -->
-  <!-- end of country.module -->
-  <define name="local.phone.attrib">
-    <empty/>
-  </define>
-  <define name="phone.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A telephone number. -->
-  <define name="phone">
-    <element name="phone">
-      <ref name="phone.attlist"/>
-      <zeroOrMore>
-        <ref name="docinfo.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of phone.element -->
-  <define name="phone.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="phone.role.attrib"/>
-    <ref name="local.phone.attrib"/>
-  </define>
-  <!-- end of phone.attlist -->
-  <!-- end of phone.module -->
-  <define name="local.fax.attrib">
-    <empty/>
-  </define>
-  <define name="fax.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A fax number. -->
-  <define name="fax">
-    <element name="fax">
-      <ref name="fax.attlist"/>
-      <zeroOrMore>
-        <ref name="docinfo.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of fax.element -->
-  <define name="fax.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="fax.role.attrib"/>
-    <ref name="local.fax.attrib"/>
-  </define>
-  <!-- end of fax.attlist -->
-  <!-- end of fax.module -->
-  <!--  Email (defined in the Inlines section, below) -->
-  <define name="local.otheraddr.attrib">
-    <empty/>
-  </define>
-  <define name="otheraddr.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:Uncategorized information in address. -->
-  <define name="otheraddr">
-    <element name="otheraddr">
-      <ref name="otheraddr.attlist"/>
-      <zeroOrMore>
-        <ref name="docinfo.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of otheraddr.element -->
-  <define name="otheraddr.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="otheraddr.role.attrib"/>
-    <ref name="local.otheraddr.attrib"/>
-  </define>
-  <!-- end of otheraddr.attlist -->
-  <!-- end of otheraddr.module -->
-  <!-- end of address.content.module -->
-  <!-- Affiliation ...................... -->
-  <define name="local.affiliation.attrib">
-    <empty/>
-  </define>
-  <define name="affiliation.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The institutional affiliation of an individual. -->
-  <define name="affiliation">
-    <element name="affiliation">
-      <ref name="affiliation.attlist"/>
-      <optional>
-        <ref name="shortaffil"/>
-      </optional>
-      <zeroOrMore>
-        <ref name="jobtitle"/>
-      </zeroOrMore>
-      <optional>
-        <ref name="orgname"/>
-      </optional>
-      <zeroOrMore>
-        <ref name="orgdiv"/>
-      </zeroOrMore>
-      <zeroOrMore>
-        <ref name="address"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of affiliation.element -->
-  <define name="affiliation.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="affiliation.role.attrib"/>
-    <ref name="local.affiliation.attrib"/>
-  </define>
-  <!-- end of affiliation.attlist -->
-  <!-- end of affiliation.module -->
-  <define name="local.shortaffil.attrib">
-    <empty/>
-  </define>
-  <define name="shortaffil.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A brief description of an affiliation. -->
-  <define name="shortaffil">
-    <element name="shortaffil">
-      <ref name="shortaffil.attlist"/>
-      <zeroOrMore>
-        <ref name="docinfo.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of shortaffil.element -->
-  <define name="shortaffil.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="shortaffil.role.attrib"/>
-    <ref name="local.shortaffil.attrib"/>
-  </define>
-  <!-- end of shortaffil.attlist -->
-  <!-- end of shortaffil.module -->
-  <define name="local.jobtitle.attrib">
-    <empty/>
-  </define>
-  <define name="jobtitle.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The title of an individual in an organization. -->
-  <define name="jobtitle">
-    <element name="jobtitle">
-      <ref name="jobtitle.attlist"/>
-      <zeroOrMore>
-        <ref name="docinfo.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of jobtitle.element -->
-  <define name="jobtitle.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="jobtitle.role.attrib"/>
-    <ref name="local.jobtitle.attrib"/>
-  </define>
-  <!-- end of jobtitle.attlist -->
-  <!-- end of jobtitle.module -->
-  <!--  OrgName (defined elsewhere in this section) -->
-  <define name="local.orgdiv.attrib">
-    <empty/>
-  </define>
-  <define name="orgdiv.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A division of an organization. -->
-  <define name="orgdiv">
-    <element name="orgdiv">
-      <ref name="orgdiv.attlist"/>
-      <zeroOrMore>
-        <ref name="docinfo.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of orgdiv.element -->
-  <define name="orgdiv.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="orgdiv.role.attrib"/>
-    <ref name="local.orgdiv.attrib"/>
-  </define>
-  <!-- end of orgdiv.attlist -->
-  <!-- end of orgdiv.module -->
-  <!--  Address (defined elsewhere in this section) -->
-  <!-- end of affiliation.content.module -->
-  <!-- ArtPageNums ...................... -->
-  <define name="local.artpagenums.attrib">
-    <empty/>
-  </define>
-  <define name="artpagenums.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The page numbers of an article as published. -->
-  <define name="artpagenums">
-    <element name="artpagenums">
-      <ref name="artpagenums.attlist"/>
-      <zeroOrMore>
-        <ref name="docinfo.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of artpagenums.element -->
-  <define name="artpagenums.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="artpagenums.role.attrib"/>
-    <ref name="local.artpagenums.attrib"/>
-  </define>
-  <!-- end of artpagenums.attlist -->
-  <!-- end of artpagenums.module -->
-  <!-- PersonName -->
-  <define name="local.personname.attrib">
-    <empty/>
-  </define>
-  <define name="personname.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The personal name of an individual. -->
-  <define name="personname">
-    <element name="personname">
-      <ref name="personname.attlist"/>
-      <oneOrMore>
-        <choice>
-          <ref name="honorific"/>
-          <ref name="firstname"/>
-          <ref name="surname"/>
-          <ref name="lineage"/>
-          <ref name="othername"/>
-        </choice>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of personname.element -->
-  <define name="personname.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="personname.role.attrib"/>
-    <ref name="local.personname.attrib"/>
-  </define>
-  <!-- end of personname.attlist -->
-  <!-- end of personname.module -->
-  <!-- Author ........................... -->
-  <define name="local.author.attrib">
-    <empty/>
-  </define>
-  <define name="author.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The name of an individual author. -->
-  <define name="author">
-    <element name="author">
-      <ref name="author.attlist"/>
-      <choice>
-        <ref name="personname"/>
-        <oneOrMore>
-          <ref name="person.ident.mix"/>
-        </oneOrMore>
-      </choice>
-      <zeroOrMore>
-        <choice>
-          <ref name="personblurb"/>
-          <ref name="email"/>
-          <ref name="address"/>
-        </choice>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of author.element -->
-  <define name="author.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="author.role.attrib"/>
-    <ref name="local.author.attrib"/>
-  </define>
-  <!-- end of author.attlist -->
-  <!-- (see "Personal identity elements" for %person.ident.mix;) -->
-  <!-- end of author.module -->
-  <!-- AuthorGroup ...................... -->
-  <define name="local.authorgroup.attrib">
-    <empty/>
-  </define>
-  <define name="authorgroup.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:Wrapper for author information when a document has multiple authors or collabarators. -->
-  <define name="authorgroup">
-    <element name="authorgroup">
-      <ref name="authorgroup.attlist"/>
-      <oneOrMore>
-        <choice>
-          <ref name="author"/>
-          <ref name="editor"/>
-          <ref name="collab"/>
-          <ref name="corpauthor"/>
-          <ref name="corpcredit"/>
-          <ref name="othercredit"/>
-        </choice>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of authorgroup.element -->
-  <define name="authorgroup.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="authorgroup.role.attrib"/>
-    <ref name="local.authorgroup.attrib"/>
-  </define>
-  <!-- end of authorgroup.attlist -->
-  <!-- end of authorgroup.module -->
-  <!--  Author (defined elsewhere in this section) -->
-  <!--  Editor (defined elsewhere in this section) -->
-  <define name="local.collab.attrib">
-    <empty/>
-  </define>
-  <define name="collab.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:Identifies a collaborator. -->
-  <define name="collab">
-    <element name="collab">
-      <ref name="collab.attlist"/>
-      <ref name="collabname"/>
-      <zeroOrMore>
-        <ref name="affiliation"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of collab.element -->
-  <define name="collab.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="collab.role.attrib"/>
-    <ref name="local.collab.attrib"/>
-  </define>
-  <!-- end of collab.attlist -->
-  <!-- end of collab.module -->
-  <define name="local.collabname.attrib">
-    <empty/>
-  </define>
-  <define name="collabname.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The name of a collaborator. -->
-  <define name="collabname">
-    <element name="collabname">
-      <ref name="collabname.attlist"/>
-      <zeroOrMore>
-        <ref name="docinfo.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of collabname.element -->
-  <define name="collabname.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="collabname.role.attrib"/>
-    <ref name="local.collabname.attrib"/>
-  </define>
-  <!-- end of collabname.attlist -->
-  <!-- end of collabname.module -->
-  <!--  Affiliation (defined elsewhere in this section) -->
-  <!-- end of collab.content.module -->
-  <!--  CorpAuthor (defined elsewhere in this section) -->
-  <!--  OtherCredit (defined elsewhere in this section) -->
-  <!-- end of authorgroup.content.module -->
-  <!-- AuthorInitials ................... -->
-  <define name="local.authorinitials.attrib">
-    <empty/>
-  </define>
-  <define name="authorinitials.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The initials or other short identifier for an author. -->
-  <define name="authorinitials">
-    <element name="authorinitials">
-      <ref name="authorinitials.attlist"/>
-      <zeroOrMore>
-        <ref name="docinfo.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of authorinitials.element -->
-  <define name="authorinitials.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="authorinitials.role.attrib"/>
-    <ref name="local.authorinitials.attrib"/>
-  </define>
-  <!-- end of authorinitials.attlist -->
-  <!-- end of authorinitials.module -->
-  <!-- ConfGroup ........................ -->
-  <define name="local.confgroup.attrib">
-    <empty/>
-  </define>
-  <define name="confgroup.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A wrapper for document meta-information about a conference. -->
-  <define name="confgroup">
-    <element name="confgroup">
-      <ref name="confgroup.attlist"/>
-      <zeroOrMore>
-        <choice>
-          <ref name="confdates"/>
-          <ref name="conftitle"/>
-          <ref name="confnum"/>
-          <ref name="address"/>
-          <ref name="confsponsor"/>
-        </choice>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of confgroup.element -->
-  <define name="confgroup.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="confgroup.role.attrib"/>
-    <ref name="local.confgroup.attrib"/>
-  </define>
-  <!-- end of confgroup.attlist -->
-  <!-- end of confgroup.module -->
-  <define name="local.confdates.attrib">
-    <empty/>
-  </define>
-  <define name="confdates.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The dates of a conference for which a document was written. -->
-  <define name="confdates">
-    <element name="confdates">
-      <ref name="confdates.attlist"/>
-      <zeroOrMore>
-        <ref name="docinfo.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of confdates.element -->
-  <define name="confdates.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="confdates.role.attrib"/>
-    <ref name="local.confdates.attrib"/>
-  </define>
-  <!-- end of confdates.attlist -->
-  <!-- end of confdates.module -->
-  <define name="local.conftitle.attrib">
-    <empty/>
-  </define>
-  <define name="conftitle.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The title of a conference for which a document was written. -->
-  <define name="conftitle">
-    <element name="conftitle">
-      <ref name="conftitle.attlist"/>
-      <zeroOrMore>
-        <ref name="docinfo.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of conftitle.element -->
-  <define name="conftitle.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="conftitle.role.attrib"/>
-    <ref name="local.conftitle.attrib"/>
-  </define>
-  <!-- end of conftitle.attlist -->
-  <!-- end of conftitle.module -->
-  <define name="local.confnum.attrib">
-    <empty/>
-  </define>
-  <define name="confnum.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:An identifier, frequently numerical, associated with a conference for which a document was written. -->
-  <define name="confnum">
-    <element name="confnum">
-      <ref name="confnum.attlist"/>
-      <zeroOrMore>
-        <ref name="docinfo.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of confnum.element -->
-  <define name="confnum.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="confnum.role.attrib"/>
-    <ref name="local.confnum.attrib"/>
-  </define>
-  <!-- end of confnum.attlist -->
-  <!-- end of confnum.module -->
-  <!--  Address (defined elsewhere in this section) -->
-  <define name="local.confsponsor.attrib">
-    <empty/>
-  </define>
-  <define name="confsponsor.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The sponsor of a conference for which a document was written. -->
-  <define name="confsponsor">
-    <element name="confsponsor">
-      <ref name="confsponsor.attlist"/>
-      <zeroOrMore>
-        <ref name="docinfo.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of confsponsor.element -->
-  <define name="confsponsor.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="confsponsor.role.attrib"/>
-    <ref name="local.confsponsor.attrib"/>
-  </define>
-  <!-- end of confsponsor.attlist -->
-  <!-- end of confsponsor.module -->
-  <!-- end of confgroup.content.module -->
-  <!-- ContractNum ...................... -->
-  <define name="local.contractnum.attrib">
-    <empty/>
-  </define>
-  <define name="contractnum.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The contract number of a document. -->
-  <define name="contractnum">
-    <element name="contractnum">
-      <ref name="contractnum.attlist"/>
-      <zeroOrMore>
-        <ref name="docinfo.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of contractnum.element -->
-  <define name="contractnum.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="contractnum.role.attrib"/>
-    <ref name="local.contractnum.attrib"/>
-  </define>
-  <!-- end of contractnum.attlist -->
-  <!-- end of contractnum.module -->
-  <!-- ContractSponsor .................. -->
-  <define name="local.contractsponsor.attrib">
-    <empty/>
-  </define>
-  <define name="contractsponsor.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The sponsor of a contract. -->
-  <define name="contractsponsor">
-    <element name="contractsponsor">
-      <ref name="contractsponsor.attlist"/>
-      <zeroOrMore>
-        <ref name="docinfo.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of contractsponsor.element -->
-  <define name="contractsponsor.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="contractsponsor.role.attrib"/>
-    <ref name="local.contractsponsor.attrib"/>
-  </define>
-  <!-- end of contractsponsor.attlist -->
-  <!-- end of contractsponsor.module -->
-  <!-- Copyright ........................ -->
-  <define name="local.copyright.attrib">
-    <empty/>
-  </define>
-  <define name="copyright.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:Copyright information about a document. -->
-  <define name="copyright">
-    <element name="copyright">
-      <ref name="copyright.attlist"/>
-      <oneOrMore>
-        <ref name="year"/>
-      </oneOrMore>
-      <zeroOrMore>
-        <ref name="holder"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of copyright.element -->
-  <define name="copyright.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="copyright.role.attrib"/>
-    <ref name="local.copyright.attrib"/>
-  </define>
-  <!-- end of copyright.attlist -->
-  <!-- end of copyright.module -->
-  <define name="local.year.attrib">
-    <empty/>
-  </define>
-  <define name="year.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The year of publication of a document. -->
-  <define name="year">
-    <element name="year">
-      <ref name="year.attlist"/>
-      <zeroOrMore>
-        <ref name="docinfo.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of year.element -->
-  <define name="year.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="year.role.attrib"/>
-    <ref name="local.year.attrib"/>
-  </define>
-  <!-- end of year.attlist -->
-  <!-- end of year.module -->
-  <define name="local.holder.attrib">
-    <empty/>
-  </define>
-  <define name="holder.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The name of the individual or organization that holds a copyright. -->
-  <define name="holder">
-    <element name="holder">
-      <ref name="holder.attlist"/>
-      <zeroOrMore>
-        <ref name="docinfo.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of holder.element -->
-  <define name="holder.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="holder.role.attrib"/>
-    <ref name="local.holder.attrib"/>
-  </define>
-  <!-- end of holder.attlist -->
-  <!-- end of holder.module -->
-  <!-- end of copyright.content.module -->
-  <!-- CorpAuthor ....................... -->
-  <define name="local.corpauthor.attrib">
-    <empty/>
-  </define>
-  <define name="corpauthor.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A corporate author, as opposed to an individual. -->
-  <define name="corpauthor">
-    <element name="corpauthor">
-      <ref name="corpauthor.attlist"/>
-      <zeroOrMore>
-        <ref name="docinfo.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of corpauthor.element -->
-  <define name="corpauthor.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="corpauthor.role.attrib"/>
-    <ref name="local.corpauthor.attrib"/>
-  </define>
-  <!-- end of corpauthor.attlist -->
-  <!-- end of corpauthor.module -->
-  <!-- CorpCredit ...................... -->
-  <define name="local.corpcredit.attrib">
-    <empty/>
-  </define>
-  <define name="corpcredit.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A corporation or organization credited in a document. -->
-  <define name="corpcredit">
-    <element name="corpcredit">
-      <ref name="corpcredit.attlist"/>
-      <zeroOrMore>
-        <ref name="docinfo.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of corpcredit.element -->
-  <define name="corpcredit.attlist" combine="interleave">
-    <optional>
-      <attribute name="class">
-        <choice>
-          <value>graphicdesigner</value>
-          <value>productioneditor</value>
-          <value>copyeditor</value>
-          <value>technicaleditor</value>
-          <value>translator</value>
-          <value>other</value>
-        </choice>
-      </attribute>
-    </optional>
-    <ref name="common.attrib"/>
-    <ref name="corpcredit.role.attrib"/>
-    <ref name="local.corpcredit.attrib"/>
-  </define>
-  <!-- end of corpcredit.attlist -->
-  <!-- end of corpcredit.module -->
-  <!-- CorpName ......................... -->
-  <define name="local.corpname.attrib">
-    <empty/>
-  </define>
-  <!-- doc:The name of a corporation. -->
-  <define name="corpname">
-    <element name="corpname">
-      <ref name="corpname.attlist"/>
-      <zeroOrMore>
-        <ref name="docinfo.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of corpname.element -->
-  <define name="corpname.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <define name="corpname.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="corpname.role.attrib"/>
-    <ref name="local.corpname.attrib"/>
-  </define>
-  <!-- end of corpname.attlist -->
-  <!-- end of corpname.module -->
-  <!-- Date ............................. -->
-  <define name="local.date.attrib">
-    <empty/>
-  </define>
-  <define name="date.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The date of publication or revision of a document. -->
-  <define name="date">
-    <element name="date">
-      <ref name="date.attlist"/>
-      <zeroOrMore>
-        <ref name="docinfo.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of date.element -->
-  <define name="date.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="date.role.attrib"/>
-    <ref name="local.date.attrib"/>
-  </define>
-  <!-- end of date.attlist -->
-  <!-- end of date.module -->
-  <!-- Edition .......................... -->
-  <define name="local.edition.attrib">
-    <empty/>
-  </define>
-  <define name="edition.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The name or number of an edition of a document. -->
-  <define name="edition">
-    <element name="edition">
-      <ref name="edition.attlist"/>
-      <zeroOrMore>
-        <ref name="docinfo.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of edition.element -->
-  <define name="edition.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="edition.role.attrib"/>
-    <ref name="local.edition.attrib"/>
-  </define>
-  <!-- end of edition.attlist -->
-  <!-- end of edition.module -->
-  <!-- Editor ........................... -->
-  <define name="local.editor.attrib">
-    <empty/>
-  </define>
-  <define name="editor.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The name of the editor of a document. -->
-  <define name="editor">
-    <element name="editor">
-      <ref name="editor.attlist"/>
-      <choice>
-        <ref name="personname"/>
-        <oneOrMore>
-          <ref name="person.ident.mix"/>
-        </oneOrMore>
-      </choice>
-      <zeroOrMore>
-        <choice>
-          <ref name="personblurb"/>
-          <ref name="email"/>
-          <ref name="address"/>
-        </choice>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of editor.element -->
-  <define name="editor.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="editor.role.attrib"/>
-    <ref name="local.editor.attrib"/>
-  </define>
-  <!-- end of editor.attlist -->
-  <!-- (see "Personal identity elements" for %person.ident.mix;) -->
-  <!-- end of editor.module -->
-  <!-- ISBN ............................. -->
-  <define name="local.isbn.attrib">
-    <empty/>
-  </define>
-  <define name="isbn.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The International Standard Book Number of a document. -->
-  <define name="isbn">
-    <element name="isbn">
-      <ref name="isbn.attlist"/>
-      <zeroOrMore>
-        <ref name="docinfo.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of isbn.element -->
-  <define name="isbn.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="isbn.role.attrib"/>
-    <ref name="local.isbn.attrib"/>
-  </define>
-  <!-- end of isbn.attlist -->
-  <!-- end of isbn.module -->
-  <!-- ISSN ............................. -->
-  <define name="local.issn.attrib">
-    <empty/>
-  </define>
-  <define name="issn.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The International Standard Serial Number of a periodical. -->
-  <define name="issn">
-    <element name="issn">
-      <ref name="issn.attlist"/>
-      <zeroOrMore>
-        <ref name="docinfo.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of issn.element -->
-  <define name="issn.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="issn.role.attrib"/>
-    <ref name="local.issn.attrib"/>
-  </define>
-  <!-- end of issn.attlist -->
-  <!-- end of issn.module -->
-  <!-- BiblioId ................. -->
-  <define name="biblio.class.attrib">
-    <optional>
-      <attribute name="class">
-        <choice>
-          <value>uri</value>
-          <value>doi</value>
-          <value>isbn</value>
-          <value>isrn</value>
-          <value>issn</value>
-          <value>libraryofcongress</value>
-          <value>pubnumber</value>
-          <value>other</value>
-        </choice>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="otherclass"/>
-    </optional>
-  </define>
-  <define name="local.biblioid.attrib">
-    <empty/>
-  </define>
-  <define name="biblioid.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:An identifier for a document. -->
-  <define name="biblioid">
-    <element name="biblioid">
-      <ref name="biblioid.attlist"/>
-      <zeroOrMore>
-        <ref name="docinfo.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of biblioid.element -->
-  <define name="biblioid.attlist" combine="interleave">
-    <ref name="biblio.class.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="biblioid.role.attrib"/>
-    <ref name="local.biblioid.attrib"/>
-  </define>
-  <!-- end of biblioid.attlist -->
-  <!-- end of biblioid.module -->
-  <!-- CiteBiblioId ................. -->
-  <define name="local.citebiblioid.attrib">
-    <empty/>
-  </define>
-  <define name="citebiblioid.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A citation of a bibliographic identifier. -->
-  <define name="citebiblioid">
-    <element name="citebiblioid">
-      <ref name="citebiblioid.attlist"/>
-      <zeroOrMore>
-        <ref name="docinfo.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of citebiblioid.element -->
-  <define name="citebiblioid.attlist" combine="interleave">
-    <ref name="biblio.class.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="citebiblioid.role.attrib"/>
-    <ref name="local.citebiblioid.attrib"/>
-  </define>
-  <!-- end of citebiblioid.attlist -->
-  <!-- end of citebiblioid.module -->
-  <!-- BiblioSource ................. -->
-  <define name="local.bibliosource.attrib">
-    <empty/>
-  </define>
-  <define name="bibliosource.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The source of a document. -->
-  <define name="bibliosource">
-    <element name="bibliosource">
-      <ref name="bibliosource.attlist"/>
-      <zeroOrMore>
-        <ref name="docinfo.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of bibliosource.element -->
-  <define name="bibliosource.attlist" combine="interleave">
-    <ref name="biblio.class.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="bibliosource.role.attrib"/>
-    <ref name="local.bibliosource.attrib"/>
-  </define>
-  <!-- end of bibliosource.attlist -->
-  <!-- end of bibliosource.module -->
-  <!-- BiblioRelation ................. -->
-  <define name="local.bibliorelation.attrib">
-    <empty/>
-  </define>
-  <define name="local.bibliorelation.types">
-    <notAllowed/>
-  </define>
-  <define name="bibliorelation.type.attrib">
-    <optional>
-      <attribute name="type">
-        <choice>
-          <value>isversionof</value>
-          <value>hasversion</value>
-          <value>isreplacedby</value>
-          <value>replaces</value>
-          <value>isrequiredby</value>
-          <value>requires</value>
-          <value>ispartof</value>
-          <value>haspart</value>
-          <value>isreferencedby</value>
-          <value>references</value>
-          <value>isformatof</value>
-          <value>hasformat</value>
-          <value>othertype</value>
-          <ref name="local.bibliorelation.types"/>
-        </choice>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="othertype"/>
-    </optional>
-  </define>
-  <define name="bibliorelation.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The relationship of a document to another. -->
-  <define name="bibliorelation">
-    <element name="bibliorelation">
-      <ref name="bibliorelation.attlist"/>
-      <zeroOrMore>
-        <ref name="docinfo.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of bibliorelation.element -->
-  <define name="bibliorelation.attlist" combine="interleave">
-    <ref name="biblio.class.attrib"/>
-    <ref name="bibliorelation.type.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="bibliorelation.role.attrib"/>
-    <ref name="local.bibliorelation.attrib"/>
-  </define>
-  <!-- end of bibliorelation.attlist -->
-  <!-- end of bibliorelation.module -->
-  <!-- BiblioCoverage ................. -->
-  <define name="local.bibliocoverage.attrib">
-    <empty/>
-  </define>
-  <define name="bibliocoverage.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The spatial or temporal coverage of a document. -->
-  <define name="bibliocoverage">
-    <element name="bibliocoverage">
-      <ref name="bibliocoverage.attlist"/>
-      <zeroOrMore>
-        <ref name="docinfo.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of bibliocoverage.element -->
-  <define name="bibliocoverage.attlist" combine="interleave">
-    <optional>
-      <attribute name="spatial">
-        <choice>
-          <value>dcmipoint</value>
-          <value>iso3166</value>
-          <value>dcmibox</value>
-          <value>tgn</value>
-          <value>otherspatial</value>
-        </choice>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="otherspatial"/>
-    </optional>
-    <optional>
-      <attribute name="temporal">
-        <choice>
-          <value>dcmiperiod</value>
-          <value>w3c-dtf</value>
-          <value>othertemporal</value>
-        </choice>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="othertemporal"/>
-    </optional>
-    <ref name="common.attrib"/>
-    <ref name="bibliocoverage.role.attrib"/>
-    <ref name="local.bibliocoverage.attrib"/>
-  </define>
-  <!-- end of bibliocoverage.attlist -->
-  <!-- end of bibliocoverage.module -->
-  <!-- InvPartNumber .................... -->
-  <define name="local.invpartnumber.attrib">
-    <empty/>
-  </define>
-  <define name="invpartnumber.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:An inventory part number. -->
-  <define name="invpartnumber">
-    <element name="invpartnumber">
-      <ref name="invpartnumber.attlist"/>
-      <zeroOrMore>
-        <ref name="docinfo.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of invpartnumber.element -->
-  <define name="invpartnumber.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="invpartnumber.role.attrib"/>
-    <ref name="local.invpartnumber.attrib"/>
-  </define>
-  <!-- end of invpartnumber.attlist -->
-  <!-- end of invpartnumber.module -->
-  <!-- IssueNum ......................... -->
-  <define name="local.issuenum.attrib">
-    <empty/>
-  </define>
-  <define name="issuenum.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The number of an issue of a journal. -->
-  <define name="issuenum">
-    <element name="issuenum">
-      <ref name="issuenum.attlist"/>
-      <zeroOrMore>
-        <ref name="docinfo.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of issuenum.element -->
-  <define name="issuenum.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="issuenum.role.attrib"/>
-    <ref name="local.issuenum.attrib"/>
-  </define>
-  <!-- end of issuenum.attlist -->
-  <!-- end of issuenum.module -->
-  <!-- LegalNotice ...................... -->
-  <define name="local.legalnotice.attrib">
-    <empty/>
-  </define>
-  <define name="legalnotice.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A statement of legal obligations or requirements. -->
-  <define name="legalnotice">
-    <element name="legalnotice">
-      <ref name="legalnotice.attlist"/>
-      <optional>
-        <ref name="blockinfo"/>
-      </optional>
-      <optional>
-        <ref name="title"/>
-      </optional>
-      <oneOrMore>
-        <ref name="legalnotice.mix"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of legalnotice.element -->
-  <define name="legalnotice.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="legalnotice.role.attrib"/>
-    <ref name="local.legalnotice.attrib"/>
-  </define>
-  <!-- end of legalnotice.attlist -->
-  <!-- end of legalnotice.module -->
-  <!-- ModeSpec ......................... -->
-  <define name="local.modespec.attrib">
-    <empty/>
-  </define>
-  <define name="modespec.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:Application-specific information necessary for the completion of an OLink. -->
-  <define name="modespec">
-    <element name="modespec">
-      <ref name="modespec.attlist"/>
-      <zeroOrMore>
-        <ref name="docinfo.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of modespec.element -->
-  <!--
-    Application: Type of action required for completion
-    of the links to which the ModeSpec is relevant (e.g.,
-    retrieval query)
-  -->
-  <define name="modespec.attlist" combine="interleave">
-    <optional>
-      <attribute name="application">
-        <choice>
-          <ref name="notation.class"/>
-        </choice>
-      </attribute>
-    </optional>
-    <ref name="common.attrib"/>
-    <ref name="modespec.role.attrib"/>
-    <ref name="local.modespec.attrib"/>
-  </define>
-  <!-- end of modespec.attlist -->
-  <!-- end of modespec.module -->
-  <!-- OrgName .......................... -->
-  <define name="local.orgname.attrib">
-    <empty/>
-  </define>
-  <define name="orgname.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The name of an organization other than a corporation. -->
-  <define name="orgname">
-    <element name="orgname">
-      <ref name="orgname.attlist"/>
-      <zeroOrMore>
-        <ref name="docinfo.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of orgname.element -->
-  <define name="orgname.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <optional>
-      <attribute name="class">
-        <choice>
-          <value>corporation</value>
-          <value>nonprofit</value>
-          <value>consortium</value>
-          <value>informal</value>
-          <value>other</value>
-        </choice>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="otherclass"/>
-    </optional>
-    <ref name="orgname.role.attrib"/>
-    <ref name="local.orgname.attrib"/>
-  </define>
-  <!-- end of orgname.attlist -->
-  <!-- end of orgname.module -->
-  <!-- OtherCredit ...................... -->
-  <define name="local.othercredit.attrib">
-    <empty/>
-  </define>
-  <define name="othercredit.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A person or entity, other than an author or editor, credited in a document. -->
-  <define name="othercredit">
-    <element name="othercredit">
-      <ref name="othercredit.attlist"/>
-      <choice>
-        <ref name="personname"/>
-        <oneOrMore>
-          <ref name="person.ident.mix"/>
-        </oneOrMore>
-      </choice>
-      <zeroOrMore>
-        <choice>
-          <ref name="personblurb"/>
-          <ref name="email"/>
-          <ref name="address"/>
-        </choice>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of othercredit.element -->
-  <define name="othercredit.attlist" combine="interleave">
-    <optional>
-      <attribute name="class">
-        <choice>
-          <value>graphicdesigner</value>
-          <value>productioneditor</value>
-          <value>copyeditor</value>
-          <value>technicaleditor</value>
-          <value>translator</value>
-          <value>other</value>
-        </choice>
-      </attribute>
-    </optional>
-    <ref name="common.attrib"/>
-    <ref name="othercredit.role.attrib"/>
-    <ref name="local.othercredit.attrib"/>
-  </define>
-  <!-- end of othercredit.attlist -->
-  <!-- (see "Personal identity elements" for %person.ident.mix;) -->
-  <!-- end of othercredit.module -->
-  <!-- PageNums ......................... -->
-  <define name="local.pagenums.attrib">
-    <empty/>
-  </define>
-  <define name="pagenums.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The numbers of the pages in a book, for use in a bibliographic entry. -->
-  <define name="pagenums">
-    <element name="pagenums">
-      <ref name="pagenums.attlist"/>
-      <zeroOrMore>
-        <ref name="docinfo.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of pagenums.element -->
-  <define name="pagenums.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="pagenums.role.attrib"/>
-    <ref name="local.pagenums.attrib"/>
-  </define>
-  <!-- end of pagenums.attlist -->
-  <!-- end of pagenums.module -->
-  <!-- Personal identity elements ....... -->
-  <!--
-    These elements are used only within Author, Editor, and
-    OtherCredit.
-  -->
-  <define name="local.contrib.attrib">
-    <empty/>
-  </define>
-  <define name="contrib.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A summary of the contributions made to a document by a credited source. -->
-  <define name="contrib">
-    <element name="contrib">
-      <ref name="contrib.attlist"/>
-      <zeroOrMore>
-        <ref name="docinfo.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of contrib.element -->
-  <define name="contrib.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="contrib.role.attrib"/>
-    <ref name="local.contrib.attrib"/>
-  </define>
-  <!-- end of contrib.attlist -->
-  <!-- end of contrib.module -->
-  <define name="local.firstname.attrib">
-    <empty/>
-  </define>
-  <define name="firstname.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The first name of a person. -->
-  <define name="firstname">
-    <element name="firstname">
-      <ref name="firstname.attlist"/>
-      <zeroOrMore>
-        <ref name="docinfo.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of firstname.element -->
-  <define name="firstname.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="firstname.role.attrib"/>
-    <ref name="local.firstname.attrib"/>
-  </define>
-  <!-- end of firstname.attlist -->
-  <!-- end of firstname.module -->
-  <define name="local.honorific.attrib">
-    <empty/>
-  </define>
-  <define name="honorific.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The title of a person. -->
-  <define name="honorific">
-    <element name="honorific">
-      <ref name="honorific.attlist"/>
-      <zeroOrMore>
-        <ref name="docinfo.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of honorific.element -->
-  <define name="honorific.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="honorific.role.attrib"/>
-    <ref name="local.honorific.attrib"/>
-  </define>
-  <!-- end of honorific.attlist -->
-  <!-- end of honorific.module -->
-  <define name="local.lineage.attrib">
-    <empty/>
-  </define>
-  <define name="lineage.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The portion of a person's name indicating a relationship to ancestors. -->
-  <define name="lineage">
-    <element name="lineage">
-      <ref name="lineage.attlist"/>
-      <zeroOrMore>
-        <ref name="docinfo.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of lineage.element -->
-  <define name="lineage.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="lineage.role.attrib"/>
-    <ref name="local.lineage.attrib"/>
-  </define>
-  <!-- end of lineage.attlist -->
-  <!-- end of lineage.module -->
-  <define name="local.othername.attrib">
-    <empty/>
-  </define>
-  <define name="othername.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A component of a persons name that is not a first name, surname, or lineage. -->
-  <define name="othername">
-    <element name="othername">
-      <ref name="othername.attlist"/>
-      <zeroOrMore>
-        <ref name="docinfo.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of othername.element -->
-  <define name="othername.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="othername.role.attrib"/>
-    <ref name="local.othername.attrib"/>
-  </define>
-  <!-- end of othername.attlist -->
-  <!-- end of othername.module -->
-  <define name="local.surname.attrib">
-    <empty/>
-  </define>
-  <define name="surname.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A family name; in western cultures the last name. -->
-  <define name="surname">
-    <element name="surname">
-      <ref name="surname.attlist"/>
-      <zeroOrMore>
-        <ref name="docinfo.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of surname.element -->
-  <define name="surname.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="surname.role.attrib"/>
-    <ref name="local.surname.attrib"/>
-  </define>
-  <!-- end of surname.attlist -->
-  <!-- end of surname.module -->
-  <!-- end of person.ident.module -->
-  <!-- PrintHistory ..................... -->
-  <define name="local.printhistory.attrib">
-    <empty/>
-  </define>
-  <define name="printhistory.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The printing history of a document. -->
-  <define name="printhistory">
-    <element name="printhistory">
-      <ref name="printhistory.attlist"/>
-      <oneOrMore>
-        <ref name="para.class"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of printhistory.element -->
-  <define name="printhistory.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="printhistory.role.attrib"/>
-    <ref name="local.printhistory.attrib"/>
-  </define>
-  <!-- end of printhistory.attlist -->
-  <!-- end of printhistory.module -->
-  <!-- ProductName ...................... -->
-  <define name="local.productname.attrib">
-    <empty/>
-  </define>
-  <define name="productname.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The formal name of a product. -->
-  <define name="productname">
-    <element name="productname">
-      <ref name="productname.attlist"/>
-      <zeroOrMore>
-        <ref name="para.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of productname.element -->
-  <!-- Class: More precisely identifies the item the element names -->
-  <define name="productname.attlist" combine="interleave">
-    <optional>
-      <attribute name="class" a:defaultValue="trade">
-        <choice>
-          <value>service</value>
-          <value>trade</value>
-          <value>registered</value>
-          <value>copyright</value>
-        </choice>
-      </attribute>
-    </optional>
-    <ref name="common.attrib"/>
-    <ref name="productname.role.attrib"/>
-    <ref name="local.productname.attrib"/>
-  </define>
-  <!-- end of productname.attlist -->
-  <!-- end of productname.module -->
-  <!-- ProductNumber .................... -->
-  <define name="local.productnumber.attrib">
-    <empty/>
-  </define>
-  <define name="productnumber.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A number assigned to a product. -->
-  <define name="productnumber">
-    <element name="productnumber">
-      <ref name="productnumber.attlist"/>
-      <zeroOrMore>
-        <ref name="docinfo.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of productnumber.element -->
-  <define name="productnumber.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="productnumber.role.attrib"/>
-    <ref name="local.productnumber.attrib"/>
-  </define>
-  <!-- end of productnumber.attlist -->
-  <!-- end of productnumber.module -->
-  <!-- PubDate .......................... -->
-  <define name="local.pubdate.attrib">
-    <empty/>
-  </define>
-  <define name="pubdate.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The date of publication of a document. -->
-  <define name="pubdate">
-    <element name="pubdate">
-      <ref name="pubdate.attlist"/>
-      <zeroOrMore>
-        <ref name="docinfo.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of pubdate.element -->
-  <define name="pubdate.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="pubdate.role.attrib"/>
-    <ref name="local.pubdate.attrib"/>
-  </define>
-  <!-- end of pubdate.attlist -->
-  <!-- end of pubdate.module -->
-  <!-- Publisher ........................ -->
-  <define name="local.publisher.attrib">
-    <empty/>
-  </define>
-  <define name="publisher.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The publisher of a document. -->
-  <define name="publisher">
-    <element name="publisher">
-      <ref name="publisher.attlist"/>
-      <ref name="publishername"/>
-      <zeroOrMore>
-        <ref name="address"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of publisher.element -->
-  <define name="publisher.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="publisher.role.attrib"/>
-    <ref name="local.publisher.attrib"/>
-  </define>
-  <!-- end of publisher.attlist -->
-  <!-- end of publisher.module -->
-  <define name="local.publishername.attrib">
-    <empty/>
-  </define>
-  <define name="publishername.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The name of the publisher of a document. -->
-  <define name="publishername">
-    <element name="publishername">
-      <ref name="publishername.attlist"/>
-      <zeroOrMore>
-        <ref name="docinfo.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of publishername.element -->
-  <define name="publishername.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="publishername.role.attrib"/>
-    <ref name="local.publishername.attrib"/>
-  </define>
-  <!-- end of publishername.attlist -->
-  <!-- end of publishername.module -->
-  <!--  Address (defined elsewhere in this section) -->
-  <!-- end of publisher.content.module -->
-  <!-- PubsNumber ....................... -->
-  <define name="local.pubsnumber.attrib">
-    <empty/>
-  </define>
-  <define name="pubsnumber.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A number assigned to a publication other than an ISBN or ISSN or inventory part number. -->
-  <define name="pubsnumber">
-    <element name="pubsnumber">
-      <ref name="pubsnumber.attlist"/>
-      <zeroOrMore>
-        <ref name="docinfo.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of pubsnumber.element -->
-  <define name="pubsnumber.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="pubsnumber.role.attrib"/>
-    <ref name="local.pubsnumber.attrib"/>
-  </define>
-  <!-- end of pubsnumber.attlist -->
-  <!-- end of pubsnumber.module -->
-  <!-- ReleaseInfo ...................... -->
-  <define name="local.releaseinfo.attrib">
-    <empty/>
-  </define>
-  <define name="releaseinfo.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:Information about a particular release of a document. -->
-  <define name="releaseinfo">
-    <element name="releaseinfo">
-      <ref name="releaseinfo.attlist"/>
-      <zeroOrMore>
-        <ref name="docinfo.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of releaseinfo.element -->
-  <define name="releaseinfo.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="releaseinfo.role.attrib"/>
-    <ref name="local.releaseinfo.attrib"/>
-  </define>
-  <!-- end of releaseinfo.attlist -->
-  <!-- end of releaseinfo.module -->
-  <!-- RevHistory ....................... -->
-  <define name="local.revhistory.attrib">
-    <empty/>
-  </define>
-  <define name="revhistory.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A history of the revisions to a document. -->
-  <define name="revhistory">
-    <element name="revhistory">
-      <ref name="revhistory.attlist"/>
-      <oneOrMore>
-        <ref name="revision"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of revhistory.element -->
-  <define name="revhistory.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="revhistory.role.attrib"/>
-    <ref name="local.revhistory.attrib"/>
-  </define>
-  <!-- end of revhistory.attlist -->
-  <!-- end of revhistory.module -->
-  <define name="local.revision.attrib">
-    <empty/>
-  </define>
-  <define name="revision.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:An entry describing a single revision in the history of the revisions to a document. -->
-  <define name="revision">
-    <element name="revision">
-      <ref name="revision.attlist"/>
-      <optional>
-        <ref name="revnumber"/>
-      </optional>
-      <ref name="date"/>
-      <zeroOrMore>
-        <choice>
-          <ref name="author"/>
-          <ref name="authorinitials"/>
-        </choice>
-      </zeroOrMore>
-      <optional>
-        <choice>
-          <ref name="revremark"/>
-          <ref name="revdescription"/>
-        </choice>
-      </optional>
-    </element>
-  </define>
-  <!-- end of revision.element -->
-  <define name="revision.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="revision.role.attrib"/>
-    <ref name="local.revision.attrib"/>
-  </define>
-  <!-- end of revision.attlist -->
-  <!-- end of revision.module -->
-  <define name="local.revnumber.attrib">
-    <empty/>
-  </define>
-  <define name="revnumber.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A document revision number. -->
-  <define name="revnumber">
-    <element name="revnumber">
-      <ref name="revnumber.attlist"/>
-      <zeroOrMore>
-        <ref name="docinfo.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of revnumber.element -->
-  <define name="revnumber.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="revnumber.role.attrib"/>
-    <ref name="local.revnumber.attrib"/>
-  </define>
-  <!-- end of revnumber.attlist -->
-  <!-- end of revnumber.module -->
-  <!--  Date (defined elsewhere in this section) -->
-  <!--  AuthorInitials (defined elsewhere in this section) -->
-  <define name="local.revremark.attrib">
-    <empty/>
-  </define>
-  <define name="revremark.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A description of a revision to a document. -->
-  <define name="revremark">
-    <element name="revremark">
-      <ref name="revremark.attlist"/>
-      <zeroOrMore>
-        <ref name="docinfo.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of revremark.element -->
-  <define name="revremark.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="revremark.role.attrib"/>
-    <ref name="local.revremark.attrib"/>
-  </define>
-  <!-- end of revremark.attlist -->
-  <!-- end of revremark.module -->
-  <define name="local.revdescription.attrib">
-    <empty/>
-  </define>
-  <define name="revdescription.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A extended description of a revision to a document. -->
-  <define name="revdescription">
-    <element name="revdescription">
-      <ref name="revdescription.attlist"/>
-      <oneOrMore>
-        <ref name="revdescription.mix"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of revdescription.element -->
-  <define name="revdescription.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="revdescription.role.attrib"/>
-    <ref name="local.revdescription.attrib"/>
-  </define>
-  <!-- end of revdescription.attlist -->
-  <!-- end of revdescription.module -->
-  <!-- end of revhistory.content.module -->
-  <!-- SeriesVolNums .................... -->
-  <define name="local.seriesvolnums.attrib">
-    <empty/>
-  </define>
-  <define name="seriesvolnums.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:Numbers of the volumes in a series of books. -->
-  <define name="seriesvolnums">
-    <element name="seriesvolnums">
-      <ref name="seriesvolnums.attlist"/>
-      <zeroOrMore>
-        <ref name="docinfo.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of seriesvolnums.element -->
-  <define name="seriesvolnums.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="seriesvolnums.role.attrib"/>
-    <ref name="local.seriesvolnums.attrib"/>
-  </define>
-  <!-- end of seriesvolnums.attlist -->
-  <!-- end of seriesvolnums.module -->
-  <!-- VolumeNum ........................ -->
-  <define name="local.volumenum.attrib">
-    <empty/>
-  </define>
-  <define name="volumenum.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The volume number of a document in a set (as of books in a set or articles in a journal). -->
-  <define name="volumenum">
-    <element name="volumenum">
-      <ref name="volumenum.attlist"/>
-      <zeroOrMore>
-        <ref name="docinfo.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of volumenum.element -->
-  <define name="volumenum.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="volumenum.role.attrib"/>
-    <ref name="local.volumenum.attrib"/>
-  </define>
-  <!-- end of volumenum.attlist -->
-  <!-- end of volumenum.module -->
-  <!-- .................................. -->
-  <!-- end of docinfo.content.module -->
-  <!-- ...................................................................... -->
-  <!-- Inline, link, and ubiquitous elements ................................ -->
-  <!-- Technical and computer terms ......................................... -->
-  <define name="local.accel.attrib">
-    <empty/>
-  </define>
-  <define name="accel.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A graphical user interface (GUI) keyboard shortcut. -->
-  <define name="accel">
-    <element name="accel">
-      <ref name="accel.attlist"/>
-      <zeroOrMore>
-        <ref name="smallcptr.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of accel.element -->
-  <define name="accel.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="accel.role.attrib"/>
-    <ref name="local.accel.attrib"/>
-  </define>
-  <!-- end of accel.attlist -->
-  <!-- end of accel.module -->
-  <define name="local.action.attrib">
-    <empty/>
-  </define>
-  <define name="action.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A response to a user event. -->
-  <define name="action">
-    <element name="action">
-      <ref name="action.attlist"/>
-      <zeroOrMore>
-        <ref name="cptr.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of action.element -->
-  <define name="action.attlist" combine="interleave">
-    <ref name="moreinfo.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="action.role.attrib"/>
-    <ref name="local.action.attrib"/>
-  </define>
-  <!-- end of action.attlist -->
-  <!-- end of action.module -->
-  <define name="local.application.attrib">
-    <empty/>
-  </define>
-  <define name="application.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The name of a software program. -->
-  <define name="application">
-    <element name="application">
-      <ref name="application.attlist"/>
-      <zeroOrMore>
-        <ref name="para.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of application.element -->
-  <define name="application.attlist" combine="interleave">
-    <optional>
-      <attribute name="class">
-        <choice>
-          <value>hardware</value>
-          <value>software</value>
-        </choice>
-      </attribute>
-    </optional>
-    <ref name="moreinfo.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="application.role.attrib"/>
-    <ref name="local.application.attrib"/>
-  </define>
-  <!-- end of application.attlist -->
-  <!-- end of application.module -->
-  <define name="local.classname.attrib">
-    <empty/>
-  </define>
-  <define name="classname.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The name of a class, in the object-oriented programming sense. -->
-  <define name="classname">
-    <element name="classname">
-      <ref name="classname.attlist"/>
-      <zeroOrMore>
-        <ref name="smallcptr.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of classname.element -->
-  <define name="classname.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="classname.role.attrib"/>
-    <ref name="local.classname.attrib"/>
-  </define>
-  <!-- end of classname.attlist -->
-  <!-- end of classname.module -->
-  <define name="local.package.attrib">
-    <empty/>
-  </define>
-  <define name="package.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A package. -->
-  <define name="package">
-    <element name="package">
-      <ref name="package.attlist"/>
-      <zeroOrMore>
-        <ref name="smallcptr.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of package.element -->
-  <define name="package.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="package.role.attrib"/>
-    <ref name="local.package.attrib"/>
-  </define>
-  <!-- end of package.attlist -->
-  <!-- end of package.module -->
-  <define name="local.co.attrib">
-    <empty/>
-  </define>
-  <!--
-    CO is a callout area of the LineColumn unit type (a single character
-    position); the position is directly indicated by the location of CO.
-  -->
-  <define name="co.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The location of a callout embedded in text. -->
-  <define name="co">
-    <element name="co">
-      <ref name="co.attlist"/>
-      <empty/>
-    </element>
-  </define>
-  <!-- end of co.element -->
-  <!-- bug number/symbol override or initialization -->
-  <!-- to any related information -->
-  <define name="co.attlist" combine="interleave">
-    <ref name="label.attrib"/>
-    <ref name="linkends.attrib"/>
-    <ref name="idreq.common.attrib"/>
-    <ref name="co.role.attrib"/>
-    <ref name="local.co.attrib"/>
-  </define>
-  <!-- end of co.attlist -->
-  <!-- end of co.module -->
-  <define name="local.coref.attrib">
-    <empty/>
-  </define>
-  <!-- COREF is a reference to a CO -->
-  <define name="coref.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A cross reference to a co. -->
-  <define name="coref">
-    <element name="coref">
-      <ref name="coref.attlist"/>
-      <empty/>
-    </element>
-  </define>
-  <!-- end of coref.element -->
-  <!-- bug number/symbol override or initialization -->
-  <!-- to any related information -->
-  <define name="coref.attlist" combine="interleave">
-    <ref name="label.attrib"/>
-    <ref name="linkendreq.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="coref.role.attrib"/>
-    <ref name="local.coref.attrib"/>
-  </define>
-  <!-- end of coref.attlist -->
-  <!-- end of coref.module -->
-  <define name="local.command.attrib">
-    <empty/>
-  </define>
-  <define name="command.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The name of an executable program or other software command. -->
-  <define name="command">
-    <element name="command">
-      <ref name="command.attlist"/>
-      <zeroOrMore>
-        <ref name="cptr.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of command.element -->
-  <define name="command.attlist" combine="interleave">
-    <ref name="moreinfo.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="command.role.attrib"/>
-    <ref name="local.command.attrib"/>
-  </define>
-  <!-- end of command.attlist -->
-  <!-- end of command.module -->
-  <define name="local.computeroutput.attrib">
-    <empty/>
-  </define>
-  <define name="computeroutput.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:Data, generally text, displayed or presented by a computer. -->
-  <define name="computeroutput">
-    <element name="computeroutput">
-      <ref name="computeroutput.attlist"/>
-      <zeroOrMore>
-        <choice>
-          <ref name="cptr.char.mix"/>
-          <ref name="co"/>
-        </choice>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of computeroutput.element -->
-  <define name="computeroutput.attlist" combine="interleave">
-    <ref name="moreinfo.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="computeroutput.role.attrib"/>
-    <ref name="local.computeroutput.attrib"/>
-  </define>
-  <!-- end of computeroutput.attlist -->
-  <!-- end of computeroutput.module -->
-  <define name="local.database.attrib">
-    <empty/>
-  </define>
-  <define name="database.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The name of a database, or part of a database. -->
-  <define name="database">
-    <element name="database">
-      <ref name="database.attlist"/>
-      <zeroOrMore>
-        <ref name="cptr.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of database.element -->
-  <!-- Class: Type of database the element names; no default -->
-  <define name="database.attlist" combine="interleave">
-    <optional>
-      <attribute name="class">
-        <choice>
-          <value>name</value>
-          <value>table</value>
-          <value>field</value>
-          <value>key1</value>
-          <value>key2</value>
-          <value>record</value>
-          <value>index</value>
-          <value>view</value>
-          <value>primarykey</value>
-          <value>secondarykey</value>
-          <value>foreignkey</value>
-          <value>altkey</value>
-          <value>procedure</value>
-          <value>datatype</value>
-          <value>constraint</value>
-          <value>rule</value>
-          <value>user</value>
-          <value>group</value>
-        </choice>
-      </attribute>
-    </optional>
-    <ref name="moreinfo.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="database.role.attrib"/>
-    <ref name="local.database.attrib"/>
-  </define>
-  <!-- end of database.attlist -->
-  <!-- end of database.module -->
-  <define name="local.email.attrib">
-    <empty/>
-  </define>
-  <define name="email.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:An email address. -->
-  <define name="email">
-    <element name="email">
-      <ref name="email.attlist"/>
-      <zeroOrMore>
-        <ref name="docinfo.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of email.element -->
-  <define name="email.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="email.role.attrib"/>
-    <ref name="local.email.attrib"/>
-  </define>
-  <!-- end of email.attlist -->
-  <!-- end of email.module -->
-  <define name="local.envar.attrib">
-    <empty/>
-  </define>
-  <define name="envar.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A software environment variable. -->
-  <define name="envar">
-    <element name="envar">
-      <ref name="envar.attlist"/>
-      <zeroOrMore>
-        <ref name="smallcptr.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of envar.element -->
-  <define name="envar.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="envar.role.attrib"/>
-    <ref name="local.envar.attrib"/>
-  </define>
-  <!-- end of envar.attlist -->
-  <!-- end of envar.module -->
-  <define name="local.errorcode.attrib">
-    <empty/>
-  </define>
-  <define name="errorcode.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:An error code. -->
-  <define name="errorcode">
-    <element name="errorcode">
-      <ref name="errorcode.attlist"/>
-      <zeroOrMore>
-        <ref name="smallcptr.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of errorcode.element -->
-  <define name="errorcode.attlist" combine="interleave">
-    <ref name="moreinfo.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="errorcode.role.attrib"/>
-    <ref name="local.errorcode.attrib"/>
-  </define>
-  <!-- end of errorcode.attlist -->
-  <!-- end of errorcode.module -->
-  <define name="local.errorname.attrib">
-    <empty/>
-  </define>
-  <define name="errorname.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:An error name. -->
-  <define name="errorname">
-    <element name="errorname">
-      <ref name="errorname.attlist"/>
-      <zeroOrMore>
-        <ref name="smallcptr.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of errorname.element -->
-  <define name="errorname.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="errorname.role.attrib"/>
-    <ref name="local.errorname.attrib"/>
-  </define>
-  <!-- end of errorname.attlist -->
-  <!-- end of errorname.module -->
-  <define name="local.errortext.attrib">
-    <empty/>
-  </define>
-  <define name="errortext.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:An error message.. -->
-  <define name="errortext">
-    <element name="errortext">
-      <ref name="errortext.attlist"/>
-      <zeroOrMore>
-        <ref name="smallcptr.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of errortext.element -->
-  <define name="errortext.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="errortext.role.attrib"/>
-    <ref name="local.errortext.attrib"/>
-  </define>
-  <!-- end of errortext.attlist -->
-  <!-- end of errortext.module -->
-  <define name="local.errortype.attrib">
-    <empty/>
-  </define>
-  <define name="errortype.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The classification of an error message. -->
-  <define name="errortype">
-    <element name="errortype">
-      <ref name="errortype.attlist"/>
-      <zeroOrMore>
-        <ref name="smallcptr.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of errortype.element -->
-  <define name="errortype.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="errortype.role.attrib"/>
-    <ref name="local.errortype.attrib"/>
-  </define>
-  <!-- end of errortype.attlist -->
-  <!-- end of errortype.module -->
-  <define name="local.filename.attrib">
-    <empty/>
-  </define>
-  <define name="filename.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The name of a file. -->
-  <define name="filename">
-    <element name="filename">
-      <ref name="filename.attlist"/>
-      <zeroOrMore>
-        <ref name="cptr.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of filename.element -->
-  <!-- Class: Type of filename the element names; no default -->
-  <!--
-    Path: Search path (possibly system-specific) in which
-    file can be found
-  -->
-  <define name="filename.attlist" combine="interleave">
-    <optional>
-      <attribute name="class">
-        <choice>
-          <value>headerfile</value>
-          <value>partition</value>
-          <value>devicefile</value>
-          <value>libraryfile</value>
-          <value>directory</value>
-          <value>extension</value>
-          <value>symlink</value>
-        </choice>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="path"/>
-    </optional>
-    <ref name="moreinfo.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="filename.role.attrib"/>
-    <ref name="local.filename.attrib"/>
-  </define>
-  <!-- end of filename.attlist -->
-  <!-- end of filename.module -->
-  <define name="local.function.attrib">
-    <empty/>
-  </define>
-  <define name="function.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The name of a function or subroutine, as in a programming language. -->
-  <define name="function">
-    <element name="function">
-      <ref name="function.attlist"/>
-      <zeroOrMore>
-        <ref name="cptr.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of function.element -->
-  <define name="function.attlist" combine="interleave">
-    <ref name="moreinfo.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="function.role.attrib"/>
-    <ref name="local.function.attrib"/>
-  </define>
-  <!-- end of function.attlist -->
-  <!-- end of function.module -->
-  <define name="local.guibutton.attrib">
-    <empty/>
-  </define>
-  <define name="guibutton.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The text on a button in a GUI. -->
-  <define name="guibutton">
-    <element name="guibutton">
-      <ref name="guibutton.attlist"/>
-      <zeroOrMore>
-        <choice>
-          <ref name="smallcptr.char.mix"/>
-          <ref name="accel"/>
-          <ref name="superscript"/>
-          <ref name="subscript"/>
-        </choice>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of guibutton.element -->
-  <define name="guibutton.attlist" combine="interleave">
-    <ref name="moreinfo.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="guibutton.role.attrib"/>
-    <ref name="local.guibutton.attrib"/>
-  </define>
-  <!-- end of guibutton.attlist -->
-  <!-- end of guibutton.module -->
-  <define name="local.guiicon.attrib">
-    <empty/>
-  </define>
-  <define name="guiicon.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:Graphic and/or text appearing as a icon in a GUI. -->
-  <define name="guiicon">
-    <element name="guiicon">
-      <ref name="guiicon.attlist"/>
-      <zeroOrMore>
-        <choice>
-          <ref name="smallcptr.char.mix"/>
-          <ref name="accel"/>
-          <ref name="superscript"/>
-          <ref name="subscript"/>
-        </choice>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of guiicon.element -->
-  <define name="guiicon.attlist" combine="interleave">
-    <ref name="moreinfo.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="guiicon.role.attrib"/>
-    <ref name="local.guiicon.attrib"/>
-  </define>
-  <!-- end of guiicon.attlist -->
-  <!-- end of guiicon.module -->
-  <define name="local.guilabel.attrib">
-    <empty/>
-  </define>
-  <define name="guilabel.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The text of a label in a GUI. -->
-  <define name="guilabel">
-    <element name="guilabel">
-      <ref name="guilabel.attlist"/>
-      <zeroOrMore>
-        <choice>
-          <ref name="smallcptr.char.mix"/>
-          <ref name="accel"/>
-          <ref name="superscript"/>
-          <ref name="subscript"/>
-        </choice>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of guilabel.element -->
-  <define name="guilabel.attlist" combine="interleave">
-    <ref name="moreinfo.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="guilabel.role.attrib"/>
-    <ref name="local.guilabel.attrib"/>
-  </define>
-  <!-- end of guilabel.attlist -->
-  <!-- end of guilabel.module -->
-  <define name="local.guimenu.attrib">
-    <empty/>
-  </define>
-  <define name="guimenu.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The name of a menu in a GUI. -->
-  <define name="guimenu">
-    <element name="guimenu">
-      <ref name="guimenu.attlist"/>
-      <zeroOrMore>
-        <choice>
-          <ref name="smallcptr.char.mix"/>
-          <ref name="accel"/>
-          <ref name="superscript"/>
-          <ref name="subscript"/>
-        </choice>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of guimenu.element -->
-  <define name="guimenu.attlist" combine="interleave">
-    <ref name="moreinfo.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="guimenu.role.attrib"/>
-    <ref name="local.guimenu.attrib"/>
-  </define>
-  <!-- end of guimenu.attlist -->
-  <!-- end of guimenu.module -->
-  <define name="local.guimenuitem.attrib">
-    <empty/>
-  </define>
-  <define name="guimenuitem.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The name of a terminal menu item in a GUI. -->
-  <define name="guimenuitem">
-    <element name="guimenuitem">
-      <ref name="guimenuitem.attlist"/>
-      <zeroOrMore>
-        <choice>
-          <ref name="smallcptr.char.mix"/>
-          <ref name="accel"/>
-          <ref name="superscript"/>
-          <ref name="subscript"/>
-        </choice>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of guimenuitem.element -->
-  <define name="guimenuitem.attlist" combine="interleave">
-    <ref name="moreinfo.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="guimenuitem.role.attrib"/>
-    <ref name="local.guimenuitem.attrib"/>
-  </define>
-  <!-- end of guimenuitem.attlist -->
-  <!-- end of guimenuitem.module -->
-  <define name="local.guisubmenu.attrib">
-    <empty/>
-  </define>
-  <define name="guisubmenu.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The name of a submenu in a GUI. -->
-  <define name="guisubmenu">
-    <element name="guisubmenu">
-      <ref name="guisubmenu.attlist"/>
-      <zeroOrMore>
-        <choice>
-          <ref name="smallcptr.char.mix"/>
-          <ref name="accel"/>
-          <ref name="superscript"/>
-          <ref name="subscript"/>
-        </choice>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of guisubmenu.element -->
-  <define name="guisubmenu.attlist" combine="interleave">
-    <ref name="moreinfo.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="guisubmenu.role.attrib"/>
-    <ref name="local.guisubmenu.attrib"/>
-  </define>
-  <!-- end of guisubmenu.attlist -->
-  <!-- end of guisubmenu.module -->
-  <define name="local.hardware.attrib">
-    <empty/>
-  </define>
-  <define name="hardware.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A physical part of a computer system. -->
-  <define name="hardware">
-    <element name="hardware">
-      <ref name="hardware.attlist"/>
-      <zeroOrMore>
-        <ref name="cptr.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of hardware.element -->
-  <define name="hardware.attlist" combine="interleave">
-    <ref name="moreinfo.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="hardware.role.attrib"/>
-    <ref name="local.hardware.attrib"/>
-  </define>
-  <!-- end of hardware.attlist -->
-  <!-- end of hardware.module -->
-  <define name="local.interface.attrib">
-    <empty/>
-  </define>
-  <define name="interface.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:An element of a GUI. -->
-  <define name="interface">
-    <element name="interface">
-      <ref name="interface.attlist"/>
-      <zeroOrMore>
-        <choice>
-          <ref name="smallcptr.char.mix"/>
-          <ref name="accel"/>
-        </choice>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of interface.element -->
-  <!-- Class: Type of the Interface item; no default -->
-  <define name="interface.attlist" combine="interleave">
-    <ref name="moreinfo.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="interface.role.attrib"/>
-    <ref name="local.interface.attrib"/>
-  </define>
-  <!-- end of interface.attlist -->
-  <!-- end of interface.module -->
-  <define name="local.keycap.attrib">
-    <empty/>
-  </define>
-  <define name="keycap.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The text printed on a key on a keyboard. -->
-  <define name="keycap">
-    <element name="keycap">
-      <ref name="keycap.attlist"/>
-      <zeroOrMore>
-        <ref name="cptr.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of keycap.element -->
-  <define name="keycap.attlist" combine="interleave">
-    <optional>
-      <attribute name="function">
-        <choice>
-          <value>alt</value>
-          <value>control</value>
-          <value>shift</value>
-          <value>meta</value>
-          <value>escape</value>
-          <value>enter</value>
-          <value>tab</value>
-          <value>backspace</value>
-          <value>command</value>
-          <value>option</value>
-          <value>space</value>
-          <value>delete</value>
-          <value>insert</value>
-          <value>up</value>
-          <value>down</value>
-          <value>left</value>
-          <value>right</value>
-          <value>home</value>
-          <value>end</value>
-          <value>pageup</value>
-          <value>pagedown</value>
-          <value>other</value>
-        </choice>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="otherfunction"/>
-    </optional>
-    <ref name="moreinfo.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="keycap.role.attrib"/>
-    <ref name="local.keycap.attrib"/>
-  </define>
-  <!-- end of keycap.attlist -->
-  <!-- end of keycap.module -->
-  <define name="local.keycode.attrib">
-    <empty/>
-  </define>
-  <define name="keycode.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The internal, frequently numeric, identifier for a key on a keyboard. -->
-  <define name="keycode">
-    <element name="keycode">
-      <ref name="keycode.attlist"/>
-      <zeroOrMore>
-        <ref name="smallcptr.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of keycode.element -->
-  <define name="keycode.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="keycode.role.attrib"/>
-    <ref name="local.keycode.attrib"/>
-  </define>
-  <!-- end of keycode.attlist -->
-  <!-- end of keycode.module -->
-  <define name="local.keycombo.attrib">
-    <empty/>
-  </define>
-  <define name="keycombo.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A combination of input actions. -->
-  <define name="keycombo">
-    <element name="keycombo">
-      <ref name="keycombo.attlist"/>
-      <oneOrMore>
-        <choice>
-          <ref name="keycap"/>
-          <ref name="keycombo"/>
-          <ref name="keysym"/>
-          <ref name="mousebutton"/>
-        </choice>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of keycombo.element -->
-  <define name="keycombo.attlist" combine="interleave">
-    <ref name="keyaction.attrib"/>
-    <ref name="moreinfo.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="keycombo.role.attrib"/>
-    <ref name="local.keycombo.attrib"/>
-  </define>
-  <!-- end of keycombo.attlist -->
-  <!-- end of keycombo.module -->
-  <define name="local.keysym.attrib">
-    <empty/>
-  </define>
-  <define name="keysysm.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The symbolic name of a key on a keyboard. -->
-  <define name="keysym">
-    <element name="keysym">
-      <ref name="keysym.attlist"/>
-      <zeroOrMore>
-        <ref name="smallcptr.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of keysym.element -->
-  <define name="keysym.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="keysysm.role.attrib"/>
-    <ref name="local.keysym.attrib"/>
-  </define>
-  <!-- end of keysym.attlist -->
-  <!-- end of keysym.module -->
-  <define name="local.lineannotation.attrib">
-    <empty/>
-  </define>
-  <define name="lineannotation.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A comment on a line in a verbatim listing. -->
-  <define name="lineannotation">
-    <element name="lineannotation">
-      <ref name="lineannotation.attlist"/>
-      <zeroOrMore>
-        <ref name="para.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of lineannotation.element -->
-  <define name="lineannotation.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="lineannotation.role.attrib"/>
-    <ref name="local.lineannotation.attrib"/>
-  </define>
-  <!-- end of lineannotation.attlist -->
-  <!-- end of lineannotation.module -->
-  <define name="local.literal.attrib">
-    <empty/>
-  </define>
-  <define name="literal.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:Inline text that is some literal value. -->
-  <define name="literal">
-    <element name="literal">
-      <ref name="literal.attlist"/>
-      <zeroOrMore>
-        <ref name="cptr.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of literal.element -->
-  <define name="literal.attlist" combine="interleave">
-    <ref name="moreinfo.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="literal.role.attrib"/>
-    <ref name="local.literal.attrib"/>
-  </define>
-  <!-- end of literal.attlist -->
-  <!-- end of literal.module -->
-  <define name="local.code.attrib">
-    <empty/>
-  </define>
-  <define name="code.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:An inline code fragment. -->
-  <define name="code">
-    <element name="code">
-      <ref name="code.attlist"/>
-      <zeroOrMore>
-        <ref name="cptr.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of code.element -->
-  <define name="code.attlist" combine="interleave">
-    <optional>
-      <attribute name="language"/>
-    </optional>
-    <ref name="common.attrib"/>
-    <ref name="code.role.attrib"/>
-    <ref name="local.code.attrib"/>
-  </define>
-  <!-- end of code.attlist -->
-  <!-- end of code.module -->
-  <define name="local.constant.attrib">
-    <empty/>
-  </define>
-  <define name="constant.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A programming or system constant. -->
-  <define name="constant">
-    <element name="constant">
-      <ref name="constant.attlist"/>
-      <zeroOrMore>
-        <ref name="smallcptr.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of constant.element -->
-  <define name="constant.attlist" combine="interleave">
-    <optional>
-      <attribute name="class">
-        <choice>
-          <value>limit</value>
-        </choice>
-      </attribute>
-    </optional>
-    <ref name="common.attrib"/>
-    <ref name="constant.role.attrib"/>
-    <ref name="local.constant.attrib"/>
-  </define>
-  <!-- end of constant.attlist -->
-  <!-- end of constant.module -->
-  <define name="local.varname.attrib">
-    <empty/>
-  </define>
-  <define name="varname.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The name of a variable. -->
-  <define name="varname">
-    <element name="varname">
-      <ref name="varname.attlist"/>
-      <zeroOrMore>
-        <ref name="smallcptr.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of varname.element -->
-  <define name="varname.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="varname.role.attrib"/>
-    <ref name="local.varname.attrib"/>
-  </define>
-  <!-- end of varname.attlist -->
-  <!-- end of varname.module -->
-  <define name="local.markup.attrib">
-    <empty/>
-  </define>
-  <define name="markup.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A string of formatting markup in text that is to be represented literally. -->
-  <define name="markup">
-    <element name="markup">
-      <ref name="markup.attlist"/>
-      <zeroOrMore>
-        <ref name="smallcptr.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of markup.element -->
-  <define name="markup.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="markup.role.attrib"/>
-    <ref name="local.markup.attrib"/>
-  </define>
-  <!-- end of markup.attlist -->
-  <!-- end of markup.module -->
-  <define name="local.medialabel.attrib">
-    <empty/>
-  </define>
-  <define name="medialabel.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A name that identifies the physical medium on which some information resides. -->
-  <define name="medialabel">
-    <element name="medialabel">
-      <ref name="medialabel.attlist"/>
-      <zeroOrMore>
-        <ref name="smallcptr.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of medialabel.element -->
-  <!-- Class: Type of medium named by the element; no default -->
-  <define name="medialabel.attlist" combine="interleave">
-    <optional>
-      <attribute name="class">
-        <choice>
-          <value>cartridge</value>
-          <value>cdrom</value>
-          <value>disk</value>
-          <value>tape</value>
-        </choice>
-      </attribute>
-    </optional>
-    <ref name="common.attrib"/>
-    <ref name="medialabel.role.attrib"/>
-    <ref name="local.medialabel.attrib"/>
-  </define>
-  <!-- end of medialabel.attlist -->
-  <!-- end of medialabel.module -->
-  <define name="local.menuchoice.attrib">
-    <empty/>
-  </define>
-  <define name="menuchoice.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A selection or series of selections from a menu. -->
-  <define name="menuchoice">
-    <element name="menuchoice">
-      <ref name="menuchoice.attlist"/>
-      <optional>
-        <ref name="shortcut"/>
-      </optional>
-      <oneOrMore>
-        <choice>
-          <ref name="guibutton"/>
-          <ref name="guiicon"/>
-          <ref name="guilabel"/>
-          <ref name="guimenu"/>
-          <ref name="guimenuitem"/>
-          <ref name="guisubmenu"/>
-          <ref name="interface"/>
-        </choice>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of menuchoice.element -->
-  <define name="menuchoice.attlist" combine="interleave">
-    <ref name="moreinfo.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="menuchoice.role.attrib"/>
-    <ref name="local.menuchoice.attrib"/>
-  </define>
-  <!-- end of menuchoice.attlist -->
-  <!-- end of menuchoice.module -->
-  <!-- See also KeyCombo -->
-  <define name="local.shortcut.attrib">
-    <empty/>
-  </define>
-  <define name="shortcut.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A key combination for an action that is also accessible through a menu. -->
-  <define name="shortcut">
-    <element name="shortcut">
-      <ref name="shortcut.attlist"/>
-      <oneOrMore>
-        <choice>
-          <ref name="keycap"/>
-          <ref name="keycombo"/>
-          <ref name="keysym"/>
-          <ref name="mousebutton"/>
-        </choice>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of shortcut.element -->
-  <define name="shortcut.attlist" combine="interleave">
-    <ref name="keyaction.attrib"/>
-    <ref name="moreinfo.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="shortcut.role.attrib"/>
-    <ref name="local.shortcut.attrib"/>
-  </define>
-  <!-- end of shortcut.attlist -->
-  <!-- end of shortcut.module -->
-  <!-- end of menuchoice.content.module -->
-  <define name="local.mousebutton.attrib">
-    <empty/>
-  </define>
-  <define name="mousebutton.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The conventional name of a mouse button. -->
-  <define name="mousebutton">
-    <element name="mousebutton">
-      <ref name="mousebutton.attlist"/>
-      <zeroOrMore>
-        <ref name="smallcptr.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of mousebutton.element -->
-  <define name="mousebutton.attlist" combine="interleave">
-    <ref name="moreinfo.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="mousebutton.role.attrib"/>
-    <ref name="local.mousebutton.attrib"/>
-  </define>
-  <!-- end of mousebutton.attlist -->
-  <!-- end of mousebutton.module -->
-  <define name="local.msgtext.attrib">
-    <empty/>
-  </define>
-  <define name="msgtext.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The actual text of a message component in a message set. -->
-  <define name="msgtext">
-    <element name="msgtext">
-      <ref name="msgtext.attlist"/>
-      <oneOrMore>
-        <ref name="component.mix"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- end of msgtext.element -->
-  <define name="msgtext.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="msgtext.role.attrib"/>
-    <ref name="local.msgtext.attrib"/>
-  </define>
-  <!-- end of msgtext.attlist -->
-  <!-- end of msgtext.module -->
-  <define name="local.option.attrib">
-    <empty/>
-  </define>
-  <define name="option.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:An option for a software command. -->
-  <define name="option">
-    <element name="option">
-      <ref name="option.attlist"/>
-      <zeroOrMore>
-        <ref name="cptr.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of option.element -->
-  <define name="option.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="option.role.attrib"/>
-    <ref name="local.option.attrib"/>
-  </define>
-  <!-- end of option.attlist -->
-  <!-- end of option.module -->
-  <define name="local.optional.attrib">
-    <empty/>
-  </define>
-  <define name="optional.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:Optional information. -->
-  <define name="optional">
-    <element name="optional">
-      <ref name="optional.attlist"/>
-      <zeroOrMore>
-        <ref name="cptr.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of optional.element -->
-  <define name="optional.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="optional.role.attrib"/>
-    <ref name="local.optional.attrib"/>
-  </define>
-  <!-- end of optional.attlist -->
-  <!-- end of optional.module -->
-  <define name="local.parameter.attrib">
-    <empty/>
-  </define>
-  <define name="parameter.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A value or a symbolic reference to a value. -->
-  <define name="parameter">
-    <element name="parameter">
-      <ref name="parameter.attlist"/>
-      <zeroOrMore>
-        <ref name="cptr.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of parameter.element -->
-  <!-- Class: Type of the Parameter; no default -->
-  <define name="parameter.attlist" combine="interleave">
-    <optional>
-      <attribute name="class">
-        <choice>
-          <value>command</value>
-          <value>function</value>
-          <value>option</value>
-        </choice>
-      </attribute>
-    </optional>
-    <ref name="moreinfo.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="parameter.role.attrib"/>
-    <ref name="local.parameter.attrib"/>
-  </define>
-  <!-- end of parameter.attlist -->
-  <!-- end of parameter.module -->
-  <define name="local.prompt.attrib">
-    <empty/>
-  </define>
-  <define name="prompt.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A character or string indicating the start of an input field in a  computer display. -->
-  <define name="prompt">
-    <element name="prompt">
-      <ref name="prompt.attlist"/>
-      <zeroOrMore>
-        <choice>
-          <ref name="smallcptr.char.mix"/>
-          <ref name="co"/>
-        </choice>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of prompt.element -->
-  <define name="prompt.attlist" combine="interleave">
-    <ref name="moreinfo.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="prompt.role.attrib"/>
-    <ref name="local.prompt.attrib"/>
-  </define>
-  <!-- end of prompt.attlist -->
-  <!-- end of prompt.module -->
-  <define name="local.property.attrib">
-    <empty/>
-  </define>
-  <define name="property.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A unit of data associated with some part of a computer system. -->
-  <define name="property">
-    <element name="property">
-      <ref name="property.attlist"/>
-      <zeroOrMore>
-        <ref name="cptr.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of property.element -->
-  <define name="property.attlist" combine="interleave">
-    <ref name="moreinfo.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="property.role.attrib"/>
-    <ref name="local.property.attrib"/>
-  </define>
-  <!-- end of property.attlist -->
-  <!-- end of property.module -->
-  <define name="local.replaceable.attrib">
-    <empty/>
-  </define>
-  <define name="replaceable.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:Content that may or must be replaced by the user. -->
-  <define name="replaceable">
-    <element name="replaceable">
-      <ref name="replaceable.attlist"/>
-      <zeroOrMore>
-        <choice>
-          <text/>
-          <ref name="link.char.class"/>
-          <ref name="optional"/>
-          <ref name="base.char.class"/>
-          <ref name="other.char.class"/>
-          <ref name="inlinegraphic"/>
-          <ref name="inlinemediaobject"/>
-          <ref name="co"/>
-        </choice>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of replaceable.element -->
-  <!--
-    Class: Type of information the element represents; no
-    default
-  -->
-  <define name="replaceable.attlist" combine="interleave">
-    <optional>
-      <attribute name="class">
-        <choice>
-          <value>command</value>
-          <value>function</value>
-          <value>option</value>
-          <value>parameter</value>
-        </choice>
-      </attribute>
-    </optional>
-    <ref name="common.attrib"/>
-    <ref name="replaceable.role.attrib"/>
-    <ref name="local.replaceable.attrib"/>
-  </define>
-  <!-- end of replaceable.attlist -->
-  <!-- end of replaceable.module -->
-  <define name="local.returnvalue.attrib">
-    <empty/>
-  </define>
-  <define name="returnvalue.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The value returned by a function. -->
-  <define name="returnvalue">
-    <element name="returnvalue">
-      <ref name="returnvalue.attlist"/>
-      <zeroOrMore>
-        <ref name="smallcptr.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of returnvalue.element -->
-  <define name="returnvalue.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="returnvalue.role.attrib"/>
-    <ref name="local.returnvalue.attrib"/>
-  </define>
-  <!-- end of returnvalue.attlist -->
-  <!-- end of returnvalue.module -->
-  <define name="local.sgmltag.attrib">
-    <empty/>
-  </define>
-  <define name="sgmltag.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A component of SGML markup. -->
-  <define name="sgmltag">
-    <element name="sgmltag">
-      <ref name="sgmltag.attlist"/>
-      <zeroOrMore>
-        <ref name="smallcptr.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of sgmltag.element -->
-  <!-- Class: Type of SGML construct the element names; no default -->
-  <define name="sgmltag.attlist" combine="interleave">
-    <optional>
-      <attribute name="class">
-        <choice>
-          <value>attribute</value>
-          <value>attvalue</value>
-          <value>element</value>
-          <value>endtag</value>
-          <value>emptytag</value>
-          <value>genentity</value>
-          <value>numcharref</value>
-          <value>paramentity</value>
-          <value>pi</value>
-          <value>xmlpi</value>
-          <value>starttag</value>
-          <value>sgmlcomment</value>
-          <value>prefix</value>
-          <value>namespace</value>
-          <value>localname</value>
-        </choice>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="namespace"/>
-    </optional>
-    <ref name="common.attrib"/>
-    <ref name="sgmltag.role.attrib"/>
-    <ref name="local.sgmltag.attrib"/>
-  </define>
-  <!-- end of sgmltag.attlist -->
-  <!-- end of sgmltag.module -->
-  <define name="local.structfield.attrib">
-    <empty/>
-  </define>
-  <define name="structfield.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A field in a structure (in the programming language sense). -->
-  <define name="structfield">
-    <element name="structfield">
-      <ref name="structfield.attlist"/>
-      <zeroOrMore>
-        <ref name="smallcptr.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of structfield.element -->
-  <define name="structfield.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="structfield.role.attrib"/>
-    <ref name="local.structfield.attrib"/>
-  </define>
-  <!-- end of structfield.attlist -->
-  <!-- end of structfield.module -->
-  <define name="local.structname.attrib">
-    <empty/>
-  </define>
-  <define name="structname.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The name of a structure (in the programming language sense). -->
-  <define name="structname">
-    <element name="structname">
-      <ref name="structname.attlist"/>
-      <zeroOrMore>
-        <ref name="smallcptr.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of structname.element -->
-  <define name="structname.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="structname.role.attrib"/>
-    <ref name="local.structname.attrib"/>
-  </define>
-  <!-- end of structname.attlist -->
-  <!-- end of structname.module -->
-  <define name="local.symbol.attrib">
-    <empty/>
-  </define>
-  <define name="symbol.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A name that is replaced by a value before processing. -->
-  <define name="symbol">
-    <element name="symbol">
-      <ref name="symbol.attlist"/>
-      <zeroOrMore>
-        <ref name="smallcptr.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of symbol.element -->
-  <!-- Class: Type of symbol; no default -->
-  <define name="symbol.attlist" combine="interleave">
-    <optional>
-      <attribute name="class">
-        <choice>
-          <value>limit</value>
-        </choice>
-      </attribute>
-    </optional>
-    <ref name="common.attrib"/>
-    <ref name="symbol.role.attrib"/>
-    <ref name="local.symbol.attrib"/>
-  </define>
-  <!-- end of symbol.attlist -->
-  <!-- end of symbol.module -->
-  <define name="local.systemitem.attrib">
-    <empty/>
-  </define>
-  <define name="systemitem.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A system-related item or term. -->
-  <define name="systemitem">
-    <element name="systemitem">
-      <ref name="systemitem.attlist"/>
-      <zeroOrMore>
-        <choice>
-          <ref name="cptr.char.mix"/>
-          <ref name="acronym"/>
-          <ref name="co"/>
-        </choice>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of systemitem.element -->
-  <!-- Class: Type of system item the element names; no default -->
-  <define name="systemitem.attlist" combine="interleave">
-    <optional>
-      <attribute name="class">
-        <choice>
-          <value>constant</value>
-          <value>daemon</value>
-          <value>domainname</value>
-          <value>etheraddress</value>
-          <value>event</value>
-          <value>eventhandler</value>
-          <value>filesystem</value>
-          <value>fqdomainname</value>
-          <value>groupname</value>
-          <value>ipaddress</value>
-          <value>library</value>
-          <value>macro</value>
-          <value>netmask</value>
-          <value>newsgroup</value>
-          <value>osname</value>
-          <value>protocol</value>
-          <value>resource</value>
-          <value>systemname</value>
-          <value>username</value>
-          <value>process</value>
-          <value>server</value>
-          <value>service</value>
-        </choice>
-      </attribute>
-    </optional>
-    <ref name="moreinfo.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="systemitem.role.attrib"/>
-    <ref name="local.systemitem.attrib"/>
-  </define>
-  <!-- end of systemitem.attlist -->
-  <!-- end of systemitem.module -->
-  <define name="local.uri.attrib">
-    <empty/>
-  </define>
-  <define name="uri.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A Uniform Resource Identifier. -->
-  <define name="uri">
-    <element name="uri">
-      <ref name="uri.attlist"/>
-      <zeroOrMore>
-        <ref name="smallcptr.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of uri.element -->
-  <!-- Type: Type of URI; no default -->
-  <define name="uri.attlist" combine="interleave">
-    <optional>
-      <attribute name="type"/>
-    </optional>
-    <ref name="common.attrib"/>
-    <ref name="uri.role.attrib"/>
-    <ref name="local.uri.attrib"/>
-  </define>
-  <!-- end of uri.attlist -->
-  <!-- end of uri.module -->
-  <define name="local.token.attrib">
-    <empty/>
-  </define>
-  <define name="token.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A unit of information. -->
-  <define name="token">
-    <element name="token">
-      <ref name="token.attlist"/>
-      <zeroOrMore>
-        <ref name="smallcptr.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of token.element -->
-  <define name="token.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="token.role.attrib"/>
-    <ref name="local.token.attrib"/>
-  </define>
-  <!-- end of token.attlist -->
-  <!-- end of token.module -->
-  <define name="local.type.attrib">
-    <empty/>
-  </define>
-  <define name="type.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The classification of a value. -->
-  <define name="type">
-    <element name="type">
-      <ref name="type.attlist"/>
-      <zeroOrMore>
-        <ref name="smallcptr.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of type.element -->
-  <define name="type.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="type.role.attrib"/>
-    <ref name="local.type.attrib"/>
-  </define>
-  <!-- end of type.attlist -->
-  <!-- end of type.module -->
-  <define name="local.userinput.attrib">
-    <empty/>
-  </define>
-  <define name="userinput.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:Data entered by the user. -->
-  <define name="userinput">
-    <element name="userinput">
-      <ref name="userinput.attlist"/>
-      <zeroOrMore>
-        <choice>
-          <ref name="cptr.char.mix"/>
-          <ref name="co"/>
-        </choice>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of userinput.element -->
-  <define name="userinput.attlist" combine="interleave">
-    <ref name="moreinfo.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="userinput.role.attrib"/>
-    <ref name="local.userinput.attrib"/>
-  </define>
-  <!-- end of userinput.attlist -->
-  <!-- end of userinput.module -->
-  <define name="local.termdef.attrib">
-    <empty/>
-  </define>
-  <define name="termdef.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:An inline definition of a term. -->
-  <define name="termdef">
-    <element name="termdef">
-      <ref name="termdef.attlist"/>
-      <zeroOrMore>
-        <ref name="para.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of termdef.element -->
-  <define name="termdef.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="termdef.role.attrib"/>
-    <ref name="local.termdef.attrib"/>
-  </define>
-  <!-- end of termdef.attlist -->
-  <!-- end of termdef.module -->
-  <!-- General words and phrases ............................................ -->
-  <define name="local.abbrev.attrib">
-    <empty/>
-  </define>
-  <define name="abbrev.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:An abbreviation, especially one followed by a period. -->
-  <define name="abbrev">
-    <element name="abbrev">
-      <ref name="abbrev.attlist"/>
-      <zeroOrMore>
-        <ref name="word.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of abbrev.element -->
-  <define name="abbrev.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="abbrev.role.attrib"/>
-    <ref name="local.abbrev.attrib"/>
-  </define>
-  <!-- end of abbrev.attlist -->
-  <!-- end of abbrev.module -->
-  <define name="local.acronym.attrib">
-    <empty/>
-  </define>
-  <define name="acronym.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:An often pronounceable word made from the initial (or selected) letters of a name or phrase. -->
-  <define name="acronym">
-    <element name="acronym">
-      <ref name="acronym.attlist"/>
-      <zeroOrMore>
-        <ref name="word.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of acronym.element -->
-  <define name="acronym.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="acronym.role.attrib"/>
-    <ref name="local.acronym.attrib"/>
-  </define>
-  <!-- end of acronym.attlist -->
-  <!-- end of acronym.module -->
-  <define name="local.citation.attrib">
-    <empty/>
-  </define>
-  <define name="citation.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:An inline bibliographic reference to another published work. -->
-  <define name="citation">
-    <element name="citation">
-      <ref name="citation.attlist"/>
-      <zeroOrMore>
-        <ref name="para.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of citation.element -->
-  <define name="citation.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="citation.role.attrib"/>
-    <ref name="local.citation.attrib"/>
-  </define>
-  <!-- end of citation.attlist -->
-  <!-- end of citation.module -->
-  <define name="local.citerefentry.attrib">
-    <empty/>
-  </define>
-  <define name="citerefentry.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A citation to a reference page. -->
-  <define name="citerefentry">
-    <element name="citerefentry">
-      <ref name="citerefentry.attlist"/>
-      <ref name="refentrytitle"/>
-      <optional>
-        <ref name="manvolnum"/>
-      </optional>
-    </element>
-  </define>
-  <!-- end of citerefentry.element -->
-  <define name="citerefentry.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="citerefentry.role.attrib"/>
-    <ref name="local.citerefentry.attrib"/>
-  </define>
-  <!-- end of citerefentry.attlist -->
-  <!-- end of citerefentry.module -->
-  <define name="local.refentrytitle.attrib">
-    <empty/>
-  </define>
-  <define name="refentrytitle.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The title of a reference page. -->
-  <define name="refentrytitle">
-    <element name="refentrytitle">
-      <ref name="refentrytitle.attlist"/>
-      <zeroOrMore>
-        <ref name="para.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of refentrytitle.element -->
-  <define name="refentrytitle.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="refentrytitle.role.attrib"/>
-    <ref name="local.refentrytitle.attrib"/>
-  </define>
-  <!-- end of refentrytitle.attlist -->
-  <!-- end of refentrytitle.module -->
-  <define name="local.manvolnum.attrib">
-    <empty/>
-  </define>
-  <define name="namvolnum.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A reference volume number. -->
-  <define name="manvolnum">
-    <element name="manvolnum">
-      <ref name="manvolnum.attlist"/>
-      <zeroOrMore>
-        <ref name="word.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of manvolnum.element -->
-  <define name="manvolnum.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="namvolnum.role.attrib"/>
-    <ref name="local.manvolnum.attrib"/>
-  </define>
-  <!-- end of manvolnum.attlist -->
-  <!-- end of manvolnum.module -->
-  <define name="local.citetitle.attrib">
-    <empty/>
-  </define>
-  <define name="citetitle.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The title of a cited work. -->
-  <define name="citetitle">
-    <element name="citetitle">
-      <ref name="citetitle.attlist"/>
-      <zeroOrMore>
-        <ref name="para.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of citetitle.element -->
-  <!-- Pubwork: Genre of published work cited; no default -->
-  <define name="citetitle.attlist" combine="interleave">
-    <optional>
-      <attribute name="pubwork">
-        <choice>
-          <value>article</value>
-          <value>book</value>
-          <value>chapter</value>
-          <value>part</value>
-          <value>refentry</value>
-          <value>section</value>
-          <value>journal</value>
-          <value>series</value>
-          <value>set</value>
-          <value>manuscript</value>
-          <value>cdrom</value>
-          <value>dvd</value>
-          <value>wiki</value>
-          <value>gopher</value>
-          <value>bbs</value>
-          <value>emailmessage</value>
-          <value>webpage</value>
-          <value>newsposting</value>
-        </choice>
-      </attribute>
-    </optional>
-    <ref name="common.attrib"/>
-    <ref name="citetitle.role.attrib"/>
-    <ref name="local.citetitle.attrib"/>
-  </define>
-  <!-- end of citetitle.attlist -->
-  <!-- end of citetitle.module -->
-  <define name="local.emphasis.attrib">
-    <empty/>
-  </define>
-  <define name="emphasis.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:Emphasized text. -->
-  <define name="emphasis">
-    <element name="emphasis">
-      <ref name="emphasis.attlist"/>
-      <zeroOrMore>
-        <ref name="para.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of emphasis.element -->
-  <define name="emphasis.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="emphasis.role.attrib"/>
-    <ref name="local.emphasis.attrib"/>
-  </define>
-  <!-- end of emphasis.attlist -->
-  <!-- end of emphasis.module -->
-  <define name="local.foreignphrase.attrib">
-    <empty/>
-  </define>
-  <define name="foreignphrase.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A word or phrase in a language other than the primary language of the document. -->
-  <define name="foreignphrase">
-    <element name="foreignphrase">
-      <ref name="foreignphrase.attlist"/>
-      <zeroOrMore>
-        <ref name="para.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of foreignphrase.element -->
-  <define name="foreignphrase.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="foreignphrase.role.attrib"/>
-    <ref name="local.foreignphrase.attrib"/>
-  </define>
-  <!-- end of foreignphrase.attlist -->
-  <!-- end of foreignphrase.module -->
-  <define name="local.glossterm.attrib">
-    <empty/>
-  </define>
-  <define name="glossterm.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A glossary term. -->
-  <define name="glossterm">
-    <element name="glossterm">
-      <ref name="glossterm.attlist"/>
-      <zeroOrMore>
-        <ref name="para.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of glossterm.element -->
-  <!-- to GlossEntry if Glossterm used in text -->
-  <!--
-    BaseForm: Provides the form of GlossTerm to be used
-    for indexing
-  -->
-  <define name="glossterm.attlist" combine="interleave">
-    <optional>
-      <attribute name="baseform"/>
-    </optional>
-    <ref name="linkend.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="glossterm.role.attrib"/>
-    <ref name="local.glossterm.attrib"/>
-  </define>
-  <!-- end of glossterm.attlist -->
-  <!-- end of glossterm.module -->
-  <define name="local.firstterm.attrib">
-    <empty/>
-  </define>
-  <define name="firstterm.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The first occurrence of a term. -->
-  <define name="firstterm">
-    <element name="firstterm">
-      <ref name="firstterm.attlist"/>
-      <zeroOrMore>
-        <ref name="para.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of firstterm.element -->
-  <!-- to GlossEntry or other explanation -->
-  <define name="firstterm.attlist" combine="interleave">
-    <optional>
-      <attribute name="baseform"/>
-    </optional>
-    <ref name="linkend.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="firstterm.role.attrib"/>
-    <ref name="local.firstterm.attrib"/>
-  </define>
-  <!-- end of firstterm.attlist -->
-  <!-- end of firstterm.module -->
-  <define name="local.phrase.attrib">
-    <empty/>
-  </define>
-  <define name="phrase.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A span of text. -->
-  <define name="phrase">
-    <element name="phrase">
-      <ref name="phrase.attlist"/>
-      <zeroOrMore>
-        <ref name="para.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of phrase.element -->
-  <define name="phrase.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="phrase.role.attrib"/>
-    <ref name="local.phrase.attrib"/>
-  </define>
-  <!-- end of phrase.attlist -->
-  <!-- end of phrase.module -->
-  <define name="local.quote.attrib">
-    <empty/>
-  </define>
-  <define name="quote.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:An inline quotation. -->
-  <define name="quote">
-    <element name="quote">
-      <ref name="quote.attlist"/>
-      <zeroOrMore>
-        <ref name="para.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of quote.element -->
-  <define name="quote.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="quote.role.attrib"/>
-    <ref name="local.quote.attrib"/>
-  </define>
-  <!-- end of quote.attlist -->
-  <!-- end of quote.module -->
-  <define name="local.ssscript.attrib">
-    <empty/>
-  </define>
-  <define name="ssscript.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A subscript (as in H{^2}O, the molecular formula for water). -->
-  <define name="subscript">
-    <element name="subscript">
-      <ref name="subscript.attlist"/>
-      <zeroOrMore>
-        <choice>
-          <text/>
-          <ref name="link.char.class"/>
-          <ref name="emphasis"/>
-          <ref name="replaceable"/>
-          <ref name="symbol"/>
-          <ref name="inlinegraphic"/>
-          <ref name="inlinemediaobject"/>
-          <ref name="base.char.class"/>
-          <ref name="other.char.class"/>
-        </choice>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of subscript.element -->
-  <define name="subscript.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="ssscript.role.attrib"/>
-    <ref name="local.ssscript.attrib"/>
-  </define>
-  <!-- end of subscript.attlist -->
-  <!-- doc:A superscript (as in x^2, the mathematical notation for x multiplied by itself). -->
-  <define name="superscript">
-    <element name="superscript">
-      <ref name="superscript.attlist"/>
-      <zeroOrMore>
-        <choice>
-          <text/>
-          <ref name="link.char.class"/>
-          <ref name="emphasis"/>
-          <ref name="replaceable"/>
-          <ref name="symbol"/>
-          <ref name="inlinegraphic"/>
-          <ref name="inlinemediaobject"/>
-          <ref name="base.char.class"/>
-          <ref name="other.char.class"/>
-        </choice>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of superscript.element -->
-  <define name="superscript.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="ssscript.role.attrib"/>
-    <ref name="local.ssscript.attrib"/>
-  </define>
-  <!-- end of superscript.attlist -->
-  <!-- end of ssscript.module -->
-  <define name="local.trademark.attrib">
-    <empty/>
-  </define>
-  <define name="trademark.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A trademark. -->
-  <define name="trademark">
-    <element name="trademark">
-      <ref name="trademark.attlist"/>
-      <zeroOrMore>
-        <choice>
-          <text/>
-          <ref name="link.char.class"/>
-          <ref name="tech.char.class"/>
-          <ref name="base.char.class"/>
-          <ref name="other.char.class"/>
-          <ref name="inlinegraphic"/>
-          <ref name="inlinemediaobject"/>
-          <ref name="emphasis"/>
-        </choice>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of trademark.element -->
-  <!-- Class: More precisely identifies the item the element names -->
-  <define name="trademark.attlist" combine="interleave">
-    <optional>
-      <attribute name="class" a:defaultValue="trade">
-        <choice>
-          <value>service</value>
-          <value>trade</value>
-          <value>registered</value>
-          <value>copyright</value>
-        </choice>
-      </attribute>
-    </optional>
-    <ref name="common.attrib"/>
-    <ref name="trademark.role.attrib"/>
-    <ref name="local.trademark.attrib"/>
-  </define>
-  <!-- end of trademark.attlist -->
-  <!-- end of trademark.module -->
-  <define name="local.wordasword.attrib">
-    <empty/>
-  </define>
-  <define name="wordasword.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A word meant specifically as a word and not representing anything else. -->
-  <define name="wordasword">
-    <element name="wordasword">
-      <ref name="wordasword.attlist"/>
-      <zeroOrMore>
-        <ref name="word.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of wordasword.element -->
-  <define name="wordasword.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="wordasword.role.attrib"/>
-    <ref name="local.wordasword.attrib"/>
-  </define>
-  <!-- end of wordasword.attlist -->
-  <!-- end of wordasword.module -->
-  <!-- Links and cross-references ........................................... -->
-  <define name="local.link.attrib">
-    <empty/>
-  </define>
-  <define name="link.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A hypertext link. -->
-  <define name="link">
-    <element name="link">
-      <ref name="link.attlist"/>
-      <zeroOrMore>
-        <ref name="para.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of link.element -->
-  <!--
-    Endterm: ID of element containing text that is to be
-    fetched from elsewhere in the document to appear as
-    the content of this element
-  -->
-  <!-- to linked-to object -->
-  <!-- Type: Freely assignable parameter -->
-  <define name="link.attlist" combine="interleave">
-    <optional>
-      <attribute name="endterm">
-        <data type="IDREF"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="xrefstyle"/>
-    </optional>
-    <optional>
-      <attribute name="type"/>
-    </optional>
-    <ref name="linkendreq.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="link.role.attrib"/>
-    <ref name="local.link.attrib"/>
-  </define>
-  <!-- end of link.attlist -->
-  <!-- end of link.module -->
-  <define name="local.olink.attrib">
-    <empty/>
-  </define>
-  <define name="olink.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A link that addresses its target indirectly, through an entity. -->
-  <define name="olink">
-    <element name="olink">
-      <ref name="olink.attlist"/>
-      <zeroOrMore>
-        <ref name="para.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of olink.element -->
-  <!-- TargetDocEnt: Name of an entity to be the target of the link -->
-  <!--
-    LinkMode: ID of a ModeSpec containing instructions for
-    operating on the entity named by TargetDocEnt
-  -->
-  <!-- LocalInfo: Information that may be passed to ModeSpec -->
-  <!-- Type: Freely assignable parameter -->
-  <define name="olink.attlist" combine="interleave">
-    <optional>
-      <attribute name="targetdocent">
-        <data type="ENTITY"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="linkmode">
-        <data type="IDREF"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="localinfo"/>
-    </optional>
-    <optional>
-      <attribute name="type"/>
-    </optional>
-    <optional>
-      <attribute name="targetdoc"/>
-    </optional>
-    <optional>
-      <attribute name="targetptr"/>
-    </optional>
-    <optional>
-      <attribute name="xrefstyle"/>
-    </optional>
-    <ref name="common.attrib"/>
-    <ref name="olink.role.attrib"/>
-    <ref name="local.olink.attrib"/>
-  </define>
-  <!-- end of olink.attlist -->
-  <!-- end of olink.module -->
-  <define name="local.ulink.attrib">
-    <empty/>
-  </define>
-  <define name="ulink.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A link that addresses its target by means of a URL (Uniform Resource Locator). -->
-  <define name="ulink">
-    <element name="ulink">
-      <ref name="ulink.attlist"/>
-      <zeroOrMore>
-        <ref name="para.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of ulink.element -->
-  <!-- URL: uniform resource locator; the target of the ULink -->
-  <!-- Type: Freely assignable parameter -->
-  <define name="ulink.attlist" combine="interleave">
-    <attribute name="url"/>
-    <optional>
-      <attribute name="type"/>
-    </optional>
-    <optional>
-      <attribute name="xrefstyle"/>
-    </optional>
-    <ref name="common.attrib"/>
-    <ref name="ulink.role.attrib"/>
-    <ref name="local.ulink.attrib"/>
-  </define>
-  <!-- end of ulink.attlist -->
-  <!-- end of ulink.module -->
-  <define name="local.footnoteref.attrib">
-    <empty/>
-  </define>
-  <define name="footnoteref.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A cross reference to a footnote (a footnote mark). -->
-  <define name="footnoteref">
-    <element name="footnoteref">
-      <ref name="footnoteref.attlist"/>
-      <empty/>
-    </element>
-  </define>
-  <!-- end of footnoteref.element -->
-  <!-- to footnote content supplied elsewhere -->
-  <define name="footnoteref.attlist" combine="interleave">
-    <ref name="linkendreq.attrib"/>
-    <ref name="label.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="footnoteref.role.attrib"/>
-    <ref name="local.footnoteref.attrib"/>
-  </define>
-  <!-- end of footnoteref.attlist -->
-  <!-- end of footnoteref.module -->
-  <define name="local.xref.attrib">
-    <empty/>
-  </define>
-  <define name="xref.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A cross reference to another part of the document. -->
-  <define name="xref">
-    <element name="xref">
-      <ref name="xref.attlist"/>
-      <empty/>
-    </element>
-  </define>
-  <!-- end of xref.element -->
-  <!--
-    Endterm: ID of element containing text that is to be
-    fetched from elsewhere in the document to appear as
-    the content of this element
-  -->
-  <!-- to linked-to object -->
-  <define name="xref.attlist" combine="interleave">
-    <optional>
-      <attribute name="endterm">
-        <data type="IDREF"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="xrefstyle"/>
-    </optional>
-    <ref name="common.attrib"/>
-    <ref name="linkendreq.attrib"/>
-    <ref name="xref.role.attrib"/>
-    <ref name="local.xref.attrib"/>
-  </define>
-  <!-- end of xref.attlist -->
-  <!-- end of xref.module -->
-  <define name="local.biblioref.attrib">
-    <empty/>
-  </define>
-  <define name="biblioref.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A cross reference to a bibliographic entry. -->
-  <define name="biblioref">
-    <element name="biblioref">
-      <ref name="biblioref.attlist"/>
-      <empty/>
-    </element>
-  </define>
-  <!-- end of biblioref.element -->
-  <define name="biblioref.attlist" combine="interleave">
-    <optional>
-      <attribute name="endterm">
-        <data type="IDREF"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="xrefstyle"/>
-    </optional>
-    <optional>
-      <attribute name="units"/>
-    </optional>
-    <optional>
-      <attribute name="begin"/>
-    </optional>
-    <optional>
-      <attribute name="end"/>
-    </optional>
-    <ref name="common.attrib"/>
-    <ref name="linkendreq.attrib"/>
-    <ref name="biblioref.role.attrib"/>
-    <ref name="local.biblioref.attrib"/>
-  </define>
-  <!-- end of biblioref.attlist -->
-  <!-- end of biblioref.module -->
-  <!-- Ubiquitous elements .................................................. -->
-  <define name="local.anchor.attrib">
-    <empty/>
-  </define>
-  <define name="anchor.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A spot in the document. -->
-  <define name="anchor">
-    <element name="anchor">
-      <ref name="anchor.attlist"/>
-      <empty/>
-    </element>
-  </define>
-  <!-- end of anchor.element -->
-  <!-- required -->
-  <!-- replaces Lang -->
-  <define name="anchor.attlist" combine="interleave">
-    <ref name="idreq.attrib"/>
-    <ref name="pagenum.attrib"/>
-    <ref name="remap.attrib"/>
-    <ref name="xreflabel.attrib"/>
-    <ref name="revisionflag.attrib"/>
-    <ref name="effectivity.attrib"/>
-    <ref name="anchor.role.attrib"/>
-    <ref name="local.anchor.attrib"/>
-  </define>
-  <!-- end of anchor.attlist -->
-  <!-- end of anchor.module -->
-  <define name="local.beginpage.attrib">
-    <empty/>
-  </define>
-  <define name="beginpage.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The location of a page break in a print version of the document. -->
-  <define name="beginpage">
-    <element name="beginpage">
-      <ref name="beginpage.attlist"/>
-      <empty/>
-    </element>
-  </define>
-  <!-- end of beginpage.element -->
-  <!-- PageNum: Number of page that begins at this point -->
-  <define name="beginpage.attlist" combine="interleave">
-    <ref name="pagenum.attrib"/>
-    <ref name="common.attrib"/>
-    <ref name="beginpage.role.attrib"/>
-    <ref name="local.beginpage.attrib"/>
-  </define>
-  <!-- end of beginpage.attlist -->
-  <!-- end of beginpage.module -->
-  <!--
-    IndexTerms appear in the text flow for generating or linking an
-    index.
-  -->
-  <define name="local.indexterm.attrib">
-    <empty/>
-  </define>
-  <define name="indexterm.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:A wrapper for terms to be indexed. -->
-  <define name="indexterm">
-    <element name="indexterm">
-      <ref name="indexterm.attlist"/>
-      <optional>
-        <ref name="primary"/>
-      </optional>
-      <optional>
-        <choice>
-          <group>
-            <ref name="secondary"/>
-            <optional>
-              <choice>
-                <group>
-                  <ref name="tertiary"/>
-                  <optional>
-                    <choice>
-                      <ref name="see"/>
-                      <oneOrMore>
-                        <ref name="seealso"/>
-                      </oneOrMore>
-                    </choice>
-                  </optional>
-                </group>
-                <ref name="see"/>
-                <oneOrMore>
-                  <ref name="seealso"/>
-                </oneOrMore>
-              </choice>
-            </optional>
-          </group>
-          <ref name="see"/>
-          <oneOrMore>
-            <ref name="seealso"/>
-          </oneOrMore>
-        </choice>
-      </optional>
-    </element>
-  </define>
-  <!-- end of indexterm.element -->
-  <!--
-    Scope: Indicates which generated indices the IndexTerm
-    should appear in: Global (whole document set), Local (this
-    document only), or All (both)
-  -->
-  <!--
-    Significance: Whether this IndexTerm is the most pertinent
-    of its series (Preferred) or not (Normal, the default)
-  -->
-  <!--
-    Class: Indicates type of IndexTerm; default is Singular,
-    or EndOfRange if StartRef is supplied; StartOfRange value
-    must be supplied explicitly on starts of ranges
-  -->
-  <!--
-    StartRef: ID of the IndexTerm that starts the indexing
-    range ended by this IndexTerm
-  -->
-  <!--
-    Zone: IDs of the elements to which the IndexTerm applies,
-    and indicates that the IndexTerm applies to those entire
-    elements rather than the point at which the IndexTerm
-    occurs
-  -->
-  <define name="indexterm.attlist" combine="interleave">
-    <ref name="pagenum.attrib"/>
-    <optional>
-      <attribute name="scope">
-        <choice>
-          <value>all</value>
-          <value>global</value>
-          <value>local</value>
-        </choice>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="significance" a:defaultValue="normal">
-        <choice>
-          <value>preferred</value>
-          <value>normal</value>
-        </choice>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="class">
-        <choice>
-          <value>singular</value>
-          <value>startofrange</value>
-          <value>endofrange</value>
-        </choice>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="startref">
-        <data type="IDREF"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="zone">
-        <data type="IDREFS"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="type"/>
-    </optional>
-    <ref name="common.attrib"/>
-    <ref name="indexterm.role.attrib"/>
-    <ref name="local.indexterm.attrib"/>
-  </define>
-  <!-- end of indexterm.attlist -->
-  <!-- end of indexterm.module -->
-  <define name="local.primsecter.attrib">
-    <empty/>
-  </define>
-  <define name="primsecter.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:The primary word or phrase under which an index term should be sorted. -->
-  <define name="primary">
-    <element name="primary">
-      <ref name="primary.attlist"/>
-      <zeroOrMore>
-        <ref name="ndxterm.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of primary.element -->
-  <!--
-    SortAs: Alternate sort string for index sorting, e.g.,
-    "fourteen" for an element containing "14"
-  -->
-  <define name="primary.attlist" combine="interleave">
-    <optional>
-      <attribute name="sortas"/>
-    </optional>
-    <ref name="common.attrib"/>
-    <ref name="primsecter.role.attrib"/>
-    <ref name="local.primsecter.attrib"/>
-  </define>
-  <!-- end of primary.attlist -->
-  <!-- doc:A secondary word or phrase in an index term. -->
-  <define name="secondary">
-    <element name="secondary">
-      <ref name="secondary.attlist"/>
-      <zeroOrMore>
-        <ref name="ndxterm.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of secondary.element -->
-  <!--
-    SortAs: Alternate sort string for index sorting, e.g.,
-    "fourteen" for an element containing "14"
-  -->
-  <define name="secondary.attlist" combine="interleave">
-    <optional>
-      <attribute name="sortas"/>
-    </optional>
-    <ref name="common.attrib"/>
-    <ref name="primsecter.role.attrib"/>
-    <ref name="local.primsecter.attrib"/>
-  </define>
-  <!-- end of secondary.attlist -->
-  <!-- doc:A tertiary word or phrase in an index term. -->
-  <define name="tertiary">
-    <element name="tertiary">
-      <ref name="tertiary.attlist"/>
-      <zeroOrMore>
-        <ref name="ndxterm.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of tertiary.element -->
-  <!--
-    SortAs: Alternate sort string for index sorting, e.g.,
-    "fourteen" for an element containing "14"
-  -->
-  <define name="tertiary.attlist" combine="interleave">
-    <optional>
-      <attribute name="sortas"/>
-    </optional>
-    <ref name="common.attrib"/>
-    <ref name="primsecter.role.attrib"/>
-    <ref name="local.primsecter.attrib"/>
-  </define>
-  <!-- end of tertiary.attlist -->
-  <!-- end of primsecter.module -->
-  <define name="local.seeseealso.attrib">
-    <empty/>
-  </define>
-  <define name="seeseealso.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- doc:Part of an index term directing the reader instead to another entry in the index. -->
-  <define name="see">
-    <element name="see">
-      <ref name="see.attlist"/>
-      <zeroOrMore>
-        <ref name="ndxterm.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of see.element -->
-  <define name="see.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="seeseealso.role.attrib"/>
-    <ref name="local.seeseealso.attrib"/>
-  </define>
-  <!-- end of see.attlist -->
-  <!-- doc:Part of an index term directing the reader also to another entry in the index. -->
-  <define name="seealso">
-    <element name="seealso">
-      <ref name="seealso.attlist"/>
-      <zeroOrMore>
-        <ref name="ndxterm.char.mix"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- end of seealso.element -->
-  <define name="seealso.attlist" combine="interleave">
-    <ref name="common.attrib"/>
-    <ref name="seeseealso.role.attrib"/>
-    <ref name="local.seeseealso.attrib"/>
-  </define>
-</grammar>
-<!-- end of seealso.attlist -->
-<!-- end of seeseealso.module -->
-<!-- end of indexterm.content.module -->
-<!-- End of DocBook XML information pool module V4.5 ...................... -->
-<!-- ...................................................................... -->
Index: OK/schema/docbook/4.5/rng/docbook.rnc
===================================================================
--- BOOK/schema/docbook/4.5/rng/docbook.rnc	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,499 +1,0 @@
-# ......................................................................
-
-# DocBook XML DTD V4.5 .................................................
-
-# File docbookx.dtd ....................................................
-
-# Copyright 1992-2006 HaL Computer Systems, Inc.,
-# O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software
-# Corporation, Norman Walsh, Sun Microsystems, Inc., and the
-# Organization for the Advancement of Structured Information
-# Standards (OASIS).
-# 
-# See also http://docbook.org/specs/
-# 
-# $Id: docbookx.dtd 6340 2006-10-03 13:23:24Z nwalsh $
-# 
-# Permission to use, copy, modify and distribute the DocBook XML DTD
-# and its accompanying documentation for any purpose and without fee
-# is hereby granted in perpetuity, provided that the above copyright
-# notice and this paragraph appear in all copies.  The copyright
-# holders make no representation about the suitability of the DTD for
-# any purpose.  It is provided "as is" without expressed or implied
-# warranty.
-# 
-# If you modify the DocBook DTD in any way, except for declaring and
-# referencing additional sets of general entities and declaring
-# additional notations, label your DTD as a variant of DocBook.  See
-# the maintenance documentation for more information.
-# 
-# Please direct all questions, bug reports, or suggestions for
-# changes to the docbook@lists.oasis-open.org mailing list. For more
-# information, see http://www.oasis-open.org/docbook/.
-
-# ......................................................................
-
-# This is the driver file for V4.5 of the DocBook DTD.
-# Please use the following formal public identifier to identify it:
-# 
-# "-//OASIS//DTD DocBook XML V4.5//EN"
-# 
-# For example, if your document's top-level element is Book, and
-# you are using DocBook directly, use the FPI in the DOCTYPE
-# declaration:
-# 
-# <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-#                "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"
-#                [...]>
-# 
-# Or, if you have a higher-level driver file that customizes DocBook,
-# use the FPI in the parameter entity declaration:
-# 
-# <!ENTITY % DocBookDTD PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-#            "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-# %DocBookDTD;
-# 
-# See the documentation for detailed information on the parameter
-# entity and module scheme used in DocBook, customizing DocBook and
-# planning for interchange, and changes made since the last release
-# of DocBook.
-
-# ......................................................................
-
-# Enable SGML features .................................................
-
-# ......................................................................
-
-# Notation declarations ................................................
-
-include "dbnotnx.rnc"
-# ......................................................................
-
-# ISO character entity sets ............................................
-
-# euro sign, U+20AC NEW
-
-# ......................................................................
-
-# DTD modules ..........................................................
-
-# Information pool ..............
-include "dbpoolx.rnc"
-# Redeclaration placeholder .....
-
-# Document hierarchy ............
-include "dbhierx.rnc"
-start =
-  articleinfo
-  | honorific
-  | legalnotice
-  | procedure
-  | simplelist
-  | keycode
-  | refsynopsisdiv
-  | article
-  | phrase
-  | destructorsynopsis
-  | itemizedlist
-  | audioobject
-  | link
-  | sect1info
-  | xref
-  | glossaryinfo
-  | varname
-  | keywordset
-  | informalequation
-  | toc
-  | pagenums
-  | lot
-  | shortcut
-  | glosslist
-  | option
-  | bibliosource
-  | variablelist
-  | filename
-  | pob
-  | colgroup
-  | foreignphrase
-  | group
-  | substeps
-  | conftitle
-  | textobject
-  | menuchoice
-  | colspec
-  | contractsponsor
-  | tocback
-  | contractnum
-  | constant
-  | dedication
-  | inlineequation
-  | bibliographyinfo
-  | country
-  | glossseealso
-  | bridgehead
-  | mousebutton
-  | surname
-  | stepalternatives
-  | tertiaryie
-  | mediaobject
-  | msgentry
-  | fax
-  | initializer
-  | table
-  | task
-  | setinfo
-  | videodata
-  | bibliodiv
-  | issuenum
-  | phone
-  | state
-  | refsynopsisdivinfo
-  | member
-  | glossentry
-  | term
-  | msgtext
-  | tr
-  | errortype
-  | confdates
-  | inlinegraphic
-  | th
-  | segmentedlist
-  | remark
-  | preface
-  | structname
-  | publisher
-  | td
-  | oointerface
-  | refsection
-  | type
-  | taskrelated
-  | msgrel
-  | artpagenums
-  | bibliomixed
-  | revnumber
-  | firstterm
-  | seeie
-  | spanspec
-  | toclevel5
-  | trademark
-  | toclevel4
-  | toclevel3
-  | toclevel2
-  | indexentry
-  | toclevel1
-  | colophon
-  | methodparam
-  | sidebarinfo
-  | productnumber
-  | funcprototype
-  | inlinemediaobject
-  | refclass
-  | lotentry
-  | paramdef
-  | classsynopsisinfo
-  | qandaset
-  | footnote
-  | msglevel
-  | keysym
-  | citation
-  | simplemsgentry
-  | othercredit
-  | subjectset
-  | keycap
-  | orderedlist
-  | refmiscinfo
-  | blockinfo
-  | programlistingco
-  | abbrev
-  | sidebar
-  | informalfigure
-  | tip
-  | primaryie
-  | appendixinfo
-  | partintro
-  | glossdiv
-  | confgroup
-  | segtitle
-  | taskprerequisites
-  | street
-  | tbody
-  | caption
-  | markup
-  | setindex
-  | msgsub
-  | subscript
-  | orgname
-  | fieldsynopsis
-  | refname
-  | void
-  | sect5
-  | sect4
-  | sect3
-  | chapter
-  | sect2
-  | sect1
-  | modifier
-  | col
-  | orgdiv
-  | city
-  | bibliolist
-  | funcparams
-  | application
-  | \token
-  | imageobject
-  | literal
-  | funcsynopsis
-  | olink
-  | package
-  | collab
-  | seealsoie
-  | primary
-  | glossterm
-  | termdef
-  | area
-  | ackno
-  | function
-  | collabname
-  | lineannotation
-  | guisubmenu
-  | msgexplan
-  | errorname
-  | property
-  | synopfragmentref
-  | refentryinfo
-  | entry
-  | manvolnum
-  | synopsis
-  | emphasis
-  | appendix
-  | bookinfo
-  | contrib
-  | otheraddr
-  | copyright
-  | methodname
-  | email
-  | ooclass
-  | videoobject
-  | abstract
-  | firstname
-  | revremark
-  | glossdef
-  | guibutton
-  | informalexample
-  | screen
-  | errorcode
-  | command
-  | seriesvolnums
-  | refpurpose
-  | parameter
-  | equation
-  | tfoot
-  | code
-  | jobtitle
-  | sgmltag
-  | screenco
-  | holder
-  | isbn
-  | corpcredit
-  | biblioset
-  | part
-  | symbol
-  | row
-  | bibliomisc
-  | imagedata
-  | secondary
-  | classname
-  | callout
-  | screenshot
-  | bibliomset
-  | indexterm
-  | refsect3
-  | tocchap
-  | para
-  | refsect2
-  | refsect1
-  | date
-  | refdescriptor
-  | wordasword
-  | epigraph
-  | audiodata
-  | hardware
-  | confsponsor
-  | authorgroup
-  | warning
-  | authorinitials
-  | medialabel
-  | varlistentry
-  | authorblurb
-  | itermset
-  | refsect3info
-  | informaltable
-  | guimenuitem
-  | postcode
-  | subjectterm
-  | refnamediv
-  | note
-  | figure
-  | envar
-  | listitem
-  | methodsynopsis
-  | affiliation
-  | funcsynopsisinfo
-  | structfield
-  | blockquote
-  | keyword
-  | chapterinfo
-  | tertiary
-  | year
-  | subtitle
-  | personblurb
-  | refentry
-  | citebiblioid
-  | seglistitem
-  | bibliography
-  | msg
-  | constructorsynopsis
-  | refsect2info
-  | volumenum
-  | database
-  | funcdef
-  | uri
-  | graphicco
-  | biblioid
-  | msgmain
-  | printhistory
-  | glosssee
-  | beginpage
-  | glossary
-  | set
-  | highlights
-  | objectinfo
-  | tocpart
-  | guiicon
-  | revhistory
-  | seg
-  | see
-  | msgorig
-  | areaspec
-  | partinfo
-  | index
-  | sectioninfo
-  | refsectioninfo
-  | optional
-  | confnum
-  | replaceable
-  | refsect1info
-  | corpauthor
-  | step
-  | anchor
-  | arg
-  | mathphrase
-  | setindexinfo
-  | keycombo
-  | address
-  | cmdsynopsis
-  | computeroutput
-  | literallayout
-  | qandaentry
-  | sect5info
-  | bibliocoverage
-  | coref
-  | editor
-  | superscript
-  | personname
-  | pubsnumber
-  | graphic
-  | simplesect
-  | accel
-  | secondaryie
-  | biblioref
-  | publishername
-  | bibliorelation
-  | prefaceinfo
-  | revision
-  | screeninfo
-  | sbr
-  | example
-  | citetitle
-  | issn
-  | invpartnumber
-  | indexdiv
-  | sect4info
-  | corpname
-  | lineage
-  | ooexception
-  | reference
-  | revdescription
-  | title
-  | edition
-  | co
-  | msgaud
-  | guimenu
-  | shortaffil
-  | titleabbrev
-  | msginfo
-  | refmeta
-  | qandadiv
-  | mediaobjectco
-  | seealso
-  | exceptionname
-  | answer
-  | programlisting
-  | tgroup
-  | refentrytitle
-  | book
-  | errortext
-  | varargs
-  | sect3info
-  | citerefentry
-  | tasksummary
-  | quote
-  | othername
-  | prompt
-  | entrytbl
-  | interfacename
-  | acronym
-  | modespec
-  | msgset
-  | thead
-  | textdata
-  | userinput
-  | attribution
-  | footnoteref
-  | action
-  | tocentry
-  | tocfront
-  | author
-  | imageobjectco
-  | alt
-  | question
-  | ulink
-  | subject
-  | pubdate
-  | returnvalue
-  | label
-  | caution
-  | section
-  | systemitem
-  | referenceinfo
-  | sect2info
-  | calloutlist
-  | classsynopsis
-  | productname
-  | simpara
-  | synopfragment
-  | important
-  | interface
-  | releaseinfo
-  | formalpara
-  | areaset
-  | biblioentry
-  | indexinfo
-  | guilabel
-# ......................................................................
-
-# Other general entities ...............................................
-
-# End of DocBook XML DTD V4.5 ..........................................
-
-# ......................................................................
Index: OK/schema/docbook/4.5/rng/docbook.rng
===================================================================
--- BOOK/schema/docbook/4.5/rng/docbook.rng	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,490 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- ...................................................................... -->
-<!-- DocBook XML DTD V4.5 ................................................. -->
-<!-- File docbookx.dtd .................................................... -->
-<!--
-  Copyright 1992-2006 HaL Computer Systems, Inc.,
-  O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software
-  Corporation, Norman Walsh, Sun Microsystems, Inc., and the
-  Organization for the Advancement of Structured Information
-  Standards (OASIS).
-  
-  See also http://docbook.org/specs/
-  
-  $Id: docbookx.dtd 6340 2006-10-03 13:23:24Z nwalsh $
-  
-  Permission to use, copy, modify and distribute the DocBook XML DTD
-  and its accompanying documentation for any purpose and without fee
-  is hereby granted in perpetuity, provided that the above copyright
-  notice and this paragraph appear in all copies.  The copyright
-  holders make no representation about the suitability of the DTD for
-  any purpose.  It is provided "as is" without expressed or implied
-  warranty.
-  
-  If you modify the DocBook DTD in any way, except for declaring and
-  referencing additional sets of general entities and declaring
-  additional notations, label your DTD as a variant of DocBook.  See
-  the maintenance documentation for more information.
-  
-  Please direct all questions, bug reports, or suggestions for
-  changes to the docbook@lists.oasis-open.org mailing list. For more
-  information, see http://www.oasis-open.org/docbook/.
--->
-<!-- ...................................................................... -->
-<!--
-  This is the driver file for V4.5 of the DocBook DTD.
-  Please use the following formal public identifier to identify it:
-  
-  "-//OASIS//DTD DocBook XML V4.5//EN"
-  
-  For example, if your document's top-level element is Book, and
-  you are using DocBook directly, use the FPI in the DOCTYPE
-  declaration:
-  
-  <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-                 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"
-                 [...]>
-  
-  Or, if you have a higher-level driver file that customizes DocBook,
-  use the FPI in the parameter entity declaration:
-  
-  <!ENTITY % DocBookDTD PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-             "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-  %DocBookDTD;
-  
-  See the documentation for detailed information on the parameter
-  entity and module scheme used in DocBook, customizing DocBook and
-  planning for interchange, and changes made since the last release
-  of DocBook.
--->
-<!-- ...................................................................... -->
-<!-- Enable SGML features ................................................. -->
-<!-- ...................................................................... -->
-<!-- Notation declarations ................................................ -->
-<grammar xmlns="http://relaxng.org/ns/structure/1.0">
-  <include href="dbnotnx.rng"/>
-  <!-- ...................................................................... -->
-  <!-- ISO character entity sets ............................................ -->
-  <!-- euro sign, U+20AC NEW -->
-  <!-- ...................................................................... -->
-  <!-- DTD modules .......................................................... -->
-  <!-- Information pool .............. -->
-  <include href="dbpoolx.rng"/>
-  <!-- Redeclaration placeholder ..... -->
-  <!-- Document hierarchy ............ -->
-  <include href="dbhierx.rng"/>
-  <start>
-    <choice>
-      <ref name="articleinfo"/>
-      <ref name="honorific"/>
-      <ref name="legalnotice"/>
-      <ref name="procedure"/>
-      <ref name="simplelist"/>
-      <ref name="keycode"/>
-      <ref name="refsynopsisdiv"/>
-      <ref name="article"/>
-      <ref name="phrase"/>
-      <ref name="destructorsynopsis"/>
-      <ref name="itemizedlist"/>
-      <ref name="audioobject"/>
-      <ref name="link"/>
-      <ref name="sect1info"/>
-      <ref name="xref"/>
-      <ref name="glossaryinfo"/>
-      <ref name="varname"/>
-      <ref name="keywordset"/>
-      <ref name="informalequation"/>
-      <ref name="toc"/>
-      <ref name="pagenums"/>
-      <ref name="lot"/>
-      <ref name="shortcut"/>
-      <ref name="glosslist"/>
-      <ref name="option"/>
-      <ref name="bibliosource"/>
-      <ref name="variablelist"/>
-      <ref name="filename"/>
-      <ref name="pob"/>
-      <ref name="colgroup"/>
-      <ref name="foreignphrase"/>
-      <ref name="group"/>
-      <ref name="substeps"/>
-      <ref name="conftitle"/>
-      <ref name="textobject"/>
-      <ref name="menuchoice"/>
-      <ref name="colspec"/>
-      <ref name="contractsponsor"/>
-      <ref name="tocback"/>
-      <ref name="contractnum"/>
-      <ref name="constant"/>
-      <ref name="dedication"/>
-      <ref name="inlineequation"/>
-      <ref name="bibliographyinfo"/>
-      <ref name="country"/>
-      <ref name="glossseealso"/>
-      <ref name="bridgehead"/>
-      <ref name="mousebutton"/>
-      <ref name="surname"/>
-      <ref name="stepalternatives"/>
-      <ref name="tertiaryie"/>
-      <ref name="mediaobject"/>
-      <ref name="msgentry"/>
-      <ref name="fax"/>
-      <ref name="initializer"/>
-      <ref name="table"/>
-      <ref name="task"/>
-      <ref name="setinfo"/>
-      <ref name="videodata"/>
-      <ref name="bibliodiv"/>
-      <ref name="issuenum"/>
-      <ref name="phone"/>
-      <ref name="state"/>
-      <ref name="refsynopsisdivinfo"/>
-      <ref name="member"/>
-      <ref name="glossentry"/>
-      <ref name="term"/>
-      <ref name="msgtext"/>
-      <ref name="tr"/>
-      <ref name="errortype"/>
-      <ref name="confdates"/>
-      <ref name="inlinegraphic"/>
-      <ref name="th"/>
-      <ref name="segmentedlist"/>
-      <ref name="remark"/>
-      <ref name="preface"/>
-      <ref name="structname"/>
-      <ref name="publisher"/>
-      <ref name="td"/>
-      <ref name="oointerface"/>
-      <ref name="refsection"/>
-      <ref name="type"/>
-      <ref name="taskrelated"/>
-      <ref name="msgrel"/>
-      <ref name="artpagenums"/>
-      <ref name="bibliomixed"/>
-      <ref name="revnumber"/>
-      <ref name="firstterm"/>
-      <ref name="seeie"/>
-      <ref name="spanspec"/>
-      <ref name="toclevel5"/>
-      <ref name="trademark"/>
-      <ref name="toclevel4"/>
-      <ref name="toclevel3"/>
-      <ref name="toclevel2"/>
-      <ref name="indexentry"/>
-      <ref name="toclevel1"/>
-      <ref name="colophon"/>
-      <ref name="methodparam"/>
-      <ref name="sidebarinfo"/>
-      <ref name="productnumber"/>
-      <ref name="funcprototype"/>
-      <ref name="inlinemediaobject"/>
-      <ref name="refclass"/>
-      <ref name="lotentry"/>
-      <ref name="paramdef"/>
-      <ref name="classsynopsisinfo"/>
-      <ref name="qandaset"/>
-      <ref name="footnote"/>
-      <ref name="msglevel"/>
-      <ref name="keysym"/>
-      <ref name="citation"/>
-      <ref name="simplemsgentry"/>
-      <ref name="othercredit"/>
-      <ref name="subjectset"/>
-      <ref name="keycap"/>
-      <ref name="orderedlist"/>
-      <ref name="refmiscinfo"/>
-      <ref name="blockinfo"/>
-      <ref name="programlistingco"/>
-      <ref name="abbrev"/>
-      <ref name="sidebar"/>
-      <ref name="informalfigure"/>
-      <ref name="tip"/>
-      <ref name="primaryie"/>
-      <ref name="appendixinfo"/>
-      <ref name="partintro"/>
-      <ref name="glossdiv"/>
-      <ref name="confgroup"/>
-      <ref name="segtitle"/>
-      <ref name="taskprerequisites"/>
-      <ref name="street"/>
-      <ref name="tbody"/>
-      <ref name="caption"/>
-      <ref name="markup"/>
-      <ref name="setindex"/>
-      <ref name="msgsub"/>
-      <ref name="subscript"/>
-      <ref name="orgname"/>
-      <ref name="fieldsynopsis"/>
-      <ref name="refname"/>
-      <ref name="void"/>
-      <ref name="sect5"/>
-      <ref name="sect4"/>
-      <ref name="sect3"/>
-      <ref name="chapter"/>
-      <ref name="sect2"/>
-      <ref name="sect1"/>
-      <ref name="modifier"/>
-      <ref name="col"/>
-      <ref name="orgdiv"/>
-      <ref name="city"/>
-      <ref name="bibliolist"/>
-      <ref name="funcparams"/>
-      <ref name="application"/>
-      <ref name="token"/>
-      <ref name="imageobject"/>
-      <ref name="literal"/>
-      <ref name="funcsynopsis"/>
-      <ref name="olink"/>
-      <ref name="package"/>
-      <ref name="collab"/>
-      <ref name="seealsoie"/>
-      <ref name="primary"/>
-      <ref name="glossterm"/>
-      <ref name="termdef"/>
-      <ref name="area"/>
-      <ref name="ackno"/>
-      <ref name="function"/>
-      <ref name="collabname"/>
-      <ref name="lineannotation"/>
-      <ref name="guisubmenu"/>
-      <ref name="msgexplan"/>
-      <ref name="errorname"/>
-      <ref name="property"/>
-      <ref name="synopfragmentref"/>
-      <ref name="refentryinfo"/>
-      <ref name="entry"/>
-      <ref name="manvolnum"/>
-      <ref name="synopsis"/>
-      <ref name="emphasis"/>
-      <ref name="appendix"/>
-      <ref name="bookinfo"/>
-      <ref name="contrib"/>
-      <ref name="otheraddr"/>
-      <ref name="copyright"/>
-      <ref name="methodname"/>
-      <ref name="email"/>
-      <ref name="ooclass"/>
-      <ref name="videoobject"/>
-      <ref name="abstract"/>
-      <ref name="firstname"/>
-      <ref name="revremark"/>
-      <ref name="glossdef"/>
-      <ref name="guibutton"/>
-      <ref name="informalexample"/>
-      <ref name="screen"/>
-      <ref name="errorcode"/>
-      <ref name="command"/>
-      <ref name="seriesvolnums"/>
-      <ref name="refpurpose"/>
-      <ref name="parameter"/>
-      <ref name="equation"/>
-      <ref name="tfoot"/>
-      <ref name="code"/>
-      <ref name="jobtitle"/>
-      <ref name="sgmltag"/>
-      <ref name="screenco"/>
-      <ref name="holder"/>
-      <ref name="isbn"/>
-      <ref name="corpcredit"/>
-      <ref name="biblioset"/>
-      <ref name="part"/>
-      <ref name="symbol"/>
-      <ref name="row"/>
-      <ref name="bibliomisc"/>
-      <ref name="imagedata"/>
-      <ref name="secondary"/>
-      <ref name="classname"/>
-      <ref name="callout"/>
-      <ref name="screenshot"/>
-      <ref name="bibliomset"/>
-      <ref name="indexterm"/>
-      <ref name="refsect3"/>
-      <ref name="tocchap"/>
-      <ref name="para"/>
-      <ref name="refsect2"/>
-      <ref name="refsect1"/>
-      <ref name="date"/>
-      <ref name="refdescriptor"/>
-      <ref name="wordasword"/>
-      <ref name="epigraph"/>
-      <ref name="audiodata"/>
-      <ref name="hardware"/>
-      <ref name="confsponsor"/>
-      <ref name="authorgroup"/>
-      <ref name="warning"/>
-      <ref name="authorinitials"/>
-      <ref name="medialabel"/>
-      <ref name="varlistentry"/>
-      <ref name="authorblurb"/>
-      <ref name="itermset"/>
-      <ref name="refsect3info"/>
-      <ref name="informaltable"/>
-      <ref name="guimenuitem"/>
-      <ref name="postcode"/>
-      <ref name="subjectterm"/>
-      <ref name="refnamediv"/>
-      <ref name="note"/>
-      <ref name="figure"/>
-      <ref name="envar"/>
-      <ref name="listitem"/>
-      <ref name="methodsynopsis"/>
-      <ref name="affiliation"/>
-      <ref name="funcsynopsisinfo"/>
-      <ref name="structfield"/>
-      <ref name="blockquote"/>
-      <ref name="keyword"/>
-      <ref name="chapterinfo"/>
-      <ref name="tertiary"/>
-      <ref name="year"/>
-      <ref name="subtitle"/>
-      <ref name="personblurb"/>
-      <ref name="refentry"/>
-      <ref name="citebiblioid"/>
-      <ref name="seglistitem"/>
-      <ref name="bibliography"/>
-      <ref name="msg"/>
-      <ref name="constructorsynopsis"/>
-      <ref name="refsect2info"/>
-      <ref name="volumenum"/>
-      <ref name="database"/>
-      <ref name="funcdef"/>
-      <ref name="uri"/>
-      <ref name="graphicco"/>
-      <ref name="biblioid"/>
-      <ref name="msgmain"/>
-      <ref name="printhistory"/>
-      <ref name="glosssee"/>
-      <ref name="beginpage"/>
-      <ref name="glossary"/>
-      <ref name="set"/>
-      <ref name="highlights"/>
-      <ref name="objectinfo"/>
-      <ref name="tocpart"/>
-      <ref name="guiicon"/>
-      <ref name="revhistory"/>
-      <ref name="seg"/>
-      <ref name="see"/>
-      <ref name="msgorig"/>
-      <ref name="areaspec"/>
-      <ref name="partinfo"/>
-      <ref name="index"/>
-      <ref name="sectioninfo"/>
-      <ref name="refsectioninfo"/>
-      <ref name="optional"/>
-      <ref name="confnum"/>
-      <ref name="replaceable"/>
-      <ref name="refsect1info"/>
-      <ref name="corpauthor"/>
-      <ref name="step"/>
-      <ref name="anchor"/>
-      <ref name="arg"/>
-      <ref name="mathphrase"/>
-      <ref name="setindexinfo"/>
-      <ref name="keycombo"/>
-      <ref name="address"/>
-      <ref name="cmdsynopsis"/>
-      <ref name="computeroutput"/>
-      <ref name="literallayout"/>
-      <ref name="qandaentry"/>
-      <ref name="sect5info"/>
-      <ref name="bibliocoverage"/>
-      <ref name="coref"/>
-      <ref name="editor"/>
-      <ref name="superscript"/>
-      <ref name="personname"/>
-      <ref name="pubsnumber"/>
-      <ref name="graphic"/>
-      <ref name="simplesect"/>
-      <ref name="accel"/>
-      <ref name="secondaryie"/>
-      <ref name="biblioref"/>
-      <ref name="publishername"/>
-      <ref name="bibliorelation"/>
-      <ref name="prefaceinfo"/>
-      <ref name="revision"/>
-      <ref name="screeninfo"/>
-      <ref name="sbr"/>
-      <ref name="example"/>
-      <ref name="citetitle"/>
-      <ref name="issn"/>
-      <ref name="invpartnumber"/>
-      <ref name="indexdiv"/>
-      <ref name="sect4info"/>
-      <ref name="corpname"/>
-      <ref name="lineage"/>
-      <ref name="ooexception"/>
-      <ref name="reference"/>
-      <ref name="revdescription"/>
-      <ref name="title"/>
-      <ref name="edition"/>
-      <ref name="co"/>
-      <ref name="msgaud"/>
-      <ref name="guimenu"/>
-      <ref name="shortaffil"/>
-      <ref name="titleabbrev"/>
-      <ref name="msginfo"/>
-      <ref name="refmeta"/>
-      <ref name="qandadiv"/>
-      <ref name="mediaobjectco"/>
-      <ref name="seealso"/>
-      <ref name="exceptionname"/>
-      <ref name="answer"/>
-      <ref name="programlisting"/>
-      <ref name="tgroup"/>
-      <ref name="refentrytitle"/>
-      <ref name="book"/>
-      <ref name="errortext"/>
-      <ref name="varargs"/>
-      <ref name="sect3info"/>
-      <ref name="citerefentry"/>
-      <ref name="tasksummary"/>
-      <ref name="quote"/>
-      <ref name="othername"/>
-      <ref name="prompt"/>
-      <ref name="entrytbl"/>
-      <ref name="interfacename"/>
-      <ref name="acronym"/>
-      <ref name="modespec"/>
-      <ref name="msgset"/>
-      <ref name="thead"/>
-      <ref name="textdata"/>
-      <ref name="userinput"/>
-      <ref name="attribution"/>
-      <ref name="footnoteref"/>
-      <ref name="action"/>
-      <ref name="tocentry"/>
-      <ref name="tocfront"/>
-      <ref name="author"/>
-      <ref name="imageobjectco"/>
-      <ref name="alt"/>
-      <ref name="question"/>
-      <ref name="ulink"/>
-      <ref name="subject"/>
-      <ref name="pubdate"/>
-      <ref name="returnvalue"/>
-      <ref name="label"/>
-      <ref name="caution"/>
-      <ref name="section"/>
-      <ref name="systemitem"/>
-      <ref name="referenceinfo"/>
-      <ref name="sect2info"/>
-      <ref name="calloutlist"/>
-      <ref name="classsynopsis"/>
-      <ref name="productname"/>
-      <ref name="simpara"/>
-      <ref name="synopfragment"/>
-      <ref name="important"/>
-      <ref name="interface"/>
-      <ref name="releaseinfo"/>
-      <ref name="formalpara"/>
-      <ref name="areaset"/>
-      <ref name="biblioentry"/>
-      <ref name="indexinfo"/>
-      <ref name="guilabel"/>
-    </choice>
-  </start>
-</grammar>
-<!-- ...................................................................... -->
-<!-- Other general entities ............................................... -->
-<!-- End of DocBook XML DTD V4.5 .......................................... -->
-<!-- ...................................................................... -->
Index: OK/schema/docbook/4.5/rng/htmltblx.rnc
===================================================================
--- BOOK/schema/docbook/4.5/rng/htmltblx.rnc	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,225 +1,0 @@
-# ......................................................................
-
-# DocBook XML HTML Table Module V4.5 ...................................
-
-# File htmltblx.mod ....................................................
-
-# Copyright 2003-2006 ArborText, Inc., Norman Walsh, Sun Microsystems,
-# Inc., and the Organization for the Advancement of Structured Information
-# Standards (OASIS).
-# 
-# $Id: htmltblx.mod 6340 2006-10-03 13:23:24Z nwalsh $
-# 
-# Permission to use, copy, modify and distribute the DocBook XML DTD
-# and its accompanying documentation for any purpose and without fee
-# is hereby granted in perpetuity, provided that the above copyright
-# notice and this paragraph appear in all copies.  The copyright
-# holders make no representation about the suitability of the DTD for
-# any purpose.  It is provided "as is" without expressed or implied
-# warranty.
-# 
-# If you modify the DocBook XML DTD in any way, except for declaring and
-# referencing additional sets of general entities and declaring
-# additional notations, label your DTD as a variant of DocBook.  See
-# the maintenance documentation for more information.
-# 
-# Please direct all questions, bug reports, or suggestions for
-# changes to the docbook@lists.oasis-open.org mailing list. For more
-# information, see http://www.oasis-open.org/docbook/.
-
-# ......................................................................
-
-# This module contains the definitions for elements that are
-# isomorphic to the HTML elements. One could argue we should
-# instead have based ourselves on the XHTML Table Module, but the
-# HTML one is more like what browsers are likely to accept today
-# and users are likely to use.
-# 
-# This module has been developed for use with the DocBook V4.5
-# "union table model" in which elements and attlists common to both
-# models are defined (as the union) in the CALS table module by
-# setting various parameter entities appropriately in this file.
-# 
-# In DTD driver files referring to this module, please use an entity
-# declaration that uses the public identifier shown below:
-# 
-# <!ENTITY % htmltbl PUBLIC
-# "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.5//EN"
-# "htmltblx.mod">
-# %htmltbl;
-# 
-# See the documentation for detailed information on the parameter
-# entity and module scheme used in DocBook, customizing DocBook and
-# planning for interchange, and changes made since the last release
-# of DocBook.
-
-# ======================= XHTML Tables =======================================
-
-namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
-
-html.coreattrs =
-  common.attrib,
-  attribute class { text }?,
-  attribute style { text }?,
-  attribute title { text }?
-# Does not contain lang or dir because they are in %common.attribs
-i18n = attribute xml:lang { xsd:NMTOKEN }?
-events =
-  attribute onclick { text }?,
-  attribute ondblclick { text }?,
-  attribute onmousedown { text }?,
-  attribute onmouseup { text }?,
-  attribute onmouseover { text }?,
-  attribute onmousemove { text }?,
-  attribute onmouseout { text }?,
-  attribute onkeypress { text }?,
-  attribute onkeydown { text }?,
-  attribute onkeyup { text }?
-attrs = html.coreattrs, i18n, events
-cellhalign =
-  attribute align { "left" | "center" | "right" | "justify" | "char" }?,
-  attribute char { text }?,
-  attribute charoff { text }?
-cellvalign =
-  attribute valign { "top" | "middle" | "bottom" | "baseline" }?
-# doc:A group of columns in an HTML table.
-colgroup = element colgroup { colgroup.attlist, col* }
-# doc:Specifications for a column in an HTML table.
-col = element col { col.attlist, empty }
-# doc:A row in an HTML table.
-tr = element tr { tr.attlist, (th | td)+ }
-# doc:A table header entry in an HTML table.
-th =
-  element th {
-    th.attlist, (para.char.mix | tabentry.mix | table | informaltable)*
-  }
-# doc:A table ntry in an HTML table.
-td =
-  element td {
-    td.attlist, (para.char.mix | tabentry.mix | table | informaltable)*
-  }
-colgroup.attlist &=
-  attrs,
-  [ a:defaultValue = "1" ] attribute span { text }?,
-  attribute width { text }?,
-  cellhalign,
-  cellvalign
-col.attlist &=
-  attrs,
-  [ a:defaultValue = "1" ] attribute span { text }?,
-  attribute width { text }?,
-  cellhalign,
-  cellvalign
-tr.attlist &=
-  attrs,
-  cellhalign,
-  cellvalign,
-  attribute bgcolor { text }?
-th.attlist &=
-  attrs,
-  attribute abbr { text }?,
-  attribute axis { text }?,
-  attribute headers { xsd:IDREFS }?,
-  attribute scope { "row" | "col" | "rowgroup" | "colgroup" }?,
-  [ a:defaultValue = "1" ] attribute rowspan { text }?,
-  [ a:defaultValue = "1" ] attribute colspan { text }?,
-  cellhalign,
-  cellvalign,
-  attribute nowrap { "nowrap" }?,
-  attribute bgcolor { text }?,
-  attribute width { text }?,
-  attribute height { text }?
-td.attlist &=
-  attrs,
-  attribute abbr { text }?,
-  attribute axis { text }?,
-  attribute headers { xsd:IDREFS }?,
-  attribute scope { "row" | "col" | "rowgroup" | "colgroup" }?,
-  [ a:defaultValue = "1" ] attribute rowspan { text }?,
-  [ a:defaultValue = "1" ] attribute colspan { text }?,
-  cellhalign,
-  cellvalign,
-  attribute nowrap { "nowrap" }?,
-  attribute bgcolor { text }?,
-  attribute width { text }?,
-  attribute height { text }?
-# ======================================================
-
-# Set up to read in the CALS model configured to
-# merge with the XHTML table model
-
-# ======================================================
-tables.role.attrib = role.attrib
-# Add label and role attributes to table and informaltable
-bodyatt =
-  attribute floatstyle { text }?,
-  attribute rowheader { "firstcol" | "norowheader" }?,
-  label.attrib
-# Add common attributes to Table, TGroup, TBody, THead, TFoot, Row, 
-# EntryTbl, and Entry (and InformalTable element).
-secur =
-  common.attrib,
-  attribute class { text }?,
-  attribute style { text }?,
-  attribute title { text }?,
-  i18n,
-  events,
-  tables.role.attrib
-common.table.attribs = bodyatt, secur
-# Content model for Table (that also allows HTML tables)
-tbl.table.mdl =
-  (blockinfo?,
-   formalobject.title.content,
-   ndxterm.class*,
-   textobject*,
-   (graphic+ | mediaobject+ | tgroup+))
-  | (caption, (col* | colgroup*), thead?, tfoot?, (tbody+ | tr+))
-informal.tbl.table.mdl =
-  (textobject*, (graphic+ | mediaobject+ | tgroup+))
-  | ((col* | colgroup*), thead?, tfoot?, (tbody+ | tr+))
-# Attributes for Table (including HTML ones)
-
-# N.B. rules = (none | groups | rows | cols | all) but it can't be spec'd
-
-# that way because 'all' already occurs in a different enumeration in
-
-# CALS tables (frame).
-tbl.table.att =
-  attribute tabstyle { text }?,
-  attribute tocentry { yesorno.attvals }?,
-  attribute shortentry { yesorno.attvals }?,
-  attribute orient { "port" | "land" }?,
-  attribute pgwide { yesorno.attvals }?,
-  attribute summary { text }?,
-  attribute width { text }?,
-  attribute border { text }?,
-  attribute rules { text }?,
-  attribute cellspacing { text }?,
-  attribute cellpadding { text }?,
-  attribute align { "left" | "center" | "right" }?,
-  attribute bgcolor { text }?
-tbl.frame.attval =
-  "void"
-  | "above"
-  | "below"
-  | "hsides"
-  | "lhs"
-  | "rhs"
-  | "vsides"
-  | "box"
-  | "border"
-  | "top"
-  | "bottom"
-  | "topbot"
-  | "all"
-  | "sides"
-  | "none"
-# Allow either objects or inlines; beware of REs between elements.
-tbl.entry.mdl = para.char.mix | tabentry.mix
-# thead, tfoot, and tbody are defined in both table models,
-# so we set up parameter entities to define union models for them
-tbl.hdft.mdl = tr+ | (colspec*, row+)
-tbl.tbody.mdl = tr+ | row+
-# End of DocBook XML HTML Table Module V4.5 ............................
-
-# ......................................................................
Index: OK/schema/docbook/4.5/rng/htmltblx.rng
===================================================================
--- BOOK/schema/docbook/4.5/rng/htmltblx.rng	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,590 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- ...................................................................... -->
-<!-- DocBook XML HTML Table Module V4.5 ................................... -->
-<!-- File htmltblx.mod .................................................... -->
-<!--
-  Copyright 2003-2006 ArborText, Inc., Norman Walsh, Sun Microsystems,
-  Inc., and the Organization for the Advancement of Structured Information
-  Standards (OASIS).
-  
-  $Id: htmltblx.mod 6340 2006-10-03 13:23:24Z nwalsh $
-  
-  Permission to use, copy, modify and distribute the DocBook XML DTD
-  and its accompanying documentation for any purpose and without fee
-  is hereby granted in perpetuity, provided that the above copyright
-  notice and this paragraph appear in all copies.  The copyright
-  holders make no representation about the suitability of the DTD for
-  any purpose.  It is provided "as is" without expressed or implied
-  warranty.
-  
-  If you modify the DocBook XML DTD in any way, except for declaring and
-  referencing additional sets of general entities and declaring
-  additional notations, label your DTD as a variant of DocBook.  See
-  the maintenance documentation for more information.
-  
-  Please direct all questions, bug reports, or suggestions for
-  changes to the docbook@lists.oasis-open.org mailing list. For more
-  information, see http://www.oasis-open.org/docbook/.
--->
-<!-- ...................................................................... -->
-<!--
-  This module contains the definitions for elements that are
-  isomorphic to the HTML elements. One could argue we should
-  instead have based ourselves on the XHTML Table Module, but the
-  HTML one is more like what browsers are likely to accept today
-  and users are likely to use.
-  
-  This module has been developed for use with the DocBook V4.5
-  "union table model" in which elements and attlists common to both
-  models are defined (as the union) in the CALS table module by
-  setting various parameter entities appropriately in this file.
-  
-  In DTD driver files referring to this module, please use an entity
-  declaration that uses the public identifier shown below:
-  
-  <!ENTITY % htmltbl PUBLIC
-  "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.5//EN"
-  "htmltblx.mod">
-  %htmltbl;
-  
-  See the documentation for detailed information on the parameter
-  entity and module scheme used in DocBook, customizing DocBook and
-  planning for interchange, and changes made since the last release
-  of DocBook.
--->
-<!-- ======================= XHTML Tables ======================================= -->
-<grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-  <define name="html.coreattrs">
-    <ref name="common.attrib"/>
-    <optional>
-      <attribute name="class"/>
-    </optional>
-    <optional>
-      <attribute name="style"/>
-    </optional>
-    <optional>
-      <attribute name="title"/>
-    </optional>
-  </define>
-  <!-- Does not contain lang or dir because they are in %common.attribs -->
-  <define name="i18n">
-    <optional>
-      <attribute name="xml:lang">
-        <data type="NMTOKEN"/>
-      </attribute>
-    </optional>
-  </define>
-  <define name="events">
-    <optional>
-      <attribute name="onclick"/>
-    </optional>
-    <optional>
-      <attribute name="ondblclick"/>
-    </optional>
-    <optional>
-      <attribute name="onmousedown"/>
-    </optional>
-    <optional>
-      <attribute name="onmouseup"/>
-    </optional>
-    <optional>
-      <attribute name="onmouseover"/>
-    </optional>
-    <optional>
-      <attribute name="onmousemove"/>
-    </optional>
-    <optional>
-      <attribute name="onmouseout"/>
-    </optional>
-    <optional>
-      <attribute name="onkeypress"/>
-    </optional>
-    <optional>
-      <attribute name="onkeydown"/>
-    </optional>
-    <optional>
-      <attribute name="onkeyup"/>
-    </optional>
-  </define>
-  <define name="attrs">
-    <ref name="html.coreattrs"/>
-    <ref name="i18n"/>
-    <ref name="events"/>
-  </define>
-  <define name="cellhalign">
-    <optional>
-      <attribute name="align">
-        <choice>
-          <value>left</value>
-          <value>center</value>
-          <value>right</value>
-          <value>justify</value>
-          <value>char</value>
-        </choice>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="char"/>
-    </optional>
-    <optional>
-      <attribute name="charoff"/>
-    </optional>
-  </define>
-  <define name="cellvalign">
-    <optional>
-      <attribute name="valign">
-        <choice>
-          <value>top</value>
-          <value>middle</value>
-          <value>bottom</value>
-          <value>baseline</value>
-        </choice>
-      </attribute>
-    </optional>
-  </define>
-  <!-- doc:A group of columns in an HTML table. -->
-  <define name="colgroup">
-    <element name="colgroup">
-      <ref name="colgroup.attlist"/>
-      <zeroOrMore>
-        <ref name="col"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- doc:Specifications for a column in an HTML table. -->
-  <define name="col">
-    <element name="col">
-      <ref name="col.attlist"/>
-      <empty/>
-    </element>
-  </define>
-  <!-- doc:A row in an HTML table. -->
-  <define name="tr">
-    <element name="tr">
-      <ref name="tr.attlist"/>
-      <oneOrMore>
-        <choice>
-          <ref name="th"/>
-          <ref name="td"/>
-        </choice>
-      </oneOrMore>
-    </element>
-  </define>
-  <!-- doc:A table header entry in an HTML table. -->
-  <define name="th">
-    <element name="th">
-      <ref name="th.attlist"/>
-      <zeroOrMore>
-        <choice>
-          <ref name="para.char.mix"/>
-          <ref name="tabentry.mix"/>
-          <ref name="table"/>
-          <ref name="informaltable"/>
-        </choice>
-      </zeroOrMore>
-    </element>
-  </define>
-  <!-- doc:A table ntry in an HTML table. -->
-  <define name="td">
-    <element name="td">
-      <ref name="td.attlist"/>
-      <zeroOrMore>
-        <choice>
-          <ref name="para.char.mix"/>
-          <ref name="tabentry.mix"/>
-          <ref name="table"/>
-          <ref name="informaltable"/>
-        </choice>
-      </zeroOrMore>
-    </element>
-  </define>
-  <define name="colgroup.attlist" combine="interleave">
-    <ref name="attrs"/>
-    <optional>
-      <attribute name="span" a:defaultValue="1"/>
-    </optional>
-    <optional>
-      <attribute name="width"/>
-    </optional>
-    <ref name="cellhalign"/>
-    <ref name="cellvalign"/>
-  </define>
-  <define name="col.attlist" combine="interleave">
-    <ref name="attrs"/>
-    <optional>
-      <attribute name="span" a:defaultValue="1"/>
-    </optional>
-    <optional>
-      <attribute name="width"/>
-    </optional>
-    <ref name="cellhalign"/>
-    <ref name="cellvalign"/>
-  </define>
-  <define name="tr.attlist" combine="interleave">
-    <ref name="attrs"/>
-    <ref name="cellhalign"/>
-    <ref name="cellvalign"/>
-    <optional>
-      <attribute name="bgcolor"/>
-    </optional>
-  </define>
-  <define name="th.attlist" combine="interleave">
-    <ref name="attrs"/>
-    <optional>
-      <attribute name="abbr"/>
-    </optional>
-    <optional>
-      <attribute name="axis"/>
-    </optional>
-    <optional>
-      <attribute name="headers">
-        <data type="IDREFS"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="scope">
-        <choice>
-          <value>row</value>
-          <value>col</value>
-          <value>rowgroup</value>
-          <value>colgroup</value>
-        </choice>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="rowspan" a:defaultValue="1"/>
-    </optional>
-    <optional>
-      <attribute name="colspan" a:defaultValue="1"/>
-    </optional>
-    <ref name="cellhalign"/>
-    <ref name="cellvalign"/>
-    <optional>
-      <attribute name="nowrap">
-        <choice>
-          <value>nowrap</value>
-        </choice>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="bgcolor"/>
-    </optional>
-    <optional>
-      <attribute name="width"/>
-    </optional>
-    <optional>
-      <attribute name="height"/>
-    </optional>
-  </define>
-  <define name="td.attlist" combine="interleave">
-    <ref name="attrs"/>
-    <optional>
-      <attribute name="abbr"/>
-    </optional>
-    <optional>
-      <attribute name="axis"/>
-    </optional>
-    <optional>
-      <attribute name="headers">
-        <data type="IDREFS"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="scope">
-        <choice>
-          <value>row</value>
-          <value>col</value>
-          <value>rowgroup</value>
-          <value>colgroup</value>
-        </choice>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="rowspan" a:defaultValue="1"/>
-    </optional>
-    <optional>
-      <attribute name="colspan" a:defaultValue="1"/>
-    </optional>
-    <ref name="cellhalign"/>
-    <ref name="cellvalign"/>
-    <optional>
-      <attribute name="nowrap">
-        <choice>
-          <value>nowrap</value>
-        </choice>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="bgcolor"/>
-    </optional>
-    <optional>
-      <attribute name="width"/>
-    </optional>
-    <optional>
-      <attribute name="height"/>
-    </optional>
-  </define>
-  <!-- ====================================================== -->
-  <!--
-    Set up to read in the CALS model configured to
-    merge with the XHTML table model
-  -->
-  <!-- ====================================================== -->
-  <define name="tables.role.attrib">
-    <ref name="role.attrib"/>
-  </define>
-  <!-- Add label and role attributes to table and informaltable -->
-  <define name="bodyatt">
-    <optional>
-      <attribute name="floatstyle"/>
-    </optional>
-    <optional>
-      <attribute name="rowheader">
-        <choice>
-          <value>firstcol</value>
-          <value>norowheader</value>
-        </choice>
-      </attribute>
-    </optional>
-    <ref name="label.attrib"/>
-  </define>
-  <!--
-    Add common attributes to Table, TGroup, TBody, THead, TFoot, Row, 
-    EntryTbl, and Entry (and InformalTable element).
-  -->
-  <define name="secur">
-    <ref name="common.attrib"/>
-    <optional>
-      <attribute name="class"/>
-    </optional>
-    <optional>
-      <attribute name="style"/>
-    </optional>
-    <optional>
-      <attribute name="title"/>
-    </optional>
-    <ref name="i18n"/>
-    <ref name="events"/>
-    <ref name="tables.role.attrib"/>
-  </define>
-  <define name="common.table.attribs">
-    <ref name="bodyatt"/>
-    <ref name="secur"/>
-  </define>
-  <!-- Content model for Table (that also allows HTML tables) -->
-  <define name="tbl.table.mdl">
-    <choice>
-      <group>
-        <optional>
-          <ref name="blockinfo"/>
-        </optional>
-        <ref name="formalobject.title.content"/>
-        <zeroOrMore>
-          <ref name="ndxterm.class"/>
-        </zeroOrMore>
-        <zeroOrMore>
-          <ref name="textobject"/>
-        </zeroOrMore>
-        <choice>
-          <oneOrMore>
-            <ref name="graphic"/>
-          </oneOrMore>
-          <oneOrMore>
-            <ref name="mediaobject"/>
-          </oneOrMore>
-          <oneOrMore>
-            <ref name="tgroup"/>
-          </oneOrMore>
-        </choice>
-      </group>
-      <group>
-        <ref name="caption"/>
-        <choice>
-          <zeroOrMore>
-            <ref name="col"/>
-          </zeroOrMore>
-          <zeroOrMore>
-            <ref name="colgroup"/>
-          </zeroOrMore>
-        </choice>
-        <optional>
-          <ref name="thead"/>
-        </optional>
-        <optional>
-          <ref name="tfoot"/>
-        </optional>
-        <choice>
-          <oneOrMore>
-            <ref name="tbody"/>
-          </oneOrMore>
-          <oneOrMore>
-            <ref name="tr"/>
-          </oneOrMore>
-        </choice>
-      </group>
-    </choice>
-  </define>
-  <define name="informal.tbl.table.mdl">
-    <choice>
-      <group>
-        <zeroOrMore>
-          <ref name="textobject"/>
-        </zeroOrMore>
-        <choice>
-          <oneOrMore>
-            <ref name="graphic"/>
-          </oneOrMore>
-          <oneOrMore>
-            <ref name="mediaobject"/>
-          </oneOrMore>
-          <oneOrMore>
-            <ref name="tgroup"/>
-          </oneOrMore>
-        </choice>
-      </group>
-      <group>
-        <choice>
-          <zeroOrMore>
-            <ref name="col"/>
-          </zeroOrMore>
-          <zeroOrMore>
-            <ref name="colgroup"/>
-          </zeroOrMore>
-        </choice>
-        <optional>
-          <ref name="thead"/>
-        </optional>
-        <optional>
-          <ref name="tfoot"/>
-        </optional>
-        <choice>
-          <oneOrMore>
-            <ref name="tbody"/>
-          </oneOrMore>
-          <oneOrMore>
-            <ref name="tr"/>
-          </oneOrMore>
-        </choice>
-      </group>
-    </choice>
-  </define>
-  <!-- Attributes for Table (including HTML ones) -->
-  <!-- N.B. rules = (none | groups | rows | cols | all) but it can't be spec'd -->
-  <!-- that way because 'all' already occurs in a different enumeration in -->
-  <!-- CALS tables (frame). -->
-  <define name="tbl.table.att">
-    <optional>
-      <attribute name="tabstyle"/>
-    </optional>
-    <optional>
-      <attribute name="tocentry">
-        <ref name="yesorno.attvals"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="shortentry">
-        <ref name="yesorno.attvals"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="orient">
-        <choice>
-          <value>port</value>
-          <value>land</value>
-        </choice>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="pgwide">
-        <ref name="yesorno.attvals"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="summary"/>
-    </optional>
-    <optional>
-      <attribute name="width"/>
-    </optional>
-    <optional>
-      <attribute name="border"/>
-    </optional>
-    <optional>
-      <attribute name="rules"/>
-    </optional>
-    <optional>
-      <attribute name="cellspacing"/>
-    </optional>
-    <optional>
-      <attribute name="cellpadding"/>
-    </optional>
-    <optional>
-      <attribute name="align">
-        <choice>
-          <value>left</value>
-          <value>center</value>
-          <value>right</value>
-        </choice>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="bgcolor"/>
-    </optional>
-  </define>
-  <define name="tbl.frame.attval">
-    <choice>
-      <value>void</value>
-      <value>above</value>
-      <value>below</value>
-      <value>hsides</value>
-      <value>lhs</value>
-      <value>rhs</value>
-      <value>vsides</value>
-      <value>box</value>
-      <value>border</value>
-      <value>top</value>
-      <value>bottom</value>
-      <value>topbot</value>
-      <value>all</value>
-      <value>sides</value>
-      <value>none</value>
-    </choice>
-  </define>
-  <!-- Allow either objects or inlines; beware of REs between elements. -->
-  <define name="tbl.entry.mdl">
-    <choice>
-      <ref name="para.char.mix"/>
-      <ref name="tabentry.mix"/>
-    </choice>
-  </define>
-  <!--
-    thead, tfoot, and tbody are defined in both table models,
-    so we set up parameter entities to define union models for them
-  -->
-  <define name="tbl.hdft.mdl">
-    <choice>
-      <oneOrMore>
-        <ref name="tr"/>
-      </oneOrMore>
-      <group>
-        <zeroOrMore>
-          <ref name="colspec"/>
-        </zeroOrMore>
-        <oneOrMore>
-          <ref name="row"/>
-        </oneOrMore>
-      </group>
-    </choice>
-  </define>
-  <define name="tbl.tbody.mdl">
-    <choice>
-      <oneOrMore>
-        <ref name="tr"/>
-      </oneOrMore>
-      <oneOrMore>
-        <ref name="row"/>
-      </oneOrMore>
-    </choice>
-  </define>
-</grammar>
-<!-- End of DocBook XML HTML Table Module V4.5 ............................ -->
-<!-- ...................................................................... -->
Index: OK/sparc-index.xml
===================================================================
--- BOOK/sparc-index.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,86 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "general.ent">
-  %general-entities;
-]>
-
-<book>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/sparc/bookinfo.xml"/>
-  <!--
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/dedication.xml"/>
-  -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/preface.xml"/>
-
-  <part id="part1">
-    <?dbhtml filename="part1.html"?>
-
-    <title>Introduction</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="introduction/sparc-chapter.xml"/>
-
-  </part>
-
-  <part id="part2">
-    <?dbhtml filename="part2.html"?>
-
-    <title>Preparing for the Build</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="partitioning/sparc-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="materials/sparc-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/sparc-chapter.xml"/>
-
-  </part>
-
-  <part id="part3">
-    <?dbhtml filename="part3.html"?>
-
-    <title>Make the Cross-Compile Tools</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cross-tools/sparc-chapter.xml"/>
-
-  </part>
-
-  <part id="part4">
-    <?dbhtml filename="part4.html"?>
-
-    <title>Building the Basic Tools</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="temp-system/sparc-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="boot/sparc-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="chroot/sparc-chapter.xml"/>
-
-  </part>
-
-  <part id="part5">
-    <?dbhtml filename="part5.html"?>
-
-    <title>Building the CLFS System</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="testsuite-tools/sparc-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-system/sparc-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="system-config/sparc-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="network/sparc-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bootable/sparc-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="the-end/chapter.xml"/>
-
-  </part>
-
-  <part id="part6">
-    <?dbhtml filename="part6.html"?>
-
-    <title>Appendices</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/acronymlist.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/dependencies/common.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/dependencies/sparc.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/rationale/common.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/rationale/sparc.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/license.xml"/>
-
-  </part>
-
-  <index/>
-
-</book>
Index: OK/sparc64-64-index.xml
===================================================================
--- BOOK/sparc64-64-index.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,86 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "general.ent">
-  %general-entities;
-]>
-
-<book>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/sparc64-64/bookinfo.xml"/>
-  <!--
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/dedication.xml"/>
-  -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/preface.xml"/>
-
-  <part id="part1">
-    <?dbhtml filename="part1.html"?>
-
-    <title>Introduction</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="introduction/sparc64-64-chapter.xml"/>
-
-  </part>
-
-  <part id="part2">
-    <?dbhtml filename="part2.html"?>
-
-    <title>Preparing for the Build</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="partitioning/sparc64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="materials/sparc64-64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/sparc64-64-chapter.xml"/>
-
-  </part>
-
-  <part id="part3">
-    <?dbhtml filename="part3.html"?>
-
-    <title>Make the Cross-Compile Tools</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cross-tools/sparc64-64-chapter.xml"/>
-
-  </part>
-
-  <part id="part4">
-    <?dbhtml filename="part4.html"?>
-
-    <title>Building the Basic Tools</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="temp-system/sparc64-64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="boot/sparc64-64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="chroot/sparc64-64-chapter.xml"/>
-
-  </part>
-
-  <part id="part5">
-    <?dbhtml filename="part5.html"?>
-
-    <title>Building the CLFS System</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="testsuite-tools/sparc64-64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-system/sparc64-64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="system-config/sparc64-64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="network/sparc64-64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bootable/sparc64-64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="the-end/chapter.xml"/>
-
-  </part>
-
-  <part id="part6">
-    <?dbhtml filename="part6.html"?>
-
-    <title>Appendices</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/acronymlist.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/dependencies/common.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/dependencies/sparc.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/rationale/common.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/rationale/sparc.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/license.xml"/>
-
-  </part>
-
-  <index/>
-
-</book>
Index: OK/sparc64-index.xml
===================================================================
--- BOOK/sparc64-index.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,86 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "general.ent">
-  %general-entities;
-]>
-
-<book>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/sparc64/bookinfo.xml"/>
-  <!--
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/dedication.xml"/>
-  -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/preface.xml"/>
-
-  <part id="part1">
-    <?dbhtml filename="part1.html"?>
-
-    <title>Introduction</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="introduction/sparc64-chapter.xml"/>
-
-  </part>
-
-  <part id="part2">
-    <?dbhtml filename="part2.html"?>
-
-    <title>Preparing for the Build</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="partitioning/sparc64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="materials/sparc64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/sparc64-chapter.xml"/>
-
-  </part>
-
-  <part id="part3">
-    <?dbhtml filename="part3.html"?>
-
-    <title>Make the Cross-Compile Tools</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cross-tools/sparc64-chapter.xml"/>
-
-  </part>
-
-  <part id="part4">
-    <?dbhtml filename="part4.html"?>
-
-    <title>Building the Basic Tools</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="temp-system/sparc64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="boot/sparc64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="chroot/sparc64-chapter.xml"/>
-
-  </part>
-
-  <part id="part5">
-    <?dbhtml filename="part5.html"?>
-
-    <title>Building the CLFS System</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="testsuite-tools/sparc64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-system/sparc64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="system-config/sparc64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="network/sparc64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bootable/sparc64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="the-end/chapter.xml"/>
-
-  </part>
-
-  <part id="part6">
-    <?dbhtml filename="part6.html"?>
-
-    <title>Appendices</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/acronymlist.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/dependencies/common.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/dependencies/sparc.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/rationale/common.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/rationale/sparc.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/license.xml"/>
-
-  </part>
-
-  <index/>
-
-</book>
Index: OK/stylesheets/clfs-chunked.xsl
===================================================================
--- BOOK/stylesheets/clfs-chunked.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,18 +1,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<!--
-$LastChangedBy$
-$Date$
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns="http://www.w3.org/1999/xhtml"
-                version="1.0">
-
-    <!-- LFS top-level chunk templates. -->
-  <xsl:import href="lfs-xsl/chunkfast.xsl"/>
-
-    <!-- The LFS book type to be processed (lfs, blfs, clfs, or hlfs) -->
-  <xsl:param name="book-type">clfs</xsl:param>
-
-</xsl:stylesheet>
Index: OK/stylesheets/clfs-nochunks.xsl
===================================================================
--- BOOK/stylesheets/clfs-nochunks.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,18 +1,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<!--
-$LastChangedBy$
-$Date$
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns="http://www.w3.org/1999/xhtml"
-                version="1.0">
-
-    <!-- LFS top-level no-chunk templates. -->
-  <xsl:import href="lfs-xsl/nochunks.xsl"/>
-
-    <!-- The LFS book type to be processed (lfs, blfs, clfs, or hlfs) -->
-  <xsl:param name="book-type">clfs</xsl:param>
-
-</xsl:stylesheet>
Index: OK/stylesheets/clfs-pdf.xsl
===================================================================
--- BOOK/stylesheets/clfs-pdf.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,18 +1,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<!--
-$LastChangedBy$
-$Date$
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version="1.0">
-
-    <!-- LFS top-level pdf templates. -->
-  <xsl:import href="lfs-xsl/pdf.xsl"/>
-
-    <!-- The LFS book type to be processed (lfs, blfs, clfs, or hlfs) -->
-  <xsl:param name="book-type">clfs</xsl:param>
-
-</xsl:stylesheet>
Index: OK/stylesheets/dump-commands.xsl
===================================================================
--- BOOK/stylesheets/dump-commands.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,84 +1,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:exsl="http://exslt.org/common"
-    extension-element-prefixes="exsl"
-    version="1.0">
-
-<!-- XSLT stylesheet to extract commands from [B,H]LFS books. -->
-
-  <xsl:template match="/">
-    <xsl:apply-templates select="//sect1"/>
-  </xsl:template>
-
-  <xsl:template match="sect1">
-      <!-- The dirs names -->
-    <xsl:variable name="pi-dir" select="../processing-instruction('dbhtml')"/>
-    <xsl:variable name="pi-dir-value" select="substring-after($pi-dir,'dir=')"/>
-    <xsl:variable name="quote-dir" select="substring($pi-dir-value,1,1)"/>
-    <xsl:variable name="dirname" select="substring-before(substring($pi-dir-value,2),$quote-dir)"/>
-      <!-- The file names -->
-    <xsl:variable name="pi-file" select="processing-instruction('dbhtml')"/>
-    <xsl:variable name="pi-file-value" select="substring-after($pi-file,'filename=')"/>
-    <xsl:variable name="filename" select="substring-before(substring($pi-file-value,2),'.html')"/>
-      <!-- The build order -->
-    <xsl:variable name="position" select="position()"/>
-    <xsl:variable name="order">
-      <xsl:choose>
-        <xsl:when test="string-length($position) = 1">
-          <xsl:text>00</xsl:text>
-          <xsl:value-of select="$position"/>
-        </xsl:when>
-        <xsl:when test="string-length($position) = 2">
-          <xsl:text>0</xsl:text>
-          <xsl:value-of select="$position"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="$position"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-      <!-- Creating dirs and files -->
-    <exsl:document href="{$dirname}/{$order}-{$filename}" method="text">
-      <xsl:apply-templates select=".//screen"/>
-    </exsl:document>
-  </xsl:template>
-
-  <xsl:template match="screen">
-    <xsl:if test="child::* = userinput">
-      <xsl:choose>
-        <xsl:when test="@role = 'nodump'"/>
-        <xsl:when test="@role = 'root'">
-          <xsl:text>&#xA;</xsl:text>
-          <xsl:text># Run this as root</xsl:text>
-          <xsl:apply-templates select="userinput"/>
-          <xsl:text># End root commands</xsl:text>
-          <xsl:text>&#xA;</xsl:text>
-	</xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates select="userinput"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:if>
-  </xsl:template>
-
-  <xsl:template match="userinput">
-    <xsl:text>&#xA;</xsl:text>
-    <xsl:if test=".//replaceable">
-      <xsl:text># This block must be edited to suit your needs.</xsl:text>
-    </xsl:if>
-    <xsl:text>&#xA;</xsl:text>
-    <xsl:apply-templates/>
-    <xsl:text>&#xA;</xsl:text>
-    <xsl:if test=".//replaceable">
-      <xsl:text># End of editable block.</xsl:text>
-    </xsl:if>
-    <xsl:text>&#xA;</xsl:text>
-  </xsl:template>
-
-  <xsl:template match="replaceable">
-    <xsl:text>**EDITME</xsl:text>
-    <xsl:apply-templates/>
-    <xsl:text>EDITME**</xsl:text>
-  </xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/chunk-master.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/chunk-master.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,53 +1,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<!--
-$LastChangedBy$
-$Date$
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns="http://www.w3.org/1999/xhtml"
-                version="1.0">
-
-   <!-- Top-level chunked code for normal processing.
-        Import customized output templates.
-        Include customized chunk templates.
-        Replaces {docbook-xsl}/xhtml/chunk.xsl -->
-
-    <!-- Our master non-chunking presentation templates -->
-  <xsl:import href="chunk-slave.xsl"/>
-
-    <!-- Upstream chunk code named templates -->
-  <xsl:import href="docbook-xsl-snapshot/xhtml/chunk-common.xsl"/>
-
-    <!-- Upstream chunk code match templates -->
-  <xsl:include href="docbook-xsl-snapshot/xhtml/chunk-code.xsl"/>
-
-    <!-- Including our customized chunks templates -->
-  <xsl:include href="xhtml/lfs-index.xsl"/>
-  <xsl:include href="xhtml/lfs-legalnotice.xsl"/>
-  <xsl:include href="xhtml/lfs-navigational.xsl"/>
-
-    <!-- sect1:
-           Prevent creation of dummy sect1 files used to emulate sub-chapters. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/chunk-code.xsl
-         It match also others sect* tags. The code for that tags is unchanged. -->
-  <xsl:template match="sect1">
-    <xsl:variable name="ischunk">
-      <xsl:call-template name="chunk"/>
-    </xsl:variable>
-    <xsl:choose>
-      <xsl:when test="@role = 'dummy'"/>
-      <xsl:when test="not(parent::*)">
-        <xsl:call-template name="process-chunk-element"/>
-      </xsl:when>
-      <xsl:when test="$ischunk = 0">
-        <xsl:apply-imports/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="process-chunk-element"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/chunk-slave.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/chunk-slave.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,69 +1,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<!--
-$LastChangedBy$
-$Date$
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns="http://www.w3.org/1999/xhtml"
-                version="1.0">
-
-   <!-- Second level chunked output template.
-        Sets global params and include customized elements templates. -->
-
-    <!-- Upstream XHTML presentation templates -->
-  <xsl:import href="docbook-xsl-snapshot/xhtml/docbook.xsl"/>
-
-    <!-- Use ISO-8859-1 for output instead of default UTF-8 -->
-  <xsl:param name="chunker.output.encoding" select="'ISO-8859-1'"/>
-
-    <!-- Including our customized elements templates -->
-  <xsl:include href="common.xsl"/>
-  <xsl:include href="xhtml/lfs-admon.xsl"/>
-  <xsl:include href="xhtml/lfs-mixed.xsl"/>
-  <xsl:include href="xhtml/lfs-sections.xsl"/>
-  <xsl:include href="xhtml/lfs-titles.xsl"/>
-  <xsl:include href="xhtml/lfs-toc.xsl"/>
-  <xsl:include href="xhtml/lfs-xref.xsl"/>
-
-    <!-- The CSS Stylesheets. We set here relative path from sub-dirs HTML files.
-    The path from top-level HTML files (index.html, partX.html, etc) MUST be
-    fixed via a sed in the Makefile-->
-    <!-- Master CSS Stylesheet -->
-  <xsl:param name="html.stylesheet" select="'../stylesheets/lfs.css'"/>
-    <!-- Print CSS Stylesheet -->
-    <!-- The original template is in {docbook-xsl}/xhtml/docbook.xsl -->
-  <xsl:template name='user.head.content'>
-     <link rel="stylesheet" href="../stylesheets/lfs-print.css" type="text/css" media="print"/>
-  </xsl:template>
-
-    <!-- Dropping some unwanted style attributes -->
-  <xsl:param name="ulink.target" select="''"/>
-  <xsl:param name="css.decoration" select="0"/>
-
-    <!-- No XML declaration -->
-  <xsl:param name="chunker.output.omit-xml-declaration" select="'yes'"/>
-
-    <!-- Control generation of ToCs and LoTs -->
-  <xsl:param name="generate.toc">
-    book      toc,title
-    preface   toc
-    part      toc
-    chapter   toc
-    appendix  nop
-    sect1     nop
-    sect2     nop
-    sect3     nop
-    sect4     nop
-    sect5     nop
-    section   nop
-  </xsl:param>
-
-    <!-- How deep should recursive sections appear in the TOC? -->
-  <xsl:param name="toc.section.depth">1</xsl:param>
-
-    <!-- How maximaly deep should be each TOC? -->
-  <xsl:param name="toc.max.depth">3</xsl:param>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/chunkfast.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/chunkfast.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,76 +1,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<!--
-$LastChangedBy$
-$Date$
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns="http://www.w3.org/1999/xhtml"
-                xmlns:exsl="http://exslt.org/common"
-                xmlns:cf="http://docbook.sourceforge.net/xmlns/chunkfast/1.0"
-                version="1.0"
-                exclude-result-prefixes="cf exsl">
-
-   <!-- Top-level chunked code for fast processing.
-        Import standart customized chunk code.
-        Replaces {docbook-xsl}/xhtml/chunkfast.xsl
-
-        Note: Using this file as the top-level for chunked output implies that
-              profiling must be done on a previous step. -->
-
-    <!-- Our master chunking templates -->
-  <xsl:import href="chunk-master.xsl"/>
-
-    <!-- Use chunk.fast code? 1 = yes, 0 = no -->
-  <xsl:param name="chunk.fast" select="1"/>
-
-  <!-- The code below was copied as-is from {docbook-xsl}/xhtml/chunkfast.xsl -->
-
-  <xsl:variable name="chunks" select="exsl:node-set($chunk.hierarchy)//cf:div"/>
-
-  <xsl:template name="process-chunk-element">
-    <xsl:choose>
-      <xsl:when test="$chunk.fast != 0 and function-available('exsl:node-set')">
-        <xsl:variable name="genid" select="generate-id()"/>
-
-        <xsl:variable name="div" select="$chunks[@id=$genid or @xml:id=$genid]"/>
-
-        <xsl:variable name="prevdiv" select="($div/preceding-sibling::cf:div|$div/preceding::cf:div|$div/parent::cf:div)[last()]"/>
-        <xsl:variable name="prev" select="key('genid', ($prevdiv/@id|$prevdiv/@xml:id)[1])"/>
-
-        <xsl:variable name="nextdiv" select="($div/following-sibling::cf:div|$div/following::cf:div|$div/cf:div)[1]"/>
-        <xsl:variable name="next" select="key('genid', ($nextdiv/@id|$nextdiv/@xml:id)[1])"/>
-
-        <xsl:choose>
-          <xsl:when test="$onechunk != 0 and parent::*">
-            <xsl:apply-imports/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:call-template name="process-chunk">
-              <xsl:with-param name="prev" select="$prev"/>
-              <xsl:with-param name="next" select="$next"/>
-            </xsl:call-template>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:choose>
-          <xsl:when test="$onechunk != 0 and not(parent::*)">
-            <xsl:call-template name="chunk-all-sections"/>
-          </xsl:when>
-          <xsl:when test="$onechunk != 0">
-            <xsl:apply-imports/>
-          </xsl:when>
-          <xsl:when test="$chunk.first.sections = 0">
-            <xsl:call-template name="chunk-first-section-with-parent"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:call-template name="chunk-all-sections"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/common.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/common.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,458 +1,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<!--
-$LastChangedBy$
-$Date$
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns="http://www.w3.org/1999/xhtml"
-                version="1.0">
-
-  <!-- This stylesheet contains common params and templates for all outputs. -->
-
-    <!-- This file contains our localization strings (for internationalization) -->
-  <xsl:param name="local.l10n.xml" select="document('lfs-l10n.xml')"/>
-
-
-<!-- INDEX -->
-
-    <!-- Should the Index be generated? 1 = yes, 0 = no -->
-  <xsl:param name="generate.index" select="1"></xsl:param>
-
-    <!-- The indexing method used. Only 'basic' is supported by xsltproc -->
-  <xsl:param name="index.method" select="'basic'"></xsl:param>
-
-    <!-- The Index title:
-           We create this param to can have gentext support in both
-           the Index page title and links that point to the Index page.
-           It also allow us to change the title, if wanted.
-           Note: To change the title involves creating the appropiate
-           entries in lfs-l10n.xml -->
-  <xsl:param name="index-title">Index</xsl:param>
-
-    <!-- Index title generation. -->
-    <!-- The original template is in {docbook-xsl}/common/titles.xsl -->
-  <xsl:template match="index" mode="title.markup">
-    <xsl:param name="allow-anchors" select="0"/>
-    <xsl:call-template name="gentext">
-      <xsl:with-param name="key" select="$index-title"/>
-    </xsl:call-template>
-  </xsl:template>
-
-    <!-- indexterm:
-           Dropping unneeded anchors and fo:wraper elemments. -->
-    <!-- The original templates are in {docbook-xsl}/{xhtml,fo}/index.xsl -->
-  <xsl:template match="indexterm"/>
-
-<!-- -->
-
-<!-- LABELS -->
-
-    <!-- Are sections enumerated? 1 = yes, 0 = no -->
-  <xsl:param name="section.autolabel" select="1"/>
-
-    <!-- Do section labels include the component label? 1 = yes, 0 = no -->
-  <xsl:param name="section.label.includes.component.label" select="1"/>
-
-    <!-- sect1 label.markup:
-           Use lowercase roman numbers for sect1 in preface. -->
-    <!-- The original template is in {docbook-xsl}/common/labels.xsl -->
-  <xsl:template match="sect1" mode="label.markup">
-    <!-- if the parent is a component, maybe label that too -->
-    <xsl:variable name="parent.is.component">
-      <xsl:call-template name="is.component">
-        <xsl:with-param name="node" select=".."/>
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="component.label">
-      <xsl:if test="$section.label.includes.component.label != 0
-                    and $parent.is.component != 0">
-        <xsl:variable name="parent.label">
-          <xsl:apply-templates select=".." mode="label.markup"/>
-        </xsl:variable>
-        <xsl:if test="$parent.label != ''">
-          <xsl:apply-templates select=".." mode="label.markup"/>
-          <xsl:apply-templates select=".." mode="intralabel.punctuation"/>
-        </xsl:if>
-      </xsl:if>
-    </xsl:variable>
-    <xsl:choose>
-      <xsl:when test="@label">
-        <xsl:value-of select="@label"/>
-      </xsl:when>
-      <xsl:when test="$section.autolabel != 0">
-        <xsl:copy-of select="$component.label"/>
-        <xsl:choose>
-          <xsl:when test="ancestor::preface">
-            <xsl:number format="i" count="sect1"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:number format="1" count="sect1"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-    </xsl:choose>
-  </xsl:template>
-
-    <!-- sect2 label.markup:
-           Skip numeration for sect2 with empty title. -->
-    <!-- The original template is in {docbook-xsl}/common/labels.xsl
-         It match also sect3, sect4, and sect5, that are unchanged. -->
-  <xsl:template match="sect2" mode="label.markup">
-      <!-- label the parent -->
-      <xsl:variable name="parent.section.label">
-        <xsl:call-template name="label.this.section">
-          <xsl:with-param name="section" select=".."/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:if test="$parent.section.label != '0'">
-        <xsl:apply-templates select=".." mode="label.markup"/>
-        <xsl:apply-templates select=".." mode="intralabel.punctuation"/>
-      </xsl:if>
-      <xsl:choose>
-        <xsl:when test="@label">
-          <xsl:value-of select="@label"/>
-        </xsl:when>
-        <xsl:when test="$section.autolabel != 0">
-          <xsl:choose>
-            <!-- If the first sect2 isn't numbered, renumber the remainig sections -->
-            <xsl:when test="string-length(../sect2[1]/title) = 0">
-              <xsl:variable name="totalsect2">
-                <xsl:number count="sect2"/>
-              </xsl:variable>
-              <xsl:number value="$totalsect2 - 1"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:number count="sect2"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:when>
-      </xsl:choose>
-  </xsl:template>
-
-    <!-- object.title.template:
-           Skip numeration for sectX > sect1 in preface. -->
-    <!-- The original template is in {docbook-xsl}/common/gentext.xsl. -->
-  <xsl:template match="section|sect1|sect2|sect3|sect4|sect5|simplesect|bridgehead"
-                mode="object.title.template">
-    <xsl:variable name="is.numbered">
-      <xsl:call-template name="label.this.section"/>
-    </xsl:variable>
-    <xsl:choose>
-      <xsl:when test="$is.numbered != 0 and not(ancestor::preface/sect1)">
-        <xsl:call-template name="gentext.template">
-          <xsl:with-param name="context" select="'title-numbered'"/>
-          <xsl:with-param name="name">
-            <xsl:call-template name="xpath.location"/>
-          </xsl:with-param>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="gentext.template">
-          <xsl:with-param name="context" select="'title-unnumbered'"/>
-          <xsl:with-param name="name">
-            <xsl:call-template name="xpath.location"/>
-          </xsl:with-param>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-<!-- -->
-
-<!-- XREF (see {xhtml,pdf}/xref.xsl) -->
-
-    <!-- mode object.xref.markup:
-           Propagate role to named template substitute-markup -->
-    <!-- The original template is in {docbook-xsl}/common/gentext.xsl -->
-  <xsl:template match="*" mode="object.xref.markup">
-    <xsl:param name="purpose"/>
-    <xsl:param name="xrefstyle"/>
-    <xsl:param name="referrer"/>
-    <xsl:param name="verbose" select="1"/>
-    <xsl:param name="role"/>
-    <xsl:variable name="template">
-      <xsl:choose>
-        <xsl:when test="starts-with(normalize-space($xrefstyle), 'select:')">
-          <xsl:call-template name="make.gentext.template">
-            <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-            <xsl:with-param name="purpose" select="$purpose"/>
-            <xsl:with-param name="referrer" select="$referrer"/>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:when test="starts-with(normalize-space($xrefstyle), 'template:')">
-          <xsl:value-of select="substring-after(normalize-space($xrefstyle), 'template:')"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates select="." mode="object.xref.template">
-            <xsl:with-param name="purpose" select="$purpose"/>
-            <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-            <xsl:with-param name="referrer" select="$referrer"/>
-          </xsl:apply-templates>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="$template = '' and $verbose != 0">
-      <xsl:message>
-        <xsl:text>object.xref.markup: empty xref template</xsl:text>
-        <xsl:text> for linkend="</xsl:text>
-        <xsl:value-of select="@id|@xml:id"/>
-        <xsl:text>" and @xrefstyle="</xsl:text>
-        <xsl:value-of select="$xrefstyle"/>
-        <xsl:text>"</xsl:text>
-      </xsl:message>
-    </xsl:if>
-    <xsl:call-template name="substitute-markup">
-      <xsl:with-param name="purpose" select="$purpose"/>
-      <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-      <xsl:with-param name="referrer" select="$referrer"/>
-      <xsl:with-param name="template" select="$template"/>
-      <xsl:with-param name="verbose" select="$verbose"/>
-      <xsl:with-param name="role" select="$role"/>
-    </xsl:call-template>
-  </xsl:template>
-
-    <!-- substitute-markup:
-           Propagate role to mode insert.title.markup -->
-    <!-- The original template is in {docbook-xsl}/common/gentext.xsl -->
-  <xsl:template name="substitute-markup">
-    <xsl:param name="template" select="''"/>
-    <xsl:param name="allow-anchors" select="'0'"/>
-    <xsl:param name="title" select="''"/>
-    <xsl:param name="subtitle" select="''"/>
-    <xsl:param name="docname" select="''"/>
-    <xsl:param name="label" select="''"/>
-    <xsl:param name="pagenumber" select="''"/>
-    <xsl:param name="purpose"/>
-    <xsl:param name="xrefstyle"/>
-    <xsl:param name="referrer"/>
-    <xsl:param name="verbose"/>
-    <xsl:param name="role"/>
-    <xsl:choose>
-      <xsl:when test="contains($template, '%')">
-        <xsl:value-of select="substring-before($template, '%')"/>
-        <xsl:variable name="candidate"
-                      select="substring(substring-after($template, '%'), 1, 1)"/>
-        <xsl:choose>
-          <xsl:when test="$candidate = 't'">
-            <xsl:apply-templates select="." mode="insert.title.markup">
-              <xsl:with-param name="purpose" select="$purpose"/>
-              <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-              <xsl:with-param name="role" select="$role"/>
-              <xsl:with-param name="title">
-                <xsl:choose>
-                  <xsl:when test="$title != ''">
-                    <xsl:copy-of select="$title"/>
-                  </xsl:when>
-                  <xsl:otherwise>
-                    <xsl:apply-templates select="." mode="title.markup">
-                      <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-                      <xsl:with-param name="verbose" select="$verbose"/>
-                    </xsl:apply-templates>
-                  </xsl:otherwise>
-                </xsl:choose>
-              </xsl:with-param>
-            </xsl:apply-templates>
-          </xsl:when>
-          <xsl:when test="$candidate = 's'">
-            <xsl:apply-templates select="." mode="insert.subtitle.markup">
-              <xsl:with-param name="purpose" select="$purpose"/>
-              <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-              <xsl:with-param name="subtitle">
-                <xsl:choose>
-                  <xsl:when test="$subtitle != ''">
-                    <xsl:copy-of select="$subtitle"/>
-                  </xsl:when>
-                  <xsl:otherwise>
-                    <xsl:apply-templates select="." mode="subtitle.markup">
-                      <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-                    </xsl:apply-templates>
-                  </xsl:otherwise>
-                </xsl:choose>
-              </xsl:with-param>
-            </xsl:apply-templates>
-          </xsl:when>
-          <xsl:when test="$candidate = 'n'">
-            <xsl:apply-templates select="." mode="insert.label.markup">
-              <xsl:with-param name="purpose" select="$purpose"/>
-              <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-              <xsl:with-param name="label">
-                <xsl:choose>
-                  <xsl:when test="$label != ''">
-                    <xsl:copy-of select="$label"/>
-                  </xsl:when>
-                  <xsl:otherwise>
-                    <xsl:apply-templates select="." mode="label.markup"/>
-                  </xsl:otherwise>
-                </xsl:choose>
-              </xsl:with-param>
-            </xsl:apply-templates>
-          </xsl:when>
-          <xsl:when test="$candidate = 'p'">
-            <xsl:apply-templates select="." mode="insert.pagenumber.markup">
-              <xsl:with-param name="purpose" select="$purpose"/>
-              <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-              <xsl:with-param name="pagenumber">
-                <xsl:choose>
-                  <xsl:when test="$pagenumber != ''">
-                    <xsl:copy-of select="$pagenumber"/>
-                  </xsl:when>
-                  <xsl:otherwise>
-                    <xsl:apply-templates select="." mode="pagenumber.markup"/>
-                  </xsl:otherwise>
-                </xsl:choose>
-              </xsl:with-param>
-            </xsl:apply-templates>
-          </xsl:when>
-          <xsl:when test="$candidate = 'o'">
-            <!-- olink target document title -->
-            <xsl:apply-templates select="." mode="insert.olink.docname.markup">
-              <xsl:with-param name="purpose" select="$purpose"/>
-              <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-              <xsl:with-param name="docname">
-                <xsl:choose>
-                  <xsl:when test="$docname != ''">
-                    <xsl:copy-of select="$docname"/>
-                  </xsl:when>
-                  <xsl:otherwise>
-                    <xsl:apply-templates select="." mode="olink.docname.markup"/>
-                  </xsl:otherwise>
-                </xsl:choose>
-              </xsl:with-param>
-            </xsl:apply-templates>
-          </xsl:when>
-          <xsl:when test="$candidate = 'd'">
-            <xsl:apply-templates select="." mode="insert.direction.markup">
-              <xsl:with-param name="purpose" select="$purpose"/>
-              <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-              <xsl:with-param name="direction">
-                <xsl:choose>
-                  <xsl:when test="$referrer">
-                    <xsl:variable name="referent-is-below">
-                      <xsl:for-each select="preceding::xref">
-                        <xsl:if test="generate-id(.) = generate-id($referrer)">1</xsl:if>
-                      </xsl:for-each>
-                    </xsl:variable>
-                    <xsl:choose>
-                      <xsl:when test="$referent-is-below = ''">
-                        <xsl:call-template name="gentext">
-                          <xsl:with-param name="key" select="'above'"/>
-                        </xsl:call-template>
-                      </xsl:when>
-                      <xsl:otherwise>
-                        <xsl:call-template name="gentext">
-                          <xsl:with-param name="key" select="'below'"/>
-                        </xsl:call-template>
-                      </xsl:otherwise>
-                    </xsl:choose>
-                  </xsl:when>
-                  <xsl:otherwise>
-                    <xsl:message>Attempt to use %d in gentext with no referrer!</xsl:message>
-                  </xsl:otherwise>
-                </xsl:choose>
-              </xsl:with-param>
-            </xsl:apply-templates>
-          </xsl:when>
-          <xsl:when test="$candidate = '%' ">
-            <xsl:text>%</xsl:text>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:text>%</xsl:text><xsl:value-of select="$candidate"/>
-          </xsl:otherwise>
-        </xsl:choose>
-        <!-- recurse with the rest of the template string -->
-        <xsl:variable name="rest"
-              select="substring($template,
-              string-length(substring-before($template, '%'))+3)"/>
-        <xsl:call-template name="substitute-markup">
-          <xsl:with-param name="template" select="$rest"/>
-          <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-          <xsl:with-param name="title" select="$title"/>
-          <xsl:with-param name="subtitle" select="$subtitle"/>
-          <xsl:with-param name="docname" select="$docname"/>
-          <xsl:with-param name="label" select="$label"/>
-          <xsl:with-param name="pagenumber" select="$pagenumber"/>
-          <xsl:with-param name="purpose" select="$purpose"/>
-          <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-          <xsl:with-param name="referrer" select="$referrer"/>
-          <xsl:with-param name="verbose" select="$verbose"/>
-          <xsl:with-param name="role" select="$role"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$template"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-<!-- -->
-
-<!-- Total packages size calculation -->
-
-    <!-- returnvalue:
-            If the tag is not empty, apply the original template.
-            Otherwise apply the calculation template. -->
-  <xsl:template match="returnvalue">
-    <xsl:choose>
-      <xsl:when test="count(*)&gt;0">
-        <xsl:apply-imports/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="calculation">
-          <xsl:with-param name="scope" select="../../variablelist"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-    <!-- Self-made calculation template. -->
-  <xsl:template name="calculation">
-    <xsl:param name="scope"/>
-    <xsl:param name="total">0</xsl:param>
-    <xsl:param name="position">1</xsl:param>
-    <xsl:variable name="tokens" select="count($scope/varlistentry)"/>
-    <xsl:variable name="token" select="$scope/varlistentry[$position]/term/token"/>
-    <xsl:variable name="size" select="substring-before($token,' KB')"/>
-    <xsl:variable name="rawsize">
-      <xsl:choose>
-        <xsl:when test="contains($size,',')">
-          <xsl:value-of select="concat(substring-before($size,','),substring-after($size,','))"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="$size"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:choose>
-      <xsl:when test="$position &lt;= $tokens">
-        <xsl:call-template name="calculation">
-          <xsl:with-param name="scope" select="$scope"/>
-          <xsl:with-param name="position" select="$position +1"/>
-          <xsl:with-param name="total" select="$total + $rawsize"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:choose>
-          <xsl:when test="$total &lt; '1000'">
-            <xsl:value-of select="$total"/>
-            <xsl:text>  KB</xsl:text>
-          </xsl:when>
-          <xsl:when test="$total &gt; '1000' and $total &lt; '5000'">
-            <xsl:value-of select="substring($total,1,1)"/>
-            <xsl:text>,</xsl:text>
-            <xsl:value-of select="substring($total,2)"/>
-            <xsl:text>  KB</xsl:text>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="round($total div 1024)"/>
-            <xsl:text>  MB</xsl:text>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-<!-- -->
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/COPYING
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/COPYING	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,47 +1,0 @@
-Copyright
----------
-Copyright (C) 1999-2007 Norman Walsh
-Copyright (C) 2003 JiÅÃ­ Kosek
-Copyright (C) 2004-2007 Steve Ball
-Copyright (C) 2005-2007 The DocBook Project
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the ``Software''), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or
-sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-Except as contained in this notice, the names of individuals
-credited with contribution to this software 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 individuals in question.
-
-Any stylesheet derived from this Software that is publically
-distributed will be identified with a different name and the
-version strings in any derived Software will be changed so that
-no possibility of confusion between the derived package and this
-Software will exist.
-
-Warranty
---------
-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 NORMAN WALSH OR ANY OTHER
-CONTRIBUTOR 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.
-
-Contacting the Author
----------------------
-The DocBook XSL stylesheets are maintained by Norman Walsh,
-<ndw@nwalsh.com>, and members of the DocBook Project,
-<docbook-developers@sf.net>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/VERSION
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/VERSION	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,113 +1,0 @@
-<?xml version='1.0'?> <!-- -*- nxml -*- vim: set foldlevel=2: -->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:fm="http://freshmeat.net/projects/freshmeat-submit/"
-  xmlns:sf="http://sourceforge.net/"
-  xmlns:dyn="http://exslt.org/dynamic"
-  xmlns:saxon="http://icl.com/saxon"
-  exclude-result-prefixes="fm sf"
-  version='1.0'>
-
-<xsl:output omit-xml-declaration="yes"/>
-
-<xsl:param name="get"/>
-<xsl:param name="VERSION" select="string(document('')//fm:Version[1])"/>
-<xsl:param name="Tag" select="concat('V',translate(string(document('')//fm:Version[1]),'.',''))"/>
-<xsl:param name="DistroTitle" select="string(document('')//fm:Branch[1])"/>
-<xsl:param name="sf-relid" select="0"/>
-
-<xsl:param name="DistroName">docbook-xsl</xsl:param>
-<xsl:param name="PreviousRelease">1.72.0</xsl:param>
-<xsl:param name="PreviousReleaseRevision">6549</xsl:param>
-<xsl:param name="Revision">$Revision$</xsl:param>
-<xsl:param name="VersionFileURL">$URL: https://docbook.svn.sourceforge.net/svnroot/docbook/trunk/xsl/VERSION $</xsl:param>
-
-<xsl:strip-space elements="fm:*"/>
-
-<fm:project>
-  <fm:Project>DocBook</fm:Project>
-  <fm:Branch>XSL Stylesheets</fm:Branch>
-  <fm:Version>1.73.2</fm:Version>
-<!--
-  <fm:License>MIT/X Consortium License</fm:License>
--->
-  <fm:Release-Focus>
-<!-- * Initial freshmeat announcement -->
-<!-- * Documentation -->
-<!-- * Code cleanup -->
-<!-- * Minor feature enhancements -->
-<!-- * Major feature enhancements -->
-Minor bugfixes
-<!-- * Major bugfixes -->
-<!-- * Minor security fixes -->
-<!-- * Major security fixes -->
-  </fm:Release-Focus>
-  <fm:Home-Page-URL>http://sourceforge.net/projects/docbook/</fm:Home-Page-URL>
-  <fm:Gzipped-Tar-URL>http://prdownloads.sourceforge.net/docbook/{DISTRONAME-VERSION}.tar.gz?download</fm:Gzipped-Tar-URL>
-  <fm:Zipped-Tar-URL>http://prdownloads.sourceforge.net/docbook/{DISTRONAME-VERSION}.zip?download</fm:Zipped-Tar-URL>
-  <fm:Bzipped-Tar-URL>http://prdownloads.sourceforge.net/docbook/{DISTRONAME-VERSION}.bz2?download</fm:Bzipped-Tar-URL>
-  <fm:Changelog-URL>http://sourceforge.net/project/shownotes.php?release_id={SFRELID}</fm:Changelog-URL>
-  <fm:CVS-URL>http://docbook.svn.sourceforge.net/viewvc/docbook/</fm:CVS-URL>
-  <fm:Mailing-List-URL>http://lists.oasis-open.org/archives/docbook-apps/</fm:Mailing-List-URL>
-  <fm:Changes>This is a bug-fix update to the 1.73.1 release.
-</fm:Changes>
-</fm:project>
-
-<xsl:template match="/" priority="-100">
-  <xsl:choose>
-    <xsl:when test="$get = 'Tag'">
-      <xsl:value-of select="$Tag"/>
-    </xsl:when>
-    <xsl:when test="$get = 'PreviousRelease'">
-      <xsl:value-of select="$PreviousRelease"/>
-    </xsl:when>
-    <xsl:when test="$get = 'PreviousReleaseRevision'">
-      <xsl:value-of select="$PreviousReleaseRevision"/>
-    </xsl:when>
-    <xsl:when test="$get = 'DistroTitle'">
-      <xsl:value-of select="$DistroTitle"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:if test="$sf-relid = 0">
-        <xsl:message terminate="yes">
-         <xsl:text>You must specify the sf-relid as a parameter.</xsl:text>
-        </xsl:message>
-      </xsl:if>
-      <xsl:apply-templates select="//fm:project"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="fm:project">
-  <xsl:apply-templates/>
-  <xsl:text>&#10;</xsl:text>
-  <xsl:apply-templates select="fm:Changes" mode="text"/>
-</xsl:template>
-
-<xsl:template match="fm:Changes"/>
-
-<xsl:template match="fm:Gzipped-Tar-URL|fm:Zipped-Tar-URL|fm:Bzipped-Tar-URL">
-  <xsl:value-of select="local-name(.)"/>
-  <xsl:text>: </xsl:text>
-  <xsl:value-of select="substring-before(., '{DISTRONAME-VERSION}')"/>
-  <xsl:value-of select="concat($DistroName, '-', $VERSION)"/>
-  <xsl:value-of select="substring-after(., '{DISTRONAME-VERSION}')"/>
-  <xsl:text>&#10;</xsl:text>
-</xsl:template>
-
-<xsl:template match="fm:Changelog-URL">
-  <xsl:value-of select="local-name(.)"/>
-  <xsl:text>: </xsl:text>
-  <xsl:value-of select="substring-before(., '{SFRELID}')"/>
-  <xsl:value-of select="$sf-relid"/>
-  <xsl:value-of select="substring-after(., '{SFRELID}')"/>
-  <xsl:text>&#10;</xsl:text>
-</xsl:template>
-
-<xsl:template match="fm:*">
-  <xsl:value-of select="local-name(.)"/>
-  <xsl:text>: </xsl:text>
-  <xsl:value-of select="normalize-space(.)"/>
-  <xsl:text>&#10;</xsl:text>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/common.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/common.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,1981 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"
-                xmlns:dyn="http://exslt.org/dynamic"
-                xmlns:saxon="http://icl.com/saxon"
-                exclude-result-prefixes="doc dyn saxon"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<doc:reference xmlns="" xml:id="base">
-  <info>
-    <title>Common Â» Base Template Reference</title>
-    <releaseinfo role="meta">
-      $Id$
-    </releaseinfo>
-  </info>
-  <!-- * yes, partintro is a valid child of a reference... -->
-  <partintro xml:id="partintro">
-    <title>Introduction</title>
-    <para>This is technical reference documentation for the âbaseâ
-      set of common templates in the DocBook XSL Stylesheets.</para>
-    <para>This is not intended to be user documentation. It is
-      provided for developers writing customization layers for the
-      stylesheets.</para>
-  </partintro>
-</doc:reference>
-
-<!-- ==================================================================== -->
-<!-- Establish strip/preserve whitespace rules -->
-
-<xsl:preserve-space elements="*"/>
-
-<xsl:strip-space elements="
-abstract affiliation anchor answer appendix area areaset areaspec
-artheader article audiodata audioobject author authorblurb authorgroup
-beginpage bibliodiv biblioentry bibliography biblioset blockquote book
-bookbiblio bookinfo callout calloutlist caption caution chapter
-citerefentry cmdsynopsis co collab colophon colspec confgroup
-copyright dedication docinfo editor entrytbl epigraph equation
-example figure footnote footnoteref formalpara funcprototype
-funcsynopsis glossary glossdef glossdiv glossentry glosslist graphicco
-group highlights imagedata imageobject imageobjectco important index
-indexdiv indexentry indexterm info informalequation informalexample
-informalfigure informaltable inlineequation inlinemediaobject
-itemizedlist itermset keycombo keywordset legalnotice listitem lot
-mediaobject mediaobjectco menuchoice msg msgentry msgexplan msginfo
-msgmain msgrel msgset msgsub msgtext note objectinfo
-orderedlist othercredit part partintro preface printhistory procedure
-programlistingco publisher qandadiv qandaentry qandaset question
-refentry reference refmeta refnamediv refsection refsect1 refsect1info refsect2
-refsect2info refsect3 refsect3info refsynopsisdiv refsynopsisdivinfo
-revhistory revision row sbr screenco screenshot sect1 sect1info sect2
-sect2info sect3 sect3info sect4 sect4info sect5 sect5info section
-sectioninfo seglistitem segmentedlist seriesinfo set setindex setinfo
-shortcut sidebar simplelist simplesect spanspec step subject
-subjectset substeps synopfragment table tbody textobject tfoot tgroup
-thead tip toc tocchap toclevel1 toclevel2 toclevel3 toclevel4
-toclevel5 tocpart varargs variablelist varlistentry videodata
-videoobject void warning subjectset
-
-classsynopsis
-constructorsynopsis
-destructorsynopsis
-fieldsynopsis
-methodparam
-methodsynopsis
-ooclass
-ooexception
-oointerface
-simplemsgentry
-manvolnum
-"/>
-<!-- ====================================================================== -->
-
-<doc:template name="is.component" xmlns="">
-<refpurpose>Tests if a given node is a component-level element</refpurpose>
-
-<refdescription id="is.component-desc">
-<para>This template returns '1' if the specified node is a component
-(Chapter, Appendix, etc.), and '0' otherwise.</para>
-</refdescription>
-
-<refparameter id="is.component-params">
-<variablelist>
-<varlistentry><term>node</term>
-<listitem>
-<para>The node which is to be tested.</para>
-</listitem>
-</varlistentry>
-</variablelist>
-</refparameter>
-
-<refreturn id="is.component-returns">
-<para>This template returns '1' if the specified node is a component
-(Chapter, Appendix, etc.), and '0' otherwise.</para>
-</refreturn>
-</doc:template>
-
-<xsl:template name="is.component">
-  <xsl:param name="node" select="."/>
-  <xsl:choose>
-    <xsl:when test="local-name($node) = 'appendix'
-                    or local-name($node) = 'article'
-                    or local-name($node) = 'chapter'
-                    or local-name($node) = 'preface'
-                    or local-name($node) = 'bibliography'
-                    or local-name($node) = 'glossary'
-                    or local-name($node) = 'index'">1</xsl:when>
-    <xsl:otherwise>0</xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ====================================================================== -->
-
-<doc:template name="is.section" xmlns="">
-<refpurpose>Tests if a given node is a section-level element</refpurpose>
-
-<refdescription id="is.section-desc">
-<para>This template returns '1' if the specified node is a section
-(Section, Sect1, Sect2, etc.), and '0' otherwise.</para>
-</refdescription>
-
-<refparameter id="is.section-params">
-<variablelist>
-<varlistentry><term>node</term>
-<listitem>
-<para>The node which is to be tested.</para>
-</listitem>
-</varlistentry>
-</variablelist>
-</refparameter>
-
-<refreturn id="is.section-returns">
-<para>This template returns '1' if the specified node is a section
-(Section, Sect1, Sect2, etc.), and '0' otherwise.</para>
-</refreturn>
-</doc:template>
-
-<xsl:template name="is.section">
-  <xsl:param name="node" select="."/>
-  <xsl:choose>
-    <xsl:when test="local-name($node) = 'section'
-                    or local-name($node) = 'sect1'
-                    or local-name($node) = 'sect2'
-                    or local-name($node) = 'sect3'
-                    or local-name($node) = 'sect4'
-                    or local-name($node) = 'sect5'
-                    or local-name($node) = 'refsect1'
-                    or local-name($node) = 'refsect2'
-                    or local-name($node) = 'refsect3'
-                    or local-name($node) = 'simplesect'">1</xsl:when>
-    <xsl:otherwise>0</xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ====================================================================== -->
-
-<doc:template name="section.level" xmlns="">
-<refpurpose>Returns the hierarchical level of a section</refpurpose>
-
-<refdescription id="section.level-desc">
-<para>This template calculates the hierarchical level of a section.
-The element <tag>sect1</tag> is at level 1, <tag>sect2</tag> is
-at level 2, etc.</para>
-
-<para>Recursive sections are calculated down to the fifth level.</para>
-</refdescription>
-
-<refparameter id="section.level-params">
-<variablelist>
-<varlistentry><term>node</term>
-<listitem>
-<para>The section node for which the level should be calculated.
-Defaults to the context node.</para>
-</listitem>
-</varlistentry>
-</variablelist>
-</refparameter>
-
-<refreturn id="section.level-returns">
-<para>The section level, <quote>1</quote>, <quote>2</quote>, etc.
-</para>
-</refreturn>
-</doc:template>
-
-<xsl:template name="section.level">
-  <xsl:param name="node" select="."/>
-  <xsl:choose>
-    <xsl:when test="local-name($node)='sect1'">1</xsl:when>
-    <xsl:when test="local-name($node)='sect2'">2</xsl:when>
-    <xsl:when test="local-name($node)='sect3'">3</xsl:when>
-    <xsl:when test="local-name($node)='sect4'">4</xsl:when>
-    <xsl:when test="local-name($node)='sect5'">5</xsl:when>
-    <xsl:when test="local-name($node)='section'">
-      <xsl:choose>
-        <xsl:when test="$node/../../../../../../section">6</xsl:when>
-        <xsl:when test="$node/../../../../../section">5</xsl:when>
-        <xsl:when test="$node/../../../../section">4</xsl:when>
-        <xsl:when test="$node/../../../section">3</xsl:when>
-        <xsl:when test="$node/../../section">2</xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:when test="local-name($node)='refsect1' or
-                    local-name($node)='refsect2' or
-                    local-name($node)='refsect3' or
-                    local-name($node)='refsection' or
-                    local-name($node)='refsynopsisdiv'">
-      <xsl:call-template name="refentry.section.level">
-        <xsl:with-param name="node" select="$node"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="local-name($node)='simplesect'">
-      <xsl:choose>
-        <xsl:when test="$node/../../sect1">2</xsl:when>
-        <xsl:when test="$node/../../sect2">3</xsl:when>
-        <xsl:when test="$node/../../sect3">4</xsl:when>
-        <xsl:when test="$node/../../sect4">5</xsl:when>
-        <xsl:when test="$node/../../sect5">5</xsl:when>
-        <xsl:when test="$node/../../section">
-          <xsl:choose>
-            <xsl:when test="$node/../../../../../section">5</xsl:when>
-            <xsl:when test="$node/../../../../section">4</xsl:when>
-            <xsl:when test="$node/../../../section">3</xsl:when>
-            <xsl:otherwise>2</xsl:otherwise>
-          </xsl:choose>
-        </xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>1</xsl:otherwise>
-  </xsl:choose>
-</xsl:template><!-- section.level -->
-
-<doc:template name="qanda.section.level" xmlns="">
-<refpurpose>Returns the hierarchical level of a QandASet</refpurpose>
-
-<refdescription id="qanda.section.level-desc">
-<para>This template calculates the hierarchical level of a QandASet.
-</para>
-</refdescription>
-
-<refreturn id="qanda.section.level-returns">
-<para>The level, <quote>1</quote>, <quote>2</quote>, etc.
-</para>
-</refreturn>
-</doc:template>
-
-<xsl:template name="qanda.section.level">
-  <xsl:variable name="section"
-                select="(ancestor::section
-                         |ancestor::simplesect
-                         |ancestor::sect5
-                         |ancestor::sect4
-                         |ancestor::sect3
-                         |ancestor::sect2
-                         |ancestor::sect1
-                         |ancestor::refsect3
-                         |ancestor::refsect2
-                         |ancestor::refsect1)[last()]"/>
-
-  <xsl:choose>
-    <xsl:when test="count($section) = '0'">1</xsl:when>
-    <xsl:otherwise>
-      <xsl:variable name="slevel">
-        <xsl:call-template name="section.level">
-          <xsl:with-param name="node" select="$section"/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:value-of select="$slevel + 1"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- Finds the total section depth of a section in a refentry -->
-<xsl:template name="refentry.section.level">
-  <xsl:param name="node" select="."/>
-
-  <xsl:variable name="RElevel">
-    <xsl:call-template name="refentry.level">
-      <xsl:with-param name="node" select="$node/ancestor::refentry[1]"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="levelinRE">
-    <xsl:choose>
-      <xsl:when test="local-name($node)='refsynopsisdiv'">1</xsl:when>
-      <xsl:when test="local-name($node)='refsect1'">1</xsl:when>
-      <xsl:when test="local-name($node)='refsect2'">2</xsl:when>
-      <xsl:when test="local-name($node)='refsect3'">3</xsl:when>
-      <xsl:when test="local-name($node)='refsection'">
-        <xsl:choose>
-          <xsl:when test="$node/../../../../../refsection">5</xsl:when>
-          <xsl:when test="$node/../../../../refsection">4</xsl:when>
-          <xsl:when test="$node/../../../refsection">3</xsl:when>
-          <xsl:when test="$node/../../refsection">2</xsl:when>
-          <xsl:otherwise>1</xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:value-of select="$levelinRE + $RElevel"/>
-</xsl:template>
-
-<!-- Finds the section depth of a refentry -->
-<xsl:template name="refentry.level">
-  <xsl:param name="node" select="."/>
-  <xsl:variable name="container"
-                select="($node/ancestor::section |
-                        $node/ancestor::sect1 |
-                        $node/ancestor::sect2 |
-                        $node/ancestor::sect3 |
-                        $node/ancestor::sect4 |
-                        $node/ancestor::sect5)[last()]"/>
-
-  <xsl:choose>
-    <xsl:when test="$container">
-      <xsl:variable name="slevel">
-        <xsl:call-template name="section.level">
-          <xsl:with-param name="node" select="$container"/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:value-of select="$slevel + 1"/>
-    </xsl:when>
-    <xsl:otherwise>1</xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="qandadiv.section.level">
-  <xsl:variable name="section.level">
-    <xsl:call-template name="qanda.section.level"/>
-  </xsl:variable>
-  <xsl:variable name="anc.divs" select="ancestor::qandadiv"/>
-
-  <xsl:value-of select="count($anc.divs) + number($section.level)"/>
-</xsl:template>
-
-<xsl:template name="question.answer.label">
-  <xsl:variable name="deflabel">
-    <xsl:choose>
-      <xsl:when test="ancestor-or-self::*[@defaultlabel]">
-        <xsl:value-of select="(ancestor-or-self::*[@defaultlabel])[last()]
-                              /@defaultlabel"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$qanda.defaultlabel"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="label" select="@label"/>
-
-<!--
- (hnr      (hierarchical-number-recursive (normalize "qandadiv") node))
-
-         (parsect  (ancestor-member node (section-element-list)))
-
-         (defnum   (if (and %qanda-inherit-numeration% 
-                            %section-autolabel%)
-                       (if (node-list-empty? parsect)
-                           (section-autolabel-prefix node)
-                           (section-autolabel parsect))
-                       ""))
-
-         (hnumber  (let loop ((numlist hnr) (number defnum) 
-                              (sep (if (equal? defnum "") "" ".")))
-                     (if (null? numlist)
-                         number
-                         (loop (cdr numlist) 
-                               (string-append number
-                                              sep
-                                              (number->string (car numlist)))
-                               "."))))
-         (cnumber  (child-number (parent node)))
-         (number   (string-append hnumber 
-                                  (if (equal? hnumber "")
-                                      ""
-                                      ".")
-                                  (number->string cnumber))))
--->
-
-  <xsl:choose>
-    <xsl:when test="$deflabel = 'qanda'">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key">
-          <xsl:choose>
-            <xsl:when test="local-name(.) = 'question'">question</xsl:when>
-            <xsl:when test="local-name(.) = 'answer'">answer</xsl:when>
-            <xsl:when test="local-name(.) = 'qandadiv'">qandadiv</xsl:when>
-            <xsl:otherwise>qandaset</xsl:otherwise>
-          </xsl:choose>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="$deflabel = 'label'">
-      <xsl:value-of select="$label"/>
-    </xsl:when>
-    <xsl:when test="$deflabel = 'number'
-                    and local-name(.) = 'question'">
-      <xsl:apply-templates select="ancestor::qandaset[1]"
-                           mode="number"/>
-      <xsl:choose>
-        <xsl:when test="ancestor::qandadiv">
-          <xsl:apply-templates select="ancestor::qandadiv[1]"
-                               mode="number"/>
-          <xsl:apply-templates select="ancestor::qandaentry"
-                               mode="number"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates select="ancestor::qandaentry"
-                               mode="number"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <!-- nothing -->
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="qandaset" mode="number">
-  <!-- FIXME: -->
-</xsl:template>
-
-<xsl:template match="qandadiv" mode="number">
-  <xsl:number level="multiple" from="qandaset" format="1."/>
-</xsl:template>
-
-<xsl:template match="qandaentry" mode="number">
-  <xsl:choose>
-    <xsl:when test="ancestor::qandadiv">
-      <xsl:number level="single" from="qandadiv" format="1."/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:number level="single" from="qandaset" format="1."/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ====================================================================== -->
-
-<xsl:template name="object.id">
-  <xsl:param name="object" select="."/>
-  <xsl:choose>
-    <xsl:when test="$object/@id">
-      <xsl:value-of select="$object/@id"/>
-    </xsl:when>
-    <xsl:when test="$object/@xml:id">
-      <xsl:value-of select="$object/@xml:id"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="generate-id($object)"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="person.name">
-  <!-- Formats a personal name. Handles corpauthor as a special case. -->
-  <xsl:param name="node" select="."/>
-
-  <xsl:variable name="style">
-    <xsl:choose>
-      <xsl:when test="$node/@role">
-        <xsl:value-of select="$node/@role"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="gentext.template">
-          <xsl:with-param name="context" select="'styles'"/>
-          <xsl:with-param name="name" select="'person-name'"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:choose>
-    <!-- the personname element is a specialcase -->
-    <xsl:when test="$node/personname">
-      <xsl:call-template name="person.name">
-        <xsl:with-param name="node" select="$node/personname"/>
-      </xsl:call-template>
-    </xsl:when>
-
-    <!-- handle corpauthor as a special case...-->
-    <!-- * MikeSmith 2007-06: I'm wondering if the person.name template -->
-    <!-- * actually ever gets called to handle corpauthor.. maybe -->
-    <!-- * we don't actually need to check for corpauthor here. -->
-    <xsl:when test="local-name($node)='corpauthor'">
-      <xsl:apply-templates select="$node"/>
-    </xsl:when>
-
-    <xsl:otherwise>
-      <xsl:choose>
-        <!-- Handle case when personname contains only general markup (DocBook 5.0) -->
-        <xsl:when test="$node/self::personname and not($node/firstname or $node/honorific or $node/lineage or $node/othername or $node/surname)">
-          <xsl:apply-templates select="$node/node()"/>
-        </xsl:when>
-        <xsl:when test="$style = 'family-given'">
-          <xsl:call-template name="person.name.family-given">
-            <xsl:with-param name="node" select="$node"/>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:when test="$style = 'last-first'">
-          <xsl:call-template name="person.name.last-first">
-            <xsl:with-param name="node" select="$node"/>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="person.name.first-last">
-            <xsl:with-param name="node" select="$node"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="person.name.family-given">
-  <xsl:param name="node" select="."/>
-
-  <!-- The family-given style applies a convention for identifying given -->
-  <!-- and family names in locales where it may be ambiguous -->
-  <xsl:apply-templates select="$node//surname[1]"/>
-
-  <xsl:if test="$node//surname and $node//firstname">
-    <xsl:text> </xsl:text>
-  </xsl:if>
-
-  <xsl:apply-templates select="$node//firstname[1]"/>
-
-  <xsl:text> [FAMILY Given]</xsl:text>
-</xsl:template>
-
-<xsl:template name="person.name.last-first">
-  <xsl:param name="node" select="."/>
-
-  <xsl:apply-templates select="$node//surname[1]"/>
-
-  <xsl:if test="$node//surname and $node//firstname">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-
-  <xsl:apply-templates select="$node//firstname[1]"/>
-</xsl:template>
-
-<xsl:template name="person.name.first-last">
-  <xsl:param name="node" select="."/>
-
-  <xsl:if test="$node//honorific">
-    <xsl:apply-templates select="$node//honorific[1]"/>
-    <xsl:value-of select="$punct.honorific"/>
-  </xsl:if>
-
-  <xsl:if test="$node//firstname">
-    <xsl:if test="$node//honorific">
-      <xsl:text> </xsl:text>
-    </xsl:if>
-    <xsl:apply-templates select="$node//firstname[1]"/>
-  </xsl:if>
-
-  <xsl:if test="$node//othername and $author.othername.in.middle != 0">
-    <xsl:if test="$node//honorific or $node//firstname">
-      <xsl:text> </xsl:text>
-    </xsl:if>
-    <xsl:apply-templates select="$node//othername[1]"/>
-  </xsl:if>
-
-  <xsl:if test="$node//surname">
-    <xsl:if test="$node//honorific or $node//firstname
-                  or ($node//othername and $author.othername.in.middle != 0)">
-      <xsl:text> </xsl:text>
-    </xsl:if>
-    <xsl:apply-templates select="$node//surname[1]"/>
-  </xsl:if>
-
-  <xsl:if test="$node//lineage">
-    <xsl:text>, </xsl:text>
-    <xsl:apply-templates select="$node//lineage[1]"/>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="person.name.list">
-  <!-- Return a formatted string representation of the contents of
-       the current element. The current element must contain one or
-       more AUTHORs, CORPAUTHORs, OTHERCREDITs, and/or EDITORs.
-
-       John Doe
-     or
-       John Doe and Jane Doe
-     or
-       John Doe, Jane Doe, and A. Nonymous
-  -->
-  <xsl:param name="person.list"
-             select="author|corpauthor|othercredit|editor"/>
-  <xsl:param name="person.count" select="count($person.list)"/>
-  <xsl:param name="count" select="1"/>
-
-  <xsl:choose>
-    <xsl:when test="$count &gt; $person.count"></xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="person.name">
-        <xsl:with-param name="node" select="$person.list[position()=$count]"/>
-      </xsl:call-template>
-
-      <xsl:choose>
-        <xsl:when test="$person.count = 2 and $count = 1">
-          <xsl:call-template name="gentext.template">
-            <xsl:with-param name="context" select="'authorgroup'"/>
-            <xsl:with-param name="name" select="'sep2'"/>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:when test="$person.count &gt; 2 and $count+1 = $person.count">
-          <xsl:call-template name="gentext.template">
-            <xsl:with-param name="context" select="'authorgroup'"/>
-            <xsl:with-param name="name" select="'seplast'"/>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:when test="$count &lt; $person.count">
-          <xsl:call-template name="gentext.template">
-            <xsl:with-param name="context" select="'authorgroup'"/>
-            <xsl:with-param name="name" select="'sep'"/>
-          </xsl:call-template>
-        </xsl:when>
-      </xsl:choose>
-
-      <xsl:call-template name="person.name.list">
-        <xsl:with-param name="person.list" select="$person.list"/>
-        <xsl:with-param name="person.count" select="$person.count"/>
-        <xsl:with-param name="count" select="$count+1"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template><!-- person.name.list -->
-
-<!-- === synopsis ======================================================= -->
-<!-- The following definitions match those given in the reference
-     documentation for DocBook V3.0
--->
-
-<xsl:variable name="arg.choice.opt.open.str">[</xsl:variable>
-<xsl:variable name="arg.choice.opt.close.str">]</xsl:variable>
-<xsl:variable name="arg.choice.req.open.str">{</xsl:variable>
-<xsl:variable name="arg.choice.req.close.str">}</xsl:variable>
-<xsl:variable name="arg.choice.plain.open.str"><xsl:text> </xsl:text></xsl:variable>
-<xsl:variable name="arg.choice.plain.close.str"><xsl:text> </xsl:text></xsl:variable>
-<xsl:variable name="arg.choice.def.open.str">[</xsl:variable>
-<xsl:variable name="arg.choice.def.close.str">]</xsl:variable>
-<xsl:variable name="arg.rep.repeat.str">...</xsl:variable>
-<xsl:variable name="arg.rep.norepeat.str"></xsl:variable>
-<xsl:variable name="arg.rep.def.str"></xsl:variable>
-<xsl:variable name="arg.or.sep"> | </xsl:variable>
-<xsl:variable name="cmdsynopsis.hanging.indent">4pi</xsl:variable>
-
-<!-- ====================================================================== -->
-
-<!--
-<xsl:template name="xref.g.subst">
-  <xsl:param name="string"></xsl:param>
-  <xsl:param name="target" select="."/>
-  <xsl:variable name="subst">%g</xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="contains($string, $subst)">
-      <xsl:value-of select="substring-before($string, $subst)"/>
-      <xsl:call-template name="gentext.element.name">
-        <xsl:with-param name="element.name" select="local-name($target)"/>
-      </xsl:call-template>
-      <xsl:call-template name="xref.g.subst">
-        <xsl:with-param name="string"
-                        select="substring-after($string, $subst)"/>
-        <xsl:with-param name="target" select="$target"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$string"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="xref.t.subst">
-  <xsl:param name="string"></xsl:param>
-  <xsl:param name="target" select="."/>
-  <xsl:variable name="subst">%t</xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="contains($string, $subst)">
-      <xsl:call-template name="xref.g.subst">
-        <xsl:with-param name="string"
-                        select="substring-before($string, $subst)"/>
-        <xsl:with-param name="target" select="$target"/>
-      </xsl:call-template>
-      <xsl:call-template name="title.xref">
-        <xsl:with-param name="target" select="$target"/>
-      </xsl:call-template>
-      <xsl:call-template name="xref.t.subst">
-        <xsl:with-param name="string"
-                        select="substring-after($string, $subst)"/>
-        <xsl:with-param name="target" select="$target"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="xref.g.subst">
-        <xsl:with-param name="string" select="$string"/>
-        <xsl:with-param name="target" select="$target"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="xref.n.subst">
-  <xsl:param name="string"></xsl:param>
-  <xsl:param name="target" select="."/>
-  <xsl:variable name="subst">%n</xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="contains($string, $subst)">
-      <xsl:call-template name="xref.t.subst">
-        <xsl:with-param name="string"
-                        select="substring-before($string, $subst)"/>
-        <xsl:with-param name="target" select="$target"/>
-      </xsl:call-template>
-      <xsl:call-template name="number.xref">
-        <xsl:with-param name="target" select="$target"/>
-      </xsl:call-template>
-      <xsl:call-template name="xref.t.subst">
-        <xsl:with-param name="string"
-                        select="substring-after($string, $subst)"/>
-        <xsl:with-param name="target" select="$target"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="xref.t.subst">
-        <xsl:with-param name="string" select="$string"/>
-        <xsl:with-param name="target" select="$target"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="subst.xref.text">
-  <xsl:param name="xref.text"></xsl:param>
-  <xsl:param name="target" select="."/>
-
-  <xsl:call-template name="xref.n.subst">
-    <xsl:with-param name="string" select="$xref.text"/>
-    <xsl:with-param name="target" select="$target"/>
-  </xsl:call-template>
-</xsl:template>
--->
-
-<!-- ====================================================================== -->
-
-<xsl:template name="filename-basename">
-  <!-- We assume all filenames are really URIs and use "/" -->
-  <xsl:param name="filename"></xsl:param>
-  <xsl:param name="recurse" select="false()"/>
-
-  <xsl:choose>
-    <xsl:when test="substring-after($filename, '/') != ''">
-      <xsl:call-template name="filename-basename">
-        <xsl:with-param name="filename"
-                        select="substring-after($filename, '/')"/>
-        <xsl:with-param name="recurse" select="true()"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$filename"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="filename-extension">
-  <xsl:param name="filename"></xsl:param>
-  <xsl:param name="recurse" select="false()"/>
-
-  <!-- Make sure we only look at the base name... -->
-  <xsl:variable name="basefn">
-    <xsl:choose>
-      <xsl:when test="$recurse">
-        <xsl:value-of select="$filename"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="filename-basename">
-          <xsl:with-param name="filename" select="$filename"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="substring-after($basefn, '.') != ''">
-      <xsl:call-template name="filename-extension">
-        <xsl:with-param name="filename"
-                        select="substring-after($basefn, '.')"/>
-        <xsl:with-param name="recurse" select="true()"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="$recurse">
-      <xsl:value-of select="$basefn"/>
-    </xsl:when>
-    <xsl:otherwise></xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ====================================================================== -->
-
-<doc:template name="select.mediaobject" xmlns="">
-<refpurpose>Selects and processes an appropriate media object from a list</refpurpose>
-
-<refdescription id="select.mediaobject-desc">
-<para>This template takes a list of media objects (usually the
-children of a mediaobject or inlinemediaobject) and processes
-the "right" object.</para>
-
-<para>This template relies on a template named 
-"select.mediaobject.index" to determine which object
-in the list is appropriate.</para>
-
-<para>If no acceptable object is located, nothing happens.</para>
-</refdescription>
-
-<refparameter id="select.mediaobject-params">
-<variablelist>
-<varlistentry><term>olist</term>
-<listitem>
-<para>The node list of potential objects to examine.</para>
-</listitem>
-</varlistentry>
-</variablelist>
-</refparameter>
-
-<refreturn id="select.mediaobject-returns">
-<para>Calls &lt;xsl:apply-templates&gt; on the selected object.</para>
-</refreturn>
-</doc:template>
-
-<xsl:template name="select.mediaobject">
-  <xsl:param name="olist"
-             select="imageobject|imageobjectco
-                     |videoobject|audioobject|textobject"/>
-  
-  <xsl:variable name="mediaobject.index">
-    <xsl:call-template name="select.mediaobject.index">
-      <xsl:with-param name="olist" select="$olist"/>
-      <xsl:with-param name="count" select="1"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:if test="$mediaobject.index != ''">
-    <xsl:apply-templates select="$olist[position() = $mediaobject.index]"/>
-  </xsl:if>
-</xsl:template>
-
-<!-- ====================================================================== -->
-
-<doc:template name="select.mediaobject.index" xmlns="">
-<refpurpose>Selects the position of the appropriate media object from a list</refpurpose>
-
-<refdescription id="select.mediaobject.index-desc">
-<para>This template takes a list of media objects (usually the
-children of a mediaobject or inlinemediaobject) and determines
-the "right" object. It returns the position of that object
-to be used by the calling template.</para>
-
-<para>If the parameter <parameter>use.role.for.mediaobject</parameter>
-is nonzero, then it first checks for an object with
-a role attribute of the appropriate value.  It takes the first
-of those.  Otherwise, it takes the first acceptable object
-through a recursive pass through the list.</para>
-
-<para>This template relies on a template named "is.acceptable.mediaobject"
-to determine if a given object is an acceptable graphic. The semantics
-of media objects is that the first acceptable graphic should be used.
-</para>
-
-<para>If no acceptable object is located, no index is returned.</para>
-</refdescription>
-
-<refparameter id="select.mediaobject.index-params">
-<variablelist>
-<varlistentry><term>olist</term>
-<listitem>
-<para>The node list of potential objects to examine.</para>
-</listitem>
-</varlistentry>
-<varlistentry><term>count</term>
-<listitem>
-<para>The position in the list currently being considered by the 
-recursive process.</para>
-</listitem>
-</varlistentry>
-</variablelist>
-</refparameter>
-
-<refreturn id="select.mediaobject.index-returns">
-<para>Returns the position in the original list of the selected object.</para>
-</refreturn>
-</doc:template>
-
-<xsl:template name="select.mediaobject.index">
-  <xsl:param name="olist"
-             select="imageobject|imageobjectco
-                     |videoobject|audioobject|textobject"/>
-  <xsl:param name="count">1</xsl:param>
-
-  <xsl:choose>
-    <!-- Test for objects preferred by role -->
-    <xsl:when test="$use.role.for.mediaobject != 0 
-               and $preferred.mediaobject.role != ''
-               and $olist[@role = $preferred.mediaobject.role]"> 
-      
-      <!-- Get the first hit's position index -->
-      <xsl:for-each select="$olist">
-        <xsl:if test="@role = $preferred.mediaobject.role and
-             not(preceding-sibling::*[@role = $preferred.mediaobject.role])"> 
-          <xsl:value-of select="position()"/> 
-        </xsl:if>
-      </xsl:for-each>
-    </xsl:when>
-
-    <xsl:when test="$use.role.for.mediaobject != 0 
-               and $olist[@role = $stylesheet.result.type]">
-      <!-- Get the first hit's position index -->
-      <xsl:for-each select="$olist">
-        <xsl:if test="@role = $stylesheet.result.type and 
-              not(preceding-sibling::*[@role = $stylesheet.result.type])"> 
-          <xsl:value-of select="position()"/> 
-        </xsl:if>
-      </xsl:for-each>
-    </xsl:when>
-    <!-- Accept 'html' for $stylesheet.result.type = 'xhtml' -->
-    <xsl:when test="$use.role.for.mediaobject != 0 
-               and $stylesheet.result.type = 'xhtml'
-               and $olist[@role = 'html']">
-      <!-- Get the first hit's position index -->
-      <xsl:for-each select="$olist">
-        <xsl:if test="@role = 'html' and 
-              not(preceding-sibling::*[@role = 'html'])"> 
-          <xsl:value-of select="position()"/> 
-        </xsl:if>
-      </xsl:for-each>
-    </xsl:when>
-
-    <!-- If no selection by role, and there is only one object, use it -->
-    <xsl:when test="count($olist) = 1 and $count = 1">
-      <xsl:value-of select="$count"/> 
-    </xsl:when>
-
-    <xsl:otherwise>
-      <!-- Otherwise select first acceptable object -->
-      <xsl:if test="$count &lt;= count($olist)">
-        <xsl:variable name="object" select="$olist[position()=$count]"/>
-    
-        <xsl:variable name="useobject">
-          <xsl:choose>
-            <!-- The phrase is used only when contains TeX Math and output is FO -->
-            <xsl:when test="local-name($object)='textobject' and $object/phrase
-                            and $object/@role='tex' and $stylesheet.result.type = 'fo'
-                            and $tex.math.in.alt != ''">
-              <xsl:text>1</xsl:text> 
-            </xsl:when>
-            <!-- The phrase is never used -->
-            <xsl:when test="local-name($object)='textobject' and $object/phrase">
-              <xsl:text>0</xsl:text>
-            </xsl:when>
-            <xsl:when test="local-name($object)='textobject'
-                            and $object/ancestor::equation ">
-            <!-- The first textobject is not a reasonable fallback
-                 for equation image -->
-              <xsl:text>0</xsl:text>
-            </xsl:when>
-            <!-- The first textobject is a reasonable fallback -->
-            <xsl:when test="local-name($object)='textobject'
-                            and $object[not(@role) or @role!='tex']">
-              <xsl:text>1</xsl:text>
-            </xsl:when>
-            <!-- don't use graphic when output is FO, TeX Math is used 
-                 and there is math in alt element -->
-            <xsl:when test="$object/ancestor::equation and 
-                            $object/ancestor::equation/alt[@role='tex']
-                            and $stylesheet.result.type = 'fo'
-                            and $tex.math.in.alt != ''">
-              <xsl:text>0</xsl:text>
-            </xsl:when>
-            <!-- If there's only one object, use it -->
-            <xsl:when test="$count = 1 and count($olist) = 1">
-               <xsl:text>1</xsl:text>
-            </xsl:when>
-            <!-- Otherwise, see if this one is a useable graphic -->
-            <xsl:otherwise>
-              <xsl:choose>
-                <!-- peek inside imageobjectco to simplify the test -->
-                <xsl:when test="local-name($object) = 'imageobjectco'">
-                  <xsl:call-template name="is.acceptable.mediaobject">
-                    <xsl:with-param name="object" select="$object/imageobject"/>
-                  </xsl:call-template>
-                </xsl:when>
-                <xsl:otherwise>
-                  <xsl:call-template name="is.acceptable.mediaobject">
-                    <xsl:with-param name="object" select="$object"/>
-                  </xsl:call-template>
-                </xsl:otherwise>
-              </xsl:choose>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:variable>
-    
-        <xsl:choose>
-          <xsl:when test="$useobject='1'">
-            <xsl:value-of select="$count"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:call-template name="select.mediaobject.index">
-              <xsl:with-param name="olist" select="$olist"/>
-              <xsl:with-param name="count" select="$count + 1"/>
-            </xsl:call-template>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:if>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<doc:template name="is.acceptable.mediaobject" xmlns="">
-<refpurpose>Returns '1' if the specified media object is recognized</refpurpose>
-
-<refdescription id="is.acceptable.mediaobject-desc">
-<para>This template examines a media object and returns '1' if the
-object is recognized as a graphic.</para>
-</refdescription>
-
-<refparameter id="is.acceptable.mediaobject-params">
-<variablelist>
-<varlistentry><term>object</term>
-<listitem>
-<para>The media object to consider.</para>
-</listitem>
-</varlistentry>
-</variablelist>
-</refparameter>
-
-<refreturn id="is.acceptable.mediaobject-returns">
-<para>0 or 1</para>
-</refreturn>
-</doc:template>
-
-<xsl:template name="is.acceptable.mediaobject">
-  <xsl:param name="object"></xsl:param>
-
-  <xsl:variable name="filename">
-    <xsl:call-template name="mediaobject.filename">
-      <xsl:with-param name="object" select="$object"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="ext">
-    <xsl:call-template name="filename-extension">
-      <xsl:with-param name="filename" select="$filename"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <!-- there will only be one -->
-  <xsl:variable name="data" select="$object/videodata
-                                    |$object/imagedata
-                                    |$object/audiodata"/>
-
-  <xsl:variable name="format" select="$data/@format"/>
-
-  <xsl:variable name="graphic.format">
-    <xsl:if test="$format">
-      <xsl:call-template name="is.graphic.format">
-        <xsl:with-param name="format" select="$format"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:variable name="graphic.ext">
-    <xsl:if test="$ext">
-      <xsl:call-template name="is.graphic.extension">
-        <xsl:with-param name="ext" select="$ext"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$use.svg = 0 and $format = 'SVG'">0</xsl:when>
-    <xsl:when xmlns:svg="http://www.w3.org/2000/svg"
-              test="$use.svg != 0 and $object/svg:*">1</xsl:when>
-    <xsl:when test="$graphic.format = '1'">1</xsl:when>
-    <xsl:when test="$graphic.ext = '1'">1</xsl:when>
-    <xsl:otherwise>0</xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="mediaobject.filename">
-  <xsl:param name="object"></xsl:param>
-
-  <xsl:variable name="data" select="$object/videodata
-                                    |$object/imagedata
-                                    |$object/audiodata
-                                    |$object"/>
-
-  <xsl:variable name="filename">
-    <xsl:choose>
-      <xsl:when test="$data[@fileref]">
-        <xsl:apply-templates select="$data/@fileref"/>
-      </xsl:when>
-      <xsl:when test="$data[@entityref]">
-        <xsl:value-of select="unparsed-entity-uri($data/@entityref)"/>
-      </xsl:when>
-      <xsl:otherwise></xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="real.ext">
-    <xsl:call-template name="filename-extension">
-      <xsl:with-param name="filename" select="$filename"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="ext">
-    <xsl:choose>
-      <xsl:when test="$real.ext != ''">
-        <xsl:value-of select="$real.ext"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$graphic.default.extension"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="graphic.ext">
-    <xsl:call-template name="is.graphic.extension">
-      <xsl:with-param name="ext" select="$ext"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$real.ext = ''">
-      <xsl:choose>
-        <xsl:when test="$ext != ''">
-          <xsl:value-of select="$filename"/>
-          <xsl:text>.</xsl:text>
-          <xsl:value-of select="$ext"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="$filename"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:when test="not($graphic.ext)">
-      <xsl:choose>
-        <xsl:when test="$graphic.default.extension != ''">
-          <xsl:value-of select="$filename"/>
-          <xsl:text>.</xsl:text>
-          <xsl:value-of select="$graphic.default.extension"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="$filename"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$filename"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ====================================================================== -->
-
-<doc:template name="check.id.unique" xmlns="">
-<refpurpose>Warn users about references to non-unique IDs</refpurpose>
-<refdescription id="check.id.unique-desc">
-<para>If passed an ID in <varname>linkend</varname>,
-<function>check.id.unique</function> prints
-a warning message to the user if either the ID does not exist or
-the ID is not unique.</para>
-</refdescription>
-</doc:template>
-
-<xsl:template name="check.id.unique">
-  <xsl:param name="linkend"></xsl:param>
-  <xsl:if test="$linkend != ''">
-    <xsl:variable name="targets" select="key('id',$linkend)"/>
-    <xsl:variable name="target" select="$targets[1]"/>
-
-    <xsl:if test="count($targets)=0">
-      <xsl:message>
-        <xsl:text>Error: no ID for constraint linkend: </xsl:text>
-        <xsl:value-of select="$linkend"/>
-        <xsl:text>.</xsl:text>
-      </xsl:message>
-      <!--
-      <xsl:message>
-        <xsl:text>If the ID exists in your document, did your </xsl:text>
-        <xsl:text>XSLT Processor load the DTD?</xsl:text>
-      </xsl:message>
-      -->
-    </xsl:if>
-
-    <xsl:if test="count($targets)>1">
-      <xsl:message>
-        <xsl:text>Warning: multiple "IDs" for constraint linkend: </xsl:text>
-        <xsl:value-of select="$linkend"/>
-        <xsl:text>.</xsl:text>
-      </xsl:message>
-    </xsl:if>
-  </xsl:if>
-</xsl:template>
-
-<doc:template name="check.idref.targets" xmlns="">
-<refpurpose>Warn users about incorrectly typed references</refpurpose>
-<refdescription id="check.idref.targets-desc">
-<para>If passed an ID in <varname>linkend</varname>,
-<function>check.idref.targets</function> makes sure that the element
-pointed to by the link is one of the elements listed in
-<varname>element-list</varname> and warns the user otherwise.</para>
-</refdescription>
-</doc:template>
-
-<xsl:template name="check.idref.targets">
-  <xsl:param name="linkend"></xsl:param>
-  <xsl:param name="element-list"></xsl:param>
-  <xsl:if test="$linkend != ''">
-    <xsl:variable name="targets" select="key('id',$linkend)"/>
-    <xsl:variable name="target" select="$targets[1]"/>
-
-    <xsl:if test="count($target) &gt; 0">
-      <xsl:if test="not(contains(concat(' ', $element-list, ' '), local-name($target)))">
-        <xsl:message>
-          <xsl:text>Error: linkend (</xsl:text>
-          <xsl:value-of select="$linkend"/>
-          <xsl:text>) points to "</xsl:text>
-          <xsl:value-of select="local-name($target)"/>
-          <xsl:text>" not (one of): </xsl:text>
-          <xsl:value-of select="$element-list"/>
-        </xsl:message>
-      </xsl:if>
-    </xsl:if>
-  </xsl:if>
-</xsl:template>
-
-<!-- ====================================================================== -->
-<!-- Procedure Step Numeration -->
-
-<xsl:param name="procedure.step.numeration.formats" select="'1aiAI'"/>
-
-<xsl:template name="procedure.step.numeration">
-  <xsl:param name="context" select="."/>
-  <xsl:variable name="format.length"
-                select="string-length($procedure.step.numeration.formats)"/>
-  <xsl:choose>
-    <xsl:when test="local-name($context) = 'substeps'">
-      <xsl:variable name="ssdepth"
-                    select="count($context/ancestor::substeps)"/>
-      <xsl:variable name="sstype" select="($ssdepth mod $format.length)+2"/>
-      <xsl:choose>
-        <xsl:when test="$sstype &gt; $format.length">
-          <xsl:value-of select="substring($procedure.step.numeration.formats,1,1)"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="substring($procedure.step.numeration.formats,$sstype,1)"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:when test="local-name($context) = 'step'">
-      <xsl:variable name="sdepth"
-                    select="count($context/ancestor::substeps)"/>
-      <xsl:variable name="stype" select="($sdepth mod $format.length)+1"/>
-      <xsl:value-of select="substring($procedure.step.numeration.formats,$stype,1)"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:message>
-        <xsl:text>Unexpected context in procedure.step.numeration: </xsl:text>
-        <xsl:value-of select="local-name($context)"/>
-      </xsl:message>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="step" mode="number">
-  <xsl:param name="rest" select="''"/>
-  <xsl:param name="recursive" select="1"/>
-  <xsl:variable name="format">
-    <xsl:call-template name="procedure.step.numeration"/>
-  </xsl:variable>
-  <xsl:variable name="num">
-    <xsl:number count="step" format="{$format}"/>
-  </xsl:variable>
-  <xsl:choose>
-    <xsl:when test="$recursive != 0 and ancestor::step">
-      <xsl:apply-templates select="ancestor::step[1]" mode="number">
-        <xsl:with-param name="rest" select="concat('.', $num, $rest)"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="concat($num, $rest)"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ====================================================================== -->
-<!-- OrderedList Numeration -->
-<xsl:template name="output-orderedlist-starting-number">
-  <xsl:param name="list"/>
-  <xsl:param name="pi-start"/>
-  <xsl:choose>
-    <xsl:when test="not($list/@continuation = 'continues')">
-      <xsl:choose>
-        <xsl:when test="@startingnumber">
-          <xsl:value-of select="@startingnumber"/>
-        </xsl:when>
-        <xsl:when test="$pi-start != ''">
-          <xsl:value-of select="$pi-start"/>
-        </xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:variable name="prevlist"
-        select="$list/preceding::orderedlist[1]"/>
-      <xsl:choose>
-        <xsl:when test="count($prevlist) = 0">2</xsl:when>
-        <xsl:otherwise>
-          <xsl:variable name="prevlength" select="count($prevlist/listitem)"/>
-          <xsl:variable name="prevstart">
-            <xsl:call-template name="orderedlist-starting-number">
-              <xsl:with-param name="list" select="$prevlist"/>
-            </xsl:call-template>
-          </xsl:variable>
-          <xsl:value-of select="$prevstart + $prevlength"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="orderedlist-item-number">
-  <!-- context node must be a listitem in an orderedlist -->
-  <xsl:param name="node" select="."/>
-  <xsl:choose>
-    <xsl:when test="$node/@override">
-      <xsl:value-of select="$node/@override"/>
-    </xsl:when>
-    <xsl:when test="$node/preceding-sibling::listitem">
-      <xsl:variable name="pnum">
-        <xsl:call-template name="orderedlist-item-number">
-          <xsl:with-param name="node" select="$node/preceding-sibling::listitem[1]"/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:value-of select="$pnum + 1"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="orderedlist-starting-number">
-        <xsl:with-param name="list" select="parent::*"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="next.numeration">
-  <xsl:param name="numeration" select="'default'"/>
-  <xsl:choose>
-    <!-- Change this list if you want to change the order of numerations -->
-    <xsl:when test="$numeration = 'arabic'">loweralpha</xsl:when>
-    <xsl:when test="$numeration = 'loweralpha'">lowerroman</xsl:when>
-    <xsl:when test="$numeration = 'lowerroman'">upperalpha</xsl:when>
-    <xsl:when test="$numeration = 'upperalpha'">upperroman</xsl:when>
-    <xsl:when test="$numeration = 'upperroman'">arabic</xsl:when>
-    <xsl:otherwise>arabic</xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="list.numeration">
-  <xsl:param name="node" select="."/>
-
-  <xsl:choose>
-    <xsl:when test="$node/@numeration">
-      <xsl:value-of select="$node/@numeration"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:choose>
-        <xsl:when test="$node/ancestor::orderedlist">
-          <xsl:call-template name="next.numeration">
-            <xsl:with-param name="numeration">
-              <xsl:call-template name="list.numeration">
-                <xsl:with-param name="node" select="$node/ancestor::orderedlist[1]"/>
-              </xsl:call-template>
-            </xsl:with-param>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="next.numeration"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ====================================================================== -->
-<!-- ItemizedList "Numeration" -->
-
-<xsl:template name="next.itemsymbol">
-  <xsl:param name="itemsymbol" select="'default'"/>
-  <xsl:choose>
-    <!-- Change this list if you want to change the order of symbols -->
-    <xsl:when test="$itemsymbol = 'disc'">circle</xsl:when>
-    <xsl:when test="$itemsymbol = 'circle'">square</xsl:when>
-    <xsl:otherwise>disc</xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="list.itemsymbol">
-  <xsl:param name="node" select="."/>
-
-  <xsl:choose>
-    <xsl:when test="@override">
-      <xsl:value-of select="@override"/>
-    </xsl:when>
-    <xsl:when test="$node/@mark">
-      <xsl:value-of select="$node/@mark"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:choose>
-        <xsl:when test="$node/ancestor::itemizedlist">
-          <xsl:call-template name="next.itemsymbol">
-            <xsl:with-param name="itemsymbol">
-              <xsl:call-template name="list.itemsymbol">
-                <xsl:with-param name="node" select="$node/ancestor::itemizedlist[1]"/>
-              </xsl:call-template>
-            </xsl:with-param>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="next.itemsymbol"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ====================================================================== -->
-
-<doc:template name="copyright.years" xmlns="">
-<refpurpose>Print a set of years with collapsed ranges</refpurpose>
-
-<refdescription id="copyright.years-desc">
-<para>This template prints a list of year elements with consecutive
-years printed as a range. In other words:</para>
-
-<screen><![CDATA[<year>1992</year>
-<year>1993</year>
-<year>1994</year>]]></screen>
-
-<para>is printed <quote>1992-1994</quote>, whereas:</para>
-
-<screen><![CDATA[<year>1992</year>
-<year>1994</year>]]></screen>
-
-<para>is printed <quote>1992, 1994</quote>.</para>
-
-<para>This template assumes that all the year elements contain only
-decimal year numbers, that the elements are sorted in increasing
-numerical order, that there are no duplicates, and that all the years
-are expressed in full <quote>century+year</quote>
-(<quote>1999</quote> not <quote>99</quote>) notation.</para>
-</refdescription>
-
-<refparameter id="copyright.years-params">
-<variablelist>
-<varlistentry><term>years</term>
-<listitem>
-<para>The initial set of year elements.</para>
-</listitem>
-</varlistentry>
-<varlistentry><term>print.ranges</term>
-<listitem>
-<para>If non-zero, multi-year ranges are collapsed. If zero, all years
-are printed discretely.</para>
-</listitem>
-</varlistentry>
-<varlistentry><term>single.year.ranges</term>
-<listitem>
-<para>If non-zero, two consecutive years will be printed as a range,
-otherwise, they will be printed discretely. In other words, a single
-year range is <quote>1991-1992</quote> but discretely it's
-<quote>1991, 1992</quote>.</para>
-</listitem>
-</varlistentry>
-</variablelist>
-</refparameter>
-
-<refreturn id="copyright.years-returns">
-<para>This template returns the formatted list of years.</para>
-</refreturn>
-</doc:template>
-
-<xsl:template name="copyright.years">
-  <xsl:param name="years"/>
-  <xsl:param name="print.ranges" select="1"/>
-  <xsl:param name="single.year.ranges" select="0"/>
-  <xsl:param name="firstyear" select="0"/>
-  <xsl:param name="nextyear" select="0"/>
-
-  <!--
-  <xsl:message terminate="no">
-    <xsl:text>CY: </xsl:text>
-    <xsl:value-of select="count($years)"/>
-    <xsl:text>, </xsl:text>
-    <xsl:value-of select="$firstyear"/>
-    <xsl:text>, </xsl:text>
-    <xsl:value-of select="$nextyear"/>
-    <xsl:text>, </xsl:text>
-    <xsl:value-of select="$print.ranges"/>
-    <xsl:text>, </xsl:text>
-    <xsl:value-of select="$single.year.ranges"/>
-    <xsl:text> (</xsl:text>
-    <xsl:value-of select="$years[1]"/>
-    <xsl:text>)</xsl:text>
-  </xsl:message>
-  -->
-
-  <xsl:choose>
-    <xsl:when test="$print.ranges = 0 and count($years) &gt; 0">
-      <xsl:choose>
-        <xsl:when test="count($years) = 1">
-          <xsl:apply-templates select="$years[1]" mode="titlepage.mode"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates select="$years[1]" mode="titlepage.mode"/>
-          <xsl:text>, </xsl:text>
-          <xsl:call-template name="copyright.years">
-            <xsl:with-param name="years"
-                            select="$years[position() &gt; 1]"/>
-            <xsl:with-param name="print.ranges" select="$print.ranges"/>
-            <xsl:with-param name="single.year.ranges"
-                            select="$single.year.ranges"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:when test="count($years) = 0">
-      <xsl:variable name="lastyear" select="$nextyear - 1"/>
-      <xsl:choose>
-        <xsl:when test="$firstyear = 0">
-          <!-- there weren't any years at all -->
-        </xsl:when>
-        <xsl:when test="$firstyear = $lastyear">
-          <xsl:value-of select="$firstyear"/>
-        </xsl:when>
-        <xsl:when test="$single.year.ranges = 0
-                        and $lastyear = $firstyear + 1">
-          <xsl:value-of select="$firstyear"/>
-          <xsl:text>, </xsl:text>
-          <xsl:value-of select="$lastyear"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="$firstyear"/>
-          <xsl:text>-</xsl:text>
-          <xsl:value-of select="$lastyear"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:when test="$firstyear = 0">
-      <xsl:call-template name="copyright.years">
-        <xsl:with-param name="years"
-                        select="$years[position() &gt; 1]"/>
-        <xsl:with-param name="firstyear" select="$years[1]"/>
-        <xsl:with-param name="nextyear" select="$years[1] + 1"/>
-        <xsl:with-param name="print.ranges" select="$print.ranges"/>
-        <xsl:with-param name="single.year.ranges"
-                        select="$single.year.ranges"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="$nextyear = $years[1]">
-      <xsl:call-template name="copyright.years">
-        <xsl:with-param name="years"
-                        select="$years[position() &gt; 1]"/>
-        <xsl:with-param name="firstyear" select="$firstyear"/>
-        <xsl:with-param name="nextyear" select="$nextyear + 1"/>
-        <xsl:with-param name="print.ranges" select="$print.ranges"/>
-        <xsl:with-param name="single.year.ranges"
-                        select="$single.year.ranges"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <!-- we have years left, but they aren't in the current range -->
-      <xsl:choose>
-        <xsl:when test="$nextyear = $firstyear + 1">
-          <xsl:value-of select="$firstyear"/>
-          <xsl:text>, </xsl:text>
-        </xsl:when>
-        <xsl:when test="$single.year.ranges = 0
-                        and $nextyear = $firstyear + 2">
-          <xsl:value-of select="$firstyear"/>
-          <xsl:text>, </xsl:text>
-          <xsl:value-of select="$nextyear - 1"/>
-          <xsl:text>, </xsl:text>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="$firstyear"/>
-          <xsl:text>-</xsl:text>
-          <xsl:value-of select="$nextyear - 1"/>
-          <xsl:text>, </xsl:text>
-        </xsl:otherwise>
-      </xsl:choose>
-      <xsl:call-template name="copyright.years">
-        <xsl:with-param name="years"
-                        select="$years[position() &gt; 1]"/>
-        <xsl:with-param name="firstyear" select="$years[1]"/>
-        <xsl:with-param name="nextyear" select="$years[1] + 1"/>
-        <xsl:with-param name="print.ranges" select="$print.ranges"/>
-        <xsl:with-param name="single.year.ranges"
-                        select="$single.year.ranges"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ====================================================================== -->
-
-<doc:template name="find.path.params" xmlns="">
-<refpurpose>Search in a table for the "best" match for the node</refpurpose>
-
-<refdescription id="find.path.params-desc">
-<para>This template searches in a table for the value that most-closely
-(in the typical best-match sense of XSLT) matches the current (element)
-node location.</para>
-</refdescription>
-</doc:template>
-
-<xsl:template name="find.path.params">
-  <xsl:param name="node" select="."/>
-  <xsl:param name="table" select="''"/>
-  <xsl:param name="location">
-    <xsl:call-template name="xpath.location">
-      <xsl:with-param name="node" select="$node"/>
-    </xsl:call-template>
-  </xsl:param>
-
-  <xsl:variable name="value">
-    <xsl:call-template name="lookup.key">
-      <xsl:with-param name="key" select="$location"/>
-      <xsl:with-param name="table" select="$table"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$value != ''">
-      <xsl:value-of select="$value"/>
-    </xsl:when>
-    <xsl:when test="contains($location, '/')">
-      <xsl:call-template name="find.path.params">
-        <xsl:with-param name="node" select="$node"/>
-        <xsl:with-param name="table" select="$table"/>
-        <xsl:with-param name="location" select="substring-after($location, '/')"/>
-      </xsl:call-template>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="relative-uri">
-  <xsl:param name="filename" select="."/>
-  <xsl:param name="destdir" select="''"/>
-  
-  <xsl:variable name="srcurl">
-    <xsl:call-template name="strippath">
-      <xsl:with-param name="filename">
-        <xsl:call-template name="xml.base.dirs">
-          <xsl:with-param name="base.elem" 
-                          select="$filename/ancestor-or-self::*
-                                   [@xml:base != ''][1]"/>
-        </xsl:call-template>
-        <xsl:value-of select="$filename"/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="srcurl.trimmed">
-    <xsl:call-template name="trim.common.uri.paths">
-      <xsl:with-param name="uriA" select="$srcurl"/>
-      <xsl:with-param name="uriB" select="$destdir"/>
-      <xsl:with-param name="return" select="'A'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="destdir.trimmed">
-    <xsl:call-template name="trim.common.uri.paths">
-      <xsl:with-param name="uriA" select="$srcurl"/>
-      <xsl:with-param name="uriB" select="$destdir"/>
-      <xsl:with-param name="return" select="'B'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="depth">
-    <xsl:call-template name="count.uri.path.depth">
-      <xsl:with-param name="filename" select="$destdir.trimmed"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:call-template name="copy-string">
-    <xsl:with-param name="string" select="'../'"/>
-    <xsl:with-param name="count" select="$depth"/>
-  </xsl:call-template>
-  <xsl:value-of select="$srcurl.trimmed"/>
-
-</xsl:template>
-
-<!-- ===================================== -->
-
-<xsl:template name="xml.base.dirs">
-  <xsl:param name="base.elem" select="NONODE"/>
-
-  <!-- Recursively resolve xml:base attributes, up to a 
-       full path with : in uri -->
-  <xsl:if test="$base.elem/ancestor::*[@xml:base != ''] and
-                not(contains($base.elem/@xml:base, ':'))">
-    <xsl:call-template name="xml.base.dirs">
-      <xsl:with-param name="base.elem" 
-                      select="$base.elem/ancestor::*[@xml:base != ''][1]"/>
-    </xsl:call-template>
-  </xsl:if>
-  <xsl:call-template name="getdir">
-    <xsl:with-param name="filename" select="$base.elem/@xml:base"/>
-  </xsl:call-template>
-
-</xsl:template>
-
-<!-- ===================================== -->
-
-<xsl:template name="strippath">
-  <xsl:param name="filename" select="''"/>
-  <xsl:choose>
-    <!-- Leading .. are not eliminated -->
-    <xsl:when test="starts-with($filename, '../')">
-      <xsl:value-of select="'../'"/>
-      <xsl:call-template name="strippath">
-        <xsl:with-param name="filename" select="substring-after($filename, '../')"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="contains($filename, '/../')">
-      <xsl:call-template name="strippath">
-        <xsl:with-param name="filename">
-          <xsl:call-template name="getdir">
-            <xsl:with-param name="filename" select="substring-before($filename, '/../')"/>
-          </xsl:call-template>
-          <xsl:value-of select="substring-after($filename, '/../')"/>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$filename"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ===================================== -->
-
-<xsl:template name="getdir">
-  <xsl:param name="filename" select="''"/>
-  <xsl:if test="contains($filename, '/')">
-    <xsl:value-of select="substring-before($filename, '/')"/>
-    <xsl:text>/</xsl:text>
-    <xsl:call-template name="getdir">
-      <xsl:with-param name="filename" select="substring-after($filename, '/')"/>
-    </xsl:call-template>
-  </xsl:if>
-</xsl:template>
-
-<!-- ===================================== -->
-
-<doc:template name="string.upper" xmlns="">
-<refpurpose>Converts a string to all uppercase letters</refpurpose>
-
-<refdescription id="string.upper-desc">
-<para>Given a string, this template does a language-aware conversion
-of that string to all uppercase letters, based on the values of the
-<literal>lowercase.alpha</literal> and
-<literal>uppercase.alpha</literal> gentext keys for the current
-locale. It affects only those characters found in the values of
-<literal>lowercase.alpha</literal> and
-<literal>uppercase.alpha</literal>. All other characters are left
-unchanged.</para>
-</refdescription>
-
-<refparameter id="string.upper-params">
-<variablelist>
-<varlistentry><term>string</term>
-<listitem>
-<para>The string to convert to uppercase.</para>
-</listitem>
-</varlistentry>
-</variablelist>
-</refparameter>
-</doc:template>
-<xsl:template name="string.upper">
-  <xsl:param name="string" select="''"/>
-  <xsl:variable name="lowercase.alpha">
-    <xsl:call-template name="gentext">
-      <xsl:with-param name="key" select="'lowercase.alpha'"/>
-    </xsl:call-template>
-  </xsl:variable>
-  <xsl:variable name="uppercase.alpha">
-    <xsl:call-template name="gentext">
-      <xsl:with-param name="key" select="'uppercase.alpha'"/>
-    </xsl:call-template>
-  </xsl:variable>
-  <xsl:value-of select="translate($string,$lowercase.alpha,$uppercase.alpha)"/>
-</xsl:template>
-
-<!-- ===================================== -->
-
-<doc:template name="string.lower" xmlns="">
-<refpurpose>Converts a string to all lowercase letters</refpurpose>
-
-<refdescription id="string.lower-desc">
-<para>Given a string, this template does a language-aware conversion
-of that string to all lowercase letters, based on the values of the
-<literal>uppercase.alpha</literal> and
-<literal>lowercase.alpha</literal> gentext keys for the current
-locale. It affects only those characters found in the values of
-<literal>uppercase.alpha</literal> and
-<literal>lowercase.alpha</literal>. All other characters are left
-unchanged.</para>
-</refdescription>
-
-<refparameter id="string.lower-params">
-<variablelist>
-<varlistentry><term>string</term>
-<listitem>
-<para>The string to convert to lowercase.</para>
-</listitem>
-</varlistentry>
-</variablelist>
-</refparameter>
-</doc:template>
-<xsl:template name="string.lower">
-  <xsl:param name="string" select="''"/>
-  <xsl:variable name="uppercase.alpha">
-    <xsl:call-template name="gentext">
-      <xsl:with-param name="key" select="'uppercase.alpha'"/>
-    </xsl:call-template>
-  </xsl:variable>
-  <xsl:variable name="lowercase.alpha">
-    <xsl:call-template name="gentext">
-      <xsl:with-param name="key" select="'lowercase.alpha'"/>
-    </xsl:call-template>
-  </xsl:variable>
-  <xsl:value-of select="translate($string,$uppercase.alpha,$lowercase.alpha)"/>
-</xsl:template>
-
-<!-- ===================================== -->
-
-<doc:template name="select.choice.separator" xmlns="">
-  <refpurpose>Returns localized choice separator</refpurpose>
-  <refdescription id="select.choice.separator-desc">
-    <para>This template enables auto-generation of an appropriate
-    localized "choice" separator (for example, "and" or "or") before
-    the final item in an inline list (though it could also be useful
-    for generating choice separators for non-inline lists).</para>
-    <para>It currently works by evaluating a processing instruction
-    (PI) of the form &lt;?dbchoice&#xa0;choice="foo"?> :
-    <itemizedlist>
-      <listitem>
-        <simpara>if the value of the <tag>choice</tag>
-        pseudo-attribute is "and" or "or", returns a localized "and"
-        or "or"</simpara>
-      </listitem>
-      <listitem>
-        <simpara>otherwise returns the literal value of the
-        <tag>choice</tag> pseudo-attribute</simpara>
-      </listitem>
-    </itemizedlist>
-    The latter is provided only as a temporary workaround because the
-    locale files do not currently have translations for the word
-    <wordasword>or</wordasword>. So if you want to generate a a
-    logical "or" separator in French (for example), you currently need
-    to do this:
-    <literallayout>&lt;?dbchoice choice="ou"?></literallayout>
-    </para>
-    <warning>
-      <para>The <tag>dbchoice</tag> processing instruction is
-      an unfortunate hack; support for it may disappear in the future
-      (particularly if and when a more appropriate means for marking
-      up "choice" lists becomes available in DocBook).</para>
-    </warning>
-  </refdescription>
-</doc:template>
-<xsl:template name="select.choice.separator">
-  <xsl:variable name="choice">
-    <xsl:call-template name="pi.dbchoice_choice"/>
-  </xsl:variable>
-  <xsl:choose>
-    <!-- if value of $choice is "and" or "or", translate to equivalent in -->
-    <!-- current locale -->
-    <xsl:when test="$choice = 'and' or $choice = 'or'">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="$choice"/>
-      </xsl:call-template>
-    </xsl:when>
-    <!--  otherwise, just output value of $choice, whatever it is -->
-    <xsl:otherwise>
-      <xsl:value-of select="$choice"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ===================================== -->
-
-<doc:template name="evaluate.info.profile" xmlns="">
-  <refpurpose>Evaluates an info profile</refpurpose>
-  <refdescription id="evaluate.info.profile-desc">
-    <para>This template evaluates an "info profile" matching the XPath
-    expression given by the <parameter>profile</parameter>
-    parameter. It relies on the XSLT <function>evaluate()</function>
-    extension function.</para>
-
-    <para>The value of the <parameter>profile</parameter> parameter
-    can include the literal string <literal>$info</literal>. If found
-    in the value of the <parameter>profile</parameter> parameter, the
-    literal string <literal>$info</literal> string is replaced with
-    the value of the <parameter>info</parameter> parameter, which
-    should be a set of <replaceable>*info</replaceable> nodes; the
-    expression is then evaluated using the XSLT
-    <function>evaluate()</function> extension function.</para>
-  </refdescription>
-  <refparameter id="evaluate.info.profile-params">
-    <variablelist>
-       <varlistentry>
-        <term>profile</term>
-        <listitem>
-          <para>A string representing an XPath expression </para>
-        </listitem>
-      </varlistentry>
-       <varlistentry>
-        <term>info</term>
-        <listitem>
-          <para>A set of *info nodes</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-
-  <refreturn id="evaluate.info.profile-returns">
-    <para>Returns a node (the result of evaluating the
-    <parameter>profile</parameter> parameter)</para>
-  </refreturn>
-</doc:template>
-  <xsl:template name="evaluate.info.profile">
-    <xsl:param name="profile"/>
-    <xsl:param name="info"/>
-    <xsl:choose>
-      <!-- * xsltproc and Xalan both support dyn:evaluate() -->
-      <xsl:when test="function-available('dyn:evaluate')">
-        <xsl:apply-templates
-            select="dyn:evaluate($profile)" mode="get.refentry.metadata"/>
-      </xsl:when>
-      <!-- * Saxon has its own evaluate() & doesn't support dyn:evaluate() -->
-      <xsl:when test="function-available('saxon:evaluate')">
-        <xsl:apply-templates
-            select="saxon:evaluate($profile)" mode="get.refentry.metadata"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:message terminate="yes">
-Error: The "info profiling" mechanism currently requires an XSLT
-engine that supports the evaluate() XSLT extension function. Your XSLT
-engine does not support it.
-</xsl:message>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/de.xml
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/de.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,669 +1,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="de" english-language-name="German">
-
-<!-- * This file is generated automatically. -->
-<!-- * To submit changes to this file upstream (to the DocBook Project) -->
-<!-- * do not submit an edited version of this file. Instead, submit an -->
-<!-- * edited version of the source file at the following location: -->
-<!-- * -->
-<!-- *  https://svn.sourceforge.net/svnroot/docbook/trunk/gentext/locale/de.xml -->
-<!-- * -->
-<!-- * E-mail the edited de.xml source file to: -->
-<!-- * -->
-<!-- *  docbook-developers@lists.sourceforge.net -->
-
-<!-- ******************************************************************** -->
-
-<!-- This file is part of the XSL DocBook Stylesheet distribution. -->
-<!-- See ../README or http://docbook.sf.net/release/xsl/current/ for -->
-<!-- copyright and other information. -->
-
-<!-- ******************************************************************** -->
-<!-- In these files, % with a letter is used for a placeholder: -->
-<!--   %t is the current element's title -->
-<!--   %s is the current element's subtitle (if applicable)-->
-<!--   %n is the current element's number label-->
-<!--   %p is the current element's page number (if applicable)-->
-<!-- ******************************************************************** -->
-
-
-<l:gentext key="Abstract" text="Zusammenfassung"/>
-<l:gentext key="abstract" text="Zusammenfassung"/>
-<l:gentext key="Answer" text="A:"/>
-<l:gentext key="answer" text="A:"/>
-<l:gentext key="Appendix" text="Anhang"/>
-<l:gentext key="appendix" text="Anhang"/>
-<l:gentext key="Article" text="Artikel"/>
-<l:gentext key="article" text="Artikel"/>
-<l:gentext key="Author" text="Autor"/>
-<l:gentext key="Bibliography" text="Literaturverzeichnis"/>
-<l:gentext key="bibliography" text="Literaturverzeichnis"/>
-<l:gentext key="Book" text="Buch"/>
-<l:gentext key="book" text="Buch"/>
-<l:gentext key="CAUTION" text="ACHTUNG"/>
-<l:gentext key="Caution" text="Achtung"/>
-<l:gentext key="caution" text="Achtung"/>
-<l:gentext key="Chapter" text="Kapitel"/>
-<l:gentext key="chapter" text="Kapitel"/>
-<l:gentext key="Colophon" text="Kolophon"/>
-<l:gentext key="colophon" text="Kolophon"/>
-<l:gentext key="Copyright" text="Copyright"/>
-<l:gentext key="copyright" text="Copyright"/>
-<l:gentext key="Dedication" text="Widmung"/>
-<l:gentext key="dedication" text="Widmung"/>
-<l:gentext key="Edition" text="Ausgabe"/>
-<l:gentext key="edition" text="Ausgabe"/>
-<l:gentext key="Editor" text="Editor" lang="en"/>
-<l:gentext key="Equation" text="Gleichung"/>
-<l:gentext key="equation" text="Gleichung"/>
-<l:gentext key="Example" text="Beispiel"/>
-<l:gentext key="example" text="Beispiel"/>
-<l:gentext key="Figure" text="Abbildung"/>
-<l:gentext key="figure" text="Abbildung"/>
-<l:gentext key="Glossary" text="Glossar"/>
-<l:gentext key="glossary" text="Glossar"/>
-<l:gentext key="GlossSee" text="Siehe"/>
-<l:gentext key="glosssee" text="Siehe"/>
-<l:gentext key="GlossSeeAlso" text="Siehe auch"/>
-<l:gentext key="glossseealso" text="Siehe auch"/>
-<l:gentext key="IMPORTANT" text="WICHTIG"/>
-<l:gentext key="important" text="Wichtig"/>
-<l:gentext key="Important" text="Wichtig"/>
-<l:gentext key="Index" text="Stichwortverzeichnis"/>
-<l:gentext key="index" text="Stichwortverzeichnis"/>
-<l:gentext key="ISBN" text="ISBN"/>
-<l:gentext key="isbn" text="ISBN"/>
-<l:gentext key="LegalNotice" text="Rechtlicher Hinweis"/>
-<l:gentext key="legalnotice" text="Rechtlicher Hinweis"/>
-<l:gentext key="MsgAud" text="Zielgruppe"/>
-<l:gentext key="msgaud" text="Zielgruppe"/>
-<l:gentext key="MsgLevel" text="Dringlichkeit"/>
-<l:gentext key="msglevel" text="Dringlichkeit"/>
-<l:gentext key="MsgOrig" text="Ursprung"/>
-<l:gentext key="msgorig" text="Ursprung"/>
-<l:gentext key="NOTE" text="ANMERKUNG"/>
-<l:gentext key="Note" text="Anmerkung"/>
-<l:gentext key="note" text="Anmerkung"/>
-<l:gentext key="Part" text="Teil"/>
-<l:gentext key="part" text="Teil"/>
-<l:gentext key="Preface" text="Vorwort"/>
-<l:gentext key="preface" text="Vorwort"/>
-<l:gentext key="Procedure" text="Prozedur"/>
-<l:gentext key="procedure" text="Prozedur"/>
-<l:gentext key="ProductionSet" text="Produktion"/>
-<l:gentext key="PubDate" text="VerÃ¶ffentlicht"/>
-<l:gentext key="pubdate" text="VerÃ¶ffentlicht"/>
-<l:gentext key="Published" text="VerÃ¶ffentlicht"/>
-<l:gentext key="published" text="VerÃ¶ffentlicht"/>
-<l:gentext key="Publisher" text="Publisher" lang="en"/>
-<l:gentext key="Qandadiv" text="F &amp; A"/>
-<l:gentext key="qandadiv" text="F &amp; A"/>
-<l:gentext key="QandASet" text="Frequently Asked Questions" lang="en"/>
-<l:gentext key="Question" text="F:"/>
-<l:gentext key="question" text="F:"/>
-<l:gentext key="RefEntry" text=""/>
-<l:gentext key="refentry" text=""/>
-<l:gentext key="Reference" text="Verweis"/>
-<l:gentext key="reference" text="Verweis"/>
-<l:gentext key="References" text="References" lang="en"/>
-<l:gentext key="RefName" text="Name"/>
-<l:gentext key="refname" text="Name"/>
-<l:gentext key="RefSection" text="Abschnitt"/>
-<l:gentext key="refsection" text="Abschnitt"/>
-<l:gentext key="RefSynopsisDiv" text="Synopsis"/>
-<l:gentext key="refsynopsisdiv" text="Synopsis"/>
-<l:gentext key="RevHistory" text="Versionsgeschichte"/>
-<l:gentext key="revhistory" text="Versionsgeschichte"/>
-<l:gentext key="revision" text="Version"/>
-<l:gentext key="Revision" text="Version"/>
-<l:gentext key="sect1" text="Abschnitt"/>
-<l:gentext key="sect2" text="Abschnitt"/>
-<l:gentext key="sect3" text="Abschnitt"/>
-<l:gentext key="sect4" text="Abschnitt"/>
-<l:gentext key="sect5" text="Abschnitt"/>
-<l:gentext key="section" text="Abschnitt"/>
-<l:gentext key="Section" text="Abschnitt"/>
-<l:gentext key="see" text="Siehe"/>
-<l:gentext key="See" text="Siehe"/>
-<l:gentext key="seealso" text="Siehe auch"/>
-<l:gentext key="Seealso" text="Siehe auch"/>
-<l:gentext key="SeeAlso" text="Siehe auch"/>
-<l:gentext key="set" text="Satz"/>
-<l:gentext key="Set" text="Satz"/>
-<l:gentext key="setindex" text="Stichwortverzeichnis"/>
-<l:gentext key="SetIndex" text="Stichwortverzeichnis"/>
-<l:gentext key="Sidebar" text="Randnotiz"/>
-<l:gentext key="sidebar" text="randnotiz"/>
-<l:gentext key="step" text="Schritt"/>
-<l:gentext key="Step" text="Schritt"/>
-<l:gentext key="table" text="Tabelle"/>
-<l:gentext key="Table" text="Tabelle"/>
-<l:gentext key="task" text="Task" lang="en"/>
-<l:gentext key="Task" text="Task" lang="en"/>
-<l:gentext key="tip" text="Tipp"/>
-<l:gentext key="TIP" text="TIPP"/>
-<l:gentext key="Tip" text="Tipp"/>
-<l:gentext key="Warning" text="Warnung"/>
-<l:gentext key="warning" text="Warnung"/>
-<l:gentext key="WARNING" text="WARNUNG"/>
-<l:gentext key="and" text="und"/>
-<l:gentext key="by" text="von"/>
-<l:gentext key="Edited" text="Herausgegeben"/>
-<l:gentext key="edited" text="Herausgegeben"/>
-<l:gentext key="Editedby" text="Herausgegeben von"/>
-<l:gentext key="editedby" text="Herausgegeben von"/>
-<l:gentext key="in" text="in"/>
-<l:gentext key="lastlistcomma" text=""/>
-<l:gentext key="listcomma" text=","/>
-<l:gentext key="nonexistantelement" text="nicht existierendes Element"/>
-<l:gentext key="notes" text="FuÃnoten"/>
-<l:gentext key="Notes" text="FuÃnoten"/>
-<l:gentext key="Pgs" text="Seiten"/>
-<l:gentext key="pgs" text="Seiten"/>
-<l:gentext key="Revisedby" text="GeÃ€ndert durch: "/>
-<l:gentext key="revisedby" text="GeÃ€ndert durch: "/>
-<l:gentext key="TableNotes" text="Bemerkungen"/>
-<l:gentext key="tablenotes" text="Bemerkungen"/>
-<l:gentext key="TableofContents" text="Inhaltsverzeichnis"/>
-<l:gentext key="tableofcontents" text="Inhaltsverzeichnis"/>
-<l:gentext key="unexpectedelementname" text="Unerwarteter Elementname"/>
-<l:gentext key="unsupported" text="wird nicht unterstÃŒtzt"/>
-<l:gentext key="xrefto" text="xref auf"/>
-<l:gentext key="Authors" text="Autoren"/>
-<l:gentext key="copyeditor" text="Copy Editor" lang="en"/>
-<l:gentext key="graphicdesigner" text="Graphic Designer" lang="en"/>
-<l:gentext key="productioneditor" text="Production Editor" lang="en"/>
-<l:gentext key="technicaleditor" text="Technical Editor" lang="en"/>
-<l:gentext key="translator" text="Translator" lang="en"/>
-<l:gentext key="listofequations" text="Gleichungen"/>
-<l:gentext key="ListofEquations" text="Gleichungen"/>
-<l:gentext key="ListofExamples" text="Beispiele"/>
-<l:gentext key="listofexamples" text="Beispiele"/>
-<l:gentext key="ListofFigures" text="Abbildungsverzeichnis"/>
-<l:gentext key="listoffigures" text="Abbildungsverzeichnis"/>
-<l:gentext key="ListofProcedures" text="List of Procedures" lang="en"/>
-<l:gentext key="listofprocedures" text="List of Procedures" lang="en"/>
-<l:gentext key="listoftables" text="Tabellenverzeichnis"/>
-<l:gentext key="ListofTables" text="Tabellenverzeichnis"/>
-<l:gentext key="ListofUnknown" text="???-Verzeichnis"/>
-<l:gentext key="listofunknown" text="???-Verzeichnis"/>
-<l:gentext key="nav-home" text="Zum Anfang"/>
-<l:gentext key="nav-next" text="Weiter"/>
-<l:gentext key="nav-next-sibling" text="Schnell weiter"/>
-<l:gentext key="nav-prev" text="ZurÃŒck"/>
-<l:gentext key="nav-prev-sibling" text="Schnell zurÃŒck"/>
-<l:gentext key="nav-up" text="Nach oben"/>
-<l:gentext key="nav-toc" text="InhV"/>
-<l:gentext key="Draft" text="Entwurf"/>
-<l:gentext key="above" text="oben"/>
-<l:gentext key="below" text="unten"/>
-<l:gentext key="sectioncalled" text="der Abschnitt namens"/>
-<l:gentext key="index symbols" text="Symbole"/>
-<l:gentext key="lowercase.alpha" text="abcdefghijklmnopqrstuvwxyzÃ€Ã¶ÃŒÃ"/>
-<l:gentext key="uppercase.alpha" text="ABCDEFGHIJKLMNOPQRSTUVWXYZÃÃÃÃ"/>
-<l:gentext key="normalize.sort.input" text="AaÃÃ ÃÃ¡ÃÃ¢ÃÃ£ÃÃ€Ã
-Ã¥ÄÄÄÄÄÄ
-ÇÇÇÇÇ Ç¡ÇºÇ»ÈÈÈÈÈŠÈ§ážážáºáº áº¡áº¢áº£áº€áº¥áºŠáº§áºšáº©áºªáº«áº¬áº­áº®áº¯áº°áº±áº²áº³áºŽáºµáº¶áº·BbÆÆÉÆÆážážážáž
-ážážCcÃÃ§ÄÄÄÄÄÄÄÄÆÆÉážážDdÄÄÄÄÆÉÆÆÇ
-Ç²È¡ÉážážážážážážážážážážEeÃÃšÃÃ©ÃÃªÃÃ«ÄÄÄÄÄÄÄÄÄÄÈÈ
-ÈÈÈšÈ©ážážážážážážážážážážáºžáº¹áººáº»áºŒáºœáºŸáº¿á»á»á»á»á»á»
-á»á»FfÆÆážážGgÄÄÄÄÄ Ä¡Ä¢Ä£ÆÉ Ç€Ç¥ÇŠÇ§ÇŽÇµáž áž¡HhÄ€Ä¥ÄŠÄ§ÈÈÉŠáž¢áž£áž€áž¥ážŠáž§ážšáž©ážªáž«áºIiÃÃ¬ÃÃ­ÃÃ®ÃÃ¯ÄšÄ©ÄªÄ«Ä¬Ä­Ä®Ä¯Ä°ÆÉšÇÇÈÈÈÈáž¬áž­áž®áž¯á»á»á»á»JjÄŽÄµÇ°ÊKkÄ¶Ä·ÆÆÇšÇ©áž°áž±áž²áž³ážŽážµLlÄ¹ÄºÄ»ÄŒÄœÄŸÄ¿ÅÅÅÆÇÈŽÉ«É¬É­áž¶áž·ážžáž¹ážºáž»ážŒážœMmÉ±ážŸáž¿á¹á¹á¹á¹NnÃÃ±ÅÅÅ
-ÅÅÅÆÉ²ÆÈ ÇÇžÇ¹ÈµÉ³á¹á¹
-á¹á¹á¹á¹á¹á¹OoÃÃ²ÃÃ³ÃÃŽÃÃµÃÃ¶ÃÃžÅÅÅÅÅÅÆÆ Æ¡ÇÇÇªÇ«Ç¬Ç­ÇŸÇ¿ÈÈÈÈÈªÈ«È¬È­È®È¯È°È±á¹á¹á¹á¹á¹á¹á¹á¹á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á» á»¡á»¢á»£PpÆ€Æ¥á¹á¹á¹á¹QqÊ RrÅÅÅÅÅÅÈÈÈÈÉŒÉœÉŸá¹á¹á¹á¹á¹á¹á¹á¹SsÅÅÅÅÅÅÅ Å¡ÈÈÊá¹ á¹¡á¹¢á¹£á¹€á¹¥á¹Šá¹§á¹šá¹©TtÅ¢Å£Å€Å¥ÅŠÅ§Æ«Æ¬Æ­Æ®ÊÈÈÈ¶á¹ªá¹«á¹¬á¹­á¹®á¹¯á¹°á¹±áºUuÃÃ¹ÃÃºÃÃ»ÃÃŒÅšÅ©ÅªÅ«Å¬Å­Å®Å¯Å°Å±Å²Å³Æ¯Æ°ÇÇÇÇÇÇÇÇÇÇÈÈÈÈá¹²á¹³á¹Žá¹µá¹¶á¹·á¹žá¹¹á¹ºá¹»á»€á»¥á»Šá»§á»šá»©á»ªá»«á»¬á»­á»®á»¯á»°á»±VvÆ²Êá¹Œá¹œá¹Ÿá¹¿WwÅŽÅµáºáºáºáºáºáº
-áºáºáºáºáºXxáºáºáºáºYyÃÃœÃ¿ÅžÅ¶Å·Æ³ÆŽÈ²È³áºáºáºá»²á»³á»Žá»µá»¶á»·á»žá»¹ZzÅ¹ÅºÅ»ÅŒÅœÅŸÆµÆ¶È€È¥ÊÊáºáºáºáºáºáºáº" lang="en"/>
-<l:gentext key="normalize.sort.output" text="AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ" lang="en"/>
-<l:dingbat key="startquote" text="â"/>
-<l:dingbat key="endquote" text="â"/>
-<l:dingbat key="nestedstartquote" text="â"/>
-<l:dingbat key="nestedendquote" text="â"/>
-<l:dingbat key="singlestartquote" text="â"/>
-<l:dingbat key="singleendquote" text="â"/>
-<l:dingbat key="bullet" text="â¢"/>
-<l:gentext key="hyphenation-character" text="-"/>
-<l:gentext key="hyphenation-push-character-count" text="2"/>
-<l:gentext key="hyphenation-remain-character-count" text="3"/>
-<l:context name="styles"><l:template name="person-name" text="first-last"/>
-</l:context>
-<l:context name="title"><l:template name="abstract" text="%t"/>
-<l:template name="answer" text="%t"/>
-<l:template name="appendix" text="Anhang %n. %t"/>
-<l:template name="article" text="%t"/>
-<l:template name="authorblurb" text="%t"/>
-<l:template name="bibliodiv" text="%t"/>
-<l:template name="biblioentry" text="%t"/>
-<l:template name="bibliography" text="%t"/>
-<l:template name="bibliolist" text="%t" lang="en"/>
-<l:template name="bibliomixed" text="%t"/>
-<l:template name="bibliomset" text="%t"/>
-<l:template name="biblioset" text="%t"/>
-<l:template name="blockquote" text="%t"/>
-<l:template name="book" text="%t"/>
-<l:template name="calloutlist" text="%t"/>
-<l:template name="caution" text="%t"/>
-<l:template name="chapter" text="Kapitel %n. %t"/>
-<l:template name="colophon" text="%t"/>
-<l:template name="dedication" text="%t"/>
-<l:template name="equation" text="Gleichung %n. %t"/>
-<l:template name="example" text="Beispiel %n. %t"/>
-<l:template name="figure" text="Abbildung %n. %t"/>
-<l:template name="foil" text="%t" lang="en"/>
-<l:template name="foilgroup" text="%t" lang="en"/>
-<l:template name="formalpara" text="%t"/>
-<l:template name="glossary" text="%t"/>
-<l:template name="glossdiv" text="%t"/>
-<l:template name="glosslist" text="%t" lang="en"/>
-<l:template name="glossentry" text="%t"/>
-<l:template name="important" text="%t"/>
-<l:template name="index" text="%t"/>
-<l:template name="indexdiv" text="%t"/>
-<l:template name="itemizedlist" text="%t"/>
-<l:template name="legalnotice" text="%t"/>
-<l:template name="listitem" text=""/>
-<l:template name="lot" text="%t"/>
-<l:template name="msg" text="%t"/>
-<l:template name="msgexplan" text="%t"/>
-<l:template name="msgmain" text="%t"/>
-<l:template name="msgrel" text="%t"/>
-<l:template name="msgset" text="%t"/>
-<l:template name="msgsub" text="%t"/>
-<l:template name="note" text="%t"/>
-<l:template name="orderedlist" text="%t"/>
-<l:template name="part" text="Teil %n. %t"/>
-<l:template name="partintro" text="%t"/>
-<l:template name="preface" text="%t"/>
-<l:template name="procedure" text="%t"/>
-<l:template name="procedure.formal" text="Prozedur %n. %t"/>
-<l:template name="productionset" text="%t"/>
-<l:template name="productionset.formal" text="ProduktionÂ %n"/>
-<l:template name="qandadiv" text="%t"/>
-<l:template name="qandaentry" text="%t"/>
-<l:template name="qandaset" text="%t"/>
-<l:template name="question" text="F: %n"/>
-<l:template name="refentry" text="%t"/>
-<l:template name="reference" text="%t"/>
-<l:template name="refsection" text="%t"/>
-<l:template name="refsect1" text="%t"/>
-<l:template name="refsect2" text="%t"/>
-<l:template name="refsect3" text="%t"/>
-<l:template name="refsynopsisdiv" text="%t"/>
-<l:template name="refsynopsisdivinfo" text="%t"/>
-<l:template name="segmentedlist" text="%t"/>
-<l:template name="set" text="%t"/>
-<l:template name="setindex" text="%t"/>
-<l:template name="sidebar" text="%t"/>
-<l:template name="step" text="%t"/>
-<l:template name="table" text="Tabelle %n. %t"/>
-<l:template name="task" text="%t"/>
-<l:template name="tasksummary" text="%t" lang="en"/>
-<l:template name="taskprerequisites" text="%t" lang="en"/>
-<l:template name="taskrelated" text="%t" lang="en"/>
-<l:template name="tip" text="%t"/>
-<l:template name="toc" text="%t"/>
-<l:template name="variablelist" text="%t"/>
-<l:template name="varlistentry" text="" lang="en"/>
-<l:template name="warning" text="%t"/>
-</l:context>
-<l:context name="title-unnumbered"><l:template name="appendix" text="%t"/>
-<l:template name="article/appendix" text="%t"/>
-<l:template name="bridgehead" text="%t"/>
-<l:template name="chapter" text="%t"/>
-<l:template name="sect1" text="%t"/>
-<l:template name="sect2" text="%t"/>
-<l:template name="sect3" text="%t"/>
-<l:template name="sect4" text="%t"/>
-<l:template name="sect5" text="%t"/>
-<l:template name="section" text="%t"/>
-<l:template name="simplesect" text="%t"/>
-<l:template name="part" text="%t" lang="en"/>
-</l:context>
-<l:context name="title-numbered"><l:template name="appendix" text="Anhang %n. %t"/>
-<l:template name="article/appendix" text="%n.Â %t"/>
-<l:template name="bridgehead" text="%n.Â %t"/>
-<l:template name="chapter" text="Kapitel %n. %t"/>
-<l:template name="part" text="TeilÂ %n.Â %t"/>
-<l:template name="sect1" text="%n. %t"/>
-<l:template name="sect2" text="%n. %t"/>
-<l:template name="sect3" text="%n. %t"/>
-<l:template name="sect4" text="%n. %t"/>
-<l:template name="sect5" text="%n. %t"/>
-<l:template name="section" text="%n. %t"/>
-<l:template name="simplesect" text="%n. %t"/>
-</l:context>
-<l:context name="subtitle"><l:template name="appendix" text="%s"/>
-<l:template name="article" text="%s"/>
-<l:template name="bibliodiv" text="%s"/>
-<l:template name="biblioentry" text="%s"/>
-<l:template name="bibliography" text="%s"/>
-<l:template name="bibliomixed" text="%s"/>
-<l:template name="bibliomset" text="%s"/>
-<l:template name="biblioset" text="%s"/>
-<l:template name="book" text="%s"/>
-<l:template name="chapter" text="%s"/>
-<l:template name="colophon" text="%s"/>
-<l:template name="dedication" text="%s"/>
-<l:template name="glossary" text="%s"/>
-<l:template name="glossdiv" text="%s"/>
-<l:template name="index" text="%s"/>
-<l:template name="indexdiv" text="%s"/>
-<l:template name="lot" text="%s"/>
-<l:template name="part" text="%s"/>
-<l:template name="partintro" text="%s"/>
-<l:template name="preface" text="%s"/>
-<l:template name="refentry" text="%s"/>
-<l:template name="reference" text="%s"/>
-<l:template name="refsection" text="%s"/>
-<l:template name="refsect1" text="%s"/>
-<l:template name="refsect2" text="%s"/>
-<l:template name="refsect3" text="%s"/>
-<l:template name="refsynopsisdiv" text="%s"/>
-<l:template name="sect1" text="%s"/>
-<l:template name="sect2" text="%s"/>
-<l:template name="sect3" text="%s"/>
-<l:template name="sect4" text="%s"/>
-<l:template name="sect5" text="%s"/>
-<l:template name="section" text="%s"/>
-<l:template name="set" text="%s"/>
-<l:template name="setindex" text="%s"/>
-<l:template name="sidebar" text="%s"/>
-<l:template name="simplesect" text="%s"/>
-<l:template name="toc" text="%s"/>
-</l:context>
-<l:context name="xref"><l:template name="abstract" text="%t"/>
-<l:template name="answer" text="A:Â %n"/>
-<l:template name="appendix" text="%t"/>
-<l:template name="article" text="%t"/>
-<l:template name="authorblurb" text="%t"/>
-<l:template name="bibliodiv" text="%t"/>
-<l:template name="bibliography" text="%t"/>
-<l:template name="bibliomset" text="%t"/>
-<l:template name="biblioset" text="%t"/>
-<l:template name="blockquote" text="%t"/>
-<l:template name="book" text="%t"/>
-<l:template name="calloutlist" text="%t"/>
-<l:template name="caution" text="%t"/>
-<l:template name="chapter" text="%t"/>
-<l:template name="colophon" text="%t"/>
-<l:template name="constraintdef" text="%t"/>
-<l:template name="dedication" text="%t"/>
-<l:template name="equation" text="%t"/>
-<l:template name="example" text="%t"/>
-<l:template name="figure" text="%t"/>
-<l:template name="foil" text="%t" lang="en"/>
-<l:template name="foilgroup" text="%t" lang="en"/>
-<l:template name="formalpara" text="%t"/>
-<l:template name="glossary" text="%t"/>
-<l:template name="glossdiv" text="%t"/>
-<l:template name="important" text="%t"/>
-<l:template name="index" text="%t"/>
-<l:template name="indexdiv" text="%t"/>
-<l:template name="itemizedlist" text="%t"/>
-<l:template name="legalnotice" text="%t"/>
-<l:template name="listitem" text="%n"/>
-<l:template name="lot" text="%t"/>
-<l:template name="msg" text="%t"/>
-<l:template name="msgexplan" text="%t"/>
-<l:template name="msgmain" text="%t"/>
-<l:template name="msgrel" text="%t"/>
-<l:template name="msgset" text="%t"/>
-<l:template name="msgsub" text="%t"/>
-<l:template name="note" text="%t"/>
-<l:template name="orderedlist" text="%t"/>
-<l:template name="part" text="%t"/>
-<l:template name="partintro" text="%t"/>
-<l:template name="preface" text="%t"/>
-<l:template name="procedure" text="%t"/>
-<l:template name="productionset" text="%t"/>
-<l:template name="qandadiv" text="%t"/>
-<l:template name="qandaentry" text="F:Â %n"/>
-<l:template name="qandaset" text="%t"/>
-<l:template name="question" text="F: %n"/>
-<l:template name="reference" text="%t"/>
-<l:template name="refsynopsisdiv" text="%t"/>
-<l:template name="segmentedlist" text="%t"/>
-<l:template name="set" text="%t"/>
-<l:template name="setindex" text="%t"/>
-<l:template name="sidebar" text="%t"/>
-<l:template name="table" text="%t"/>
-<l:template name="task" text="%t" lang="en"/>
-<l:template name="tip" text="%t"/>
-<l:template name="toc" text="%t"/>
-<l:template name="variablelist" text="%t"/>
-<l:template name="varlistentry" text="%n"/>
-<l:template name="warning" text="%t"/>
-<l:template name="olink.document.citation" text=" in %o" lang="en"/>
-<l:template name="olink.page.citation" text=" (page %p)" lang="en"/>
-<l:template name="page.citation" text=" [%p]"/>
-<l:template name="page" text="(Seite %p)"/>
-<l:template name="docname" text=" in %o" lang="en"/>
-<l:template name="docnamelong" text=" in the document titled %o" lang="en"/>
-<l:template name="pageabbrev" text="(S. %p)"/>
-<l:template name="Page" text="Seite %p"/>
-<l:template name="bridgehead" text="â%tâ"/>
-<l:template name="refsection" text="â%tâ"/>
-<l:template name="refsect1" text="â%tâ"/>
-<l:template name="refsect2" text="â%tâ"/>
-<l:template name="refsect3" text="â%tâ"/>
-<l:template name="sect1" text="â%tâ"/>
-<l:template name="sect2" text="â%tâ"/>
-<l:template name="sect3" text="â%tâ"/>
-<l:template name="sect4" text="â%tâ"/>
-<l:template name="sect5" text="â%tâ"/>
-<l:template name="section" text="â%tâ"/>
-<l:template name="simplesect" text="â%tâ"/>
-</l:context>
-<l:context name="xref-number"><l:template name="answer" text="A:Â %n"/>
-<l:template name="appendix" text="AnhangÂ %n"/>
-<l:template name="bridgehead" text="AbschnittÂ %n"/>
-<l:template name="chapter" text="KapitelÂ %n"/>
-<l:template name="equation" text="GleichungÂ %n"/>
-<l:template name="example" text="BeispielÂ %n"/>
-<l:template name="figure" text="AbbildungÂ %n"/>
-<l:template name="part" text="TeilÂ %n"/>
-<l:template name="procedure" text="ProzedurÂ %n"/>
-<l:template name="productionset" text="ProduktionÂ %n"/>
-<l:template name="qandadiv" text="F &amp; AÂ %n"/>
-<l:template name="qandaentry" text="F:Â %n"/>
-<l:template name="question" text="F:Â %n"/>
-<l:template name="sect1" text="AbschnittÂ %n"/>
-<l:template name="sect2" text="AbschnittÂ %n"/>
-<l:template name="sect3" text="AbschnittÂ %n"/>
-<l:template name="sect4" text="AbschnittÂ %n"/>
-<l:template name="sect5" text="AbschnittÂ %n"/>
-<l:template name="section" text="AbschnittÂ %n"/>
-<l:template name="table" text="TabelleÂ %n"/>
-</l:context>
-<l:context name="xref-number-and-title"><l:template name="appendix" text="AnhangÂ %n, %t"/>
-<l:template name="bridgehead" text="AbschnittÂ %n, â%tâ"/>
-<l:template name="chapter" text="KapitelÂ %n, %t"/>
-<l:template name="equation" text="GleichungÂ %n, â%tâ"/>
-<l:template name="example" text="BeispielÂ %n, â%tâ"/>
-<l:template name="figure" text="AbbildungÂ %n, â%tâ"/>
-<l:template name="part" text="TeilÂ %n, â%tâ"/>
-<l:template name="procedure" text="ProzedurÂ %n, â%tâ"/>
-<l:template name="productionset" text="ProduktionÂ %n, â%tâ"/>
-<l:template name="qandadiv" text="F &amp; AÂ %n, â%tâ"/>
-<l:template name="refsect1" text="der Abschnitt namens â%tâ"/>
-<l:template name="refsect2" text="der Abschnitt namens â%tâ"/>
-<l:template name="refsect3" text="der Abschnitt namens â%tâ"/>
-<l:template name="refsection" text="der Abschnitt namens â%tâ"/>
-<l:template name="sect1" text="AbschnittÂ %n, â%tâ"/>
-<l:template name="sect2" text="AbschnittÂ %n, â%tâ"/>
-<l:template name="sect3" text="AbschnittÂ %n, â%tâ"/>
-<l:template name="sect4" text="AbschnittÂ %n, â%tâ"/>
-<l:template name="sect5" text="AbschnittÂ %n, â%tâ"/>
-<l:template name="section" text="AbschnittÂ %n, â%tâ"/>
-<l:template name="simplesect" text="der Abschnitt namens â%tâ"/>
-<l:template name="table" text="TabelleÂ %n, â%tâ"/>
-</l:context>
-<l:context name="authorgroup"><l:template name="sep" text=", "/>
-<l:template name="sep2" text=" und "/>
-<l:template name="seplast" text=" und "/>
-</l:context>
-<l:context name="glossary"><l:template name="see" text="Siehe %t"/>
-<l:template name="seealso" text="Siehe auch %t"/>
-</l:context>
-<l:context name="msgset"><l:template name="MsgAud" text="Zielgruppe: "/>
-<l:template name="MsgLevel" text="Dringlichkeit: "/>
-<l:template name="MsgOrig" text="Ursprung: "/>
-</l:context>
-<l:context name="datetime"><l:template name="format" text="d.m.Y"/>
-</l:context>
-<l:context name="termdef"><l:template name="prefix" text="[Definition: " lang="en"/>
-<l:template name="suffix" text="]" lang="en"/>
-</l:context>
-<l:context name="datetime-full"><l:template name="January" text="Januar"/>
-<l:template name="February" text="Februar"/>
-<l:template name="March" text="MÃ€rz"/>
-<l:template name="April" text="April"/>
-<l:template name="May" text="Mai"/>
-<l:template name="June" text="Juni"/>
-<l:template name="July" text="Juli"/>
-<l:template name="August" text="August"/>
-<l:template name="September" text="September"/>
-<l:template name="October" text="Oktober"/>
-<l:template name="November" text="November"/>
-<l:template name="December" text="Dezember"/>
-<l:template name="Monday" text="Montag"/>
-<l:template name="Tuesday" text="Dienstag"/>
-<l:template name="Wednesday" text="Mittwoch"/>
-<l:template name="Thursday" text="Donnerstag"/>
-<l:template name="Friday" text="Freitag"/>
-<l:template name="Saturday" text="Samstag"/>
-<l:template name="Sunday" text="Sonntag"/>
-</l:context>
-<l:context name="datetime-abbrev"><l:template name="Jan" text="Jan"/>
-<l:template name="Feb" text="Feb"/>
-<l:template name="Mar" text="Mar"/>
-<l:template name="Apr" text="Apr"/>
-<l:template name="May" text="Mai"/>
-<l:template name="Jun" text="Jun"/>
-<l:template name="Jul" text="Jul"/>
-<l:template name="Aug" text="Aug"/>
-<l:template name="Sep" text="Sep"/>
-<l:template name="Oct" text="Okt"/>
-<l:template name="Nov" text="Nov"/>
-<l:template name="Dec" text="Dez"/>
-<l:template name="Mon" text="Mo"/>
-<l:template name="Tue" text="Di"/>
-<l:template name="Wed" text="Mi"/>
-<l:template name="Thu" text="Do"/>
-<l:template name="Fri" text="Fr"/>
-<l:template name="Sat" text="Sa"/>
-<l:template name="Sun" text="So"/>
-</l:context>
-<l:context name="htmlhelp"><l:template name="langcode" text="0x0407 German (GERMANY)"/>
-</l:context>
-<l:context name="index"><l:template name="term-separator" text=", " lang="en"/>
-<l:template name="number-separator" text=", " lang="en"/>
-<l:template name="range-separator" text="-" lang="en"/>
-</l:context>
-<l:context name="iso690"><l:template name="lastfirst.sep" text=", " lang="en"/>
-<l:template name="alt.person.two.sep" text=" â " lang="en"/>
-<l:template name="alt.person.last.sep" text=" â " lang="en"/>
-<l:template name="alt.person.more.sep" text=" â " lang="en"/>
-<l:template name="primary.editor" text=" (ed.)" lang="en"/>
-<l:template name="primary.many" text=", et al." lang="en"/>
-<l:template name="primary.sep" text=". " lang="en"/>
-<l:template name="submaintitle.sep" text=": " lang="en"/>
-<l:template name="title.sep" text=". " lang="en"/>
-<l:template name="othertitle.sep" text=", " lang="en"/>
-<l:template name="medium1" text=" [" lang="en"/>
-<l:template name="medium2" text="]" lang="en"/>
-<l:template name="secondary.person.sep" text="; " lang="en"/>
-<l:template name="secondary.sep" text=". " lang="en"/>
-<l:template name="respons.sep" text=". " lang="en"/>
-<l:template name="edition.sep" text=". " lang="en"/>
-<l:template name="edition.serial.sep" text=", " lang="en"/>
-<l:template name="issuing.range" text="-" lang="en"/>
-<l:template name="issuing.div" text=", " lang="en"/>
-<l:template name="issuing.sep" text=". " lang="en"/>
-<l:template name="partnr.sep" text=". " lang="en"/>
-<l:template name="placepubl.sep" text=": " lang="en"/>
-<l:template name="publyear.sep" text=", " lang="en"/>
-<l:template name="pubinfo.sep" text=". " lang="en"/>
-<l:template name="spec.pubinfo.sep" text=", " lang="en"/>
-<l:template name="upd.sep" text=", " lang="en"/>
-<l:template name="datecit1" text=" [cited " lang="en"/>
-<l:template name="datecit2" text="]" lang="en"/>
-<l:template name="extent.sep" text=". " lang="en"/>
-<l:template name="locs.sep" text=", " lang="en"/>
-<l:template name="location.sep" text=". " lang="en"/>
-<l:template name="serie.sep" text=". " lang="en"/>
-<l:template name="notice.sep" text=". " lang="en"/>
-<l:template name="access" text="Available " lang="en"/>
-<l:template name="acctoo" text="Also available " lang="en"/>
-<l:template name="onwww" text="from World Wide Web" lang="en"/>
-<l:template name="oninet" text="from Internet" lang="en"/>
-<l:template name="access.end" text=": " lang="en"/>
-<l:template name="link1" text="&lt;" lang="en"/>
-<l:template name="link2" text="&gt;" lang="en"/>
-<l:template name="access.sep" text=". " lang="en"/>
-<l:template name="isbn" text="ISBN " lang="en"/>
-<l:template name="issn" text="ISSN " lang="en"/>
-<l:template name="stdnum.sep" text=". " lang="en"/>
-<l:template name="patcountry.sep" text=". " lang="en"/>
-<l:template name="pattype.sep" text=", " lang="en"/>
-<l:template name="patnum.sep" text=". " lang="en"/>
-<l:template name="patdate.sep" text=". " lang="en"/>
-</l:context><l:letters><l:l i="-1"/>
-<l:l i="0">Symbole</l:l>
-<l:l i="1">A</l:l>
-<l:l i="1">a</l:l>
-<l:l i="1">Ã</l:l>
-<l:l i="1">Ã€</l:l>
-<l:l i="2">B</l:l>
-<l:l i="2">b</l:l>
-<l:l i="3">C</l:l>
-<l:l i="3">c</l:l>
-<l:l i="4">D</l:l>
-<l:l i="4">d</l:l>
-<l:l i="5">E</l:l>
-<l:l i="5">e</l:l>
-<l:l i="6">F</l:l>
-<l:l i="6">f</l:l>
-<l:l i="7">G</l:l>
-<l:l i="7">g</l:l>
-<l:l i="8">H</l:l>
-<l:l i="8">h</l:l>
-<l:l i="9">I</l:l>
-<l:l i="9">i</l:l>
-<l:l i="10">J</l:l>
-<l:l i="10">j</l:l>
-<l:l i="11">K</l:l>
-<l:l i="11">k</l:l>
-<l:l i="12">L</l:l>
-<l:l i="12">l</l:l>
-<l:l i="13">M</l:l>
-<l:l i="13">m</l:l>
-<l:l i="14">N</l:l>
-<l:l i="14">n</l:l>
-<l:l i="15">O</l:l>
-<l:l i="15">o</l:l>
-<l:l i="15">Ã</l:l>
-<l:l i="15">Ã¶</l:l>
-<l:l i="16">P</l:l>
-<l:l i="16">p</l:l>
-<l:l i="17">Q</l:l>
-<l:l i="17">q</l:l>
-<l:l i="18">R</l:l>
-<l:l i="18">r</l:l>
-<l:l i="19">S</l:l>
-<l:l i="19">s</l:l>
-<l:l i="20">T</l:l>
-<l:l i="20">t</l:l>
-<l:l i="21">U</l:l>
-<l:l i="21">u</l:l>
-<l:l i="21">Ã</l:l>
-<l:l i="21">ÃŒ</l:l>
-<l:l i="22">V</l:l>
-<l:l i="22">v</l:l>
-<l:l i="23">W</l:l>
-<l:l i="23">w</l:l>
-<l:l i="24">X</l:l>
-<l:l i="24">x</l:l>
-<l:l i="25">Y</l:l>
-<l:l i="25">y</l:l>
-<l:l i="26">Z</l:l>
-<l:l i="26">z</l:l>
-</l:letters>
-</l:l10n>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/en.xml
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/en.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,1241 +1,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="en" english-language-name="English">
-
-<!-- * This file is generated automatically. -->
-<!-- * To submit changes to this file upstream (to the DocBook Project) -->
-<!-- * do not submit an edited version of this file. Instead, submit an -->
-<!-- * edited version of the source file at the following location: -->
-<!-- * -->
-<!-- *  https://svn.sourceforge.net/svnroot/docbook/trunk/gentext/locale/en.xml -->
-<!-- * -->
-<!-- * E-mail the edited en.xml source file to: -->
-<!-- * -->
-<!-- *  docbook-developers@lists.sourceforge.net -->
-
-<!-- ******************************************************************** -->
-
-<!-- This file is part of the XSL DocBook Stylesheet distribution. -->
-<!-- See ../README or http://docbook.sf.net/release/xsl/current/ for -->
-<!-- copyright and other information. -->
-
-<!-- ******************************************************************** -->
-<!-- In these files, % with a letter is used for a placeholder: -->
-<!--   %t is the current element's title -->
-<!--   %s is the current element's subtitle (if applicable)-->
-<!--   %n is the current element's number label-->
-<!--   %p is the current element's page number (if applicable)-->
-<!-- ******************************************************************** -->
-
-
-<l:gentext key="Abstract" text="Abstract"/>
-<l:gentext key="abstract" text="Abstract"/>
-<l:gentext key="Answer" text="A:"/>
-<l:gentext key="answer" text="A:"/>
-<l:gentext key="Appendix" text="Appendix"/>
-<l:gentext key="appendix" text="Appendix"/>
-<l:gentext key="Article" text="Article"/>
-<l:gentext key="article" text="Article"/>
-<l:gentext key="Author" text="Author"/>
-<l:gentext key="Bibliography" text="Bibliography"/>
-<l:gentext key="bibliography" text="Bibliography"/>
-<l:gentext key="Book" text="Book"/>
-<l:gentext key="book" text="Book"/>
-<l:gentext key="CAUTION" text="CAUTION"/>
-<l:gentext key="Caution" text="Caution"/>
-<l:gentext key="caution" text="Caution"/>
-<l:gentext key="Chapter" text="Chapter"/>
-<l:gentext key="chapter" text="Chapter"/>
-<l:gentext key="Colophon" text="Colophon"/>
-<l:gentext key="colophon" text="Colophon"/>
-<l:gentext key="Copyright" text="Copyright"/>
-<l:gentext key="copyright" text="Copyright"/>
-<l:gentext key="Dedication" text="Dedication"/>
-<l:gentext key="dedication" text="Dedication"/>
-<l:gentext key="Edition" text="Edition"/>
-<l:gentext key="edition" text="Edition"/>
-<l:gentext key="Editor" text="Editor"/>
-<l:gentext key="Equation" text="Equation"/>
-<l:gentext key="equation" text="Equation"/>
-<l:gentext key="Example" text="Example"/>
-<l:gentext key="example" text="Example"/>
-<l:gentext key="Figure" text="Figure"/>
-<l:gentext key="figure" text="Figure"/>
-<l:gentext key="Glossary" text="Glossary"/>
-<l:gentext key="glossary" text="Glossary"/>
-<l:gentext key="GlossSee" text="See"/>
-<l:gentext key="glosssee" text="See"/>
-<l:gentext key="GlossSeeAlso" text="See Also"/>
-<l:gentext key="glossseealso" text="See Also"/>
-<l:gentext key="IMPORTANT" text="IMPORTANT"/>
-<l:gentext key="important" text="Important"/>
-<l:gentext key="Important" text="Important"/>
-<l:gentext key="Index" text="Index"/>
-<l:gentext key="index" text="Index"/>
-<l:gentext key="ISBN" text="ISBN"/>
-<l:gentext key="isbn" text="ISBN"/>
-<l:gentext key="LegalNotice" text="Legal Notice"/>
-<l:gentext key="legalnotice" text="Legal Notice"/>
-<l:gentext key="MsgAud" text="Audience"/>
-<l:gentext key="msgaud" text="Audience"/>
-<l:gentext key="MsgLevel" text="Level"/>
-<l:gentext key="msglevel" text="Level"/>
-<l:gentext key="MsgOrig" text="Origin"/>
-<l:gentext key="msgorig" text="Origin"/>
-<l:gentext key="NOTE" text="NOTE"/>
-<l:gentext key="Note" text="Note"/>
-<l:gentext key="note" text="Note"/>
-<l:gentext key="Part" text="Part"/>
-<l:gentext key="part" text="Part"/>
-<l:gentext key="Preface" text="Preface"/>
-<l:gentext key="preface" text="Preface"/>
-<l:gentext key="Procedure" text="Procedure"/>
-<l:gentext key="procedure" text="Procedure"/>
-<l:gentext key="ProductionSet" text="Production"/>
-<l:gentext key="PubDate" text="Publication Date"/>
-<l:gentext key="pubdate" text="Publication date"/>
-<l:gentext key="Published" text="Published"/>
-<l:gentext key="published" text="Published"/>
-<l:gentext key="Publisher" text="Publisher"/>
-<l:gentext key="Qandadiv" text="Q &amp; A"/>
-<l:gentext key="qandadiv" text="Q &amp; A"/>
-<l:gentext key="QandASet" text="Frequently Asked Questions"/>
-<l:gentext key="Question" text="Q:"/>
-<l:gentext key="question" text="Q:"/>
-<l:gentext key="RefEntry" text=""/>
-<l:gentext key="refentry" text=""/>
-<l:gentext key="Reference" text="Reference"/>
-<l:gentext key="reference" text="Reference"/>
-<l:gentext key="References" text="References"/>
-<l:gentext key="RefName" text="Name"/>
-<l:gentext key="refname" text="Name"/>
-<l:gentext key="RefSection" text=""/>
-<l:gentext key="refsection" text=""/>
-<l:gentext key="RefSynopsisDiv" text="Synopsis"/>
-<l:gentext key="refsynopsisdiv" text="Synopsis"/>
-<l:gentext key="RevHistory" text="Revision History"/>
-<l:gentext key="revhistory" text="Revision History"/>
-<l:gentext key="revision" text="Revision"/>
-<l:gentext key="Revision" text="Revision"/>
-<l:gentext key="sect1" text="Section"/>
-<l:gentext key="sect2" text="Section"/>
-<l:gentext key="sect3" text="Section"/>
-<l:gentext key="sect4" text="Section"/>
-<l:gentext key="sect5" text="Section"/>
-<l:gentext key="section" text="Section"/>
-<l:gentext key="Section" text="Section"/>
-<l:gentext key="see" text="see"/>
-<l:gentext key="See" text="See"/>
-<l:gentext key="seealso" text="see also"/>
-<l:gentext key="Seealso" text="See also"/>
-<l:gentext key="SeeAlso" text="See Also"/>
-<l:gentext key="set" text="Set"/>
-<l:gentext key="Set" text="Set"/>
-<l:gentext key="setindex" text="Set Index"/>
-<l:gentext key="SetIndex" text="Set Index"/>
-<l:gentext key="Sidebar" text=""/>
-<l:gentext key="sidebar" text="sidebar"/>
-<l:gentext key="step" text="step"/>
-<l:gentext key="Step" text="Step"/>
-<l:gentext key="table" text="Table"/>
-<l:gentext key="Table" text="Table"/>
-<l:gentext key="task" text="Task"/>
-<l:gentext key="Task" text="Task"/>
-<l:gentext key="tip" text="Tip"/>
-<l:gentext key="TIP" text="TIP"/>
-<l:gentext key="Tip" text="Tip"/>
-<l:gentext key="Warning" text="Warning"/>
-<l:gentext key="warning" text="Warning"/>
-<l:gentext key="WARNING" text="WARNING"/>
-<l:gentext key="and" text="and"/>
-<l:gentext key="by" text="by"/>
-<l:gentext key="Edited" text="Edited"/>
-<l:gentext key="edited" text="Edited"/>
-<l:gentext key="Editedby" text="Edited by"/>
-<l:gentext key="editedby" text="Edited by"/>
-<l:gentext key="in" text="in"/>
-<l:gentext key="lastlistcomma" text=","/>
-<l:gentext key="listcomma" text=","/>
-<l:gentext key="nonexistantelement" text="non-existant element"/>
-<l:gentext key="notes" text="Notes"/>
-<l:gentext key="Notes" text="Notes"/>
-<l:gentext key="Pgs" text="Pgs."/>
-<l:gentext key="pgs" text="Pgs."/>
-<l:gentext key="Revisedby" text="Revised by: "/>
-<l:gentext key="revisedby" text="Revised by: "/>
-<l:gentext key="TableNotes" text="Notes"/>
-<l:gentext key="tablenotes" text="Notes"/>
-<l:gentext key="TableofContents" text="Table of Contents"/>
-<l:gentext key="tableofcontents" text="Table of Contents"/>
-<l:gentext key="unexpectedelementname" text="Unexpected element name"/>
-<l:gentext key="unsupported" text="unsupported"/>
-<l:gentext key="xrefto" text="xref to"/>
-<l:gentext key="Authors" text="Authors"/>
-<l:gentext key="copyeditor" text="Copy Editor"/>
-<l:gentext key="graphicdesigner" text="Graphic Designer"/>
-<l:gentext key="productioneditor" text="Production Editor"/>
-<l:gentext key="technicaleditor" text="Technical Editor"/>
-<l:gentext key="translator" text="Translator"/>
-<l:gentext key="listofequations" text="List of Equations"/>
-<l:gentext key="ListofEquations" text="List of Equations"/>
-<l:gentext key="ListofExamples" text="List of Examples"/>
-<l:gentext key="listofexamples" text="List of Examples"/>
-<l:gentext key="ListofFigures" text="List of Figures"/>
-<l:gentext key="listoffigures" text="List of Figures"/>
-<l:gentext key="ListofProcedures" text="List of Procedures"/>
-<l:gentext key="listofprocedures" text="List of Procedures"/>
-<l:gentext key="listoftables" text="List of Tables"/>
-<l:gentext key="ListofTables" text="List of Tables"/>
-<l:gentext key="ListofUnknown" text="List of Unknown"/>
-<l:gentext key="listofunknown" text="List of Unknown"/>
-<l:gentext key="nav-home" text="Home"/>
-<l:gentext key="nav-next" text="Next"/>
-<l:gentext key="nav-next-sibling" text="Fast Forward"/>
-<l:gentext key="nav-prev" text="Prev"/>
-<l:gentext key="nav-prev-sibling" text="Fast Backward"/>
-<l:gentext key="nav-up" text="Up"/>
-<l:gentext key="nav-toc" text="ToC"/>
-<l:gentext key="Draft" text="Draft"/>
-<l:gentext key="above" text="above"/>
-<l:gentext key="below" text="below"/>
-<l:gentext key="sectioncalled" text="the section called"/>
-<l:gentext key="index symbols" text="Symbols"/>
-<l:gentext key="lowercase.alpha" text="abcdefghijklmnopqrstuvwxyz"/>
-<l:gentext key="uppercase.alpha" text="ABCDEFGHIJKLMNOPQRSTUVWXYZ"/>
-<l:gentext key="normalize.sort.input" text="AaÃÃ ÃÃ¡ÃÃ¢ÃÃ£ÃÃ€Ã
-Ã¥ÄÄÄÄÄÄ
-ÇÇÇÇÇ Ç¡ÇºÇ»ÈÈÈÈÈŠÈ§ážážáºáº áº¡áº¢áº£áº€áº¥áºŠáº§áºšáº©áºªáº«áº¬áº­áº®áº¯áº°áº±áº²áº³áºŽáºµáº¶áº·BbÆÆÉÆÆážážážáž
-ážážCcÃÃ§ÄÄÄÄÄÄÄÄÆÆÉážážDdÄÄÄÄÆÉÆÆÇ
-Ç²È¡ÉážážážážážážážážážážEeÃÃšÃÃ©ÃÃªÃÃ«ÄÄÄÄÄÄÄÄÄÄÈÈ
-ÈÈÈšÈ©ážážážážážážážážážážáºžáº¹áººáº»áºŒáºœáºŸáº¿á»á»á»á»á»á»
-á»á»FfÆÆážážGgÄÄÄÄÄ Ä¡Ä¢Ä£ÆÉ Ç€Ç¥ÇŠÇ§ÇŽÇµáž áž¡HhÄ€Ä¥ÄŠÄ§ÈÈÉŠáž¢áž£áž€áž¥ážŠáž§ážšáž©ážªáž«áºIiÃÃ¬ÃÃ­ÃÃ®ÃÃ¯ÄšÄ©ÄªÄ«Ä¬Ä­Ä®Ä¯Ä°ÆÉšÇÇÈÈÈÈáž¬áž­áž®áž¯á»á»á»á»JjÄŽÄµÇ°ÊKkÄ¶Ä·ÆÆÇšÇ©áž°áž±áž²áž³ážŽážµLlÄ¹ÄºÄ»ÄŒÄœÄŸÄ¿ÅÅÅÆÇÈŽÉ«É¬É­áž¶áž·ážžáž¹ážºáž»ážŒážœMmÉ±ážŸáž¿á¹á¹á¹á¹NnÃÃ±ÅÅÅ
-ÅÅÅÆÉ²ÆÈ ÇÇžÇ¹ÈµÉ³á¹á¹
-á¹á¹á¹á¹á¹á¹OoÃÃ²ÃÃ³ÃÃŽÃÃµÃÃ¶ÃÃžÅÅÅÅÅÅÆÆ Æ¡ÇÇÇªÇ«Ç¬Ç­ÇŸÇ¿ÈÈÈÈÈªÈ«È¬È­È®È¯È°È±á¹á¹á¹á¹á¹á¹á¹á¹á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á» á»¡á»¢á»£PpÆ€Æ¥á¹á¹á¹á¹QqÊ RrÅÅÅÅÅÅÈÈÈÈÉŒÉœÉŸá¹á¹á¹á¹á¹á¹á¹á¹SsÅÅÅÅÅÅÅ Å¡ÈÈÊá¹ á¹¡á¹¢á¹£á¹€á¹¥á¹Šá¹§á¹šá¹©TtÅ¢Å£Å€Å¥ÅŠÅ§Æ«Æ¬Æ­Æ®ÊÈÈÈ¶á¹ªá¹«á¹¬á¹­á¹®á¹¯á¹°á¹±áºUuÃÃ¹ÃÃºÃÃ»ÃÃŒÅšÅ©ÅªÅ«Å¬Å­Å®Å¯Å°Å±Å²Å³Æ¯Æ°ÇÇÇÇÇÇÇÇÇÇÈÈÈÈá¹²á¹³á¹Žá¹µá¹¶á¹·á¹žá¹¹á¹ºá¹»á»€á»¥á»Šá»§á»šá»©á»ªá»«á»¬á»­á»®á»¯á»°á»±VvÆ²Êá¹Œá¹œá¹Ÿá¹¿WwÅŽÅµáºáºáºáºáºáº
-áºáºáºáºáºXxáºáºáºáºYyÃÃœÃ¿ÅžÅ¶Å·Æ³ÆŽÈ²È³áºáºáºá»²á»³á»Žá»µá»¶á»·á»žá»¹ZzÅ¹ÅºÅ»ÅŒÅœÅŸÆµÆ¶È€È¥ÊÊáºáºáºáºáºáºáº"/>
-<l:gentext key="normalize.sort.output" text="AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ"/>
-<l:dingbat key="startquote" text="â"/>
-<l:dingbat key="endquote" text="â"/>
-<l:dingbat key="nestedstartquote" text="â"/>
-<l:dingbat key="nestedendquote" text="â"/>
-<l:dingbat key="singlestartquote" text="â"/>
-<l:dingbat key="singleendquote" text="â"/>
-<l:dingbat key="bullet" text="â¢"/>
-<l:gentext key="hyphenation-character" text="-"/>
-<l:gentext key="hyphenation-push-character-count" text="2"/>
-<l:gentext key="hyphenation-remain-character-count" text="2"/>
-<l:context name="styles"><l:template name="person-name" text="first-last"/>
-</l:context>
-<l:context name="title"><l:template name="abstract" text="%t"/>
-<l:template name="answer" text="%t"/>
-<l:template name="appendix" text="AppendixÂ %n.Â %t"/>
-<l:template name="article" text="%t"/>
-<l:template name="authorblurb" text="%t"/>
-<l:template name="bibliodiv" text="%t"/>
-<l:template name="biblioentry" text="%t"/>
-<l:template name="bibliography" text="%t"/>
-<l:template name="bibliolist" text="%t"/>
-<l:template name="bibliomixed" text="%t"/>
-<l:template name="bibliomset" text="%t"/>
-<l:template name="biblioset" text="%t"/>
-<l:template name="blockquote" text="%t"/>
-<l:template name="book" text="%t"/>
-<l:template name="calloutlist" text="%t"/>
-<l:template name="caution" text="%t"/>
-<l:template name="chapter" text="ChapterÂ %n.Â %t"/>
-<l:template name="colophon" text="%t"/>
-<l:template name="dedication" text="%t"/>
-<l:template name="equation" text="EquationÂ %n.Â %t"/>
-<l:template name="example" text="ExampleÂ %n.Â %t"/>
-<l:template name="figure" text="FigureÂ %n.Â %t"/>
-<l:template name="foil" text="%t"/>
-<l:template name="foilgroup" text="%t"/>
-<l:template name="formalpara" text="%t"/>
-<l:template name="glossary" text="%t"/>
-<l:template name="glossdiv" text="%t"/>
-<l:template name="glosslist" text="%t"/>
-<l:template name="glossentry" text="%t"/>
-<l:template name="important" text="%t"/>
-<l:template name="index" text="%t"/>
-<l:template name="indexdiv" text="%t"/>
-<l:template name="itemizedlist" text="%t"/>
-<l:template name="legalnotice" text="%t"/>
-<l:template name="listitem" text=""/>
-<l:template name="lot" text="%t"/>
-<l:template name="msg" text="%t"/>
-<l:template name="msgexplan" text="%t"/>
-<l:template name="msgmain" text="%t"/>
-<l:template name="msgrel" text="%t"/>
-<l:template name="msgset" text="%t"/>
-<l:template name="msgsub" text="%t"/>
-<l:template name="note" text="%t"/>
-<l:template name="orderedlist" text="%t"/>
-<l:template name="part" text="PartÂ %n.Â %t"/>
-<l:template name="partintro" text="%t"/>
-<l:template name="preface" text="%t"/>
-<l:template name="procedure" text="%t"/>
-<l:template name="procedure.formal" text="ProcedureÂ %n.Â %t"/>
-<l:template name="productionset" text="%t"/>
-<l:template name="productionset.formal" text="ProductionÂ %n"/>
-<l:template name="qandadiv" text="%t"/>
-<l:template name="qandaentry" text="%t"/>
-<l:template name="qandaset" text="%t"/>
-<l:template name="question" text="%t"/>
-<l:template name="refentry" text="%t"/>
-<l:template name="reference" text="%t"/>
-<l:template name="refsection" text="%t"/>
-<l:template name="refsect1" text="%t"/>
-<l:template name="refsect2" text="%t"/>
-<l:template name="refsect3" text="%t"/>
-<l:template name="refsynopsisdiv" text="%t"/>
-<l:template name="refsynopsisdivinfo" text="%t"/>
-<l:template name="segmentedlist" text="%t"/>
-<l:template name="set" text="%t"/>
-<l:template name="setindex" text="%t"/>
-<l:template name="sidebar" text="%t"/>
-<l:template name="step" text="%t"/>
-<l:template name="table" text="TableÂ %n.Â %t"/>
-<l:template name="task" text="%t"/>
-<l:template name="tasksummary" text="%t"/>
-<l:template name="taskprerequisites" text="%t"/>
-<l:template name="taskrelated" text="%t"/>
-<l:template name="tip" text="%t"/>
-<l:template name="toc" text="%t"/>
-<l:template name="variablelist" text="%t"/>
-<l:template name="varlistentry" text=""/>
-<l:template name="warning" text="%t"/>
-</l:context>
-<l:context name="title-unnumbered"><l:template name="appendix" text="%t"/>
-<l:template name="article/appendix" text="%t"/>
-<l:template name="bridgehead" text="%t"/>
-<l:template name="chapter" text="%t"/>
-<l:template name="sect1" text="%t"/>
-<l:template name="sect2" text="%t"/>
-<l:template name="sect3" text="%t"/>
-<l:template name="sect4" text="%t"/>
-<l:template name="sect5" text="%t"/>
-<l:template name="section" text="%t"/>
-<l:template name="simplesect" text="%t"/>
-<l:template name="part" text="%t"/>
-</l:context>
-<l:context name="title-numbered"><l:template name="appendix" text="AppendixÂ %n.Â %t"/>
-<l:template name="article/appendix" text="%n.Â %t"/>
-<l:template name="bridgehead" text="%n.Â %t"/>
-<l:template name="chapter" text="ChapterÂ %n.Â %t"/>
-<l:template name="part" text="PartÂ %n.Â %t"/>
-<l:template name="sect1" text="%n.Â %t"/>
-<l:template name="sect2" text="%n.Â %t"/>
-<l:template name="sect3" text="%n.Â %t"/>
-<l:template name="sect4" text="%n.Â %t"/>
-<l:template name="sect5" text="%n.Â %t"/>
-<l:template name="section" text="%n.Â %t"/>
-<l:template name="simplesect" text="%t"/>
-</l:context>
-<l:context name="subtitle"><l:template name="appendix" text="%s"/>
-<l:template name="article" text="%s"/>
-<l:template name="bibliodiv" text="%s"/>
-<l:template name="biblioentry" text="%s"/>
-<l:template name="bibliography" text="%s"/>
-<l:template name="bibliomixed" text="%s"/>
-<l:template name="bibliomset" text="%s"/>
-<l:template name="biblioset" text="%s"/>
-<l:template name="book" text="%s"/>
-<l:template name="chapter" text="%s"/>
-<l:template name="colophon" text="%s"/>
-<l:template name="dedication" text="%s"/>
-<l:template name="glossary" text="%s"/>
-<l:template name="glossdiv" text="%s"/>
-<l:template name="index" text="%s"/>
-<l:template name="indexdiv" text="%s"/>
-<l:template name="lot" text="%s"/>
-<l:template name="part" text="%s"/>
-<l:template name="partintro" text="%s"/>
-<l:template name="preface" text="%s"/>
-<l:template name="refentry" text="%s"/>
-<l:template name="reference" text="%s"/>
-<l:template name="refsection" text="%s"/>
-<l:template name="refsect1" text="%s"/>
-<l:template name="refsect2" text="%s"/>
-<l:template name="refsect3" text="%s"/>
-<l:template name="refsynopsisdiv" text="%s"/>
-<l:template name="sect1" text="%s"/>
-<l:template name="sect2" text="%s"/>
-<l:template name="sect3" text="%s"/>
-<l:template name="sect4" text="%s"/>
-<l:template name="sect5" text="%s"/>
-<l:template name="section" text="%s"/>
-<l:template name="set" text="%s"/>
-<l:template name="setindex" text="%s"/>
-<l:template name="sidebar" text="%s"/>
-<l:template name="simplesect" text="%s"/>
-<l:template name="toc" text="%s"/>
-</l:context>
-<l:context name="xref"><l:template name="abstract" text="%t"/>
-<l:template name="answer" text="A:Â %n"/>
-<l:template name="appendix" text="%t"/>
-<l:template name="article" text="%t"/>
-<l:template name="authorblurb" text="%t"/>
-<l:template name="bibliodiv" text="%t"/>
-<l:template name="bibliography" text="%t"/>
-<l:template name="bibliomset" text="%t"/>
-<l:template name="biblioset" text="%t"/>
-<l:template name="blockquote" text="%t"/>
-<l:template name="book" text="%t"/>
-<l:template name="calloutlist" text="%t"/>
-<l:template name="caution" text="%t"/>
-<l:template name="chapter" text="%t"/>
-<l:template name="colophon" text="%t"/>
-<l:template name="constraintdef" text="%t"/>
-<l:template name="dedication" text="%t"/>
-<l:template name="equation" text="%t"/>
-<l:template name="example" text="%t"/>
-<l:template name="figure" text="%t"/>
-<l:template name="foil" text="%t"/>
-<l:template name="foilgroup" text="%t"/>
-<l:template name="formalpara" text="%t"/>
-<l:template name="glossary" text="%t"/>
-<l:template name="glossdiv" text="%t"/>
-<l:template name="important" text="%t"/>
-<l:template name="index" text="%t"/>
-<l:template name="indexdiv" text="%t"/>
-<l:template name="itemizedlist" text="%t"/>
-<l:template name="legalnotice" text="%t"/>
-<l:template name="listitem" text="%n"/>
-<l:template name="lot" text="%t"/>
-<l:template name="msg" text="%t"/>
-<l:template name="msgexplan" text="%t"/>
-<l:template name="msgmain" text="%t"/>
-<l:template name="msgrel" text="%t"/>
-<l:template name="msgset" text="%t"/>
-<l:template name="msgsub" text="%t"/>
-<l:template name="note" text="%t"/>
-<l:template name="orderedlist" text="%t"/>
-<l:template name="part" text="%t"/>
-<l:template name="partintro" text="%t"/>
-<l:template name="preface" text="%t"/>
-<l:template name="procedure" text="%t"/>
-<l:template name="productionset" text="%t"/>
-<l:template name="qandadiv" text="%t"/>
-<l:template name="qandaentry" text="Q:Â %n"/>
-<l:template name="qandaset" text="%t"/>
-<l:template name="question" text="Q:Â %n"/>
-<l:template name="reference" text="%t"/>
-<l:template name="refsynopsisdiv" text="%t"/>
-<l:template name="segmentedlist" text="%t"/>
-<l:template name="set" text="%t"/>
-<l:template name="setindex" text="%t"/>
-<l:template name="sidebar" text="%t"/>
-<l:template name="table" text="%t"/>
-<l:template name="task" text="%t"/>
-<l:template name="tip" text="%t"/>
-<l:template name="toc" text="%t"/>
-<l:template name="variablelist" text="%t"/>
-<l:template name="varlistentry" text="%n"/>
-<l:template name="warning" text="%t"/>
-<l:template name="olink.document.citation" text=" in %o"/>
-<l:template name="olink.page.citation" text=" (page %p)"/>
-<l:template name="page.citation" text=" [%p]"/>
-<l:template name="page" text="(page %p)"/>
-<l:template name="docname" text=" in %o"/>
-<l:template name="docnamelong" text=" in the document titled %o"/>
-<l:template name="pageabbrev" text="(p. %p)"/>
-<l:template name="Page" text="Page %p"/>
-<l:template name="bridgehead" text="the section called â%tâ"/>
-<l:template name="refsection" text="the section called â%tâ"/>
-<l:template name="refsect1" text="the section called â%tâ"/>
-<l:template name="refsect2" text="the section called â%tâ"/>
-<l:template name="refsect3" text="the section called â%tâ"/>
-<l:template name="sect1" text="the section called â%tâ"/>
-<l:template name="sect2" text="the section called â%tâ"/>
-<l:template name="sect3" text="the section called â%tâ"/>
-<l:template name="sect4" text="the section called â%tâ"/>
-<l:template name="sect5" text="the section called â%tâ"/>
-<l:template name="section" text="the section called â%tâ"/>
-<l:template name="simplesect" text="the section called â%tâ"/>
-</l:context>
-<l:context name="xref-number"><l:template name="answer" text="A:Â %n"/>
-<l:template name="appendix" text="AppendixÂ %n"/>
-<l:template name="bridgehead" text="SectionÂ %n"/>
-<l:template name="chapter" text="ChapterÂ %n"/>
-<l:template name="equation" text="EquationÂ %n"/>
-<l:template name="example" text="ExampleÂ %n"/>
-<l:template name="figure" text="FigureÂ %n"/>
-<l:template name="part" text="PartÂ %n"/>
-<l:template name="procedure" text="ProcedureÂ %n"/>
-<l:template name="productionset" text="ProductionÂ %n"/>
-<l:template name="qandadiv" text="Q &amp; AÂ %n"/>
-<l:template name="qandaentry" text="Q:Â %n"/>
-<l:template name="question" text="Q:Â %n"/>
-<l:template name="sect1" text="SectionÂ %n"/>
-<l:template name="sect2" text="SectionÂ %n"/>
-<l:template name="sect3" text="SectionÂ %n"/>
-<l:template name="sect4" text="SectionÂ %n"/>
-<l:template name="sect5" text="SectionÂ %n"/>
-<l:template name="section" text="SectionÂ %n"/>
-<l:template name="table" text="TableÂ %n"/>
-</l:context>
-<l:context name="xref-number-and-title"><l:template name="appendix" text="AppendixÂ %n, %t"/>
-<l:template name="bridgehead" text="SectionÂ %n, â%tâ"/>
-<l:template name="chapter" text="ChapterÂ %n, %t"/>
-<l:template name="equation" text="EquationÂ %n, â%tâ"/>
-<l:template name="example" text="ExampleÂ %n, â%tâ"/>
-<l:template name="figure" text="FigureÂ %n, â%tâ"/>
-<l:template name="part" text="PartÂ %n, â%tâ"/>
-<l:template name="procedure" text="ProcedureÂ %n, â%tâ"/>
-<l:template name="productionset" text="ProductionÂ %n, â%tâ"/>
-<l:template name="qandadiv" text="Q &amp; AÂ %n, â%tâ"/>
-<l:template name="refsect1" text="the section called â%tâ"/>
-<l:template name="refsect2" text="the section called â%tâ"/>
-<l:template name="refsect3" text="the section called â%tâ"/>
-<l:template name="refsection" text="the section called â%tâ"/>
-<l:template name="sect1" text="SectionÂ %n, â%tâ"/>
-<l:template name="sect2" text="SectionÂ %n, â%tâ"/>
-<l:template name="sect3" text="SectionÂ %n, â%tâ"/>
-<l:template name="sect4" text="SectionÂ %n, â%tâ"/>
-<l:template name="sect5" text="SectionÂ %n, â%tâ"/>
-<l:template name="section" text="SectionÂ %n, â%tâ"/>
-<l:template name="simplesect" text="the section called â%tâ"/>
-<l:template name="table" text="TableÂ %n, â%tâ"/>
-</l:context>
-<l:context name="authorgroup"><l:template name="sep" text=", "/>
-<l:template name="sep2" text=" and "/>
-<l:template name="seplast" text=", and "/>
-</l:context>
-<l:context name="glossary"><l:template name="see" text="See %t"/>
-<l:template name="seealso" text="See Also %t"/>
-</l:context>
-<l:context name="msgset"><l:template name="MsgAud" text="Audience: "/>
-<l:template name="MsgLevel" text="Level: "/>
-<l:template name="MsgOrig" text="Origin: "/>
-</l:context>
-<l:context name="datetime"><l:template name="format" text="m/d/Y"/>
-</l:context>
-<l:context name="termdef"><l:template name="prefix" text="[Definition: "/>
-<l:template name="suffix" text="]"/>
-</l:context>
-<l:context name="datetime-full"><l:template name="January" text="January"/>
-<l:template name="February" text="February"/>
-<l:template name="March" text="March"/>
-<l:template name="April" text="April"/>
-<l:template name="May" text="May"/>
-<l:template name="June" text="June"/>
-<l:template name="July" text="July"/>
-<l:template name="August" text="August"/>
-<l:template name="September" text="September"/>
-<l:template name="October" text="October"/>
-<l:template name="November" text="November"/>
-<l:template name="December" text="December"/>
-<l:template name="Monday" text="Monday"/>
-<l:template name="Tuesday" text="Tuesday"/>
-<l:template name="Wednesday" text="Wednesday"/>
-<l:template name="Thursday" text="Thursday"/>
-<l:template name="Friday" text="Friday"/>
-<l:template name="Saturday" text="Saturday"/>
-<l:template name="Sunday" text="Sunday"/>
-</l:context>
-<l:context name="datetime-abbrev"><l:template name="Jan" text="Jan"/>
-<l:template name="Feb" text="Feb"/>
-<l:template name="Mar" text="Mar"/>
-<l:template name="Apr" text="Apr"/>
-<l:template name="May" text="May"/>
-<l:template name="Jun" text="Jun"/>
-<l:template name="Jul" text="Jul"/>
-<l:template name="Aug" text="Aug"/>
-<l:template name="Sep" text="Sep"/>
-<l:template name="Oct" text="Oct"/>
-<l:template name="Nov" text="Nov"/>
-<l:template name="Dec" text="Dec"/>
-<l:template name="Mon" text="Mon"/>
-<l:template name="Tue" text="Tue"/>
-<l:template name="Wed" text="Wed"/>
-<l:template name="Thu" text="Thu"/>
-<l:template name="Fri" text="Fri"/>
-<l:template name="Sat" text="Sat"/>
-<l:template name="Sun" text="Sun"/>
-</l:context>
-<l:context name="htmlhelp"><l:template name="langcode" text="0x0409 English (UNITED STATES)"/>
-</l:context>
-<l:context name="index"><l:template name="term-separator" text=", "/>
-<l:template name="number-separator" text=", "/>
-<l:template name="range-separator" text="-"/>
-</l:context>
-<l:context name="iso690"><l:template name="lastfirst.sep" text=", "/>
-<l:template name="alt.person.two.sep" text=" â "/>
-<l:template name="alt.person.last.sep" text=" â "/>
-<l:template name="alt.person.more.sep" text=" â "/>
-<l:template name="primary.editor" text=" (ed.)"/>
-<l:template name="primary.many" text=", et al."/>
-<l:template name="primary.sep" text=". "/>
-<l:template name="submaintitle.sep" text=": "/>
-<l:template name="title.sep" text=". "/>
-<l:template name="othertitle.sep" text=", "/>
-<l:template name="medium1" text=" ["/>
-<l:template name="medium2" text="]"/>
-<l:template name="secondary.person.sep" text="; "/>
-<l:template name="secondary.sep" text=". "/>
-<l:template name="respons.sep" text=". "/>
-<l:template name="edition.sep" text=". "/>
-<l:template name="edition.serial.sep" text=", "/>
-<l:template name="issuing.range" text="-"/>
-<l:template name="issuing.div" text=", "/>
-<l:template name="issuing.sep" text=". "/>
-<l:template name="partnr.sep" text=". "/>
-<l:template name="placepubl.sep" text=": "/>
-<l:template name="publyear.sep" text=", "/>
-<l:template name="pubinfo.sep" text=". "/>
-<l:template name="spec.pubinfo.sep" text=", "/>
-<l:template name="upd.sep" text=", "/>
-<l:template name="datecit1" text=" [cited "/>
-<l:template name="datecit2" text="]"/>
-<l:template name="extent.sep" text=". "/>
-<l:template name="locs.sep" text=", "/>
-<l:template name="location.sep" text=". "/>
-<l:template name="serie.sep" text=". "/>
-<l:template name="notice.sep" text=". "/>
-<l:template name="access" text="Available "/>
-<l:template name="acctoo" text="Also available "/>
-<l:template name="onwww" text="from World Wide Web"/>
-<l:template name="oninet" text="from Internet"/>
-<l:template name="access.end" text=": "/>
-<l:template name="link1" text="&lt;"/>
-<l:template name="link2" text="&gt;"/>
-<l:template name="access.sep" text=". "/>
-<l:template name="isbn" text="ISBN "/>
-<l:template name="issn" text="ISSN "/>
-<l:template name="stdnum.sep" text=". "/>
-<l:template name="patcountry.sep" text=". "/>
-<l:template name="pattype.sep" text=", "/>
-<l:template name="patnum.sep" text=". "/>
-<l:template name="patdate.sep" text=". "/>
-</l:context><l:letters><l:l i="-1"/>
-<l:l i="0">Symbols</l:l>
-<l:l i="10">A</l:l>
-<l:l i="10">a</l:l>
-<l:l i="10">Ã</l:l>
-<l:l i="10">Ã </l:l>
-<l:l i="10">Ã</l:l>
-<l:l i="10">Ã¡</l:l>
-<l:l i="10">Ã</l:l>
-<l:l i="10">Ã¢</l:l>
-<l:l i="10">Ã</l:l>
-<l:l i="10">Ã£</l:l>
-<l:l i="10">Ã</l:l>
-<l:l i="10">Ã€</l:l>
-<l:l i="10">Ã
-</l:l>
-<l:l i="10">Ã¥</l:l>
-<l:l i="10">Ä</l:l>
-<l:l i="10">Ä</l:l>
-<l:l i="10">Ä</l:l>
-<l:l i="10">Ä</l:l>
-<l:l i="10">Ä</l:l>
-<l:l i="10">Ä
-</l:l>
-<l:l i="10">Ç</l:l>
-<l:l i="10">Ç</l:l>
-<l:l i="10">Ç</l:l>
-<l:l i="10">Ç</l:l>
-<l:l i="10">Ç </l:l>
-<l:l i="10">Ç¡</l:l>
-<l:l i="10">Çº</l:l>
-<l:l i="10">Ç»</l:l>
-<l:l i="10">È</l:l>
-<l:l i="10">È</l:l>
-<l:l i="10">È</l:l>
-<l:l i="10">È</l:l>
-<l:l i="10">ÈŠ</l:l>
-<l:l i="10">È§</l:l>
-<l:l i="10">áž</l:l>
-<l:l i="10">áž</l:l>
-<l:l i="10">áº</l:l>
-<l:l i="10">áº </l:l>
-<l:l i="10">áº¡</l:l>
-<l:l i="10">áº¢</l:l>
-<l:l i="10">áº£</l:l>
-<l:l i="10">áº€</l:l>
-<l:l i="10">áº¥</l:l>
-<l:l i="10">áºŠ</l:l>
-<l:l i="10">áº§</l:l>
-<l:l i="10">áºš</l:l>
-<l:l i="10">áº©</l:l>
-<l:l i="10">áºª</l:l>
-<l:l i="10">áº«</l:l>
-<l:l i="10">áº¬</l:l>
-<l:l i="10">áº­</l:l>
-<l:l i="10">áº®</l:l>
-<l:l i="10">áº¯</l:l>
-<l:l i="10">áº°</l:l>
-<l:l i="10">áº±</l:l>
-<l:l i="10">áº²</l:l>
-<l:l i="10">áº³</l:l>
-<l:l i="10">áºŽ</l:l>
-<l:l i="10">áºµ</l:l>
-<l:l i="10">áº¶</l:l>
-<l:l i="10">áº·</l:l>
-<l:l i="20">B</l:l>
-<l:l i="20">b</l:l>
-<l:l i="20">Æ</l:l>
-<l:l i="20">Æ</l:l>
-<l:l i="20">É</l:l>
-<l:l i="20">Æ</l:l>
-<l:l i="20">Æ</l:l>
-<l:l i="20">áž</l:l>
-<l:l i="20">áž</l:l>
-<l:l i="20">áž</l:l>
-<l:l i="20">áž
-</l:l>
-<l:l i="20">áž</l:l>
-<l:l i="20">áž</l:l>
-<l:l i="30">C</l:l>
-<l:l i="30">c</l:l>
-<l:l i="30">Ã</l:l>
-<l:l i="30">Ã§</l:l>
-<l:l i="30">Ä</l:l>
-<l:l i="30">Ä</l:l>
-<l:l i="30">Ä</l:l>
-<l:l i="30">Ä</l:l>
-<l:l i="30">Ä</l:l>
-<l:l i="30">Ä</l:l>
-<l:l i="30">Ä</l:l>
-<l:l i="30">Ä</l:l>
-<l:l i="30">Æ</l:l>
-<l:l i="30">Æ</l:l>
-<l:l i="30">É</l:l>
-<l:l i="30">áž</l:l>
-<l:l i="30">áž</l:l>
-<l:l i="40">D</l:l>
-<l:l i="40">d</l:l>
-<l:l i="40">Ä</l:l>
-<l:l i="40">Ä</l:l>
-<l:l i="40">Ä</l:l>
-<l:l i="40">Ä</l:l>
-<l:l i="40">Æ</l:l>
-<l:l i="40">É</l:l>
-<l:l i="40">Æ</l:l>
-<l:l i="40">Æ</l:l>
-<l:l i="40">Ç
-</l:l>
-<l:l i="40">Ç²</l:l>
-<l:l i="40">È¡</l:l>
-<l:l i="40">É</l:l>
-<l:l i="40">áž</l:l>
-<l:l i="40">áž</l:l>
-<l:l i="40">áž</l:l>
-<l:l i="40">áž</l:l>
-<l:l i="40">áž</l:l>
-<l:l i="40">áž</l:l>
-<l:l i="40">áž</l:l>
-<l:l i="40">áž</l:l>
-<l:l i="40">áž</l:l>
-<l:l i="40">áž</l:l>
-<l:l i="50">E</l:l>
-<l:l i="50">e</l:l>
-<l:l i="50">Ã</l:l>
-<l:l i="50">Ãš</l:l>
-<l:l i="50">Ã</l:l>
-<l:l i="50">Ã©</l:l>
-<l:l i="50">Ã</l:l>
-<l:l i="50">Ãª</l:l>
-<l:l i="50">Ã</l:l>
-<l:l i="50">Ã«</l:l>
-<l:l i="50">Ä</l:l>
-<l:l i="50">Ä</l:l>
-<l:l i="50">Ä</l:l>
-<l:l i="50">Ä</l:l>
-<l:l i="50">Ä</l:l>
-<l:l i="50">Ä</l:l>
-<l:l i="50">Ä</l:l>
-<l:l i="50">Ä</l:l>
-<l:l i="50">Ä</l:l>
-<l:l i="50">Ä</l:l>
-<l:l i="50">È</l:l>
-<l:l i="50">È
-</l:l>
-<l:l i="50">È</l:l>
-<l:l i="50">È</l:l>
-<l:l i="50">Èš</l:l>
-<l:l i="50">È©</l:l>
-<l:l i="50">áž</l:l>
-<l:l i="50">áž</l:l>
-<l:l i="50">áž</l:l>
-<l:l i="50">áž</l:l>
-<l:l i="50">áž</l:l>
-<l:l i="50">áž</l:l>
-<l:l i="50">áž</l:l>
-<l:l i="50">áž</l:l>
-<l:l i="50">áž</l:l>
-<l:l i="50">áž</l:l>
-<l:l i="50">áºž</l:l>
-<l:l i="50">áº¹</l:l>
-<l:l i="50">áºº</l:l>
-<l:l i="50">áº»</l:l>
-<l:l i="50">áºŒ</l:l>
-<l:l i="50">áºœ</l:l>
-<l:l i="50">áºŸ</l:l>
-<l:l i="50">áº¿</l:l>
-<l:l i="50">á»</l:l>
-<l:l i="50">á»</l:l>
-<l:l i="50">á»</l:l>
-<l:l i="50">á»</l:l>
-<l:l i="50">á»</l:l>
-<l:l i="50">á»
-</l:l>
-<l:l i="50">á»</l:l>
-<l:l i="50">á»</l:l>
-<l:l i="60">F</l:l>
-<l:l i="60">f</l:l>
-<l:l i="60">Æ</l:l>
-<l:l i="60">Æ</l:l>
-<l:l i="60">áž</l:l>
-<l:l i="60">áž</l:l>
-<l:l i="70">G</l:l>
-<l:l i="70">g</l:l>
-<l:l i="70">Ä</l:l>
-<l:l i="70">Ä</l:l>
-<l:l i="70">Ä</l:l>
-<l:l i="70">Ä</l:l>
-<l:l i="70">Ä </l:l>
-<l:l i="70">Ä¡</l:l>
-<l:l i="70">Ä¢</l:l>
-<l:l i="70">Ä£</l:l>
-<l:l i="70">Æ</l:l>
-<l:l i="70">É </l:l>
-<l:l i="70">Ç€</l:l>
-<l:l i="70">Ç¥</l:l>
-<l:l i="70">ÇŠ</l:l>
-<l:l i="70">Ç§</l:l>
-<l:l i="70">ÇŽ</l:l>
-<l:l i="70">Çµ</l:l>
-<l:l i="70">áž </l:l>
-<l:l i="70">áž¡</l:l>
-<l:l i="80">H</l:l>
-<l:l i="80">h</l:l>
-<l:l i="80">Ä€</l:l>
-<l:l i="80">Ä¥</l:l>
-<l:l i="80">ÄŠ</l:l>
-<l:l i="80">Ä§</l:l>
-<l:l i="80">È</l:l>
-<l:l i="80">È</l:l>
-<l:l i="80">ÉŠ</l:l>
-<l:l i="80">áž¢</l:l>
-<l:l i="80">áž£</l:l>
-<l:l i="80">áž€</l:l>
-<l:l i="80">áž¥</l:l>
-<l:l i="80">ážŠ</l:l>
-<l:l i="80">áž§</l:l>
-<l:l i="80">ážš</l:l>
-<l:l i="80">áž©</l:l>
-<l:l i="80">ážª</l:l>
-<l:l i="80">áž«</l:l>
-<l:l i="80">áº</l:l>
-<l:l i="90">I</l:l>
-<l:l i="90">i</l:l>
-<l:l i="90">Ã</l:l>
-<l:l i="90">Ã¬</l:l>
-<l:l i="90">Ã</l:l>
-<l:l i="90">Ã­</l:l>
-<l:l i="90">Ã</l:l>
-<l:l i="90">Ã®</l:l>
-<l:l i="90">Ã</l:l>
-<l:l i="90">Ã¯</l:l>
-<l:l i="90">Äš</l:l>
-<l:l i="90">Ä©</l:l>
-<l:l i="90">Äª</l:l>
-<l:l i="90">Ä«</l:l>
-<l:l i="90">Ä¬</l:l>
-<l:l i="90">Ä­</l:l>
-<l:l i="90">Ä®</l:l>
-<l:l i="90">Ä¯</l:l>
-<l:l i="90">Ä°</l:l>
-<l:l i="90">Æ</l:l>
-<l:l i="90">Éš</l:l>
-<l:l i="90">Ç</l:l>
-<l:l i="90">Ç</l:l>
-<l:l i="90">È</l:l>
-<l:l i="90">È</l:l>
-<l:l i="90">È</l:l>
-<l:l i="90">È</l:l>
-<l:l i="90">áž¬</l:l>
-<l:l i="90">áž­</l:l>
-<l:l i="90">áž®</l:l>
-<l:l i="90">áž¯</l:l>
-<l:l i="90">á»</l:l>
-<l:l i="90">á»</l:l>
-<l:l i="90">á»</l:l>
-<l:l i="90">á»</l:l>
-<l:l i="100">J</l:l>
-<l:l i="100">j</l:l>
-<l:l i="100">ÄŽ</l:l>
-<l:l i="100">Äµ</l:l>
-<l:l i="100">Ç°</l:l>
-<l:l i="100">Ê</l:l>
-<l:l i="110">K</l:l>
-<l:l i="110">k</l:l>
-<l:l i="110">Ä¶</l:l>
-<l:l i="110">Ä·</l:l>
-<l:l i="110">Æ</l:l>
-<l:l i="110">Æ</l:l>
-<l:l i="110">Çš</l:l>
-<l:l i="110">Ç©</l:l>
-<l:l i="110">áž°</l:l>
-<l:l i="110">áž±</l:l>
-<l:l i="110">áž²</l:l>
-<l:l i="110">áž³</l:l>
-<l:l i="110">ážŽ</l:l>
-<l:l i="110">ážµ</l:l>
-<l:l i="120">L</l:l>
-<l:l i="120">l</l:l>
-<l:l i="120">Ä¹</l:l>
-<l:l i="120">Äº</l:l>
-<l:l i="120">Ä»</l:l>
-<l:l i="120">ÄŒ</l:l>
-<l:l i="120">Äœ</l:l>
-<l:l i="120">ÄŸ</l:l>
-<l:l i="120">Ä¿</l:l>
-<l:l i="120">Å</l:l>
-<l:l i="120">Å</l:l>
-<l:l i="120">Å</l:l>
-<l:l i="120">Æ</l:l>
-<l:l i="120">Ç</l:l>
-<l:l i="120">ÈŽ</l:l>
-<l:l i="120">É«</l:l>
-<l:l i="120">É¬</l:l>
-<l:l i="120">É­</l:l>
-<l:l i="120">áž¶</l:l>
-<l:l i="120">áž·</l:l>
-<l:l i="120">ážž</l:l>
-<l:l i="120">áž¹</l:l>
-<l:l i="120">ážº</l:l>
-<l:l i="120">áž»</l:l>
-<l:l i="120">ážŒ</l:l>
-<l:l i="120">ážœ</l:l>
-<l:l i="130">M</l:l>
-<l:l i="130">m</l:l>
-<l:l i="130">É±</l:l>
-<l:l i="130">ážŸ</l:l>
-<l:l i="130">áž¿</l:l>
-<l:l i="130">á¹</l:l>
-<l:l i="130">á¹</l:l>
-<l:l i="130">á¹</l:l>
-<l:l i="130">á¹</l:l>
-<l:l i="140">N</l:l>
-<l:l i="140">n</l:l>
-<l:l i="140">Ã</l:l>
-<l:l i="140">Ã±</l:l>
-<l:l i="140">Å</l:l>
-<l:l i="140">Å</l:l>
-<l:l i="140">Å
-</l:l>
-<l:l i="140">Å</l:l>
-<l:l i="140">Å</l:l>
-<l:l i="140">Å</l:l>
-<l:l i="140">Æ</l:l>
-<l:l i="140">É²</l:l>
-<l:l i="140">Æ</l:l>
-<l:l i="140">È </l:l>
-<l:l i="140">Ç</l:l>
-<l:l i="140">Çž</l:l>
-<l:l i="140">Ç¹</l:l>
-<l:l i="140">Èµ</l:l>
-<l:l i="140">É³</l:l>
-<l:l i="140">á¹</l:l>
-<l:l i="140">á¹
-</l:l>
-<l:l i="140">á¹</l:l>
-<l:l i="140">á¹</l:l>
-<l:l i="140">á¹</l:l>
-<l:l i="140">á¹</l:l>
-<l:l i="140">á¹</l:l>
-<l:l i="140">á¹</l:l>
-<l:l i="150">O</l:l>
-<l:l i="150">o</l:l>
-<l:l i="150">Ã</l:l>
-<l:l i="150">Ã²</l:l>
-<l:l i="150">Ã</l:l>
-<l:l i="150">Ã³</l:l>
-<l:l i="150">Ã</l:l>
-<l:l i="150">ÃŽ</l:l>
-<l:l i="150">Ã</l:l>
-<l:l i="150">Ãµ</l:l>
-<l:l i="150">Ã</l:l>
-<l:l i="150">Ã¶</l:l>
-<l:l i="150">Ã</l:l>
-<l:l i="150">Ãž</l:l>
-<l:l i="150">Å</l:l>
-<l:l i="150">Å</l:l>
-<l:l i="150">Å</l:l>
-<l:l i="150">Å</l:l>
-<l:l i="150">Å</l:l>
-<l:l i="150">Å</l:l>
-<l:l i="150">Æ</l:l>
-<l:l i="150">Æ </l:l>
-<l:l i="150">Æ¡</l:l>
-<l:l i="150">Ç</l:l>
-<l:l i="150">Ç</l:l>
-<l:l i="150">Çª</l:l>
-<l:l i="150">Ç«</l:l>
-<l:l i="150">Ç¬</l:l>
-<l:l i="150">Ç­</l:l>
-<l:l i="150">ÇŸ</l:l>
-<l:l i="150">Ç¿</l:l>
-<l:l i="150">È</l:l>
-<l:l i="150">È</l:l>
-<l:l i="150">È</l:l>
-<l:l i="150">È</l:l>
-<l:l i="150">Èª</l:l>
-<l:l i="150">È«</l:l>
-<l:l i="150">È¬</l:l>
-<l:l i="150">È­</l:l>
-<l:l i="150">È®</l:l>
-<l:l i="150">È¯</l:l>
-<l:l i="150">È°</l:l>
-<l:l i="150">È±</l:l>
-<l:l i="150">á¹</l:l>
-<l:l i="150">á¹</l:l>
-<l:l i="150">á¹</l:l>
-<l:l i="150">á¹</l:l>
-<l:l i="150">á¹</l:l>
-<l:l i="150">á¹</l:l>
-<l:l i="150">á¹</l:l>
-<l:l i="150">á¹</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á» </l:l>
-<l:l i="150">á»¡</l:l>
-<l:l i="150">á»¢</l:l>
-<l:l i="150">á»£</l:l>
-<l:l i="160">P</l:l>
-<l:l i="160">p</l:l>
-<l:l i="160">Æ€</l:l>
-<l:l i="160">Æ¥</l:l>
-<l:l i="160">á¹</l:l>
-<l:l i="160">á¹</l:l>
-<l:l i="160">á¹</l:l>
-<l:l i="160">á¹</l:l>
-<l:l i="170">Q</l:l>
-<l:l i="170">q</l:l>
-<l:l i="170">Ê </l:l>
-<l:l i="180">R</l:l>
-<l:l i="180">r</l:l>
-<l:l i="180">Å</l:l>
-<l:l i="180">Å</l:l>
-<l:l i="180">Å</l:l>
-<l:l i="180">Å</l:l>
-<l:l i="180">Å</l:l>
-<l:l i="180">Å</l:l>
-<l:l i="180">È</l:l>
-<l:l i="180">È</l:l>
-<l:l i="180">È</l:l>
-<l:l i="180">È</l:l>
-<l:l i="180">ÉŒ</l:l>
-<l:l i="180">Éœ</l:l>
-<l:l i="180">ÉŸ</l:l>
-<l:l i="180">á¹</l:l>
-<l:l i="180">á¹</l:l>
-<l:l i="180">á¹</l:l>
-<l:l i="180">á¹</l:l>
-<l:l i="180">á¹</l:l>
-<l:l i="180">á¹</l:l>
-<l:l i="180">á¹</l:l>
-<l:l i="180">á¹</l:l>
-<l:l i="190">S</l:l>
-<l:l i="190">s</l:l>
-<l:l i="190">Å</l:l>
-<l:l i="190">Å</l:l>
-<l:l i="190">Å</l:l>
-<l:l i="190">Å</l:l>
-<l:l i="190">Å</l:l>
-<l:l i="190">Å</l:l>
-<l:l i="190">Å </l:l>
-<l:l i="190">Å¡</l:l>
-<l:l i="190">È</l:l>
-<l:l i="190">È</l:l>
-<l:l i="190">Ê</l:l>
-<l:l i="190">á¹ </l:l>
-<l:l i="190">á¹¡</l:l>
-<l:l i="190">á¹¢</l:l>
-<l:l i="190">á¹£</l:l>
-<l:l i="190">á¹€</l:l>
-<l:l i="190">á¹¥</l:l>
-<l:l i="190">á¹Š</l:l>
-<l:l i="190">á¹§</l:l>
-<l:l i="190">á¹š</l:l>
-<l:l i="190">á¹©</l:l>
-<l:l i="200">T</l:l>
-<l:l i="200">t</l:l>
-<l:l i="200">Å¢</l:l>
-<l:l i="200">Å£</l:l>
-<l:l i="200">Å€</l:l>
-<l:l i="200">Å¥</l:l>
-<l:l i="200">ÅŠ</l:l>
-<l:l i="200">Å§</l:l>
-<l:l i="200">Æ«</l:l>
-<l:l i="200">Æ¬</l:l>
-<l:l i="200">Æ­</l:l>
-<l:l i="200">Æ®</l:l>
-<l:l i="200">Ê</l:l>
-<l:l i="200">È</l:l>
-<l:l i="200">È</l:l>
-<l:l i="200">È¶</l:l>
-<l:l i="200">á¹ª</l:l>
-<l:l i="200">á¹«</l:l>
-<l:l i="200">á¹¬</l:l>
-<l:l i="200">á¹­</l:l>
-<l:l i="200">á¹®</l:l>
-<l:l i="200">á¹¯</l:l>
-<l:l i="200">á¹°</l:l>
-<l:l i="200">á¹±</l:l>
-<l:l i="200">áº</l:l>
-<l:l i="210">U</l:l>
-<l:l i="210">u</l:l>
-<l:l i="210">Ã</l:l>
-<l:l i="210">Ã¹</l:l>
-<l:l i="210">Ã</l:l>
-<l:l i="210">Ãº</l:l>
-<l:l i="210">Ã</l:l>
-<l:l i="210">Ã»</l:l>
-<l:l i="210">Ã</l:l>
-<l:l i="210">ÃŒ</l:l>
-<l:l i="210">Åš</l:l>
-<l:l i="210">Å©</l:l>
-<l:l i="210">Åª</l:l>
-<l:l i="210">Å«</l:l>
-<l:l i="210">Å¬</l:l>
-<l:l i="210">Å­</l:l>
-<l:l i="210">Å®</l:l>
-<l:l i="210">Å¯</l:l>
-<l:l i="210">Å°</l:l>
-<l:l i="210">Å±</l:l>
-<l:l i="210">Å²</l:l>
-<l:l i="210">Å³</l:l>
-<l:l i="210">Æ¯</l:l>
-<l:l i="210">Æ°</l:l>
-<l:l i="210">Ç</l:l>
-<l:l i="210">Ç</l:l>
-<l:l i="210">Ç</l:l>
-<l:l i="210">Ç</l:l>
-<l:l i="210">Ç</l:l>
-<l:l i="210">Ç</l:l>
-<l:l i="210">Ç</l:l>
-<l:l i="210">Ç</l:l>
-<l:l i="210">Ç</l:l>
-<l:l i="210">Ç</l:l>
-<l:l i="210">È</l:l>
-<l:l i="210">È</l:l>
-<l:l i="210">È</l:l>
-<l:l i="210">È</l:l>
-<l:l i="210">á¹²</l:l>
-<l:l i="210">á¹³</l:l>
-<l:l i="210">á¹Ž</l:l>
-<l:l i="210">á¹µ</l:l>
-<l:l i="210">á¹¶</l:l>
-<l:l i="210">á¹·</l:l>
-<l:l i="210">á¹ž</l:l>
-<l:l i="210">á¹¹</l:l>
-<l:l i="210">á¹º</l:l>
-<l:l i="210">á¹»</l:l>
-<l:l i="210">á»€</l:l>
-<l:l i="210">á»¥</l:l>
-<l:l i="210">á»Š</l:l>
-<l:l i="210">á»§</l:l>
-<l:l i="210">á»š</l:l>
-<l:l i="210">á»©</l:l>
-<l:l i="210">á»ª</l:l>
-<l:l i="210">á»«</l:l>
-<l:l i="210">á»¬</l:l>
-<l:l i="210">á»­</l:l>
-<l:l i="210">á»®</l:l>
-<l:l i="210">á»¯</l:l>
-<l:l i="210">á»°</l:l>
-<l:l i="210">á»±</l:l>
-<l:l i="220">V</l:l>
-<l:l i="220">v</l:l>
-<l:l i="220">Æ²</l:l>
-<l:l i="220">Ê</l:l>
-<l:l i="220">á¹Œ</l:l>
-<l:l i="220">á¹œ</l:l>
-<l:l i="220">á¹Ÿ</l:l>
-<l:l i="220">á¹¿</l:l>
-<l:l i="230">W</l:l>
-<l:l i="230">w</l:l>
-<l:l i="230">ÅŽ</l:l>
-<l:l i="230">Åµ</l:l>
-<l:l i="230">áº</l:l>
-<l:l i="230">áº</l:l>
-<l:l i="230">áº</l:l>
-<l:l i="230">áº</l:l>
-<l:l i="230">áº</l:l>
-<l:l i="230">áº
-</l:l>
-<l:l i="230">áº</l:l>
-<l:l i="230">áº</l:l>
-<l:l i="230">áº</l:l>
-<l:l i="230">áº</l:l>
-<l:l i="230">áº</l:l>
-<l:l i="240">X</l:l>
-<l:l i="240">x</l:l>
-<l:l i="240">áº</l:l>
-<l:l i="240">áº</l:l>
-<l:l i="240">áº</l:l>
-<l:l i="240">áº</l:l>
-<l:l i="250">Y</l:l>
-<l:l i="250">y</l:l>
-<l:l i="250">Ã</l:l>
-<l:l i="250">Ãœ</l:l>
-<l:l i="250">Ã¿</l:l>
-<l:l i="250">Åž</l:l>
-<l:l i="250">Å¶</l:l>
-<l:l i="250">Å·</l:l>
-<l:l i="250">Æ³</l:l>
-<l:l i="250">ÆŽ</l:l>
-<l:l i="250">È²</l:l>
-<l:l i="250">È³</l:l>
-<l:l i="250">áº</l:l>
-<l:l i="250">áº</l:l>
-<l:l i="250">áº</l:l>
-<l:l i="250">á»²</l:l>
-<l:l i="250">á»³</l:l>
-<l:l i="250">á»Ž</l:l>
-<l:l i="250">á»µ</l:l>
-<l:l i="250">á»¶</l:l>
-<l:l i="250">á»·</l:l>
-<l:l i="250">á»ž</l:l>
-<l:l i="250">á»¹</l:l>
-<l:l i="260">Z</l:l>
-<l:l i="260">z</l:l>
-<l:l i="260">Å¹</l:l>
-<l:l i="260">Åº</l:l>
-<l:l i="260">Å»</l:l>
-<l:l i="260">ÅŒ</l:l>
-<l:l i="260">Åœ</l:l>
-<l:l i="260">ÅŸ</l:l>
-<l:l i="260">Æµ</l:l>
-<l:l i="260">Æ¶</l:l>
-<l:l i="260">È€</l:l>
-<l:l i="260">È¥</l:l>
-<l:l i="260">Ê</l:l>
-<l:l i="260">Ê</l:l>
-<l:l i="260">áº</l:l>
-<l:l i="260">áº</l:l>
-<l:l i="260">áº</l:l>
-<l:l i="260">áº</l:l>
-<l:l i="260">áº</l:l>
-<l:l i="260">áº</l:l>
-</l:letters>
-</l:l10n>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/entities.ent
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/entities.ent	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,47 +1,0 @@
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-     
-     This file contains common entity declarations used for
-     sorting by various templates.
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<!ENTITY lowercase "'Aa&#192;&#224;&#193;&#225;&#194;&#226;&#195;&#227;&#196;&#228;&#197;&#229;&#256;&#257;&#258;&#259;&#260;&#261;&#461;&#462;&#478;&#479;&#480;&#481;&#506;&#507;&#512;&#513;&#514;&#515;&#550;&#551;&#7680;&#7681;&#7834;&#7840;&#7841;&#7842;&#7843;&#7844;&#7845;&#7846;&#7847;&#7848;&#7849;&#7850;&#7851;&#7852;&#7853;&#7854;&#7855;&#7856;&#7857;&#7858;&#7859;&#7860;&#7861;&#7862;&#7863;Bb&#384;&#385;&#595;&#386;&#387;&#7682;&#7683;&#7684;&#7685;&#7686;&#7687;Cc&#199;&#231;&#262;&#263;&#264;&#265;&#266;&#267;&#268;&#269;&#391;&#392;&#597;&#7688;&#7689;Dd&#270;&#271;&#272;&#273;&#394;&#599;&#395;&#396;&#453;&#498;&#545;&#598;&#7690;&#7691;&#7692;&#7693;&#7694;&#7695;&#7696;&#7697;&#7698;&#7699;Ee&#200;&#232;&#201;&#233;&#202;&#234;&#203;&#235;&#274;&#275;&#276;&#277;&#278;&#279;&#280;&#281;&#282;&#283;&#516;&#517;&#518;&#519;&#552;&#553;&#7700;&#7701;&#7702;&#7703;&#7704;&#7705;&#7706;&#7707;&#7708;&#7709;&#7864;&#7865;&#7866;&#7867;&#7868;&#7869;&#7870;&#7871;&#7872;&#7873;&#7874;&#7875;&#7876;&#7877;&#7878;&#7879;Ff&#401;&#402;&#7710;&#7711;Gg&#284;&#285;&#286;&#287;&#288;&#289;&#290;&#291;&#403;&#608;&#484;&#485;&#486;&#487;&#500;&#501;&#7712;&#7713;Hh&#292;&#293;&#294;&#295;&#542;&#543;&#614;&#7714;&#7715;&#7716;&#7717;&#7718;&#7719;&#7720;&#7721;&#7722;&#7723;&#7830;Ii&#204;&#236;&#205;&#237;&#206;&#238;&#207;&#239;&#296;&#297;&#298;&#299;&#300;&#301;&#302;&#303;&#304;&#407;&#616;&#463;&#464;&#520;&#521;&#522;&#523;&#7724;&#7725;&#7726;&#7727;&#7880;&#7881;&#7882;&#7883;Jj&#308;&#309;&#496;&#669;Kk&#310;&#311;&#408;&#409;&#488;&#489;&#7728;&#7729;&#7730;&#7731;&#7732;&#7733;Ll&#313;&#314;&#315;&#316;&#317;&#318;&#319;&#320;&#321;&#322;&#410;&#456;&#564;&#619;&#620;&#621;&#7734;&#7735;&#7736;&#7737;&#7738;&#7739;&#7740;&#7741;Mm&#625;&#7742;&#7743;&#7744;&#7745;&#7746;&#7747;Nn&#209;&#241;&#323;&#324;&#325;&#326;&#327;&#328;&#413;&#626;&#414;&#544;&#459;&#504;&#505;&#565;&#627;&#7748;&#7749;&#7750;&#7751;&#7752;&#7753;&#7754;&#7755;Oo&#210;&#242;&#211;&#243;&#212;&#244;&#213;&#245;&#214;&#246;&#216;&#248;&#332;&#333;&#334;&#335;&#336;&#337;&#415;&#416;&#417;&#465;&#466;&#490;&#491;&#492;&#493;&#510;&#511;&#524;&#525;&#526;&#527;&#554;&#555;&#556;&#557;&#558;&#559;&#560;&#561;&#7756;&#7757;&#7758;&#7759;&#7760;&#7761;&#7762;&#7763;&#7884;&#7885;&#7886;&#7887;&#7888;&#7889;&#7890;&#7891;&#7892;&#7893;&#7894;&#7895;&#7896;&#7897;&#7898;&#7899;&#7900;&#7901;&#7902;&#7903;&#7904;&#7905;&#7906;&#7907;Pp&#420;&#421;&#7764;&#7765;&#7766;&#7767;Qq&#672;Rr&#340;&#341;&#342;&#343;&#344;&#345;&#528;&#529;&#530;&#531;&#636;&#637;&#638;&#7768;&#7769;&#7770;&#7771;&#7772;&#7773;&#7774;&#7775;Ss&#346;&#347;&#348;&#349;&#350;&#351;&#352;&#353;&#536;&#537;&#642;&#7776;&#7777;&#7778;&#7779;&#7780;&#7781;&#7782;&#7783;&#7784;&#7785;Tt&#354;&#355;&#356;&#357;&#358;&#359;&#427;&#428;&#429;&#430;&#648;&#538;&#539;&#566;&#7786;&#7787;&#7788;&#7789;&#7790;&#7791;&#7792;&#7793;&#7831;Uu&#217;&#249;&#218;&#250;&#219;&#251;&#220;&#252;&#360;&#361;&#362;&#363;&#364;&#365;&#366;&#367;&#368;&#369;&#370;&#371;&#431;&#432;&#467;&#468;&#469;&#470;&#471;&#472;&#473;&#474;&#475;&#476;&#532;&#533;&#534;&#535;&#7794;&#7795;&#7796;&#7797;&#7798;&#7799;&#7800;&#7801;&#7802;&#7803;&#7908;&#7909;&#7910;&#7911;&#7912;&#7913;&#7914;&#7915;&#7916;&#7917;&#7918;&#7919;&#7920;&#7921;Vv&#434;&#651;&#7804;&#7805;&#7806;&#7807;Ww&#372;&#373;&#7808;&#7809;&#7810;&#7811;&#7812;&#7813;&#7814;&#7815;&#7816;&#7817;&#7832;Xx&#7818;&#7819;&#7820;&#7821;Yy&#221;&#253;&#255;&#376;&#374;&#375;&#435;&#436;&#562;&#563;&#7822;&#7823;&#7833;&#7922;&#7923;&#7924;&#7925;&#7926;&#7927;&#7928;&#7929;Zz&#377;&#378;&#379;&#380;&#381;&#382;&#437;&#438;&#548;&#549;&#656;&#657;&#7824;&#7825;&#7826;&#7827;&#7828;&#7829;&#7829;'">
-<!ENTITY uppercase "'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ'">
-
-<!ENTITY primary   'normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""]))'>
-<!ENTITY secondary 'normalize-space(concat(secondary/@sortas, secondary[not(@sortas) or @sortas = ""]))'>
-<!ENTITY tertiary  'normalize-space(concat(tertiary/@sortas, tertiary[not(@sortas) or @sortas = ""]))'>
-
-
-<!ENTITY section   '(ancestor-or-self::set|ancestor-or-self::book|ancestor-or-self::part|ancestor-or-self::reference|ancestor-or-self::partintro|ancestor-or-self::chapter|ancestor-or-self::appendix|ancestor-or-self::preface|ancestor-or-self::article|ancestor-or-self::section|ancestor-or-self::sect1|ancestor-or-self::sect2|ancestor-or-self::sect3|ancestor-or-self::sect4|ancestor-or-self::sect5|ancestor-or-self::refentry|ancestor-or-self::refsect1|ancestor-or-self::refsect2|ancestor-or-self::refsect3|ancestor-or-self::simplesect|ancestor-or-self::bibliography|ancestor-or-self::glossary|ancestor-or-self::index|ancestor-or-self::webpage)[last()]'>
-
-<!ENTITY section.id 'generate-id(&section;)'>
-<!ENTITY sep '" "'>
-
-<!ENTITY scope 'count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))'>
-
-<!ENTITY setup-language-variable '
-<xsl:variable name="language" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:call-template name="l10n.language"/>
-</xsl:variable>
-
-<xsl:variable name="lowercase" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:call-template name="gentext">
-    <xsl:with-param name="key">normalize.sort.input</xsl:with-param>
-  </xsl:call-template>
-</xsl:variable>
-
-<xsl:variable name="uppercase" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:call-template name="gentext">
-    <xsl:with-param name="key">normalize.sort.output</xsl:with-param>
-  </xsl:call-template>
-</xsl:variable>
-'>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/es.xml
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/es.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,679 +1,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="es" english-language-name="Spanish">
-
-<!-- * This file is generated automatically. -->
-<!-- * To submit changes to this file upstream (to the DocBook Project) -->
-<!-- * do not submit an edited version of this file. Instead, submit an -->
-<!-- * edited version of the source file at the following location: -->
-<!-- * -->
-<!-- *  https://svn.sourceforge.net/svnroot/docbook/trunk/gentext/locale/es.xml -->
-<!-- * -->
-<!-- * E-mail the edited es.xml source file to: -->
-<!-- * -->
-<!-- *  docbook-developers@lists.sourceforge.net -->
-
-<!-- ******************************************************************** -->
-
-<!-- This file is part of the XSL DocBook Stylesheet distribution. -->
-<!-- See ../README or http://docbook.sf.net/release/xsl/current/ for -->
-<!-- copyright and other information. -->
-
-<!-- ******************************************************************** -->
-<!-- In these files, % with a letter is used for a placeholder: -->
-<!--   %t is the current element's title -->
-<!--   %s is the current element's subtitle (if applicable)-->
-<!--   %n is the current element's number label-->
-<!--   %p is the current element's page number (if applicable)-->
-<!-- ******************************************************************** -->
-
-
-<l:gentext key="Abstract" text="Resumen"/>
-<l:gentext key="abstract" text="resumen"/>
-<l:gentext key="Answer" text="R:"/>
-<l:gentext key="answer" text="r:"/>
-<l:gentext key="Appendix" text="ApÃ©ndice"/>
-<l:gentext key="appendix" text="apÃ©ndice"/>
-<l:gentext key="Article" text="ArtÃ­culo"/>
-<l:gentext key="article" text="artÃ­culo"/>
-<l:gentext key="Author" text="Autor"/>
-<l:gentext key="Bibliography" text="BibliografÃ­a"/>
-<l:gentext key="bibliography" text="bibliografÃ­a"/>
-<l:gentext key="Book" text="Libro"/>
-<l:gentext key="book" text="libro"/>
-<l:gentext key="CAUTION" text="ATENCIÃN"/>
-<l:gentext key="Caution" text="AtenciÃ³n"/>
-<l:gentext key="caution" text="atenciÃ³n"/>
-<l:gentext key="Chapter" text="CapÃ­tulo"/>
-<l:gentext key="chapter" text="capÃ­tulo"/>
-<l:gentext key="Colophon" text="ColofÃ³n"/>
-<l:gentext key="colophon" text="colofÃ³n"/>
-<l:gentext key="Copyright" text="Copyright"/>
-<l:gentext key="copyright" text="copyright"/>
-<l:gentext key="Dedication" text="Dedicatoria"/>
-<l:gentext key="dedication" text="dedicatoria"/>
-<l:gentext key="Edition" text="EdiciÃ³n"/>
-<l:gentext key="edition" text="ediciÃ³n"/>
-<l:gentext key="Editor" text="Editor" lang="en"/>
-<l:gentext key="Equation" text="EcuaciÃ³n"/>
-<l:gentext key="equation" text="ecuaciÃ³n"/>
-<l:gentext key="Example" text="Ejemplo"/>
-<l:gentext key="example" text="ejemplo"/>
-<l:gentext key="Figure" text="Figura"/>
-<l:gentext key="figure" text="figura"/>
-<l:gentext key="Glossary" text="Glosario"/>
-<l:gentext key="glossary" text="glosario"/>
-<l:gentext key="GlossSee" text="Ver"/>
-<l:gentext key="glosssee" text="ver"/>
-<l:gentext key="GlossSeeAlso" text="Ver tambiÃ©n"/>
-<l:gentext key="glossseealso" text="ver tambiÃ©n"/>
-<l:gentext key="IMPORTANT" text="IMPORTANTE"/>
-<l:gentext key="important" text="importante"/>
-<l:gentext key="Important" text="Importante"/>
-<l:gentext key="Index" text="Ãndice"/>
-<l:gentext key="index" text="Ã­ndice"/>
-<l:gentext key="ISBN" text="ISBN"/>
-<l:gentext key="isbn" text="isbn"/>
-<l:gentext key="LegalNotice" text="Aviso Legal"/>
-<l:gentext key="legalnotice" text="aviso legal"/>
-<l:gentext key="MsgAud" text="Audiencia"/>
-<l:gentext key="msgaud" text="audiencia"/>
-<l:gentext key="MsgLevel" text="Nivel"/>
-<l:gentext key="msglevel" text="nivel"/>
-<l:gentext key="MsgOrig" text="Origen"/>
-<l:gentext key="msgorig" text="origen"/>
-<l:gentext key="NOTE" text="NOTA"/>
-<l:gentext key="Note" text="Nota"/>
-<l:gentext key="note" text="nota"/>
-<l:gentext key="Part" text="Parte"/>
-<l:gentext key="part" text="parte"/>
-<l:gentext key="Preface" text="Prefacio"/>
-<l:gentext key="preface" text="prefacio"/>
-<l:gentext key="Procedure" text="Procedimiento"/>
-<l:gentext key="procedure" text="procedimiento"/>
-<l:gentext key="ProductionSet" text="ProducciÃ³n"/>
-<l:gentext key="PubDate" text="Fecha de publicaciÃ³n"/>
-<l:gentext key="pubdate" text="fecha de publicaciÃ³n"/>
-<l:gentext key="Published" text="Publicado"/>
-<l:gentext key="published" text="publicado"/>
-<l:gentext key="Publisher" text="Publisher" lang="en"/>
-<l:gentext key="Qandadiv" text="P y R"/>
-<l:gentext key="qandadiv" text="P y R"/>
-<l:gentext key="QandASet" text="Frequently Asked Questions" lang="en"/>
-<l:gentext key="Question" text="P:"/>
-<l:gentext key="question" text="p:"/>
-<l:gentext key="RefEntry" text="Entrada de referencia"/>
-<l:gentext key="refentry" text="entrada de referencia"/>
-<l:gentext key="Reference" text="Referencia"/>
-<l:gentext key="reference" text="referencia"/>
-<l:gentext key="References" text="References" lang="en"/>
-<l:gentext key="RefName" text="Nombre de referencia"/>
-<l:gentext key="refname" text="nombre de referencia"/>
-<l:gentext key="RefSection" text="SecciÃ³n de referencia"/>
-<l:gentext key="refsection" text="secciÃ³n de referencia"/>
-<l:gentext key="RefSynopsisDiv" text="Sinopsis"/>
-<l:gentext key="refsynopsisdiv" text="sinopsis"/>
-<l:gentext key="RevHistory" text="Historial de revisiones"/>
-<l:gentext key="revhistory" text="Historial de revisiones"/>
-<l:gentext key="revision" text="revisiÃ³n"/>
-<l:gentext key="Revision" text="RevisiÃ³n"/>
-<l:gentext key="sect1" text="SecciÃ³n"/>
-<l:gentext key="sect2" text="SecciÃ³n"/>
-<l:gentext key="sect3" text="SecciÃ³n"/>
-<l:gentext key="sect4" text="SecciÃ³n"/>
-<l:gentext key="sect5" text="SecciÃ³n"/>
-<l:gentext key="section" text="secciÃ³n"/>
-<l:gentext key="Section" text="SecciÃ³n"/>
-<l:gentext key="see" text="ver"/>
-<l:gentext key="See" text="Ver"/>
-<l:gentext key="seealso" text="ver tambiÃ©n"/>
-<l:gentext key="Seealso" text="Ver tambiÃ©n"/>
-<l:gentext key="SeeAlso" text="Ver TambiÃ©n"/>
-<l:gentext key="set" text="conjunto"/>
-<l:gentext key="Set" text="Conjunto"/>
-<l:gentext key="setindex" text="Ã­ndice del conjunto"/>
-<l:gentext key="SetIndex" text="Ãndice del Conjunto"/>
-<l:gentext key="Sidebar" text="Barra lateral"/>
-<l:gentext key="sidebar" text="barra lateral"/>
-<l:gentext key="step" text="paso"/>
-<l:gentext key="Step" text="Paso"/>
-<l:gentext key="table" text="tabla"/>
-<l:gentext key="Table" text="Tabla"/>
-<l:gentext key="task" text="Task" lang="en"/>
-<l:gentext key="Task" text="Task" lang="en"/>
-<l:gentext key="tip" text="sugerencia"/>
-<l:gentext key="TIP" text="SUGERENCIA"/>
-<l:gentext key="Tip" text="Sugerencia"/>
-<l:gentext key="Warning" text="Aviso"/>
-<l:gentext key="warning" text="aviso"/>
-<l:gentext key="WARNING" text="AVISO"/>
-<l:gentext key="and" text="y"/>
-<l:gentext key="by" text="por"/>
-<l:gentext key="Edited" text="Editado"/>
-<l:gentext key="edited" text="editado"/>
-<l:gentext key="Editedby" text="Editado por"/>
-<l:gentext key="editedby" text="editado por"/>
-<l:gentext key="in" text="en"/>
-<l:gentext key="lastlistcomma" text=","/>
-<l:gentext key="listcomma" text=","/>
-<l:gentext key="nonexistantelement" text="elemento inexistente"/>
-<l:gentext key="notes" text="notas"/>
-<l:gentext key="Notes" text="Notas"/>
-<l:gentext key="Pgs" text="PÃ¡gs."/>
-<l:gentext key="pgs" text="pÃ¡gs."/>
-<l:gentext key="Revisedby" text="Revisado por: "/>
-<l:gentext key="revisedby" text="revisado por: "/>
-<l:gentext key="TableNotes" text="Notas de tabla"/>
-<l:gentext key="tablenotes" text="notas de tabla"/>
-<l:gentext key="TableofContents" text="Tabla de contenidos"/>
-<l:gentext key="tableofcontents" text="tabla de contenidos"/>
-<l:gentext key="unexpectedelementname" text="nombre de elemento inesperado"/>
-<l:gentext key="unsupported" text="no soportado"/>
-<l:gentext key="xrefto" text="referencia a"/>
-<l:gentext key="Authors" text="Authors" lang="en"/>
-<l:gentext key="copyeditor" text="Copy Editor" lang="en"/>
-<l:gentext key="graphicdesigner" text="Graphic Designer" lang="en"/>
-<l:gentext key="productioneditor" text="Production Editor" lang="en"/>
-<l:gentext key="technicaleditor" text="Technical Editor" lang="en"/>
-<l:gentext key="translator" text="Translator" lang="en"/>
-<l:gentext key="listofequations" text="lista de ecuaciones"/>
-<l:gentext key="ListofEquations" text="Lista de ecuaciones"/>
-<l:gentext key="ListofExamples" text="Lista de ejemplos"/>
-<l:gentext key="listofexamples" text="lista de ejemplos"/>
-<l:gentext key="ListofFigures" text="Lista de figuras"/>
-<l:gentext key="listoffigures" text="lista de figuras"/>
-<l:gentext key="ListofProcedures" text="List of Procedures" lang="en"/>
-<l:gentext key="listofprocedures" text="List of Procedures" lang="en"/>
-<l:gentext key="listoftables" text="lista de tablas"/>
-<l:gentext key="ListofTables" text="Lista de tablas"/>
-<l:gentext key="ListofUnknown" text="Lista de desconocido"/>
-<l:gentext key="listofunknown" text="lista de desconocido"/>
-<l:gentext key="nav-home" text="Inicio"/>
-<l:gentext key="nav-next" text="Siguiente"/>
-<l:gentext key="nav-next-sibling" text="Avanzar"/>
-<l:gentext key="nav-prev" text="Anterior"/>
-<l:gentext key="nav-prev-sibling" text="Retroceder"/>
-<l:gentext key="nav-up" text="Subir"/>
-<l:gentext key="nav-toc" text="ToC" lang="en"/>
-<l:gentext key="Draft" text="Borrador"/>
-<l:gentext key="above" text="arriba"/>
-<l:gentext key="below" text="abajo"/>
-<l:gentext key="sectioncalled" text="secciÃ³n llamada"/>
-<l:gentext key="index symbols" text="SÃ­mbolos"/>
-<l:gentext key="lowercase.alpha" text="abcdefghijklmnopqrstuvwxyzÃ¡Ã©Ã­Ã³ÃºÃ±"/>
-<l:gentext key="uppercase.alpha" text="ABCDEFGHIJKLMNOPQRSTUVWXYZÃÃÃÃÃÃ"/>
-<l:gentext key="normalize.sort.input" text="AaÃÃ ÃÃ¡ÃÃ¢ÃÃ£ÃÃ€Ã
-Ã¥ÄÄÄÄÄÄ
-ÇÇÇÇÇ Ç¡ÇºÇ»ÈÈÈÈÈŠÈ§ážážáºáº áº¡áº¢áº£áº€áº¥áºŠáº§áºšáº©áºªáº«áº¬áº­áº®áº¯áº°áº±áº²áº³áºŽáºµáº¶áº·BbÆÆÉÆÆážážážáž
-ážážCcÃÃ§ÄÄÄÄÄÄÄÄÆÆÉážážDdÄÄÄÄÆÉÆÆÇ
-Ç²È¡ÉážážážážážážážážážážEeÃÃšÃÃ©ÃÃªÃÃ«ÄÄÄÄÄÄÄÄÄÄÈÈ
-ÈÈÈšÈ©ážážážážážážážážážážáºžáº¹áººáº»áºŒáºœáºŸáº¿á»á»á»á»á»á»
-á»á»FfÆÆážážGgÄÄÄÄÄ Ä¡Ä¢Ä£ÆÉ Ç€Ç¥ÇŠÇ§ÇŽÇµáž áž¡HhÄ€Ä¥ÄŠÄ§ÈÈÉŠáž¢áž£áž€áž¥ážŠáž§ážšáž©ážªáž«áºIiÃÃ¬ÃÃ­ÃÃ®ÃÃ¯ÄšÄ©ÄªÄ«Ä¬Ä­Ä®Ä¯Ä°ÆÉšÇÇÈÈÈÈáž¬áž­áž®áž¯á»á»á»á»JjÄŽÄµÇ°ÊKkÄ¶Ä·ÆÆÇšÇ©áž°áž±áž²áž³ážŽážµLlÄ¹ÄºÄ»ÄŒÄœÄŸÄ¿ÅÅÅÆÇÈŽÉ«É¬É­áž¶áž·ážžáž¹ážºáž»ážŒážœMmÉ±ážŸáž¿á¹á¹á¹á¹NnÃÃ±ÅÅÅ
-ÅÅÅÆÉ²ÆÈ ÇÇžÇ¹ÈµÉ³á¹á¹
-á¹á¹á¹á¹á¹á¹OoÃÃ²ÃÃ³ÃÃŽÃÃµÃÃ¶ÃÃžÅÅÅÅÅÅÆÆ Æ¡ÇÇÇªÇ«Ç¬Ç­ÇŸÇ¿ÈÈÈÈÈªÈ«È¬È­È®È¯È°È±á¹á¹á¹á¹á¹á¹á¹á¹á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á» á»¡á»¢á»£PpÆ€Æ¥á¹á¹á¹á¹QqÊ RrÅÅÅÅÅÅÈÈÈÈÉŒÉœÉŸá¹á¹á¹á¹á¹á¹á¹á¹SsÅÅÅÅÅÅÅ Å¡ÈÈÊá¹ á¹¡á¹¢á¹£á¹€á¹¥á¹Šá¹§á¹šá¹©TtÅ¢Å£Å€Å¥ÅŠÅ§Æ«Æ¬Æ­Æ®ÊÈÈÈ¶á¹ªá¹«á¹¬á¹­á¹®á¹¯á¹°á¹±áºUuÃÃ¹ÃÃºÃÃ»ÃÃŒÅšÅ©ÅªÅ«Å¬Å­Å®Å¯Å°Å±Å²Å³Æ¯Æ°ÇÇÇÇÇÇÇÇÇÇÈÈÈÈá¹²á¹³á¹Žá¹µá¹¶á¹·á¹žá¹¹á¹ºá¹»á»€á»¥á»Šá»§á»šá»©á»ªá»«á»¬á»­á»®á»¯á»°á»±VvÆ²Êá¹Œá¹œá¹Ÿá¹¿WwÅŽÅµáºáºáºáºáºáº
-áºáºáºáºáºXxáºáºáºáºYyÃÃœÃ¿ÅžÅ¶Å·Æ³ÆŽÈ²È³áºáºáºá»²á»³á»Žá»µá»¶á»·á»žá»¹ZzÅ¹ÅºÅ»ÅŒÅœÅŸÆµÆ¶È€È¥ÊÊáºáºáºáºáºáºáº" lang="en"/>
-<l:gentext key="normalize.sort.output" text="AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ" lang="en"/>
-<l:dingbat key="startquote" text="â"/>
-<l:dingbat key="endquote" text="â"/>
-<l:dingbat key="nestedstartquote" text="â"/>
-<l:dingbat key="nestedendquote" text="â"/>
-<l:dingbat key="singlestartquote" text="â" lang="en"/>
-<l:dingbat key="singleendquote" text="â" lang="en"/>
-<l:dingbat key="bullet" text="â¢"/>
-<l:gentext key="hyphenation-character" text="-" lang="en"/>
-<l:gentext key="hyphenation-push-character-count" text="2" lang="en"/>
-<l:gentext key="hyphenation-remain-character-count" text="2" lang="en"/>
-<l:context name="styles"><l:template name="person-name" text="first-last"/>
-</l:context>
-<l:context name="title"><l:template name="abstract" text="%t"/>
-<l:template name="answer" text="%t"/>
-<l:template name="appendix" text="ApÃ©ndice %n. %t"/>
-<l:template name="article" text="%t"/>
-<l:template name="authorblurb" text="%t"/>
-<l:template name="bibliodiv" text="%t"/>
-<l:template name="biblioentry" text="%t"/>
-<l:template name="bibliography" text="%t"/>
-<l:template name="bibliolist" text="%t" lang="en"/>
-<l:template name="bibliomixed" text="%t"/>
-<l:template name="bibliomset" text="%t"/>
-<l:template name="biblioset" text="%t"/>
-<l:template name="blockquote" text="%t"/>
-<l:template name="book" text="%t"/>
-<l:template name="calloutlist" text="%t"/>
-<l:template name="caution" text="%t"/>
-<l:template name="chapter" text="CapÃ­tulo %n. %t"/>
-<l:template name="colophon" text="%t"/>
-<l:template name="dedication" text="%t"/>
-<l:template name="equation" text="EcuaciÃ³n %n. %t"/>
-<l:template name="example" text="Ejemplo %n. %t"/>
-<l:template name="figure" text="Figura %n. %t"/>
-<l:template name="foil" text="%t" lang="en"/>
-<l:template name="foilgroup" text="%t" lang="en"/>
-<l:template name="formalpara" text="%t"/>
-<l:template name="glossary" text="%t"/>
-<l:template name="glossdiv" text="%t"/>
-<l:template name="glosslist" text="%t" lang="en"/>
-<l:template name="glossentry" text="%t" lang="en"/>
-<l:template name="important" text="%t"/>
-<l:template name="index" text="%t"/>
-<l:template name="indexdiv" text="%t"/>
-<l:template name="itemizedlist" text="%t"/>
-<l:template name="legalnotice" text="%t"/>
-<l:template name="listitem" text=""/>
-<l:template name="lot" text="%t"/>
-<l:template name="msg" text="%t"/>
-<l:template name="msgexplan" text="%t"/>
-<l:template name="msgmain" text="%t"/>
-<l:template name="msgrel" text="%t"/>
-<l:template name="msgset" text="%t"/>
-<l:template name="msgsub" text="%t"/>
-<l:template name="note" text="%t"/>
-<l:template name="orderedlist" text="%t"/>
-<l:template name="part" text="Parte %n. %t"/>
-<l:template name="partintro" text="%t"/>
-<l:template name="preface" text="%t"/>
-<l:template name="procedure" text="%t"/>
-<l:template name="procedure.formal" text="Procedimiento %n. %t"/>
-<l:template name="productionset" text="%t"/>
-<l:template name="productionset.formal" text="ProducciÃ³n %n"/>
-<l:template name="qandadiv" text="%t"/>
-<l:template name="qandaentry" text="%t"/>
-<l:template name="qandaset" text="%t"/>
-<l:template name="question" text="%t"/>
-<l:template name="refentry" text="%t"/>
-<l:template name="reference" text="%t"/>
-<l:template name="refsection" text="%t"/>
-<l:template name="refsect1" text="%t"/>
-<l:template name="refsect2" text="%t"/>
-<l:template name="refsect3" text="%t"/>
-<l:template name="refsynopsisdiv" text="%t"/>
-<l:template name="refsynopsisdivinfo" text="%t"/>
-<l:template name="segmentedlist" text="%t"/>
-<l:template name="set" text="%t"/>
-<l:template name="setindex" text="%t"/>
-<l:template name="sidebar" text="%t"/>
-<l:template name="step" text="%t"/>
-<l:template name="table" text="Tabla %n. %t"/>
-<l:template name="task" text="%t" lang="en"/>
-<l:template name="tasksummary" text="%t" lang="en"/>
-<l:template name="taskprerequisites" text="%t" lang="en"/>
-<l:template name="taskrelated" text="%t" lang="en"/>
-<l:template name="tip" text="%t"/>
-<l:template name="toc" text="%t"/>
-<l:template name="variablelist" text="%t"/>
-<l:template name="varlistentry" text="" lang="en"/>
-<l:template name="warning" text="%t"/>
-</l:context>
-<l:context name="title-unnumbered"><l:template name="appendix" text="%t"/>
-<l:template name="article/appendix" text="%t" lang="en"/>
-<l:template name="bridgehead" text="%t"/>
-<l:template name="chapter" text="%t"/>
-<l:template name="sect1" text="%t"/>
-<l:template name="sect2" text="%t"/>
-<l:template name="sect3" text="%t"/>
-<l:template name="sect4" text="%t"/>
-<l:template name="sect5" text="%t"/>
-<l:template name="section" text="%t"/>
-<l:template name="simplesect" text="%t"/>
-<l:template name="part" text="%t" lang="en"/>
-</l:context>
-<l:context name="title-numbered"><l:template name="appendix" text="ApÃ©ndice %n. %t"/>
-<l:template name="article/appendix" text="%n.Â %t" lang="en"/>
-<l:template name="bridgehead" text="%n. %t"/>
-<l:template name="chapter" text="CapÃ­tulo %n. %t"/>
-<l:template name="part" text="ParteÂ %n.Â %t"/>
-<l:template name="sect1" text="%n. %t"/>
-<l:template name="sect2" text="%n. %t"/>
-<l:template name="sect3" text="%n. %t"/>
-<l:template name="sect4" text="%n. %t"/>
-<l:template name="sect5" text="%n. %t"/>
-<l:template name="section" text="%n. %t"/>
-<l:template name="simplesect" text="%t"/>
-</l:context>
-<l:context name="subtitle"><l:template name="appendix" text="%s"/>
-<l:template name="article" text="%s"/>
-<l:template name="bibliodiv" text="%s"/>
-<l:template name="biblioentry" text="%s"/>
-<l:template name="bibliography" text="%s"/>
-<l:template name="bibliomixed" text="%s"/>
-<l:template name="bibliomset" text="%s"/>
-<l:template name="biblioset" text="%s"/>
-<l:template name="book" text="%s"/>
-<l:template name="chapter" text="%s"/>
-<l:template name="colophon" text="%s"/>
-<l:template name="dedication" text="%s"/>
-<l:template name="glossary" text="%s"/>
-<l:template name="glossdiv" text="%s"/>
-<l:template name="index" text="%s"/>
-<l:template name="indexdiv" text="%s"/>
-<l:template name="lot" text="%s"/>
-<l:template name="part" text="%s"/>
-<l:template name="partintro" text="%s"/>
-<l:template name="preface" text="%s"/>
-<l:template name="refentry" text="%s"/>
-<l:template name="reference" text="%s"/>
-<l:template name="refsection" text="%s"/>
-<l:template name="refsect1" text="%s"/>
-<l:template name="refsect2" text="%s"/>
-<l:template name="refsect3" text="%s"/>
-<l:template name="refsynopsisdiv" text="%s"/>
-<l:template name="sect1" text="%s"/>
-<l:template name="sect2" text="%s"/>
-<l:template name="sect3" text="%s"/>
-<l:template name="sect4" text="%s"/>
-<l:template name="sect5" text="%s"/>
-<l:template name="section" text="%s"/>
-<l:template name="set" text="%s"/>
-<l:template name="setindex" text="%s"/>
-<l:template name="sidebar" text="%s"/>
-<l:template name="simplesect" text="%s"/>
-<l:template name="toc" text="%s"/>
-</l:context>
-<l:context name="xref"><l:template name="abstract" text="%t"/>
-<l:template name="answer" text="R:Â %n"/>
-<l:template name="appendix" text="%t"/>
-<l:template name="article" text="%t"/>
-<l:template name="authorblurb" text="%t"/>
-<l:template name="bibliodiv" text="%t"/>
-<l:template name="bibliography" text="%t"/>
-<l:template name="bibliomset" text="%t"/>
-<l:template name="biblioset" text="%t"/>
-<l:template name="blockquote" text="%t"/>
-<l:template name="book" text="%t"/>
-<l:template name="calloutlist" text="%t"/>
-<l:template name="caution" text="%t"/>
-<l:template name="chapter" text="%t"/>
-<l:template name="colophon" text="%t"/>
-<l:template name="constraintdef" text="%t"/>
-<l:template name="dedication" text="%t"/>
-<l:template name="equation" text="%t"/>
-<l:template name="example" text="%t"/>
-<l:template name="figure" text="%t"/>
-<l:template name="foil" text="%t" lang="en"/>
-<l:template name="foilgroup" text="%t" lang="en"/>
-<l:template name="formalpara" text="%t"/>
-<l:template name="glossary" text="%t"/>
-<l:template name="glossdiv" text="%t"/>
-<l:template name="important" text="%t"/>
-<l:template name="index" text="%t"/>
-<l:template name="indexdiv" text="%t"/>
-<l:template name="itemizedlist" text="%t"/>
-<l:template name="legalnotice" text="%t"/>
-<l:template name="listitem" text="%n"/>
-<l:template name="lot" text="%t"/>
-<l:template name="msg" text="%t"/>
-<l:template name="msgexplan" text="%t"/>
-<l:template name="msgmain" text="%t"/>
-<l:template name="msgrel" text="%t"/>
-<l:template name="msgset" text="%t"/>
-<l:template name="msgsub" text="%t"/>
-<l:template name="note" text="%t"/>
-<l:template name="orderedlist" text="%t"/>
-<l:template name="part" text="%t"/>
-<l:template name="partintro" text="%t"/>
-<l:template name="preface" text="%t"/>
-<l:template name="procedure" text="%t"/>
-<l:template name="productionset" text="%t"/>
-<l:template name="qandadiv" text="%t"/>
-<l:template name="qandaentry" text="P:Â %n"/>
-<l:template name="qandaset" text="%t"/>
-<l:template name="question" text="P:Â %n"/>
-<l:template name="reference" text="%t"/>
-<l:template name="refsynopsisdiv" text="%t"/>
-<l:template name="segmentedlist" text="%t"/>
-<l:template name="set" text="%t"/>
-<l:template name="setindex" text="%t"/>
-<l:template name="sidebar" text="%t"/>
-<l:template name="table" text="%t"/>
-<l:template name="task" text="%t" lang="en"/>
-<l:template name="tip" text="%t"/>
-<l:template name="toc" text="%t"/>
-<l:template name="variablelist" text="%t"/>
-<l:template name="varlistentry" text="%n"/>
-<l:template name="warning" text="%t"/>
-<l:template name="olink.document.citation" text=" in %o" lang="en"/>
-<l:template name="olink.page.citation" text=" (page %p)" lang="en"/>
-<l:template name="page.citation" text=" [%p]"/>
-<l:template name="page" text="(page %p)" lang="en"/>
-<l:template name="docname" text=" in %o" lang="en"/>
-<l:template name="docnamelong" text=" in the document titled %o" lang="en"/>
-<l:template name="pageabbrev" text="(p. %p)" lang="en"/>
-<l:template name="Page" text="Page %p" lang="en"/>
-<l:template name="bridgehead" text="â%tâ"/>
-<l:template name="refsection" text="â%tâ"/>
-<l:template name="refsect1" text="â%tâ"/>
-<l:template name="refsect2" text="â%tâ"/>
-<l:template name="refsect3" text="â%tâ"/>
-<l:template name="sect1" text="â%tâ"/>
-<l:template name="sect2" text="â%tâ"/>
-<l:template name="sect3" text="â%tâ"/>
-<l:template name="sect4" text="â%tâ"/>
-<l:template name="sect5" text="â%tâ"/>
-<l:template name="section" text="â%tâ"/>
-<l:template name="simplesect" text="â%tâ"/>
-</l:context>
-<l:context name="xref-number"><l:template name="answer" text="R:Â %n"/>
-<l:template name="appendix" text="ApÃ©ndiceÂ %n"/>
-<l:template name="bridgehead" text="SecciÃ³nÂ %n"/>
-<l:template name="chapter" text="CapÃ­tuloÂ %n"/>
-<l:template name="equation" text="EcuaciÃ³nÂ %n"/>
-<l:template name="example" text="EjemploÂ %n"/>
-<l:template name="figure" text="FiguraÂ %n"/>
-<l:template name="part" text="ParteÂ %n"/>
-<l:template name="procedure" text="ProcedimientoÂ %n"/>
-<l:template name="productionset" text="ProducciÃ³nÂ %n"/>
-<l:template name="qandadiv" text="P y RÂ %n"/>
-<l:template name="qandaentry" text="P:Â %n"/>
-<l:template name="question" text="P:Â %n"/>
-<l:template name="sect1" text="SecciÃ³nÂ %n"/>
-<l:template name="sect2" text="SecciÃ³nÂ %n"/>
-<l:template name="sect3" text="SecciÃ³nÂ %n"/>
-<l:template name="sect4" text="SecciÃ³nÂ %n"/>
-<l:template name="sect5" text="SecciÃ³nÂ %n"/>
-<l:template name="section" text="SecciÃ³nÂ %n"/>
-<l:template name="table" text="TablaÂ %n"/>
-</l:context>
-<l:context name="xref-number-and-title"><l:template name="appendix" text="ApÃ©ndiceÂ %n, %t"/>
-<l:template name="bridgehead" text="SecciÃ³nÂ %n, â%tâ"/>
-<l:template name="chapter" text="CapÃ­tuloÂ %n, %t"/>
-<l:template name="equation" text="EcuaciÃ³nÂ %n, â%tâ"/>
-<l:template name="example" text="EjemploÂ %n, â%tâ"/>
-<l:template name="figure" text="FiguraÂ %n, â%tâ"/>
-<l:template name="part" text="ParteÂ %n, â%tâ"/>
-<l:template name="procedure" text="ProcedimientoÂ %n, â%tâ"/>
-<l:template name="productionset" text="ProducciÃ³nÂ %n, â%tâ"/>
-<l:template name="qandadiv" text="P y RÂ %n, â%tâ"/>
-<l:template name="refsect1" text="secciÃ³n llamada â%tâ"/>
-<l:template name="refsect2" text="secciÃ³n llamada â%tâ"/>
-<l:template name="refsect3" text="secciÃ³n llamada â%tâ"/>
-<l:template name="refsection" text="secciÃ³n llamada â%tâ"/>
-<l:template name="sect1" text="SecciÃ³nÂ %n, â%tâ"/>
-<l:template name="sect2" text="SecciÃ³nÂ %n, â%tâ"/>
-<l:template name="sect3" text="SecciÃ³nÂ %n, â%tâ"/>
-<l:template name="sect4" text="SecciÃ³nÂ %n, â%tâ"/>
-<l:template name="sect5" text="SecciÃ³nÂ %n, â%tâ"/>
-<l:template name="section" text="SecciÃ³nÂ %n, â%tâ"/>
-<l:template name="simplesect" text="secciÃ³n llamada â%tâ"/>
-<l:template name="table" text="TablaÂ %n, â%tâ"/>
-</l:context>
-<l:context name="authorgroup"><l:template name="sep" text=", "/>
-<l:template name="sep2" text=" y "/>
-<l:template name="seplast" text=", y "/>
-</l:context>
-<l:context name="glossary"><l:template name="see" text="Ver %t"/>
-<l:template name="seealso" text="Ver tambiÃ©n %t"/>
-</l:context>
-<l:context name="msgset"><l:template name="MsgAud" text="Audiencia: "/>
-<l:template name="MsgLevel" text="Nivel: "/>
-<l:template name="MsgOrig" text="Origen: "/>
-</l:context>
-<l:context name="datetime"><l:template name="format" text="m/d/Y" lang="en"/>
-</l:context>
-<l:context name="termdef"><l:template name="prefix" text="[Definition: " lang="en"/>
-<l:template name="suffix" text="]" lang="en"/>
-</l:context>
-<l:context name="datetime-full"><l:template name="January" text="January" lang="en"/>
-<l:template name="February" text="February" lang="en"/>
-<l:template name="March" text="March" lang="en"/>
-<l:template name="April" text="April" lang="en"/>
-<l:template name="May" text="May" lang="en"/>
-<l:template name="June" text="June" lang="en"/>
-<l:template name="July" text="July" lang="en"/>
-<l:template name="August" text="August" lang="en"/>
-<l:template name="September" text="September" lang="en"/>
-<l:template name="October" text="October" lang="en"/>
-<l:template name="November" text="November" lang="en"/>
-<l:template name="December" text="December" lang="en"/>
-<l:template name="Monday" text="Monday" lang="en"/>
-<l:template name="Tuesday" text="Tuesday" lang="en"/>
-<l:template name="Wednesday" text="Wednesday" lang="en"/>
-<l:template name="Thursday" text="Thursday" lang="en"/>
-<l:template name="Friday" text="Friday" lang="en"/>
-<l:template name="Saturday" text="Saturday" lang="en"/>
-<l:template name="Sunday" text="Sunday" lang="en"/>
-</l:context>
-<l:context name="datetime-abbrev"><l:template name="Jan" text="Jan" lang="en"/>
-<l:template name="Feb" text="Feb" lang="en"/>
-<l:template name="Mar" text="Mar" lang="en"/>
-<l:template name="Apr" text="Apr" lang="en"/>
-<l:template name="May" text="May" lang="en"/>
-<l:template name="Jun" text="Jun" lang="en"/>
-<l:template name="Jul" text="Jul" lang="en"/>
-<l:template name="Aug" text="Aug" lang="en"/>
-<l:template name="Sep" text="Sep" lang="en"/>
-<l:template name="Oct" text="Oct" lang="en"/>
-<l:template name="Nov" text="Nov" lang="en"/>
-<l:template name="Dec" text="Dec" lang="en"/>
-<l:template name="Mon" text="Mon" lang="en"/>
-<l:template name="Tue" text="Tue" lang="en"/>
-<l:template name="Wed" text="Wed" lang="en"/>
-<l:template name="Thu" text="Thu" lang="en"/>
-<l:template name="Fri" text="Fri" lang="en"/>
-<l:template name="Sat" text="Sat" lang="en"/>
-<l:template name="Sun" text="Sun" lang="en"/>
-</l:context>
-<l:context name="htmlhelp"><l:template name="langcode" text="0x040a Spanish (Traditional Sort)"/>
-</l:context>
-<l:context name="index"><l:template name="term-separator" text=", " lang="en"/>
-<l:template name="number-separator" text=", " lang="en"/>
-<l:template name="range-separator" text="-" lang="en"/>
-</l:context>
-<l:context name="iso690"><l:template name="lastfirst.sep" text=", " lang="en"/>
-<l:template name="alt.person.two.sep" text=" â " lang="en"/>
-<l:template name="alt.person.last.sep" text=" â " lang="en"/>
-<l:template name="alt.person.more.sep" text=" â " lang="en"/>
-<l:template name="primary.editor" text=" (ed.)" lang="en"/>
-<l:template name="primary.many" text=", et al." lang="en"/>
-<l:template name="primary.sep" text=". " lang="en"/>
-<l:template name="submaintitle.sep" text=": " lang="en"/>
-<l:template name="title.sep" text=". " lang="en"/>
-<l:template name="othertitle.sep" text=", " lang="en"/>
-<l:template name="medium1" text=" [" lang="en"/>
-<l:template name="medium2" text="]" lang="en"/>
-<l:template name="secondary.person.sep" text="; " lang="en"/>
-<l:template name="secondary.sep" text=". " lang="en"/>
-<l:template name="respons.sep" text=". " lang="en"/>
-<l:template name="edition.sep" text=". " lang="en"/>
-<l:template name="edition.serial.sep" text=", " lang="en"/>
-<l:template name="issuing.range" text="-" lang="en"/>
-<l:template name="issuing.div" text=", " lang="en"/>
-<l:template name="issuing.sep" text=". " lang="en"/>
-<l:template name="partnr.sep" text=". " lang="en"/>
-<l:template name="placepubl.sep" text=": " lang="en"/>
-<l:template name="publyear.sep" text=", " lang="en"/>
-<l:template name="pubinfo.sep" text=". " lang="en"/>
-<l:template name="spec.pubinfo.sep" text=", " lang="en"/>
-<l:template name="upd.sep" text=", " lang="en"/>
-<l:template name="datecit1" text=" [cited " lang="en"/>
-<l:template name="datecit2" text="]" lang="en"/>
-<l:template name="extent.sep" text=". " lang="en"/>
-<l:template name="locs.sep" text=", " lang="en"/>
-<l:template name="location.sep" text=". " lang="en"/>
-<l:template name="serie.sep" text=". " lang="en"/>
-<l:template name="notice.sep" text=". " lang="en"/>
-<l:template name="access" text="Available " lang="en"/>
-<l:template name="acctoo" text="Also available " lang="en"/>
-<l:template name="onwww" text="from World Wide Web" lang="en"/>
-<l:template name="oninet" text="from Internet" lang="en"/>
-<l:template name="access.end" text=": " lang="en"/>
-<l:template name="link1" text="&lt;" lang="en"/>
-<l:template name="link2" text="&gt;" lang="en"/>
-<l:template name="access.sep" text=". " lang="en"/>
-<l:template name="isbn" text="ISBN " lang="en"/>
-<l:template name="issn" text="ISSN " lang="en"/>
-<l:template name="stdnum.sep" text=". " lang="en"/>
-<l:template name="patcountry.sep" text=". " lang="en"/>
-<l:template name="pattype.sep" text=", " lang="en"/>
-<l:template name="patnum.sep" text=". " lang="en"/>
-<l:template name="patdate.sep" text=". " lang="en"/>
-</l:context><l:letters><l:l i="-1"/>
-<l:l i="0">SÃ­mbolos</l:l>
-<l:l i="1">A</l:l>
-<l:l i="1">a</l:l>
-<l:l i="1">Ã¡</l:l>
-<l:l i="1">Ã</l:l>
-<l:l i="2">B</l:l>
-<l:l i="2">b</l:l>
-<l:l i="3">C</l:l>
-<l:l i="3">c</l:l>
-<l:l i="4">CH</l:l>
-<l:l i="4">ch</l:l>
-<l:l i="5">D</l:l>
-<l:l i="5">d</l:l>
-<l:l i="6">E</l:l>
-<l:l i="6">e</l:l>
-<l:l i="6">Ã</l:l>
-<l:l i="6">Ã©</l:l>
-<l:l i="7">F</l:l>
-<l:l i="7">f</l:l>
-<l:l i="8">G</l:l>
-<l:l i="8">g</l:l>
-<l:l i="9">H</l:l>
-<l:l i="9">h</l:l>
-<l:l i="10">I</l:l>
-<l:l i="10">i</l:l>
-<l:l i="10">Ã</l:l>
-<l:l i="10">Ã­</l:l>
-<l:l i="11">J</l:l>
-<l:l i="11">j</l:l>
-<l:l i="12">K</l:l>
-<l:l i="12">k</l:l>
-<l:l i="13">L</l:l>
-<l:l i="13">l</l:l>
-<l:l i="14">LL</l:l>
-<l:l i="14">ll</l:l>
-<l:l i="15">M</l:l>
-<l:l i="15">m</l:l>
-<l:l i="16">N</l:l>
-<l:l i="16">n</l:l>
-<l:l i="17">Ã</l:l>
-<l:l i="17">Ã±</l:l>
-<l:l i="18">O</l:l>
-<l:l i="18">o</l:l>
-<l:l i="18">Ã</l:l>
-<l:l i="18">Ã³</l:l>
-<l:l i="19">P</l:l>
-<l:l i="19">p</l:l>
-<l:l i="20">Q</l:l>
-<l:l i="20">q</l:l>
-<l:l i="21">R</l:l>
-<l:l i="21">r</l:l>
-<l:l i="22">S</l:l>
-<l:l i="22">s</l:l>
-<l:l i="23">T</l:l>
-<l:l i="23">t</l:l>
-<l:l i="24">U</l:l>
-<l:l i="24">u</l:l>
-<l:l i="24">Ã</l:l>
-<l:l i="24">Ãº</l:l>
-<l:l i="25">V</l:l>
-<l:l i="25">v</l:l>
-<l:l i="26">W</l:l>
-<l:l i="26">w</l:l>
-<l:l i="27">X</l:l>
-<l:l i="27">x</l:l>
-<l:l i="28">Y</l:l>
-<l:l i="28">y</l:l>
-<l:l i="29">Z</l:l>
-<l:l i="29">z</l:l>
-</l:letters>
-</l:l10n>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/fr.xml
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/fr.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,693 +1,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="fr" english-language-name="French">
-
-<!-- * This file is generated automatically. -->
-<!-- * To submit changes to this file upstream (to the DocBook Project) -->
-<!-- * do not submit an edited version of this file. Instead, submit an -->
-<!-- * edited version of the source file at the following location: -->
-<!-- * -->
-<!-- *  https://svn.sourceforge.net/svnroot/docbook/trunk/gentext/locale/fr.xml -->
-<!-- * -->
-<!-- * E-mail the edited fr.xml source file to: -->
-<!-- * -->
-<!-- *  docbook-developers@lists.sourceforge.net -->
-
-<!-- ******************************************************************** -->
-
-<!-- This file is part of the XSL DocBook Stylesheet distribution. -->
-<!-- See ../README or http://docbook.sf.net/release/xsl/current/ for -->
-<!-- copyright and other information. -->
-
-<!-- ******************************************************************** -->
-<!-- In these files, % with a letter is used for a placeholder: -->
-<!--   %t is the current element's title -->
-<!--   %s is the current element's subtitle (if applicable)-->
-<!--   %n is the current element's number label-->
-<!--   %p is the current element's page number (if applicable)-->
-<!-- ******************************************************************** -->
-
-
-<l:gentext key="Abstract" text="RÃ©sumÃ©"/>
-<l:gentext key="abstract" text="RÃ©sumÃ©"/>
-<l:gentext key="Answer" text="RÂ :"/>
-<l:gentext key="answer" text="RÂ :"/>
-<l:gentext key="Appendix" text="Annexe"/>
-<l:gentext key="appendix" text="annexe"/>
-<l:gentext key="Article" text="Article"/>
-<l:gentext key="article" text="Article"/>
-<l:gentext key="Author" text="Auteur"/>
-<l:gentext key="Bibliography" text="Bibliographie"/>
-<l:gentext key="bibliography" text="Bibliographie"/>
-<l:gentext key="Book" text="Livre"/>
-<l:gentext key="book" text="Livre"/>
-<l:gentext key="CAUTION" text="ATTENTION"/>
-<l:gentext key="Caution" text="Attention"/>
-<l:gentext key="caution" text="Attention"/>
-<l:gentext key="Chapter" text="Chapitre"/>
-<l:gentext key="chapter" text="chapitre"/>
-<l:gentext key="Colophon" text="AchevÃ© d'imprimer"/>
-<l:gentext key="colophon" text="AchevÃ© d'imprimer"/>
-<l:gentext key="Copyright" text="Copyright"/>
-<l:gentext key="copyright" text="Copyright"/>
-<l:gentext key="Dedication" text="DÃ©dicace"/>
-<l:gentext key="dedication" text="DÃ©dicace"/>
-<l:gentext key="Edition" text="Ãdition"/>
-<l:gentext key="edition" text="Ãdition"/>
-<l:gentext key="Editor" text="Editor" lang="en"/>
-<l:gentext key="Equation" text="Ãquation"/>
-<l:gentext key="equation" text="Ãquation"/>
-<l:gentext key="Example" text="Exemple"/>
-<l:gentext key="example" text="Exemple"/>
-<l:gentext key="Figure" text="Figure"/>
-<l:gentext key="figure" text="Figure"/>
-<l:gentext key="Glossary" text="Glossaire"/>
-<l:gentext key="glossary" text="Glossaire"/>
-<l:gentext key="GlossSee" text="Voir"/>
-<l:gentext key="glosssee" text="Voir"/>
-<l:gentext key="GlossSeeAlso" text="Voir aussi"/>
-<l:gentext key="glossseealso" text="Voir aussi"/>
-<l:gentext key="IMPORTANT" text="IMPORTANT"/>
-<l:gentext key="important" text="Important"/>
-<l:gentext key="Important" text="Important"/>
-<l:gentext key="Index" text="Index"/>
-<l:gentext key="index" text="Index"/>
-<l:gentext key="ISBN" text="ISBN"/>
-<l:gentext key="isbn" text="ISBN"/>
-<l:gentext key="LegalNotice" text="Note lÃ©gale"/>
-<l:gentext key="legalnotice" text="Note lÃ©gale"/>
-<l:gentext key="MsgAud" text="Public visÃ©"/>
-<l:gentext key="msgaud" text="Public visÃ©"/>
-<l:gentext key="MsgLevel" text="Niveau"/>
-<l:gentext key="msglevel" text="Niveau"/>
-<l:gentext key="MsgOrig" text="Origine"/>
-<l:gentext key="msgorig" text="Origine"/>
-<l:gentext key="NOTE" text="NOTE"/>
-<l:gentext key="Note" text="Note"/>
-<l:gentext key="note" text="Note"/>
-<l:gentext key="Part" text="Partie"/>
-<l:gentext key="part" text="Partie"/>
-<l:gentext key="Preface" text="PrÃ©face"/>
-<l:gentext key="preface" text="PrÃ©face"/>
-<l:gentext key="Procedure" text="ProcÃ©dure"/>
-<l:gentext key="procedure" text="ProcÃ©dure"/>
-<l:gentext key="ProductionSet" text="Production"/>
-<l:gentext key="PubDate" text="Date de publication"/>
-<l:gentext key="pubdate" text="Date de publication"/>
-<l:gentext key="Published" text="PubliÃ© le"/>
-<l:gentext key="published" text="PubliÃ© le"/>
-<l:gentext key="Publisher" text="Publisher" lang="en"/>
-<l:gentext key="Qandadiv" text="Q &amp; R"/>
-<l:gentext key="qandadiv" text="Q &amp; R"/>
-<l:gentext key="QandASet" text="Frequently Asked Questions" lang="en"/>
-<l:gentext key="Question" text="QÂ :"/>
-<l:gentext key="question" text="QÂ :"/>
-<l:gentext key="RefEntry" text=""/>
-<l:gentext key="refentry" text=""/>
-<l:gentext key="Reference" text="RÃ©fÃ©rence"/>
-<l:gentext key="reference" text="RÃ©fÃ©rence"/>
-<l:gentext key="References" text="References" lang="en"/>
-<l:gentext key="RefName" text="Nom"/>
-<l:gentext key="refname" text="Nom"/>
-<l:gentext key="RefSection" text=""/>
-<l:gentext key="refsection" text=""/>
-<l:gentext key="RefSynopsisDiv" text="Synopsis"/>
-<l:gentext key="refsynopsisdiv" text="Synopsis"/>
-<l:gentext key="RevHistory" text="Historique des versions"/>
-<l:gentext key="revhistory" text="Historique des versions"/>
-<l:gentext key="revision" text="Version"/>
-<l:gentext key="Revision" text="Version"/>
-<l:gentext key="sect1" text="Section"/>
-<l:gentext key="sect2" text="Section"/>
-<l:gentext key="sect3" text="Section"/>
-<l:gentext key="sect4" text="Section"/>
-<l:gentext key="sect5" text="Section"/>
-<l:gentext key="section" text="section"/>
-<l:gentext key="Section" text="Section"/>
-<l:gentext key="see" text="voir"/>
-<l:gentext key="See" text="Voir"/>
-<l:gentext key="seealso" text="voir aussi"/>
-<l:gentext key="Seealso" text="Voir aussi"/>
-<l:gentext key="SeeAlso" text="Voir Aussi"/>
-<l:gentext key="set" text="Ensemble"/>
-<l:gentext key="Set" text="Ensemble"/>
-<l:gentext key="setindex" text="Index"/>
-<l:gentext key="SetIndex" text="Index"/>
-<l:gentext key="Sidebar" text="Filet vertical"/>
-<l:gentext key="sidebar" text="Filet vertical"/>
-<l:gentext key="step" text="Ã©tape"/>
-<l:gentext key="Step" text="Ãtape"/>
-<l:gentext key="table" text="Tableau"/>
-<l:gentext key="Table" text="Tableau"/>
-<l:gentext key="task" text="Task" lang="en"/>
-<l:gentext key="Task" text="Task" lang="en"/>
-<l:gentext key="tip" text="ASTUCE"/>
-<l:gentext key="TIP" text="ASTUCE"/>
-<l:gentext key="Tip" text="Astuce"/>
-<l:gentext key="Warning" text="Avertissement"/>
-<l:gentext key="warning" text="AVERTISSEMENT"/>
-<l:gentext key="WARNING" text="AVERTISSEMENT"/>
-<l:gentext key="and" text="et"/>
-<l:gentext key="by" text="par"/>
-<l:gentext key="Edited" text="PubliÃ©"/>
-<l:gentext key="edited" text="PubliÃ©"/>
-<l:gentext key="Editedby" text="PubliÃ© par"/>
-<l:gentext key="editedby" text="PubliÃ© par"/>
-<l:gentext key="in" text="dans"/>
-<l:gentext key="lastlistcomma" text=","/>
-<l:gentext key="listcomma" text=","/>
-<l:gentext key="nonexistantelement" text="Cet Ã©lÃ©ment n'existe pas"/>
-<l:gentext key="notes" text="Notes"/>
-<l:gentext key="Notes" text="Notes"/>
-<l:gentext key="Pgs" text="Pages"/>
-<l:gentext key="pgs" text="Pages"/>
-<l:gentext key="Revisedby" text="Revu et corrigÃ© parÂ : "/>
-<l:gentext key="revisedby" text="Revu et corrigÃ© parÂ : "/>
-<l:gentext key="TableNotes" text="Remarques"/>
-<l:gentext key="tablenotes" text="Remarques"/>
-<l:gentext key="TableofContents" text="Table des matiÃšres"/>
-<l:gentext key="tableofcontents" text="Table des matiÃšres"/>
-<l:gentext key="unexpectedelementname" text="Nom d'Ã©lÃ©ment inattendu"/>
-<l:gentext key="unsupported" text="Non reconnu par le systÃšme"/>
-<l:gentext key="xrefto" text="RÃ©fÃ©rence vers"/>
-<l:gentext key="Authors" text="Authors" lang="en"/>
-<l:gentext key="copyeditor" text="Copy Editor" lang="en"/>
-<l:gentext key="graphicdesigner" text="Graphic Designer" lang="en"/>
-<l:gentext key="productioneditor" text="Production Editor" lang="en"/>
-<l:gentext key="technicaleditor" text="Technical Editor" lang="en"/>
-<l:gentext key="translator" text="Translator" lang="en"/>
-<l:gentext key="listofequations" text="Liste des Ã©quations"/>
-<l:gentext key="ListofEquations" text="Liste des Ã©quations"/>
-<l:gentext key="ListofExamples" text="Liste des exemples"/>
-<l:gentext key="listofexamples" text="Liste des exemples"/>
-<l:gentext key="ListofFigures" text="Liste des illustrations"/>
-<l:gentext key="listoffigures" text="Liste des illustrations"/>
-<l:gentext key="ListofProcedures" text="Liste des procÃ©dures"/>
-<l:gentext key="listofprocedures" text="Liste des procÃ©dures"/>
-<l:gentext key="listoftables" text="Liste des tableaux"/>
-<l:gentext key="ListofTables" text="Liste des tableaux"/>
-<l:gentext key="ListofUnknown" text="Liste inconnue"/>
-<l:gentext key="listofunknown" text="Liste inconnue"/>
-<l:gentext key="nav-home" text="Sommaire"/>
-<l:gentext key="nav-next" text="Suivant"/>
-<l:gentext key="nav-next-sibling" text="Avance rapide"/>
-<l:gentext key="nav-prev" text="PrÃ©cÃ©dent"/>
-<l:gentext key="nav-prev-sibling" text="ArriÃšre rapide"/>
-<l:gentext key="nav-up" text="Niveau supÃ©rieur"/>
-<l:gentext key="nav-toc" text="TdM"/>
-<l:gentext key="Draft" text="Brouillon"/>
-<l:gentext key="above" text="au-dessus"/>
-<l:gentext key="below" text="au-dessous"/>
-<l:gentext key="sectioncalled" text="la section intitulÃ©e"/>
-<l:gentext key="index symbols" text="Symboles"/>
-<l:gentext key="lowercase.alpha" text="abcdefghijklmnopqrstuvwxyzÃ¢ÃªÃ®ÃŽÃ»Ã«Ã¯ÃŒÃ ÃšÃ¹Ã©Ã§ÃŠÅ"/>
-<l:gentext key="uppercase.alpha" text="ABCDEFGHIJKLMNOPQRSTUVWXYZÃÃÃÃÃÃÃÃÃÃÃÃÃÃÅ"/>
-<l:gentext key="normalize.sort.input" text="AaÃÃ ÃÃ¡ÃÃ¢ÃÃ£ÃÃ€Ã
-Ã¥ÄÄÄÄÄÄ
-ÇÇÇÇÇ Ç¡ÇºÇ»ÈÈÈÈÈŠÈ§ážážáºáº áº¡áº¢áº£áº€áº¥áºŠáº§áºšáº©áºªáº«áº¬áº­áº®áº¯áº°áº±áº²áº³áºŽáºµáº¶áº·BbÆÆÉÆÆážážážáž
-ážážCcÃÃ§ÄÄÄÄÄÄÄÄÆÆÉážážDdÄÄÄÄÆÉÆÆÇ
-Ç²È¡ÉážážážážážážážážážážEeÃÃšÃÃ©ÃÃªÃÃ«ÄÄÄÄÄÄÄÄÄÄÈÈ
-ÈÈÈšÈ©ážážážážážážážážážážáºžáº¹áººáº»áºŒáºœáºŸáº¿á»á»á»á»á»á»
-á»á»FfÆÆážážGgÄÄÄÄÄ Ä¡Ä¢Ä£ÆÉ Ç€Ç¥ÇŠÇ§ÇŽÇµáž áž¡HhÄ€Ä¥ÄŠÄ§ÈÈÉŠáž¢áž£áž€áž¥ážŠáž§ážšáž©ážªáž«áºIiÃÃ¬ÃÃ­ÃÃ®ÃÃ¯ÄšÄ©ÄªÄ«Ä¬Ä­Ä®Ä¯Ä°ÆÉšÇÇÈÈÈÈáž¬áž­áž®áž¯á»á»á»á»JjÄŽÄµÇ°ÊKkÄ¶Ä·ÆÆÇšÇ©áž°áž±áž²áž³ážŽážµLlÄ¹ÄºÄ»ÄŒÄœÄŸÄ¿ÅÅÅÆÇÈŽÉ«É¬É­áž¶áž·ážžáž¹ážºáž»ážŒážœMmÉ±ážŸáž¿á¹á¹á¹á¹NnÃÃ±ÅÅÅ
-ÅÅÅÆÉ²ÆÈ ÇÇžÇ¹ÈµÉ³á¹á¹
-á¹á¹á¹á¹á¹á¹OoÃÃ²ÃÃ³ÃÃŽÃÃµÃÃ¶ÃÃžÅÅÅÅÅÅÆÆ Æ¡ÇÇÇªÇ«Ç¬Ç­ÇŸÇ¿ÈÈÈÈÈªÈ«È¬È­È®È¯È°È±á¹á¹á¹á¹á¹á¹á¹á¹á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á» á»¡á»¢á»£PpÆ€Æ¥á¹á¹á¹á¹QqÊ RrÅÅÅÅÅÅÈÈÈÈÉŒÉœÉŸá¹á¹á¹á¹á¹á¹á¹á¹SsÅÅÅÅÅÅÅ Å¡ÈÈÊá¹ á¹¡á¹¢á¹£á¹€á¹¥á¹Šá¹§á¹šá¹©TtÅ¢Å£Å€Å¥ÅŠÅ§Æ«Æ¬Æ­Æ®ÊÈÈÈ¶á¹ªá¹«á¹¬á¹­á¹®á¹¯á¹°á¹±áºUuÃÃ¹ÃÃºÃÃ»ÃÃŒÅšÅ©ÅªÅ«Å¬Å­Å®Å¯Å°Å±Å²Å³Æ¯Æ°ÇÇÇÇÇÇÇÇÇÇÈÈÈÈá¹²á¹³á¹Žá¹µá¹¶á¹·á¹žá¹¹á¹ºá¹»á»€á»¥á»Šá»§á»šá»©á»ªá»«á»¬á»­á»®á»¯á»°á»±VvÆ²Êá¹Œá¹œá¹Ÿá¹¿WwÅŽÅµáºáºáºáºáºáº
-áºáºáºáºáºXxáºáºáºáºYyÃÃœÃ¿ÅžÅ¶Å·Æ³ÆŽÈ²È³áºáºáºá»²á»³á»Žá»µá»¶á»·á»žá»¹ZzÅ¹ÅºÅ»ÅŒÅœÅŸÆµÆ¶È€È¥ÊÊáºáºáºáºáºáºáº" lang="en"/>
-<l:gentext key="normalize.sort.output" text="AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ" lang="en"/>
-<l:dingbat key="startquote" text="Â«Â "/>
-<l:dingbat key="endquote" text="Â Â»"/>
-<l:dingbat key="nestedstartquote" text="â"/>
-<l:dingbat key="nestedendquote" text="â"/>
-<l:dingbat key="singlestartquote" text="â¹"/>
-<l:dingbat key="singleendquote" text="âº"/>
-<l:dingbat key="bullet" text="â¢"/>
-<l:gentext key="hyphenation-character" text="-"/>
-<l:gentext key="hyphenation-push-character-count" text="2"/>
-<l:gentext key="hyphenation-remain-character-count" text="2"/>
-<l:context name="styles"><l:template name="person-name" text="first-last"/>
-</l:context>
-<l:context name="title"><l:template name="abstract" text="%t"/>
-<l:template name="answer" text="%t"/>
-<l:template name="appendix" text="AnnexeÂ %n.Â %t"/>
-<l:template name="article" text="%t"/>
-<l:template name="authorblurb" text="%t"/>
-<l:template name="bibliodiv" text="%t"/>
-<l:template name="biblioentry" text="%t"/>
-<l:template name="bibliography" text="%t"/>
-<l:template name="bibliolist" text="%t" lang="en"/>
-<l:template name="bibliomixed" text="%t"/>
-<l:template name="bibliomset" text="%t"/>
-<l:template name="biblioset" text="%t"/>
-<l:template name="blockquote" text="%t"/>
-<l:template name="book" text="%t"/>
-<l:template name="calloutlist" text="%t"/>
-<l:template name="caution" text="%t"/>
-<l:template name="chapter" text="ChapitreÂ %n.Â %t"/>
-<l:template name="colophon" text="%t"/>
-<l:template name="dedication" text="%t"/>
-<l:template name="equation" text="ÃquationÂ %n.Â %t"/>
-<l:template name="example" text="ExempleÂ %n.Â %t"/>
-<l:template name="figure" text="FigureÂ %n.Â %t"/>
-<l:template name="foil" text="%t" lang="en"/>
-<l:template name="foilgroup" text="%t" lang="en"/>
-<l:template name="formalpara" text="%t"/>
-<l:template name="glossary" text="%t"/>
-<l:template name="glossdiv" text="%t"/>
-<l:template name="glosslist" text="%t" lang="en"/>
-<l:template name="glossentry" text="%t"/>
-<l:template name="important" text="%t"/>
-<l:template name="index" text="%t"/>
-<l:template name="indexdiv" text="%t"/>
-<l:template name="itemizedlist" text="%t"/>
-<l:template name="legalnotice" text="%t"/>
-<l:template name="listitem" text=""/>
-<l:template name="lot" text="%t"/>
-<l:template name="msg" text="%t"/>
-<l:template name="msgexplan" text="%t"/>
-<l:template name="msgmain" text="%t"/>
-<l:template name="msgrel" text="%t"/>
-<l:template name="msgset" text="%t"/>
-<l:template name="msgsub" text="%t"/>
-<l:template name="note" text="%t"/>
-<l:template name="orderedlist" text="%t"/>
-<l:template name="part" text="%t"/>
-<l:template name="partintro" text="%t"/>
-<l:template name="preface" text="%t"/>
-<l:template name="procedure" text="%t"/>
-<l:template name="procedure.formal" text="ProcÃ©dureÂ %n.Â %t"/>
-<l:template name="productionset" text="%t"/>
-<l:template name="productionset.formal" text="ProductionÂ %n"/>
-<l:template name="qandadiv" text="%t"/>
-<l:template name="qandaentry" text="%t"/>
-<l:template name="qandaset" text="%t"/>
-<l:template name="question" text="%t"/>
-<l:template name="refentry" text="%t"/>
-<l:template name="reference" text="%t"/>
-<l:template name="refsection" text="%t"/>
-<l:template name="refsect1" text="%t"/>
-<l:template name="refsect2" text="%t"/>
-<l:template name="refsect3" text="%t"/>
-<l:template name="refsynopsisdiv" text="%t"/>
-<l:template name="refsynopsisdivinfo" text="%t"/>
-<l:template name="segmentedlist" text="%t"/>
-<l:template name="set" text="%t"/>
-<l:template name="setindex" text="%t"/>
-<l:template name="sidebar" text="%t"/>
-<l:template name="step" text="%t"/>
-<l:template name="table" text="TableauÂ %n.Â %t"/>
-<l:template name="task" text="%t"/>
-<l:template name="tasksummary" text="%t" lang="en"/>
-<l:template name="taskprerequisites" text="%t" lang="en"/>
-<l:template name="taskrelated" text="%t" lang="en"/>
-<l:template name="tip" text="%t"/>
-<l:template name="toc" text="%t"/>
-<l:template name="variablelist" text="%t"/>
-<l:template name="varlistentry" text=""/>
-<l:template name="warning" text="%t"/>
-</l:context>
-<l:context name="title-unnumbered"><l:template name="appendix" text="%t"/>
-<l:template name="article/appendix" text="%t"/>
-<l:template name="bridgehead" text="%t"/>
-<l:template name="chapter" text="%t"/>
-<l:template name="sect1" text="%t"/>
-<l:template name="sect2" text="%t"/>
-<l:template name="sect3" text="%t"/>
-<l:template name="sect4" text="%t"/>
-<l:template name="sect5" text="%t"/>
-<l:template name="section" text="%t"/>
-<l:template name="simplesect" text="%t"/>
-<l:template name="part" text="%t" lang="en"/>
-</l:context>
-<l:context name="title-numbered"><l:template name="appendix" text="AnnexeÂ %n.Â %t"/>
-<l:template name="article/appendix" text="%n.Â %t"/>
-<l:template name="bridgehead" text="%n.Â %t"/>
-<l:template name="chapter" text="ChapitreÂ %n.Â %t"/>
-<l:template name="part" text="PartieÂ %n.Â %t"/>
-<l:template name="sect1" text="%n.Â %t"/>
-<l:template name="sect2" text="%n.Â %t"/>
-<l:template name="sect3" text="%n.Â %t"/>
-<l:template name="sect4" text="%n.Â %t"/>
-<l:template name="sect5" text="%n.Â %t"/>
-<l:template name="section" text="%n.Â %t"/>
-<l:template name="simplesect" text="%t"/>
-</l:context>
-<l:context name="subtitle"><l:template name="appendix" text="%s"/>
-<l:template name="article" text="%s"/>
-<l:template name="bibliodiv" text="%s"/>
-<l:template name="biblioentry" text="%s"/>
-<l:template name="bibliography" text="%s"/>
-<l:template name="bibliomixed" text="%s"/>
-<l:template name="bibliomset" text="%s"/>
-<l:template name="biblioset" text="%s"/>
-<l:template name="book" text="%s"/>
-<l:template name="chapter" text="%s"/>
-<l:template name="colophon" text="%s"/>
-<l:template name="dedication" text="%s"/>
-<l:template name="glossary" text="%s"/>
-<l:template name="glossdiv" text="%s"/>
-<l:template name="index" text="%s"/>
-<l:template name="indexdiv" text="%s"/>
-<l:template name="lot" text="%s"/>
-<l:template name="part" text="%s"/>
-<l:template name="partintro" text="%s"/>
-<l:template name="preface" text="%s"/>
-<l:template name="refentry" text="%s"/>
-<l:template name="reference" text="%s"/>
-<l:template name="refsection" text="%s"/>
-<l:template name="refsect1" text="%s"/>
-<l:template name="refsect2" text="%s"/>
-<l:template name="refsect3" text="%s"/>
-<l:template name="refsynopsisdiv" text="%s"/>
-<l:template name="sect1" text="%s"/>
-<l:template name="sect2" text="%s"/>
-<l:template name="sect3" text="%s"/>
-<l:template name="sect4" text="%s"/>
-<l:template name="sect5" text="%s"/>
-<l:template name="section" text="%s"/>
-<l:template name="set" text="%s"/>
-<l:template name="setindex" text="%s"/>
-<l:template name="sidebar" text="%s"/>
-<l:template name="simplesect" text="%s"/>
-<l:template name="toc" text="%s"/>
-</l:context>
-<l:context name="xref"><l:template name="abstract" text="%t"/>
-<l:template name="answer" text="RÂ :Â %n"/>
-<l:template name="appendix" text="%t"/>
-<l:template name="article" text="%t"/>
-<l:template name="authorblurb" text="%t"/>
-<l:template name="bibliodiv" text="%t"/>
-<l:template name="bibliography" text="%t"/>
-<l:template name="bibliomset" text="%t"/>
-<l:template name="biblioset" text="%t"/>
-<l:template name="blockquote" text="%t"/>
-<l:template name="book" text="%t"/>
-<l:template name="calloutlist" text="%t"/>
-<l:template name="caution" text="%t"/>
-<l:template name="chapter" text="%t"/>
-<l:template name="colophon" text="%t"/>
-<l:template name="constraintdef" text="%t"/>
-<l:template name="dedication" text="%t"/>
-<l:template name="equation" text="%t"/>
-<l:template name="example" text="%t"/>
-<l:template name="figure" text="%t"/>
-<l:template name="foil" text="%t" lang="en"/>
-<l:template name="foilgroup" text="%t" lang="en"/>
-<l:template name="formalpara" text="%t"/>
-<l:template name="glossary" text="%t"/>
-<l:template name="glossdiv" text="%t"/>
-<l:template name="important" text="%t"/>
-<l:template name="index" text="%t"/>
-<l:template name="indexdiv" text="%t"/>
-<l:template name="itemizedlist" text="%t"/>
-<l:template name="legalnotice" text="%t"/>
-<l:template name="listitem" text="%n"/>
-<l:template name="lot" text="%t"/>
-<l:template name="msg" text="%t"/>
-<l:template name="msgexplan" text="%t"/>
-<l:template name="msgmain" text="%t"/>
-<l:template name="msgrel" text="%t"/>
-<l:template name="msgset" text="%t"/>
-<l:template name="msgsub" text="%t"/>
-<l:template name="note" text="%t"/>
-<l:template name="orderedlist" text="%t"/>
-<l:template name="part" text="%t"/>
-<l:template name="partintro" text="%t"/>
-<l:template name="preface" text="%t"/>
-<l:template name="procedure" text="%t"/>
-<l:template name="productionset" text="%t"/>
-<l:template name="qandadiv" text="%t"/>
-<l:template name="qandaentry" text="QÂ :Â %n"/>
-<l:template name="qandaset" text="%t"/>
-<l:template name="question" text="QÂ :Â %n"/>
-<l:template name="reference" text="%t"/>
-<l:template name="refsynopsisdiv" text="%t"/>
-<l:template name="segmentedlist" text="%t"/>
-<l:template name="set" text="%t"/>
-<l:template name="setindex" text="%t"/>
-<l:template name="sidebar" text="%t"/>
-<l:template name="table" text="%t"/>
-<l:template name="task" text="%t" lang="en"/>
-<l:template name="tip" text="%t"/>
-<l:template name="toc" text="%t"/>
-<l:template name="variablelist" text="%t"/>
-<l:template name="varlistentry" text="%n"/>
-<l:template name="warning" text="%t"/>
-<l:template name="olink.document.citation" text=" in %o" lang="en"/>
-<l:template name="olink.page.citation" text=" (page %p)" lang="en"/>
-<l:template name="page.citation" text=" [%p]"/>
-<l:template name="page" text="(page %p)"/>
-<l:template name="docname" text=" in %o" lang="en"/>
-<l:template name="docnamelong" text=" in the document titled %o" lang="en"/>
-<l:template name="pageabbrev" text="(p. %p)"/>
-<l:template name="Page" text="Page %p"/>
-<l:template name="bridgehead" text="la section intitulÃ©e Â«Â %tÂ Â»"/>
-<l:template name="refsection" text="la section intitulÃ©e Â«Â %tÂ Â»"/>
-<l:template name="refsect1" text="la section intitulÃ©e Â«Â %tÂ Â»"/>
-<l:template name="refsect2" text="la section intitulÃ©e Â«Â %tÂ Â»"/>
-<l:template name="refsect3" text="la section intitulÃ©e Â«Â %tÂ Â»"/>
-<l:template name="sect1" text="la section intitulÃ©e Â«Â %tÂ Â»"/>
-<l:template name="sect2" text="la section intitulÃ©e Â«Â %tÂ Â»"/>
-<l:template name="sect3" text="la section intitulÃ©e Â«Â %tÂ Â»"/>
-<l:template name="sect4" text="la section intitulÃ©e Â«Â %tÂ Â»"/>
-<l:template name="sect5" text="la section intitulÃ©e Â«Â %tÂ Â»"/>
-<l:template name="section" text="la section intitulÃ©e Â«Â %tÂ Â»"/>
-<l:template name="simplesect" text="la section intitulÃ©e Â«Â %tÂ Â»"/>
-</l:context>
-<l:context name="xref-number"><l:template name="answer" text="RÂ :Â %n"/>
-<l:template name="appendix" text="AnnexeÂ %n"/>
-<l:template name="bridgehead" text="SectionÂ %n"/>
-<l:template name="chapter" text="ChapitreÂ %n"/>
-<l:template name="equation" text="ÃquationÂ %n"/>
-<l:template name="example" text="ExempleÂ %n"/>
-<l:template name="figure" text="FigureÂ %n"/>
-<l:template name="part" text="PartieÂ %n"/>
-<l:template name="procedure" text="ProcÃ©dureÂ %n"/>
-<l:template name="productionset" text="ProductionÂ %n"/>
-<l:template name="qandadiv" text="Q &amp; RÂ %n"/>
-<l:template name="qandaentry" text="QÂ :Â %n"/>
-<l:template name="question" text="QÂ :Â %n"/>
-<l:template name="sect1" text="SectionÂ %n"/>
-<l:template name="sect2" text="SectionÂ %n"/>
-<l:template name="sect3" text="SectionÂ %n"/>
-<l:template name="sect4" text="SectionÂ %n"/>
-<l:template name="sect5" text="SectionÂ %n"/>
-<l:template name="section" text="SectionÂ %n"/>
-<l:template name="table" text="TableauÂ %n"/>
-</l:context>
-<l:context name="xref-number-and-title"><l:template name="appendix" text="AnnexeÂ %n, %t"/>
-<l:template name="bridgehead" text="SectionÂ %n, Â«Â %tÂ Â»"/>
-<l:template name="chapter" text="ChapitreÂ %n, %t"/>
-<l:template name="equation" text="ÃquationÂ %n, Â«Â %tÂ Â»"/>
-<l:template name="example" text="ExempleÂ %n, Â«Â %tÂ Â»"/>
-<l:template name="figure" text="FigureÂ %n, Â«Â %tÂ Â»"/>
-<l:template name="part" text="PartieÂ %n, Â«Â %tÂ Â»"/>
-<l:template name="procedure" text="ProcÃ©dureÂ %n, Â«Â %tÂ Â»"/>
-<l:template name="productionset" text="ProductionÂ %n, Â«Â %tÂ Â»"/>
-<l:template name="qandadiv" text="Q &amp; RÂ %n, Â«Â %tÂ Â»"/>
-<l:template name="refsect1" text="la section intitulÃ©e Â«Â %tÂ Â»"/>
-<l:template name="refsect2" text="la section intitulÃ©e Â«Â %tÂ Â»"/>
-<l:template name="refsect3" text="la section intitulÃ©e Â«Â %tÂ Â»"/>
-<l:template name="refsection" text="la section intitulÃ©e Â«Â %tÂ Â»"/>
-<l:template name="sect1" text="SectionÂ %n, Â«Â %tÂ Â»"/>
-<l:template name="sect2" text="SectionÂ %n, Â«Â %tÂ Â»"/>
-<l:template name="sect3" text="SectionÂ %n, Â«Â %tÂ Â»"/>
-<l:template name="sect4" text="SectionÂ %n, Â«Â %tÂ Â»"/>
-<l:template name="sect5" text="SectionÂ %n, Â«Â %tÂ Â»"/>
-<l:template name="section" text="SectionÂ %n, Â«Â %tÂ Â»"/>
-<l:template name="simplesect" text="la section intitulÃ©e Â«Â %tÂ Â»"/>
-<l:template name="table" text="TableauÂ %n, Â«Â %tÂ Â»"/>
-</l:context>
-<l:context name="authorgroup"><l:template name="sep" text=", "/>
-<l:template name="sep2" text=" et "/>
-<l:template name="seplast" text=", et "/>
-</l:context>
-<l:context name="glossary"><l:template name="see" text="Voir %t"/>
-<l:template name="seealso" text="Voir aussi %t"/>
-</l:context>
-<l:context name="msgset"><l:template name="MsgAud" text="Public visÃ©: "/>
-<l:template name="MsgLevel" text="Niveau: "/>
-<l:template name="MsgOrig" text="Origine: "/>
-</l:context>
-<l:context name="datetime"><l:template name="format" text="d/m/Y"/>
-</l:context>
-<l:context name="termdef"><l:template name="prefix" text="[Definition: " lang="en"/>
-<l:template name="suffix" text="]" lang="en"/>
-</l:context>
-<l:context name="datetime-full"><l:template name="January" text="janvier"/>
-<l:template name="February" text="fÃ©vrier"/>
-<l:template name="March" text="mars"/>
-<l:template name="April" text="avril"/>
-<l:template name="May" text="mai"/>
-<l:template name="June" text="juin"/>
-<l:template name="July" text="juillet"/>
-<l:template name="August" text="aoÃ»t"/>
-<l:template name="September" text="septembre"/>
-<l:template name="October" text="octobre"/>
-<l:template name="November" text="novembre"/>
-<l:template name="December" text="dÃ©cembre"/>
-<l:template name="Monday" text="lundi"/>
-<l:template name="Tuesday" text="mardi"/>
-<l:template name="Wednesday" text="mercredi"/>
-<l:template name="Thursday" text="jeudi"/>
-<l:template name="Friday" text="vendredi"/>
-<l:template name="Saturday" text="samedi"/>
-<l:template name="Sunday" text="dimanche"/>
-</l:context>
-<l:context name="datetime-abbrev"><l:template name="Jan" text="jan"/>
-<l:template name="Feb" text="fÃ©v"/>
-<l:template name="Mar" text="mar"/>
-<l:template name="Apr" text="avr"/>
-<l:template name="May" text="mai"/>
-<l:template name="Jun" text="jun"/>
-<l:template name="Jul" text="jui"/>
-<l:template name="Aug" text="aoÃ»"/>
-<l:template name="Sep" text="sep"/>
-<l:template name="Oct" text="oct"/>
-<l:template name="Nov" text="nov"/>
-<l:template name="Dec" text="dÃ©c"/>
-<l:template name="Mon" text="lun"/>
-<l:template name="Tue" text="mar"/>
-<l:template name="Wed" text="mer"/>
-<l:template name="Thu" text="jeu"/>
-<l:template name="Fri" text="ven"/>
-<l:template name="Sat" text="sam"/>
-<l:template name="Sun" text="dim"/>
-</l:context>
-<l:context name="htmlhelp"><l:template name="langcode" text="0x040c French (FRANCE)"/>
-</l:context>
-<l:context name="index"><l:template name="term-separator" text=", " lang="en"/>
-<l:template name="number-separator" text=", " lang="en"/>
-<l:template name="range-separator" text="-" lang="en"/>
-</l:context>
-<l:context name="iso690"><l:template name="lastfirst.sep" text=", " lang="en"/>
-<l:template name="alt.person.two.sep" text=" â " lang="en"/>
-<l:template name="alt.person.last.sep" text=" â " lang="en"/>
-<l:template name="alt.person.more.sep" text=" â " lang="en"/>
-<l:template name="primary.editor" text=" (ed.)" lang="en"/>
-<l:template name="primary.many" text=", et al." lang="en"/>
-<l:template name="primary.sep" text=". " lang="en"/>
-<l:template name="submaintitle.sep" text=": " lang="en"/>
-<l:template name="title.sep" text=". " lang="en"/>
-<l:template name="othertitle.sep" text=", " lang="en"/>
-<l:template name="medium1" text=" [" lang="en"/>
-<l:template name="medium2" text="]" lang="en"/>
-<l:template name="secondary.person.sep" text="; " lang="en"/>
-<l:template name="secondary.sep" text=". " lang="en"/>
-<l:template name="respons.sep" text=". " lang="en"/>
-<l:template name="edition.sep" text=". " lang="en"/>
-<l:template name="edition.serial.sep" text=", " lang="en"/>
-<l:template name="issuing.range" text="-" lang="en"/>
-<l:template name="issuing.div" text=", " lang="en"/>
-<l:template name="issuing.sep" text=". " lang="en"/>
-<l:template name="partnr.sep" text=". " lang="en"/>
-<l:template name="placepubl.sep" text=": " lang="en"/>
-<l:template name="publyear.sep" text=", " lang="en"/>
-<l:template name="pubinfo.sep" text=". " lang="en"/>
-<l:template name="spec.pubinfo.sep" text=", " lang="en"/>
-<l:template name="upd.sep" text=", " lang="en"/>
-<l:template name="datecit1" text=" [cited " lang="en"/>
-<l:template name="datecit2" text="]" lang="en"/>
-<l:template name="extent.sep" text=". " lang="en"/>
-<l:template name="locs.sep" text=", " lang="en"/>
-<l:template name="location.sep" text=". " lang="en"/>
-<l:template name="serie.sep" text=". " lang="en"/>
-<l:template name="notice.sep" text=". " lang="en"/>
-<l:template name="access" text="Available " lang="en"/>
-<l:template name="acctoo" text="Also available " lang="en"/>
-<l:template name="onwww" text="from World Wide Web" lang="en"/>
-<l:template name="oninet" text="from Internet" lang="en"/>
-<l:template name="access.end" text=": " lang="en"/>
-<l:template name="link1" text="&lt;" lang="en"/>
-<l:template name="link2" text="&gt;" lang="en"/>
-<l:template name="access.sep" text=". " lang="en"/>
-<l:template name="isbn" text="ISBN " lang="en"/>
-<l:template name="issn" text="ISSN " lang="en"/>
-<l:template name="stdnum.sep" text=". " lang="en"/>
-<l:template name="patcountry.sep" text=". " lang="en"/>
-<l:template name="pattype.sep" text=", " lang="en"/>
-<l:template name="patnum.sep" text=". " lang="en"/>
-<l:template name="patdate.sep" text=". " lang="en"/>
-</l:context><l:letters><l:l i="-1"/>
-<l:l i="0">Symboles</l:l>
-<l:l i="1">A</l:l>
-<l:l i="1">a</l:l>
-<l:l i="1">Ã </l:l>
-<l:l i="1">Ã</l:l>
-<l:l i="1">Ã¢</l:l>
-<l:l i="1">Ã</l:l>
-<l:l i="1">Ã</l:l>
-<l:l i="1">ÃŠ</l:l>
-<l:l i="2">B</l:l>
-<l:l i="2">b</l:l>
-<l:l i="3">C</l:l>
-<l:l i="3">c</l:l>
-<l:l i="3">Ã§</l:l>
-<l:l i="4">D</l:l>
-<l:l i="4">d</l:l>
-<l:l i="5">E</l:l>
-<l:l i="5">e</l:l>
-<l:l i="5">Ãª</l:l>
-<l:l i="5">Ã</l:l>
-<l:l i="5">Ã©</l:l>
-<l:l i="5">Ã</l:l>
-<l:l i="5">Ãš</l:l>
-<l:l i="5">Ã</l:l>
-<l:l i="5">Ã«</l:l>
-<l:l i="5">Ã</l:l>
-<l:l i="5">â¬</l:l>
-<l:l i="6">F</l:l>
-<l:l i="6">f</l:l>
-<l:l i="7">G</l:l>
-<l:l i="7">g</l:l>
-<l:l i="8">H</l:l>
-<l:l i="8">h</l:l>
-<l:l i="9">I</l:l>
-<l:l i="9">i</l:l>
-<l:l i="9">Ã</l:l>
-<l:l i="9">Ã®</l:l>
-<l:l i="9">Ã</l:l>
-<l:l i="9">Ã¯</l:l>
-<l:l i="10">J</l:l>
-<l:l i="10">j</l:l>
-<l:l i="11">K</l:l>
-<l:l i="11">k</l:l>
-<l:l i="12">L</l:l>
-<l:l i="12">l</l:l>
-<l:l i="13">M</l:l>
-<l:l i="13">m</l:l>
-<l:l i="14">N</l:l>
-<l:l i="14">n</l:l>
-<l:l i="15">O</l:l>
-<l:l i="15">o</l:l>
-<l:l i="15">Ã</l:l>
-<l:l i="15">Ã¶</l:l>
-<l:l i="15">Å</l:l>
-<l:l i="15">Å</l:l>
-<l:l i="16">P</l:l>
-<l:l i="16">p</l:l>
-<l:l i="17">Q</l:l>
-<l:l i="17">q</l:l>
-<l:l i="18">R</l:l>
-<l:l i="18">r</l:l>
-<l:l i="19">S</l:l>
-<l:l i="19">s</l:l>
-<l:l i="20">T</l:l>
-<l:l i="20">t</l:l>
-<l:l i="21">U</l:l>
-<l:l i="21">u</l:l>
-<l:l i="21">Ã</l:l>
-<l:l i="21">Ã¹</l:l>
-<l:l i="21">Ã</l:l>
-<l:l i="21">Ã»</l:l>
-<l:l i="21">Ã</l:l>
-<l:l i="21">ÃŒ</l:l>
-<l:l i="22">V</l:l>
-<l:l i="22">v</l:l>
-<l:l i="23">W</l:l>
-<l:l i="23">w</l:l>
-<l:l i="24">X</l:l>
-<l:l i="24">x</l:l>
-<l:l i="25">Y</l:l>
-<l:l i="25">y</l:l>
-<l:l i="26">Z</l:l>
-<l:l i="26">z</l:l>
-</l:letters>
-</l:l10n>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/gentext.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/gentext.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,831 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"
-                exclude-result-prefixes="doc"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-
-<xsl:template match="*" mode="object.title.template">
-  <xsl:call-template name="gentext.template">
-    <xsl:with-param name="context" select="'title'"/>
-    <xsl:with-param name="name">
-      <xsl:call-template name="xpath.location"/>
-    </xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="chapter" mode="object.title.template">
-  <xsl:choose>
-    <xsl:when test="string($chapter.autolabel) != 0">
-      <xsl:call-template name="gentext.template">
-        <xsl:with-param name="context" select="'title-numbered'"/>
-        <xsl:with-param name="name">
-          <xsl:call-template name="xpath.location"/>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="gentext.template">
-        <xsl:with-param name="context" select="'title-unnumbered'"/>
-        <xsl:with-param name="name">
-          <xsl:call-template name="xpath.location"/>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="appendix" mode="object.title.template">
-  <xsl:choose>
-    <xsl:when test="string($appendix.autolabel) != 0">
-      <xsl:call-template name="gentext.template">
-        <xsl:with-param name="context" select="'title-numbered'"/>
-        <xsl:with-param name="name">
-          <xsl:call-template name="xpath.location"/>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="gentext.template">
-        <xsl:with-param name="context" select="'title-unnumbered'"/>
-        <xsl:with-param name="name">
-          <xsl:call-template name="xpath.location"/>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="part" mode="object.title.template">
-  <xsl:choose>
-    <xsl:when test="string($part.autolabel) != 0">
-      <xsl:call-template name="gentext.template">
-        <xsl:with-param name="context" select="'title-numbered'"/>
-        <xsl:with-param name="name">
-          <xsl:call-template name="xpath.location"/>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="gentext.template">
-        <xsl:with-param name="context" select="'title-unnumbered'"/>
-        <xsl:with-param name="name">
-          <xsl:call-template name="xpath.location"/>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="section|sect1|sect2|sect3|sect4|sect5|simplesect
-                     |bridgehead"
-              mode="object.title.template">
-  <xsl:variable name="is.numbered">
-    <xsl:call-template name="label.this.section"/>
-  </xsl:variable>
-  <xsl:choose>
-    <xsl:when test="$is.numbered != 0">
-      <xsl:call-template name="gentext.template">
-        <xsl:with-param name="context" select="'title-numbered'"/>
-        <xsl:with-param name="name">
-          <xsl:call-template name="xpath.location"/>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="gentext.template">
-        <xsl:with-param name="context" select="'title-unnumbered'"/>
-        <xsl:with-param name="name">
-          <xsl:call-template name="xpath.location"/>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="procedure" mode="object.title.template">
-  <xsl:choose>
-    <xsl:when test="$formal.procedures != 0 and title">
-      <xsl:call-template name="gentext.template">
-        <xsl:with-param name="context" select="'title'"/>
-        <xsl:with-param name="name">
-          <xsl:call-template name="xpath.location"/>
-          <xsl:text>.formal</xsl:text>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="gentext.template">
-        <xsl:with-param name="context" select="'title'"/>
-        <xsl:with-param name="name">
-          <xsl:call-template name="xpath.location"/>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ============================================================ -->
-
-<xsl:template match="*" mode="object.subtitle.template">
-  <xsl:call-template name="gentext.template">
-    <xsl:with-param name="context" select="'subtitle'"/>
-    <xsl:with-param name="name">
-      <xsl:call-template name="xpath.location"/>
-    </xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<!-- ============================================================ -->
-
-<xsl:template match="*" mode="is.autonumber">
-  <xsl:value-of select="'0'"/>
-</xsl:template>
-
-<xsl:template match="section|sect1|sect2|sect3|sect4|sect5" 
-              mode="is.autonumber">
-  <xsl:call-template name="label.this.section"/>
-</xsl:template>
-
-<xsl:template match="figure|example|table|equation" mode="is.autonumber">
-  <xsl:value-of select="'1'"/>
-</xsl:template>
-
-<xsl:template match="appendix" mode="is.autonumber">
-  <xsl:value-of select="$appendix.autolabel"/>
-</xsl:template>
-
-<xsl:template match="chapter" mode="is.autonumber">
-  <xsl:value-of select="$chapter.autolabel"/>
-</xsl:template>
-
-<xsl:template match="part" mode="is.autonumber">
-  <xsl:value-of select="$part.autolabel"/>
-</xsl:template>
-
-<xsl:template match="preface" mode="is.autonumber">
-  <xsl:value-of select="$preface.autolabel"/>
-</xsl:template>
-
-<xsl:template match="question|answer" mode="is.autonumber">
-  <xsl:choose>
-    <xsl:when test="$qanda.defaultlabel = 'number'
-                    and not(label)">
-      <xsl:value-of select="'1'"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="'0'"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="qandadiv" mode="is.autonumber">
-  <xsl:value-of select="$qandadiv.autolabel"/>
-</xsl:template>
-
-<xsl:template match="bridgehead" mode="is.autonumber">
-  <xsl:value-of select="$section.autolabel"/>
-</xsl:template>
-
-<xsl:template match="*" mode="object.xref.template">
-  <xsl:param name="purpose"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="referrer"/>
-
-  <!-- Is autonumbering on? -->
-  <xsl:variable name="autonumber">
-    <xsl:apply-templates select="." mode="is.autonumber"/>
-  </xsl:variable>
-
-  <xsl:variable name="number-and-title-template">
-    <xsl:call-template name="gentext.template.exists">
-      <xsl:with-param name="context" select="'xref-number-and-title'"/>
-      <xsl:with-param name="name">
-        <xsl:call-template name="xpath.location"/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="number-template">
-    <xsl:call-template name="gentext.template.exists">
-      <xsl:with-param name="context" select="'xref-number'"/>
-      <xsl:with-param name="name">
-        <xsl:call-template name="xpath.location"/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="context">
-    <xsl:choose>
-      <xsl:when test="string($autonumber) != 0 
-                      and $number-and-title-template != 0
-                      and $xref.with.number.and.title != 0">
-         <xsl:value-of select="'xref-number-and-title'"/>
-      </xsl:when>
-      <xsl:when test="string($autonumber) != 0 
-                      and $number-template != 0">
-         <xsl:value-of select="'xref-number'"/>
-      </xsl:when>
-      <xsl:otherwise>
-         <xsl:value-of select="'xref'"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:call-template name="gentext.template">
-    <xsl:with-param name="context" select="$context"/>
-    <xsl:with-param name="name">
-      <xsl:call-template name="xpath.location"/>
-    </xsl:with-param>
-    <xsl:with-param name="purpose" select="$purpose"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-  </xsl:call-template>
-
-</xsl:template>
-
-
-<!-- ============================================================ -->
-
-<xsl:template match="*" mode="object.title.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-  <xsl:variable name="template">
-    <xsl:apply-templates select="." mode="object.title.template"/>
-  </xsl:variable>
-
-<!--
-  <xsl:message>
-    <xsl:text>object.title.markup: </xsl:text>
-    <xsl:value-of select="local-name(.)"/>
-    <xsl:text>: </xsl:text>
-    <xsl:value-of select="$template"/>
-  </xsl:message>
--->
-
-  <xsl:call-template name="substitute-markup">
-    <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-    <xsl:with-param name="template" select="$template"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="*" mode="object.title.markup.textonly">
-  <xsl:variable name="title">
-    <xsl:apply-templates select="." mode="object.title.markup"/>
-  </xsl:variable>
-  <xsl:value-of select="normalize-space($title)"/>
-</xsl:template>
-
-<!-- ============================================================ -->
-
-<xsl:template match="*" mode="object.titleabbrev.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-
-  <!-- Just for consistency in template naming -->
-
-  <xsl:apply-templates select="." mode="titleabbrev.markup">
-    <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<!-- ============================================================ -->
-
-<xsl:template match="*" mode="object.subtitle.markup">
-  <xsl:variable name="template">
-    <xsl:apply-templates select="." mode="object.subtitle.template"/>
-  </xsl:variable>
-
-  <xsl:call-template name="substitute-markup">
-    <xsl:with-param name="template" select="$template"/>
-  </xsl:call-template>
-</xsl:template>
-
-<!-- ============================================================ -->
-
-<xsl:template match="*" mode="object.xref.markup">
-  <xsl:param name="purpose"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="referrer"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:variable name="template">
-    <xsl:choose>
-      <xsl:when test="starts-with(normalize-space($xrefstyle), 'select:')">
-        <xsl:call-template name="make.gentext.template">
-          <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-          <xsl:with-param name="purpose" select="$purpose"/>
-          <xsl:with-param name="referrer" select="$referrer"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:when test="starts-with(normalize-space($xrefstyle), 'template:')">
-        <xsl:value-of select="substring-after(normalize-space($xrefstyle), 'template:')"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:apply-templates select="." mode="object.xref.template">
-          <xsl:with-param name="purpose" select="$purpose"/>
-          <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-          <xsl:with-param name="referrer" select="$referrer"/>
-        </xsl:apply-templates>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-<!-- 
-  <xsl:message>
-    <xsl:text>object.xref.markup: </xsl:text>
-    <xsl:value-of select="local-name(.)"/>
-    <xsl:text>(</xsl:text>
-    <xsl:value-of select="$xrefstyle"/>
-    <xsl:text>, </xsl:text>
-    <xsl:value-of select="$purpose"/>
-    <xsl:text>)</xsl:text>
-    <xsl:text>: [</xsl:text>
-    <xsl:value-of select="$template"/>
-    <xsl:text>]</xsl:text>
-  </xsl:message>
--->
-
-  <xsl:if test="$template = '' and $verbose != 0">
-    <xsl:message>
-      <xsl:text>object.xref.markup: empty xref template</xsl:text>
-      <xsl:text> for linkend="</xsl:text>
-      <xsl:value-of select="@id|@xml:id"/>
-      <xsl:text>" and @xrefstyle="</xsl:text>
-      <xsl:value-of select="$xrefstyle"/>
-      <xsl:text>"</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <xsl:call-template name="substitute-markup">
-    <xsl:with-param name="purpose" select="$purpose"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="template" select="$template"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="listitem" mode="object.xref.markup">
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:choose>
-    <xsl:when test="parent::orderedlist">
-      <xsl:variable name="template">
-        <xsl:apply-templates select="." mode="object.xref.template"/>
-      </xsl:variable>
-      <xsl:call-template name="substitute-markup">
-        <xsl:with-param name="template" select="$template"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="$verbose != 0">
-      <xsl:message>
-        <xsl:text>Xref is only supported to listitems in an</xsl:text>
-        <xsl:text> orderedlist: </xsl:text>
-        <xsl:value-of select="@id|@xml:id"/>
-      </xsl:message>
-      <xsl:text>???</xsl:text>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="question" mode="object.xref.markup">
-  <xsl:param name="purpose"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="referrer"/>
-
-  <xsl:variable name="deflabel">
-    <xsl:choose>
-      <xsl:when test="ancestor-or-self::*[@defaultlabel]">
-        <xsl:value-of select="(ancestor-or-self::*[@defaultlabel])[last()]
-                              /@defaultlabel"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$qanda.defaultlabel"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="template">
-    <xsl:choose>
-      <!-- This avoids double Q: Q: in xref when defaultlabel=qanda -->
-      <xsl:when test="$deflabel = 'qanda' and not(label)">%n</xsl:when>
-      <xsl:otherwise>
-        <xsl:apply-templates select="." mode="object.xref.template">
-          <xsl:with-param name="purpose" select="$purpose"/>
-          <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-          <xsl:with-param name="referrer" select="$referrer"/>
-        </xsl:apply-templates>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:call-template name="substitute-markup">
-    <xsl:with-param name="purpose" select="$purpose"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="template" select="$template"/>
-  </xsl:call-template>
-</xsl:template>
-
-<!-- ============================================================ -->
-
-<xsl:template name="substitute-markup">
-  <xsl:param name="template" select="''"/>
-  <xsl:param name="allow-anchors" select="'0'"/>
-  <xsl:param name="title" select="''"/>
-  <xsl:param name="subtitle" select="''"/>
-  <xsl:param name="docname" select="''"/>
-  <xsl:param name="label" select="''"/>
-  <xsl:param name="pagenumber" select="''"/>
-  <xsl:param name="purpose"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="referrer"/>
-  <xsl:param name="verbose"/>
-
-  <xsl:choose>
-    <xsl:when test="contains($template, '%')">
-      <xsl:value-of select="substring-before($template, '%')"/>
-      <xsl:variable name="candidate"
-             select="substring(substring-after($template, '%'), 1, 1)"/>
-      <xsl:choose>
-        <xsl:when test="$candidate = 't'">
-          <xsl:apply-templates select="." mode="insert.title.markup">
-            <xsl:with-param name="purpose" select="$purpose"/>
-            <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-            <xsl:with-param name="title">
-              <xsl:choose>
-                <xsl:when test="$title != ''">
-                  <xsl:copy-of select="$title"/>
-                </xsl:when>
-                <xsl:otherwise>
-                  <xsl:apply-templates select="." mode="title.markup">
-                    <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-                    <xsl:with-param name="verbose" select="$verbose"/>
-                  </xsl:apply-templates>
-                </xsl:otherwise>
-              </xsl:choose>
-            </xsl:with-param>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:when test="$candidate = 's'">
-          <xsl:apply-templates select="." mode="insert.subtitle.markup">
-            <xsl:with-param name="purpose" select="$purpose"/>
-            <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-            <xsl:with-param name="subtitle">
-              <xsl:choose>
-                <xsl:when test="$subtitle != ''">
-                  <xsl:copy-of select="$subtitle"/>
-                </xsl:when>
-                <xsl:otherwise>
-                  <xsl:apply-templates select="." mode="subtitle.markup">
-                    <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-                  </xsl:apply-templates>
-                </xsl:otherwise>
-              </xsl:choose>
-            </xsl:with-param>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:when test="$candidate = 'n'">
-          <xsl:apply-templates select="." mode="insert.label.markup">
-            <xsl:with-param name="purpose" select="$purpose"/>
-            <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-            <xsl:with-param name="label">
-              <xsl:choose>
-                <xsl:when test="$label != ''">
-                  <xsl:copy-of select="$label"/>
-                </xsl:when>
-                <xsl:otherwise>
-                  <xsl:apply-templates select="." mode="label.markup"/>
-                </xsl:otherwise>
-              </xsl:choose>
-            </xsl:with-param>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:when test="$candidate = 'p'">
-          <xsl:apply-templates select="." mode="insert.pagenumber.markup">
-            <xsl:with-param name="purpose" select="$purpose"/>
-            <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-            <xsl:with-param name="pagenumber">
-              <xsl:choose>
-                <xsl:when test="$pagenumber != ''">
-                  <xsl:copy-of select="$pagenumber"/>
-                </xsl:when>
-                <xsl:otherwise>
-                  <xsl:apply-templates select="." mode="pagenumber.markup"/>
-                </xsl:otherwise>
-              </xsl:choose>
-            </xsl:with-param>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:when test="$candidate = 'o'">
-          <!-- olink target document title -->
-          <xsl:apply-templates select="." mode="insert.olink.docname.markup">
-            <xsl:with-param name="purpose" select="$purpose"/>
-            <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-            <xsl:with-param name="docname">
-              <xsl:choose>
-                <xsl:when test="$docname != ''">
-                  <xsl:copy-of select="$docname"/>
-                </xsl:when>
-                <xsl:otherwise>
-                  <xsl:apply-templates select="." mode="olink.docname.markup"/>
-                </xsl:otherwise>
-              </xsl:choose>
-            </xsl:with-param>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:when test="$candidate = 'd'">
-          <xsl:apply-templates select="." mode="insert.direction.markup">
-            <xsl:with-param name="purpose" select="$purpose"/>
-            <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-            <xsl:with-param name="direction">
-              <xsl:choose>
-                <xsl:when test="$referrer">
-                  <xsl:variable name="referent-is-below">
-                    <xsl:for-each select="preceding::xref">
-                      <xsl:if test="generate-id(.) = generate-id($referrer)">1</xsl:if>
-                    </xsl:for-each>
-                  </xsl:variable>
-                  <xsl:choose>
-                    <xsl:when test="$referent-is-below = ''">
-                      <xsl:call-template name="gentext">
-                        <xsl:with-param name="key" select="'above'"/>
-                      </xsl:call-template>
-                    </xsl:when>
-                    <xsl:otherwise>
-                      <xsl:call-template name="gentext">
-                        <xsl:with-param name="key" select="'below'"/>
-                      </xsl:call-template>
-                    </xsl:otherwise>
-                  </xsl:choose>
-                </xsl:when>
-                <xsl:otherwise>
-                  <xsl:message>Attempt to use %d in gentext with no referrer!</xsl:message>
-                </xsl:otherwise>
-              </xsl:choose>
-            </xsl:with-param>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:when test="$candidate = '%' ">
-          <xsl:text>%</xsl:text>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:text>%</xsl:text><xsl:value-of select="$candidate"/>
-        </xsl:otherwise>
-      </xsl:choose>
-      <!-- recurse with the rest of the template string -->
-      <xsl:variable name="rest"
-            select="substring($template,
-            string-length(substring-before($template, '%'))+3)"/>
-      <xsl:call-template name="substitute-markup">
-        <xsl:with-param name="template" select="$rest"/>
-        <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-        <xsl:with-param name="title" select="$title"/>
-        <xsl:with-param name="subtitle" select="$subtitle"/>
-        <xsl:with-param name="docname" select="$docname"/>
-        <xsl:with-param name="label" select="$label"/>
-        <xsl:with-param name="pagenumber" select="$pagenumber"/>
-        <xsl:with-param name="purpose" select="$purpose"/>
-        <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-        <xsl:with-param name="referrer" select="$referrer"/>
-        <xsl:with-param name="verbose" select="$verbose"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$template"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ============================================================ -->
-
-<xsl:template name="make.gentext.template">
-  <xsl:param name="xrefstyle" select="''"/>
-  <xsl:param name="purpose"/>
-  <xsl:param name="referrer"/>
-  <xsl:param name="lang">
-    <xsl:call-template name="l10n.language"/>
-  </xsl:param>
-  <xsl:param name="target.elem" select="local-name(.)"/>
-
-  <!-- parse xrefstyle to get parts -->
-  <xsl:variable name="parts"
-      select="substring-after(normalize-space($xrefstyle), 'select:')"/>
-
-  <xsl:variable name="labeltype">
-    <xsl:choose>
-      <xsl:when test="contains($parts, 'labelnumber')">
-         <xsl:text>labelnumber</xsl:text>
-      </xsl:when>
-      <xsl:when test="contains($parts, 'labelname')">
-         <xsl:text>labelname</xsl:text>
-      </xsl:when>
-      <xsl:when test="contains($parts, 'label')">
-         <xsl:text>label</xsl:text>
-      </xsl:when>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="titletype">
-    <xsl:choose>
-      <xsl:when test="contains($parts, 'quotedtitle')">
-         <xsl:text>quotedtitle</xsl:text>
-      </xsl:when>
-      <xsl:when test="contains($parts, 'title')">
-         <xsl:text>title</xsl:text>
-      </xsl:when>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="pagetype">
-    <xsl:choose>
-      <xsl:when test="$insert.olink.page.number = 'no' and
-                      local-name($referrer) = 'olink'">
-        <!-- suppress page numbers -->
-      </xsl:when>
-      <xsl:when test="$insert.xref.page.number = 'no' and
-                      local-name($referrer) != 'olink'">
-        <!-- suppress page numbers -->
-      </xsl:when>
-      <xsl:when test="contains($parts, 'nopage')">
-         <xsl:text>nopage</xsl:text>
-      </xsl:when>
-      <xsl:when test="contains($parts, 'pagenumber')">
-         <xsl:text>pagenumber</xsl:text>
-      </xsl:when>
-      <xsl:when test="contains($parts, 'pageabbrev')">
-         <xsl:text>pageabbrev</xsl:text>
-      </xsl:when>
-      <xsl:when test="contains($parts, 'Page')">
-         <xsl:text>Page</xsl:text>
-      </xsl:when>
-      <xsl:when test="contains($parts, 'page')">
-         <xsl:text>page</xsl:text>
-      </xsl:when>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="docnametype">
-    <xsl:choose>
-      <xsl:when test="($olink.doctitle = 0 or
-                       $olink.doctitle = 'no') and
-                      local-name($referrer) = 'olink'">
-        <!-- suppress docname -->
-      </xsl:when>
-      <xsl:when test="contains($parts, 'nodocname')">
-         <xsl:text>nodocname</xsl:text>
-      </xsl:when>
-      <xsl:when test="contains($parts, 'docnamelong')">
-         <xsl:text>docnamelong</xsl:text>
-      </xsl:when>
-      <xsl:when test="contains($parts, 'docname')">
-         <xsl:text>docname</xsl:text>
-      </xsl:when>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:if test="$labeltype != ''">
-    <xsl:choose>
-      <xsl:when test="$labeltype = 'labelname'">
-        <xsl:call-template name="gentext">
-          <xsl:with-param name="key">
-            <xsl:choose>
-              <xsl:when test="local-name($referrer) = 'olink'">
-                <xsl:value-of select="$target.elem"/>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:value-of select="local-name(.)"/>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:with-param>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:when test="$labeltype = 'labelnumber'">
-        <xsl:text>%n</xsl:text>
-      </xsl:when>
-      <xsl:when test="$labeltype = 'label'">
-        <xsl:call-template name="gentext.template">
-          <xsl:with-param name="context" select="'xref-number'"/>
-          <xsl:with-param name="name">
-            <xsl:choose>
-              <xsl:when test="local-name($referrer) = 'olink'">
-                <xsl:value-of select="$target.elem"/>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:call-template name="xpath.location"/>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:with-param>
-          <xsl:with-param name="purpose" select="$purpose"/>
-          <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-          <xsl:with-param name="referrer" select="$referrer"/>
-        </xsl:call-template>
-      </xsl:when>
-    </xsl:choose>
-
-    <xsl:choose>
-      <xsl:when test="$titletype != ''">
-        <xsl:value-of select="$xref.label-title.separator"/>
-      </xsl:when>
-      <xsl:when test="$pagetype != ''">
-        <xsl:value-of select="$xref.label-page.separator"/>
-      </xsl:when>
-    </xsl:choose>
-  </xsl:if>
-
-  <xsl:if test="$titletype != ''">
-    <xsl:choose>
-      <xsl:when test="$titletype = 'title'">
-        <xsl:text>%t</xsl:text>
-      </xsl:when>
-      <xsl:when test="$titletype = 'quotedtitle'">
-        <xsl:call-template name="gentext.dingbat">
-          <xsl:with-param name="dingbat" select="'startquote'"/>
-        </xsl:call-template>
-        <xsl:text>%t</xsl:text>
-        <xsl:call-template name="gentext.dingbat">
-          <xsl:with-param name="dingbat" select="'endquote'"/>
-        </xsl:call-template>
-      </xsl:when>
-    </xsl:choose>
-
-    <xsl:choose>
-      <xsl:when test="$pagetype != '' and $pagetype != 'nopage'">
-        <xsl:value-of select="$xref.title-page.separator"/>
-      </xsl:when>
-    </xsl:choose>
-  </xsl:if>
-  
-  <!-- special case: use regular xref template if just turning off page -->
-  <xsl:if test="($pagetype = 'nopage' or $docnametype = 'nodocname')
-                  and local-name($referrer) != 'olink'
-                  and $labeltype = '' 
-                  and $titletype = ''">
-    <xsl:apply-templates select="." mode="object.xref.template">
-      <xsl:with-param name="purpose" select="$purpose"/>
-      <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-      <xsl:with-param name="referrer" select="$referrer"/>
-    </xsl:apply-templates>
-  </xsl:if>
-
-  <xsl:if test="$pagetype != ''">
-    <xsl:choose>
-      <xsl:when test="$pagetype = 'page'">
-        <xsl:call-template name="gentext.template">
-          <xsl:with-param name="context" select="'xref'"/>
-          <xsl:with-param name="name" select="'page'"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:when test="$pagetype = 'Page'">
-        <xsl:call-template name="gentext.template">
-          <xsl:with-param name="context" select="'xref'"/>
-          <xsl:with-param name="name" select="'Page'"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:when test="$pagetype = 'pageabbrev'">
-        <xsl:call-template name="gentext.template">
-          <xsl:with-param name="context" select="'xref'"/>
-          <xsl:with-param name="name" select="'pageabbrev'"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:when test="$pagetype = 'pagenumber'">
-        <xsl:text>%p</xsl:text>
-      </xsl:when>
-    </xsl:choose>
-
-  </xsl:if>
-
-  <!-- Add reference to other document title -->
-  <xsl:if test="$docnametype != '' and local-name($referrer) = 'olink'">
-    <!-- Any separator should be in the gentext template -->
-    <xsl:choose>
-      <xsl:when test="$docnametype = 'docnamelong'">
-        <xsl:call-template name="gentext.template">
-          <xsl:with-param name="context" select="'xref'"/>
-          <xsl:with-param name="name" select="'docnamelong'"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:when test="$docnametype = 'docname'">
-        <xsl:call-template name="gentext.template">
-          <xsl:with-param name="context" select="'xref'"/>
-          <xsl:with-param name="name" select="'docname'"/>
-        </xsl:call-template>
-      </xsl:when>
-    </xsl:choose>
-
-  </xsl:if>
-  
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/insertfile.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/insertfile.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,111 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:xi="http://www.w3.org/2001/XInclude"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<xsl:param name="textdata.default.encoding"></xsl:param>
-
-<!-- * This stylesheet makes a copy of a source tree, replacing all -->
-<!-- * instances of the following with corresponding Xinclude instances -->
-<!-- * in the result tree. -->
-<!-- * -->
-<!-- *   <textobject><textdata fileref="foo.txt"> -->
-<!-- *   <imagedata format="linespecific" fileref="foo.txt"> -->
-<!-- *   <inlinegraphic format="linespecific" fileref="foo.txt"> -->
-<!-- * -->
-<!-- * Those become: -->
-<!-- * -->
-<!-- *   <xi:include href="foo.txt" parse="text"/> -->
-<!-- * -->
-<!-- * It also works as expected with entityref in place of fileref, -->
-<!-- * and copies over the value of the <textdata>âencodingâ atrribute (if -->
-<!-- * found). It is basically intended as an alternative to using the -->
-<!-- * DocBook XSLT Java insertfile() extension. -->
-
-<!-- ==================================================================== -->
-
-<xsl:template name="get.external.filename">
-  <xsl:choose>
-    <xsl:when test="@entityref">
-      <xsl:value-of select="unparsed-entity-uri(@entityref)"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="@fileref"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="textobject[child::textdata[@entityref|@fileref]]">
-  <xsl:apply-templates select="textdata"/>
-</xsl:template>
-
-<xsl:template match="textdata[@entityref|@fileref]">
-  <xsl:variable name="filename">
-    <xsl:call-template name="get.external.filename"/>
-  </xsl:variable>
-  <xsl:variable name="encoding">
-    <xsl:choose>
-      <xsl:when test="@encoding">
-        <xsl:value-of select="@encoding"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$textdata.default.encoding"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-  <xi:include href="{$filename}" parse="text" encoding="{$encoding}"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template
-    match="inlinemediaobject
-           [child::imageobject
-           [child::imagedata
-           [@format = 'linespecific' and
-           (@entityref|@fileref)]]]">
-  <xsl:apply-templates select="imageobject/imagedata"/>
-</xsl:template>
-
-<xsl:template match="imagedata
-                     [@format = 'linespecific' and
-                     (@entityref|@fileref)]">
-  <xsl:variable name="filename">
-    <xsl:call-template name="get.external.filename"/>
-  </xsl:variable>
-  <xi:include href="{$filename}" parse="text" encoding="{$textdata.default.encoding}"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="inlinegraphic
-                     [@format = 'linespecific' and
-                     (@entityref|@fileref)]">
-  <xsl:variable name="filename">
-    <xsl:call-template name="get.external.filename"/>
-  </xsl:variable>
-  <xi:include href="{$filename}" parse="text" encoding="{$textdata.default.encoding}"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<!-- * copy everything else into result tree as-is -->
-<xsl:template match="node() | @*">
-  <xsl:copy>
-    <xsl:apply-templates select="@* | node()"/>
-  </xsl:copy>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/it.xml
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/it.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,1241 +1,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="it" english-language-name="Italian">
-
-<!-- * This file is generated automatically. -->
-<!-- * To submit changes to this file upstream (to the DocBook Project) -->
-<!-- * do not submit an edited version of this file. Instead, submit an -->
-<!-- * edited version of the source file at the following location: -->
-<!-- * -->
-<!-- *  https://svn.sourceforge.net/svnroot/docbook/trunk/gentext/locale/it.xml -->
-<!-- * -->
-<!-- * E-mail the edited it.xml source file to: -->
-<!-- * -->
-<!-- *  docbook-developers@lists.sourceforge.net -->
-
-<!-- ******************************************************************** -->
-
-<!-- This file is part of the XSL DocBook Stylesheet distribution. -->
-<!-- See ../README or http://docbook.sf.net/release/xsl/current/ for -->
-<!-- copyright and other information. -->
-
-<!-- ******************************************************************** -->
-<!-- In these files, % with a letter is used for a placeholder: -->
-<!--   %t is the current element's title -->
-<!--   %s is the current element's subtitle (if applicable)-->
-<!--   %n is the current element's number label-->
-<!--   %p is the current element's page number (if applicable)-->
-<!-- ******************************************************************** -->
-
-
-<l:gentext key="Abstract" text="Estratto"/>
-<l:gentext key="abstract" text="Estratto"/>
-<l:gentext key="Answer" text="R:"/>
-<l:gentext key="answer" text="R:"/>
-<l:gentext key="Appendix" text="Appendice"/>
-<l:gentext key="appendix" text="appendice"/>
-<l:gentext key="Article" text="Articolo"/>
-<l:gentext key="article" text="Articolo"/>
-<l:gentext key="Author" text="Autori"/>
-<l:gentext key="Bibliography" text="Bibliografia"/>
-<l:gentext key="bibliography" text="Bibliografia"/>
-<l:gentext key="Book" text="Libro"/>
-<l:gentext key="book" text="Libro"/>
-<l:gentext key="CAUTION" text="ATTENZIONE"/>
-<l:gentext key="Caution" text="Attenzione"/>
-<l:gentext key="caution" text="Attenzione"/>
-<l:gentext key="Chapter" text="Capitolo"/>
-<l:gentext key="chapter" text="capitolo"/>
-<l:gentext key="Colophon" text="Colophon"/>
-<l:gentext key="colophon" text="Colophon"/>
-<l:gentext key="Copyright" text="Copyright"/>
-<l:gentext key="copyright" text="Copyright"/>
-<l:gentext key="Dedication" text="Dedica"/>
-<l:gentext key="dedication" text="Dedica"/>
-<l:gentext key="Edition" text="Edizione"/>
-<l:gentext key="edition" text="Edizione"/>
-<l:gentext key="Editor" text="Editor" lang="en"/>
-<l:gentext key="Equation" text="Equazione"/>
-<l:gentext key="equation" text="Equazione"/>
-<l:gentext key="Example" text="Esempio"/>
-<l:gentext key="example" text="Esempio"/>
-<l:gentext key="Figure" text="Figura"/>
-<l:gentext key="figure" text="Figura"/>
-<l:gentext key="Glossary" text="Glossario"/>
-<l:gentext key="glossary" text="Glossario"/>
-<l:gentext key="GlossSee" text="Vedi"/>
-<l:gentext key="glosssee" text="Vedi"/>
-<l:gentext key="GlossSeeAlso" text="Vedi Anche"/>
-<l:gentext key="glossseealso" text="Vedi Anche"/>
-<l:gentext key="IMPORTANT" text="IMPORTANTE"/>
-<l:gentext key="important" text="Importante"/>
-<l:gentext key="Important" text="Importante"/>
-<l:gentext key="Index" text="Indice"/>
-<l:gentext key="index" text="Indice"/>
-<l:gentext key="ISBN" text="ISBN"/>
-<l:gentext key="isbn" text="ISBN"/>
-<l:gentext key="LegalNotice" text="Note Legali"/>
-<l:gentext key="legalnotice" text="Note Legali"/>
-<l:gentext key="MsgAud" text="Pubblico"/>
-<l:gentext key="msgaud" text="Pubblico"/>
-<l:gentext key="MsgLevel" text="Livello"/>
-<l:gentext key="msglevel" text="Livello"/>
-<l:gentext key="MsgOrig" text="Origine"/>
-<l:gentext key="msgorig" text="Origine"/>
-<l:gentext key="NOTE" text="NOTA"/>
-<l:gentext key="Note" text="Nota"/>
-<l:gentext key="note" text="Nota"/>
-<l:gentext key="Part" text="Parte"/>
-<l:gentext key="part" text="Parte"/>
-<l:gentext key="Preface" text="Prefazione"/>
-<l:gentext key="preface" text="Prefazione"/>
-<l:gentext key="Procedure" text="Procedura"/>
-<l:gentext key="procedure" text="Procedura"/>
-<l:gentext key="ProductionSet" text="Produzione"/>
-<l:gentext key="PubDate" text="Data di pubblicazione"/>
-<l:gentext key="pubdate" text="Data di pubblicazione"/>
-<l:gentext key="Published" text="Pubblicato"/>
-<l:gentext key="published" text="Pubblicato"/>
-<l:gentext key="Publisher" text="Publisher" lang="en"/>
-<l:gentext key="Qandadiv" text="D e R"/>
-<l:gentext key="qandadiv" text="D e R"/>
-<l:gentext key="QandASet" text="Frequently Asked Questions" lang="en"/>
-<l:gentext key="Question" text="D:"/>
-<l:gentext key="question" text="D:"/>
-<l:gentext key="RefEntry" text=""/>
-<l:gentext key="refentry" text=""/>
-<l:gentext key="Reference" text="Riferimento"/>
-<l:gentext key="reference" text="Riferimento"/>
-<l:gentext key="References" text="Riferimenti"/>
-<l:gentext key="RefName" text="Nome"/>
-<l:gentext key="refname" text="Nome"/>
-<l:gentext key="RefSection" text=""/>
-<l:gentext key="refsection" text=""/>
-<l:gentext key="RefSynopsisDiv" text="Sinossi"/>
-<l:gentext key="refsynopsisdiv" text="Sinossi"/>
-<l:gentext key="RevHistory" text="Diario delle Revisioni"/>
-<l:gentext key="revhistory" text="Diario delle Revisioni"/>
-<l:gentext key="revision" text="Revisione"/>
-<l:gentext key="Revision" text="Revisione"/>
-<l:gentext key="sect1" text="Sezione"/>
-<l:gentext key="sect2" text="Sezione"/>
-<l:gentext key="sect3" text="Sezione"/>
-<l:gentext key="sect4" text="Sezione"/>
-<l:gentext key="sect5" text="Sezione"/>
-<l:gentext key="section" text="Sezione"/>
-<l:gentext key="Section" text="Sezione"/>
-<l:gentext key="see" text="Vd."/>
-<l:gentext key="See" text="Vd."/>
-<l:gentext key="seealso" text="Vd. Anche"/>
-<l:gentext key="Seealso" text="Vd. anche"/>
-<l:gentext key="SeeAlso" text="Vd. Anche"/>
-<l:gentext key="set" text="Raccolta"/>
-<l:gentext key="Set" text="Raccolta"/>
-<l:gentext key="setindex" text="Indice Raccolta"/>
-<l:gentext key="SetIndex" text="Indice Raccolta"/>
-<l:gentext key="Sidebar" text=""/>
-<l:gentext key="sidebar" text="nota a margine"/>
-<l:gentext key="step" text="passo"/>
-<l:gentext key="Step" text="Passo"/>
-<l:gentext key="table" text="Tabella"/>
-<l:gentext key="Table" text="Tabella"/>
-<l:gentext key="task" text="Task" lang="en"/>
-<l:gentext key="Task" text="Task" lang="en"/>
-<l:gentext key="tip" text="Suggerimento"/>
-<l:gentext key="TIP" text="SUGGERIMENTO"/>
-<l:gentext key="Tip" text="Suggerimento"/>
-<l:gentext key="Warning" text="Avvertimento"/>
-<l:gentext key="warning" text="avvertimento"/>
-<l:gentext key="WARNING" text="AVVERTIMENTO"/>
-<l:gentext key="and" text="e"/>
-<l:gentext key="by" text="di"/>
-<l:gentext key="Edited" text="A cura"/>
-<l:gentext key="edited" text="A cura"/>
-<l:gentext key="Editedby" text="A cura di"/>
-<l:gentext key="editedby" text="A cura di"/>
-<l:gentext key="in" text="in"/>
-<l:gentext key="lastlistcomma" text=","/>
-<l:gentext key="listcomma" text=","/>
-<l:gentext key="nonexistantelement" text="elemento non esistente"/>
-<l:gentext key="notes" text="Note"/>
-<l:gentext key="Notes" text="Note"/>
-<l:gentext key="Pgs" text="pp."/>
-<l:gentext key="pgs" text="pp."/>
-<l:gentext key="Revisedby" text="Revisionato da: "/>
-<l:gentext key="revisedby" text="Revisionato da: "/>
-<l:gentext key="TableNotes" text="Note"/>
-<l:gentext key="tablenotes" text="Note"/>
-<l:gentext key="TableofContents" text="Sommario"/>
-<l:gentext key="tableofcontents" text="Sommario"/>
-<l:gentext key="unexpectedelementname" text="Nome elemento inaspettato"/>
-<l:gentext key="unsupported" text="non supportato"/>
-<l:gentext key="xrefto" text="riferimento a"/>
-<l:gentext key="Authors" text="Autori"/>
-<l:gentext key="copyeditor" text="Copy Editor" lang="en"/>
-<l:gentext key="graphicdesigner" text="Designer Grafico"/>
-<l:gentext key="productioneditor" text="Production Editor" lang="en"/>
-<l:gentext key="technicaleditor" text="Technical Editor" lang="en"/>
-<l:gentext key="translator" text="Traduttore"/>
-<l:gentext key="listofequations" text="Lista delle Equazioni"/>
-<l:gentext key="ListofEquations" text="Lista delle Equazioni"/>
-<l:gentext key="ListofExamples" text="Lista degli Esempi"/>
-<l:gentext key="listofexamples" text="Lista degli Esempi"/>
-<l:gentext key="ListofFigures" text="Lista delle Figure"/>
-<l:gentext key="listoffigures" text="Lista delle Figure"/>
-<l:gentext key="ListofProcedures" text="Lista delle procedure"/>
-<l:gentext key="listofprocedures" text="Lista delle procedure"/>
-<l:gentext key="listoftables" text="Lista delle Tabelle"/>
-<l:gentext key="ListofTables" text="Lista delle Tabelle"/>
-<l:gentext key="ListofUnknown" text="Lista degli Sconosciuti"/>
-<l:gentext key="listofunknown" text="Lista degli Sconosciuti"/>
-<l:gentext key="nav-home" text="Partenza"/>
-<l:gentext key="nav-next" text="Avanti"/>
-<l:gentext key="nav-next-sibling" text="Salta Avanti"/>
-<l:gentext key="nav-prev" text="Indietro"/>
-<l:gentext key="nav-prev-sibling" text="Salta Indietro"/>
-<l:gentext key="nav-up" text="Risali"/>
-<l:gentext key="nav-toc" text="ToC" lang="en"/>
-<l:gentext key="Draft" text="Bozza"/>
-<l:gentext key="above" text="sopra"/>
-<l:gentext key="below" text="sotto"/>
-<l:gentext key="sectioncalled" text="la sezione chiamata"/>
-<l:gentext key="index symbols" text="Simboli"/>
-<l:gentext key="lowercase.alpha" text="abcdefghijklmnopqrstuvwxyz"/>
-<l:gentext key="uppercase.alpha" text="ABCDEFGHIJKLMNOPQRSTUVWXYZ"/>
-<l:gentext key="normalize.sort.input" text="AaÃÃ ÃÃ¡ÃÃ¢ÃÃ£ÃÃ€Ã
-Ã¥ÄÄÄÄÄÄ
-ÇÇÇÇÇ Ç¡ÇºÇ»ÈÈÈÈÈŠÈ§ážážáºáº áº¡áº¢áº£áº€áº¥áºŠáº§áºšáº©áºªáº«áº¬áº­áº®áº¯áº°áº±áº²áº³áºŽáºµáº¶áº·BbÆÆÉÆÆážážážáž
-ážážCcÃÃ§ÄÄÄÄÄÄÄÄÆÆÉážážDdÄÄÄÄÆÉÆÆÇ
-Ç²È¡ÉážážážážážážážážážážEeÃÃšÃÃ©ÃÃªÃÃ«ÄÄÄÄÄÄÄÄÄÄÈÈ
-ÈÈÈšÈ©ážážážážážážážážážážáºžáº¹áººáº»áºŒáºœáºŸáº¿á»á»á»á»á»á»
-á»á»FfÆÆážážGgÄÄÄÄÄ Ä¡Ä¢Ä£ÆÉ Ç€Ç¥ÇŠÇ§ÇŽÇµáž áž¡HhÄ€Ä¥ÄŠÄ§ÈÈÉŠáž¢áž£áž€áž¥ážŠáž§ážšáž©ážªáž«áºIiÃÃ¬ÃÃ­ÃÃ®ÃÃ¯ÄšÄ©ÄªÄ«Ä¬Ä­Ä®Ä¯Ä°ÆÉšÇÇÈÈÈÈáž¬áž­áž®áž¯á»á»á»á»JjÄŽÄµÇ°ÊKkÄ¶Ä·ÆÆÇšÇ©áž°áž±áž²áž³ážŽážµLlÄ¹ÄºÄ»ÄŒÄœÄŸÄ¿ÅÅÅÆÇÈŽÉ«É¬É­áž¶áž·ážžáž¹ážºáž»ážŒážœMmÉ±ážŸáž¿á¹á¹á¹á¹NnÃÃ±ÅÅÅ
-ÅÅÅÆÉ²ÆÈ ÇÇžÇ¹ÈµÉ³á¹á¹
-á¹á¹á¹á¹á¹á¹OoÃÃ²ÃÃ³ÃÃŽÃÃµÃÃ¶ÃÃžÅÅÅÅÅÅÆÆ Æ¡ÇÇÇªÇ«Ç¬Ç­ÇŸÇ¿ÈÈÈÈÈªÈ«È¬È­È®È¯È°È±á¹á¹á¹á¹á¹á¹á¹á¹á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á» á»¡á»¢á»£PpÆ€Æ¥á¹á¹á¹á¹QqÊ RrÅÅÅÅÅÅÈÈÈÈÉŒÉœÉŸá¹á¹á¹á¹á¹á¹á¹á¹SsÅÅÅÅÅÅÅ Å¡ÈÈÊá¹ á¹¡á¹¢á¹£á¹€á¹¥á¹Šá¹§á¹šá¹©TtÅ¢Å£Å€Å¥ÅŠÅ§Æ«Æ¬Æ­Æ®ÊÈÈÈ¶á¹ªá¹«á¹¬á¹­á¹®á¹¯á¹°á¹±áºUuÃÃ¹ÃÃºÃÃ»ÃÃŒÅšÅ©ÅªÅ«Å¬Å­Å®Å¯Å°Å±Å²Å³Æ¯Æ°ÇÇÇÇÇÇÇÇÇÇÈÈÈÈá¹²á¹³á¹Žá¹µá¹¶á¹·á¹žá¹¹á¹ºá¹»á»€á»¥á»Šá»§á»šá»©á»ªá»«á»¬á»­á»®á»¯á»°á»±VvÆ²Êá¹Œá¹œá¹Ÿá¹¿WwÅŽÅµáºáºáºáºáºáº
-áºáºáºáºáºXxáºáºáºáºYyÃÃœÃ¿ÅžÅ¶Å·Æ³ÆŽÈ²È³áºáºáºá»²á»³á»Žá»µá»¶á»·á»žá»¹ZzÅ¹ÅºÅ»ÅŒÅœÅŸÆµÆ¶È€È¥ÊÊáºáºáºáºáºáºáº" lang="en"/>
-<l:gentext key="normalize.sort.output" text="AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ" lang="en"/>
-<l:dingbat key="startquote" text="Â«"/>
-<l:dingbat key="endquote" text="Â»"/>
-<l:dingbat key="nestedstartquote" text="â"/>
-<l:dingbat key="nestedendquote" text="â"/>
-<l:dingbat key="singlestartquote" text="â" lang="en"/>
-<l:dingbat key="singleendquote" text="â" lang="en"/>
-<l:dingbat key="bullet" text="â¢"/>
-<l:gentext key="hyphenation-character" text="-" lang="en"/>
-<l:gentext key="hyphenation-push-character-count" text="2" lang="en"/>
-<l:gentext key="hyphenation-remain-character-count" text="2" lang="en"/>
-<l:context name="styles"><l:template name="person-name" text="first-last"/>
-</l:context>
-<l:context name="title"><l:template name="abstract" text="%t"/>
-<l:template name="answer" text="%t"/>
-<l:template name="appendix" text="AppendiceÂ %n.Â %t"/>
-<l:template name="article" text="%t"/>
-<l:template name="authorblurb" text="%t"/>
-<l:template name="bibliodiv" text="%t"/>
-<l:template name="biblioentry" text="%t"/>
-<l:template name="bibliography" text="%t"/>
-<l:template name="bibliolist" text="%t" lang="en"/>
-<l:template name="bibliomixed" text="%t"/>
-<l:template name="bibliomset" text="%t"/>
-<l:template name="biblioset" text="%t"/>
-<l:template name="blockquote" text="%t"/>
-<l:template name="book" text="%t"/>
-<l:template name="calloutlist" text="%t"/>
-<l:template name="caution" text="%t"/>
-<l:template name="chapter" text="CapitoloÂ %n.Â %t"/>
-<l:template name="colophon" text="%t"/>
-<l:template name="dedication" text="%t"/>
-<l:template name="equation" text="EquazioneÂ %n.Â %t"/>
-<l:template name="example" text="EsempioÂ %n.Â %t"/>
-<l:template name="figure" text="FiguraÂ %n.Â %t"/>
-<l:template name="foil" text="%t" lang="en"/>
-<l:template name="foilgroup" text="%t" lang="en"/>
-<l:template name="formalpara" text="%t"/>
-<l:template name="glossary" text="%t"/>
-<l:template name="glossdiv" text="%t"/>
-<l:template name="glosslist" text="%t" lang="en"/>
-<l:template name="glossentry" text="%t" lang="en"/>
-<l:template name="important" text="%t"/>
-<l:template name="index" text="%t"/>
-<l:template name="indexdiv" text="%t"/>
-<l:template name="itemizedlist" text="%t"/>
-<l:template name="legalnotice" text="%t"/>
-<l:template name="listitem" text=""/>
-<l:template name="lot" text="%t"/>
-<l:template name="msg" text="%t"/>
-<l:template name="msgexplan" text="%t"/>
-<l:template name="msgmain" text="%t"/>
-<l:template name="msgrel" text="%t"/>
-<l:template name="msgset" text="%t"/>
-<l:template name="msgsub" text="%t"/>
-<l:template name="note" text="%t"/>
-<l:template name="orderedlist" text="%t"/>
-<l:template name="part" text="ParteÂ %n.Â %t"/>
-<l:template name="partintro" text="%t"/>
-<l:template name="preface" text="%t"/>
-<l:template name="procedure" text="%t"/>
-<l:template name="procedure.formal" text="ProceduraÂ %n.Â %t"/>
-<l:template name="productionset" text="%t"/>
-<l:template name="productionset.formal" text="ProduzioneÂ %n"/>
-<l:template name="qandadiv" text="%t"/>
-<l:template name="qandaentry" text="%t"/>
-<l:template name="qandaset" text="%t"/>
-<l:template name="question" text="%t"/>
-<l:template name="refentry" text="%t"/>
-<l:template name="reference" text="%t"/>
-<l:template name="refsection" text="%t"/>
-<l:template name="refsect1" text="%t"/>
-<l:template name="refsect2" text="%t"/>
-<l:template name="refsect3" text="%t"/>
-<l:template name="refsynopsisdiv" text="%t"/>
-<l:template name="refsynopsisdivinfo" text="%t"/>
-<l:template name="segmentedlist" text="%t"/>
-<l:template name="set" text="%t"/>
-<l:template name="setindex" text="%t"/>
-<l:template name="sidebar" text="%t"/>
-<l:template name="step" text="%t"/>
-<l:template name="table" text="TabellaÂ %n.Â %t"/>
-<l:template name="task" text="%t" lang="en"/>
-<l:template name="tasksummary" text="%t" lang="en"/>
-<l:template name="taskprerequisites" text="%t" lang="en"/>
-<l:template name="taskrelated" text="%t" lang="en"/>
-<l:template name="tip" text="%t"/>
-<l:template name="toc" text="%t"/>
-<l:template name="variablelist" text="%t"/>
-<l:template name="varlistentry" text=""/>
-<l:template name="warning" text="%t"/>
-</l:context>
-<l:context name="title-unnumbered"><l:template name="appendix" text="%t"/>
-<l:template name="article/appendix" text="%t" lang="en"/>
-<l:template name="bridgehead" text="%t"/>
-<l:template name="chapter" text="%t"/>
-<l:template name="sect1" text="%t"/>
-<l:template name="sect2" text="%t"/>
-<l:template name="sect3" text="%t"/>
-<l:template name="sect4" text="%t"/>
-<l:template name="sect5" text="%t"/>
-<l:template name="section" text="%t"/>
-<l:template name="simplesect" text="%t"/>
-<l:template name="part" text="%t" lang="en"/>
-</l:context>
-<l:context name="title-numbered"><l:template name="appendix" text="AppendiceÂ %n.Â %t"/>
-<l:template name="article/appendix" text="%n.Â %t" lang="en"/>
-<l:template name="bridgehead" text="%n.Â %t"/>
-<l:template name="chapter" text="CapitoloÂ %n.Â %t"/>
-<l:template name="part" text="ParteÂ %n.Â %t"/>
-<l:template name="sect1" text="%n.Â %t"/>
-<l:template name="sect2" text="%n.Â %t"/>
-<l:template name="sect3" text="%n.Â %t"/>
-<l:template name="sect4" text="%n.Â %t"/>
-<l:template name="sect5" text="%n.Â %t"/>
-<l:template name="section" text="%n.Â %t"/>
-<l:template name="simplesect" text="%t"/>
-</l:context>
-<l:context name="subtitle"><l:template name="appendix" text="%s"/>
-<l:template name="article" text="%s"/>
-<l:template name="bibliodiv" text="%s"/>
-<l:template name="biblioentry" text="%s"/>
-<l:template name="bibliography" text="%s"/>
-<l:template name="bibliomixed" text="%s"/>
-<l:template name="bibliomset" text="%s"/>
-<l:template name="biblioset" text="%s"/>
-<l:template name="book" text="%s"/>
-<l:template name="chapter" text="%s"/>
-<l:template name="colophon" text="%s"/>
-<l:template name="dedication" text="%s"/>
-<l:template name="glossary" text="%s"/>
-<l:template name="glossdiv" text="%s"/>
-<l:template name="index" text="%s"/>
-<l:template name="indexdiv" text="%s"/>
-<l:template name="lot" text="%s"/>
-<l:template name="part" text="%s"/>
-<l:template name="partintro" text="%s"/>
-<l:template name="preface" text="%s"/>
-<l:template name="refentry" text="%s"/>
-<l:template name="reference" text="%s"/>
-<l:template name="refsection" text="%s"/>
-<l:template name="refsect1" text="%s"/>
-<l:template name="refsect2" text="%s"/>
-<l:template name="refsect3" text="%s"/>
-<l:template name="refsynopsisdiv" text="%s"/>
-<l:template name="sect1" text="%s"/>
-<l:template name="sect2" text="%s"/>
-<l:template name="sect3" text="%s"/>
-<l:template name="sect4" text="%s"/>
-<l:template name="sect5" text="%s"/>
-<l:template name="section" text="%s"/>
-<l:template name="set" text="%s"/>
-<l:template name="setindex" text="%s"/>
-<l:template name="sidebar" text="%s"/>
-<l:template name="simplesect" text="%s"/>
-<l:template name="toc" text="%s"/>
-</l:context>
-<l:context name="xref"><l:template name="abstract" text="%t"/>
-<l:template name="answer" text="R:Â %n"/>
-<l:template name="appendix" text="%t"/>
-<l:template name="article" text="%t"/>
-<l:template name="authorblurb" text="%t"/>
-<l:template name="bibliodiv" text="%t"/>
-<l:template name="bibliography" text="%t"/>
-<l:template name="bibliomset" text="%t"/>
-<l:template name="biblioset" text="%t"/>
-<l:template name="blockquote" text="%t"/>
-<l:template name="book" text="%t"/>
-<l:template name="calloutlist" text="%t"/>
-<l:template name="caution" text="%t"/>
-<l:template name="chapter" text="%t"/>
-<l:template name="colophon" text="%t"/>
-<l:template name="constraintdef" text="%t"/>
-<l:template name="dedication" text="%t"/>
-<l:template name="equation" text="%t"/>
-<l:template name="example" text="%t"/>
-<l:template name="figure" text="%t"/>
-<l:template name="foil" text="%t" lang="en"/>
-<l:template name="foilgroup" text="%t" lang="en"/>
-<l:template name="formalpara" text="%t"/>
-<l:template name="glossary" text="%t"/>
-<l:template name="glossdiv" text="%t"/>
-<l:template name="important" text="%t"/>
-<l:template name="index" text="%t"/>
-<l:template name="indexdiv" text="%t"/>
-<l:template name="itemizedlist" text="%t"/>
-<l:template name="legalnotice" text="%t"/>
-<l:template name="listitem" text="%n"/>
-<l:template name="lot" text="%t"/>
-<l:template name="msg" text="%t"/>
-<l:template name="msgexplan" text="%t"/>
-<l:template name="msgmain" text="%t"/>
-<l:template name="msgrel" text="%t"/>
-<l:template name="msgset" text="%t"/>
-<l:template name="msgsub" text="%t"/>
-<l:template name="note" text="%t"/>
-<l:template name="orderedlist" text="%t"/>
-<l:template name="part" text="%t"/>
-<l:template name="partintro" text="%t"/>
-<l:template name="preface" text="%t"/>
-<l:template name="procedure" text="%t"/>
-<l:template name="productionset" text="%t"/>
-<l:template name="qandadiv" text="%t"/>
-<l:template name="qandaentry" text="D:Â %n"/>
-<l:template name="qandaset" text="%t"/>
-<l:template name="question" text="D:Â %n"/>
-<l:template name="reference" text="%t"/>
-<l:template name="refsynopsisdiv" text="%t"/>
-<l:template name="segmentedlist" text="%t"/>
-<l:template name="set" text="%t"/>
-<l:template name="setindex" text="%t"/>
-<l:template name="sidebar" text="%t"/>
-<l:template name="table" text="%t"/>
-<l:template name="task" text="%t" lang="en"/>
-<l:template name="tip" text="%t"/>
-<l:template name="toc" text="%t"/>
-<l:template name="variablelist" text="%t"/>
-<l:template name="varlistentry" text="%n"/>
-<l:template name="warning" text="%t"/>
-<l:template name="olink.document.citation" text=" in %o" lang="en"/>
-<l:template name="olink.page.citation" text=" (page %p)" lang="en"/>
-<l:template name="page.citation" text=" [%p]"/>
-<l:template name="page" text="(page %p)" lang="en"/>
-<l:template name="docname" text=" in %o" lang="en"/>
-<l:template name="docnamelong" text=" in the document titled %o" lang="en"/>
-<l:template name="pageabbrev" text="(p. %p)" lang="en"/>
-<l:template name="Page" text="Page %p" lang="en"/>
-<l:template name="bridgehead" text="la sezione chiamata Â«%tÂ»"/>
-<l:template name="refsection" text="la sezione chiamata Â«%tÂ»"/>
-<l:template name="refsect1" text="la sezione chiamata Â«%tÂ»"/>
-<l:template name="refsect2" text="la sezione chiamata Â«%tÂ»"/>
-<l:template name="refsect3" text="la sezione chiamata Â«%tÂ»"/>
-<l:template name="sect1" text="la sezione chiamata Â«%tÂ»"/>
-<l:template name="sect2" text="la sezione chiamata Â«%tÂ»"/>
-<l:template name="sect3" text="la sezione chiamata Â«%tÂ»"/>
-<l:template name="sect4" text="la sezione chiamata Â«%tÂ»"/>
-<l:template name="sect5" text="la sezione chiamata Â«%tÂ»"/>
-<l:template name="section" text="la sezione chiamata Â«%tÂ»"/>
-<l:template name="simplesect" text="la sezione chiamata Â«%tÂ»"/>
-</l:context>
-<l:context name="xref-number"><l:template name="answer" text="R:Â %n"/>
-<l:template name="appendix" text="AppendiceÂ %n"/>
-<l:template name="bridgehead" text="SezioneÂ %n"/>
-<l:template name="chapter" text="CapitoloÂ %n"/>
-<l:template name="equation" text="EquazioneÂ %n"/>
-<l:template name="example" text="EsempioÂ %n"/>
-<l:template name="figure" text="FiguraÂ %n"/>
-<l:template name="part" text="ParteÂ %n"/>
-<l:template name="procedure" text="ProceduraÂ %n"/>
-<l:template name="productionset" text="ProduzioneÂ %n"/>
-<l:template name="qandadiv" text="D e RÂ %n"/>
-<l:template name="qandaentry" text="D:Â %n"/>
-<l:template name="question" text="D:Â %n"/>
-<l:template name="sect1" text="SezioneÂ %n"/>
-<l:template name="sect2" text="SezioneÂ %n"/>
-<l:template name="sect3" text="SezioneÂ %n"/>
-<l:template name="sect4" text="SezioneÂ %n"/>
-<l:template name="sect5" text="SezioneÂ %n"/>
-<l:template name="section" text="SezioneÂ %n"/>
-<l:template name="table" text="TabellaÂ %n"/>
-</l:context>
-<l:context name="xref-number-and-title"><l:template name="appendix" text="AppendiceÂ %n, %t"/>
-<l:template name="bridgehead" text="SezioneÂ %n, Â«%tÂ»"/>
-<l:template name="chapter" text="CapitoloÂ %n, %t"/>
-<l:template name="equation" text="EquazioneÂ %n, Â«%tÂ»"/>
-<l:template name="example" text="EsempioÂ %n, Â«%tÂ»"/>
-<l:template name="figure" text="FiguraÂ %n, Â«%tÂ»"/>
-<l:template name="part" text="ParteÂ %n, Â«%tÂ»"/>
-<l:template name="procedure" text="ProceduraÂ %n, Â«%tÂ»"/>
-<l:template name="productionset" text="ProduzioneÂ %n, Â«%tÂ»"/>
-<l:template name="qandadiv" text="D e RÂ %n, Â«%tÂ»"/>
-<l:template name="refsect1" text="la sezione chiamata Â«%tÂ»"/>
-<l:template name="refsect2" text="la sezione chiamata Â«%tÂ»"/>
-<l:template name="refsect3" text="la sezione chiamata Â«%tÂ»"/>
-<l:template name="refsection" text="la sezione chiamata Â«%tÂ»"/>
-<l:template name="sect1" text="SezioneÂ %n, Â«%tÂ»"/>
-<l:template name="sect2" text="SezioneÂ %n, Â«%tÂ»"/>
-<l:template name="sect3" text="SezioneÂ %n, Â«%tÂ»"/>
-<l:template name="sect4" text="SezioneÂ %n, Â«%tÂ»"/>
-<l:template name="sect5" text="SezioneÂ %n, Â«%tÂ»"/>
-<l:template name="section" text="SezioneÂ %n, Â«%tÂ»"/>
-<l:template name="simplesect" text="la sezione chiamata Â«%tÂ»"/>
-<l:template name="table" text="TabellaÂ %n, Â«%tÂ»"/>
-</l:context>
-<l:context name="authorgroup"><l:template name="sep" text=", "/>
-<l:template name="sep2" text=" e "/>
-<l:template name="seplast" text=", e "/>
-</l:context>
-<l:context name="glossary"><l:template name="see" text="Vedi %t"/>
-<l:template name="seealso" text="Vedi Anche %t"/>
-</l:context>
-<l:context name="msgset"><l:template name="MsgAud" text="Pubblico: "/>
-<l:template name="MsgLevel" text="Livello: "/>
-<l:template name="MsgOrig" text="Origine: "/>
-</l:context>
-<l:context name="datetime"><l:template name="format" text="d/m/Y"/>
-</l:context>
-<l:context name="termdef"><l:template name="prefix" text="[Definition: " lang="en"/>
-<l:template name="suffix" text="]" lang="en"/>
-</l:context>
-<l:context name="datetime-full"><l:template name="January" text="gennaio"/>
-<l:template name="February" text="febbraio"/>
-<l:template name="March" text="marzo"/>
-<l:template name="April" text="aprile"/>
-<l:template name="May" text="maggio"/>
-<l:template name="June" text="giugno"/>
-<l:template name="July" text="luglio"/>
-<l:template name="August" text="agosto"/>
-<l:template name="September" text="settembre"/>
-<l:template name="October" text="ottobre"/>
-<l:template name="November" text="novembre"/>
-<l:template name="December" text="dicembre"/>
-<l:template name="Monday" text="lunedÃ¬"/>
-<l:template name="Tuesday" text="martedÃ¬"/>
-<l:template name="Wednesday" text="mercoledÃ¬"/>
-<l:template name="Thursday" text="giovedÃ¬"/>
-<l:template name="Friday" text="venerdÃ¬"/>
-<l:template name="Saturday" text="sabato"/>
-<l:template name="Sunday" text="domenica"/>
-</l:context>
-<l:context name="datetime-abbrev"><l:template name="Jan" text="gen"/>
-<l:template name="Feb" text="feb"/>
-<l:template name="Mar" text="mar"/>
-<l:template name="Apr" text="apr"/>
-<l:template name="May" text="mag"/>
-<l:template name="Jun" text="giu"/>
-<l:template name="Jul" text="lug"/>
-<l:template name="Aug" text="ago"/>
-<l:template name="Sep" text="set"/>
-<l:template name="Oct" text="ott"/>
-<l:template name="Nov" text="nov"/>
-<l:template name="Dec" text="dic"/>
-<l:template name="Mon" text="lun"/>
-<l:template name="Tue" text="mar"/>
-<l:template name="Wed" text="mer"/>
-<l:template name="Thu" text="gio"/>
-<l:template name="Fri" text="ven"/>
-<l:template name="Sat" text="sab"/>
-<l:template name="Sun" text="dom"/>
-</l:context>
-<l:context name="htmlhelp"><l:template name="langcode" text="0x0410 Italian"/>
-</l:context>
-<l:context name="index"><l:template name="term-separator" text=", " lang="en"/>
-<l:template name="number-separator" text=", " lang="en"/>
-<l:template name="range-separator" text="-" lang="en"/>
-</l:context>
-<l:context name="iso690"><l:template name="lastfirst.sep" text=", " lang="en"/>
-<l:template name="alt.person.two.sep" text=" â " lang="en"/>
-<l:template name="alt.person.last.sep" text=" â " lang="en"/>
-<l:template name="alt.person.more.sep" text=" â " lang="en"/>
-<l:template name="primary.editor" text=" (ed.)" lang="en"/>
-<l:template name="primary.many" text=", et al." lang="en"/>
-<l:template name="primary.sep" text=". " lang="en"/>
-<l:template name="submaintitle.sep" text=": " lang="en"/>
-<l:template name="title.sep" text=". " lang="en"/>
-<l:template name="othertitle.sep" text=", " lang="en"/>
-<l:template name="medium1" text=" [" lang="en"/>
-<l:template name="medium2" text="]" lang="en"/>
-<l:template name="secondary.person.sep" text="; " lang="en"/>
-<l:template name="secondary.sep" text=". " lang="en"/>
-<l:template name="respons.sep" text=". " lang="en"/>
-<l:template name="edition.sep" text=". " lang="en"/>
-<l:template name="edition.serial.sep" text=", " lang="en"/>
-<l:template name="issuing.range" text="-" lang="en"/>
-<l:template name="issuing.div" text=", " lang="en"/>
-<l:template name="issuing.sep" text=". " lang="en"/>
-<l:template name="partnr.sep" text=". " lang="en"/>
-<l:template name="placepubl.sep" text=": " lang="en"/>
-<l:template name="publyear.sep" text=", " lang="en"/>
-<l:template name="pubinfo.sep" text=". " lang="en"/>
-<l:template name="spec.pubinfo.sep" text=", " lang="en"/>
-<l:template name="upd.sep" text=", " lang="en"/>
-<l:template name="datecit1" text=" [cited " lang="en"/>
-<l:template name="datecit2" text="]" lang="en"/>
-<l:template name="extent.sep" text=". " lang="en"/>
-<l:template name="locs.sep" text=", " lang="en"/>
-<l:template name="location.sep" text=". " lang="en"/>
-<l:template name="serie.sep" text=". " lang="en"/>
-<l:template name="notice.sep" text=". " lang="en"/>
-<l:template name="access" text="Available " lang="en"/>
-<l:template name="acctoo" text="Also available " lang="en"/>
-<l:template name="onwww" text="from World Wide Web" lang="en"/>
-<l:template name="oninet" text="from Internet" lang="en"/>
-<l:template name="access.end" text=": " lang="en"/>
-<l:template name="link1" text="&lt;" lang="en"/>
-<l:template name="link2" text="&gt;" lang="en"/>
-<l:template name="access.sep" text=". " lang="en"/>
-<l:template name="isbn" text="ISBN " lang="en"/>
-<l:template name="issn" text="ISSN " lang="en"/>
-<l:template name="stdnum.sep" text=". " lang="en"/>
-<l:template name="patcountry.sep" text=". " lang="en"/>
-<l:template name="pattype.sep" text=", " lang="en"/>
-<l:template name="patnum.sep" text=". " lang="en"/>
-<l:template name="patdate.sep" text=". " lang="en"/>
-</l:context><l:letters lang="en"><l:l i="-1"/>
-<l:l i="0">Symbols</l:l>
-<l:l i="10">A</l:l>
-<l:l i="10">a</l:l>
-<l:l i="10">Ã</l:l>
-<l:l i="10">Ã </l:l>
-<l:l i="10">Ã</l:l>
-<l:l i="10">Ã¡</l:l>
-<l:l i="10">Ã</l:l>
-<l:l i="10">Ã¢</l:l>
-<l:l i="10">Ã</l:l>
-<l:l i="10">Ã£</l:l>
-<l:l i="10">Ã</l:l>
-<l:l i="10">Ã€</l:l>
-<l:l i="10">Ã
-</l:l>
-<l:l i="10">Ã¥</l:l>
-<l:l i="10">Ä</l:l>
-<l:l i="10">Ä</l:l>
-<l:l i="10">Ä</l:l>
-<l:l i="10">Ä</l:l>
-<l:l i="10">Ä</l:l>
-<l:l i="10">Ä
-</l:l>
-<l:l i="10">Ç</l:l>
-<l:l i="10">Ç</l:l>
-<l:l i="10">Ç</l:l>
-<l:l i="10">Ç</l:l>
-<l:l i="10">Ç </l:l>
-<l:l i="10">Ç¡</l:l>
-<l:l i="10">Çº</l:l>
-<l:l i="10">Ç»</l:l>
-<l:l i="10">È</l:l>
-<l:l i="10">È</l:l>
-<l:l i="10">È</l:l>
-<l:l i="10">È</l:l>
-<l:l i="10">ÈŠ</l:l>
-<l:l i="10">È§</l:l>
-<l:l i="10">áž</l:l>
-<l:l i="10">áž</l:l>
-<l:l i="10">áº</l:l>
-<l:l i="10">áº </l:l>
-<l:l i="10">áº¡</l:l>
-<l:l i="10">áº¢</l:l>
-<l:l i="10">áº£</l:l>
-<l:l i="10">áº€</l:l>
-<l:l i="10">áº¥</l:l>
-<l:l i="10">áºŠ</l:l>
-<l:l i="10">áº§</l:l>
-<l:l i="10">áºš</l:l>
-<l:l i="10">áº©</l:l>
-<l:l i="10">áºª</l:l>
-<l:l i="10">áº«</l:l>
-<l:l i="10">áº¬</l:l>
-<l:l i="10">áº­</l:l>
-<l:l i="10">áº®</l:l>
-<l:l i="10">áº¯</l:l>
-<l:l i="10">áº°</l:l>
-<l:l i="10">áº±</l:l>
-<l:l i="10">áº²</l:l>
-<l:l i="10">áº³</l:l>
-<l:l i="10">áºŽ</l:l>
-<l:l i="10">áºµ</l:l>
-<l:l i="10">áº¶</l:l>
-<l:l i="10">áº·</l:l>
-<l:l i="20">B</l:l>
-<l:l i="20">b</l:l>
-<l:l i="20">Æ</l:l>
-<l:l i="20">Æ</l:l>
-<l:l i="20">É</l:l>
-<l:l i="20">Æ</l:l>
-<l:l i="20">Æ</l:l>
-<l:l i="20">áž</l:l>
-<l:l i="20">áž</l:l>
-<l:l i="20">áž</l:l>
-<l:l i="20">áž
-</l:l>
-<l:l i="20">áž</l:l>
-<l:l i="20">áž</l:l>
-<l:l i="30">C</l:l>
-<l:l i="30">c</l:l>
-<l:l i="30">Ã</l:l>
-<l:l i="30">Ã§</l:l>
-<l:l i="30">Ä</l:l>
-<l:l i="30">Ä</l:l>
-<l:l i="30">Ä</l:l>
-<l:l i="30">Ä</l:l>
-<l:l i="30">Ä</l:l>
-<l:l i="30">Ä</l:l>
-<l:l i="30">Ä</l:l>
-<l:l i="30">Ä</l:l>
-<l:l i="30">Æ</l:l>
-<l:l i="30">Æ</l:l>
-<l:l i="30">É</l:l>
-<l:l i="30">áž</l:l>
-<l:l i="30">áž</l:l>
-<l:l i="40">D</l:l>
-<l:l i="40">d</l:l>
-<l:l i="40">Ä</l:l>
-<l:l i="40">Ä</l:l>
-<l:l i="40">Ä</l:l>
-<l:l i="40">Ä</l:l>
-<l:l i="40">Æ</l:l>
-<l:l i="40">É</l:l>
-<l:l i="40">Æ</l:l>
-<l:l i="40">Æ</l:l>
-<l:l i="40">Ç
-</l:l>
-<l:l i="40">Ç²</l:l>
-<l:l i="40">È¡</l:l>
-<l:l i="40">É</l:l>
-<l:l i="40">áž</l:l>
-<l:l i="40">áž</l:l>
-<l:l i="40">áž</l:l>
-<l:l i="40">áž</l:l>
-<l:l i="40">áž</l:l>
-<l:l i="40">áž</l:l>
-<l:l i="40">áž</l:l>
-<l:l i="40">áž</l:l>
-<l:l i="40">áž</l:l>
-<l:l i="40">áž</l:l>
-<l:l i="50">E</l:l>
-<l:l i="50">e</l:l>
-<l:l i="50">Ã</l:l>
-<l:l i="50">Ãš</l:l>
-<l:l i="50">Ã</l:l>
-<l:l i="50">Ã©</l:l>
-<l:l i="50">Ã</l:l>
-<l:l i="50">Ãª</l:l>
-<l:l i="50">Ã</l:l>
-<l:l i="50">Ã«</l:l>
-<l:l i="50">Ä</l:l>
-<l:l i="50">Ä</l:l>
-<l:l i="50">Ä</l:l>
-<l:l i="50">Ä</l:l>
-<l:l i="50">Ä</l:l>
-<l:l i="50">Ä</l:l>
-<l:l i="50">Ä</l:l>
-<l:l i="50">Ä</l:l>
-<l:l i="50">Ä</l:l>
-<l:l i="50">Ä</l:l>
-<l:l i="50">È</l:l>
-<l:l i="50">È
-</l:l>
-<l:l i="50">È</l:l>
-<l:l i="50">È</l:l>
-<l:l i="50">Èš</l:l>
-<l:l i="50">È©</l:l>
-<l:l i="50">áž</l:l>
-<l:l i="50">áž</l:l>
-<l:l i="50">áž</l:l>
-<l:l i="50">áž</l:l>
-<l:l i="50">áž</l:l>
-<l:l i="50">áž</l:l>
-<l:l i="50">áž</l:l>
-<l:l i="50">áž</l:l>
-<l:l i="50">áž</l:l>
-<l:l i="50">áž</l:l>
-<l:l i="50">áºž</l:l>
-<l:l i="50">áº¹</l:l>
-<l:l i="50">áºº</l:l>
-<l:l i="50">áº»</l:l>
-<l:l i="50">áºŒ</l:l>
-<l:l i="50">áºœ</l:l>
-<l:l i="50">áºŸ</l:l>
-<l:l i="50">áº¿</l:l>
-<l:l i="50">á»</l:l>
-<l:l i="50">á»</l:l>
-<l:l i="50">á»</l:l>
-<l:l i="50">á»</l:l>
-<l:l i="50">á»</l:l>
-<l:l i="50">á»
-</l:l>
-<l:l i="50">á»</l:l>
-<l:l i="50">á»</l:l>
-<l:l i="60">F</l:l>
-<l:l i="60">f</l:l>
-<l:l i="60">Æ</l:l>
-<l:l i="60">Æ</l:l>
-<l:l i="60">áž</l:l>
-<l:l i="60">áž</l:l>
-<l:l i="70">G</l:l>
-<l:l i="70">g</l:l>
-<l:l i="70">Ä</l:l>
-<l:l i="70">Ä</l:l>
-<l:l i="70">Ä</l:l>
-<l:l i="70">Ä</l:l>
-<l:l i="70">Ä </l:l>
-<l:l i="70">Ä¡</l:l>
-<l:l i="70">Ä¢</l:l>
-<l:l i="70">Ä£</l:l>
-<l:l i="70">Æ</l:l>
-<l:l i="70">É </l:l>
-<l:l i="70">Ç€</l:l>
-<l:l i="70">Ç¥</l:l>
-<l:l i="70">ÇŠ</l:l>
-<l:l i="70">Ç§</l:l>
-<l:l i="70">ÇŽ</l:l>
-<l:l i="70">Çµ</l:l>
-<l:l i="70">áž </l:l>
-<l:l i="70">áž¡</l:l>
-<l:l i="80">H</l:l>
-<l:l i="80">h</l:l>
-<l:l i="80">Ä€</l:l>
-<l:l i="80">Ä¥</l:l>
-<l:l i="80">ÄŠ</l:l>
-<l:l i="80">Ä§</l:l>
-<l:l i="80">È</l:l>
-<l:l i="80">È</l:l>
-<l:l i="80">ÉŠ</l:l>
-<l:l i="80">áž¢</l:l>
-<l:l i="80">áž£</l:l>
-<l:l i="80">áž€</l:l>
-<l:l i="80">áž¥</l:l>
-<l:l i="80">ážŠ</l:l>
-<l:l i="80">áž§</l:l>
-<l:l i="80">ážš</l:l>
-<l:l i="80">áž©</l:l>
-<l:l i="80">ážª</l:l>
-<l:l i="80">áž«</l:l>
-<l:l i="80">áº</l:l>
-<l:l i="90">I</l:l>
-<l:l i="90">i</l:l>
-<l:l i="90">Ã</l:l>
-<l:l i="90">Ã¬</l:l>
-<l:l i="90">Ã</l:l>
-<l:l i="90">Ã­</l:l>
-<l:l i="90">Ã</l:l>
-<l:l i="90">Ã®</l:l>
-<l:l i="90">Ã</l:l>
-<l:l i="90">Ã¯</l:l>
-<l:l i="90">Äš</l:l>
-<l:l i="90">Ä©</l:l>
-<l:l i="90">Äª</l:l>
-<l:l i="90">Ä«</l:l>
-<l:l i="90">Ä¬</l:l>
-<l:l i="90">Ä­</l:l>
-<l:l i="90">Ä®</l:l>
-<l:l i="90">Ä¯</l:l>
-<l:l i="90">Ä°</l:l>
-<l:l i="90">Æ</l:l>
-<l:l i="90">Éš</l:l>
-<l:l i="90">Ç</l:l>
-<l:l i="90">Ç</l:l>
-<l:l i="90">È</l:l>
-<l:l i="90">È</l:l>
-<l:l i="90">È</l:l>
-<l:l i="90">È</l:l>
-<l:l i="90">áž¬</l:l>
-<l:l i="90">áž­</l:l>
-<l:l i="90">áž®</l:l>
-<l:l i="90">áž¯</l:l>
-<l:l i="90">á»</l:l>
-<l:l i="90">á»</l:l>
-<l:l i="90">á»</l:l>
-<l:l i="90">á»</l:l>
-<l:l i="100">J</l:l>
-<l:l i="100">j</l:l>
-<l:l i="100">ÄŽ</l:l>
-<l:l i="100">Äµ</l:l>
-<l:l i="100">Ç°</l:l>
-<l:l i="100">Ê</l:l>
-<l:l i="110">K</l:l>
-<l:l i="110">k</l:l>
-<l:l i="110">Ä¶</l:l>
-<l:l i="110">Ä·</l:l>
-<l:l i="110">Æ</l:l>
-<l:l i="110">Æ</l:l>
-<l:l i="110">Çš</l:l>
-<l:l i="110">Ç©</l:l>
-<l:l i="110">áž°</l:l>
-<l:l i="110">áž±</l:l>
-<l:l i="110">áž²</l:l>
-<l:l i="110">áž³</l:l>
-<l:l i="110">ážŽ</l:l>
-<l:l i="110">ážµ</l:l>
-<l:l i="120">L</l:l>
-<l:l i="120">l</l:l>
-<l:l i="120">Ä¹</l:l>
-<l:l i="120">Äº</l:l>
-<l:l i="120">Ä»</l:l>
-<l:l i="120">ÄŒ</l:l>
-<l:l i="120">Äœ</l:l>
-<l:l i="120">ÄŸ</l:l>
-<l:l i="120">Ä¿</l:l>
-<l:l i="120">Å</l:l>
-<l:l i="120">Å</l:l>
-<l:l i="120">Å</l:l>
-<l:l i="120">Æ</l:l>
-<l:l i="120">Ç</l:l>
-<l:l i="120">ÈŽ</l:l>
-<l:l i="120">É«</l:l>
-<l:l i="120">É¬</l:l>
-<l:l i="120">É­</l:l>
-<l:l i="120">áž¶</l:l>
-<l:l i="120">áž·</l:l>
-<l:l i="120">ážž</l:l>
-<l:l i="120">áž¹</l:l>
-<l:l i="120">ážº</l:l>
-<l:l i="120">áž»</l:l>
-<l:l i="120">ážŒ</l:l>
-<l:l i="120">ážœ</l:l>
-<l:l i="130">M</l:l>
-<l:l i="130">m</l:l>
-<l:l i="130">É±</l:l>
-<l:l i="130">ážŸ</l:l>
-<l:l i="130">áž¿</l:l>
-<l:l i="130">á¹</l:l>
-<l:l i="130">á¹</l:l>
-<l:l i="130">á¹</l:l>
-<l:l i="130">á¹</l:l>
-<l:l i="140">N</l:l>
-<l:l i="140">n</l:l>
-<l:l i="140">Ã</l:l>
-<l:l i="140">Ã±</l:l>
-<l:l i="140">Å</l:l>
-<l:l i="140">Å</l:l>
-<l:l i="140">Å
-</l:l>
-<l:l i="140">Å</l:l>
-<l:l i="140">Å</l:l>
-<l:l i="140">Å</l:l>
-<l:l i="140">Æ</l:l>
-<l:l i="140">É²</l:l>
-<l:l i="140">Æ</l:l>
-<l:l i="140">È </l:l>
-<l:l i="140">Ç</l:l>
-<l:l i="140">Çž</l:l>
-<l:l i="140">Ç¹</l:l>
-<l:l i="140">Èµ</l:l>
-<l:l i="140">É³</l:l>
-<l:l i="140">á¹</l:l>
-<l:l i="140">á¹
-</l:l>
-<l:l i="140">á¹</l:l>
-<l:l i="140">á¹</l:l>
-<l:l i="140">á¹</l:l>
-<l:l i="140">á¹</l:l>
-<l:l i="140">á¹</l:l>
-<l:l i="140">á¹</l:l>
-<l:l i="150">O</l:l>
-<l:l i="150">o</l:l>
-<l:l i="150">Ã</l:l>
-<l:l i="150">Ã²</l:l>
-<l:l i="150">Ã</l:l>
-<l:l i="150">Ã³</l:l>
-<l:l i="150">Ã</l:l>
-<l:l i="150">ÃŽ</l:l>
-<l:l i="150">Ã</l:l>
-<l:l i="150">Ãµ</l:l>
-<l:l i="150">Ã</l:l>
-<l:l i="150">Ã¶</l:l>
-<l:l i="150">Ã</l:l>
-<l:l i="150">Ãž</l:l>
-<l:l i="150">Å</l:l>
-<l:l i="150">Å</l:l>
-<l:l i="150">Å</l:l>
-<l:l i="150">Å</l:l>
-<l:l i="150">Å</l:l>
-<l:l i="150">Å</l:l>
-<l:l i="150">Æ</l:l>
-<l:l i="150">Æ </l:l>
-<l:l i="150">Æ¡</l:l>
-<l:l i="150">Ç</l:l>
-<l:l i="150">Ç</l:l>
-<l:l i="150">Çª</l:l>
-<l:l i="150">Ç«</l:l>
-<l:l i="150">Ç¬</l:l>
-<l:l i="150">Ç­</l:l>
-<l:l i="150">ÇŸ</l:l>
-<l:l i="150">Ç¿</l:l>
-<l:l i="150">È</l:l>
-<l:l i="150">È</l:l>
-<l:l i="150">È</l:l>
-<l:l i="150">È</l:l>
-<l:l i="150">Èª</l:l>
-<l:l i="150">È«</l:l>
-<l:l i="150">È¬</l:l>
-<l:l i="150">È­</l:l>
-<l:l i="150">È®</l:l>
-<l:l i="150">È¯</l:l>
-<l:l i="150">È°</l:l>
-<l:l i="150">È±</l:l>
-<l:l i="150">á¹</l:l>
-<l:l i="150">á¹</l:l>
-<l:l i="150">á¹</l:l>
-<l:l i="150">á¹</l:l>
-<l:l i="150">á¹</l:l>
-<l:l i="150">á¹</l:l>
-<l:l i="150">á¹</l:l>
-<l:l i="150">á¹</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á» </l:l>
-<l:l i="150">á»¡</l:l>
-<l:l i="150">á»¢</l:l>
-<l:l i="150">á»£</l:l>
-<l:l i="160">P</l:l>
-<l:l i="160">p</l:l>
-<l:l i="160">Æ€</l:l>
-<l:l i="160">Æ¥</l:l>
-<l:l i="160">á¹</l:l>
-<l:l i="160">á¹</l:l>
-<l:l i="160">á¹</l:l>
-<l:l i="160">á¹</l:l>
-<l:l i="170">Q</l:l>
-<l:l i="170">q</l:l>
-<l:l i="170">Ê </l:l>
-<l:l i="180">R</l:l>
-<l:l i="180">r</l:l>
-<l:l i="180">Å</l:l>
-<l:l i="180">Å</l:l>
-<l:l i="180">Å</l:l>
-<l:l i="180">Å</l:l>
-<l:l i="180">Å</l:l>
-<l:l i="180">Å</l:l>
-<l:l i="180">È</l:l>
-<l:l i="180">È</l:l>
-<l:l i="180">È</l:l>
-<l:l i="180">È</l:l>
-<l:l i="180">ÉŒ</l:l>
-<l:l i="180">Éœ</l:l>
-<l:l i="180">ÉŸ</l:l>
-<l:l i="180">á¹</l:l>
-<l:l i="180">á¹</l:l>
-<l:l i="180">á¹</l:l>
-<l:l i="180">á¹</l:l>
-<l:l i="180">á¹</l:l>
-<l:l i="180">á¹</l:l>
-<l:l i="180">á¹</l:l>
-<l:l i="180">á¹</l:l>
-<l:l i="190">S</l:l>
-<l:l i="190">s</l:l>
-<l:l i="190">Å</l:l>
-<l:l i="190">Å</l:l>
-<l:l i="190">Å</l:l>
-<l:l i="190">Å</l:l>
-<l:l i="190">Å</l:l>
-<l:l i="190">Å</l:l>
-<l:l i="190">Å </l:l>
-<l:l i="190">Å¡</l:l>
-<l:l i="190">È</l:l>
-<l:l i="190">È</l:l>
-<l:l i="190">Ê</l:l>
-<l:l i="190">á¹ </l:l>
-<l:l i="190">á¹¡</l:l>
-<l:l i="190">á¹¢</l:l>
-<l:l i="190">á¹£</l:l>
-<l:l i="190">á¹€</l:l>
-<l:l i="190">á¹¥</l:l>
-<l:l i="190">á¹Š</l:l>
-<l:l i="190">á¹§</l:l>
-<l:l i="190">á¹š</l:l>
-<l:l i="190">á¹©</l:l>
-<l:l i="200">T</l:l>
-<l:l i="200">t</l:l>
-<l:l i="200">Å¢</l:l>
-<l:l i="200">Å£</l:l>
-<l:l i="200">Å€</l:l>
-<l:l i="200">Å¥</l:l>
-<l:l i="200">ÅŠ</l:l>
-<l:l i="200">Å§</l:l>
-<l:l i="200">Æ«</l:l>
-<l:l i="200">Æ¬</l:l>
-<l:l i="200">Æ­</l:l>
-<l:l i="200">Æ®</l:l>
-<l:l i="200">Ê</l:l>
-<l:l i="200">È</l:l>
-<l:l i="200">È</l:l>
-<l:l i="200">È¶</l:l>
-<l:l i="200">á¹ª</l:l>
-<l:l i="200">á¹«</l:l>
-<l:l i="200">á¹¬</l:l>
-<l:l i="200">á¹­</l:l>
-<l:l i="200">á¹®</l:l>
-<l:l i="200">á¹¯</l:l>
-<l:l i="200">á¹°</l:l>
-<l:l i="200">á¹±</l:l>
-<l:l i="200">áº</l:l>
-<l:l i="210">U</l:l>
-<l:l i="210">u</l:l>
-<l:l i="210">Ã</l:l>
-<l:l i="210">Ã¹</l:l>
-<l:l i="210">Ã</l:l>
-<l:l i="210">Ãº</l:l>
-<l:l i="210">Ã</l:l>
-<l:l i="210">Ã»</l:l>
-<l:l i="210">Ã</l:l>
-<l:l i="210">ÃŒ</l:l>
-<l:l i="210">Åš</l:l>
-<l:l i="210">Å©</l:l>
-<l:l i="210">Åª</l:l>
-<l:l i="210">Å«</l:l>
-<l:l i="210">Å¬</l:l>
-<l:l i="210">Å­</l:l>
-<l:l i="210">Å®</l:l>
-<l:l i="210">Å¯</l:l>
-<l:l i="210">Å°</l:l>
-<l:l i="210">Å±</l:l>
-<l:l i="210">Å²</l:l>
-<l:l i="210">Å³</l:l>
-<l:l i="210">Æ¯</l:l>
-<l:l i="210">Æ°</l:l>
-<l:l i="210">Ç</l:l>
-<l:l i="210">Ç</l:l>
-<l:l i="210">Ç</l:l>
-<l:l i="210">Ç</l:l>
-<l:l i="210">Ç</l:l>
-<l:l i="210">Ç</l:l>
-<l:l i="210">Ç</l:l>
-<l:l i="210">Ç</l:l>
-<l:l i="210">Ç</l:l>
-<l:l i="210">Ç</l:l>
-<l:l i="210">È</l:l>
-<l:l i="210">È</l:l>
-<l:l i="210">È</l:l>
-<l:l i="210">È</l:l>
-<l:l i="210">á¹²</l:l>
-<l:l i="210">á¹³</l:l>
-<l:l i="210">á¹Ž</l:l>
-<l:l i="210">á¹µ</l:l>
-<l:l i="210">á¹¶</l:l>
-<l:l i="210">á¹·</l:l>
-<l:l i="210">á¹ž</l:l>
-<l:l i="210">á¹¹</l:l>
-<l:l i="210">á¹º</l:l>
-<l:l i="210">á¹»</l:l>
-<l:l i="210">á»€</l:l>
-<l:l i="210">á»¥</l:l>
-<l:l i="210">á»Š</l:l>
-<l:l i="210">á»§</l:l>
-<l:l i="210">á»š</l:l>
-<l:l i="210">á»©</l:l>
-<l:l i="210">á»ª</l:l>
-<l:l i="210">á»«</l:l>
-<l:l i="210">á»¬</l:l>
-<l:l i="210">á»­</l:l>
-<l:l i="210">á»®</l:l>
-<l:l i="210">á»¯</l:l>
-<l:l i="210">á»°</l:l>
-<l:l i="210">á»±</l:l>
-<l:l i="220">V</l:l>
-<l:l i="220">v</l:l>
-<l:l i="220">Æ²</l:l>
-<l:l i="220">Ê</l:l>
-<l:l i="220">á¹Œ</l:l>
-<l:l i="220">á¹œ</l:l>
-<l:l i="220">á¹Ÿ</l:l>
-<l:l i="220">á¹¿</l:l>
-<l:l i="230">W</l:l>
-<l:l i="230">w</l:l>
-<l:l i="230">ÅŽ</l:l>
-<l:l i="230">Åµ</l:l>
-<l:l i="230">áº</l:l>
-<l:l i="230">áº</l:l>
-<l:l i="230">áº</l:l>
-<l:l i="230">áº</l:l>
-<l:l i="230">áº</l:l>
-<l:l i="230">áº
-</l:l>
-<l:l i="230">áº</l:l>
-<l:l i="230">áº</l:l>
-<l:l i="230">áº</l:l>
-<l:l i="230">áº</l:l>
-<l:l i="230">áº</l:l>
-<l:l i="240">X</l:l>
-<l:l i="240">x</l:l>
-<l:l i="240">áº</l:l>
-<l:l i="240">áº</l:l>
-<l:l i="240">áº</l:l>
-<l:l i="240">áº</l:l>
-<l:l i="250">Y</l:l>
-<l:l i="250">y</l:l>
-<l:l i="250">Ã</l:l>
-<l:l i="250">Ãœ</l:l>
-<l:l i="250">Ã¿</l:l>
-<l:l i="250">Åž</l:l>
-<l:l i="250">Å¶</l:l>
-<l:l i="250">Å·</l:l>
-<l:l i="250">Æ³</l:l>
-<l:l i="250">ÆŽ</l:l>
-<l:l i="250">È²</l:l>
-<l:l i="250">È³</l:l>
-<l:l i="250">áº</l:l>
-<l:l i="250">áº</l:l>
-<l:l i="250">áº</l:l>
-<l:l i="250">á»²</l:l>
-<l:l i="250">á»³</l:l>
-<l:l i="250">á»Ž</l:l>
-<l:l i="250">á»µ</l:l>
-<l:l i="250">á»¶</l:l>
-<l:l i="250">á»·</l:l>
-<l:l i="250">á»ž</l:l>
-<l:l i="250">á»¹</l:l>
-<l:l i="260">Z</l:l>
-<l:l i="260">z</l:l>
-<l:l i="260">Å¹</l:l>
-<l:l i="260">Åº</l:l>
-<l:l i="260">Å»</l:l>
-<l:l i="260">ÅŒ</l:l>
-<l:l i="260">Åœ</l:l>
-<l:l i="260">ÅŸ</l:l>
-<l:l i="260">Æµ</l:l>
-<l:l i="260">Æ¶</l:l>
-<l:l i="260">È€</l:l>
-<l:l i="260">È¥</l:l>
-<l:l i="260">Ê</l:l>
-<l:l i="260">Ê</l:l>
-<l:l i="260">áº</l:l>
-<l:l i="260">áº</l:l>
-<l:l i="260">áº</l:l>
-<l:l i="260">áº</l:l>
-<l:l i="260">áº</l:l>
-<l:l i="260">áº</l:l>
-</l:letters>
-</l:l10n>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/l10n.dtd
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/l10n.dtd	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,63 +1,0 @@
-<!ENTITY % prefix "l">
-
-<!ENTITY % xmlns "xmlns:%prefix;">
-<!ENTITY % uri "'http://docbook.sourceforge.net/xmlns/l10n/1.0'">
-
-<!ENTITY % i18n "%prefix;:i18n">
-<!ENTITY % l10n "%prefix;:l10n">
-<!ENTITY % gentext "%prefix;:gentext">
-<!ENTITY % dingbat "%prefix;:dingbat">
-<!ENTITY % context "%prefix;:context">
-<!ENTITY % template "%prefix;:template">
-<!ENTITY % letters "%prefix;:letters">
-<!ENTITY % l "%prefix;:l">
-<!ENTITY % lang "lang NMTOKEN #IMPLIED"> 
-
-<!ELEMENT %i18n; ((%l10n;)+)>
-<!ATTLIST %i18n;
-	%xmlns;		CDATA	#FIXED %uri;
->
-
-<!ELEMENT %l10n; (%gentext;|%dingbat;|%context;|%letters;)*>
-<!ATTLIST %l10n;
-	%xmlns;		CDATA	#FIXED %uri;
-	language	CDATA	#REQUIRED
-	english-language-name	CDATA	#IMPLIED
->
-
-<!ELEMENT %gentext; EMPTY>
-<!ATTLIST %gentext;
-	%lang;
-	key		CDATA	#REQUIRED
-	text		CDATA	#REQUIRED
->
-
-<!ELEMENT %dingbat; EMPTY>
-<!ATTLIST %dingbat;
-        %lang;
-	key		CDATA	#REQUIRED
-	text		CDATA	#REQUIRED
->
-
-<!ELEMENT %context; ((%template;)+)>
-<!ATTLIST %context;
-	name		CDATA	#REQUIRED
->
-
-<!ELEMENT %template; EMPTY>
-<!ATTLIST %template;
-        %lang;
-	name		CDATA	#REQUIRED
-	text		CDATA	#REQUIRED
-	style		CDATA	#IMPLIED
->
-
-<!ELEMENT %letters; ((%l;)+)>
-<!ATTLIST %letters;
-          %lang;
->
-
-<!ELEMENT %l; (#PCDATA)>
-<!ATTLIST %l;
-          i 		CDATA 	#REQUIRED
->
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/l10n.xml
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/l10n.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,19 +1,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE l:i18n SYSTEM "l10n.dtd" [
-<!ENTITY de SYSTEM "de.xml">
-<!ENTITY en SYSTEM "en.xml">
-<!ENTITY es SYSTEM "es.xml">
-<!ENTITY fr SYSTEM "fr.xml">
-<!ENTITY it SYSTEM "it.xml">
-<!ENTITY zh_cn SYSTEM "zh_cn.xml">
-<!ENTITY zh_tw SYSTEM "zh_tw.xml">
-]>
-<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
-&de;
-&en;
-&es;
-&fr;
-&it;
-&zh_cn;
-&zh_tw;
-</l:i18n>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/l10n.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/l10n.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,441 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0"
-                exclude-result-prefixes="l"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     This file contains localization templates (for internationalization)
-     ******************************************************************** -->
-
-<xsl:param name="l10n.xml" select="document('../common/l10n.xml')"/>
-<xsl:param name="local.l10n.xml" select="document('')"/>
-
-<xsl:template name="l10n.language">
-  <xsl:param name="target" select="."/>
-  <xsl:param name="xref-context" select="false()"/>
-
-  <xsl:variable name="mc-language">
-    <xsl:choose>
-      <xsl:when test="$l10n.gentext.language != ''">
-        <xsl:value-of select="$l10n.gentext.language"/>
-      </xsl:when>
-
-      <xsl:when test="$xref-context or $l10n.gentext.use.xref.language != 0">
-        <!-- can't do this one step: attributes are unordered! -->
-        <xsl:variable name="lang-scope"
-                      select="$target/ancestor-or-self::*
-                              [@lang or @xml:lang][1]"/>
-        <xsl:variable name="lang-attr"
-                      select="($lang-scope/@lang | $lang-scope/@xml:lang)[1]"/>
-        <xsl:choose>
-          <xsl:when test="string($lang-attr) = ''">
-            <xsl:value-of select="$l10n.gentext.default.language"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="$lang-attr"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-
-      <xsl:otherwise>
-        <!-- can't do this one step: attributes are unordered! -->
-        <xsl:variable name="lang-scope"
-                      select="$target/ancestor-or-self::*
-                              [@lang or @xml:lang][1]"/>
-        <xsl:variable name="lang-attr"
-                      select="($lang-scope/@lang | $lang-scope/@xml:lang)[1]"/>
-
-        <xsl:choose>
-          <xsl:when test="string($lang-attr) = ''">
-            <xsl:value-of select="$l10n.gentext.default.language"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="$lang-attr"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="language" select="translate($mc-language,
-                                        'ABCDEFGHIJKLMNOPQRSTUVWXYZ',
-                                        'abcdefghijklmnopqrstuvwxyz')"/>
-
-  <xsl:variable name="adjusted.language">
-    <xsl:choose>
-      <xsl:when test="contains($language,'-')">
-        <xsl:value-of select="substring-before($language,'-')"/>
-        <xsl:text>_</xsl:text>
-        <xsl:value-of select="substring-after($language,'-')"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$language"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$l10n.xml/l:i18n/l:l10n[@language=$adjusted.language]">
-      <xsl:value-of select="$adjusted.language"/>
-    </xsl:when>
-    <!-- try just the lang code without country -->
-    <xsl:when test="$l10n.xml/l:i18n/l:l10n[@language=substring-before($adjusted.language,'_')]">
-      <xsl:value-of select="substring-before($adjusted.language,'_')"/>
-    </xsl:when>
-    <!-- or use the default -->
-    <xsl:otherwise>
-      <xsl:message>
-        <xsl:text>No localization exists for "</xsl:text>
-        <xsl:value-of select="$adjusted.language"/>
-        <xsl:text>" or "</xsl:text>
-        <xsl:value-of select="substring-before($adjusted.language,'_')"/>
-        <xsl:text>". Using default "</xsl:text>
-        <xsl:value-of select="$l10n.gentext.default.language"/>
-        <xsl:text>".</xsl:text>
-      </xsl:message>
-      <xsl:value-of select="$l10n.gentext.default.language"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="language.attribute">
-  <xsl:param name="node" select="."/>
-
-  <xsl:variable name="language">
-    <xsl:choose>
-      <xsl:when test="$l10n.gentext.language != ''">
-        <xsl:value-of select="$l10n.gentext.language"/>
-      </xsl:when>
-
-      <xsl:otherwise>
-        <!-- can't do this one step: attributes are unordered! -->
-        <xsl:variable name="lang-scope"
-                      select="$node/ancestor-or-self::*
-                              [@lang or @xml:lang][1]"/>
-        <xsl:variable name="lang-attr"
-                      select="($lang-scope/@lang | $lang-scope/@xml:lang)[1]"/>
-
-        <xsl:choose>
-          <xsl:when test="string($lang-attr) = ''">
-            <xsl:value-of select="$l10n.gentext.default.language"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="$lang-attr"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:if test="$language != ''">
-    <xsl:attribute name="lang">
-      <xsl:choose>
-        <xsl:when test="$l10n.lang.value.rfc.compliant != 0">
-          <xsl:value-of select="translate($language, '_', '-')"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="$language"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:attribute>
-  </xsl:if>
-
-  <!-- FIXME: This is sort of hack, but it was the easiest way to add at least partial support for dir attribute -->
-  <xsl:copy-of select="ancestor-or-self::*[@dir][1]/@dir"/>
-</xsl:template>
-
-<xsl:template name="gentext">
-  <xsl:param name="key" select="local-name(.)"/>
-  <xsl:param name="lang">
-    <xsl:call-template name="l10n.language"/>
-  </xsl:param>
-
-  <xsl:variable name="local.l10n.gentext"
-                select="($local.l10n.xml//l:i18n/l:l10n[@language=$lang]/l:gentext[@key=$key])[1]"/>
-
-  <xsl:variable name="l10n.gentext"
-                select="($l10n.xml/l:i18n/l:l10n[@language=$lang]/l:gentext[@key=$key])[1]"/>
-
-  <xsl:choose>
-    <xsl:when test="$local.l10n.gentext">
-      <xsl:value-of select="$local.l10n.gentext/@text"/>
-    </xsl:when>
-    <xsl:when test="$l10n.gentext">
-      <xsl:value-of select="$l10n.gentext/@text"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:message>
-        <xsl:text>No "</xsl:text>
-        <xsl:value-of select="$lang"/>
-        <xsl:text>" localization of "</xsl:text>
-        <xsl:value-of select="$key"/>
-        <xsl:text>" exists</xsl:text>
-        <xsl:choose>
-          <xsl:when test="$lang = 'en'">
-             <xsl:text>.</xsl:text>
-          </xsl:when>
-          <xsl:otherwise>
-             <xsl:text>; using "en".</xsl:text>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:message>
-
-      <xsl:value-of select="($l10n.xml/l:i18n/l:l10n[@language='en']/l:gentext[@key=$key])[1]/@text"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="gentext.element.name">
-  <xsl:param name="element.name" select="local-name(.)"/>
-  <xsl:param name="lang">
-    <xsl:call-template name="l10n.language"/>
-  </xsl:param>
-
-  <xsl:call-template name="gentext">
-    <xsl:with-param name="key" select="$element.name"/>
-    <xsl:with-param name="lang" select="$lang"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="gentext.space">
-  <xsl:text> </xsl:text>
-</xsl:template>
-
-<xsl:template name="gentext.edited.by">
-  <xsl:call-template name="gentext">
-    <xsl:with-param name="key" select="'Editedby'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="gentext.by">
-  <xsl:call-template name="gentext">
-    <xsl:with-param name="key" select="'by'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="gentext.dingbat">
-  <xsl:param name="dingbat">bullet</xsl:param>
-  <xsl:param name="lang">
-    <xsl:call-template name="l10n.language"/>
-  </xsl:param>
-
-  <xsl:variable name="local.l10n.dingbat"
-                select="($local.l10n.xml//l:i18n/l:l10n[@language=$lang]/l:dingbat[@key=$dingbat])[1]"/>
-
-  <xsl:variable name="l10n.dingbat"
-                select="($l10n.xml/l:i18n/l:l10n[@language=$lang]/l:dingbat[@key=$dingbat])[1]"/>
-
-  <xsl:choose>
-    <xsl:when test="$local.l10n.dingbat">
-      <xsl:value-of select="$local.l10n.dingbat/@text"/>
-    </xsl:when>
-    <xsl:when test="$l10n.dingbat">
-      <xsl:value-of select="$l10n.dingbat/@text"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:message>
-        <xsl:text>No "</xsl:text>
-        <xsl:value-of select="$lang"/>
-        <xsl:text>" localization of dingbat </xsl:text>
-        <xsl:value-of select="$dingbat"/>
-        <xsl:text> exists; using "en".</xsl:text>
-      </xsl:message>
-
-      <xsl:value-of select="($l10n.xml/l:i18n/l:l10n[@language='en']/l:dingbat[@key=$dingbat])[1]/@text"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="gentext.startquote">
-  <xsl:call-template name="gentext.dingbat">
-    <xsl:with-param name="dingbat">startquote</xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="gentext.endquote">
-  <xsl:call-template name="gentext.dingbat">
-    <xsl:with-param name="dingbat">endquote</xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="gentext.nestedstartquote">
-  <xsl:call-template name="gentext.dingbat">
-    <xsl:with-param name="dingbat">nestedstartquote</xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="gentext.nestedendquote">
-  <xsl:call-template name="gentext.dingbat">
-    <xsl:with-param name="dingbat">nestedendquote</xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="gentext.nav.prev">
-  <xsl:call-template name="gentext">
-    <xsl:with-param name="key" select="'nav-prev'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="gentext.nav.next">
-  <xsl:call-template name="gentext">
-    <xsl:with-param name="key" select="'nav-next'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="gentext.nav.home">
-  <xsl:call-template name="gentext">
-    <xsl:with-param name="key" select="'nav-home'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="gentext.nav.up">
-  <xsl:call-template name="gentext">
-    <xsl:with-param name="key" select="'nav-up'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<!-- ============================================================ -->
-
-<xsl:template name="gentext.template">
-  <xsl:param name="context" select="'default'"/>
-  <xsl:param name="name" select="'default'"/>
-  <xsl:param name="origname" select="$name"/>
-  <xsl:param name="purpose"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="referrer"/>
-  <xsl:param name="lang">
-    <xsl:call-template name="l10n.language"/>
-  </xsl:param>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:variable name="local.localization.node"
-                select="($local.l10n.xml//l:i18n/l:l10n[@language=$lang])[1]"/>
-
-  <xsl:variable name="localization.node"
-                select="($l10n.xml/l:i18n/l:l10n[@language=$lang])[1]"/>
-
-  <xsl:if test="count($localization.node) = 0
-                and count($local.localization.node) = 0
-                and $verbose != 0">
-    <xsl:message>
-      <xsl:text>No "</xsl:text>
-      <xsl:value-of select="$lang"/>
-      <xsl:text>" localization exists.</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <xsl:variable name="local.context.node"
-                select="$local.localization.node/l:context[@name=$context]"/>
-
-  <xsl:variable name="context.node"
-                select="$localization.node/l:context[@name=$context]"/>
-
-  <xsl:if test="count($context.node) = 0
-                and count($local.context.node) = 0
-                and $verbose != 0">
-    <xsl:message>
-      <xsl:text>No context named "</xsl:text>
-      <xsl:value-of select="$context"/>
-      <xsl:text>" exists in the "</xsl:text>
-      <xsl:value-of select="$lang"/>
-      <xsl:text>" localization.</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <xsl:variable name="local.template.node"
-                select="($local.context.node/l:template[@name=$name
-                                                        and @style
-                                                        and @style=$xrefstyle]
-                        |$local.context.node/l:template[@name=$name
-                                                        and not(@style)])[1]"/>
-
-  <xsl:variable name="template.node"
-                select="($context.node/l:template[@name=$name
-                                                  and @style
-                                                  and @style=$xrefstyle]
-                        |$context.node/l:template[@name=$name
-                                                  and not(@style)])[1]"/>
-
-  <xsl:choose>
-    <xsl:when test="$local.template.node/@text">
-      <xsl:value-of select="$local.template.node/@text"/>
-    </xsl:when>
-    <xsl:when test="$template.node/@text">
-      <xsl:value-of select="$template.node/@text"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:choose>
-        <xsl:when test="contains($name, '/')">
-          <xsl:call-template name="gentext.template">
-            <xsl:with-param name="context" select="$context"/>
-            <xsl:with-param name="name" select="substring-after($name, '/')"/>
-            <xsl:with-param name="origname" select="$origname"/>
-            <xsl:with-param name="purpose" select="$purpose"/>
-            <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-            <xsl:with-param name="referrer" select="$referrer"/>
-            <xsl:with-param name="lang" select="$lang"/>
-            <xsl:with-param name="verbose" select="$verbose"/>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:when test="$verbose = 0">
-          <!-- silence -->
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:message>
-            <xsl:text>No template for "</xsl:text>
-            <xsl:value-of select="$origname"/>
-            <xsl:text>" (or any of its leaves) exists
-in the context named "</xsl:text>
-            <xsl:value-of select="$context"/>
-            <xsl:text>" in the "</xsl:text>
-            <xsl:value-of select="$lang"/>
-            <xsl:text>" localization.</xsl:text>
-          </xsl:message>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- silently test if a gentext template exists -->
-
-<xsl:template name="gentext.template.exists">
-  <xsl:param name="context" select="'default'"/>
-  <xsl:param name="name" select="'default'"/>
-  <xsl:param name="origname" select="$name"/>
-  <xsl:param name="purpose"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="referrer"/>
-  <xsl:param name="lang">
-    <xsl:call-template name="l10n.language"/>
-  </xsl:param>
-
-  <xsl:variable name="template">
-    <xsl:call-template name="gentext.template">
-      <xsl:with-param name="context" select="$context"/>
-      <xsl:with-param name="name" select="$name"/>
-      <xsl:with-param name="origname" select="$origname"/>
-      <xsl:with-param name="purpose" select="$purpose"/>
-      <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-      <xsl:with-param name="referrer" select="$referrer"/>
-      <xsl:with-param name="lang" select="$lang"/>
-      <xsl:with-param name="verbose" select="0"/>
-    </xsl:call-template>
-  </xsl:variable>
-  
-  <xsl:choose>
-    <xsl:when test="string-length($template) != 0">1</xsl:when>
-    <xsl:otherwise>0</xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-</xsl:stylesheet>
-
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/labels.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/labels.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,869 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"
-                exclude-result-prefixes="doc"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<!-- label markup -->
-
-<doc:mode mode="label.markup" xmlns="">
-<refpurpose>Provides access to element labels</refpurpose>
-<refdescription id="label.markup-desc">
-<para>Processing an element in the
-<literal role="mode">label.markup</literal> mode produces the
-element label.</para>
-<para>Trailing punctuation is not added to the label.
-</para>
-</refdescription>
-</doc:mode>
-
-<xsl:template match="*" mode="intralabel.punctuation">
-  <xsl:text>.</xsl:text>
-</xsl:template>
-
-<xsl:template match="*" mode="label.markup">
-  <xsl:param name="verbose" select="1"/>
-  <xsl:if test="$verbose">
-    <xsl:message>
-      <xsl:text>Request for label of unexpected element: </xsl:text>
-      <xsl:value-of select="local-name(.)"/>
-    </xsl:message>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="set|book" mode="label.markup">
-  <xsl:if test="@label">
-    <xsl:value-of select="@label"/>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="part" mode="label.markup">
-  <xsl:choose>
-    <xsl:when test="@label">
-      <xsl:value-of select="@label"/>
-    </xsl:when>
-    <xsl:when test="string($part.autolabel) != 0">
-      <xsl:variable name="format">
-        <xsl:call-template name="autolabel.format">
-          <xsl:with-param name="format" select="$part.autolabel"/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:number from="book" count="part" format="{$format}"/>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="partintro" mode="label.markup">
-  <!-- no label -->
-</xsl:template>
-
-<xsl:template match="preface" mode="label.markup">
-  <xsl:choose>
-    <xsl:when test="@label">
-      <xsl:value-of select="@label"/>
-    </xsl:when>
-    <xsl:when test="string($preface.autolabel) != 0">
-      <xsl:if test="$component.label.includes.part.label != 0 and
-                      ancestor::part">
-        <xsl:variable name="part.label">
-          <xsl:apply-templates select="ancestor::part" 
-                               mode="label.markup"/>
-        </xsl:variable>
-        <xsl:if test="$part.label != ''">
-          <xsl:value-of select="$part.label"/>
-          <xsl:apply-templates select="ancestor::part" 
-                               mode="intralabel.punctuation"/>
-        </xsl:if>
-      </xsl:if>
-      <xsl:variable name="format">
-        <xsl:call-template name="autolabel.format">
-          <xsl:with-param name="format" select="$preface.autolabel"/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:choose>
-        <xsl:when test="$label.from.part != 0 and ancestor::part">
-          <xsl:number from="part" count="preface" format="{$format}" level="any"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:number from="book" count="preface" format="{$format}" level="any"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="chapter" mode="label.markup">
-  <xsl:choose>
-    <xsl:when test="@label">
-      <xsl:value-of select="@label"/>
-    </xsl:when>
-    <xsl:when test="string($chapter.autolabel) != 0">
-      <xsl:if test="$component.label.includes.part.label != 0 and
-                      ancestor::part">
-        <xsl:variable name="part.label">
-          <xsl:apply-templates select="ancestor::part" 
-                               mode="label.markup"/>
-        </xsl:variable>
-        <xsl:if test="$part.label != ''">
-          <xsl:value-of select="$part.label"/>
-          <xsl:apply-templates select="ancestor::part" 
-                               mode="intralabel.punctuation"/>
-        </xsl:if>
-      </xsl:if>
-      <xsl:variable name="format">
-        <xsl:call-template name="autolabel.format">
-          <xsl:with-param name="format" select="$chapter.autolabel"/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:choose>
-        <xsl:when test="$label.from.part != 0 and ancestor::part">
-          <xsl:number from="part" count="chapter" format="{$format}" level="any"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:number from="book" count="chapter" format="{$format}" level="any"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="appendix" mode="label.markup">
-  <xsl:choose>
-    <xsl:when test="@label">
-      <xsl:value-of select="@label"/>
-    </xsl:when>
-    <xsl:when test="string($appendix.autolabel) != 0">
-      <xsl:if test="$component.label.includes.part.label != 0 and
-                      ancestor::part">
-        <xsl:variable name="part.label">
-          <xsl:apply-templates select="ancestor::part" 
-                               mode="label.markup"/>
-        </xsl:variable>
-        <xsl:if test="$part.label != ''">
-          <xsl:value-of select="$part.label"/>
-          <xsl:apply-templates select="ancestor::part" 
-                               mode="intralabel.punctuation"/>
-        </xsl:if>
-      </xsl:if>
-      <xsl:variable name="format">
-        <xsl:call-template name="autolabel.format">
-          <xsl:with-param name="format" select="$appendix.autolabel"/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:choose>
-        <xsl:when test="$label.from.part != 0 and ancestor::part">
-          <xsl:number from="part" count="appendix" format="{$format}" level="any"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:number from="book|article"
-                      count="appendix" format="{$format}" level="any"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="article" mode="label.markup">
-  <xsl:if test="@label">
-    <xsl:value-of select="@label"/>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="dedication|colophon" mode="label.markup">
-  <xsl:if test="@label">
-    <xsl:value-of select="@label"/>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="reference" mode="label.markup">
-  <xsl:choose>
-    <xsl:when test="@label">
-      <xsl:value-of select="@label"/>
-    </xsl:when>
-    <xsl:when test="string($reference.autolabel) != 0">
-      <xsl:if test="$component.label.includes.part.label != 0 and
-                      ancestor::part">
-        <xsl:variable name="part.label">
-          <xsl:apply-templates select="ancestor::part" 
-                               mode="label.markup"/>
-        </xsl:variable>
-        <xsl:if test="$part.label != ''">
-          <xsl:value-of select="$part.label"/>
-          <xsl:apply-templates select="ancestor::part" 
-                               mode="intralabel.punctuation"/>
-        </xsl:if>
-      </xsl:if>
-      <xsl:variable name="format">
-        <xsl:call-template name="autolabel.format">
-          <xsl:with-param name="format" select="$reference.autolabel"/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:choose>
-        <xsl:when test="$label.from.part != 0 and ancestor::part">
-          <xsl:number from="part" count="reference" format="{$format}" level="any"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:number from="book" count="reference" format="{$format}" level="any"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="refentry" mode="label.markup">
-  <xsl:if test="@label">
-    <xsl:value-of select="@label"/>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="section" mode="label.markup">
-  <!-- if this is a nested section, label the parent -->
-  <xsl:if test="local-name(..) = 'section'">
-    <xsl:variable name="parent.section.label">
-      <xsl:call-template name="label.this.section">
-        <xsl:with-param name="section" select=".."/>
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:if test="$parent.section.label != '0'">
-      <xsl:apply-templates select=".." mode="label.markup"/>
-      <xsl:apply-templates select=".." mode="intralabel.punctuation"/>
-    </xsl:if>
-  </xsl:if>
-
-  <!-- if the parent is a component, maybe label that too -->
-  <xsl:variable name="parent.is.component">
-    <xsl:call-template name="is.component">
-      <xsl:with-param name="node" select=".."/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <!-- does this section get labelled? -->
-  <xsl:variable name="label">
-    <xsl:call-template name="label.this.section">
-      <xsl:with-param name="section" select="."/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:if test="$section.label.includes.component.label != 0
-                and $parent.is.component != 0">
-    <xsl:variable name="parent.label">
-      <xsl:apply-templates select=".." mode="label.markup"/>
-    </xsl:variable>
-    <xsl:if test="$parent.label != ''">
-      <xsl:apply-templates select=".." mode="label.markup"/>
-      <xsl:apply-templates select=".." mode="intralabel.punctuation"/>
-    </xsl:if>
-  </xsl:if>
-
-<!--
-  <xsl:message>
-    test: <xsl:value-of select="$label"/>, <xsl:number count="section"/>
-  </xsl:message>
--->
-
-  <xsl:choose>
-    <xsl:when test="@label">
-      <xsl:value-of select="@label"/>
-    </xsl:when>
-    <xsl:when test="$label != 0">      
-      <xsl:variable name="format">
-        <xsl:call-template name="autolabel.format">
-          <xsl:with-param name="format" select="$section.autolabel"/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:number format="{$format}" count="section"/>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="sect1" mode="label.markup">
-  <!-- if the parent is a component, maybe label that too -->
-  <xsl:variable name="parent.is.component">
-    <xsl:call-template name="is.component">
-      <xsl:with-param name="node" select=".."/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="component.label">
-    <xsl:if test="$section.label.includes.component.label != 0
-                  and $parent.is.component != 0">
-      <xsl:variable name="parent.label">
-        <xsl:apply-templates select=".." mode="label.markup"/>
-      </xsl:variable>
-      <xsl:if test="$parent.label != ''">
-        <xsl:apply-templates select=".." mode="label.markup"/>
-        <xsl:apply-templates select=".." mode="intralabel.punctuation"/>
-      </xsl:if>
-    </xsl:if>
-  </xsl:variable>
-
-
-  <xsl:variable name="is.numbered">
-    <xsl:call-template name="label.this.section"/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="@label">
-      <xsl:value-of select="@label"/>
-    </xsl:when>
-    <xsl:when test="$is.numbered != 0">
-      <xsl:variable name="format">
-        <xsl:call-template name="autolabel.format">
-          <xsl:with-param name="format" select="$section.autolabel"/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:copy-of select="$component.label"/>
-      <xsl:number format="{$format}" count="sect1"/>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="sect2|sect3|sect4|sect5" mode="label.markup">
-  <!-- label the parent -->
-  <xsl:variable name="parent.section.label">
-    <xsl:call-template name="label.this.section">
-      <xsl:with-param name="section" select=".."/>
-    </xsl:call-template>
-  </xsl:variable>
-  <xsl:if test="$parent.section.label != '0'">
-    <xsl:apply-templates select=".." mode="label.markup"/>
-    <xsl:apply-templates select=".." mode="intralabel.punctuation"/>
-  </xsl:if>
-
-  <xsl:variable name="is.numbered">
-    <xsl:call-template name="label.this.section"/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="@label">
-      <xsl:value-of select="@label"/>
-    </xsl:when>
-    <xsl:when test="$is.numbered != 0">
-      <xsl:variable name="format">
-        <xsl:call-template name="autolabel.format">
-          <xsl:with-param name="format" select="$section.autolabel"/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:choose>
-        <xsl:when test="local-name(.) = 'sect2'">
-          <xsl:number format="{$format}" count="sect2"/>
-        </xsl:when>
-        <xsl:when test="local-name(.) = 'sect3'">
-          <xsl:number format="{$format}" count="sect3"/>
-        </xsl:when>
-        <xsl:when test="local-name(.) = 'sect4'">
-          <xsl:number format="{$format}" count="sect4"/>
-        </xsl:when>
-        <xsl:when test="local-name(.) = 'sect5'">
-          <xsl:number format="{$format}" count="sect5"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:message>label.markup: this can't happen!</xsl:message>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="bridgehead" mode="label.markup">
-  <!-- FIXME: could we do a better job here? -->
-  <xsl:variable name="contsec"
-                select="(ancestor::section
-                         |ancestor::simplesect
-                         |ancestor::sect1
-                         |ancestor::sect2
-                         |ancestor::sect3
-                         |ancestor::sect4
-                         |ancestor::sect5
-                         |ancestor::refsect1
-                         |ancestor::refsect2
-                         |ancestor::refsect3
-                         |ancestor::chapter
-                         |ancestor::appendix
-                         |ancestor::preface)[last()]"/>
-
-  <xsl:apply-templates select="$contsec" mode="label.markup"/>
-</xsl:template>
-
-<xsl:template match="refsect1" mode="label.markup">
-  <xsl:choose>
-    <xsl:when test="@label">
-      <xsl:value-of select="@label"/>
-    </xsl:when>
-    <xsl:when test="$section.autolabel != 0">
-      <xsl:variable name="format">
-        <xsl:call-template name="autolabel.format">
-          <xsl:with-param name="format" select="$section.autolabel"/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:number count="refsect1" format="{$format}"/>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="refsect2|refsect3" mode="label.markup">
-  <!-- label the parent -->
-  <xsl:variable name="parent.label">
-    <xsl:apply-templates select=".." mode="label.markup"/>
-  </xsl:variable>
-  <xsl:if test="$parent.label != ''">
-    <xsl:apply-templates select=".." mode="label.markup"/>
-    <xsl:apply-templates select=".." mode="intralabel.punctuation"/>
-  </xsl:if>
-
-  <xsl:choose>
-    <xsl:when test="@label">
-      <xsl:value-of select="@label"/>
-    </xsl:when>
-    <xsl:when test="$section.autolabel != 0">
-      <xsl:variable name="format">
-        <xsl:call-template name="autolabel.format">
-          <xsl:with-param name="format" select="$section.autolabel"/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:choose>
-        <xsl:when test="local-name(.) = 'refsect2'">
-          <xsl:number count="refsect2" format="{$format}"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:number count="refsect3" format="{$format}"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="simplesect" mode="label.markup">
-  <!-- if this is a nested section, label the parent -->
-  <xsl:if test="local-name(..) = 'section'
-                or local-name(..) = 'sect1'
-                or local-name(..) = 'sect2'
-                or local-name(..) = 'sect3'
-                or local-name(..) = 'sect4'
-                or local-name(..) = 'sect5'">
-    <xsl:variable name="parent.section.label">
-      <xsl:apply-templates select=".." mode="label.markup"/>
-    </xsl:variable>
-    <xsl:if test="$parent.section.label != ''">
-      <xsl:apply-templates select=".." mode="label.markup"/>
-      <xsl:apply-templates select=".." mode="intralabel.punctuation"/>
-    </xsl:if>
-  </xsl:if>
-
-  <!-- if the parent is a component, maybe label that too -->
-  <xsl:variable name="parent.is.component">
-    <xsl:call-template name="is.component">
-      <xsl:with-param name="node" select=".."/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <!-- does this section get labelled? -->
-  <xsl:variable name="label">
-    <xsl:call-template name="label.this.section">
-      <xsl:with-param name="section" select="."/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:if test="$section.label.includes.component.label != 0
-                and $parent.is.component != 0">
-    <xsl:variable name="parent.label">
-      <xsl:apply-templates select=".." mode="label.markup"/>
-    </xsl:variable>
-    <xsl:if test="$parent.label != ''">
-      <xsl:apply-templates select=".." mode="label.markup"/>
-      <xsl:apply-templates select=".." mode="intralabel.punctuation"/>
-    </xsl:if>
-  </xsl:if>
-
-  <xsl:choose>
-    <xsl:when test="@label">
-      <xsl:value-of select="@label"/>
-    </xsl:when>
-    <xsl:when test="$label != 0">
-      <xsl:variable name="format">
-        <xsl:call-template name="autolabel.format">
-          <xsl:with-param name="format" select="$section.autolabel"/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:number format="{$format}" count="simplesect"/>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="qandadiv" mode="label.markup">
-  <xsl:variable name="lparent" select="(ancestor::set
-                                       |ancestor::book
-                                       |ancestor::chapter
-                                       |ancestor::appendix
-                                       |ancestor::preface
-                                       |ancestor::section
-                                       |ancestor::simplesect
-                                       |ancestor::sect1
-                                       |ancestor::sect2
-                                       |ancestor::sect3
-                                       |ancestor::sect4
-                                       |ancestor::sect5
-                                       |ancestor::refsect1
-                                       |ancestor::refsect2
-                                       |ancestor::refsect3)[last()]"/>
-
-  <xsl:variable name="lparent.prefix">
-    <xsl:apply-templates select="$lparent" mode="label.markup"/>
-  </xsl:variable>
-
-  <xsl:variable name="prefix">
-    <xsl:if test="$qanda.inherit.numeration != 0">
-      <xsl:if test="$lparent.prefix != ''">
-        <xsl:apply-templates select="$lparent" mode="label.markup"/>
-        <xsl:apply-templates select="$lparent" mode="intralabel.punctuation"/>
-      </xsl:if>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$qandadiv.autolabel != 0">
-      <xsl:variable name="format">
-        <xsl:call-template name="autolabel.format">
-          <xsl:with-param name="format" select="$qandadiv.autolabel"/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:value-of select="$prefix"/>
-      <xsl:number level="multiple" count="qandadiv" format="{$format}"/>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="question|answer" mode="label.markup">
-  <xsl:variable name="lparent" select="(ancestor::set
-                                       |ancestor::book
-                                       |ancestor::chapter
-                                       |ancestor::appendix
-                                       |ancestor::preface
-                                       |ancestor::section
-                                       |ancestor::simplesect
-                                       |ancestor::sect1
-                                       |ancestor::sect2
-                                       |ancestor::sect3
-                                       |ancestor::sect4
-                                       |ancestor::sect5
-                                       |ancestor::refsect1
-                                       |ancestor::refsect2
-                                       |ancestor::refsect3)[last()]"/>
-
-  <xsl:variable name="lparent.prefix">
-    <xsl:apply-templates select="$lparent" mode="label.markup"/>
-  </xsl:variable>
-
-  <xsl:variable name="prefix">
-    <xsl:if test="$qanda.inherit.numeration != 0">
-      <xsl:choose>
-        <xsl:when test="ancestor::qandadiv">
-          <xsl:apply-templates select="ancestor::qandadiv[1]" mode="label.markup"/>
-          <xsl:apply-templates select="ancestor::qandadiv[1]"
-                               mode="intralabel.punctuation"/>
-        </xsl:when>
-        <xsl:when test="$lparent.prefix != ''">
-          <xsl:apply-templates select="$lparent" mode="label.markup"/>
-          <xsl:apply-templates select="$lparent" mode="intralabel.punctuation"/>
-        </xsl:when>
-      </xsl:choose>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:variable name="inhlabel"
-                select="ancestor-or-self::qandaset/@defaultlabel[1]"/>
-
-  <xsl:variable name="deflabel">
-    <xsl:choose>
-      <xsl:when test="$inhlabel != ''">
-        <xsl:value-of select="$inhlabel"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$qanda.defaultlabel"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="label" select="label"/>
-
-  <xsl:choose>
-    <xsl:when test="count($label)>0">
-      <xsl:apply-templates select="$label"/>
-    </xsl:when>
-
-    <xsl:when test="$deflabel = 'qanda' and local-name(.) = 'question'">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'Question'"/>
-      </xsl:call-template>
-    </xsl:when>
-
-    <xsl:when test="$deflabel = 'qanda' and local-name(.) = 'answer'">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'Answer'"/>
-      </xsl:call-template>
-    </xsl:when>
-
-    <xsl:when test="$deflabel = 'number' and local-name(.) = 'question'">
-      <xsl:value-of select="$prefix"/>
-      <xsl:number level="multiple" count="qandaentry" format="1"/>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="bibliography|glossary|
-                     qandaset|index|setindex" mode="label.markup">
-  <xsl:if test="@label">
-    <xsl:value-of select="@label"/>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="figure|table|example" mode="label.markup">
-  <xsl:variable name="pchap"
-                select="ancestor::chapter
-                        |ancestor::appendix
-                        |ancestor::article[ancestor::book]"/>
-
-  <xsl:variable name="prefix">
-    <xsl:if test="count($pchap) &gt; 0">
-      <xsl:apply-templates select="$pchap" mode="label.markup"/>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="@label">
-      <xsl:value-of select="@label"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:choose>
-        <xsl:when test="$prefix != ''">
-            <xsl:apply-templates select="$pchap" mode="label.markup"/>
-            <xsl:apply-templates select="$pchap" mode="intralabel.punctuation"/>
-          <xsl:number format="1" from="chapter|appendix" level="any"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:number format="1" from="book|article" level="any"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="procedure" mode="label.markup">
-  <xsl:variable name="pchap"
-                select="ancestor::chapter
-                        |ancestor::appendix
-                        |ancestor::article[ancestor::book]"/>
-
-  <xsl:variable name="prefix">
-    <xsl:if test="count($pchap) &gt; 0">
-      <xsl:apply-templates select="$pchap" mode="label.markup"/>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="@label">
-      <xsl:value-of select="@label"/>
-    </xsl:when>
-    <xsl:when test="$formal.procedures = 0">
-      <!-- No label -->
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:choose>
-        <xsl:when test="count($pchap)>0">
-          <xsl:if test="$prefix != ''">
-            <xsl:apply-templates select="$pchap" mode="label.markup"/>
-            <xsl:apply-templates select="$pchap" mode="intralabel.punctuation"/>
-          </xsl:if>
-          <xsl:number count="procedure[title]" format="1" 
-                      from="chapter|appendix" level="any"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:number count="procedure[title]" format="1" 
-                      from="book|article" level="any"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="equation" mode="label.markup">
-  <xsl:variable name="pchap"
-                select="ancestor::chapter
-                        |ancestor::appendix
-                        |ancestor::article[ancestor::book]"/>
-
-  <xsl:variable name="prefix">
-    <xsl:if test="count($pchap) &gt; 0">
-      <xsl:apply-templates select="$pchap" mode="label.markup"/>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="@label">
-      <xsl:value-of select="@label"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:choose>
-        <xsl:when test="count($pchap)>0">
-          <xsl:if test="$prefix != ''">
-            <xsl:apply-templates select="$pchap" mode="label.markup"/>
-            <xsl:apply-templates select="$pchap" mode="intralabel.punctuation"/>
-          </xsl:if>
-          <xsl:number format="1" count="equation[title or info/title]" 
-	              from="chapter|appendix" level="any"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:number format="1" count="equation[title or info/title]" 
-	              from="book|article" level="any"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="orderedlist/listitem" mode="label.markup">
-  <xsl:variable name="numeration">
-    <xsl:call-template name="list.numeration">
-      <xsl:with-param name="node" select="parent::orderedlist"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="type">
-    <xsl:choose>
-      <xsl:when test="$numeration='arabic'">1</xsl:when>
-      <xsl:when test="$numeration='loweralpha'">a</xsl:when>
-      <xsl:when test="$numeration='lowerroman'">i</xsl:when>
-      <xsl:when test="$numeration='upperalpha'">A</xsl:when>
-      <xsl:when test="$numeration='upperroman'">I</xsl:when>
-      <!-- What!? This should never happen -->
-      <xsl:otherwise>
-        <xsl:message>
-          <xsl:text>Unexpected numeration: </xsl:text>
-          <xsl:value-of select="$numeration"/>
-        </xsl:message>
-        <xsl:value-of select="1."/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="item-number">
-    <xsl:call-template name="orderedlist-item-number"/>
-  </xsl:variable>
-
-  <xsl:number value="$item-number" format="{$type}"/>
-</xsl:template>
-
-<xsl:template match="abstract" mode="label.markup">
-  <!-- nop -->
-</xsl:template>
-
-<xsl:template match="sidebar" mode="label.markup">
-  <!-- nop -->
-</xsl:template>
-
-<!-- ============================================================ -->
-
-<xsl:template name="label.this.section">
-  <xsl:param name="section" select="."/>
-
-  <xsl:variable name="level">
-    <xsl:call-template name="section.level"/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$level &lt;= $section.autolabel.max.depth">      
-      <xsl:value-of select="$section.autolabel"/>
-    </xsl:when>
-    <xsl:otherwise>0</xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<doc:template name="label.this.section" xmlns="">
-<refpurpose>Returns true if $section should be labelled</refpurpose>
-<refdescription id="label.this.section-desc">
-<para>Returns true if the specified section should be labelled.
-By default, this template returns zero unless 
-the section level is less than or equal to the value of the
-<literal>$section.autolabel.max.depth</literal> parameter, in
-which case it returns
-<literal>$section.autolabel</literal>.
-Custom stylesheets may override it to get more selective behavior.</para>
-</refdescription>
-</doc:template>
-
-<!-- ============================================================ -->
-
-<xsl:template name="default.autolabel.format">
-  <xsl:param name="context" select="."/>
-  <xsl:choose>
-    <xsl:when test="local-name($context) = 'appendix'">
-      <xsl:value-of select="'A'"/>
-    </xsl:when>
-    <xsl:when test="local-name($context) = 'part'">
-      <xsl:value-of select="'I'"/>
-    </xsl:when>
-    <xsl:otherwise>1</xsl:otherwise>
-  </xsl:choose>  
-</xsl:template>
-  
-<xsl:template name="autolabel.format">
-  <xsl:param name="context" select="."/>
-  <xsl:param name="format"/>
-
-  <xsl:choose>
-    <xsl:when test="string($format) != 0">
-      <xsl:choose>
-        <xsl:when test="string($format)='arabic' or $format='1'">1</xsl:when>
-        <xsl:when test="$format='loweralpha' or $format='a'">
-          <xsl:value-of select="'a'"/>
-        </xsl:when>
-        <xsl:when test="$format='lowerroman' or $format='i'">
-          <xsl:value-of select="'i'"/>
-        </xsl:when>
-        <xsl:when test="$format='upperalpha' or $format='A'">
-          <xsl:value-of select="'A'"/>
-        </xsl:when>
-        <xsl:when test="$format='upperroman' or $format='I'">
-          <xsl:value-of select="'I'"/>
-        </xsl:when>      
-	<xsl:when test="$format='arabicindic' or $format='&#x661;'">
-	  <xsl:value-of select="'&#x661;'"/>
-	</xsl:when>
-        <xsl:otherwise>
-          <xsl:message>
-            <xsl:text>Unexpected </xsl:text><xsl:value-of select="local-name(.)"/><xsl:text>.autolabel value: </xsl:text>
-            <xsl:value-of select="$format"/><xsl:text>; using default.</xsl:text>
-          </xsl:message>
-          <xsl:call-template name="default.autolabel.format"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<doc:template name="autolabel.format" xmlns="">
-<refpurpose>Returns format for autolabel parameters</refpurpose>
-<refdescription id="autolabel.format-desc">
-<para>Returns format passed as parameter if non zero. Supported
-  format are 'arabic' or '1', 'loweralpha' or 'a', 'lowerroman' or 'i', 
-  'upperlapha' or 'A', 'upperroman' or 'I', 'arabicindic' or '&#x661;'.
-  If its not one of these then 
-  returns the default format.</para>
-</refdescription>
-</doc:template>
-
-<!-- ============================================================ -->
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/olink.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/olink.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,1149 +1,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="1.0">
-
-<!-- Create keys for quickly looking up olink targets -->
-<xsl:key name="targetdoc-key" match="document" use="@targetdoc" />
-<xsl:key name="targetptr-key"  match="div|obj"
-         use="concat(ancestor::document/@targetdoc, '/',
-                     @targetptr, '/', ancestor::document/@lang)" />
-
-<!-- Return filename of database -->
-<xsl:template name="select.target.database">
-  <xsl:param name="targetdoc.att" select="''"/>
-  <xsl:param name="targetptr.att" select="''"/>
-  <xsl:param name="olink.lang" select="''"/>
-
-  <!-- use root's xml:base if exists -->
-  <xsl:variable name="xml.base" select="/*/@xml:base"/>
-
-  <!-- This selection can be customized if needed -->
-  <xsl:variable name="target.database.filename">
-    <xsl:choose>
-      <xsl:when test="$xml.base != '' and
-                   not(starts-with($target.database.document, 'file:/')) and
-                   not(starts-with($target.database.document, '/'))">
-        <xsl:call-template name="systemIdToBaseURI">
-          <xsl:with-param name="systemId" select="$xml.base"/>
-        </xsl:call-template>
-        <xsl:value-of select="$target.database.document"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$target.database.document"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="target.database" 
-      select="document($target.database.filename,/)"/>
-
-  <xsl:choose>
-    <!-- Was the database document parameter not set? -->
-    <xsl:when test="$target.database.document = ''">
-      <xsl:message>
-        <xsl:text>Olinks not processed: must specify a </xsl:text>
-        <xsl:text>$target.database.document parameter&#10;</xsl:text>
-        <xsl:text>when using olinks with targetdoc </xsl:text>
-        <xsl:text>and targetptr attributes.</xsl:text>
-      </xsl:message>
-    </xsl:when>
-    <!-- Did it not open? Should be a targetset element -->
-    <xsl:when test="not($target.database/*)">
-      <xsl:message>
-        <xsl:text>Olink error: could not open target database '</xsl:text>
-        <xsl:value-of select="$target.database.filename"/>
-        <xsl:text>'.</xsl:text>
-      </xsl:message>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$target.database.filename"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="select.olink.key">
-  <xsl:param name="targetdoc.att" select="''"/>
-  <xsl:param name="targetptr.att" select="''"/>
-  <xsl:param name="olink.lang" select="''"/>
-  <xsl:param name="target.database"/>
-
-  <xsl:if test="$target.database/*">
-    <xsl:variable name="olink.fallback.sequence">
-      <xsl:call-template name="select.olink.lang.fallback">
-        <xsl:with-param name="olink.lang" select="$olink.lang"/>
-      </xsl:call-template>
-    </xsl:variable>
-  
-    <!-- Recurse through the languages until you find a match -->
-    <xsl:call-template name="select.olink.key.in.lang">
-      <xsl:with-param name="targetdoc.att" select="$targetdoc.att"/>
-      <xsl:with-param name="targetptr.att" select="$targetptr.att"/>
-      <xsl:with-param name="olink.lang" select="$olink.lang"/>
-      <xsl:with-param name="target.database" select="$target.database"/>
-      <xsl:with-param name="fallback.index" select="1"/>
-      <xsl:with-param name="olink.fallback.sequence"
-                      select="$olink.fallback.sequence"/>
-    </xsl:call-template>
-  </xsl:if>
-  
-</xsl:template>
-
-<!-- Locate olink key in a particular language -->
-<xsl:template name="select.olink.key.in.lang">
-  <xsl:param name="targetdoc.att" select="''"/>
-  <xsl:param name="targetptr.att" select="''"/>
-  <xsl:param name="olink.lang" select="''"/>
-  <xsl:param name="target.database"/>
-  <xsl:param name="fallback.index" select="1"/>
-  <xsl:param name="olink.fallback.sequence" select="''"/>
-  
-  <xsl:variable name="target.lang">
-    <xsl:call-template name="select.target.lang">
-      <xsl:with-param name="fallback.index" select="$fallback.index"/>
-      <xsl:with-param name="olink.fallback.sequence"
-                      select="$olink.fallback.sequence"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:if test="$olink.debug != 0">
-    <xsl:message><xsl:text>Olink debug: cases for targetdoc='</xsl:text>
-      <xsl:value-of select="$targetdoc.att"/>
-      <xsl:text>' and targetptr='</xsl:text>
-      <xsl:value-of select="$targetptr.att"/>
-      <xsl:text>' in language '</xsl:text>
-      <xsl:value-of select="$target.lang"/>
-      <xsl:text>'.</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <!-- Customize these cases if you want different selection logic -->
-  <xsl:variable name="CaseA">
-    <!-- targetdoc.att = not blank
-         targetptr.att = not blank
-    -->
-    <xsl:if test="$targetdoc.att != '' and
-                  $targetptr.att != ''">
-      <xsl:for-each select="$target.database">
-        <xsl:variable name="key" 
-                      select="concat($targetdoc.att, '/', 
-                                     $targetptr.att, '/',
-                                     $target.lang)"/>
-        <xsl:choose>
-          <xsl:when test="key('targetptr-key', $key)/@href != ''">
-            <xsl:value-of select="$key"/>
-            <xsl:if test="$olink.debug != 0">
-              <xsl:message>Olink debug: CaseA matched.</xsl:message>
-            </xsl:if>
-          </xsl:when>
-          <xsl:when test="$olink.debug != 0">
-            <xsl:message>Olink debug: CaseA NOT matched</xsl:message>
-          </xsl:when>
-        </xsl:choose>
-      </xsl:for-each>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:variable name="CaseB">
-    <!-- targetdoc.att = not blank
-         targetptr.att = not blank
-         prefer.internal.olink = not zero
-         current.docid = not blank 
-    -->
-    <xsl:if test="$targetdoc.att != '' and
-                  $targetptr.att != '' and
-                  $current.docid != '' and
-                  $prefer.internal.olink != 0">
-      <xsl:for-each select="$target.database">
-        <xsl:variable name="key" 
-                      select="concat($current.docid, '/', 
-                                     $targetptr.att, '/',
-                                     $target.lang)"/>
-        <xsl:choose>
-          <xsl:when test="key('targetptr-key', $key)/@href != ''">
-            <xsl:value-of select="$key"/>
-            <xsl:if test="$olink.debug != 0">
-              <xsl:message>Olink debug: CaseB matched.</xsl:message>
-            </xsl:if>
-          </xsl:when>
-          <xsl:when test="$olink.debug != 0">
-            <xsl:message>Olink debug: CaseB NOT matched</xsl:message>
-          </xsl:when>
-        </xsl:choose>
-      </xsl:for-each>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:variable name="CaseC">
-    <!-- targetdoc.att = blank
-         targetptr.att = not blank
-         current.docid = not blank 
-    -->
-    <xsl:if test="string-length($targetdoc.att) = 0 and
-                  $targetptr.att != '' and
-                  $current.docid != ''">
-      <!-- Must use a for-each to change context for keys to work -->
-      <xsl:for-each select="$target.database">
-        <xsl:variable name="key" 
-                      select="concat($current.docid, '/', 
-                                     $targetptr.att, '/',
-                                     $target.lang)"/>
-        <xsl:choose>
-          <xsl:when test="key('targetptr-key', $key)/@href != ''">
-            <xsl:value-of select="$key"/>
-            <xsl:if test="$olink.debug != 0">
-              <xsl:message>Olink debug: CaseC matched.</xsl:message>
-            </xsl:if>
-          </xsl:when>
-          <xsl:when test="$olink.debug != 0">
-            <xsl:message>Olink debug: CaseC NOT matched.</xsl:message>
-          </xsl:when>
-        </xsl:choose>
-      </xsl:for-each>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:variable name="CaseD">
-    <!-- targetdoc.att = blank
-         targetptr.att = not blank
-         current.docid = blank 
-    -->
-    <!-- This is possible if only one document in the database -->
-    <xsl:if test="string-length($targetdoc.att) = 0 and
-                  $targetptr.att != '' and
-                  string-length($current.docid) = 0 and
-                  count($target.database//document) = 1">
-      <xsl:for-each select="$target.database">
-        <xsl:variable name="key" 
-                      select="concat(.//document/@targetdoc, '/', 
-                                     $targetptr.att, '/',
-                                     $target.lang)"/>
-        <xsl:choose>
-          <xsl:when test="key('targetptr-key', $key)/@href != ''">
-            <xsl:value-of select="$key"/>
-            <xsl:if test="$olink.debug != 0">
-              <xsl:message>Olink debug: CaseD matched.</xsl:message>
-            </xsl:if>
-          </xsl:when>
-          <xsl:when test="$olink.debug != 0">
-            <xsl:message>Olink debug: CaseD NOT matched</xsl:message>
-          </xsl:when>
-        </xsl:choose>
-      </xsl:for-each>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:variable name="CaseE">
-    <!-- targetdoc.att = not blank
-         targetptr.att = blank
-    -->
-    <xsl:if test="$targetdoc.att != '' and
-                  string-length($targetptr.att) = 0">
-
-      <!-- Try the document's root element id -->
-      <xsl:variable name="rootid">
-        <xsl:choose>
-          <xsl:when test="$target.lang != ''">
-            <xsl:value-of select="$target.database//document[@targetdoc = $targetdoc.att and @lang = $target.lang]/*[1]/@targetptr"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="$target.database//document[@targetdoc = $targetdoc.att and not(@lang)]/*[1]/@targetptr"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-
-      <xsl:for-each select="$target.database">
-        <xsl:variable name="key" 
-                      select="concat($targetdoc.att, '/', 
-                                     $rootid, '/',
-                                     $target.lang)"/>
-        <xsl:choose>
-          <xsl:when test="key('targetptr-key', $key)/@href != ''">
-            <xsl:value-of select="$key"/>
-            <xsl:if test="$olink.debug != 0">
-              <xsl:message>Olink debug: CaseE matched.</xsl:message>
-            </xsl:if>
-          </xsl:when>
-          <xsl:when test="$olink.debug != 0">
-            <xsl:message>Olink debug: CaseE NOT matched.</xsl:message>
-          </xsl:when>
-        </xsl:choose>
-      </xsl:for-each>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:variable name="CaseF">
-    <!-- targetdoc.att = not blank
-         targetptr.att = blank
-         prefer.internal.olink = not zero
-         current.docid = not blank 
-    -->
-    <xsl:if test="$targetdoc.att != '' and
-                  string-length($targetptr.att) = 0 and
-                  $current.docid != '' and
-                  $prefer.internal.olink != 0">
-      <!-- Try the document's root element id -->
-      <xsl:variable name="rootid">
-        <xsl:choose>
-          <xsl:when test="$target.lang != ''">
-            <xsl:value-of select="$target.database//document[@targetdoc = $current.docid and @lang = $target.lang]/*[1]/@targetptr"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="$target.database//document[@targetdoc = $current.docid and not(@lang)]/*[1]/@targetptr"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-
-      <xsl:for-each select="$target.database">
-        <xsl:variable name="key" 
-                      select="concat($current.docid, '/', 
-                                     $rootid, '/',
-                                     $target.lang)"/>
-        <xsl:choose>
-          <xsl:when test="key('targetptr-key', $key)/@href != ''">
-            <xsl:value-of select="$key"/>
-            <xsl:if test="$olink.debug != 0">
-              <xsl:message>Olink debug: CaseF matched.</xsl:message>
-            </xsl:if>
-          </xsl:when>
-          <xsl:when test="$olink.debug != 0">
-            <xsl:message>Olink debug: CaseF NOT matched.</xsl:message>
-          </xsl:when>
-        </xsl:choose>
-      </xsl:for-each>
-    </xsl:if>
-  </xsl:variable>
-
-  <!-- Now select the best match. Customize the order if needed -->
-  <xsl:variable name="selected.key">
-    <xsl:choose>
-      <xsl:when test="$CaseB != ''">
-        <xsl:value-of select="$CaseB"/>
-        <xsl:if test="$olink.debug != 0">
-          <xsl:message>
-            <xsl:text>Olink debug: CaseB key is the final selection: </xsl:text>
-            <xsl:value-of select="$CaseB"/>
-          </xsl:message>
-        </xsl:if>
-      </xsl:when>
-      <xsl:when test="$CaseA != ''">
-        <xsl:value-of select="$CaseA"/>
-        <xsl:if test="$olink.debug != 0">
-          <xsl:message>
-            <xsl:text>Olink debug: CaseA key is the final selection: </xsl:text>
-            <xsl:value-of select="$CaseA"/>
-          </xsl:message>
-        </xsl:if>
-      </xsl:when>
-      <xsl:when test="$CaseC != ''">
-        <xsl:value-of select="$CaseC"/>
-        <xsl:if test="$olink.debug != 0">
-          <xsl:message>
-            <xsl:text>Olink debug: CaseC key is the final selection: </xsl:text>
-            <xsl:value-of select="$CaseC"/>
-          </xsl:message>
-        </xsl:if>
-      </xsl:when>
-      <xsl:when test="$CaseD != ''">
-        <xsl:value-of select="$CaseD"/>
-        <xsl:if test="$olink.debug != 0">
-          <xsl:message>
-            <xsl:text>Olink debug: CaseD key is the final selection: </xsl:text>
-            <xsl:value-of select="$CaseD"/>
-          </xsl:message>
-        </xsl:if>
-      </xsl:when>
-      <xsl:when test="$CaseF != ''">
-        <xsl:value-of select="$CaseF"/>
-        <xsl:if test="$olink.debug != 0">
-          <xsl:message>
-            <xsl:text>Olink debug: CaseF key is the final selection: </xsl:text>
-            <xsl:value-of select="$CaseF"/>
-          </xsl:message>
-        </xsl:if>
-      </xsl:when>
-      <xsl:when test="$CaseE != ''">
-        <xsl:value-of select="$CaseE"/>
-        <xsl:if test="$olink.debug != 0">
-          <xsl:message>
-            <xsl:text>Olink debug: CaseE key is the final selection: </xsl:text>
-            <xsl:value-of select="$CaseE"/>
-          </xsl:message>
-        </xsl:if>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:if test="$olink.debug != 0">
-          <xsl:message>
-            <xsl:text>Olink debug: No case matched for lang '</xsl:text>
-            <xsl:value-of select="$target.lang"/>
-            <xsl:text>'.</xsl:text>
-          </xsl:message>
-        </xsl:if>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$selected.key != ''">
-      <xsl:value-of select="$selected.key"/>
-    </xsl:when>
-    <xsl:when test="string-length($selected.key) = 0 and 
-                    string-length($target.lang) = 0">
-      <!-- No match on last try, and we are done -->
-    </xsl:when>
-    <xsl:otherwise>
-      <!-- Recurse through next language -->
-      <xsl:call-template name="select.olink.key.in.lang">
-        <xsl:with-param name="targetdoc.att" select="$targetdoc.att"/>
-        <xsl:with-param name="targetptr.att" select="$targetptr.att"/>
-        <xsl:with-param name="olink.lang" select="$olink.lang"/>
-        <xsl:with-param name="target.database" select="$target.database"/>
-        <xsl:with-param name="fallback.index" select="$fallback.index + 1"/>
-        <xsl:with-param name="olink.fallback.sequence"
-                        select="$olink.fallback.sequence"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-
-</xsl:template>
-
-<xsl:template name="select.target.lang">
-  <xsl:param name="fallback.index" select="1"/>
-  <xsl:param name="olink.fallback.sequence" select="''"/>
-
-  <!-- recurse backwards to find the lang matching the index -->
-  <xsl:variable name="firstlang" 
-                select="substring-before($olink.fallback.sequence, ' ')"/>
-  <xsl:variable name="rest" 
-                select="substring-after($olink.fallback.sequence, ' ')"/>
-  <xsl:choose>
-    <xsl:when test="$fallback.index = 1">
-      <xsl:value-of select="$firstlang"/>
-    </xsl:when>
-    <xsl:when test="$fallback.index &gt; 1">
-      <xsl:call-template name="select.target.lang">
-        <xsl:with-param name="fallback.index" select="$fallback.index - 1"/>
-        <xsl:with-param name="olink.fallback.sequence"
-                        select="$rest"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="select.olink.lang.fallback">
-  <xsl:param name="olink.lang" select="''"/>
-
-  <!-- Prefer language of the olink element -->
-  <xsl:value-of select="concat(normalize-space(concat($olink.lang, ' ', 
-                        $olink.lang.fallback.sequence)), ' ')"/>
-</xsl:template>
-
-<!-- Returns the complete olink href value if found -->
-<xsl:template name="make.olink.href">
-  <xsl:param name="olink.key" select="''"/>
-  <xsl:param name="target.database"/>
-
-  <xsl:if test="$olink.key != ''">
-    <xsl:variable name="target.href" >
-      <xsl:for-each select="$target.database" >
-        <xsl:value-of select="key('targetptr-key', $olink.key)/@href" />
-      </xsl:for-each>
-    </xsl:variable>
-  
-    <xsl:variable name="targetdoc">
-      <xsl:value-of select="substring-before($olink.key, '/')"/>
-    </xsl:variable>
-  
-    <!-- Does the target database use a sitemap? -->
-    <xsl:variable name="use.sitemap">
-      <xsl:choose>
-        <xsl:when test="$target.database//sitemap">1</xsl:when>
-        <xsl:otherwise>0</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-  
-  
-    <!-- Get the baseuri for this targetptr -->
-    <xsl:variable name="baseuri" >
-      <xsl:choose>
-        <!-- Does the database use a sitemap? -->
-        <xsl:when test="$use.sitemap != 0" >
-          <xsl:choose>
-            <!-- Was current.docid parameter set? -->
-            <xsl:when test="$current.docid != ''">
-              <!-- Was it found in the database? -->
-              <xsl:variable name="currentdoc.key" >
-                <xsl:for-each select="$target.database" >
-                  <xsl:value-of select="key('targetdoc-key',
-                                        $current.docid)/@targetdoc" />
-                </xsl:for-each>
-              </xsl:variable>
-              <xsl:choose>
-                <xsl:when test="$currentdoc.key != ''">
-                  <xsl:for-each select="$target.database" >
-                    <xsl:call-template name="targetpath" >
-                      <xsl:with-param name="dirnode" 
-                          select="key('targetdoc-key', $current.docid)/parent::dir"/>
-                      <xsl:with-param name="targetdoc" select="$targetdoc"/>
-                    </xsl:call-template>
-                  </xsl:for-each >
-                </xsl:when>
-                <xsl:otherwise>
-                  <xsl:message>
-                    <xsl:text>Olink error: cannot compute relative </xsl:text>
-                    <xsl:text>sitemap path because $current.docid '</xsl:text>
-                    <xsl:value-of select="$current.docid"/>
-                    <xsl:text>' not found in target database.</xsl:text>
-                  </xsl:message>
-                </xsl:otherwise>
-              </xsl:choose>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:message>
-                <xsl:text>Olink warning: cannot compute relative </xsl:text>
-                <xsl:text>sitemap path without $current.docid parameter</xsl:text>
-              </xsl:message>
-            </xsl:otherwise>
-          </xsl:choose> 
-          <!-- In either case, add baseuri from its document entry-->
-          <xsl:variable name="docbaseuri">
-            <xsl:for-each select="$target.database" >
-              <xsl:value-of select="key('targetdoc-key', $targetdoc)/@baseuri" />
-            </xsl:for-each>
-          </xsl:variable>
-          <xsl:if test="$docbaseuri != ''" >
-            <xsl:value-of select="$docbaseuri"/>
-          </xsl:if>
-        </xsl:when>
-        <!-- No database sitemap in use -->
-        <xsl:otherwise>
-          <!-- Just use any baseuri from its document entry -->
-          <xsl:variable name="docbaseuri">
-            <xsl:for-each select="$target.database" >
-              <xsl:value-of select="key('targetdoc-key', $targetdoc)/@baseuri" />
-            </xsl:for-each>
-          </xsl:variable>
-          <xsl:if test="$docbaseuri != ''" >
-            <xsl:value-of select="$docbaseuri"/>
-          </xsl:if>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-  
-    <!-- Form the href information -->
-    <xsl:if test="$baseuri != ''">
-      <xsl:value-of select="$baseuri"/>
-      <xsl:if test="substring($target.href,1,1) != '#'">
-        <!--xsl:text>/</xsl:text-->
-      </xsl:if>
-    </xsl:if>
-    <!-- optionally turn off frag for PDF references -->
-    <xsl:if test="not($insert.olink.pdf.frag = 0 and
-          translate(substring($baseuri, string-length($baseuri) - 3),
-                    'PDF', 'pdf') = '.pdf'
-          and starts-with($target.href, '#') )">
-      <xsl:value-of select="$target.href"/>
-    </xsl:if>
-  </xsl:if>
-</xsl:template>
-
-<!-- Computes the href of the object containing the olink element -->
-<xsl:template name="olink.from.uri">
-  <xsl:param name="target.database"/>
-  <xsl:param name="object" select="NotAnElement"/>
-  <xsl:param name="object.targetdoc" select="$current.docid"/>
-  <xsl:param name="object.lang" 
-           select="concat($object/ancestor::*[last()]/@lang,
-                          $object/ancestor::*[last()]/@xml:lang)"/>
-
-  <xsl:variable name="parent.id">
-    <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="$object"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <!-- Get the olink key for the parent of olink element -->
-  <xsl:variable name="from.key">
-    <xsl:call-template name="select.olink.key">
-      <xsl:with-param name="targetdoc.att" select="$object.targetdoc"/>
-      <xsl:with-param name="targetptr.att" select="$parent.id"/>
-      <xsl:with-param name="olink.lang" select="$object.lang"/>
-      <xsl:with-param name="target.database" select="$target.database"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="from.olink.href">
-    <xsl:for-each select="$target.database" >
-      <xsl:value-of select="key('targetptr-key', $from.key)/@href" />
-    </xsl:for-each>
-  </xsl:variable>
-
-  <xsl:choose>
-    <!-- we found the olink object -->
-    <xsl:when test="$from.olink.href != ''">
-      <xsl:value-of select="$from.olink.href"/>
-    </xsl:when>
-    <xsl:when test="not($object/parent::*)">
-      <xsl:value-of select="$from.olink.href"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <!-- recurse upward in current document -->
-      <xsl:call-template name="olink.from.uri">
-        <xsl:with-param name="target.database" select="$target.database"/>
-        <xsl:with-param name="object" select="$object/parent::*"/>
-        <xsl:with-param name="object.targetdoc" select="$object.targetdoc"/>
-        <xsl:with-param name="object.lang" select="$object.lang"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-
-</xsl:template>
-
-<xsl:template name="olink.hottext">
-  <xsl:param name="target.database"/>
-  <xsl:param name="olink.lang" select="''"/>
-  <xsl:param name="olink.key" select="''"/>
-  <xsl:param name="referrer" select="."/>
-  <xsl:param name="xrefstyle">
-    <xsl:choose>
-      <xsl:when test="@role and not(@xrefstyle) 
-                      and $use.role.as.xrefstyle != 0">
-        <xsl:value-of select="@role"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="@xrefstyle"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:param>
-
-  <xsl:choose>
-    <!-- If it has elements or text (not just PI or comment) -->
-    <xsl:when test="child::text() or child::*">
-      <xsl:apply-templates/>
-    </xsl:when>
-    <xsl:when test="$olink.key != ''">
-      <!-- Get the xref text for this record -->
-      <xsl:variable name="xref.text" >
-        <xsl:for-each select="$target.database" >
-          <xsl:copy-of 
-                  select="key('targetptr-key', $olink.key)/xreftext/node()" />
-        </xsl:for-each>
-      </xsl:variable>
-
-      <xsl:variable name="xref.number" >
-        <xsl:for-each select="$target.database" >
-          <xsl:value-of select="key('targetptr-key', $olink.key)/@number" />
-        </xsl:for-each>
-      </xsl:variable>
-
-      <xsl:variable name="target.elem" >
-        <xsl:for-each select="$target.database" >
-          <xsl:value-of select="key('targetptr-key', $olink.key)/@element" />
-        </xsl:for-each>
-      </xsl:variable>
-
-      <xsl:variable name="lang">
-        <xsl:variable name="candidate">
-          <xsl:for-each select="$target.database" >
-            <xsl:value-of 
-                      select="key('targetptr-key', $olink.key)/@lang" />
-          </xsl:for-each>
-        </xsl:variable>
-        <xsl:choose>
-          <xsl:when test="$candidate != ''">
-            <xsl:value-of select="$candidate"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="$olink.lang"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-
-      <xsl:variable name="targetdoc">
-        <xsl:value-of select="substring-before($olink.key, '/')"/>
-      </xsl:variable>
-
-      <xsl:choose>
-        <xsl:when test="$xrefstyle != '' and
-                        starts-with(normalize-space($xrefstyle), 'select:') and
-                        (contains($xrefstyle, 'nodocname') or
-                        contains($xrefstyle, 'nopage')) and
-                        not(contains($xrefstyle, 'title')) and
-                        not(contains($xrefstyle, 'label'))"> 
-          <xsl:copy-of select="$xref.text"/>
-        </xsl:when>
-        <xsl:when test="$xrefstyle != ''">
-          <xsl:if test="$olink.debug != 0">
-            <xsl:message>
-              <xsl:text>xrefstyle is '</xsl:text>
-              <xsl:value-of select="$xrefstyle"/>
-              <xsl:text>'.</xsl:text>
-            </xsl:message>
-          </xsl:if>
-          <xsl:variable name="template">
-            <xsl:choose>
-              <xsl:when test="starts-with(normalize-space($xrefstyle),
-                                          'select:')">
-                <xsl:call-template name="make.gentext.template">
-                  <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-                  <xsl:with-param name="purpose" select="'olink'"/>
-                  <xsl:with-param name="referrer" select="."/>
-                  <xsl:with-param name="target.elem" select="$target.elem"/>
-                </xsl:call-template>
-              </xsl:when>
-              <xsl:when test="starts-with(normalize-space($xrefstyle),
-                                          'template:')">
-                <xsl:value-of select="substring-after(
-                                 normalize-space($xrefstyle), 'template:')"/>
-              </xsl:when>
-              <xsl:otherwise>
-                <!-- Look for Gentext template with @style attribute -->
-                <!-- Must compare to no style value because gentext.template
-                     falls back to no style -->
-
-                <xsl:variable name="xref-context">
-                  <xsl:call-template name="gentext.template">
-                    <xsl:with-param name="context" select="'xref'"/>
-                    <xsl:with-param name="name" select="$target.elem"/>
-                    <xsl:with-param name="lang" select="$lang"/>
-                  </xsl:call-template>
-                </xsl:variable>
-
-                <xsl:variable name="styled-xref-context">
-                  <xsl:call-template name="gentext.template">
-                    <xsl:with-param name="context" select="'xref'"/>
-                    <xsl:with-param name="name" select="$target.elem"/>
-                    <xsl:with-param name="lang" select="$lang"/>
-                    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-                  </xsl:call-template>
-                </xsl:variable>
-
-                <xsl:variable name="xref-number-context">
-                  <xsl:call-template name="gentext.template">
-                    <xsl:with-param name="context" select="'xref-number'"/>
-                    <xsl:with-param name="name" select="$target.elem"/>
-                    <xsl:with-param name="lang" select="$lang"/>
-                  </xsl:call-template>
-                </xsl:variable>
-
-                <xsl:variable name="styled-xref-number-context">
-                  <xsl:call-template name="gentext.template">
-                    <xsl:with-param name="context" select="'xref-number'"/>
-                    <xsl:with-param name="name" select="$target.elem"/>
-                    <xsl:with-param name="lang" select="$lang"/>
-                    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-                  </xsl:call-template>
-                </xsl:variable>
-
-                <xsl:variable name="xref-number-and-title-context">
-                  <xsl:call-template name="gentext.template">
-                    <xsl:with-param name="context" 
-                                    select="'xref-number-and-title'"/>
-                    <xsl:with-param name="name" select="$target.elem"/>
-                    <xsl:with-param name="lang" select="$lang"/>
-                  </xsl:call-template>
-                </xsl:variable>
-
-                <xsl:variable name="styled-xref-number-and-title-context">
-                  <xsl:call-template name="gentext.template">
-                    <xsl:with-param name="context" 
-                                    select="'xref-number-and-title'"/>
-                    <xsl:with-param name="name" select="$target.elem"/>
-                    <xsl:with-param name="lang" select="$lang"/>
-                    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-                  </xsl:call-template>
-                </xsl:variable>
-
-                <xsl:choose>
-                  <xsl:when test="$xref-number-and-title-context != 
-                                 $styled-xref-number-and-title-context and
-                                 $xref.number != '' and
-                                 $xref.with.number.and.title != 0">
-                    <xsl:value-of 
-                            select="$styled-xref-number-and-title-context"/>
-                  </xsl:when>
-                  <xsl:when test="$xref-number-context != 
-                                 $styled-xref-number-context and
-                                 $xref.number != ''">
-                    <xsl:value-of select="$styled-xref-number-context"/>
-                  </xsl:when>
-                  <xsl:when test="$xref-context != $styled-xref-context">
-                    <xsl:value-of select="$styled-xref-context"/>
-                  </xsl:when>
-                  <xsl:when test="$xref-number-and-title-context != '' and
-                                 $xref.number != '' and
-                                 $xref.with.number.and.title != 0">
-                    <xsl:value-of 
-                            select="$xref-number-and-title-context"/>
-                    <xsl:if test="$olink.debug">
-                      <xsl:message>
-                        <xsl:text>Olink error: no gentext template</xsl:text>
-                        <xsl:text> exists for xrefstyle '</xsl:text>
-                        <xsl:value-of select="$xrefstyle"/>
-                        <xsl:text>' for element '</xsl:text>
-                        <xsl:value-of select="$target.elem"/>
-                        <xsl:text>' in language '</xsl:text>
-                        <xsl:value-of select="$lang"/>
-                        <xsl:text>' in context 'xref-number-and-title</xsl:text>
-                        <xsl:text>'. Using template without @style.</xsl:text>
-                      </xsl:message>
-                    </xsl:if>
-                  </xsl:when>
-                  <xsl:when test="$xref-number-context != '' and
-                                 $xref.number != ''">
-                    <xsl:value-of select="$xref-number-context"/>
-                    <xsl:if test="$olink.debug">
-                      <xsl:message>
-                        <xsl:text>Olink error: no gentext template</xsl:text>
-                        <xsl:text> exists for xrefstyle '</xsl:text>
-                        <xsl:value-of select="$xrefstyle"/>
-                        <xsl:text>' for element '</xsl:text>
-                        <xsl:value-of select="$target.elem"/>
-                        <xsl:text>' in language '</xsl:text>
-                        <xsl:value-of select="$lang"/>
-                        <xsl:text>' in context 'xref-number</xsl:text>
-                        <xsl:text>'. Using template without @style.</xsl:text>
-                      </xsl:message>
-                    </xsl:if>
-                  </xsl:when>
-                  <xsl:when test="$xref-context != ''">
-                    <xsl:value-of select="$xref-context"/>
-                    <xsl:if test="$olink.debug">
-                      <xsl:message>
-                        <xsl:text>Olink error: no gentext template</xsl:text>
-                        <xsl:text> exists for xrefstyle '</xsl:text>
-                        <xsl:value-of select="$xrefstyle"/>
-                        <xsl:text>' for element '</xsl:text>
-                        <xsl:value-of select="$target.elem"/>
-                        <xsl:text>' in language '</xsl:text>
-                        <xsl:value-of select="$lang"/>
-                        <xsl:text>' in context 'xref</xsl:text>
-                        <xsl:text>'. Using template without @style.</xsl:text>
-                      </xsl:message>
-                    </xsl:if>
-                  </xsl:when>
-                  <xsl:otherwise>
-                    <xsl:message>
-                      <xsl:text>Olink error: no gentext template</xsl:text>
-                      <xsl:text> exists for xrefstyle '</xsl:text>
-                      <xsl:value-of select="$xrefstyle"/>
-                      <xsl:text>' for element '</xsl:text>
-                      <xsl:value-of select="$target.elem"/>
-                      <xsl:text>' in language '</xsl:text>
-                      <xsl:value-of select="$lang"/>
-                      <xsl:text>'. Trying '%t'.</xsl:text>
-                    </xsl:message>
-                    <xsl:value-of select="'%t'"/>
-                  </xsl:otherwise>
-                </xsl:choose>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:variable>
-
-          <xsl:if test="$olink.debug != 0">
-            <xsl:message>
-              <xsl:text>Olink debug: xrefstyle template is '</xsl:text>
-              <xsl:value-of select="$template"/>
-              <xsl:text>'.</xsl:text>
-            </xsl:message>
-          </xsl:if>
-
-          <xsl:call-template name="substitute-markup">
-            <xsl:with-param name="template" select="$template"/>
-            <xsl:with-param name="title">
-              <xsl:for-each select="$target.database" >
-                <xsl:value-of select="key('targetptr-key', $olink.key)/ttl" />
-              </xsl:for-each>
-            </xsl:with-param>
-            <xsl:with-param name="label">
-              <xsl:for-each select="$target.database" >
-                <xsl:value-of 
-                        select="key('targetptr-key', $olink.key)/@number" />
-              </xsl:for-each>
-            </xsl:with-param>
-            <xsl:with-param name="pagenumber">
-              <xsl:for-each select="$target.database" >
-                <xsl:value-of 
-                        select="key('targetptr-key', $olink.key)/@page" />
-              </xsl:for-each>
-            </xsl:with-param>
-            <xsl:with-param name="docname">
-              <xsl:for-each select="$target.database" >
-                <xsl:value-of 
-                       select="key('targetdoc-key', $targetdoc)/div[1]/ttl" />
-              </xsl:for-each>
-            </xsl:with-param>
-          </xsl:call-template>
-        </xsl:when>
-
-        <xsl:when test="$use.local.olink.style != 0">
-
-          <xsl:variable name="template">
-            <xsl:call-template name="gentext.template">
-              <xsl:with-param name="context" select="'xref'"/>
-              <xsl:with-param name="name" select="$target.elem"/>
-              <xsl:with-param name="lang" select="$lang"/>
-            </xsl:call-template>
-          </xsl:variable>
-
-          <xsl:call-template name="substitute-markup">
-            <xsl:with-param name="template" select="$template"/>
-            <xsl:with-param name="title">
-              <xsl:for-each select="$target.database" >
-                <xsl:value-of select="key('targetptr-key', $olink.key)/ttl" />
-              </xsl:for-each>
-            </xsl:with-param>
-            <xsl:with-param name="label">
-              <xsl:for-each select="$target.database" >
-                <xsl:value-of 
-                          select="key('targetptr-key', $olink.key)/@number" />
-              </xsl:for-each>
-            </xsl:with-param>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:when test="$xref.text !=''">
-          <xsl:copy-of select="$xref.text"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:message>
-            <xsl:text>Olink error: no generated text for </xsl:text>
-            <xsl:text>targetdoc/targetptr/lang = '</xsl:text>
-            <xsl:value-of select="$olink.key"/>
-            <xsl:text>'.</xsl:text>
-          </xsl:message>
-          <xsl:text>????</xsl:text>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:when test="@targetdoc != '' or @targetptr != ''">
-      <xsl:if test="$olink.key != ''">
-        <xsl:message>
-          <xsl:text>Olink error: no generated text for </xsl:text>
-          <xsl:text>targetdoc/targetptr/lang = '</xsl:text>
-          <xsl:value-of select="$olink.key"/>
-          <xsl:text>'.</xsl:text>
-        </xsl:message>
-      </xsl:if>
-      <xsl:text>????</xsl:text>
-    </xsl:when>
-    <xsl:otherwise>
-      <!-- old style olink -->
-      <xsl:call-template name="olink.outline">
-        <xsl:with-param name="outline.base.uri"
-                        select="unparsed-entity-uri(@targetdocent)"/>
-        <xsl:with-param name="localinfo" select="@localinfo"/>
-        <xsl:with-param name="return" select="'xreftext'"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="*" mode="olink.docname.markup">
-  <!-- No-op for now -->
-</xsl:template>
-
-<xsl:template name="targetpath">
-  <xsl:param name="dirnode" />
-  <xsl:param name="targetdoc" select="''"/>
-
-<!-- 
-<xsl:message>dirnode is <xsl:value-of select="$dirnode/@name"/></xsl:message>
-<xsl:message>targetdoc is <xsl:value-of select="$targetdoc"/></xsl:message>
--->
-  <!-- recursive template generates path to olink target directory -->
-  <xsl:choose>
-    <!-- Have we arrived at the final path step? -->
-    <xsl:when test="$dirnode/child::document[@targetdoc = $targetdoc]">
-      <!-- We are done -->
-    </xsl:when>
-    <!-- Have we reached the top without a match? -->
-    <xsl:when test="local-name($dirnode) != 'dir'" >
-        <xsl:message>Olink error: cannot locate targetdoc <xsl:value-of select="$targetdoc"/> in sitemap</xsl:message>
-    </xsl:when>
-    <!-- Is the target in a descendant? -->
-    <xsl:when test="$dirnode/descendant::document/@targetdoc = $targetdoc">
-      <xsl:variable name="step" select="$dirnode/child::dir[descendant::document/@targetdoc = $targetdoc]"/>
-      <xsl:if test = "$step">
-        <xsl:value-of select="$step/@name"/>
-        <xsl:text>/</xsl:text>
-      </xsl:if>
-      <!-- Now recurse with the child -->
-      <xsl:call-template name="targetpath" >
-        <xsl:with-param name="dirnode" select="$step"/>
-        <xsl:with-param name="targetdoc" select="$targetdoc"/>
-      </xsl:call-template>
-    </xsl:when>
-    <!-- Otherwise we need to move up a step -->
-    <xsl:otherwise>
-      <xsl:if test="$dirnode/parent::dir">
-        <xsl:text>../</xsl:text>
-      </xsl:if>
-      <xsl:call-template name="targetpath" >
-        <xsl:with-param name="dirnode" select="$dirnode/parent::*"/>
-        <xsl:with-param name="targetdoc" select="$targetdoc"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="olink.page.citation">
-  <xsl:param name="olink.key" select="''"/>
-  <xsl:param name="olink.lang" select="'en'"/>
-  <xsl:param name="target.database"/>
-  <xsl:param name="linkend" select="''"/>
-  <xsl:param name="xrefstyle">
-    <xsl:choose>
-      <xsl:when test="@role and not(@xrefstyle) 
-                      and $use.role.as.xrefstyle != 0">
-        <xsl:value-of select="@role"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="@xrefstyle"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:param>
-
-  <xsl:variable name="targetdoc">
-    <xsl:value-of select="substring-before($olink.key, '/')"/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$linkend != ''">
-      <xsl:call-template name="xref.page.citation">
-        <xsl:with-param name="linkend" select="$linkend"/>
-        <xsl:with-param name="target" select="key('id', $linkend)"/>
-        <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="not(starts-with(normalize-space($xrefstyle),
-                        'select:') 
-                and (contains($xrefstyle, 'page')
-                     or contains($xrefstyle, 'Page')))
-                and $current.docid != '' 
-                and $current.docid != $targetdoc
-                and $insert.olink.page.number = 'yes' ">
-  
-      <xsl:variable name="page-number">
-        <xsl:for-each select="$target.database" >
-          <xsl:value-of 
-                 select="key('targetptr-key', $olink.key)/@page" />
-        </xsl:for-each>
-      </xsl:variable>
-  
-      <xsl:if test="$page-number != ''">
-        <xsl:call-template name="substitute-markup">
-          <xsl:with-param name="template">
-            <xsl:call-template name="gentext.template">
-              <xsl:with-param name="name" select="'olink.page.citation'"/>
-              <xsl:with-param name="context" select="'xref'"/>
-              <xsl:with-param name="lang" select="$olink.lang"/>
-            </xsl:call-template>
-          </xsl:with-param>
-          <xsl:with-param name="pagenumber" select="$page-number"/>
-        </xsl:call-template>
-      </xsl:if>
-  
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="olink.document.citation">
-  <xsl:param name="olink.key" select="''"/>
-  <xsl:param name="olink.lang" select="'en'"/>
-  <xsl:param name="target.database"/>
-  <xsl:param name="xrefstyle">
-    <xsl:choose>
-      <xsl:when test="@role and not(@xrefstyle) 
-                      and $use.role.as.xrefstyle != 0">
-        <xsl:value-of select="@role"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="@xrefstyle"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:param>
-
-  <xsl:variable name="page">
-    <xsl:for-each select="$target.database" >
-      <xsl:value-of 
-             select="key('targetptr-key', $olink.key)/@page" />
-    </xsl:for-each>
-  </xsl:variable>
-
-  <xsl:variable name="targetdoc">
-    <xsl:value-of select="substring-before($olink.key, '/')"/>
-  </xsl:variable>
-
-  <xsl:variable name="targetptr">
-    <xsl:value-of 
-          select="substring-before(substring-after($olink.key, '/'), '/')"/>
-  </xsl:variable>
-
-  <!-- Don't add docname if pointing to root element -->
-  <xsl:variable name="rootptr">
-    <xsl:for-each select="$target.database" >
-      <xsl:value-of 
-             select="key('targetdoc-key', $targetdoc)/div[1]/@targetptr" />
-    </xsl:for-each>
-  </xsl:variable>
-
-  <xsl:variable name="docname">
-    <xsl:for-each select="$target.database" >
-      <xsl:value-of 
-             select="key('targetdoc-key', $targetdoc)/div[1]/ttl" />
-    </xsl:for-each>
-  </xsl:variable>
-
-  <xsl:if test="not(starts-with(normalize-space($xrefstyle), 'select:') 
-              and (contains($xrefstyle, 'docname')))
-              and ($olink.doctitle = 'yes' or $olink.doctitle = '1')
-              and $current.docid != '' 
-              and $rootptr != $targetptr
-              and $current.docid != $targetdoc
-              and $docname != ''">
-    <xsl:call-template name="substitute-markup">
-      <xsl:with-param name="template">
-        <xsl:call-template name="gentext.template">
-          <xsl:with-param name="name" select="'olink.document.citation'"/>
-          <xsl:with-param name="context" select="'xref'"/>
-          <xsl:with-param name="lang" select="$olink.lang"/>
-        </xsl:call-template>
-      </xsl:with-param>
-      <xsl:with-param name="docname" select="$docname"/>
-      <xsl:with-param name="pagenumber" select="$page"/>
-    </xsl:call-template>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="xref.page.citation">
-  <!-- Determine if this xref should have a page citation.
-       Context node is the xref or local olink element -->
-  <xsl:param name="linkend" select="@linkend"/>
-  <xsl:param name="target" select="key('id', $linkend)"/>
-  <xsl:param name="xrefstyle">
-    <xsl:choose>
-      <xsl:when test="@role and not(@xrefstyle) 
-                      and $use.role.as.xrefstyle != 0">
-        <xsl:value-of select="@role"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="@xrefstyle"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:param>
-
-  <xsl:if test="not(starts-with(normalize-space($xrefstyle),'select:')
-                    and (contains($xrefstyle, 'page')
-                         or contains($xrefstyle, 'Page')))
-                and ( $insert.xref.page.number = 'yes' 
-                   or $insert.xref.page.number = '1')
-                or local-name($target) = 'para'">
-    <xsl:apply-templates select="$target" mode="page.citation">
-      <xsl:with-param name="id" select="$linkend"/>
-    </xsl:apply-templates>
-  </xsl:if>
-</xsl:template>
-
-</xsl:stylesheet>
-
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/pi.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/pi.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,346 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"
-  xmlns:date="http://exslt.org/dates-and-times"
-  xmlns:exsl="http://exslt.org/common"
-  xmlns:xlink="http://www.w3.org/1999/xlink"
-  exclude-result-prefixes="doc date exsl"
-  extension-element-prefixes="date exsl"
-  version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<doc:reference xmlns=""><info><title>Common Processing Instruction Reference</title>
-    <releaseinfo role="meta">
-      $Id$
-    </releaseinfo>
-  </info>
-  <partintro id="partintro">
-    <title>Introduction</title>
-    <para>This is generated reference documentation for all
-      user-specifiable processing instructions (PIs) in the
-      âcommonâ part of the DocBook XSL stylesheets.
-      <note>
-        <para>You add these PIs at particular points in a document to
-          cause specific âexceptionsâ to formatting/output behavior. To
-          make global changes in formatting/output behavior across an
-          entire document, itâs better to do it by setting an
-          appropriate stylesheet parameter (if there is one).</para>
-      </note>
-    </para>
-  </partintro>
-</doc:reference>
-
-<!-- ==================================================================== -->
-<doc:pi name="dbchoice_choice" xmlns="">
-  <refpurpose>Generates a localized choice separator</refpurpose>
-  <refdescription id="select.choice.separator-desc">
-    <para>Use the <tag class="xmlpi">dbchoice choice</tag> PI to
-      generate an appropriate localized âchoiceâ separator (for
-      example, <literal>and</literal> or <literal>or</literal>)
-      before the final item in an inline <tag>simplelist</tag></para>
-    <warning>
-      <para>This PI is a less-than-ideal hack; support for it may
-        disappear in the future (particularly if and when a more
-        appropriate means for marking up "choice" lists becomes
-        available in DocBook).</para>
-    </warning>
-  </refdescription>
-  <refsynopsisdiv>
-    <synopsis><tag class="xmlpi">dbchoice choice="and"|"or"|<replaceable>string</replaceable>"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter>
-    <variablelist>
-      <varlistentry><term>choice="and"</term>
-        <listitem>
-          <para>generates a localized <literal>and</literal> separator</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry><term>choice="or"</term>
-        <listitem>
-          <para>generates a localized <literal>or</literal> separator</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry><term>choice="<replaceable>string</replaceable>"</term>
-        <listitem>
-          <para>generates a literal <replaceable>string</replaceable> separator</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-</doc:pi>
-<xsl:template name="pi.dbchoice_choice">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="pi-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbchoice')"/>
-    <xsl:with-param name="attribute">choice</xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi name="dbtimestamp" xmlns="">
-  <refpurpose>Inserts a date timestamp</refpurpose>
-  <refdescription>
-    <para>Use the <tag class="xmlpi">dbtimestamp</tag> PI at any point in a
-      source document to cause a date timestamp (a formatted
-      string representing the current date and time) to be
-      inserted in output of the document.</para>
-  </refdescription>
-  <refsynopsisdiv>
-    <synopsis><tag class="xmlpi">dbtimestamp format="<replaceable>formatstring</replaceable>" [padding="0"|"1"]</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter>
-    <variablelist>
-      <varlistentry><term>format="<replaceable>formatstring</replaceable>"</term>
-        <listitem>
-          <para>Specifies format in which the date and time are
-            output</para>
-        <note>
-          <para>For details of the content of the format string,
-            see <link role="tcg" xlink:href="Datetime.html"
-              >Date and time</link>.</para>
-        </note>
-        </listitem>
-      </varlistentry>
-      <varlistentry><term>padding="0"|"1"</term>
-        <listitem>
-          <para>Specifies padding behavior; if non-zero, padding is is added</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-</doc:pi>
-<xsl:template name="pi.dbtimestamp">
-  <xsl:variable name="format">
-    <xsl:variable name="pi-format">
-      <xsl:call-template name="pi-attribute">
-        <xsl:with-param name="pis" select="."/>
-        <xsl:with-param name="attribute">format</xsl:with-param>
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:choose>
-      <xsl:when test="$pi-format != ''">
-        <xsl:value-of select="$pi-format"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="gentext.template">
-          <xsl:with-param name="context" select="'datetime'"/>
-          <xsl:with-param name="name" select="'format'"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable> 
-  <xsl:variable name="padding">
-    <xsl:variable name="pi-padding">
-      <xsl:call-template name="pi-attribute">
-        <xsl:with-param name="pis" select="."/>
-        <xsl:with-param name="attribute">padding</xsl:with-param>
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:choose>
-      <xsl:when test="$pi-padding != ''">
-        <xsl:value-of select="$pi-padding"/>
-      </xsl:when>
-      <xsl:otherwise>1</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-  <xsl:variable name="date">
-    <xsl:choose>
-      <xsl:when test="function-available('date:date-time')">
-        <xsl:value-of select="date:date-time()"/>
-      </xsl:when>
-      <xsl:when test="function-available('date:dateTime')">
-        <!-- Xalan quirk -->
-        <xsl:value-of select="date:dateTime()"/>
-      </xsl:when>
-    </xsl:choose>
-  </xsl:variable>
-  <xsl:choose>
-    <xsl:when test="function-available('date:date-time') or
-      function-available('date:dateTime')">
-      <xsl:call-template name="datetime.format">
-        <xsl:with-param name="date" select="$date"/>
-        <xsl:with-param name="format" select="$format"/>
-        <xsl:with-param name="padding" select="$padding"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:message>
-        Timestamp processing requires XSLT processor with EXSLT date support.
-      </xsl:message>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<doc:pi name="dbtex_delims" xmlns="">
-  <refpurpose>Generates delimiters around embedded TeX equations
-    in output</refpurpose>
-  <refdescription>
-    <para>Use the <tag class="xmlpi">dbtex delims</tag> PI as a
-      child of a <tag>textobject</tag> containing embedded TeX
-      markup, to cause that markup to be surrounded by
-      <literal>$</literal> delimiter characters in output.</para>
-  </refdescription>
-  <refsynopsisdiv>
-    <synopsis><tag class="xmlpi">dbtex delims="no"|"yes"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter>
-    <variablelist>
-      <varlistentry><term>dbtex delims="no"|"yes"</term>
-        <listitem>
-          <para>Specifies whether delimiters are output</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee role="params">
-    <para><parameter>tex.math.delims</parameter></para>
-  </refsee>
-  <refsee role="tcg">
-    <para><link role="tcg"
-        xlink:href="TexMath.html"
-        >DBTeXMath</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbtex_delims">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="pi-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbtex')"/>
-    <xsl:with-param name="attribute" select="'delims'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="processing-instruction()" mode="titlepage.mode">
-  <!-- * Als process PIs on title pages -->
-  <xsl:apply-templates select="."/>
-</xsl:template>
-
-<xsl:template match="processing-instruction('dbtimestamp')">
-  <xsl:call-template name="pi.dbtimestamp"/>
-</xsl:template>
-
-<xsl:template name="datetime.format">
-  <xsl:param name="date"/>
-  <xsl:param name="format"/>
-  <xsl:param name="padding" select="1"/>
-  <xsl:if test="$format != ''">
-    <!-- replace any whitespace in the format string with a non-breaking space -->
-    <xsl:variable name="format-nbsp"
-      select="translate($format,
-      '&#x20;&#x9;&#xd;&#xa;',
-      '&#xa0;&#xa0;&#xa0;&#xa0;')"/>
-    <xsl:variable name="tokenized-format-string">
-      <xsl:call-template name="str.tokenize.keep.delimiters">
-        <xsl:with-param name="string" select="$format-nbsp"/>
-        <xsl:with-param name="delimiters" select="'&#xa0;,./-()[]:'"/>
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:choose>
-      <!-- include extra test for Xalan quirk -->
-      <xsl:when test="function-available('exsl:node-set') or 
-        contains(system-property('xsl:vendor'),'Apache Software Foundation')">
-        <!-- We must preserve context node in order to get valid language -->
-        <xsl:variable name="context" select="."/>
-        <xsl:for-each select="exsl:node-set($tokenized-format-string)/node()">
-          <xsl:variable name="token">
-            <xsl:value-of select="."/>
-          </xsl:variable>
-          <!-- Restore context node -->
-          <xsl:for-each select="$context">
-            <xsl:choose>
-              <xsl:when test="$token = 'a'">
-                <xsl:call-template name="gentext.template">
-                  <xsl:with-param name="context" select="'datetime-abbrev'"/>
-                  <xsl:with-param name="name" select="date:day-abbreviation($date)"/>
-                </xsl:call-template>
-              </xsl:when>
-              <xsl:when test="$token = 'A'">
-                <xsl:call-template name="gentext.template">
-                  <xsl:with-param name="context" select="'datetime-full'"/>
-                  <xsl:with-param name="name" select="date:day-name($date)"/>
-                </xsl:call-template>
-              </xsl:when>
-              <xsl:when test="$token = 'b'">
-                <xsl:call-template name="gentext.template">
-                  <xsl:with-param name="context" select="'datetime-abbrev'"/>
-                  <xsl:with-param name="name" select="date:month-abbreviation($date)"/>
-                </xsl:call-template>
-              </xsl:when>
-              <xsl:when test="$token = 'c'">
-                <xsl:value-of select="date:date($date)"/>
-                <xsl:text> </xsl:text>
-                <xsl:value-of select="date:time($date)"/>
-              </xsl:when>
-              <xsl:when test="$token = 'B'">
-                <xsl:call-template name="gentext.template">
-                  <xsl:with-param name="context" select="'datetime-full'"/>
-                  <xsl:with-param name="name" select="date:month-name($date)"/>
-                </xsl:call-template>
-              </xsl:when>
-              <xsl:when test="$token = 'd'">
-                <xsl:if test="$padding = 1 and
-                  string-length(date:day-in-month($date)) = 1">0</xsl:if>
-                <xsl:value-of select="date:day-in-month($date)"/>
-              </xsl:when>
-              <xsl:when test="$token = 'H'">
-                <xsl:if test="$padding = 1 and string-length(date:hour-in-day($date)) = 1">0</xsl:if>
-                <xsl:value-of select="date:hour-in-day($date)"/>
-              </xsl:when>
-              <xsl:when test="$token = 'j'">
-                <xsl:value-of select="date:day-in-year($date)"/>
-              </xsl:when>
-              <xsl:when test="$token = 'm'">
-                <xsl:if test="$padding = 1 and string-length(date:month-in-year($date)) = 1">0</xsl:if>
-                <xsl:value-of select="date:month-in-year($date)"/>
-              </xsl:when>
-              <xsl:when test="$token = 'M'">
-                <xsl:if test="string-length(date:minute-in-hour($date)) = 1">0</xsl:if>
-                <xsl:value-of select="date:minute-in-hour($date)"/>
-              </xsl:when>
-              <xsl:when test="$token = 'S'">
-                <xsl:if test="string-length(date:second-in-minute($date)) = 1">0</xsl:if>
-                <xsl:value-of select="date:second-in-minute($date)"/>
-              </xsl:when>
-              <xsl:when test="$token = 'U'">
-                <xsl:value-of select="date:week-in-year($date)"/>
-              </xsl:when>
-              <xsl:when test="$token = 'w'">
-                <xsl:value-of select="date:day-in-week($date)"/>
-              </xsl:when>
-              <xsl:when test="$token = 'x'">
-                <xsl:value-of select="date:date($date)"/>
-              </xsl:when>
-              <xsl:when test="$token = 'X'">
-                <xsl:value-of select="date:time($date)"/>
-              </xsl:when>
-              <xsl:when test="$token = 'Y'">
-                <xsl:value-of select="date:year($date)"/>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:value-of select="$token"/>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:for-each>
-        </xsl:for-each>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:message>
-          Timestamp processing requires an XSLT processor with support
-          for the EXSLT node-set() function.
-        </xsl:message>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:if>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/refentry.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/refentry.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,1277 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"
-                xmlns:date="http://exslt.org/dates-and-times"
-                exclude-result-prefixes="doc date"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-<doc:reference xmlns="" xml:id="refentry">
-  <info>
-    <title>Common Â» Refentry Metadata Template Reference</title>
-    <releaseinfo role="meta">
-      $Id$
-    </releaseinfo>
-  </info>
-  <!-- * yes, partintro is a valid child of a reference... -->
-  <partintro xml:id="partintro">
-    <title>Introduction</title>
-    <para>This is technical reference documentation for the ârefentry
-    metadataâ templates in the DocBook XSL Stylesheets.</para>
-    <para>This is not intended to be user documentation. It is provided
-    for developers writing customization layers for the stylesheets.</para>
-    <note>
-      <para>Currently, only the manpages stylesheets make use of these
-      templates. They are, however, potentially useful elsewhere.</para>
-    </note>
-  </partintro>
-</doc:reference>
-
-<!-- ==================================================================== -->
-<doc:template name="get.refentry.metadata" xmlns="">
-  <refpurpose>Gathers metadata from a refentry and its ancestors</refpurpose>
-  <refdescription id="get.refentry.metadata-desc">
-    <para>Reference documentation for particular commands, functions,
-    etc., is sometimes viewed in isolation from its greater "context". For
-    example, users view Unix man pages as, well, individual pages, not as
-    part of a "book" of some kind. Therefore, it is sometimes necessary to
-    embed "context" information in output for each <tag>refentry</tag>.</para>
-
-    <para>However, one problem is that different users mark up that
-    context information in different ways. Often (usually), the
-    context information is not actually part of the content of the
-    <tag>refentry</tag> itself, but instead part of the content of a
-    parent or ancestor element to the the <tag>refentry</tag>. And
-    even then, DocBook provides a variety of elements that users might
-    potentially use to mark up the same kind of information. One user
-    might use the <tag>productnumber</tag> element to mark up version
-    information about a particular product, while another might use
-    the <tag>releaseinfo</tag> element.</para>
-
-    <para>Taking all that in mind, the
-    <function>get.refentry.metadata</function> template tries to gather
-    metadata from a <tag>refentry</tag> element and its ancestor
-    elements in an intelligent and user-configurable way. The basic
-    mechanism used in the XPath expressions throughout this stylesheet
-    is to select the relevant metadata from the *info element that is
-    closest to the actual <tag>refentry</tag>&#160;â either on the
-    <tag>refentry</tag> itself, or on its nearest ancestor.</para>
-
-    <note>
-      <para>The <function>get.refentry.metadata</function>
-        template is actually just sort of a "driver" template; it
-        calls other templates that do the actual data collection,
-        then returns the data as a set.</para>
-    </note>
-
-  </refdescription>
-  <refparameter id="get.refentry.metadata-params">
-    <variablelist>
-      <varlistentry>
-        <term>refname</term>
-        <listitem>
-          <para>The first <tag>refname</tag> in the refentry</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>info</term>
-        <listitem>
-          <para>A set of info nodes (from a <tag>refentry</tag>
-          element and its ancestors)</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>prefs</term>
-        <listitem>
-          <para>A node containing user preferences (from global
-          stylesheet parameters)</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refreturn id="get.refentry.metadata-returns">
-    <para>Returns a node set with the following elements. The
-    descriptions are verbatim from the <literal>man(7)</literal> man
-    page.
-    <variablelist>
-      <varlistentry>
-        <term>title</term>
-        <listitem>
-          <para>the title of the man page (e.g., <literal>MAN</literal>)</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>section</term>
-        <listitem>
-          <para>the section number the man page should be placed in (e.g.,
-          <literal>7</literal>)</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>date</term>
-        <listitem>
-          <para>the date of the last revision</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>source</term>
-        <listitem>
-          <para>the source of the command</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>manual</term>
-        <listitem>
-          <para>the title of the manual (e.g., <citetitle>Linux
-          Programmer's Manual</citetitle>)</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-    </para>
-  </refreturn>
-</doc:template>
-<xsl:template name="get.refentry.metadata">
-  <xsl:param name="refname"/>
-  <xsl:param name="info"/>
-  <xsl:param name="prefs"/>
-  <title>
-    <xsl:call-template name="get.refentry.title">
-      <xsl:with-param name="refname" select="$refname"/>
-    </xsl:call-template>
-  </title>
-  <section>
-    <xsl:call-template name="get.refentry.section">
-      <xsl:with-param name="refname" select="$refname"/>
-    </xsl:call-template>
-  </section>
-  <date>
-    <xsl:call-template name="get.refentry.date">
-      <xsl:with-param name="info" select="$info"/>
-      <xsl:with-param name="refname" select="$refname"/>
-      <xsl:with-param name="prefs" select="$prefs/DatePrefs"/>
-    </xsl:call-template>
-  </date>
-  <source>
-    <xsl:call-template name="get.refentry.source">
-      <xsl:with-param name="info" select="$info"/>
-      <xsl:with-param name="refname" select="$refname"/>
-      <xsl:with-param name="prefs" select="$prefs/SourcePrefs"/>
-    </xsl:call-template>
-  </source>
-  <manual>
-    <xsl:call-template name="get.refentry.manual">
-      <xsl:with-param name="info" select="$info"/>
-      <xsl:with-param name="refname" select="$refname"/>
-      <xsl:with-param name="prefs" select="$prefs/ManualPrefs"/>
-    </xsl:call-template>
-  </manual>
-</xsl:template>
-
-<!-- ====================================================================== -->
-<doc:template name="get.refentry.title" xmlns="">
-  <refpurpose>Gets title metadata for a refentry</refpurpose>
-  <refdescription id="get.refentry.title-desc">
-    <para>The <literal>man(7)</literal> man page describes this as "the
-    title of the man page (e.g., <literal>MAN</literal>). This differs
-    from <tag>refname</tag> in that, if the <tag>refentry</tag> has a
-    <tag>refentrytitle</tag>, we use that as the <tag>title</tag>;
-    otherwise, we just use first <tag>refname</tag> in the first
-    <tag>refnamediv</tag> in the source.</para>
-  </refdescription>
-  <refparameter id="get.refentry.title-params">
-    <variablelist>
-      <varlistentry>
-        <term>refname</term>
-        <listitem>
-          <para>The first <tag>refname</tag> in the refentry</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refreturn id="get.refentry.title-returns">
-  <para>Returns a <tag>title</tag> node.</para></refreturn>
-</doc:template>
-<xsl:template name="get.refentry.title">
-  <xsl:param name="refname"/>
-  <xsl:choose>
-    <xsl:when test="refmeta/refentrytitle">
-      <xsl:copy>
-        <xsl:apply-templates select="refmeta/refentrytitle/node()"/>
-      </xsl:copy>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:copy-of select="$refname"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-<doc:template name="get.refentry.section" xmlns="">
-  <refpurpose>Gets section metadata for a refentry</refpurpose>
-  <refdescription id="get.refentry.section-desc">
-    <para>The <literal>man(7)</literal> man page describes this as "the
-    section number the man page should be placed in (e.g.,
-    <literal>7</literal>)". If we do not find a <tag>manvolnum</tag>
-    specified in the source, and we find that the <tag>refentry</tag> is
-    for a function, we use the section number <literal>3</literal>
-    ["Library calls (functions within program libraries)"]; otherwise, we
-    default to using <literal>1</literal> ["Executable programs or shell
-    commands"].</para>
-  </refdescription>
-  <refparameter id="get.refentry.section-params">
-    <variablelist>
-      <varlistentry>
-        <term>refname</term>
-        <listitem>
-          <para>The first <tag>refname</tag> in the refentry</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>quiet</term>
-        <listitem>
-          <para>If non-zero, no "missing" message is emitted</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refreturn id="get.refentry.section-returns">
-  <para>Returns a string representing a section number.</para></refreturn>
-</doc:template>
-<xsl:template name="get.refentry.section">
-  <xsl:param name="refname"/>
-  <xsl:param name="quiet" select="0"/>
-  <xsl:choose>
-    <xsl:when test="refmeta/manvolnum">
-      <xsl:value-of select="refmeta/manvolnum"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:if test="$quiet = 0">
-        <xsl:if test="$refentry.meta.get.quietly = 0">
-          <xsl:call-template name="log.message">
-            <xsl:with-param name="level">Note</xsl:with-param>
-            <xsl:with-param name="source" select="$refname"/>
-            <xsl:with-param name="context-desc">meta manvol</xsl:with-param>
-            <xsl:with-param name="message">
-              <xsl:text>no refentry/refmeta/manvolnum</xsl:text>
-            </xsl:with-param>
-          </xsl:call-template>
-          <xsl:call-template name="log.message">
-            <xsl:with-param name="level">Note</xsl:with-param>
-            <xsl:with-param name="source" select="$refname"/>
-            <xsl:with-param name="context-desc">meta manvol</xsl:with-param>
-            <xsl:with-param name="message">
-              <xsl:text>see http://docbook.sf.net/el/manvolnum</xsl:text>
-            </xsl:with-param>
-          </xsl:call-template>
-        </xsl:if>
-      </xsl:if>
-      <xsl:choose>
-        <xsl:when test=".//funcsynopsis">
-          <xsl:if test="$quiet = 0">
-            <xsl:if test="$refentry.meta.get.quietly = 0">
-              <xsl:call-template name="log.message">
-                <xsl:with-param name="level">Note</xsl:with-param>
-                <xsl:with-param name="source" select="$refname"/>
-                <xsl:with-param name="context-desc">meta manvol</xsl:with-param>
-                <xsl:with-param name="message">
-                  <xsl:text>Setting man section to 3</xsl:text>
-                </xsl:with-param>
-              </xsl:call-template>
-            </xsl:if>
-          </xsl:if>
-          <xsl:text>3</xsl:text>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:text>1</xsl:text>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-<doc:template name="get.refentry.date" xmlns="">
-  <refpurpose>Gets date metadata for a refentry</refpurpose>
-  <refdescription id="get.refentry.date-desc">
-    <para>The <literal>man(7)</literal> man page describes this as "the
-    date of the last revision". If we cannot find a date in the source, we
-    generate one.</para>
-  </refdescription>
-  <refparameter id="get.refentry.date-params">
-    <variablelist>
-      <varlistentry>
-        <term>refname</term>
-        <listitem>
-          <para>The first <tag>refname</tag> in the refentry</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>info</term>
-        <listitem>
-          <para>A set of info nodes (from a <tag>refentry</tag>
-          element and its ancestors)</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>prefs</term>
-        <listitem>
-          <para>A node containing users preferences (from global stylesheet parameters)</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refreturn id="get.refentry.date-returns">
-    <para>Returns a <tag>date</tag> node.</para>
-  </refreturn>
-</doc:template>
-<xsl:template name="get.refentry.date">
-  <xsl:param name="refname"/>
-  <xsl:param name="info"/>
-  <xsl:param name="prefs"/>
-  <xsl:variable name="Date">
-    <xsl:choose>
-      <!-- * if profiling is enabled for date, and the date -->
-      <!-- * profile is non-empty, use it -->
-      <xsl:when test="not($prefs/@profileEnabled = 0) and
-                      not($prefs/@profile = '')">
-        <xsl:call-template name="evaluate.info.profile">
-          <xsl:with-param name="profile" select="$prefs/@profile"/>
-          <xsl:with-param name="info" select="$info"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <!-- * either profiling is not enabled for date, or the-->
-        <!-- * date profile is empty, so we need to look for date -->
-        <!-- * in *info -->
-        <xsl:choose>
-          <!-- * look for date or pubdate in *info -->
-          <xsl:when test="$info/date/node()
-                          |$info/pubdate/node()">
-            <xsl:apply-templates
-                select="(($info[date])[last()]/date)[1]|
-                        (($info[pubdate])[last()]/pubdate)[1]"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <!-- * found no Date or Pubdate -->
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-  <xsl:choose>
-    <xsl:when test="not($Date = '')">
-      <xsl:value-of select="$Date"/>
-    </xsl:when>
-    <!-- * We couldn't find a date, so we generate a date. -->
-    <!-- * And we make it an appropriately localized date. -->
-    <xsl:otherwise>
-      <xsl:if test="$refentry.meta.get.quietly = 0">
-        <xsl:call-template name="log.message">
-          <xsl:with-param name="level">Note</xsl:with-param>
-          <xsl:with-param name="source" select="$refname"/>
-          <xsl:with-param name="context-desc">meta date</xsl:with-param>
-          <xsl:with-param name="message">
-            <xsl:text>no date; using generated date</xsl:text>
-          </xsl:with-param>
-        </xsl:call-template>
-        <xsl:call-template name="log.message">
-          <xsl:with-param name="level">Note</xsl:with-param>
-          <xsl:with-param name="source" select="$refname"/>
-          <xsl:with-param name="context-desc">meta date</xsl:with-param>
-          <xsl:with-param name="message">
-            <xsl:text>see http://docbook.sf.net/el/date</xsl:text>
-          </xsl:with-param>
-        </xsl:call-template>
-      </xsl:if>
-      <xsl:call-template name="datetime.format">
-        <xsl:with-param name="date">
-          <xsl:choose>
-            <xsl:when test="function-available('date:date-time')">
-              <xsl:value-of select="date:date-time()"/>
-            </xsl:when>
-            <xsl:when test="function-available('date:dateTime')">
-              <!-- Xalan quirk -->
-              <xsl:value-of select="date:dateTime()"/>
-            </xsl:when>
-          </xsl:choose>
-        </xsl:with-param>
-        <xsl:with-param name="format">
-          <xsl:call-template name="gentext.template">
-            <xsl:with-param name="context" select="'datetime'"/>
-            <xsl:with-param name="name" select="'format'"/>
-          </xsl:call-template>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-<doc:template name="get.refentry.source" xmlns="">
-  <refpurpose>Gets source metadata for a refentry</refpurpose>
-  <refdescription id="get.refentry.source-desc">
-    <para>The <literal>man(7)</literal> man page describes this as "the
-    source of the command", and provides the following examples:
-    <itemizedlist>
-      <listitem>
-        <para>For binaries, use something like: GNU, NET-2, SLS
-        Distribution, MCC Distribution.</para>
-      </listitem>
-      <listitem>
-        <para>For system calls, use the version of the kernel that you are
-        currently looking at: Linux 0.99.11.</para>
-      </listitem>
-      <listitem>
-        <para>For library calls, use the source of the function: GNU, BSD
-        4.3, Linux DLL 4.4.1.</para>
-      </listitem>
-    </itemizedlist>
-    </para>
-
-    <para>The <literal>solbook(5)</literal> man page describes
-    something very much like what <literal>man(7)</literal> calls
-    "source", except that <literal>solbook(5)</literal> names it
-    "software" and describes it like this:
-    <blockquote>
-      <para>This is the name of the software product that the topic
-      discussed on the reference page belongs to. For example UNIX
-      commands are part of the <literal>SunOS x.x</literal>
-      release.</para>
-    </blockquote>
-    </para>
-
-    <para>In practice, there are many pages that simply have a version
-    number in the "source" field. So, it looks like what we have is a
-    two-part field,
-    <replaceable>Name</replaceable>&#160;<replaceable>Version</replaceable>,
-    where:
-    <variablelist>
-      <varlistentry>
-        <term>Name</term>
-        <listitem>
-          <para>product name (e.g., BSD) or org. name (e.g., GNU)</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>Version</term>
-        <listitem>
-          <para>version name</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-    Each part is optional. If the <replaceable>Name</replaceable> is a
-    product name, then the <replaceable>Version</replaceable> is probably
-    the version of the product. Or there may be no
-    <replaceable>Name</replaceable>, in which case, if there is a
-    <replaceable>Version</replaceable>, it is probably the version of the
-    item itself, not the product it is part of. Or, if the
-    <replaceable>Name</replaceable> is an organization name, then there
-    probably will be no <replaceable>Version</replaceable>.
-    </para>
-  </refdescription>
-  <refparameter id="get.refentry.source-params">
-    <variablelist>
-      <varlistentry>
-        <term>refname</term>
-        <listitem>
-          <para>The first <tag>refname</tag> in the refentry</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>info</term>
-        <listitem>
-          <para>A set of info nodes (from a <tag>refentry</tag>
-          element and its ancestors)</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>prefs</term>
-        <listitem>
-          <para>A node containing users preferences (from global
-          stylesheet parameters)</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refreturn id="get.refentry.source-returns">
-    <para>Returns a <tag>source</tag> node.</para>
-  </refreturn>
-</doc:template>
-<xsl:template name="get.refentry.source">
-  <xsl:param name="refname"/>
-  <xsl:param name="info"/>
-  <xsl:param name="prefs"/>
-  <xsl:variable name="Name">
-    <xsl:if test="$prefs/Name/@suppress = 0">
-      <xsl:call-template name="get.refentry.source.name">
-        <xsl:with-param name="info" select="$info"/>
-        <xsl:with-param name="refname" select="$refname"/>
-        <xsl:with-param name="prefs" select="$prefs/Name"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:variable>
-  <xsl:variable name="Version">
-    <xsl:if test="$prefs/Version/@suppress = 0">
-      <xsl:call-template name="get.refentry.version">
-        <xsl:with-param name="info" select="$info"/>
-        <xsl:with-param name="refname" select="$refname"/>
-        <xsl:with-param name="prefs" select="$prefs/Version"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:variable>
-  <xsl:choose>
-    <!-- * if we have a Name and/or Version, use either or both -->
-    <!-- * of those, in the form "Name Version" or just "Name" -->
-    <!-- * or just "Version" -->
-    <xsl:when test="not($Name = '') or not($Version = '')">
-      <xsl:choose>
-        <xsl:when test="not($Name = '') and not($Version = '')">
-          <xsl:copy-of select="$Name"/>
-          <xsl:text> </xsl:text>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:copy-of select="$Name"/>
-        </xsl:otherwise>
-      </xsl:choose>
-      <xsl:copy-of select="$Version"/>
-    </xsl:when>
-    <!-- * if no Name and no Version, use fallback (if any) -->
-    <xsl:when test="not($prefs/@fallback = '')">
-      <xsl:variable name="source.fallback">
-        <xsl:call-template name="evaluate.info.profile">
-          <xsl:with-param name="profile" select="$prefs/@fallback"/>
-          <xsl:with-param name="info" select="$info"/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:choose>
-        <xsl:when test="not($source.fallback = '')">
-          <xsl:value-of select="$source.fallback"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:if test="$refentry.meta.get.quietly = 0">
-            <xsl:call-template name="log.message">
-              <xsl:with-param name="level">Warn</xsl:with-param>
-              <xsl:with-param name="source" select="$refname"/>
-              <xsl:with-param name="context-desc">meta source</xsl:with-param>
-              <xsl:with-param name="message">
-                <xsl:text>no valid fallback for source; leaving empty</xsl:text>
-              </xsl:with-param>
-            </xsl:call-template>
-          </xsl:if>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:if test="$refentry.meta.get.quietly = 0">
-        <xsl:call-template name="log.message">
-          <xsl:with-param name="level">Warn</xsl:with-param>
-          <xsl:with-param name="source" select="$refname"/>
-          <xsl:with-param name="context-desc">meta source</xsl:with-param>
-          <xsl:with-param name="message">
-            <xsl:text>no source fallback specified; leaving empty</xsl:text>
-          </xsl:with-param>
-        </xsl:call-template>
-      </xsl:if>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-<doc:template name="get.refentry.source.name" xmlns="">
-  <refpurpose>Gets source-name metadata for a refentry</refpurpose>
-  <refdescription id="get.refentry.source.name-desc">
-    <para>A "source name" is one part of a (potentially) two-part
-    <replaceable>Name</replaceable>&#160;<replaceable>Version</replaceable>
-    source field. For more details, see the documentation for the
-    <function>get.refentry.source</function> template.</para>
-  </refdescription>
-  <refparameter id="get.refentry.source.name-params">
-    <variablelist>
-      <varlistentry>
-        <term>refname</term>
-        <listitem>
-          <para>The first <tag>refname</tag> in the refentry</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>info</term>
-        <listitem>
-          <para>A set of info nodes (from a <tag>refentry</tag>
-          element and its ancestors)</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>prefs</term>
-        <listitem>
-          <para>A node containing users preferences (from global
-          stylesheet parameters)</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refreturn id="get.refentry.source.name-returns">
-    <para>Depending on what output method is used for the
-  current stylesheet, either returns a text node or possibly an element
-  node, containing "source name" data.</para>
-  </refreturn>
-</doc:template>
-<xsl:template name="get.refentry.source.name">
-  <xsl:param name="refname"/>
-  <xsl:param name="info"/>
-  <xsl:param name="prefs"/>
-  <xsl:choose>
-    <!-- * if profiling is enabled for source.name, and the -->
-    <!-- * source.name profile is non-empty, use it -->
-    <xsl:when test="not($prefs/@profileEnabled = 0) and
-                    not($prefs/@profile = '')">
-      <xsl:call-template name="evaluate.info.profile">
-        <xsl:with-param name="profile" select="$prefs/@profile"/>
-        <xsl:with-param name="info" select="$info"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <!-- * either profiling for source.name is not enabled, or-->
-      <!-- * the source.name profile is empty; so we need to look -->
-      <!-- * for a name to use -->
-      <xsl:choose>
-        <xsl:when test="refmeta/refmiscinfo[@class = 'source' or @class = 'software']">
-          <xsl:apply-templates 
-              select="refmeta/refmiscinfo[@class = 'source' or @class='software'][1]/node()"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:choose>
-            <xsl:when test="$info/productname">
-              <xsl:call-template name="set.refentry.metadata">
-                <xsl:with-param name="refname" select="$refname"/>
-                <xsl:with-param
-                    name="info"
-                    select="($info[productname])[last()]"/>
-                <xsl:with-param
-                    name="contents"
-                    select="(($info[productname])[last()]/productname)[1]"/>
-                <xsl:with-param name="context">source</xsl:with-param>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:when test="$info/corpname">
-              <xsl:call-template name="set.refentry.metadata">
-                <xsl:with-param name="refname" select="$refname"/>
-                <xsl:with-param
-                    name="info"
-                    select="($info[corpname])[last()]"/>
-                <xsl:with-param
-                    name="contents"
-                    select="(($info[corpname])[last()]/corpname)[1]"/>
-                <xsl:with-param name="context">source</xsl:with-param>
-                <xsl:with-param name="preferred">productname</xsl:with-param>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:when test="$info/corpcredit">
-              <xsl:call-template name="set.refentry.metadata">
-                <xsl:with-param name="refname" select="$refname"/>
-                <xsl:with-param
-                    name="info"
-                    select="($info[corpcredit])[last()]"/>
-                <xsl:with-param
-                    name="contents"
-                    select="(($info[corpcredit])[last()]/corpcredit)[1]"/>
-                <xsl:with-param name="context">source</xsl:with-param>
-                <xsl:with-param name="preferred">productname</xsl:with-param>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:when test="$info/corpauthor">
-              <xsl:call-template name="set.refentry.metadata">
-                <xsl:with-param name="refname" select="$refname"/>
-                <xsl:with-param
-                    name="info"
-                    select="($info[corpauthor])[last()]"/>
-                <xsl:with-param
-                    name="contents"
-                    select="(($info[corpauthor])[last()]/corpauthor)[1]"/>
-                <xsl:with-param name="context">source</xsl:with-param>
-                <xsl:with-param name="preferred">productname</xsl:with-param>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:when test="$info//orgname">
-              <xsl:call-template name="set.refentry.metadata">
-                <xsl:with-param name="refname" select="$refname"/>
-                <xsl:with-param
-                    name="info"
-                    select="($info[//orgname])[last()]"/>
-                <xsl:with-param
-                    name="contents"
-                    select="(($info[//orgname])[last()]//orgname)[1]"/>
-                <xsl:with-param name="context">source</xsl:with-param>
-                <xsl:with-param name="preferred">productname</xsl:with-param>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:when test="$info//publishername">
-              <xsl:call-template name="set.refentry.metadata">
-                <xsl:with-param name="refname" select="$refname"/>
-                <xsl:with-param
-                    name="info"
-                    select="($info[//publishername])[last()]"/>
-                <xsl:with-param
-                    name="contents"
-                    select="(($info[//publishername])[last()]//publishername)[1]"/>
-                <xsl:with-param name="context">source</xsl:with-param>
-                <xsl:with-param name="preferred">productname</xsl:with-param>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:if test="$refentry.meta.get.quietly = 0">
-                <xsl:call-template name="log.message">
-                  <xsl:with-param name="level">Note</xsl:with-param>
-                  <xsl:with-param name="source" select="$refname"/>
-                  <xsl:with-param name="context-desc">meta source</xsl:with-param>
-                  <xsl:with-param name="message">
-                    <xsl:text>no *info/productname or alternative</xsl:text>
-                  </xsl:with-param>
-                </xsl:call-template>
-                <xsl:call-template name="log.message">
-                  <xsl:with-param name="level">Note</xsl:with-param>
-                  <xsl:with-param name="source" select="$refname"/>
-                  <xsl:with-param name="context-desc">meta source</xsl:with-param>
-                  <xsl:with-param name="message">
-                    <xsl:text>see http://docbook.sf.net/el/productname</xsl:text>
-                  </xsl:with-param>
-                </xsl:call-template>
-                <xsl:call-template name="log.message">
-                  <xsl:with-param name="level">Note</xsl:with-param>
-                  <xsl:with-param name="source" select="$refname"/>
-                  <xsl:with-param name="context-desc">meta source</xsl:with-param>
-                  <xsl:with-param name="message">
-                    <xsl:text>no refentry/refmeta/refmiscinfo@class=source</xsl:text>
-                  </xsl:with-param>
-                </xsl:call-template>
-                <xsl:call-template name="log.message">
-                  <xsl:with-param name="level">Note</xsl:with-param>
-                  <xsl:with-param name="source" select="$refname"/>
-                  <xsl:with-param name="context-desc">meta source</xsl:with-param>
-                  <xsl:with-param name="message">
-                    <xsl:text>see http://docbook.sf.net/el/refmiscinfo</xsl:text>
-                  </xsl:with-param>
-                </xsl:call-template>
-              </xsl:if>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-<doc:template name="get.refentry.version" xmlns="">
-  <refpurpose>Gets version metadata for a refentry</refpurpose>
-  <refdescription id="get.refentry.version-desc">
-    <para>A "version" is one part of a (potentially) two-part
-    <replaceable>Name</replaceable>&#160;<replaceable>Version</replaceable>
-    source field. For more details, see the documentation for the
-    <function>get.refentry.source</function> template.</para>
-  </refdescription>
-  <refparameter id="get.refentry.version-params">
-    <variablelist>
-      <varlistentry>
-        <term>refname</term>
-        <listitem>
-          <para>The first <tag>refname</tag> in the refentry</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>info</term>
-        <listitem>
-          <para>A set of info nodes (from a <tag>refentry</tag>
-          element and its ancestors)</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>prefs</term>
-        <listitem>
-          <para>A node containing users preferences (from global
-          stylesheet parameters)</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refreturn id="get.refentry.version-returns">
-    <para>Depending on what output method is used for the
-  current stylesheet, either returns a text node or possibly an element
-  node, containing "version" data.</para>
-  </refreturn>
-</doc:template>
-<xsl:template name="get.refentry.version">
-  <xsl:param name="refname"/>
-  <xsl:param name="info"/>
-  <xsl:param name="prefs"/>
-  <xsl:choose>
-    <!-- * if profiling is enabled for version, and the -->
-    <!-- * version profile is non-empty, use it -->
-    <xsl:when test="not($prefs/@profileEnabled = 0) and
-                    not($prefs/@profile = '')">
-      <xsl:call-template name="evaluate.info.profile">
-        <xsl:with-param name="profile" select="$prefs/@profile"/>
-        <xsl:with-param name="info" select="$info"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <!-- * either profiling for source.name is not enabled, or-->
-      <!-- * the source.name profile is empty; so we need to look -->
-      <!-- * for a name to use -->
-      <xsl:choose>
-        <xsl:when test="refmeta/refmiscinfo[@class = 'version']">
-          <xsl:apply-templates 
-              select="refmeta/refmiscinfo[@class = 'version'][1]/node()"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:choose>
-            <xsl:when test="$info/productnumber">
-              <xsl:call-template name="set.refentry.metadata">
-                <xsl:with-param name="refname" select="$refname"/>
-                <xsl:with-param
-                    name="info"
-                    select="($info[productnumber])[last()]"/>
-                <xsl:with-param
-                    name="contents"
-                    select="(($info[productnumber])[last()]/productnumber)[1]"/>
-                <xsl:with-param name="context">version</xsl:with-param>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:when test="$info/edition">
-              <xsl:call-template name="set.refentry.metadata">
-                <xsl:with-param name="refname" select="$refname"/>
-                <xsl:with-param
-                    name="info"
-                    select="($info[edition])[last()]"/>
-                <xsl:with-param
-                    name="contents"
-                    select="(($info[edition])[last()]/edition)[1]"/>
-                <xsl:with-param name="context">version</xsl:with-param>
-                <xsl:with-param name="preferred">productnumber</xsl:with-param>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:when test="$info/releaseinfo">
-              <xsl:call-template name="set.refentry.metadata">
-                <xsl:with-param name="refname" select="$refname"/>
-                <xsl:with-param
-                    name="info"
-                    select="($info[releaseinfo])[last()]"/>
-                <xsl:with-param
-                    name="contents"
-                    select="(($info[releaseinfo])[last()]/releaseinfo)[1]"/>
-                <xsl:with-param name="context">version</xsl:with-param>
-                <xsl:with-param name="preferred">productnumber</xsl:with-param>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:if test="$refentry.meta.get.quietly = 0">
-                <xsl:call-template name="log.message">
-                  <xsl:with-param name="level">Note</xsl:with-param>
-                  <xsl:with-param name="source" select="$refname"/>
-                  <xsl:with-param name="context-desc">meta version</xsl:with-param>
-                  <xsl:with-param name="message">
-                    <xsl:text>no *info/productnumber or alternative</xsl:text>
-                  </xsl:with-param>
-                </xsl:call-template>
-                <xsl:call-template name="log.message">
-                  <xsl:with-param name="level">Note</xsl:with-param>
-                  <xsl:with-param name="source" select="$refname"/>
-                  <xsl:with-param name="context-desc">meta version</xsl:with-param>
-                  <xsl:with-param name="message">
-                    <xsl:text>see http://docbook.sf.net/el/productnumber</xsl:text>
-                  </xsl:with-param>
-                </xsl:call-template>
-                <xsl:call-template name="log.message">
-                  <xsl:with-param name="level">Note</xsl:with-param>
-                  <xsl:with-param name="source" select="$refname"/>
-                  <xsl:with-param name="context-desc">meta version</xsl:with-param>
-                  <xsl:with-param name="message">
-                    <xsl:text>no refentry/refmeta/refmiscinfo@class=version</xsl:text>
-                  </xsl:with-param>
-                </xsl:call-template>
-                <xsl:call-template name="log.message">
-                  <xsl:with-param name="level">Note</xsl:with-param>
-                  <xsl:with-param name="source" select="$refname"/>
-                  <xsl:with-param name="context-desc">meta version</xsl:with-param>
-                  <xsl:with-param name="message">
-                    <xsl:text>see http://docbook.sf.net/el/refmiscinfo</xsl:text>
-                  </xsl:with-param>
-                </xsl:call-template>
-              </xsl:if>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-<doc:template name="get.refentry.manual" xmlns="">
-  <refpurpose>Gets source metadata for a refentry</refpurpose>
-  <refdescription id="get.refentry.manual-desc">
-    <para>The <literal>man(7)</literal> man page describes this as "the
-    title of the manual (e.g., <citetitle>Linux Programmer's
-    Manual</citetitle>)". Here are some examples from existing man pages:
-    <itemizedlist>
-      <listitem>
-        <para><citetitle>dpkg utilities</citetitle>
-        (<command>dpkg-name</command>)</para>
-      </listitem>
-      <listitem>
-        <para><citetitle>User Contributed Perl Documentation</citetitle>
-        (<command>GET</command>)</para>
-      </listitem>
-      <listitem>
-        <para><citetitle>GNU Development Tools</citetitle>
-        (<command>ld</command>)</para>
-      </listitem>
-      <listitem>
-        <para><citetitle>Emperor Norton Utilities</citetitle>
-        (<command>ddate</command>)</para>
-      </listitem>
-      <listitem>
-        <para><citetitle>Debian GNU/Linux manual</citetitle>
-        (<command>faked</command>)</para>
-      </listitem>
-      <listitem>
-        <para><citetitle>GIMP Manual Pages</citetitle>
-        (<command>gimp</command>)</para>
-      </listitem>
-      <listitem>
-        <para><citetitle>KDOC Documentation System</citetitle>
-        (<command>qt2kdoc</command>)</para>
-      </listitem>
-    </itemizedlist>
-    </para>
-
-    <para>The <literal>solbook(5)</literal> man page describes
-    something very much like what <literal>man(7)</literal> calls
-    "manual", except that <literal>solbook(5)</literal> names it
-    "sectdesc" and describes it like this:
-    <blockquote>
-      <para>This is the section title of the reference page; for
-      example <literal>User Commands</literal>.</para>
-    </blockquote>
-    </para>
-
-  </refdescription>
-  <refparameter id="get.refentry.manual-params">
-    <variablelist>
-      <varlistentry>
-        <term>refname</term>
-        <listitem>
-          <para>The first <tag>refname</tag> in the refentry</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>info</term>
-        <listitem>
-          <para>A set of info nodes (from a <tag>refentry</tag>
-          element and its ancestors)</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>prefs</term>
-        <listitem>
-          <para>A node containing users preferences (from global
-          stylesheet parameters)</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refreturn id="get.refentry.manual-returns">
-    <para>Returns a <tag>manual</tag> node.</para>
-  </refreturn>
-</doc:template>
-<xsl:template name="get.refentry.manual">
-  <xsl:param name="refname"/>
-  <xsl:param name="info"/>
-  <xsl:param name="prefs"/>
-  <xsl:variable name="Manual">
-    <xsl:choose>
-      <!-- * if profiling is enabled for manual, and the manual -->
-      <!-- * profile is non-empty, use it -->
-      <xsl:when test="not($prefs/@profileEnabled = 0) and
-                      not($prefs/@profile = '')">
-        <xsl:call-template name="evaluate.info.profile">
-          <xsl:with-param name="profile" select="$prefs/@profile"/>
-          <xsl:with-param name="info" select="$info"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:choose>
-          <xsl:when test="refmeta/refmiscinfo[@class = 'manual' or @class = 'sectdesc']">
-            <xsl:apply-templates 
-                select="refmeta/refmiscinfo[@class = 'manual' or @class = 'sectdesc'][1]/node()"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <!-- * only in the case of choosing appropriate -->
-            <!-- * "manual" content do we select the furthest -->
-            <!-- * (first) matching element instead of the -->
-            <!-- * closest (last) matching one -->
-            <xsl:choose>
-              <xsl:when test="ancestor::*/title">
-                <xsl:call-template name="set.refentry.metadata">
-                  <xsl:with-param name="refname" select="$refname"/>
-                  <xsl:with-param
-                      name="info"
-                      select="(ancestor::*[title])[1]"/>
-                  <xsl:with-param
-                      name="contents"
-                      select="(ancestor::*[title])[1]/title"/>
-                  <xsl:with-param name="context">manual</xsl:with-param>
-                </xsl:call-template>
-              </xsl:when>
-              <xsl:when test="$info/title">
-                <xsl:call-template name="set.refentry.metadata">
-                  <xsl:with-param name="refname" select="$refname"/>
-                  <xsl:with-param
-                      name="info"
-                      select="($info[title])[1]"/>
-                  <xsl:with-param
-                      name="contents"
-                      select="(($info[title])[1]/title)[1]"/>
-                  <xsl:with-param name="context">manual</xsl:with-param>
-                </xsl:call-template>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:if test="$refentry.meta.get.quietly = 0">
-                  <xsl:call-template name="log.message">
-                    <xsl:with-param name="level">Note</xsl:with-param>
-                    <xsl:with-param name="source" select="$refname"/>
-                    <xsl:with-param name="context-desc">meta manual</xsl:with-param>
-                    <xsl:with-param name="message">
-                      <xsl:text>no titled ancestor of refentry</xsl:text>
-                    </xsl:with-param>
-                  </xsl:call-template>
-                  <xsl:call-template name="log.message">
-                    <xsl:with-param name="level">Note</xsl:with-param>
-                    <xsl:with-param name="source" select="$refname"/>
-                    <xsl:with-param name="context-desc">meta manual</xsl:with-param>
-                    <xsl:with-param name="message">
-                      <xsl:text>no refentry/refmeta/refmiscinfo@class=manual</xsl:text>
-                    </xsl:with-param>
-                  </xsl:call-template>
-                  <xsl:call-template name="log.message">
-                    <xsl:with-param name="level">Note</xsl:with-param>
-                    <xsl:with-param name="source" select="$refname"/>
-                    <xsl:with-param name="context-desc">meta manual</xsl:with-param>
-                    <xsl:with-param name="message">
-                      <xsl:text>see http://docbook.sf.net/el/refmiscinfo</xsl:text>
-                    </xsl:with-param>
-                  </xsl:call-template>
-                </xsl:if>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-  <xsl:choose>
-    <xsl:when test="not($Manual = '')">
-      <xsl:copy-of select="$Manual"/>
-    </xsl:when>
-    <!-- * if no Manual, use contents of specified Fallback (if any) -->
-    <xsl:when test="not($prefs/@fallback = '')">
-      <xsl:variable name="manual.fallback">
-        <xsl:call-template name="evaluate.info.profile">
-          <xsl:with-param name="profile" select="$prefs/@fallback"/>
-          <xsl:with-param name="info" select="$info"/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:choose>
-        <xsl:when test="not($manual.fallback = '')">
-          <xsl:value-of select="$manual.fallback"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:if test="$refentry.meta.get.quietly = 0">
-            <xsl:call-template name="log.message">
-              <xsl:with-param name="level">Warn</xsl:with-param>
-              <xsl:with-param name="source" select="$refname"/>
-              <xsl:with-param name="context-desc">meta manual</xsl:with-param>
-              <xsl:with-param name="message">
-                <xsl:text>no valid fallback for manual; leaving empty</xsl:text>
-              </xsl:with-param>
-            </xsl:call-template>
-          </xsl:if>
-        </xsl:otherwise>
-      </xsl:choose>
-
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:if test="$refentry.meta.get.quietly = 0">
-        <xsl:call-template name="log.message">
-          <xsl:with-param name="level">Warn</xsl:with-param>
-          <xsl:with-param name="source" select="$refname"/>
-          <xsl:with-param name="context-desc">meta manual</xsl:with-param>
-          <xsl:with-param name="message">
-            <xsl:text>no manual fallback specified; leaving empty</xsl:text>
-          </xsl:with-param>
-        </xsl:call-template>
-      </xsl:if>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ====================================================================== -->
-<doc:template name="get.refentry.metadata.prefs" xmlns="">
-  <refpurpose>Gets user preferences for refentry metadata gathering</refpurpose>
-  <refdescription id="get.refentry.metadata.prefs-desc">
-    <para>The DocBook XSL stylesheets include several user-configurable
-    global stylesheet parameters for controlling <tag>refentry</tag>
-    metadata gathering. Those parameters are not read directly by the
-    other <tag>refentry</tag> metadata-gathering
-    templates. Instead, they are read only by the
-    <function>get.refentry.metadata.prefs</function> template,
-    which assembles them into a structure that is then passed to
-    the other <tag>refentry</tag> metadata-gathering
-    templates.</para>
-
-    <para>So the, <function>get.refentry.metadata.prefs</function>
-    template is the only interface to collecting stylesheet parameters for
-    controlling <tag>refentry</tag> metadata gathering.</para>
-  </refdescription>
-  <refparameter id="get.refentry.metadata.prefs-params">
-    <para>There are no local parameters for this template; however, it
-    does rely on a number of global parameters.</para>
-  </refparameter>
-  <refreturn id="get.refentry.metadata.prefs-returns">
-    <para>Returns a <tag>manual</tag> node.</para>
-  </refreturn>
-</doc:template>
-<xsl:template name="get.refentry.metadata.prefs">
-  <DatePrefs>
-    <xsl:attribute name="profile">
-      <xsl:value-of select="$refentry.date.profile"/>
-    </xsl:attribute>
-    <xsl:attribute name="profileEnabled">
-      <xsl:value-of select="$refentry.date.profile.enabled"/>
-    </xsl:attribute>
-  </DatePrefs>
-  <SourcePrefs>
-    <xsl:attribute name="fallback">
-      <xsl:value-of select="$refentry.source.fallback.profile"/>
-    </xsl:attribute>
-    <Name>
-      <xsl:attribute name="profile">
-        <xsl:value-of select="$refentry.source.name.profile"/>
-      </xsl:attribute>
-      <xsl:attribute name="profileEnabled">
-        <xsl:value-of select="$refentry.source.name.profile.enabled"/>
-      </xsl:attribute>
-      <xsl:attribute name="suppress">
-        <xsl:value-of select="$refentry.source.name.suppress"/>
-      </xsl:attribute>
-    </Name>
-    <Version>
-      <xsl:attribute name="profile">
-        <xsl:value-of select="$refentry.version.profile"/>
-      </xsl:attribute>
-      <xsl:attribute name="profileEnabled">
-        <xsl:value-of select="$refentry.version.profile.enabled"/>
-      </xsl:attribute>
-      <xsl:attribute name="suppress">
-        <xsl:value-of select="$refentry.version.suppress"/>
-      </xsl:attribute>
-    </Version>
-  </SourcePrefs>
-  <ManualPrefs>
-    <xsl:attribute name="fallback">
-      <xsl:value-of select="$refentry.manual.fallback.profile"/>
-    </xsl:attribute>
-    <xsl:attribute name="profile">
-      <xsl:value-of select="$refentry.manual.profile"/>
-    </xsl:attribute>
-    <xsl:attribute name="profileEnabled">
-      <xsl:value-of select="$refentry.manual.profile.enabled"/>
-    </xsl:attribute>
-  </ManualPrefs>
-</xsl:template>
-
-<!-- ====================================================================== -->
-<doc:template name="set.refentry.metadata" xmlns="">
-  <refpurpose>Sets content of a refentry metadata item</refpurpose>
-  <refdescription id="set.refentry.metadata-desc">
-    <para>The <function>set.refentry.metadata</function> template is
-    called each time a suitable source element is found for a certain
-    metadata field.</para>
-  </refdescription>
-  <refparameter id="set.refentry.metadata-params">
-    <variablelist>
-      <varlistentry>
-        <term>refname</term>
-        <listitem>
-          <para>The first <tag>refname</tag> in the refentry</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>info</term>
-        <listitem>
-          <para>A single *info node that contains the selected source element.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>contents</term>
-        <listitem>
-          <para>A node containing the selected source element.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>context</term>
-        <listitem>
-          <para>A string describing the metadata context in which the
-          <function>set.refentry.metadata</function> template was
-          called: either "date", "source", "version", or "manual".</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refreturn id="set.refentry.metadata-returns">
-  <para>Returns formatted contents of a selected source element.</para></refreturn>
-</doc:template>
-<xsl:template name="set.refentry.metadata">
-  <xsl:param name="refname"/>
-  <xsl:param name="info"/>
-  <xsl:param name="contents"/>
-  <xsl:param name="context"/>
-  <xsl:param name="preferred"/>
-  <xsl:if test="not($preferred = '')">
-    <xsl:if test="$refentry.meta.get.quietly = 0">
-      <xsl:call-template name="log.message">
-        <xsl:with-param name="level">Note</xsl:with-param>
-        <xsl:with-param name="source" select="$refname"/>
-        <xsl:with-param name="context-desc" select="concat('meta ', $context)"/>
-        <xsl:with-param name="message" select="concat('No ', $preferred)"/>
-      </xsl:call-template>
-      <xsl:call-template name="log.message">
-        <xsl:with-param name="level">Note</xsl:with-param>
-        <xsl:with-param name="source" select="$refname"/>
-        <xsl:with-param name="context-desc" select="concat('meta ', $context)"/>
-        <xsl:with-param name="message">
-          <xsl:text>no refentry/refmeta/refmiscinfo@class=</xsl:text>
-          <xsl:value-of select="$context"/>
-        </xsl:with-param>
-      </xsl:call-template>
-      <xsl:call-template name="log.message">
-        <xsl:with-param name="level">Note</xsl:with-param>
-        <xsl:with-param name="source" select="$refname"/>
-        <xsl:with-param name="context-desc" select="concat('meta ', $context)"/>
-        <xsl:with-param name="message" select="concat('Using ', local-name($contents))"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:if>
-  <xsl:value-of select="$contents"/>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/stripns.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/stripns.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,342 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:ng="http://docbook.org/docbook-ng"
-                xmlns:db="http://docbook.org/ns/docbook"
-                xmlns:saxon="http://icl.com/saxon"
-                xmlns:NodeInfo="http://org.apache.xalan.lib.NodeInfo"
-                xmlns:exsl="http://exslt.org/common"
-                exclude-result-prefixes="db ng exsl saxon NodeInfo"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- put an xml:base attribute on the root element -->
-<xsl:template match="/*" mode="stripNS">
-  <xsl:choose>
-    <xsl:when test="self::ng:* or self::db:*">
-      <xsl:element name="{local-name(.)}">
-        <xsl:copy-of select="@*[not(name(.) = 'xml:id')
-                                and not(name(.) = 'version')]"/>
-        <xsl:if test="@xml:id">
-          <xsl:attribute name="id">
-            <xsl:value-of select="@xml:id"/>
-          </xsl:attribute>
-        </xsl:if>
-
-        <xsl:call-template name="add-xml-base"/>
-
-        <xsl:apply-templates mode="stripNS"/>
-      </xsl:element>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:copy>
-        <xsl:copy-of select="@*[not(name(.) = 'xml:id')
-                                and not(name(.) = 'version')]"/>
-        <xsl:if test="@xml:id">
-          <xsl:attribute name="id">
-            <xsl:value-of select="@xml:id"/>
-          </xsl:attribute>
-        </xsl:if>
-
-        <xsl:call-template name="add-xml-base"/>
-
-        <xsl:apply-templates mode="stripNS"/>
-      </xsl:copy>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="*" mode="stripNS">
-  <xsl:choose>
-    <xsl:when test="self::ng:* or self::db:*">
-      <xsl:element name="{local-name(.)}">
-        <xsl:copy-of select="@*[not(name(.) = 'xml:id')
-                                and not(name(.) = 'version')]"/>
-        <xsl:if test="@xml:id">
-          <xsl:attribute name="id">
-            <xsl:value-of select="@xml:id"/>
-          </xsl:attribute>
-        </xsl:if>
-        <xsl:apply-templates mode="stripNS"/>
-      </xsl:element>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:copy>
-        <xsl:copy-of select="@*[not(name(.) = 'xml:id')
-                                and not(name(.) = 'version')]"/>
-        <xsl:if test="@xml:id">
-          <xsl:attribute name="id">
-            <xsl:value-of select="@xml:id"/>
-          </xsl:attribute>
-        </xsl:if>
-        <xsl:apply-templates mode="stripNS"/>
-      </xsl:copy>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="db:info" mode="stripNS">
-  <xsl:variable name="info">
-    <xsl:choose>
-      <xsl:when test="parent::db:article
-                      |parent::db:appendix
-                      |parent::db:bibliography
-                      |parent::db:book
-                      |parent::db:chapter
-                      |parent::db:glossary
-                      |parent::db:index
-                      |parent::db:part
-                      |parent::db:preface
-                      |parent::db:refentry
-                      |parent::db:reference
-                      |parent::db:refsect1
-                      |parent::db:refsect2
-                      |parent::db:refsect3
-                      |parent::db:refsection
-                      |parent::db:refsynopsisdiv
-                      |parent::db:sect1
-                      |parent::db:sect2
-                      |parent::db:sect3
-                      |parent::db:sect4
-                      |parent::db:sect5
-                      |parent::db:section
-                      |parent::db:setindex
-                      |parent::db:set
-                      |parent::db:slides
-                      |parent::db:sidebar">
-        <xsl:value-of select="local-name(parent::*)"/>
-        <xsl:text>info</xsl:text>
-      </xsl:when>
-      <xsl:when test="parent::db:audioobject
-                      |parent::db:imageobject
-                      |parent::db:inlinemediaobject
-                      |parent::db:mediaobject
-                      |parent::db:mediaobjectco
-                      |parent::db:textobject
-                      |parent::db:videoobject">
-        <xsl:text>objectinfo</xsl:text>
-      </xsl:when>
-      <xsl:otherwise>blockinfo</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:element name="{$info}">
-    <xsl:copy-of select="@*[not(name(.) = 'xml:id')
-                         and not(name(.) = 'version')]"/>
-    <xsl:if test="@xml:id">
-      <xsl:attribute name="id">
-        <xsl:value-of select="@xml:id"/>
-      </xsl:attribute>
-    </xsl:if>
-    <xsl:apply-templates mode="stripNS"/>
-  </xsl:element>
-
-  <xsl:if test="(not(../db:title) and not(../ng:title))
-                and ($info = 'prefaceinfo'
-                     or $info = 'chapterinfo'
-                     or $info = 'sectioninfo'
-                     or $info = 'sect1info'
-                     or $info = 'sect2info'
-                     or $info = 'sect3info'
-                     or $info = 'sect4info'
-                     or $info = 'sect5info'
-                     or $info = 'refsectioninfo'
-                     or $info = 'refsect1info'
-                     or $info = 'refsect2info'
-                     or $info = 'refsect3info'
-                     or $info = 'blockinfo'
-                     or $info = 'appendixinfo')">
-    <xsl:apply-templates select="db:title|ng:title" mode="stripNS"/>
-  </xsl:if>
-
-</xsl:template>
-
-<xsl:template match="ng:link|db:link" mode="stripNS">
-  <xsl:variable xmlns:xlink="http://www.w3.org/1999/xlink"
-                name="href" select="@xlink:href|@href"/>
-  <xsl:choose>
-    <xsl:when test="$href != '' and not(starts-with($href,'#'))">
-      <ulink url="{$href}">
-        <xsl:for-each select="@*">
-          <xsl:if test="local-name(.) != 'href'
-                        and name(.) != 'version'
-                        and name(.) != 'xml:id'">
-            <xsl:copy/>
-          </xsl:if>
-        </xsl:for-each>
-        <xsl:if test="@xml:id">
-          <xsl:attribute name="id">
-            <xsl:value-of select="@xml:id"/>
-          </xsl:attribute>
-        </xsl:if>
-        <xsl:apply-templates mode="stripNS"/>
-      </ulink>
-    </xsl:when>
-    <xsl:when test="$href != '' and starts-with($href,'#')">
-      <link linkend="{substring-after($href,'#')}">
-        <xsl:for-each select="@*">
-          <xsl:if test="local-name(.) != 'href'
-                        and name(.) != 'version'
-                        and name(.) != 'xml:id'">
-            <xsl:copy/>
-          </xsl:if>
-        </xsl:for-each>
-        <xsl:if test="@xml:id">
-          <xsl:attribute name="id">
-            <xsl:value-of select="@xml:id"/>
-          </xsl:attribute>
-        </xsl:if>
-        <xsl:apply-templates mode="stripNS"/>
-      </link>
-    </xsl:when>
-    <xsl:otherwise>
-      <link>
-        <xsl:copy-of select="@*[not(name(.) = 'xml:id')
-                             and not(name(.) = 'version')]"/>
-        <xsl:if test="@xml:id">
-          <xsl:attribute name="id">
-            <xsl:value-of select="@xml:id"/>
-          </xsl:attribute>
-        </xsl:if>
-        <xsl:apply-templates mode="stripNS"/>
-      </link>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="ng:tag|db:tag" mode="stripNS">
-  <sgmltag>
-    <xsl:copy-of select="@*[not(name(.) = 'xml:id')
-                         and not(name(.) = 'version')]"/>
-    <xsl:apply-templates mode="stripNS"/>
-  </sgmltag>
-</xsl:template>
-
-<xsl:template match="ng:textdata|db:textdata
-                     |ng:imagedata|db:imagedata
-                     |ng:videodata|db:videodata
-                     |ng:audiodata|db:audiodata" mode="stripNS">
-  <xsl:element name="{local-name(.)}">
-    <xsl:copy-of select="@*[not(name(.) = 'xml:id')
-                            and not(name(.) = 'version')
-                            and not(name(.) = 'entityref')]"/>
-    <xsl:if test="@xml:id">
-      <xsl:attribute name="id">
-        <xsl:value-of select="@xml:id"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <xsl:choose>
-      <xsl:when test="@entityref">
-        <xsl:attribute name="fileref">
-          <xsl:value-of select="unparsed-entity-uri(@entityref)"/>
-        </xsl:attribute>
-      </xsl:when>
-    </xsl:choose>
-
-    <xsl:apply-templates mode="stripNS"/>
-  </xsl:element>
-</xsl:template>
-
-<xsl:template name="add-xml-base">
-  <xsl:if test="not(@xml:base)">
-    <xsl:variable name="base">
-      <xsl:choose>
-        <xsl:when test="function-available('saxon:systemId')">
-          <xsl:value-of select="saxon:systemId()"/>
-        </xsl:when>
-        <xsl:when test="function-available('NodeInfo:systemId')">
-          <xsl:value-of select="NodeInfo:systemId()"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:message>
-            <xsl:text>WARNING: cannot add @xml:base to node </xsl:text>
-            <xsl:text>set root element.  </xsl:text>
-            <xsl:text>Relative paths may not work.</xsl:text>
-          </xsl:message>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <!-- debug
-    <xsl:message>base is <xsl:value-of select="$base"/></xsl:message>
-    -->
-    <xsl:if test="$base != ''">
-      <xsl:attribute name="xml:base">
-        <xsl:call-template name="systemIdToBaseURI">
-          <xsl:with-param name="systemId">
-            <!-- file: seems to confuse some processors. -->
-            <xsl:choose>
-              <!-- however, windows paths must use file:///c:/path -->
-              <xsl:when test="starts-with($base, 'file:///') and
-                              substring($base, 10, 1) = ':'">
-                <xsl:value-of select="$base"/>
-              </xsl:when>
-              <xsl:when test="starts-with($base, 'file:/')
-                              and substring($base, 8, 1) = ':'">
-                <xsl:value-of select="concat('file:///', 
-                                      substring-after($base,'file:/'))"/>
-              </xsl:when>
-              <xsl:when test="starts-with($base, 'file:///')">
-                <xsl:value-of select="substring-after($base,'file://')"/>
-              </xsl:when>
-              <xsl:when test="starts-with($base, 'file://')">
-                <xsl:value-of select="substring-after($base,'file:/')"/>
-              </xsl:when>
-              <xsl:when test="starts-with($base, 'file:/')">
-                <xsl:value-of select="substring-after($base,'file:')"/>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:value-of select="$base"/>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:with-param>
-        </xsl:call-template>
-      </xsl:attribute>
-    </xsl:if>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="systemIdToBaseURI">
-  <xsl:param name="systemId" select="''"/>
-  <xsl:if test="contains($systemId,'/')">
-    <xsl:value-of select="substring-before($systemId,'/')"/>
-    <xsl:text>/</xsl:text>
-    <xsl:call-template name="systemIdToBaseURI">
-      <xsl:with-param name="systemId"
-                      select="substring-after($systemId,'/')"/>
-    </xsl:call-template>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="comment()|processing-instruction()|text()" mode="stripNS">
-  <xsl:copy/>
-</xsl:template>
-
-<xsl:template match="/" priority="-1">
-  <xsl:choose>
-    <xsl:when test="(function-available('exsl:node-set') or
-                     contains(system-property('xsl:vendor'),
-                       'Apache Software Foundation'))
-                    and (*/self::ng:* or */self::db:*)">
-      <xsl:message>Stripping namespace from DocBook 5 document.</xsl:message>
-      <xsl:variable name="nons">
-        <xsl:apply-templates mode="stripNS"/>
-      </xsl:variable>
-      <xsl:message>Processing stripped document.</xsl:message>
-      <xsl:apply-templates select="exsl:node-set($nons)"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:copy-of select="@* | node()"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/subtitles.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/subtitles.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,155 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"
-                exclude-result-prefixes="doc"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<!-- subtitle markup -->
-
-<doc:mode mode="subtitle.markup" xmlns="">
-<refpurpose>Provides access to element subtitles</refpurpose>
-<refdescription id="subtitle.markup-desc">
-<para>Processing an element in the
-<literal role="mode">subtitle.markup</literal> mode produces the
-subtitle of the element.
-</para>
-</refdescription>
-</doc:mode>
-
-<xsl:template match="*" mode="subtitle.markup">
-  <xsl:message>
-    <xsl:text>Request for subtitle of unexpected element: </xsl:text>
-    <xsl:value-of select="local-name(.)"/>
-  </xsl:message>
-  <xsl:text>???SUBTITLE???</xsl:text>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="subtitle.markup">
-  <xsl:param name="allow-anchors" select="'0'"/>
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="set" mode="subtitle.markup">
-  <xsl:param name="allow-anchors" select="'0'"/>
-  <xsl:apply-templates select="(setinfo/subtitle|info/subtitle|subtitle)[1]"
-                       mode="subtitle.markup">
-    <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="book" mode="subtitle.markup">
-  <xsl:param name="allow-anchors" select="'0'"/>
-  <xsl:apply-templates select="(bookinfo/subtitle|info/subtitle|subtitle)[1]"
-                       mode="subtitle.markup">
-    <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="part" mode="subtitle.markup">
-  <xsl:param name="allow-anchors" select="'0'"/>
-  <xsl:apply-templates select="(partinfo/subtitle
-                                |docinfo/subtitle
-                                |info/subtitle
-                                |subtitle)[1]"
-                       mode="subtitle.markup">
-    <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="preface|chapter|appendix" mode="subtitle.markup">
-  <xsl:param name="allow-anchors" select="'0'"/>
-  <xsl:apply-templates select="(docinfo/subtitle
-                                |info/subtitle
-                                |prefaceinfo/subtitle
-                                |chapterinfo/subtitle
-                                |appendixinfo/subtitle
-                                |subtitle)[1]"
-                       mode="subtitle.markup">
-    <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="article" mode="subtitle.markup">
-  <xsl:param name="allow-anchors" select="'0'"/>
-  <xsl:apply-templates select="(artheader/subtitle
-                                |articleinfo/subtitle
-                                |info/subtitle
-                                |subtitle)[1]"
-                       mode="subtitle.markup">
-    <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="dedication|colophon" mode="subtitle.markup">
-  <xsl:param name="allow-anchors" select="'0'"/>
-  <xsl:apply-templates select="(subtitle|info/subtitle)[1]"
-                       mode="subtitle.markup">
-    <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="reference" mode="subtitle.markup">
-  <xsl:param name="allow-anchors" select="'0'"/>
-  <xsl:apply-templates select="(referenceinfo/subtitle
-                                |docinfo/subtitle
-                                |info/subtitle
-                                |subtitle)[1]"
-                       mode="subtitle.markup">
-    <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="qandaset" mode="subtitle.markup">
-  <xsl:param name="allow-anchors" select="'0'"/>
-  <xsl:apply-templates select="(blockinfo/subtitle|info/subtitle)[1]"
-                       mode="subtitle.markup">
-    <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="refentry" mode="subtitle.markup">
-  <xsl:param name="allow-anchors" select="'0'"/>
-  <xsl:apply-templates select="(refentryinfo/subtitle
-                                |info/subtitle
-                                |docinfo/subtitle)[1]"
-                       mode="subtitle.markup">
-    <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="section
-                     |sect1|sect2|sect3|sect4|sect5
-                     |refsect1|refsect2|refsect3
-                     |simplesect"
-              mode="subtitle.markup">
-  <xsl:param name="allow-anchors" select="'0'"/>
-  <xsl:apply-templates select="(info/subtitle
-                                |sectioninfo/subtitle
-                                |sect1info/subtitle
-                                |sect2info/subtitle
-                                |sect3info/subtitle
-                                |sect4info/subtitle
-                                |sect5info/subtitle
-                                |refsect1info/subtitle
-                                |refsect2info/subtitle
-                                |refsect3info/subtitle
-                                |subtitle)[1]"
-                       mode="subtitle.markup">
-    <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-</xsl:stylesheet>
-
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/table.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/table.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,514 +1,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"
-                exclude-result-prefixes="doc"
-                version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:template name="blank.spans">
-  <xsl:param name="cols" select="1"/>
-  <xsl:if test="$cols &gt; 0">
-    <xsl:text>0:</xsl:text>
-    <xsl:call-template name="blank.spans">
-      <xsl:with-param name="cols" select="$cols - 1"/>
-    </xsl:call-template>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="calculate.following.spans">
-  <xsl:param name="colspan" select="1"/>
-  <xsl:param name="spans" select="''"/>
-
-  <xsl:choose>
-    <xsl:when test="$colspan &gt; 0">
-      <xsl:call-template name="calculate.following.spans">
-        <xsl:with-param name="colspan" select="$colspan - 1"/>
-        <xsl:with-param name="spans" select="substring-after($spans,':')"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$spans"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="finaltd">
-  <xsl:param name="spans"/>
-  <xsl:param name="col" select="0"/>
-
-  <xsl:if test="$spans != ''">
-    <xsl:choose>
-      <xsl:when test="starts-with($spans,'0:')">
-        <xsl:call-template name="empty.table.cell">
-          <xsl:with-param name="colnum" select="$col"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise></xsl:otherwise>
-    </xsl:choose>
-
-    <xsl:call-template name="finaltd">
-      <xsl:with-param name="spans" select="substring-after($spans,':')"/>
-      <xsl:with-param name="col" select="$col+1"/>
-    </xsl:call-template>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="sfinaltd">
-  <xsl:param name="spans"/>
-
-  <xsl:if test="$spans != ''">
-    <xsl:choose>
-      <xsl:when test="starts-with($spans,'0:')">0:</xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="substring-before($spans,':')-1"/>
-        <xsl:text>:</xsl:text>
-      </xsl:otherwise>
-    </xsl:choose>
-
-    <xsl:call-template name="sfinaltd">
-      <xsl:with-param name="spans" select="substring-after($spans,':')"/>
-    </xsl:call-template>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="entry.colnum">
-  <xsl:param name="entry" select="."/>
-
-  <xsl:choose>
-    <xsl:when test="$entry/@spanname">
-      <xsl:variable name="spanname" select="$entry/@spanname"/>
-      <xsl:variable name="spanspec"
-                    select="($entry/ancestor::tgroup/spanspec[@spanname=$spanname]
-                             |$entry/ancestor::entrytbl/spanspec[@spanname=$spanname])[last()]"/>
-      <xsl:variable name="colspec"
-                    select="($entry/ancestor::tgroup/colspec[@colname=$spanspec/@namest]
-                             |$entry/ancestor::entrytbl/colspec[@colname=$spanspec/@namest])[last()]"/>
-      <xsl:call-template name="colspec.colnum">
-        <xsl:with-param name="colspec" select="$colspec"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="$entry/@colname">
-      <xsl:variable name="colname" select="$entry/@colname"/>
-      <xsl:variable name="colspec"
-                    select="($entry/ancestor::tgroup/colspec[@colname=$colname]
-                             |$entry/ancestor::entrytbl/colspec[@colname=$colname])[last()]"/>
-      <xsl:call-template name="colspec.colnum">
-        <xsl:with-param name="colspec" select="$colspec"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="$entry/@namest">
-      <xsl:variable name="namest" select="$entry/@namest"/>
-      <xsl:variable name="colspec"
-                    select="($entry/ancestor::tgroup/colspec[@colname=$namest]
-                             |$entry/ancestor::entrytbl/colspec[@colname=$namest])[last()]"/>
-      <xsl:call-template name="colspec.colnum">
-        <xsl:with-param name="colspec" select="$colspec"/>
-      </xsl:call-template>
-    </xsl:when>
-    <!-- no idea, return 0 -->
-    <xsl:otherwise>0</xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<doc:template name="entry.colnum" xmlns="">
-<refpurpose>Determine the column number in which a given entry occurs</refpurpose>
-<refdescription id="entry.colnum-desc">
-<para>If an <tag>entry</tag> has a
-<tag class="attribute">colname</tag> or
-<tag class="attribute">namest</tag> attribute, this template
-will determine the number of the column in which the entry should occur.
-For other <tag>entry</tag>s, nothing is returned.</para>
-</refdescription>
-<refparameter id="entry.colnum-params">
-<variablelist>
-<varlistentry><term>entry</term>
-<listitem>
-<para>The <tag>entry</tag>-element which is to be tested.</para>
-</listitem>
-</varlistentry>
-</variablelist>
-</refparameter>
-
-<refreturn id="entry.colnum-returns">
-<para>This template returns the column number if it can be determined,
-or 0 (the empty string)</para>
-</refreturn>
-</doc:template>
-
-<xsl:template name="colspec.colnum">
-  <xsl:param name="colspec" select="."/>
-  <xsl:choose>
-    <xsl:when test="$colspec/@colnum">
-      <xsl:value-of select="$colspec/@colnum"/>
-    </xsl:when>
-    <xsl:when test="$colspec/preceding-sibling::colspec">
-      <xsl:variable name="prec.colspec.colnum">
-        <xsl:call-template name="colspec.colnum">
-          <xsl:with-param name="colspec"
-                          select="$colspec/preceding-sibling::colspec[1]"/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:value-of select="$prec.colspec.colnum + 1"/>
-    </xsl:when>
-    <xsl:otherwise>1</xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="calculate.colspan">
-  <xsl:param name="entry" select="."/>
-  <xsl:variable name="spanname" select="$entry/@spanname"/>
-  <xsl:variable name="spanspec"
-                select="($entry/ancestor::tgroup/spanspec[@spanname=$spanname]
-                         |$entry/ancestor::entrytbl/spanspec[@spanname=$spanname])[last()]"/>
-
-  <xsl:variable name="namest">
-    <xsl:choose>
-      <xsl:when test="@spanname">
-        <xsl:value-of select="$spanspec/@namest"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$entry/@namest"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="nameend">
-    <xsl:choose>
-      <xsl:when test="@spanname">
-        <xsl:value-of select="$spanspec/@nameend"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$entry/@nameend"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="scol">
-    <xsl:call-template name="colspec.colnum">
-      <xsl:with-param name="colspec"
-                      select="($entry/ancestor::tgroup/colspec[@colname=$namest]
-                               |$entry/ancestor::entrytbl/colspec[@colname=$namest])[last()]"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="ecol">
-    <xsl:call-template name="colspec.colnum">
-      <xsl:with-param name="colspec"
-                      select="($entry/ancestor::tgroup/colspec[@colname=$nameend]
-                               |$entry/ancestor::entrytbl/colspec[@colname=$nameend])[last()]"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$namest != '' and $nameend != ''">
-      <xsl:choose>
-        <xsl:when test="number($ecol) &gt;= number($scol)">
-          <xsl:value-of select="number($ecol) - number($scol) + 1"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="number($scol) - number($ecol) + 1"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>1</xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="calculate.rowsep">
-  <xsl:param name="entry" select="."/>
-  <xsl:param name="colnum" select="0"/>
-
-  <xsl:call-template name="inherited.table.attribute">
-    <xsl:with-param name="entry" select="$entry"/>
-    <xsl:with-param name="colnum" select="$colnum"/>
-    <xsl:with-param name="attribute" select="'rowsep'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="calculate.colsep">
-  <xsl:param name="entry" select="."/>
-  <xsl:param name="colnum" select="0"/>
-
-  <xsl:call-template name="inherited.table.attribute">
-    <xsl:with-param name="entry" select="$entry"/>
-    <xsl:with-param name="colnum" select="$colnum"/>
-    <xsl:with-param name="attribute" select="'colsep'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="inherited.table.attribute">
-  <xsl:param name="entry" select="."/>
-  <xsl:param name="row" select="$entry/ancestor-or-self::row[1]"/>
-  <xsl:param name="colnum" select="0"/>
-  <xsl:param name="attribute" select="'colsep'"/>
-
-  <xsl:variable name="tgroup" select="$row/parent::*/parent::tgroup[1]"/>
-  <xsl:variable name="tbody" select="$row/parent::*[1]"/>
-
-  <xsl:variable name="table" select="($tgroup/ancestor::table
-                                     |$tgroup/ancestor::informaltable
-				     |$entry/ancestor::entrytbl)[last()]"/>
-
-  <xsl:variable name="entry.value">
-    <xsl:call-template name="get-attribute">
-      <xsl:with-param name="element" select="$entry"/>
-      <xsl:with-param name="attribute" select="$attribute"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="row.value">
-    <xsl:call-template name="get-attribute">
-      <xsl:with-param name="element" select="$row"/>
-      <xsl:with-param name="attribute" select="$attribute"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="span.value">
-    <xsl:if test="$entry/@spanname">
-      <xsl:variable name="spanname" select="$entry/@spanname"/>
-      <xsl:variable name="spanspec"
-                    select="$tgroup/spanspec[@spanname=$spanname]"/>
-      <xsl:variable name="span.colspec"
-                    select="$tgroup/colspec[@colname=$spanspec/@namest]"/>
-
-      <xsl:variable name="spanspec.value">
-        <xsl:call-template name="get-attribute">
-          <xsl:with-param name="element" select="$spanspec"/>
-          <xsl:with-param name="attribute" select="$attribute"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <xsl:variable name="scolspec.value">
-        <xsl:call-template name="get-attribute">
-          <xsl:with-param name="element" select="$span.colspec"/>
-          <xsl:with-param name="attribute" select="$attribute"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <xsl:choose>
-        <xsl:when test="$spanspec.value != ''">
-          <xsl:value-of select="$spanspec.value"/>
-        </xsl:when>
-        <xsl:when test="$scolspec.value != ''">
-          <xsl:value-of select="$scolspec.value"/>
-        </xsl:when>
-        <xsl:otherwise></xsl:otherwise>
-      </xsl:choose>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:variable name="namest.value">
-    <xsl:if test="$entry/@namest">
-      <xsl:variable name="namest" select="$entry/@namest"/>
-      <xsl:variable name="colspec"
-                    select="$tgroup/colspec[@colname=$namest]"/>
-
-      <xsl:variable name="inner.namest.value">
-        <xsl:call-template name="get-attribute">
-          <xsl:with-param name="element" select="$colspec"/>
-          <xsl:with-param name="attribute" select="$attribute"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <xsl:choose>
-        <xsl:when test="$inner.namest.value">
-          <xsl:value-of select="$inner.namest.value"/>
-        </xsl:when>
-        <xsl:otherwise></xsl:otherwise>
-      </xsl:choose>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:variable name="tgroup.value">
-    <xsl:call-template name="get-attribute">
-      <xsl:with-param name="element" select="$tgroup"/>
-      <xsl:with-param name="attribute" select="$attribute"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="tbody.value">
-    <xsl:call-template name="get-attribute">
-      <xsl:with-param name="element" select="$tbody"/>
-      <xsl:with-param name="attribute" select="$attribute"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="table.value">
-    <xsl:call-template name="get-attribute">
-      <xsl:with-param name="element" select="$table"/>
-      <xsl:with-param name="attribute" select="$attribute"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="default.value">
-    <!-- This section used to say that rowsep and colsep have defaults based -->
-    <!-- on the frame setting. Further reflection and closer examination of the -->
-    <!-- CALS spec reveals I was mistaken. The default is "1" for rowsep and colsep. -->
-    <!-- For everything else, the default is the tgroup value -->
-    <xsl:choose>
-      <xsl:when test="$tgroup.value != ''">
-        <xsl:value-of select="$tgroup.value"/>
-      </xsl:when>
-      <xsl:when test="$attribute = 'rowsep'">1</xsl:when>
-      <xsl:when test="$attribute = 'colsep'">1</xsl:when>
-      <xsl:otherwise><!-- empty --></xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="calc.colvalue">
-    <xsl:if test="$colnum &gt; 0">
-      <xsl:call-template name="colnum.colspec">
-        <xsl:with-param name="colnum" select="$colnum"/>
-        <xsl:with-param name="attribute" select="$attribute"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$entry.value != ''">
-      <xsl:value-of select="$entry.value"/>
-    </xsl:when>
-    <xsl:when test="$row.value != ''">
-      <xsl:value-of select="$row.value"/>
-    </xsl:when>
-    <xsl:when test="$span.value != ''">
-      <xsl:value-of select="$span.value"/>
-    </xsl:when>
-    <xsl:when test="$namest.value != ''">
-      <xsl:value-of select="$namest.value"/>
-    </xsl:when>
-    <xsl:when test="$calc.colvalue != ''">
-      <xsl:value-of select="$calc.colvalue"/>
-    </xsl:when>
-    <xsl:when test="$tbody.value != ''">
-      <xsl:value-of select="$tbody.value"/>
-    </xsl:when>
-    <xsl:when test="$tgroup.value != ''">
-      <xsl:value-of select="$tgroup.value"/>
-    </xsl:when>
-    <xsl:when test="$table.value != ''">
-      <xsl:value-of select="$table.value"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$default.value"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="colnum.colspec">
-  <xsl:param name="colnum" select="0"/>
-  <xsl:param name="attribute" select="'colname'"/>
-  <xsl:param name="colspec.ancestor" 
-             select="(ancestor::tgroup|ancestor::entrytbl)
-	             [position() = last()]"/>
-  <xsl:param name="colspecs" select="$colspec.ancestor/colspec"/>
-  <xsl:param name="count" select="1"/>
-
-  <xsl:choose>
-    <xsl:when test="not($colspecs) or $count &gt; $colnum">
-      <!-- nop -->
-    </xsl:when>
-    <xsl:when test="$colspecs[1]/@colnum">
-      <xsl:choose>
-        <xsl:when test="$colspecs[1]/@colnum = $colnum">
-          <xsl:call-template name="get-attribute">
-            <xsl:with-param name="element" select="$colspecs[1]"/>
-            <xsl:with-param name="attribute" select="$attribute"/>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="colnum.colspec">
-            <xsl:with-param name="colnum" select="$colnum"/>
-            <xsl:with-param name="attribute" select="$attribute"/>
-            <xsl:with-param name="colspecs"
-                            select="$colspecs[position()&gt;1]"/>
-            <xsl:with-param name="count"
-                            select="$colspecs[1]/@colnum+1"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:choose>
-        <xsl:when test="$count = $colnum">
-          <xsl:call-template name="get-attribute">
-            <xsl:with-param name="element" select="$colspecs[1]"/>
-            <xsl:with-param name="attribute" select="$attribute"/>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="colnum.colspec">
-            <xsl:with-param name="colnum" select="$colnum"/>
-            <xsl:with-param name="attribute" select="$attribute"/>
-            <xsl:with-param name="colspecs"
-                            select="$colspecs[position()&gt;1]"/>
-            <xsl:with-param name="count" select="$count+1"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="get-attribute">
-  <xsl:param name="element" select="."/>
-  <xsl:param name="attribute" select="''"/>
-
-  <xsl:for-each select="$element/@*">
-    <xsl:if test="local-name(.) = $attribute">
-      <xsl:value-of select="."/>
-    </xsl:if>
-  </xsl:for-each>
-</xsl:template>
-
-<xsl:template name="consume-row">
-  <xsl:param name="spans"/>
-
-  <xsl:if test="contains($spans,':')">
-    <xsl:value-of select="substring-before($spans,':') - 1"/>
-    <xsl:text>:</xsl:text>
-    <xsl:call-template name="consume-row">
-      <xsl:with-param name="spans" select="substring-after($spans,':')"/>
-    </xsl:call-template>
-  </xsl:if>
-</xsl:template>
-
-<!-- Returns the table style for the context element -->
-<xsl:template name="tabstyle">
-  <xsl:param name="node" select="."/>
-
-  <xsl:variable name="tgroup" select="$node/tgroup[1] | 
-                                      $node/ancestor-or-self::tgroup[1]"/>
-
-  <xsl:variable name="table" 
-                select="($node/ancestor-or-self::table | 
-                         $node/ancestor-or-self::informaltable)[1]"/>
-
-  <xsl:variable name="tabstyle">
-    <xsl:choose>
-      <xsl:when test="$table/@tabstyle != ''">
-        <xsl:value-of select="normalize-space($table/@tabstyle)"/>
-      </xsl:when>
-      <xsl:when test="$tgroup/@tgroupstyle != ''">
-        <xsl:value-of select="normalize-space($tgroup/@tgroupstyle)"/>
-      </xsl:when>
-      <xsl:otherwise>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:value-of select="$tabstyle"/>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/targetdatabase.dtd
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/targetdatabase.dtd	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,49 +1,0 @@
-<!-- targetdatabase.dtd -->
-<!-- A DTD for managing cross reference target information -->
-
-<!ELEMENT targetset (targetsetinfo?, sitemap*, document*) >
-
-<!ELEMENT targetsetinfo ANY >
-
-<!ELEMENT sitemap (dir) >
-
-<!ELEMENT dir ((dir|document)*) >
-<!ATTLIST dir
-        name      CDATA   #REQUIRED
->
-
-<!ELEMENT document (div*) >
-<!ATTLIST document
-        targetdoc CDATA   #REQUIRED
-        uri       CDATA   #IMPLIED
-        baseuri   CDATA   #IMPLIED
-        href      CDATA   #IMPLIED
-        dir       CDATA   #IMPLIED
->
-
-<!ELEMENT div (ttl?, objttl?, xreftext?, (div|obj)*)>
-<!ATTLIST div
-        targetptr  CDATA   #IMPLIED
-        element   CDATA   #IMPLIED
-        name      CDATA   #IMPLIED
-        number    CDATA   #IMPLIED
-        href      CDATA   #IMPLIED
-        lang      CDATA   #IMPLIED
-        page      CDATA   #IMPLIED
->
-        
-        
-<!ELEMENT ttl ANY >
-<!ELEMENT objttl ANY >
-<!ELEMENT xreftext ANY >
-
-<!ELEMENT obj (ttl?, objttl?, xreftext?)>
-<!ATTLIST obj
-        targetptr  CDATA   #IMPLIED
-        element   CDATA   #IMPLIED
-        name      CDATA   #IMPLIED
-        number    CDATA   #IMPLIED
-        href      CDATA   #IMPLIED
-        lang      CDATA   #IMPLIED
-        page      CDATA   #IMPLIED
->
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/targets.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/targets.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,272 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"
-                exclude-result-prefixes="doc"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<!-- cross reference target collection  -->
-
-<doc:mode mode="collect.targets" xmlns="">
-<refpurpose>Collects information for potential cross reference targets</refpurpose>
-<refdescription id="collect.targets-desc">
-<para>Processing the root element in the
-<literal role="mode">collect.targets</literal> mode produces 
-a set of target database elements that can be used by
-the olink mechanism to resolve external cross references.
-The collection process is controlled by the <literal>
-collect.xref.targets</literal> parameter, which can be
-<literal>yes</literal> to collect targets and process
-the document for output, <literal>only</literal> to
-only collect the targets, and <literal>no</literal>
-(default) to not collect the targets and only process the document.
-</para>
-<para>
-A <literal>targets.filename</literal> parameter must be
-specified to receive the output if 
-<literal>collect.xref.targets</literal> is
-set to <literal>yes</literal> so as to
-redirect the target data to a file separate from the
-document output.
-</para>
-</refdescription>
-</doc:mode>
-
-<!-- ============================================================ -->
-
-<xsl:template match="*" mode="collect.targets">
-  <xsl:choose>
-    <xsl:when test="$collect.xref.targets = 'yes' and $targets.filename = ''">
-      <xsl:message>
-        Must specify a $targets.filename parameter when
-        $collect.xref.targets is set to 'yes'.
-        The xref targets were not collected.
-      </xsl:message>
-    </xsl:when> 
-    <xsl:otherwise>
-      <xsl:choose>
-        <xsl:when test="$targets.filename">
-          <xsl:call-template name="write.chunk">
-            <xsl:with-param name="filename" select="$targets.filename"/>
-            <xsl:with-param name="method" select="'xml'"/>
-            <xsl:with-param name="encoding" select="'utf-8'"/>
-            <xsl:with-param name="omit-xml-declaration" select="'yes'"/>
-            <xsl:with-param name="doctype-public" select="''"/>
-            <xsl:with-param name="doctype-system" select="''"/>
-            <xsl:with-param name="indent" select="'no'"/>
-            <xsl:with-param name="quiet" select="0"/>
-            <xsl:with-param name="content">
-              <xsl:apply-templates select="." mode="olink.mode"/>
-            </xsl:with-param>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-          <!-- Else write to standard output -->
-          <xsl:apply-templates select="." mode="olink.mode"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="olink.href.target">
-  <xsl:param name="nd" select="."/>
-
-  <xsl:value-of select="$olink.base.uri"/>
-  <xsl:call-template name="href.target">
-    <xsl:with-param name="object" select="$nd"/>
-    <xsl:with-param name="context" select="NOTANODE"/>
-  </xsl:call-template>
-</xsl:template>
-
-<!-- Templates for extracting cross reference information
-     from a document for use in an xref database.
--->
-
-<xsl:template name="attrs">
-  <xsl:param name="nd" select="."/>
-
-  <xsl:attribute name="element">
-    <xsl:value-of select="local-name(.)"/>
-  </xsl:attribute>
-
-  <xsl:attribute name="href">
-    <xsl:call-template name="olink.href.target">
-      <xsl:with-param name="nd" select="$nd"/>
-    </xsl:call-template>
-  </xsl:attribute>
-
-  <xsl:variable name="num">
-    <xsl:apply-templates select="$nd" mode="label.markup">
-      <xsl:with-param name="verbose" select="0"/>
-    </xsl:apply-templates>
-  </xsl:variable>
-
-  <xsl:if test="$num">
-    <xsl:attribute name="number">
-      <xsl:value-of select="$num"/>
-    </xsl:attribute>
-  </xsl:if>
-
-  <xsl:choose>
-    <xsl:when test="$nd/@id">
-      <xsl:attribute name="targetptr">
-        <xsl:value-of select="$nd/@id"/>
-      </xsl:attribute>
-    </xsl:when>
-    <xsl:when test="$nd/@xml:id">
-      <xsl:attribute name="targetptr">
-        <xsl:value-of select="$nd/@xml:id"/>
-      </xsl:attribute>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:if test="$nd/@lang">
-    <xsl:attribute name="lang">
-      <xsl:value-of select="$nd/@lang"/>
-    </xsl:attribute>
-  </xsl:if>
-
-</xsl:template>
-
-<xsl:template name="div">
-  <xsl:param name="nd" select="."/>
-
-  <div>
-    <xsl:call-template name="attrs">
-      <xsl:with-param name="nd" select="$nd"/>
-    </xsl:call-template>
-    <ttl>
-      <xsl:apply-templates select="$nd" mode="title.markup">
-        <xsl:with-param name="verbose" select="0"/>
-      </xsl:apply-templates>
-    </ttl>
-    <xreftext>
-      <xsl:choose>
-        <xsl:when test="$nd/@xreflabel">
-          <xsl:call-template name="xref.xreflabel">
-            <xsl:with-param name="target" select="$nd"/>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates select="$nd" mode="xref-to">
-            <xsl:with-param name="verbose" select="0"/>
-          </xsl:apply-templates>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xreftext>
-    <xsl:apply-templates mode="olink.mode"/>
-  </div>
-</xsl:template>
-
-<xsl:template name="obj">
-  <xsl:param name="nd" select="."/>
-
-  <obj>
-    <xsl:call-template name="attrs">
-      <xsl:with-param name="nd" select="$nd"/>
-    </xsl:call-template>
-    <ttl>
-      <xsl:apply-templates select="$nd" mode="title.markup">
-        <xsl:with-param name="verbose" select="0"/>
-      </xsl:apply-templates>
-    </ttl>
-    <xreftext>
-      <xsl:choose>
-        <xsl:when test="$nd/@xreflabel">
-          <xsl:call-template name="xref.xreflabel">
-            <xsl:with-param name="target" select="$nd"/>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates select="$nd" mode="xref-to">
-            <xsl:with-param name="verbose" select="0"/>
-          </xsl:apply-templates>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xreftext>
-  </obj>
-</xsl:template>
-
-<xsl:template match="text()|processing-instruction()|comment()"
-              mode="olink.mode">
-  <!-- nop -->
-</xsl:template>
-
-<!--
-<xsl:template match="*" mode="olink.mode">
-</xsl:template>
--->
-
-<xsl:template match="set" mode="olink.mode">
-  <xsl:call-template name="div"/>
-</xsl:template>
-
-<xsl:template match="book" mode="olink.mode">
-  <xsl:call-template name="div"/>
-</xsl:template>
-
-<xsl:template match="preface|chapter|appendix" mode="olink.mode">
-  <xsl:call-template name="div"/>
-</xsl:template>
-
-<xsl:template match="part|reference" mode="olink.mode">
-  <xsl:call-template name="div"/>
-</xsl:template>
-
-<xsl:template match="article" mode="olink.mode">
-  <xsl:call-template name="div"/>
-</xsl:template>
-
-<xsl:template match="bibliography|bibliodiv" mode="olink.mode">
-  <xsl:call-template name="div"/>
-</xsl:template>
-
-<xsl:template match="biblioentry|bibliomixed" mode="olink.mode">
-  <xsl:call-template name="obj"/>
-</xsl:template>
-
-<xsl:template match="refentry" mode="olink.mode">
-  <xsl:call-template name="div"/>
-</xsl:template>
-
-<xsl:template match="section|sect1|sect2|sect3|sect4|sect5" mode="olink.mode">
-  <xsl:call-template name="div"/>
-</xsl:template>
-
-<xsl:template match="refsection|refsect1|refsect2|refsect3" mode="olink.mode">
-  <xsl:call-template name="div"/>
-</xsl:template>
-
-<xsl:template match="figure|example|table" mode="olink.mode">
-  <xsl:call-template name="obj"/>
-  <xsl:apply-templates mode="olink.mode"/>
-</xsl:template>
-
-<xsl:template match="equation[title or info/title]" mode="olink.mode">
-  <xsl:call-template name="obj"/>
-</xsl:template>
-
-<xsl:template match="qandaset|qandaentry" mode="olink.mode">
-  <xsl:call-template name="div"/>
-</xsl:template>
-
-<xsl:template match="*" mode="olink.mode">
-  <xsl:if test="@id or @xml:id">
-    <xsl:call-template name="obj"/>
-  </xsl:if> 
-  <xsl:apply-templates mode="olink.mode"/>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/titles.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/titles.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,740 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"
-                exclude-result-prefixes="doc"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<!-- title markup -->
-
-<doc:mode mode="title.markup" xmlns="">
-<refpurpose>Provides access to element titles</refpurpose>
-<refdescription id="title.markup-desc">
-<para>Processing an element in the
-<literal role="mode">title.markup</literal> mode produces the
-title of the element. This does not include the label.
-</para>
-</refdescription>
-</doc:mode>
-
-<xsl:template match="*" mode="title.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-  <xsl:param name="verbose" select="1"/>
-  <xsl:choose>
-    <!-- * FIXME: this should handle other *info elements as well -->
-    <!-- * but this is good enough for now. -->
-    <xsl:when test="title|info/title">
-      <xsl:apply-templates select="title[1]|info/title[1]" mode="title.markup">
-        <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:when test="local-name(.) = 'partintro'">
-      <!-- partintro's don't have titles, use the parent (part or reference)
-           title instead. -->
-      <xsl:apply-templates select="parent::*" mode="title.markup"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:if test="$verbose != 0">
-        <xsl:message>
-          <xsl:text>Request for title of element with no title: </xsl:text>
-          <xsl:value-of select="local-name(.)"/>
-          <xsl:choose>
-            <xsl:when test="@id">
-              <xsl:text> (id="</xsl:text>
-              <xsl:value-of select="@id"/>
-              <xsl:text>")</xsl:text>
-            </xsl:when>
-            <xsl:when test="@xml:id">
-              <xsl:text> (xml:id="</xsl:text>
-              <xsl:value-of select="@xml:id"/>
-              <xsl:text>")</xsl:text>
-            </xsl:when>
-          </xsl:choose>
-        </xsl:message>
-      </xsl:if>
-      <xsl:text>???TITLE???</xsl:text>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="title" mode="title.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-
-  <xsl:choose>
-    <xsl:when test="$allow-anchors != 0">
-      <xsl:apply-templates/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates mode="no.anchor.mode"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- only occurs in HTML Tables! -->
-<xsl:template match="caption" mode="title.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-
-  <xsl:choose>
-    <xsl:when test="$allow-anchors != 0">
-      <xsl:apply-templates/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates mode="no.anchor.mode"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="set" mode="title.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-  <xsl:apply-templates select="(setinfo/title|info/title|title)[1]"
-                       mode="title.markup">
-    <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="book" mode="title.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-  <xsl:apply-templates select="(bookinfo/title|info/title|title)[1]"
-                       mode="title.markup">
-    <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="part" mode="title.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-  <xsl:apply-templates select="(partinfo/title|info/title|docinfo/title|title)[1]"
-                       mode="title.markup">
-    <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="preface|chapter|appendix" mode="title.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-
-<!--
-  <xsl:message>
-    <xsl:value-of select="local-name(.)"/>
-    <xsl:text> </xsl:text>
-    <xsl:value-of select="$allow-anchors"/>
-  </xsl:message>
--->
-
-  <xsl:variable name="title" select="(docinfo/title
-                                      |info/title
-                                      |prefaceinfo/title
-                                      |chapterinfo/title
-                                      |appendixinfo/title
-                                      |title)[1]"/>
-  <xsl:apply-templates select="$title" mode="title.markup">
-    <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="dedication" mode="title.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-  <xsl:choose>
-    <xsl:when test="title">
-      <xsl:apply-templates select="(title|info/title)[1]" mode="title.markup">
-        <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'Dedication'"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="colophon" mode="title.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-  <xsl:choose>
-    <xsl:when test="title">
-      <xsl:apply-templates select="(title|info/title)[1]" mode="title.markup">
-        <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'Colophon'"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="article" mode="title.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-  <xsl:variable name="title" select="(artheader/title
-                                      |articleinfo/title
-                                      |info/title
-                                      |title)[1]"/>
-
-  <xsl:apply-templates select="$title" mode="title.markup">
-    <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="reference" mode="title.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-  <xsl:apply-templates select="(referenceinfo/title|docinfo/title|info/title|title)[1]"
-                       mode="title.markup">
-    <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="refentry" mode="title.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-  <xsl:variable name="refmeta" select=".//refmeta"/>
-  <xsl:variable name="refentrytitle" select="$refmeta//refentrytitle"/>
-  <xsl:variable name="refnamediv" select=".//refnamediv"/>
-  <xsl:variable name="refname" select="$refnamediv//refname"/>
-  <xsl:variable name="refdesc" select="$refnamediv//refdescriptor"/>
-
-  <xsl:variable name="title">
-    <xsl:choose>
-      <xsl:when test="$refentrytitle">
-        <xsl:apply-templates select="$refentrytitle[1]" mode="title.markup"/>
-      </xsl:when>
-      <xsl:when test="$refdesc">
-        <xsl:apply-templates select="$refdesc" mode="title.markup"/>
-      </xsl:when>
-      <xsl:when test="$refname">
-        <xsl:apply-templates select="$refname[1]" mode="title.markup"/>
-      </xsl:when>
-      <xsl:otherwise>REFENTRY WITHOUT TITLE???</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:copy-of select="$title"/>
-</xsl:template>
-
-<xsl:template match="refentrytitle|refname|refdescriptor" mode="title.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-  <xsl:choose>
-    <xsl:when test="$allow-anchors != 0">
-      <xsl:apply-templates/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates mode="no.anchor.mode"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="section
-                     |sect1|sect2|sect3|sect4|sect5
-                     |refsect1|refsect2|refsect3|refsection
-                     |simplesect"
-              mode="title.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-  <xsl:variable name="title" select="(info/title
-                                      |sectioninfo/title
-                                      |sect1info/title
-                                      |sect2info/title
-                                      |sect3info/title
-                                      |sect4info/title
-                                      |sect5info/title
-                                      |refsect1info/title
-                                      |refsect2info/title
-                                      |refsect3info/title
-                                      |refsectioninfo/title
-                                      |title)[1]"/>
-
-  <xsl:apply-templates select="$title" mode="title.markup">
-    <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="bridgehead" mode="title.markup">
-  <xsl:apply-templates mode="title.markup"/>
-</xsl:template>
-
-<xsl:template match="refsynopsisdiv" mode="title.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-  <xsl:choose>
-    <xsl:when test="title">
-      <xsl:apply-templates select="title" mode="title.markup">
-        <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'RefSynopsisDiv'"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="bibliography" mode="title.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-  <xsl:variable name="title" select="(bibliographyinfo/title|info/title|title)[1]"/>
-  <xsl:choose>
-    <xsl:when test="$title">
-      <xsl:apply-templates select="$title" mode="title.markup">
-        <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'Bibliography'"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="glossary" mode="title.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-  <xsl:variable name="title" select="(glossaryinfo/title|info/title|title)[1]"/>
-  <xsl:choose>
-    <xsl:when test="$title">
-      <xsl:apply-templates select="$title" mode="title.markup">
-        <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="gentext.element.name">
-        <xsl:with-param name="element.name" select="local-name(.)"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="glossdiv" mode="title.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-  <xsl:variable name="title" select="(info/title|title)[1]"/>
-  <xsl:choose>
-    <xsl:when test="$title">
-      <xsl:apply-templates select="$title" mode="title.markup">
-        <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:message>ERROR: glossdiv missing its required title</xsl:message>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="glossentry" mode="title.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-  <xsl:apply-templates select="glossterm" mode="title.markup">
-    <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="glossterm" mode="title.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-
-  <xsl:choose>
-    <xsl:when test="$allow-anchors != 0">
-      <xsl:apply-templates/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates mode="no.anchor.mode"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="index" mode="title.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-  <xsl:variable name="title" select="(indexinfo/title|info/title|title)[1]"/>
-  <xsl:choose>
-    <xsl:when test="$title">
-      <xsl:apply-templates select="$title" mode="title.markup">
-        <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'Index'"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="setindex" mode="title.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-  <xsl:variable name="title" select="(setindexinfo/title|info/title|title)[1]"/>
-  <xsl:choose>
-    <xsl:when test="$title">
-      <xsl:apply-templates select="$title" mode="title.markup">
-        <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'SetIndex'"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="figure|example|equation" mode="title.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-  <xsl:apply-templates select="title|info/title" mode="title.markup">
-    <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="table" mode="title.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-  <xsl:apply-templates select="(title|caption)[1]" mode="title.markup">
-    <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="procedure" mode="title.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-  <xsl:apply-templates select="title" mode="title.markup">
-    <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="task" mode="title.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-  <xsl:apply-templates select="title" mode="title.markup">
-    <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="sidebar" mode="title.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-  <xsl:apply-templates select="(info/title|sidebarinfo/title|title)[1]"
-                       mode="title.markup">
-    <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="abstract" mode="title.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-  <xsl:choose>
-    <xsl:when test="title|info/title">
-      <xsl:apply-templates select="(title|info/title)[1]" mode="title.markup">
-        <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'Abstract'"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="caution|tip|warning|important|note" mode="title.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-  <xsl:variable name="title" select="(title|info/title)[1]"/>
-  <xsl:choose>
-    <xsl:when test="$title">
-      <xsl:apply-templates select="$title" mode="title.markup">
-        <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key">
-          <xsl:choose>
-            <xsl:when test="local-name(.)='note'">Note</xsl:when>
-            <xsl:when test="local-name(.)='important'">Important</xsl:when>
-            <xsl:when test="local-name(.)='caution'">Caution</xsl:when>
-            <xsl:when test="local-name(.)='warning'">Warning</xsl:when>
-            <xsl:when test="local-name(.)='tip'">Tip</xsl:when>
-          </xsl:choose>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="question" mode="title.markup">
-  <!-- questions don't have titles -->
-  <xsl:text>Question</xsl:text>
-</xsl:template>
-
-<xsl:template match="answer" mode="title.markup">
-  <!-- answers don't have titles -->
-  <xsl:text>Answer</xsl:text>
-</xsl:template>
-
-<xsl:template match="qandaentry" mode="title.markup">
-  <!-- qandaentrys are represented by the first question in them -->
-  <xsl:text>Question</xsl:text>
-</xsl:template>
-
-<xsl:template match="qandaset" mode="title.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-  <xsl:variable name="title" select="(info/title|
-                                      blockinfo/title|
-                                      title)[1]"/>
-  <xsl:choose>
-    <xsl:when test="$title">
-      <xsl:apply-templates select="$title" mode="title.markup">
-        <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'QandASet'"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="title.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-  <xsl:choose>
-    <xsl:when test="title">
-      <xsl:apply-templates select="title" mode="title.markup">
-        <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'LegalNotice'"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ============================================================ -->
-
-<xsl:template match="*" mode="titleabbrev.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:choose>
-    <xsl:when test="titleabbrev">
-      <xsl:apply-templates select="titleabbrev[1]" mode="title.markup">
-        <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates select="." mode="title.markup">
-        <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-        <xsl:with-param name="verbose" select="$verbose"/>
-      </xsl:apply-templates>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="book|preface|chapter|appendix" mode="titleabbrev.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:variable name="titleabbrev" select="(docinfo/titleabbrev
-                                           |bookinfo/titleabbrev
-                                           |info/titleabbrev
-                                           |prefaceinfo/titleabbrev
-                                           |chapterinfo/titleabbrev
-                                           |appendixinfo/titleabbrev
-                                           |titleabbrev)[1]"/>
-
-  <xsl:choose>
-    <xsl:when test="$titleabbrev">
-      <xsl:apply-templates select="$titleabbrev" mode="title.markup">
-        <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates select="." mode="title.markup">
-        <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-        <xsl:with-param name="verbose" select="$verbose"/>
-      </xsl:apply-templates>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="article" mode="titleabbrev.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:variable name="titleabbrev" select="(artheader/titleabbrev
-                                           |articleinfo/titleabbrev
-                                           |info/titleabbrev
-                                           |titleabbrev)[1]"/>
-
-  <xsl:choose>
-    <xsl:when test="$titleabbrev">
-      <xsl:apply-templates select="$titleabbrev" mode="title.markup">
-        <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates select="." mode="title.markup">
-        <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-        <xsl:with-param name="verbose" select="$verbose"/>
-      </xsl:apply-templates>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="section
-                     |sect1|sect2|sect3|sect4|sect5
-                     |refsect1|refsect2|refsect3
-                     |simplesect"
-              mode="titleabbrev.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:variable name="titleabbrev" select="(info/titleabbrev
-                                            |sectioninfo/titleabbrev
-                                            |sect1info/titleabbrev
-                                            |sect2info/titleabbrev
-                                            |sect3info/titleabbrev
-                                            |sect4info/titleabbrev
-                                            |sect5info/titleabbrev
-                                            |refsect1info/titleabbrev
-                                            |refsect2info/titleabbrev
-                                            |refsect3info/titleabbrev
-                                            |titleabbrev)[1]"/>
-
-  <xsl:choose>
-    <xsl:when test="$titleabbrev">
-      <xsl:apply-templates select="$titleabbrev" mode="title.markup">
-        <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates select="." mode="title.markup">
-        <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-        <xsl:with-param name="verbose" select="$verbose"/>
-      </xsl:apply-templates>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="titleabbrev" mode="title.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-
-  <xsl:choose>
-    <xsl:when test="$allow-anchors != 0">
-      <xsl:apply-templates/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates mode="no.anchor.mode"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ============================================================ -->
-
-<xsl:template match="*" mode="no.anchor.mode">
-  <!-- Switch to normal mode if no links -->
-  <xsl:choose>
-    <xsl:when test="descendant-or-self::footnote or
-                    descendant-or-self::anchor or
-                    descendant-or-self::ulink or
-                    descendant-or-self::link or
-                    descendant-or-self::olink or
-                    descendant-or-self::xref or
-                    descendant-or-self::indexterm">
-
-      <xsl:apply-templates mode="no.anchor.mode"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates select="."/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="footnote" mode="no.anchor.mode">
-  <!-- nop, suppressed -->
-</xsl:template>
-
-<xsl:template match="anchor" mode="no.anchor.mode">
-  <!-- nop, suppressed -->
-</xsl:template>
-
-<xsl:template match="ulink" mode="no.anchor.mode">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="link" mode="no.anchor.mode">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="olink" mode="no.anchor.mode">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="no.anchor.mode">
-  <!-- nop, suppressed -->
-</xsl:template>
-
-<xsl:template match="xref" mode="no.anchor.mode">
-  <xsl:variable name="targets" select="key('id',@linkend)"/>
-  <xsl:variable name="target" select="$targets[1]"/>
-  <xsl:variable name="refelem" select="local-name($target)"/>
-  
-  <xsl:call-template name="check.id.unique">
-    <xsl:with-param name="linkend" select="@linkend"/>
-  </xsl:call-template>
-
-  <xsl:choose>
-    <xsl:when test="count($target) = 0">
-      <xsl:message>
-        <xsl:text>XRef to nonexistent id: </xsl:text>
-        <xsl:value-of select="@linkend"/>
-      </xsl:message>
-      <xsl:text>???</xsl:text>
-    </xsl:when>
-
-    <xsl:when test="@endterm">
-      <xsl:variable name="etargets" select="key('id',@endterm)"/>
-      <xsl:variable name="etarget" select="$etargets[1]"/>
-      <xsl:choose>
-        <xsl:when test="count($etarget) = 0">
-          <xsl:message>
-            <xsl:value-of select="count($etargets)"/>
-            <xsl:text>Endterm points to nonexistent ID: </xsl:text>
-            <xsl:value-of select="@endterm"/>
-          </xsl:message>
-          <xsl:text>???</xsl:text>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates select="$etarget" mode="endterm"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-
-    <xsl:when test="$target/@xreflabel">
-      <xsl:call-template name="xref.xreflabel">
-        <xsl:with-param name="target" select="$target"/>
-      </xsl:call-template>
-    </xsl:when>
-
-    <xsl:otherwise>
-      <xsl:apply-templates select="$target" mode="xref-to-prefix"/>
-
-      <xsl:apply-templates select="$target" mode="xref-to">
-        <xsl:with-param name="referrer" select="."/>
-        <xsl:with-param name="xrefstyle">
-          <xsl:choose>
-            <xsl:when test="@role and not(@xrefstyle) and $use.role.as.xrefstyle != 0">
-              <xsl:value-of select="@role"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:value-of select="@xrefstyle"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:with-param>
-      </xsl:apply-templates>
-
-      <xsl:apply-templates select="$target" mode="xref-to-suffix"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ============================================================ -->
-
-</xsl:stylesheet>
-
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/utility.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/utility.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,290 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"
-                xmlns:dyn="http://exslt.org/dynamic"
-                xmlns:saxon="http://icl.com/saxon"
-                xmlns:xlink="http://www.w3.org/1999/xlink"
-                exclude-result-prefixes="doc dyn saxon"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-<doc:reference xmlns="" xml:id="utility">
-  <info>
-    <title>Common Â» Utility Template Reference</title>
-    <releaseinfo role="meta">
-      $Id$
-    </releaseinfo>
-  </info>
-  <!-- * yes, partintro is a valid child of a reference... -->
-  <partintro xml:id="partintro">
-    <title>Introduction</title>
-    <para>This is technical reference documentation for the
-      miscellaneous utility templates in the DocBook XSL
-      Stylesheets.</para>
-    <note>
-      <para>These templates are defined in a separate file from the set
-        of âcommonâ templates because some of the common templates
-        reference DocBook XSL stylesheet parameters, requiring the
-        entire set of parameters to be imported/included in any
-        stylesheet that imports/includes the common templates.</para>
-      <para>The utility templates donât import or include any DocBook
-        XSL stylesheet parameters, so the utility templates can be used
-        without importing the whole set of parameters.</para>
-    </note>
-    <para>This is not intended to be user documentation. It is
-      provided for developers writing customization layers for the
-      stylesheets.</para>
-  </partintro>
-</doc:reference>
-
-<!-- ====================================================================== -->
-
-<doc:template name="log.message" xmlns="">
-  <refpurpose>Logs/emits formatted notes and warnings</refpurpose>
-
-  <refdescription id="log.message-desc">
-    <para>The <function>log.message</function> template is a utility
-    template for logging/emitting formatted messages&#xa0;â that is,
-    notes and warnings, along with a given log âlevelâ and an
-    identifier for the âsourceâ that the message relates to.</para>
-  </refdescription>
-
-  <refparameter id="log.message-params">
-    <variablelist>
-      <varlistentry><term>level</term>
-        <listitem>
-          <para>Text to log/emit in the message-level field to
-            indicate the message level
-          (<literal>Note</literal> or
-          <literal>Warning</literal>)</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry><term>source</term>
-        <listitem>
-          <para>Text to log/emit in the source field to identify the
-            âsourceâ to which the notification/warning relates.
-            This can be any arbitrary string, but because the
-            message lacks line and column numbers to identify the
-            exact part of the source document to which it
-            relates, the intention is that the value you pass
-            into the <literal>source</literal> parameter should
-            give the user some way to identify the portion of
-            their source document on which to take potentially
-            take action in response to the log message (for
-            example, to edit, change, or add content).</para>
-          <para>So the <literal>source</literal> value should be,
-            for example, an ID, book/chapter/article title, title
-            of some formal object, or even a string giving an
-            XPath expression.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry><term>context-desc</term>
-        <listitem>
-          <para>Text to log/emit in the context-description field to
-            describe the context for the message.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry><term>context-desc-field-length</term>
-        <listitem>
-          <para>Specifies length of the context-description field
-            (in characters); default is 12</para>
-          <para>If the text specified by the
-            <literal>context-desc</literal> parameter is longer
-            than the number of characters specified in
-            <literal>context-desc-field-length</literal>, it is
-            truncated to <literal>context-desc-field-length</literal>
-            (12 characters by default).</para>
-          <para>If the specified text is shorter than
-            <literal>context-desc-field-length</literal>,
-          it is right-padded out to
-          <literal>context-desc-field-length</literal> (12 by
-          default).</para>
-        <para>If no value has been specified for the
-          <literal>context-desc</literal> parameter, the field is
-          left empty and the text of the log message begins with
-          the value of the <literal>message</literal>
-          parameter.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry><term>message</term>
-        <listitem>
-          <para>Text to log/emit in the actual message field</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry><term>message-field-length</term>
-        <listitem>
-          <para>Specifies length of the message
-            field (in characters); default is 45</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refreturn id="log.message-returns">
-  <para>Outputs a message (generally, to standard error).</para></refreturn>
-</doc:template>
-<xsl:template name="log.message">
-  <xsl:param name="level"/>
-  <xsl:param name="source"/>
-  <xsl:param name="context-desc"/>
-  <xsl:param name="context-desc-field-length">12</xsl:param>
-  <xsl:param name="context-desc-padded">
-    <xsl:if test="not($context-desc = '')">
-      <xsl:call-template name="pad-string">
-        <xsl:with-param name="leftRight">right</xsl:with-param>
-        <xsl:with-param name="padVar"
-          select="substring($context-desc, 1, $context-desc-field-length)"/>
-        <xsl:with-param name="length" select="$context-desc-field-length"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:param>
-  <xsl:param name="message"/>
-  <xsl:param name="message-field-length" select="45"/>
-  <xsl:param name="message-padded">
-    <xsl:variable name="spaces-for-blank-level">
-      <!-- * if the level field is blank, we'll need to pad out -->
-      <!-- * the message field with spaces to compensate -->
-      <xsl:choose>
-        <xsl:when test="$level = ''">
-          <xsl:value-of select="4 + 2"/>
-          <!-- * 4 = hard-coded length of comment text ("Note" or "Warn") -->
-          <!-- * + 2 = length of colon-plus-space separator ": " -->
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="0"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:variable name="spaces-for-blank-context-desc">
-      <!-- * if the context-description field is blank, we'll need -->
-      <!-- * to pad out the message field with spaces to compensate -->
-      <xsl:choose>
-        <xsl:when test="$context-desc = ''">
-          <xsl:value-of select="$context-desc-field-length + 2"/>
-          <!-- * + 2 = length of colon-plus-space separator ": " -->
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="0"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:variable name="extra-spaces"
-      select="$spaces-for-blank-level + $spaces-for-blank-context-desc"/>
-    <xsl:call-template name="pad-string">
-      <xsl:with-param name="leftRight">right</xsl:with-param>
-      <xsl:with-param name="padVar"
-        select="substring($message, 1, ($message-field-length + $extra-spaces))"/>
-      <xsl:with-param name="length"
-        select="$message-field-length + $extra-spaces"/>
-    </xsl:call-template>
-  </xsl:param>
-  <!-- * emit the actual log message -->
-  <xsl:message>
-    <xsl:if test="not($level = '')">
-      <xsl:value-of select="$level"/>
-      <xsl:text>: </xsl:text>
-    </xsl:if>
-    <xsl:if test="not($context-desc = '')">
-      <xsl:value-of select="$context-desc-padded"/>
-      <xsl:text>: </xsl:text>
-    </xsl:if>
-    <xsl:value-of select="$message-padded"/>
-    <xsl:text>  </xsl:text>
-    <xsl:value-of select="$source"/>
-  </xsl:message>
-</xsl:template>
-
-<!-- ===================================== -->
-<doc:template name="get.doc.title" xmlns="">
-  <refpurpose>Gets a title from the current document</refpurpose>
-  <refdescription id="get.doc.title-desc">
-    <para>The <function>get.doc.title</function> template is a
-      utility template for returning the first title found in the
-      current document.</para>
-  </refdescription>
-  <refreturn id="get.doc.title-returns">
-  <para>Returns a string containing some identifying title for the
-    current document .</para></refreturn>
-</doc:template>
-<xsl:template name="get.doc.title">
-  <xsl:choose>
-    <xsl:when test="//*[local-name() = 'title'
-      or local-name() = 'refname']">
-      <xsl:value-of select="//*[local-name() = 'title'
-        or local-name() = 'refname'][1]"/>
-    </xsl:when>
-    <xsl:when test="substring(local-name(*[1]),
-      string-length(local-name(*[1])-3) = 'info')
-      and *[1]/*[local-name() = 'title']">
-      <xsl:value-of select="*[1]/*[local-name() = 'title'][1]"/>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ===================================== -->
-<doc:template name="pad-string" xmlns="">
-  <refpurpose>Right-pads or left-pads a string out to a certain length</refpurpose>
-  <refdescription id="pad-string-desc">
-    <para>This function takes string <parameter>padVar</parameter> and
-      pads it out in the direction <parameter>rightLeft</parameter> to
-      the string-length <parameter>length</parameter>, using string
-      <parameter>padChar</parameter> (a space character by default) as
-      the padding string (note that <parameter>padChar</parameter> can
-      be a string; it is not limited to just being a single
-      character).</para>
-    <note>
-      <para>This function began as a copy of Nate Austin's
-        <function>prepend-pad</function> function in the <link
-          xlink:href="http://www.dpawson.co.uk/xsl/sect2/padding.html" >Padding
-          Content</link> section of Dave Pawson's <link
-          xlink:href="http://www.dpawson.co.uk/xsl/index.html" >XSLT
-          FAQ</link>.</para>
-    </note>
-  </refdescription>
-  <refreturn id="pad-string-returns">
-  <para>Returns a (padded) string.</para></refreturn>
-</doc:template>
-<xsl:template name="pad-string">
-  <!-- * recursive template to right/left pad the value with -->
-  <!-- * whatever padChar is passed in -->
-  <xsl:param name="padChar" select="' '"/>
-  <xsl:param name="leftRight">left</xsl:param>
-  <xsl:param name="padVar"/>
-  <xsl:param name="length"/>
-  <xsl:choose>
-    <xsl:when test="string-length($padVar) &lt; $length">
-      <xsl:call-template name="pad-string">
-        <xsl:with-param name="padChar" select="$padChar"/>
-        <xsl:with-param name="leftRight" select="$leftRight"/>
-        <xsl:with-param name="padVar">
-          <xsl:choose>
-            <!-- * determine whether string should be -->
-            <!-- * right- or left-padded -->
-            <xsl:when test="$leftRight = 'left'">
-              <!-- * pad it to left -->
-              <xsl:value-of select="concat($padChar,$padVar)"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <!-- * otherwise, right-pad the string -->
-              <xsl:value-of select="concat($padVar,$padChar)"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:with-param>
-        <xsl:with-param name="length" select="$length"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of 
-        select="substring($padVar,string-length($padVar) - $length + 1)"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/zh_cn.xml
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/zh_cn.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,698 +1,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="zh_cn" english-language-name="Chinese Simplified">
-
-<!-- * This file is generated automatically. -->
-<!-- * To submit changes to this file upstream (to the DocBook Project) -->
-<!-- * do not submit an edited version of this file. Instead, submit an -->
-<!-- * edited version of the source file at the following location: -->
-<!-- * -->
-<!-- *  https://svn.sourceforge.net/svnroot/docbook/trunk/gentext/locale/zh_cn.xml -->
-<!-- * -->
-<!-- * E-mail the edited zh_cn.xml source file to: -->
-<!-- * -->
-<!-- *  docbook-developers@lists.sourceforge.net -->
-
-<!-- ******************************************************************** -->
-
-<!-- This file is part of the XSL DocBook Stylesheet distribution. -->
-<!-- See ../README or http://docbook.sf.net/release/xsl/current/ for -->
-<!-- copyright and other information. -->
-
-<!-- ******************************************************************** -->
-<!-- In these files, % with a letter is used for a placeholder: -->
-<!--   %t is the current element's title -->
-<!--   %s is the current element's subtitle (if applicable)-->
-<!--   %n is the current element's number label-->
-<!--   %p is the current element's page number (if applicable)-->
-<!-- ******************************************************************** -->
-
-
-<l:gentext key="Abstract" text="æèŠ"/>
-<l:gentext key="abstract" text="æèŠ"/>
-<l:gentext key="Answer" text="ç­ïŒ"/>
-<l:gentext key="answer" text="ç­ïŒ"/>
-<l:gentext key="Appendix" text="éåœ"/>
-<l:gentext key="appendix" text="éåœ"/>
-<l:gentext key="Article" text="æç« "/>
-<l:gentext key="article" text="æç« "/>
-<l:gentext key="Author" text="Author" lang="en"/>
-<l:gentext key="Bibliography" text="åèä¹Šç®"/>
-<l:gentext key="bibliography" text="åèä¹Šç®"/>
-<l:gentext key="Book" text="ä¹Š"/>
-<l:gentext key="book" text="ä¹Š"/>
-<l:gentext key="CAUTION" text="å°å¿"/>
-<l:gentext key="Caution" text="å°å¿"/>
-<l:gentext key="caution" text="å°å¿"/>
-<l:gentext key="Chapter" text="ç« "/>
-<l:gentext key="chapter" text="ç« "/>
-<l:gentext key="Colophon" text="Colophon"/>
-<l:gentext key="colophon" text="Colophon"/>
-<l:gentext key="Copyright" text="çæ"/>
-<l:gentext key="copyright" text="çæ"/>
-<l:gentext key="Dedication" text="é¢è¯"/>
-<l:gentext key="dedication" text="é¢è¯"/>
-<l:gentext key="Edition" text="ç"/>
-<l:gentext key="edition" text="ç"/>
-<l:gentext key="Editor" text="çŒè
-"/>
-<l:gentext key="Equation" text="å
-¬åŒ"/>
-<l:gentext key="equation" text="å
-¬åŒ"/>
-<l:gentext key="Example" text="äŸ"/>
-<l:gentext key="example" text="äŸ"/>
-<l:gentext key="Figure" text="åŸ"/>
-<l:gentext key="figure" text="åŸ"/>
-<l:gentext key="Glossary" text="æ¯è¯­è¡š"/>
-<l:gentext key="glossary" text="æ¯è¯­è¡š"/>
-<l:gentext key="GlossSee" text="è§"/>
-<l:gentext key="glosssee" text="è§"/>
-<l:gentext key="GlossSeeAlso" text="åè§"/>
-<l:gentext key="glossseealso" text="åè§"/>
-<l:gentext key="IMPORTANT" text="éèŠ"/>
-<l:gentext key="important" text="éèŠ"/>
-<l:gentext key="Important" text="éèŠ"/>
-<l:gentext key="Index" text="çŽ¢åŒ"/>
-<l:gentext key="index" text="çŽ¢åŒ"/>
-<l:gentext key="ISBN" text="ISBN"/>
-<l:gentext key="isbn" text="ISBN"/>
-<l:gentext key="LegalNotice" text="æ³åŸéå"/>
-<l:gentext key="legalnotice" text="æ³åŸéå"/>
-<l:gentext key="MsgAud" text="åäŒ"/>
-<l:gentext key="msgaud" text="åäŒ"/>
-<l:gentext key="MsgLevel" text="çº§å«"/>
-<l:gentext key="msglevel" text="çº§å«"/>
-<l:gentext key="MsgOrig" text="åºå€"/>
-<l:gentext key="msgorig" text="åºå€"/>
-<l:gentext key="NOTE" text="æ³šæ"/>
-<l:gentext key="Note" text="æ³šæ"/>
-<l:gentext key="note" text="æ³šæ"/>
-<l:gentext key="Part" text="éšå"/>
-<l:gentext key="part" text="éšå"/>
-<l:gentext key="Preface" text="åèš"/>
-<l:gentext key="preface" text="åèš"/>
-<l:gentext key="Procedure" text="è¿çš"/>
-<l:gentext key="procedure" text="è¿çš"/>
-<l:gentext key="ProductionSet" text="äº§å"/>
-<l:gentext key="PubDate" text="åºçæ¥æ"/>
-<l:gentext key="pubdate" text="åºçæ¥æ"/>
-<l:gentext key="Published" text="åºçæ¹"/>
-<l:gentext key="published" text="åºçæ¹"/>
-<l:gentext key="Publisher" text="åºçè
-"/>
-<l:gentext key="Qandadiv" text="èŽšä¿"/>
-<l:gentext key="qandadiv" text="èŽšä¿"/>
-<l:gentext key="QandASet" text="åžžè§é®é¢"/>
-<l:gentext key="Question" text="é®ïŒ"/>
-<l:gentext key="question" text="é®ïŒ"/>
-<l:gentext key="RefEntry" text=""/>
-<l:gentext key="refentry" text=""/>
-<l:gentext key="Reference" text="åè"/>
-<l:gentext key="reference" text="åè"/>
-<l:gentext key="References" text="åè"/>
-<l:gentext key="RefName" text="åç§°"/>
-<l:gentext key="refname" text="åç§°"/>
-<l:gentext key="RefSection" text=""/>
-<l:gentext key="refsection" text=""/>
-<l:gentext key="RefSynopsisDiv" text="å€§çº²"/>
-<l:gentext key="refsynopsisdiv" text="å€§çº²"/>
-<l:gentext key="RevHistory" text="ä¿®è®¢åå²"/>
-<l:gentext key="revhistory" text="ä¿®è®¢åå²"/>
-<l:gentext key="revision" text="ä¿®è®¢"/>
-<l:gentext key="Revision" text="ä¿®è®¢"/>
-<l:gentext key="sect1" text="è"/>
-<l:gentext key="sect2" text="è"/>
-<l:gentext key="sect3" text="è"/>
-<l:gentext key="sect4" text="è"/>
-<l:gentext key="sect5" text="è"/>
-<l:gentext key="section" text="è"/>
-<l:gentext key="Section" text="è"/>
-<l:gentext key="see" text="è§"/>
-<l:gentext key="See" text="è§"/>
-<l:gentext key="seealso" text="åè§"/>
-<l:gentext key="Seealso" text="åè§"/>
-<l:gentext key="SeeAlso" text="åè§"/>
-<l:gentext key="set" text="Set"/>
-<l:gentext key="Set" text="Set"/>
-<l:gentext key="setindex" text="Set Index"/>
-<l:gentext key="SetIndex" text="Set Index"/>
-<l:gentext key="Sidebar" text=""/>
-<l:gentext key="sidebar" text="sidebar"/>
-<l:gentext key="step" text="æ­¥éª€"/>
-<l:gentext key="Step" text="æ­¥éª€"/>
-<l:gentext key="table" text="è¡š"/>
-<l:gentext key="Table" text="è¡š"/>
-<l:gentext key="task" text="ä»»å¡"/>
-<l:gentext key="Task" text="ä»»å¡"/>
-<l:gentext key="tip" text="æç€º"/>
-<l:gentext key="TIP" text="æç€º"/>
-<l:gentext key="Tip" text="æç€º"/>
-<l:gentext key="Warning" text="è­Šå"/>
-<l:gentext key="warning" text="è­Šå"/>
-<l:gentext key="WARNING" text="è­Šå"/>
-<l:gentext key="and" text="å"/>
-<l:gentext key="by" text="ç±"/>
-<l:gentext key="Edited" text="çŒèŸæ¶éŽ"/>
-<l:gentext key="edited" text="çŒèŸæ¶éŽ"/>
-<l:gentext key="Editedby" text="çŒèŸè
-"/>
-<l:gentext key="editedby" text="çŒèŸè
-"/>
-<l:gentext key="in" text="äº"/>
-<l:gentext key="lastlistcomma" text=""/>
-<l:gentext key="listcomma" text="ã"/>
-<l:gentext key="nonexistantelement" text="äžå­åšçå
-çŽ "/>
-<l:gentext key="notes" text="å€æ³š"/>
-<l:gentext key="Notes" text="å€æ³š"/>
-<l:gentext key="Pgs" text="é¡µ"/>
-<l:gentext key="pgs" text="é¡µ"/>
-<l:gentext key="Revisedby" text="ä¿®è®¢è
-ïŒ"/>
-<l:gentext key="revisedby" text="ä¿®è®¢è
-ïŒ"/>
-<l:gentext key="TableNotes" text="è¡šæ³š"/>
-<l:gentext key="tablenotes" text="è¡šæ³š"/>
-<l:gentext key="TableofContents" text="ç®åœ"/>
-<l:gentext key="tableofcontents" text="ç®åœ"/>
-<l:gentext key="unexpectedelementname" text="æªé¢æçåç§°"/>
-<l:gentext key="unsupported" text="äžæ¯æ"/>
-<l:gentext key="xrefto" text="xref to"/>
-<l:gentext key="Authors" text="äœè
-"/>
-<l:gentext key="copyeditor" text="çæçŒèŸ"/>
-<l:gentext key="graphicdesigner" text="çŸæ¯çŒèŸ"/>
-<l:gentext key="productioneditor" text="äº§åçŒèŸ"/>
-<l:gentext key="technicaleditor" text="ææ¯çŒèŸ"/>
-<l:gentext key="translator" text="è¯è
-"/>
-<l:gentext key="listofequations" text="å
-¬åŒæž
-å"/>
-<l:gentext key="ListofEquations" text="å
-¬åŒæž
-å"/>
-<l:gentext key="ListofExamples" text="èäŸæž
-å"/>
-<l:gentext key="listofexamples" text="èäŸæž
-å"/>
-<l:gentext key="ListofFigures" text="æåŸæž
-å"/>
-<l:gentext key="listoffigures" text="æåŸæž
-å"/>
-<l:gentext key="ListofProcedures" text="è¿çšæž
-å"/>
-<l:gentext key="listofprocedures" text="è¿çšæž
-å"/>
-<l:gentext key="listoftables" text="è¡šæ Œæž
-å"/>
-<l:gentext key="ListofTables" text="è¡šæ Œæž
-å"/>
-<l:gentext key="ListofUnknown" text="æªç¥æž
-å"/>
-<l:gentext key="listofunknown" text="æªç¥æž
-å"/>
-<l:gentext key="nav-home" text="èµ·å§é¡µ"/>
-<l:gentext key="nav-next" text="äžäžé¡µ"/>
-<l:gentext key="nav-next-sibling" text="å¿«è¿"/>
-<l:gentext key="nav-prev" text="äžäžé¡µ"/>
-<l:gentext key="nav-prev-sibling" text="å¿«é"/>
-<l:gentext key="nav-up" text="äžäžçº§"/>
-<l:gentext key="nav-toc" text="ç®åœ"/>
-<l:gentext key="Draft" text="èçš¿"/>
-<l:gentext key="above" text="ä»¥äž"/>
-<l:gentext key="below" text="ä»¥äž"/>
-<l:gentext key="sectioncalled" text="äžè"/>
-<l:gentext key="index symbols" text="ç¬Šå·"/>
-<l:gentext key="lowercase.alpha" text="abcdefghijklmnopqrstuvwxyz"/>
-<l:gentext key="uppercase.alpha" text="ABCDEFGHIJKLMNOPQRSTUVWXYZ"/>
-<l:gentext key="normalize.sort.input" text="AaÃÃ ÃÃ¡ÃÃ¢ÃÃ£ÃÃ€Ã
-Ã¥ÄÄÄÄÄÄ
-ÇÇÇÇÇ Ç¡ÇºÇ»ÈÈÈÈÈŠÈ§ážážáºáº áº¡áº¢áº£áº€áº¥áºŠáº§áºšáº©áºªáº«áº¬áº­áº®áº¯áº°áº±áº²áº³áºŽáºµáº¶áº·BbÆÆÉÆÆážážážáž
-ážážCcÃÃ§ÄÄÄÄÄÄÄÄÆÆÉážážDdÄÄÄÄÆÉÆÆÇ
-Ç²È¡ÉážážážážážážážážážážEeÃÃšÃÃ©ÃÃªÃÃ«ÄÄÄÄÄÄÄÄÄÄÈÈ
-ÈÈÈšÈ©ážážážážážážážážážážáºžáº¹áººáº»áºŒáºœáºŸáº¿á»á»á»á»á»á»
-á»á»FfÆÆážážGgÄÄÄÄÄ Ä¡Ä¢Ä£ÆÉ Ç€Ç¥ÇŠÇ§ÇŽÇµáž áž¡HhÄ€Ä¥ÄŠÄ§ÈÈÉŠáž¢áž£áž€áž¥ážŠáž§ážšáž©ážªáž«áºIiÃÃ¬ÃÃ­ÃÃ®ÃÃ¯ÄšÄ©ÄªÄ«Ä¬Ä­Ä®Ä¯Ä°ÆÉšÇÇÈÈÈÈáž¬áž­áž®áž¯á»á»á»á»JjÄŽÄµÇ°ÊKkÄ¶Ä·ÆÆÇšÇ©áž°áž±áž²áž³ážŽážµLlÄ¹ÄºÄ»ÄŒÄœÄŸÄ¿ÅÅÅÆÇÈŽÉ«É¬É­áž¶áž·ážžáž¹ážºáž»ážŒážœMmÉ±ážŸáž¿á¹á¹á¹á¹NnÃÃ±ÅÅÅ
-ÅÅÅÆÉ²ÆÈ ÇÇžÇ¹ÈµÉ³á¹á¹
-á¹á¹á¹á¹á¹á¹OoÃÃ²ÃÃ³ÃÃŽÃÃµÃÃ¶ÃÃžÅÅÅÅÅÅÆÆ Æ¡ÇÇÇªÇ«Ç¬Ç­ÇŸÇ¿ÈÈÈÈÈªÈ«È¬È­È®È¯È°È±á¹á¹á¹á¹á¹á¹á¹á¹á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á» á»¡á»¢á»£PpÆ€Æ¥á¹á¹á¹á¹QqÊ RrÅÅÅÅÅÅÈÈÈÈÉŒÉœÉŸá¹á¹á¹á¹á¹á¹á¹á¹SsÅÅÅÅÅÅÅ Å¡ÈÈÊá¹ á¹¡á¹¢á¹£á¹€á¹¥á¹Šá¹§á¹šá¹©TtÅ¢Å£Å€Å¥ÅŠÅ§Æ«Æ¬Æ­Æ®ÊÈÈÈ¶á¹ªá¹«á¹¬á¹­á¹®á¹¯á¹°á¹±áºUuÃÃ¹ÃÃºÃÃ»ÃÃŒÅšÅ©ÅªÅ«Å¬Å­Å®Å¯Å°Å±Å²Å³Æ¯Æ°ÇÇÇÇÇÇÇÇÇÇÈÈÈÈá¹²á¹³á¹Žá¹µá¹¶á¹·á¹žá¹¹á¹ºá¹»á»€á»¥á»Šá»§á»šá»©á»ªá»«á»¬á»­á»®á»¯á»°á»±VvÆ²Êá¹Œá¹œá¹Ÿá¹¿WwÅŽÅµáºáºáºáºáºáº
-áºáºáºáºáºXxáºáºáºáºYyÃÃœÃ¿ÅžÅ¶Å·Æ³ÆŽÈ²È³áºáºáºá»²á»³á»Žá»µá»¶á»·á»žá»¹ZzÅ¹ÅºÅ»ÅŒÅœÅŸÆµÆ¶È€È¥ÊÊáºáºáºáºáºáºáº" lang="en"/>
-<l:gentext key="normalize.sort.output" text="AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ" lang="en"/>
-<l:dingbat key="startquote" text="â"/>
-<l:dingbat key="endquote" text="â"/>
-<l:dingbat key="nestedstartquote" text="â"/>
-<l:dingbat key="nestedendquote" text="â"/>
-<l:dingbat key="singlestartquote" text="â"/>
-<l:dingbat key="singleendquote" text="â"/>
-<l:dingbat key="bullet" text="Â·"/>
-<l:gentext key="hyphenation-character" text="-"/>
-<l:gentext key="hyphenation-push-character-count" text="2"/>
-<l:gentext key="hyphenation-remain-character-count" text="2"/>
-<l:context name="styles"><l:template name="person-name" text="first-last"/>
-</l:context>
-<l:context name="title"><l:template name="abstract" text="%t"/>
-<l:template name="answer" text="%t"/>
-<l:template name="appendix" text="éåœÂ %n.Â %t"/>
-<l:template name="article" text="%t"/>
-<l:template name="authorblurb" text="%t"/>
-<l:template name="bibliodiv" text="%t"/>
-<l:template name="biblioentry" text="%t"/>
-<l:template name="bibliography" text="%t"/>
-<l:template name="bibliolist" text="%t"/>
-<l:template name="bibliomixed" text="%t"/>
-<l:template name="bibliomset" text="%t"/>
-<l:template name="biblioset" text="%t"/>
-<l:template name="blockquote" text="%t"/>
-<l:template name="book" text="%t"/>
-<l:template name="calloutlist" text="%t"/>
-<l:template name="caution" text="%t"/>
-<l:template name="chapter" text="ç¬¬Â %nÂ ç« Â %t"/>
-<l:template name="colophon" text="%t"/>
-<l:template name="dedication" text="%t"/>
-<l:template name="equation" text="å
-¬åŒÂ %n.Â %t"/>
-<l:template name="example" text="äŸÂ %n.Â %t"/>
-<l:template name="figure" text="åŸÂ %n.Â %t"/>
-<l:template name="foil" text="%t" lang="en"/>
-<l:template name="foilgroup" text="%t" lang="en"/>
-<l:template name="formalpara" text="%t"/>
-<l:template name="glossary" text="%t"/>
-<l:template name="glossdiv" text="%t"/>
-<l:template name="glosslist" text="%t"/>
-<l:template name="glossentry" text="%t"/>
-<l:template name="important" text="%t"/>
-<l:template name="index" text="%t"/>
-<l:template name="indexdiv" text="%t"/>
-<l:template name="itemizedlist" text="%t"/>
-<l:template name="legalnotice" text="%t"/>
-<l:template name="listitem" text=""/>
-<l:template name="lot" text="%t"/>
-<l:template name="msg" text="%t"/>
-<l:template name="msgexplan" text="%t"/>
-<l:template name="msgmain" text="%t"/>
-<l:template name="msgrel" text="%t"/>
-<l:template name="msgset" text="%t"/>
-<l:template name="msgsub" text="%t"/>
-<l:template name="note" text="%t"/>
-<l:template name="orderedlist" text="%t"/>
-<l:template name="part" text="ç¬¬Â %nÂ éšåÂ %t"/>
-<l:template name="partintro" text="%t"/>
-<l:template name="preface" text="%t"/>
-<l:template name="procedure" text="%t"/>
-<l:template name="procedure.formal" text="è¿çšÂ %n.Â %t"/>
-<l:template name="productionset" text="%t"/>
-<l:template name="productionset.formal" text="äº§åÂ %n"/>
-<l:template name="qandadiv" text="%t"/>
-<l:template name="qandaentry" text="%t"/>
-<l:template name="qandaset" text="%t"/>
-<l:template name="question" text="%t"/>
-<l:template name="refentry" text="%t"/>
-<l:template name="reference" text="%t"/>
-<l:template name="refsection" text="%t"/>
-<l:template name="refsect1" text="%t"/>
-<l:template name="refsect2" text="%t"/>
-<l:template name="refsect3" text="%t"/>
-<l:template name="refsynopsisdiv" text="%t"/>
-<l:template name="refsynopsisdivinfo" text="%t"/>
-<l:template name="segmentedlist" text="%t"/>
-<l:template name="set" text="%t"/>
-<l:template name="setindex" text="%t"/>
-<l:template name="sidebar" text="%t"/>
-<l:template name="step" text="%t"/>
-<l:template name="table" text="è¡šÂ %n.Â %t"/>
-<l:template name="task" text="%t"/>
-<l:template name="tasksummary" text="%t" lang="en"/>
-<l:template name="taskprerequisites" text="%t" lang="en"/>
-<l:template name="taskrelated" text="%t" lang="en"/>
-<l:template name="tip" text="%t"/>
-<l:template name="toc" text="%t"/>
-<l:template name="variablelist" text="%t"/>
-<l:template name="varlistentry" text=""/>
-<l:template name="warning" text="%t"/>
-</l:context>
-<l:context name="title-unnumbered"><l:template name="appendix" text="%t"/>
-<l:template name="article/appendix" text="%t"/>
-<l:template name="bridgehead" text="%t"/>
-<l:template name="chapter" text="%t"/>
-<l:template name="sect1" text="%t"/>
-<l:template name="sect2" text="%t"/>
-<l:template name="sect3" text="%t"/>
-<l:template name="sect4" text="%t"/>
-<l:template name="sect5" text="%t"/>
-<l:template name="section" text="%t"/>
-<l:template name="simplesect" text="%t"/>
-<l:template name="part" text="%t" lang="en"/>
-</l:context>
-<l:context name="title-numbered"><l:template name="appendix" text="éåœÂ %n.Â %t"/>
-<l:template name="article/appendix" text="%n.Â %t"/>
-<l:template name="bridgehead" text="%n.Â %t"/>
-<l:template name="chapter" text="ç¬¬Â %nÂ ç« Â %t"/>
-<l:template name="part" text="éšåÂ %n.Â %t"/>
-<l:template name="sect1" text="%n.Â %t"/>
-<l:template name="sect2" text="%n.Â %t"/>
-<l:template name="sect3" text="%n.Â %t"/>
-<l:template name="sect4" text="%n.Â %t"/>
-<l:template name="sect5" text="%n.Â %t"/>
-<l:template name="section" text="%n.Â %t"/>
-<l:template name="simplesect" text="%t"/>
-</l:context>
-<l:context name="subtitle"><l:template name="appendix" text="%s"/>
-<l:template name="article" text="%s"/>
-<l:template name="bibliodiv" text="%s"/>
-<l:template name="biblioentry" text="%s"/>
-<l:template name="bibliography" text="%s"/>
-<l:template name="bibliomixed" text="%s"/>
-<l:template name="bibliomset" text="%s"/>
-<l:template name="biblioset" text="%s"/>
-<l:template name="book" text="%s"/>
-<l:template name="chapter" text="%s"/>
-<l:template name="colophon" text="%s"/>
-<l:template name="dedication" text="%s"/>
-<l:template name="glossary" text="%s"/>
-<l:template name="glossdiv" text="%s"/>
-<l:template name="index" text="%s"/>
-<l:template name="indexdiv" text="%s"/>
-<l:template name="lot" text="%s"/>
-<l:template name="part" text="%s"/>
-<l:template name="partintro" text="%s"/>
-<l:template name="preface" text="%s"/>
-<l:template name="refentry" text="%s"/>
-<l:template name="reference" text="%s"/>
-<l:template name="refsection" text="%s"/>
-<l:template name="refsect1" text="%s"/>
-<l:template name="refsect2" text="%s"/>
-<l:template name="refsect3" text="%s"/>
-<l:template name="refsynopsisdiv" text="%s"/>
-<l:template name="sect1" text="%s"/>
-<l:template name="sect2" text="%s"/>
-<l:template name="sect3" text="%s"/>
-<l:template name="sect4" text="%s"/>
-<l:template name="sect5" text="%s"/>
-<l:template name="section" text="%s"/>
-<l:template name="set" text="%s"/>
-<l:template name="setindex" text="%s"/>
-<l:template name="sidebar" text="%s"/>
-<l:template name="simplesect" text="%s"/>
-<l:template name="toc" text="%s"/>
-</l:context>
-<l:context name="xref"><l:template name="abstract" text="%t"/>
-<l:template name="answer" text="ç­ïŒÂ %n"/>
-<l:template name="appendix" text="%t"/>
-<l:template name="article" text="%t"/>
-<l:template name="authorblurb" text="%t"/>
-<l:template name="bibliodiv" text="%t"/>
-<l:template name="bibliography" text="%t"/>
-<l:template name="bibliomset" text="%t"/>
-<l:template name="biblioset" text="%t"/>
-<l:template name="blockquote" text="%t"/>
-<l:template name="book" text="%t"/>
-<l:template name="calloutlist" text="%t"/>
-<l:template name="caution" text="%t"/>
-<l:template name="chapter" text="%t"/>
-<l:template name="colophon" text="%t"/>
-<l:template name="constraintdef" text="%t"/>
-<l:template name="dedication" text="%t"/>
-<l:template name="equation" text="%t"/>
-<l:template name="example" text="%t"/>
-<l:template name="figure" text="%t"/>
-<l:template name="foil" text="%t" lang="en"/>
-<l:template name="foilgroup" text="%t" lang="en"/>
-<l:template name="formalpara" text="%t"/>
-<l:template name="glossary" text="%t"/>
-<l:template name="glossdiv" text="%t"/>
-<l:template name="important" text="%t"/>
-<l:template name="index" text="%t"/>
-<l:template name="indexdiv" text="%t"/>
-<l:template name="itemizedlist" text="%t"/>
-<l:template name="legalnotice" text="%t"/>
-<l:template name="listitem" text="%n"/>
-<l:template name="lot" text="%t"/>
-<l:template name="msg" text="%t"/>
-<l:template name="msgexplan" text="%t"/>
-<l:template name="msgmain" text="%t"/>
-<l:template name="msgrel" text="%t"/>
-<l:template name="msgset" text="%t"/>
-<l:template name="msgsub" text="%t"/>
-<l:template name="note" text="%t"/>
-<l:template name="orderedlist" text="%t"/>
-<l:template name="part" text="%t"/>
-<l:template name="partintro" text="%t"/>
-<l:template name="preface" text="%t"/>
-<l:template name="procedure" text="%t"/>
-<l:template name="productionset" text="%t"/>
-<l:template name="qandadiv" text="%t"/>
-<l:template name="qandaentry" text="é®ïŒÂ %n"/>
-<l:template name="qandaset" text="%t"/>
-<l:template name="question" text="é®ïŒÂ %n"/>
-<l:template name="reference" text="%t"/>
-<l:template name="refsynopsisdiv" text="%t"/>
-<l:template name="segmentedlist" text="%t"/>
-<l:template name="set" text="%t"/>
-<l:template name="setindex" text="%t"/>
-<l:template name="sidebar" text="%t"/>
-<l:template name="table" text="%t"/>
-<l:template name="task" text="%t" lang="en"/>
-<l:template name="tip" text="%t"/>
-<l:template name="toc" text="%t"/>
-<l:template name="variablelist" text="%t"/>
-<l:template name="varlistentry" text="%n"/>
-<l:template name="warning" text="%t"/>
-<l:template name="olink.document.citation" text=" in %o" lang="en"/>
-<l:template name="olink.page.citation" text=" (page %p)" lang="en"/>
-<l:template name="page.citation" text=" [%p]"/>
-<l:template name="page" text="(ç¬¬ %p é¡µ)"/>
-<l:template name="docname" text=" in %o" lang="en"/>
-<l:template name="docnamelong" text=" in the document titled %o" lang="en"/>
-<l:template name="pageabbrev" text="(ç¬¬ %p é¡µ)"/>
-<l:template name="Page" text="ç¬¬ %p é¡µ"/>
-<l:template name="bridgehead" text="â%tâäžè"/>
-<l:template name="refsection" text="â%tâäžè"/>
-<l:template name="refsect1" text="â%tâäžè"/>
-<l:template name="refsect2" text="â%tâäžè"/>
-<l:template name="refsect3" text="â%tâäžè"/>
-<l:template name="sect1" text="â%tâäžè"/>
-<l:template name="sect2" text="â%tâäžè"/>
-<l:template name="sect3" text="â%tâäžè"/>
-<l:template name="sect4" text="â%tâäžè"/>
-<l:template name="sect5" text="â%tâäžè"/>
-<l:template name="section" text="â%tâäžè"/>
-<l:template name="simplesect" text="â%tâäžè"/>
-</l:context>
-<l:context name="xref-number"><l:template name="answer" text="ç­ïŒÂ %n"/>
-<l:template name="appendix" text="éåœÂ %n"/>
-<l:template name="bridgehead" text="ç¬¬Â %nÂ è"/>
-<l:template name="chapter" text="ç¬¬Â %nÂ ç« "/>
-<l:template name="equation" text="å
-¬åŒÂ %n"/>
-<l:template name="example" text="äŸÂ %n"/>
-<l:template name="figure" text="åŸÂ %n"/>
-<l:template name="part" text="ç¬¬Â %nÂ éšå"/>
-<l:template name="procedure" text="è¿çšÂ %n"/>
-<l:template name="productionset" text="äº§åÂ %n"/>
-<l:template name="qandadiv" text="èŽšä¿Â %n"/>
-<l:template name="qandaentry" text="é®ïŒÂ %n"/>
-<l:template name="question" text="é®ïŒÂ %n"/>
-<l:template name="sect1" text="ç¬¬Â %nÂ è"/>
-<l:template name="sect2" text="ç¬¬Â %nÂ è"/>
-<l:template name="sect3" text="ç¬¬Â %nÂ è"/>
-<l:template name="sect4" text="ç¬¬Â %nÂ è"/>
-<l:template name="sect5" text="ç¬¬Â %nÂ è"/>
-<l:template name="section" text="ç¬¬Â %nÂ è"/>
-<l:template name="table" text="è¡šÂ %n"/>
-</l:context>
-<l:context name="xref-number-and-title"><l:template name="appendix" text="éåœÂ %n, %t"/>
-<l:template name="bridgehead" text="ç¬¬Â %nÂ è â%tâ"/>
-<l:template name="chapter" text="ç¬¬Â %nÂ ç«  %t"/>
-<l:template name="equation" text="å
-¬åŒÂ %n â%tâ"/>
-<l:template name="example" text="äŸÂ %n â%tâ"/>
-<l:template name="figure" text="åŸÂ %n â%tâ"/>
-<l:template name="part" text="ç¬¬Â %nÂ éšå â%tâ"/>
-<l:template name="procedure" text="è¿çšÂ %n, â%tâ"/>
-<l:template name="productionset" text="äº§åÂ %n, â%tâ"/>
-<l:template name="qandadiv" text="èŽšä¿Â %n, â%tâ"/>
-<l:template name="refsect1" text="â%tâäžè"/>
-<l:template name="refsect2" text="â%tâäžè"/>
-<l:template name="refsect3" text="â%tâäžè"/>
-<l:template name="refsection" text="â%tâäžè"/>
-<l:template name="sect1" text="ç¬¬Â %nÂ è â%tâ"/>
-<l:template name="sect2" text="ç¬¬Â %nÂ è â%tâ"/>
-<l:template name="sect3" text="ç¬¬Â %nÂ è â%tâ"/>
-<l:template name="sect4" text="ç¬¬Â %nÂ è â%tâ"/>
-<l:template name="sect5" text="ç¬¬Â %nÂ è â%tâ"/>
-<l:template name="section" text="ç¬¬Â %nÂ è â%tâ"/>
-<l:template name="simplesect" text="â%tâäžè"/>
-<l:template name="table" text="è¡šÂ %n â%tâ"/>
-</l:context>
-<l:context name="authorgroup"><l:template name="sep" text="ã"/>
-<l:template name="sep2" text="å"/>
-<l:template name="seplast" text="å"/>
-</l:context>
-<l:context name="glossary"><l:template name="see" text="è§%t"/>
-<l:template name="seealso" text="åè§%t"/>
-</l:context>
-<l:context name="msgset"><l:template name="MsgAud" text="åäŒïŒ"/>
-<l:template name="MsgLevel" text="çº§å«ïŒ"/>
-<l:template name="MsgOrig" text="åºå€ïŒ"/>
-</l:context>
-<l:context name="datetime"><l:template name="format" text="Y-m-d"/>
-</l:context>
-<l:context name="termdef"><l:template name="prefix" text="[Definition: " lang="en"/>
-<l:template name="suffix" text="]" lang="en"/>
-</l:context>
-<l:context name="datetime-full"><l:template name="January" text="äžæ"/>
-<l:template name="February" text="äºæ"/>
-<l:template name="March" text="äžæ"/>
-<l:template name="April" text="åæ"/>
-<l:template name="May" text="äºæ"/>
-<l:template name="June" text="å
-­æ"/>
-<l:template name="July" text="äžæ"/>
-<l:template name="August" text="å
-«æ"/>
-<l:template name="September" text="ä¹æ"/>
-<l:template name="October" text="åæ"/>
-<l:template name="November" text="åäžæ"/>
-<l:template name="December" text="åäºæ"/>
-<l:template name="Monday" text="ææäž"/>
-<l:template name="Tuesday" text="ææäº"/>
-<l:template name="Wednesday" text="ææäž"/>
-<l:template name="Thursday" text="ææå"/>
-<l:template name="Friday" text="ææäº"/>
-<l:template name="Saturday" text="ææå
-­"/>
-<l:template name="Sunday" text="æææ¥"/>
-</l:context>
-<l:context name="datetime-abbrev"><l:template name="Jan" text="äžæ"/>
-<l:template name="Feb" text="äºæ"/>
-<l:template name="Mar" text="äžæ"/>
-<l:template name="Apr" text="åæ"/>
-<l:template name="May" text="äºæ"/>
-<l:template name="Jun" text="å
-­æ"/>
-<l:template name="Jul" text="äžæ"/>
-<l:template name="Aug" text="å
-«æ"/>
-<l:template name="Sep" text="ä¹æ"/>
-<l:template name="Oct" text="åæ"/>
-<l:template name="Nov" text="åäžæ"/>
-<l:template name="Dec" text="åäºæ"/>
-<l:template name="Mon" text="åšäž"/>
-<l:template name="Tue" text="åšäº"/>
-<l:template name="Wed" text="åšäž"/>
-<l:template name="Thu" text="åšå"/>
-<l:template name="Fri" text="åšäº"/>
-<l:template name="Sat" text="åšå
-­"/>
-<l:template name="Sun" text="åšæ¥"/>
-</l:context>
-<l:context name="htmlhelp"><l:template name="langcode" text="0x0804 Chinese (CHINA)"/>
-</l:context>
-<l:context name="index"><l:template name="term-separator" text=", " lang="en"/>
-<l:template name="number-separator" text=", " lang="en"/>
-<l:template name="range-separator" text="-" lang="en"/>
-</l:context>
-<l:context name="iso690"><l:template name="lastfirst.sep" text=", " lang="en"/>
-<l:template name="alt.person.two.sep" text=" â " lang="en"/>
-<l:template name="alt.person.last.sep" text=" â " lang="en"/>
-<l:template name="alt.person.more.sep" text=" â " lang="en"/>
-<l:template name="primary.editor" text=" (ed.)" lang="en"/>
-<l:template name="primary.many" text=", et al." lang="en"/>
-<l:template name="primary.sep" text=". " lang="en"/>
-<l:template name="submaintitle.sep" text=": " lang="en"/>
-<l:template name="title.sep" text=". " lang="en"/>
-<l:template name="othertitle.sep" text=", " lang="en"/>
-<l:template name="medium1" text=" [" lang="en"/>
-<l:template name="medium2" text="]" lang="en"/>
-<l:template name="secondary.person.sep" text="; " lang="en"/>
-<l:template name="secondary.sep" text=". " lang="en"/>
-<l:template name="respons.sep" text=". " lang="en"/>
-<l:template name="edition.sep" text=". " lang="en"/>
-<l:template name="edition.serial.sep" text=", " lang="en"/>
-<l:template name="issuing.range" text="-" lang="en"/>
-<l:template name="issuing.div" text=", " lang="en"/>
-<l:template name="issuing.sep" text=". " lang="en"/>
-<l:template name="partnr.sep" text=". " lang="en"/>
-<l:template name="placepubl.sep" text=": " lang="en"/>
-<l:template name="publyear.sep" text=", " lang="en"/>
-<l:template name="pubinfo.sep" text=". " lang="en"/>
-<l:template name="spec.pubinfo.sep" text=", " lang="en"/>
-<l:template name="upd.sep" text=", " lang="en"/>
-<l:template name="datecit1" text=" [cited " lang="en"/>
-<l:template name="datecit2" text="]" lang="en"/>
-<l:template name="extent.sep" text=". " lang="en"/>
-<l:template name="locs.sep" text=", " lang="en"/>
-<l:template name="location.sep" text=". " lang="en"/>
-<l:template name="serie.sep" text=". " lang="en"/>
-<l:template name="notice.sep" text=". " lang="en"/>
-<l:template name="access" text="Available " lang="en"/>
-<l:template name="acctoo" text="Also available " lang="en"/>
-<l:template name="onwww" text="from World Wide Web" lang="en"/>
-<l:template name="oninet" text="from Internet" lang="en"/>
-<l:template name="access.end" text=": " lang="en"/>
-<l:template name="link1" text="&lt;" lang="en"/>
-<l:template name="link2" text="&gt;" lang="en"/>
-<l:template name="access.sep" text=". " lang="en"/>
-<l:template name="isbn" text="ISBN " lang="en"/>
-<l:template name="issn" text="ISSN " lang="en"/>
-<l:template name="stdnum.sep" text=". " lang="en"/>
-<l:template name="patcountry.sep" text=". " lang="en"/>
-<l:template name="pattype.sep" text=", " lang="en"/>
-<l:template name="patnum.sep" text=". " lang="en"/>
-<l:template name="patdate.sep" text=". " lang="en"/>
-</l:context><l:letters><l:l i="-1"/>
-<l:l i="0">å
-¶å®</l:l>
-<l:l i="10">A</l:l>
-<l:l i="10">a</l:l>
-<l:l i="20">B</l:l>
-<l:l i="20">b</l:l>
-<l:l i="30">C</l:l>
-<l:l i="30">c</l:l>
-<l:l i="40">D</l:l>
-<l:l i="40">d</l:l>
-<l:l i="50">E</l:l>
-<l:l i="50">e</l:l>
-<l:l i="60">F</l:l>
-<l:l i="60">f</l:l>
-<l:l i="70">G</l:l>
-<l:l i="70">g</l:l>
-<l:l i="80">H</l:l>
-<l:l i="80">h</l:l>
-<l:l i="90">I</l:l>
-<l:l i="90">i</l:l>
-<l:l i="100">J</l:l>
-<l:l i="100">j</l:l>
-<l:l i="110">K</l:l>
-<l:l i="110">k</l:l>
-<l:l i="120">L</l:l>
-<l:l i="120">l</l:l>
-<l:l i="130">M</l:l>
-<l:l i="130">m</l:l>
-<l:l i="140">N</l:l>
-<l:l i="140">n</l:l>
-<l:l i="150">O</l:l>
-<l:l i="150">o</l:l>
-<l:l i="160">P</l:l>
-<l:l i="160">p</l:l>
-<l:l i="170">Q</l:l>
-<l:l i="170">q</l:l>
-<l:l i="180">R</l:l>
-<l:l i="180">r</l:l>
-<l:l i="190">S</l:l>
-<l:l i="190">s</l:l>
-<l:l i="200">T</l:l>
-<l:l i="200">t</l:l>
-<l:l i="210">U</l:l>
-<l:l i="210">u</l:l>
-<l:l i="220">V</l:l>
-<l:l i="220">v</l:l>
-<l:l i="230">W</l:l>
-<l:l i="230">w</l:l>
-<l:l i="240">X</l:l>
-<l:l i="240">x</l:l>
-<l:l i="250">Y</l:l>
-<l:l i="250">y</l:l>
-<l:l i="260">Z</l:l>
-<l:l i="260">z</l:l>
-</l:letters>
-</l:l10n>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/zh_tw.xml
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/zh_tw.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,1262 +1,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="zh_tw" english-language-name="Chinese (Taiwan)">
-
-<!-- * This file is generated automatically. -->
-<!-- * To submit changes to this file upstream (to the DocBook Project) -->
-<!-- * do not submit an edited version of this file. Instead, submit an -->
-<!-- * edited version of the source file at the following location: -->
-<!-- * -->
-<!-- *  https://svn.sourceforge.net/svnroot/docbook/trunk/gentext/locale/zh_tw.xml -->
-<!-- * -->
-<!-- * E-mail the edited zh_tw.xml source file to: -->
-<!-- * -->
-<!-- *  docbook-developers@lists.sourceforge.net -->
-
-<!-- ******************************************************************** -->
-
-<!-- This file is part of the XSL DocBook Stylesheet distribution. -->
-<!-- See ../README or http://docbook.sf.net/release/xsl/current/ for -->
-<!-- copyright and other information. -->
-
-<!-- ******************************************************************** -->
-<!-- In these files, % with a letter is used for a placeholder: -->
-<!--   %t is the current element's title -->
-<!--   %s is the current element's subtitle (if applicable)-->
-<!--   %n is the current element's number label-->
-<!--   %p is the current element's page number (if applicable)-->
-<!-- ******************************************************************** -->
-
-
-<l:gentext key="Abstract" text="æèŠ"/>
-<l:gentext key="abstract" text="æèŠ"/>
-<l:gentext key="Answer" text="ç­ïŒ"/>
-<l:gentext key="answer" text="ç­ïŒ"/>
-<l:gentext key="Appendix" text="éé"/>
-<l:gentext key="appendix" text="éé"/>
-<l:gentext key="Article" text="æç« "/>
-<l:gentext key="article" text="æç« "/>
-<l:gentext key="Author" text="Author" lang="en"/>
-<l:gentext key="Bibliography" text="åèæç»"/>
-<l:gentext key="bibliography" text="åèæç»"/>
-<l:gentext key="Book" text="æžç®"/>
-<l:gentext key="book" text="æžç®"/>
-<l:gentext key="CAUTION" text="æ³šæ"/>
-<l:gentext key="Caution" text="æ³šæ"/>
-<l:gentext key="caution" text="æ³šæ"/>
-<l:gentext key="Chapter" text="ç« "/>
-<l:gentext key="chapter" text="ç« "/>
-<l:gentext key="Colophon" text="çæ¬èšé"/>
-<l:gentext key="colophon" text="çæ¬èšé"/>
-<l:gentext key="Copyright" text="çæ¬"/>
-<l:gentext key="copyright" text="çæ¬"/>
-<l:gentext key="Dedication" text="å¥ç»"/>
-<l:gentext key="dedication" text="å¥ç»"/>
-<l:gentext key="Edition" text="ç"/>
-<l:gentext key="edition" text="ç"/>
-<l:gentext key="Editor" text="Editor" lang="en"/>
-<l:gentext key="Equation" text="æ¹çšåŒ"/>
-<l:gentext key="equation" text="æ¹çšåŒ"/>
-<l:gentext key="Example" text="ç¯äŸ"/>
-<l:gentext key="example" text="ç¯äŸ"/>
-<l:gentext key="Figure" text="ååœ¢"/>
-<l:gentext key="figure" text="ååœ¢"/>
-<l:gentext key="Glossary" text="å°èŸ­åœ"/>
-<l:gentext key="glossary" text="å°èŸ­åœ"/>
-<l:gentext key="GlossSee" text="åèŠ"/>
-<l:gentext key="glosssee" text="åèŠ"/>
-<l:gentext key="GlossSeeAlso" text="åŠåèŠ"/>
-<l:gentext key="glossseealso" text="åŠåèŠ"/>
-<l:gentext key="IMPORTANT" text="éèŠ"/>
-<l:gentext key="important" text="éèŠ"/>
-<l:gentext key="Important" text="éèŠ"/>
-<l:gentext key="Index" text="çŽ¢åŒ"/>
-<l:gentext key="index" text="çŽ¢åŒ"/>
-<l:gentext key="ISBN" text="ISBN"/>
-<l:gentext key="isbn" text="ISBN"/>
-<l:gentext key="LegalNotice" text="æ³åŸè²æ"/>
-<l:gentext key="legalnotice" text="æ³åŸè²æ"/>
-<l:gentext key="MsgAud" text="è®è
-"/>
-<l:gentext key="msgaud" text="è®è
-"/>
-<l:gentext key="MsgLevel" text="çšåºŠ"/>
-<l:gentext key="msglevel" text="çšåºŠ"/>
-<l:gentext key="MsgOrig" text="åºè"/>
-<l:gentext key="msgorig" text="åºè"/>
-<l:gentext key="NOTE" text="æ³š"/>
-<l:gentext key="Note" text="æ³š"/>
-<l:gentext key="note" text="æ³š"/>
-<l:gentext key="Part" text="éš"/>
-<l:gentext key="part" text="éš"/>
-<l:gentext key="Preface" text="åºèš"/>
-<l:gentext key="preface" text="åºèš"/>
-<l:gentext key="Procedure" text="éçš"/>
-<l:gentext key="procedure" text="éçš"/>
-<l:gentext key="ProductionSet" text="Production"/>
-<l:gentext key="PubDate" text="Publication Date" lang="en"/>
-<l:gentext key="pubdate" text="Publication date" lang="en"/>
-<l:gentext key="Published" text="åºç"/>
-<l:gentext key="published" text="åºç"/>
-<l:gentext key="Publisher" text="Publisher" lang="en"/>
-<l:gentext key="Qandadiv" text="åïŒäžç­ïŒ"/>
-<l:gentext key="qandadiv" text="åïŒäžç­ïŒ"/>
-<l:gentext key="QandASet" text="Frequently Asked Questions" lang="en"/>
-<l:gentext key="Question" text="åïŒ"/>
-<l:gentext key="question" text="åïŒ"/>
-<l:gentext key="RefEntry" text="åç
-§é 
-ç®"/>
-<l:gentext key="refentry" text="åç
-§é 
-ç®"/>
-<l:gentext key="Reference" text="åè"/>
-<l:gentext key="reference" text="åè"/>
-<l:gentext key="References" text="References" lang="en"/>
-<l:gentext key="RefName" text="åèå"/>
-<l:gentext key="refname" text="åèå"/>
-<l:gentext key="RefSection" text="åç
-§ç« ç¯"/>
-<l:gentext key="refsection" text="åç
-§ç« ç¯"/>
-<l:gentext key="RefSynopsisDiv" text="å€§ç¶±"/>
-<l:gentext key="refsynopsisdiv" text="å€§ç¶±"/>
-<l:gentext key="RevHistory" text="ä¿®èšèšé"/>
-<l:gentext key="revhistory" text="ä¿®èšèšé"/>
-<l:gentext key="revision" text="ä¿®èš"/>
-<l:gentext key="Revision" text="ä¿®èš"/>
-<l:gentext key="sect1" text="Section"/>
-<l:gentext key="sect2" text="Section"/>
-<l:gentext key="sect3" text="Section"/>
-<l:gentext key="sect4" text="Section"/>
-<l:gentext key="sect5" text="Section"/>
-<l:gentext key="section" text="ç¯"/>
-<l:gentext key="Section" text="ç¯"/>
-<l:gentext key="see" text="èŠ"/>
-<l:gentext key="See" text="èŠ"/>
-<l:gentext key="seealso" text="åŠèŠ"/>
-<l:gentext key="Seealso" text="åŠèŠ"/>
-<l:gentext key="SeeAlso" text="åŠèŠ"/>
-<l:gentext key="set" text="Set"/>
-<l:gentext key="Set" text="Set"/>
-<l:gentext key="setindex" text="Set Index"/>
-<l:gentext key="SetIndex" text="Set Index"/>
-<l:gentext key="Sidebar" text=""/>
-<l:gentext key="sidebar" text=""/>
-<l:gentext key="step" text="æ­¥é©"/>
-<l:gentext key="Step" text="æ­¥é©"/>
-<l:gentext key="table" text="è¡šæ Œ"/>
-<l:gentext key="Table" text="è¡šæ Œ"/>
-<l:gentext key="task" text="Task" lang="en"/>
-<l:gentext key="Task" text="Task" lang="en"/>
-<l:gentext key="tip" text="æç€º"/>
-<l:gentext key="TIP" text="æç€º"/>
-<l:gentext key="Tip" text="æç€º"/>
-<l:gentext key="Warning" text="è­Šå"/>
-<l:gentext key="warning" text="è­Šå"/>
-<l:gentext key="WARNING" text="è­Šå"/>
-<l:gentext key="and" text="äž"/>
-<l:gentext key="by" text="ç±"/>
-<l:gentext key="Edited" text="ç·šèŒ¯"/>
-<l:gentext key="edited" text="ç·šèŒ¯"/>
-<l:gentext key="Editedby" text="ç·šèŒ¯"/>
-<l:gentext key="editedby" text="ç·šèŒ¯"/>
-<l:gentext key="in" text="åš"/>
-<l:gentext key="lastlistcomma" text=","/>
-<l:gentext key="listcomma" text=","/>
-<l:gentext key="nonexistantelement" text="äžå­åšçå
-çŽ "/>
-<l:gentext key="notes" text="æ³š"/>
-<l:gentext key="Notes" text="æ³š"/>
-<l:gentext key="Pgs" text="é "/>
-<l:gentext key="pgs" text="é "/>
-<l:gentext key="Revisedby" text="ä¿®èš"/>
-<l:gentext key="revisedby" text="ä¿®èš"/>
-<l:gentext key="TableNotes" text="æ³šé"/>
-<l:gentext key="tablenotes" text="æ³šé"/>
-<l:gentext key="TableofContents" text="å
-§å®¹ç®é"/>
-<l:gentext key="tableofcontents" text="å
-§å®¹ç®é"/>
-<l:gentext key="unexpectedelementname" text="éé æçå
-çŽ å"/>
-<l:gentext key="unsupported" text="æªæ¯æŽ"/>
-<l:gentext key="xrefto" text="åç
-§"/>
-<l:gentext key="Authors" text="Authors" lang="en"/>
-<l:gentext key="copyeditor" text="Copy Editor" lang="en"/>
-<l:gentext key="graphicdesigner" text="Graphic Designer" lang="en"/>
-<l:gentext key="productioneditor" text="Production Editor" lang="en"/>
-<l:gentext key="technicaleditor" text="Technical Editor" lang="en"/>
-<l:gentext key="translator" text="Translator" lang="en"/>
-<l:gentext key="listofequations" text="å
-¬åŒç®é"/>
-<l:gentext key="ListofEquations" text="å
-¬åŒç®é"/>
-<l:gentext key="ListofExamples" text="ç¯äŸç®é"/>
-<l:gentext key="listofexamples" text="ç¯äŸç®é"/>
-<l:gentext key="ListofFigures" text="éåç®é"/>
-<l:gentext key="listoffigures" text="éåç®é"/>
-<l:gentext key="ListofProcedures" text="List of Procedures" lang="en"/>
-<l:gentext key="listofprocedures" text="List of Procedures" lang="en"/>
-<l:gentext key="listoftables" text="éè¡šç®é"/>
-<l:gentext key="ListofTables" text="éè¡šç®é"/>
-<l:gentext key="ListofUnknown" text="å
-¶å®å
-§å®¹ç®é"/>
-<l:gentext key="listofunknown" text="å
-¶å®å
-§å®¹ç®é"/>
-<l:gentext key="nav-home" text="å
-§å®¹"/>
-<l:gentext key="nav-next" text="äžäžé "/>
-<l:gentext key="nav-next-sibling" text="å¿«éååŸ"/>
-<l:gentext key="nav-prev" text="åäžé "/>
-<l:gentext key="nav-prev-sibling" text="å¿«éåå"/>
-<l:gentext key="nav-up" text="äžäžå±€"/>
-<l:gentext key="nav-toc" text="ToC" lang="en"/>
-<l:gentext key="Draft" text="Draft"/>
-<l:gentext key="above" text="above"/>
-<l:gentext key="below" text="below"/>
-<l:gentext key="sectioncalled" text="the section called"/>
-<l:gentext key="index symbols" text="Symbols"/>
-<l:gentext key="lowercase.alpha" text="abcdefghijklmnopqrstuvwxyz" lang="en"/>
-<l:gentext key="uppercase.alpha" text="ABCDEFGHIJKLMNOPQRSTUVWXYZ" lang="en"/>
-<l:gentext key="normalize.sort.input" text="AaÃÃ ÃÃ¡ÃÃ¢ÃÃ£ÃÃ€Ã
-Ã¥ÄÄÄÄÄÄ
-ÇÇÇÇÇ Ç¡ÇºÇ»ÈÈÈÈÈŠÈ§ážážáºáº áº¡áº¢áº£áº€áº¥áºŠáº§áºšáº©áºªáº«áº¬áº­áº®áº¯áº°áº±áº²áº³áºŽáºµáº¶áº·BbÆÆÉÆÆážážážáž
-ážážCcÃÃ§ÄÄÄÄÄÄÄÄÆÆÉážážDdÄÄÄÄÆÉÆÆÇ
-Ç²È¡ÉážážážážážážážážážážEeÃÃšÃÃ©ÃÃªÃÃ«ÄÄÄÄÄÄÄÄÄÄÈÈ
-ÈÈÈšÈ©ážážážážážážážážážážáºžáº¹áººáº»áºŒáºœáºŸáº¿á»á»á»á»á»á»
-á»á»FfÆÆážážGgÄÄÄÄÄ Ä¡Ä¢Ä£ÆÉ Ç€Ç¥ÇŠÇ§ÇŽÇµáž áž¡HhÄ€Ä¥ÄŠÄ§ÈÈÉŠáž¢áž£áž€áž¥ážŠáž§ážšáž©ážªáž«áºIiÃÃ¬ÃÃ­ÃÃ®ÃÃ¯ÄšÄ©ÄªÄ«Ä¬Ä­Ä®Ä¯Ä°ÆÉšÇÇÈÈÈÈáž¬áž­áž®áž¯á»á»á»á»JjÄŽÄµÇ°ÊKkÄ¶Ä·ÆÆÇšÇ©áž°áž±áž²áž³ážŽážµLlÄ¹ÄºÄ»ÄŒÄœÄŸÄ¿ÅÅÅÆÇÈŽÉ«É¬É­áž¶áž·ážžáž¹ážºáž»ážŒážœMmÉ±ážŸáž¿á¹á¹á¹á¹NnÃÃ±ÅÅÅ
-ÅÅÅÆÉ²ÆÈ ÇÇžÇ¹ÈµÉ³á¹á¹
-á¹á¹á¹á¹á¹á¹OoÃÃ²ÃÃ³ÃÃŽÃÃµÃÃ¶ÃÃžÅÅÅÅÅÅÆÆ Æ¡ÇÇÇªÇ«Ç¬Ç­ÇŸÇ¿ÈÈÈÈÈªÈ«È¬È­È®È¯È°È±á¹á¹á¹á¹á¹á¹á¹á¹á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á» á»¡á»¢á»£PpÆ€Æ¥á¹á¹á¹á¹QqÊ RrÅÅÅÅÅÅÈÈÈÈÉŒÉœÉŸá¹á¹á¹á¹á¹á¹á¹á¹SsÅÅÅÅÅÅÅ Å¡ÈÈÊá¹ á¹¡á¹¢á¹£á¹€á¹¥á¹Šá¹§á¹šá¹©TtÅ¢Å£Å€Å¥ÅŠÅ§Æ«Æ¬Æ­Æ®ÊÈÈÈ¶á¹ªá¹«á¹¬á¹­á¹®á¹¯á¹°á¹±áºUuÃÃ¹ÃÃºÃÃ»ÃÃŒÅšÅ©ÅªÅ«Å¬Å­Å®Å¯Å°Å±Å²Å³Æ¯Æ°ÇÇÇÇÇÇÇÇÇÇÈÈÈÈá¹²á¹³á¹Žá¹µá¹¶á¹·á¹žá¹¹á¹ºá¹»á»€á»¥á»Šá»§á»šá»©á»ªá»«á»¬á»­á»®á»¯á»°á»±VvÆ²Êá¹Œá¹œá¹Ÿá¹¿WwÅŽÅµáºáºáºáºáºáº
-áºáºáºáºáºXxáºáºáºáºYyÃÃœÃ¿ÅžÅ¶Å·Æ³ÆŽÈ²È³áºáºáºá»²á»³á»Žá»µá»¶á»·á»žá»¹ZzÅ¹ÅºÅ»ÅŒÅœÅŸÆµÆ¶È€È¥ÊÊáºáºáºáºáºáºáº" lang="en"/>
-<l:gentext key="normalize.sort.output" text="AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ" lang="en"/>
-<l:dingbat key="startquote" text="â"/>
-<l:dingbat key="endquote" text="â"/>
-<l:dingbat key="nestedstartquote" text="â"/>
-<l:dingbat key="nestedendquote" text="â"/>
-<l:dingbat key="singlestartquote" text="â" lang="en"/>
-<l:dingbat key="singleendquote" text="â" lang="en"/>
-<l:dingbat key="bullet" text="â¢"/>
-<l:gentext key="hyphenation-character" text="-" lang="en"/>
-<l:gentext key="hyphenation-push-character-count" text="2" lang="en"/>
-<l:gentext key="hyphenation-remain-character-count" text="2" lang="en"/>
-<l:context name="styles"><l:template name="person-name" text="first-last"/>
-</l:context>
-<l:context name="title"><l:template name="abstract" text="%t"/>
-<l:template name="answer" text="%t"/>
-<l:template name="appendix" text="éé %n. %t"/>
-<l:template name="article" text="%t"/>
-<l:template name="authorblurb" text="%t"/>
-<l:template name="bibliodiv" text="%t"/>
-<l:template name="biblioentry" text="%t"/>
-<l:template name="bibliography" text="%t"/>
-<l:template name="bibliolist" text="%t" lang="en"/>
-<l:template name="bibliomixed" text="%t"/>
-<l:template name="bibliomset" text="%t"/>
-<l:template name="biblioset" text="%t"/>
-<l:template name="blockquote" text="%t"/>
-<l:template name="book" text="%t"/>
-<l:template name="calloutlist" text="%t"/>
-<l:template name="caution" text="%t"/>
-<l:template name="chapter" text="ç«  %n. %t"/>
-<l:template name="colophon" text="%t"/>
-<l:template name="dedication" text="%t"/>
-<l:template name="equation" text="æ¹çšåŒ %n. %t"/>
-<l:template name="example" text="ç¯äŸ %n. %t"/>
-<l:template name="figure" text="ååœ¢ %n. %t"/>
-<l:template name="foil" text="%t" lang="en"/>
-<l:template name="foilgroup" text="%t" lang="en"/>
-<l:template name="formalpara" text="%t"/>
-<l:template name="glossary" text="%t"/>
-<l:template name="glossdiv" text="%t"/>
-<l:template name="glosslist" text="%t" lang="en"/>
-<l:template name="glossentry" text="%t" lang="en"/>
-<l:template name="important" text="%t"/>
-<l:template name="index" text="%t"/>
-<l:template name="indexdiv" text="%t"/>
-<l:template name="itemizedlist" text="%t"/>
-<l:template name="legalnotice" text="%t"/>
-<l:template name="listitem" text=""/>
-<l:template name="lot" text="%t"/>
-<l:template name="msg" text="%t"/>
-<l:template name="msgexplan" text="%t"/>
-<l:template name="msgmain" text="%t"/>
-<l:template name="msgrel" text="%t"/>
-<l:template name="msgset" text="%t"/>
-<l:template name="msgsub" text="%t"/>
-<l:template name="note" text="%t"/>
-<l:template name="orderedlist" text="%t"/>
-<l:template name="part" text="éš %n. %t"/>
-<l:template name="partintro" text="%t"/>
-<l:template name="preface" text="%t"/>
-<l:template name="procedure" text="%t"/>
-<l:template name="procedure.formal" text="éçšÂ %n.Â %t"/>
-<l:template name="productionset" text="%t"/>
-<l:template name="productionset.formal" text="ProductionÂ %n"/>
-<l:template name="qandadiv" text="%t"/>
-<l:template name="qandaentry" text="%t"/>
-<l:template name="qandaset" text="%t"/>
-<l:template name="question" text="%t"/>
-<l:template name="refentry" text="%t"/>
-<l:template name="reference" text="%t"/>
-<l:template name="refsection" text="%t" lang="en"/>
-<l:template name="refsect1" text="%t"/>
-<l:template name="refsect2" text="%t"/>
-<l:template name="refsect3" text="%t"/>
-<l:template name="refsynopsisdiv" text="%t"/>
-<l:template name="refsynopsisdivinfo" text="%t"/>
-<l:template name="segmentedlist" text="%t"/>
-<l:template name="set" text="%t"/>
-<l:template name="setindex" text="%t"/>
-<l:template name="sidebar" text="%t"/>
-<l:template name="step" text="%t"/>
-<l:template name="table" text="è¡šæ Œ %n. %t"/>
-<l:template name="task" text="%t" lang="en"/>
-<l:template name="tasksummary" text="%t" lang="en"/>
-<l:template name="taskprerequisites" text="%t" lang="en"/>
-<l:template name="taskrelated" text="%t" lang="en"/>
-<l:template name="tip" text="%t"/>
-<l:template name="toc" text="%t"/>
-<l:template name="variablelist" text="%t"/>
-<l:template name="varlistentry" text="" lang="en"/>
-<l:template name="warning" text="%t"/>
-</l:context>
-<l:context name="title-unnumbered"><l:template name="appendix" text="%t"/>
-<l:template name="article/appendix" text="%t" lang="en"/>
-<l:template name="bridgehead" text="%t"/>
-<l:template name="chapter" text="%t"/>
-<l:template name="sect1" text="%t"/>
-<l:template name="sect2" text="%t"/>
-<l:template name="sect3" text="%t"/>
-<l:template name="sect4" text="%t"/>
-<l:template name="sect5" text="%t"/>
-<l:template name="section" text="%t"/>
-<l:template name="simplesect" text="%t"/>
-<l:template name="part" text="%t" lang="en"/>
-</l:context>
-<l:context name="title-numbered"><l:template name="appendix" text="éé %n. %t"/>
-<l:template name="article/appendix" text="%n.Â %t" lang="en"/>
-<l:template name="bridgehead" text="%t"/>
-<l:template name="chapter" text="ç«  %n. %t"/>
-<l:template name="part" text="éšÂ %n.Â %t"/>
-<l:template name="sect1" text="%n. %t"/>
-<l:template name="sect2" text="%n. %t"/>
-<l:template name="sect3" text="%n. %t"/>
-<l:template name="sect4" text="%n. %t"/>
-<l:template name="sect5" text="%n. %t"/>
-<l:template name="section" text="%n. %t"/>
-<l:template name="simplesect" text="%n. %t"/>
-</l:context>
-<l:context name="subtitle"><l:template name="appendix" text="%s"/>
-<l:template name="article" text="%s"/>
-<l:template name="bibliodiv" text="%s"/>
-<l:template name="biblioentry" text="%s"/>
-<l:template name="bibliography" text="%s"/>
-<l:template name="bibliomixed" text="%s"/>
-<l:template name="bibliomset" text="%s"/>
-<l:template name="biblioset" text="%s"/>
-<l:template name="book" text="%s"/>
-<l:template name="chapter" text="%s"/>
-<l:template name="colophon" text="%s"/>
-<l:template name="dedication" text="%s"/>
-<l:template name="glossary" text="%s"/>
-<l:template name="glossdiv" text="%s"/>
-<l:template name="index" text="%s"/>
-<l:template name="indexdiv" text="%s"/>
-<l:template name="lot" text="%s"/>
-<l:template name="part" text="%s"/>
-<l:template name="partintro" text="%s"/>
-<l:template name="preface" text="%s"/>
-<l:template name="refentry" text="%s"/>
-<l:template name="reference" text="%s"/>
-<l:template name="refsection" text="%s" lang="en"/>
-<l:template name="refsect1" text="%s"/>
-<l:template name="refsect2" text="%s"/>
-<l:template name="refsect3" text="%s"/>
-<l:template name="refsynopsisdiv" text="%s"/>
-<l:template name="sect1" text="%s"/>
-<l:template name="sect2" text="%s"/>
-<l:template name="sect3" text="%s"/>
-<l:template name="sect4" text="%s"/>
-<l:template name="sect5" text="%s"/>
-<l:template name="section" text="%s"/>
-<l:template name="set" text="%s"/>
-<l:template name="setindex" text="%s"/>
-<l:template name="sidebar" text="%s"/>
-<l:template name="simplesect" text="%s"/>
-<l:template name="toc" text="%s"/>
-</l:context>
-<l:context name="xref"><l:template name="abstract" text="%t"/>
-<l:template name="answer" text="ç­ïŒÂ %n"/>
-<l:template name="appendix" text="%t"/>
-<l:template name="article" text="%t"/>
-<l:template name="authorblurb" text="%t"/>
-<l:template name="bibliodiv" text="%t"/>
-<l:template name="bibliography" text="%t"/>
-<l:template name="bibliomset" text="%t"/>
-<l:template name="biblioset" text="%t"/>
-<l:template name="blockquote" text="%t"/>
-<l:template name="book" text="%t"/>
-<l:template name="calloutlist" text="%t"/>
-<l:template name="caution" text="%t"/>
-<l:template name="chapter" text="%t"/>
-<l:template name="colophon" text="%t"/>
-<l:template name="constraintdef" text="%t"/>
-<l:template name="dedication" text="%t"/>
-<l:template name="equation" text="%t"/>
-<l:template name="example" text="%t"/>
-<l:template name="figure" text="%t"/>
-<l:template name="foil" text="%t" lang="en"/>
-<l:template name="foilgroup" text="%t" lang="en"/>
-<l:template name="formalpara" text="%t"/>
-<l:template name="glossary" text="%t"/>
-<l:template name="glossdiv" text="%t"/>
-<l:template name="important" text="%t"/>
-<l:template name="index" text="%t"/>
-<l:template name="indexdiv" text="%t"/>
-<l:template name="itemizedlist" text="%t"/>
-<l:template name="legalnotice" text="%t"/>
-<l:template name="listitem" text="%n"/>
-<l:template name="lot" text="%t"/>
-<l:template name="msg" text="%t"/>
-<l:template name="msgexplan" text="%t"/>
-<l:template name="msgmain" text="%t"/>
-<l:template name="msgrel" text="%t"/>
-<l:template name="msgset" text="%t"/>
-<l:template name="msgsub" text="%t"/>
-<l:template name="note" text="%t"/>
-<l:template name="orderedlist" text="%t"/>
-<l:template name="part" text="%t"/>
-<l:template name="partintro" text="%t"/>
-<l:template name="preface" text="%t"/>
-<l:template name="procedure" text="%t"/>
-<l:template name="productionset" text="%t"/>
-<l:template name="qandadiv" text="%t"/>
-<l:template name="qandaentry" text="åïŒÂ %n"/>
-<l:template name="qandaset" text="%t"/>
-<l:template name="question" text="åïŒÂ %n"/>
-<l:template name="reference" text="%t"/>
-<l:template name="refsynopsisdiv" text="%t"/>
-<l:template name="segmentedlist" text="%t"/>
-<l:template name="set" text="%t"/>
-<l:template name="setindex" text="%t"/>
-<l:template name="sidebar" text="%t"/>
-<l:template name="table" text="%t"/>
-<l:template name="task" text="%t" lang="en"/>
-<l:template name="tip" text="%t"/>
-<l:template name="toc" text="%t"/>
-<l:template name="variablelist" text="%t"/>
-<l:template name="varlistentry" text="%n"/>
-<l:template name="warning" text="%t"/>
-<l:template name="olink.document.citation" text=" in %o" lang="en"/>
-<l:template name="olink.page.citation" text=" (page %p)" lang="en"/>
-<l:template name="page.citation" text=" [%p]"/>
-<l:template name="page" text="(page %p)" lang="en"/>
-<l:template name="docname" text=" in %o" lang="en"/>
-<l:template name="docnamelong" text=" in the document titled %o" lang="en"/>
-<l:template name="pageabbrev" text="(p. %p)" lang="en"/>
-<l:template name="Page" text="Page %p" lang="en"/>
-<l:template name="bridgehead" text="â%tâ"/>
-<l:template name="refsection" text="â%tâ"/>
-<l:template name="refsect1" text="â%tâ"/>
-<l:template name="refsect2" text="â%tâ"/>
-<l:template name="refsect3" text="â%tâ"/>
-<l:template name="sect1" text="â%tâ"/>
-<l:template name="sect2" text="â%tâ"/>
-<l:template name="sect3" text="â%tâ"/>
-<l:template name="sect4" text="â%tâ"/>
-<l:template name="sect5" text="â%tâ"/>
-<l:template name="section" text="â%tâ"/>
-<l:template name="simplesect" text="â%tâ"/>
-</l:context>
-<l:context name="xref-number"><l:template name="answer" text="ç­ïŒÂ %n"/>
-<l:template name="appendix" text="ééÂ %n"/>
-<l:template name="bridgehead" text="ç¯Â %n"/>
-<l:template name="chapter" text="ç« Â %n"/>
-<l:template name="equation" text="æ¹çšåŒÂ %n"/>
-<l:template name="example" text="ç¯äŸÂ %n"/>
-<l:template name="figure" text="ååœ¢Â %n"/>
-<l:template name="part" text="éšÂ %n"/>
-<l:template name="procedure" text="éçšÂ %n"/>
-<l:template name="productionset" text="ProductionÂ %n"/>
-<l:template name="qandadiv" text="åïŒäžç­ïŒÂ %n"/>
-<l:template name="qandaentry" text="åïŒÂ %n"/>
-<l:template name="question" text="åïŒÂ %n"/>
-<l:template name="sect1" text="ç¯Â %n"/>
-<l:template name="sect2" text="ç¯Â %n"/>
-<l:template name="sect3" text="ç¯Â %n"/>
-<l:template name="sect4" text="ç¯Â %n"/>
-<l:template name="sect5" text="ç¯Â %n"/>
-<l:template name="section" text="ç¯Â %n"/>
-<l:template name="table" text="è¡šæ ŒÂ %n"/>
-</l:context>
-<l:context name="xref-number-and-title"><l:template name="appendix" text="ééÂ %n, %t"/>
-<l:template name="bridgehead" text="ç¯Â %n, â%tâ"/>
-<l:template name="chapter" text="ç« Â %n, %t"/>
-<l:template name="equation" text="æ¹çšåŒÂ %n, â%tâ"/>
-<l:template name="example" text="ç¯äŸÂ %n, â%tâ"/>
-<l:template name="figure" text="ååœ¢Â %n, â%tâ"/>
-<l:template name="part" text="éšÂ %n, â%tâ"/>
-<l:template name="procedure" text="éçšÂ %n, â%tâ"/>
-<l:template name="productionset" text="ProductionÂ %n, â%tâ"/>
-<l:template name="qandadiv" text="åïŒäžç­ïŒÂ %n, â%tâ"/>
-<l:template name="refsect1" text="the section called â%tâ"/>
-<l:template name="refsect2" text="the section called â%tâ"/>
-<l:template name="refsect3" text="the section called â%tâ"/>
-<l:template name="refsection" text="the section called â%tâ"/>
-<l:template name="sect1" text="ç¯Â %n, â%tâ"/>
-<l:template name="sect2" text="ç¯Â %n, â%tâ"/>
-<l:template name="sect3" text="ç¯Â %n, â%tâ"/>
-<l:template name="sect4" text="ç¯Â %n, â%tâ"/>
-<l:template name="sect5" text="ç¯Â %n, â%tâ"/>
-<l:template name="section" text="ç¯Â %n, â%tâ"/>
-<l:template name="simplesect" text="the section called â%tâ"/>
-<l:template name="table" text="è¡šæ ŒÂ %n, â%tâ"/>
-</l:context>
-<l:context name="authorgroup"><l:template name="sep" text=", "/>
-<l:template name="sep2" text=" äž "/>
-<l:template name="seplast" text=", äž "/>
-</l:context>
-<l:context name="glossary"><l:template name="see" text="åèŠ %t"/>
-<l:template name="seealso" text="åŠåèŠ %t"/>
-</l:context>
-<l:context name="msgset"><l:template name="MsgAud" text="è®è
-: "/>
-<l:template name="MsgLevel" text="çšåºŠ: "/>
-<l:template name="MsgOrig" text="åºè: "/>
-</l:context>
-<l:context name="datetime"><l:template name="format" text="m/d/Y" lang="en"/>
-</l:context>
-<l:context name="termdef"><l:template name="prefix" text="[Definition: " lang="en"/>
-<l:template name="suffix" text="]" lang="en"/>
-</l:context>
-<l:context name="datetime-full"><l:template name="January" text="January" lang="en"/>
-<l:template name="February" text="February" lang="en"/>
-<l:template name="March" text="March" lang="en"/>
-<l:template name="April" text="April" lang="en"/>
-<l:template name="May" text="May" lang="en"/>
-<l:template name="June" text="June" lang="en"/>
-<l:template name="July" text="July" lang="en"/>
-<l:template name="August" text="August" lang="en"/>
-<l:template name="September" text="September" lang="en"/>
-<l:template name="October" text="October" lang="en"/>
-<l:template name="November" text="November" lang="en"/>
-<l:template name="December" text="December" lang="en"/>
-<l:template name="Monday" text="Monday" lang="en"/>
-<l:template name="Tuesday" text="Tuesday" lang="en"/>
-<l:template name="Wednesday" text="Wednesday" lang="en"/>
-<l:template name="Thursday" text="Thursday" lang="en"/>
-<l:template name="Friday" text="Friday" lang="en"/>
-<l:template name="Saturday" text="Saturday" lang="en"/>
-<l:template name="Sunday" text="Sunday" lang="en"/>
-</l:context>
-<l:context name="datetime-abbrev"><l:template name="Jan" text="Jan" lang="en"/>
-<l:template name="Feb" text="Feb" lang="en"/>
-<l:template name="Mar" text="Mar" lang="en"/>
-<l:template name="Apr" text="Apr" lang="en"/>
-<l:template name="May" text="May" lang="en"/>
-<l:template name="Jun" text="Jun" lang="en"/>
-<l:template name="Jul" text="Jul" lang="en"/>
-<l:template name="Aug" text="Aug" lang="en"/>
-<l:template name="Sep" text="Sep" lang="en"/>
-<l:template name="Oct" text="Oct" lang="en"/>
-<l:template name="Nov" text="Nov" lang="en"/>
-<l:template name="Dec" text="Dec" lang="en"/>
-<l:template name="Mon" text="Mon" lang="en"/>
-<l:template name="Tue" text="Tue" lang="en"/>
-<l:template name="Wed" text="Wed" lang="en"/>
-<l:template name="Thu" text="Thu" lang="en"/>
-<l:template name="Fri" text="Fri" lang="en"/>
-<l:template name="Sat" text="Sat" lang="en"/>
-<l:template name="Sun" text="Sun" lang="en"/>
-</l:context>
-<l:context name="htmlhelp"><l:template name="langcode" text="0x0404 Chinese (TAIWAN)"/>
-</l:context>
-<l:context name="index"><l:template name="term-separator" text=", " lang="en"/>
-<l:template name="number-separator" text=", " lang="en"/>
-<l:template name="range-separator" text="-" lang="en"/>
-</l:context>
-<l:context name="iso690"><l:template name="lastfirst.sep" text=", " lang="en"/>
-<l:template name="alt.person.two.sep" text=" â " lang="en"/>
-<l:template name="alt.person.last.sep" text=" â " lang="en"/>
-<l:template name="alt.person.more.sep" text=" â " lang="en"/>
-<l:template name="primary.editor" text=" (ed.)" lang="en"/>
-<l:template name="primary.many" text=", et al." lang="en"/>
-<l:template name="primary.sep" text=". " lang="en"/>
-<l:template name="submaintitle.sep" text=": " lang="en"/>
-<l:template name="title.sep" text=". " lang="en"/>
-<l:template name="othertitle.sep" text=", " lang="en"/>
-<l:template name="medium1" text=" [" lang="en"/>
-<l:template name="medium2" text="]" lang="en"/>
-<l:template name="secondary.person.sep" text="; " lang="en"/>
-<l:template name="secondary.sep" text=". " lang="en"/>
-<l:template name="respons.sep" text=". " lang="en"/>
-<l:template name="edition.sep" text=". " lang="en"/>
-<l:template name="edition.serial.sep" text=", " lang="en"/>
-<l:template name="issuing.range" text="-" lang="en"/>
-<l:template name="issuing.div" text=", " lang="en"/>
-<l:template name="issuing.sep" text=". " lang="en"/>
-<l:template name="partnr.sep" text=". " lang="en"/>
-<l:template name="placepubl.sep" text=": " lang="en"/>
-<l:template name="publyear.sep" text=", " lang="en"/>
-<l:template name="pubinfo.sep" text=". " lang="en"/>
-<l:template name="spec.pubinfo.sep" text=", " lang="en"/>
-<l:template name="upd.sep" text=", " lang="en"/>
-<l:template name="datecit1" text=" [cited " lang="en"/>
-<l:template name="datecit2" text="]" lang="en"/>
-<l:template name="extent.sep" text=". " lang="en"/>
-<l:template name="locs.sep" text=", " lang="en"/>
-<l:template name="location.sep" text=". " lang="en"/>
-<l:template name="serie.sep" text=". " lang="en"/>
-<l:template name="notice.sep" text=". " lang="en"/>
-<l:template name="access" text="Available " lang="en"/>
-<l:template name="acctoo" text="Also available " lang="en"/>
-<l:template name="onwww" text="from World Wide Web" lang="en"/>
-<l:template name="oninet" text="from Internet" lang="en"/>
-<l:template name="access.end" text=": " lang="en"/>
-<l:template name="link1" text="&lt;" lang="en"/>
-<l:template name="link2" text="&gt;" lang="en"/>
-<l:template name="access.sep" text=". " lang="en"/>
-<l:template name="isbn" text="ISBN " lang="en"/>
-<l:template name="issn" text="ISSN " lang="en"/>
-<l:template name="stdnum.sep" text=". " lang="en"/>
-<l:template name="patcountry.sep" text=". " lang="en"/>
-<l:template name="pattype.sep" text=", " lang="en"/>
-<l:template name="patnum.sep" text=". " lang="en"/>
-<l:template name="patdate.sep" text=". " lang="en"/>
-</l:context><l:letters lang="en"><l:l i="-1"/>
-<l:l i="0">Symbols</l:l>
-<l:l i="10">A</l:l>
-<l:l i="10">a</l:l>
-<l:l i="10">Ã</l:l>
-<l:l i="10">Ã </l:l>
-<l:l i="10">Ã</l:l>
-<l:l i="10">Ã¡</l:l>
-<l:l i="10">Ã</l:l>
-<l:l i="10">Ã¢</l:l>
-<l:l i="10">Ã</l:l>
-<l:l i="10">Ã£</l:l>
-<l:l i="10">Ã</l:l>
-<l:l i="10">Ã€</l:l>
-<l:l i="10">Ã
-</l:l>
-<l:l i="10">Ã¥</l:l>
-<l:l i="10">Ä</l:l>
-<l:l i="10">Ä</l:l>
-<l:l i="10">Ä</l:l>
-<l:l i="10">Ä</l:l>
-<l:l i="10">Ä</l:l>
-<l:l i="10">Ä
-</l:l>
-<l:l i="10">Ç</l:l>
-<l:l i="10">Ç</l:l>
-<l:l i="10">Ç</l:l>
-<l:l i="10">Ç</l:l>
-<l:l i="10">Ç </l:l>
-<l:l i="10">Ç¡</l:l>
-<l:l i="10">Çº</l:l>
-<l:l i="10">Ç»</l:l>
-<l:l i="10">È</l:l>
-<l:l i="10">È</l:l>
-<l:l i="10">È</l:l>
-<l:l i="10">È</l:l>
-<l:l i="10">ÈŠ</l:l>
-<l:l i="10">È§</l:l>
-<l:l i="10">áž</l:l>
-<l:l i="10">áž</l:l>
-<l:l i="10">áº</l:l>
-<l:l i="10">áº </l:l>
-<l:l i="10">áº¡</l:l>
-<l:l i="10">áº¢</l:l>
-<l:l i="10">áº£</l:l>
-<l:l i="10">áº€</l:l>
-<l:l i="10">áº¥</l:l>
-<l:l i="10">áºŠ</l:l>
-<l:l i="10">áº§</l:l>
-<l:l i="10">áºš</l:l>
-<l:l i="10">áº©</l:l>
-<l:l i="10">áºª</l:l>
-<l:l i="10">áº«</l:l>
-<l:l i="10">áº¬</l:l>
-<l:l i="10">áº­</l:l>
-<l:l i="10">áº®</l:l>
-<l:l i="10">áº¯</l:l>
-<l:l i="10">áº°</l:l>
-<l:l i="10">áº±</l:l>
-<l:l i="10">áº²</l:l>
-<l:l i="10">áº³</l:l>
-<l:l i="10">áºŽ</l:l>
-<l:l i="10">áºµ</l:l>
-<l:l i="10">áº¶</l:l>
-<l:l i="10">áº·</l:l>
-<l:l i="20">B</l:l>
-<l:l i="20">b</l:l>
-<l:l i="20">Æ</l:l>
-<l:l i="20">Æ</l:l>
-<l:l i="20">É</l:l>
-<l:l i="20">Æ</l:l>
-<l:l i="20">Æ</l:l>
-<l:l i="20">áž</l:l>
-<l:l i="20">áž</l:l>
-<l:l i="20">áž</l:l>
-<l:l i="20">áž
-</l:l>
-<l:l i="20">áž</l:l>
-<l:l i="20">áž</l:l>
-<l:l i="30">C</l:l>
-<l:l i="30">c</l:l>
-<l:l i="30">Ã</l:l>
-<l:l i="30">Ã§</l:l>
-<l:l i="30">Ä</l:l>
-<l:l i="30">Ä</l:l>
-<l:l i="30">Ä</l:l>
-<l:l i="30">Ä</l:l>
-<l:l i="30">Ä</l:l>
-<l:l i="30">Ä</l:l>
-<l:l i="30">Ä</l:l>
-<l:l i="30">Ä</l:l>
-<l:l i="30">Æ</l:l>
-<l:l i="30">Æ</l:l>
-<l:l i="30">É</l:l>
-<l:l i="30">áž</l:l>
-<l:l i="30">áž</l:l>
-<l:l i="40">D</l:l>
-<l:l i="40">d</l:l>
-<l:l i="40">Ä</l:l>
-<l:l i="40">Ä</l:l>
-<l:l i="40">Ä</l:l>
-<l:l i="40">Ä</l:l>
-<l:l i="40">Æ</l:l>
-<l:l i="40">É</l:l>
-<l:l i="40">Æ</l:l>
-<l:l i="40">Æ</l:l>
-<l:l i="40">Ç
-</l:l>
-<l:l i="40">Ç²</l:l>
-<l:l i="40">È¡</l:l>
-<l:l i="40">É</l:l>
-<l:l i="40">áž</l:l>
-<l:l i="40">áž</l:l>
-<l:l i="40">áž</l:l>
-<l:l i="40">áž</l:l>
-<l:l i="40">áž</l:l>
-<l:l i="40">áž</l:l>
-<l:l i="40">áž</l:l>
-<l:l i="40">áž</l:l>
-<l:l i="40">áž</l:l>
-<l:l i="40">áž</l:l>
-<l:l i="50">E</l:l>
-<l:l i="50">e</l:l>
-<l:l i="50">Ã</l:l>
-<l:l i="50">Ãš</l:l>
-<l:l i="50">Ã</l:l>
-<l:l i="50">Ã©</l:l>
-<l:l i="50">Ã</l:l>
-<l:l i="50">Ãª</l:l>
-<l:l i="50">Ã</l:l>
-<l:l i="50">Ã«</l:l>
-<l:l i="50">Ä</l:l>
-<l:l i="50">Ä</l:l>
-<l:l i="50">Ä</l:l>
-<l:l i="50">Ä</l:l>
-<l:l i="50">Ä</l:l>
-<l:l i="50">Ä</l:l>
-<l:l i="50">Ä</l:l>
-<l:l i="50">Ä</l:l>
-<l:l i="50">Ä</l:l>
-<l:l i="50">Ä</l:l>
-<l:l i="50">È</l:l>
-<l:l i="50">È
-</l:l>
-<l:l i="50">È</l:l>
-<l:l i="50">È</l:l>
-<l:l i="50">Èš</l:l>
-<l:l i="50">È©</l:l>
-<l:l i="50">áž</l:l>
-<l:l i="50">áž</l:l>
-<l:l i="50">áž</l:l>
-<l:l i="50">áž</l:l>
-<l:l i="50">áž</l:l>
-<l:l i="50">áž</l:l>
-<l:l i="50">áž</l:l>
-<l:l i="50">áž</l:l>
-<l:l i="50">áž</l:l>
-<l:l i="50">áž</l:l>
-<l:l i="50">áºž</l:l>
-<l:l i="50">áº¹</l:l>
-<l:l i="50">áºº</l:l>
-<l:l i="50">áº»</l:l>
-<l:l i="50">áºŒ</l:l>
-<l:l i="50">áºœ</l:l>
-<l:l i="50">áºŸ</l:l>
-<l:l i="50">áº¿</l:l>
-<l:l i="50">á»</l:l>
-<l:l i="50">á»</l:l>
-<l:l i="50">á»</l:l>
-<l:l i="50">á»</l:l>
-<l:l i="50">á»</l:l>
-<l:l i="50">á»
-</l:l>
-<l:l i="50">á»</l:l>
-<l:l i="50">á»</l:l>
-<l:l i="60">F</l:l>
-<l:l i="60">f</l:l>
-<l:l i="60">Æ</l:l>
-<l:l i="60">Æ</l:l>
-<l:l i="60">áž</l:l>
-<l:l i="60">áž</l:l>
-<l:l i="70">G</l:l>
-<l:l i="70">g</l:l>
-<l:l i="70">Ä</l:l>
-<l:l i="70">Ä</l:l>
-<l:l i="70">Ä</l:l>
-<l:l i="70">Ä</l:l>
-<l:l i="70">Ä </l:l>
-<l:l i="70">Ä¡</l:l>
-<l:l i="70">Ä¢</l:l>
-<l:l i="70">Ä£</l:l>
-<l:l i="70">Æ</l:l>
-<l:l i="70">É </l:l>
-<l:l i="70">Ç€</l:l>
-<l:l i="70">Ç¥</l:l>
-<l:l i="70">ÇŠ</l:l>
-<l:l i="70">Ç§</l:l>
-<l:l i="70">ÇŽ</l:l>
-<l:l i="70">Çµ</l:l>
-<l:l i="70">áž </l:l>
-<l:l i="70">áž¡</l:l>
-<l:l i="80">H</l:l>
-<l:l i="80">h</l:l>
-<l:l i="80">Ä€</l:l>
-<l:l i="80">Ä¥</l:l>
-<l:l i="80">ÄŠ</l:l>
-<l:l i="80">Ä§</l:l>
-<l:l i="80">È</l:l>
-<l:l i="80">È</l:l>
-<l:l i="80">ÉŠ</l:l>
-<l:l i="80">áž¢</l:l>
-<l:l i="80">áž£</l:l>
-<l:l i="80">áž€</l:l>
-<l:l i="80">áž¥</l:l>
-<l:l i="80">ážŠ</l:l>
-<l:l i="80">áž§</l:l>
-<l:l i="80">ážš</l:l>
-<l:l i="80">áž©</l:l>
-<l:l i="80">ážª</l:l>
-<l:l i="80">áž«</l:l>
-<l:l i="80">áº</l:l>
-<l:l i="90">I</l:l>
-<l:l i="90">i</l:l>
-<l:l i="90">Ã</l:l>
-<l:l i="90">Ã¬</l:l>
-<l:l i="90">Ã</l:l>
-<l:l i="90">Ã­</l:l>
-<l:l i="90">Ã</l:l>
-<l:l i="90">Ã®</l:l>
-<l:l i="90">Ã</l:l>
-<l:l i="90">Ã¯</l:l>
-<l:l i="90">Äš</l:l>
-<l:l i="90">Ä©</l:l>
-<l:l i="90">Äª</l:l>
-<l:l i="90">Ä«</l:l>
-<l:l i="90">Ä¬</l:l>
-<l:l i="90">Ä­</l:l>
-<l:l i="90">Ä®</l:l>
-<l:l i="90">Ä¯</l:l>
-<l:l i="90">Ä°</l:l>
-<l:l i="90">Æ</l:l>
-<l:l i="90">Éš</l:l>
-<l:l i="90">Ç</l:l>
-<l:l i="90">Ç</l:l>
-<l:l i="90">È</l:l>
-<l:l i="90">È</l:l>
-<l:l i="90">È</l:l>
-<l:l i="90">È</l:l>
-<l:l i="90">áž¬</l:l>
-<l:l i="90">áž­</l:l>
-<l:l i="90">áž®</l:l>
-<l:l i="90">áž¯</l:l>
-<l:l i="90">á»</l:l>
-<l:l i="90">á»</l:l>
-<l:l i="90">á»</l:l>
-<l:l i="90">á»</l:l>
-<l:l i="100">J</l:l>
-<l:l i="100">j</l:l>
-<l:l i="100">ÄŽ</l:l>
-<l:l i="100">Äµ</l:l>
-<l:l i="100">Ç°</l:l>
-<l:l i="100">Ê</l:l>
-<l:l i="110">K</l:l>
-<l:l i="110">k</l:l>
-<l:l i="110">Ä¶</l:l>
-<l:l i="110">Ä·</l:l>
-<l:l i="110">Æ</l:l>
-<l:l i="110">Æ</l:l>
-<l:l i="110">Çš</l:l>
-<l:l i="110">Ç©</l:l>
-<l:l i="110">áž°</l:l>
-<l:l i="110">áž±</l:l>
-<l:l i="110">áž²</l:l>
-<l:l i="110">áž³</l:l>
-<l:l i="110">ážŽ</l:l>
-<l:l i="110">ážµ</l:l>
-<l:l i="120">L</l:l>
-<l:l i="120">l</l:l>
-<l:l i="120">Ä¹</l:l>
-<l:l i="120">Äº</l:l>
-<l:l i="120">Ä»</l:l>
-<l:l i="120">ÄŒ</l:l>
-<l:l i="120">Äœ</l:l>
-<l:l i="120">ÄŸ</l:l>
-<l:l i="120">Ä¿</l:l>
-<l:l i="120">Å</l:l>
-<l:l i="120">Å</l:l>
-<l:l i="120">Å</l:l>
-<l:l i="120">Æ</l:l>
-<l:l i="120">Ç</l:l>
-<l:l i="120">ÈŽ</l:l>
-<l:l i="120">É«</l:l>
-<l:l i="120">É¬</l:l>
-<l:l i="120">É­</l:l>
-<l:l i="120">áž¶</l:l>
-<l:l i="120">áž·</l:l>
-<l:l i="120">ážž</l:l>
-<l:l i="120">áž¹</l:l>
-<l:l i="120">ážº</l:l>
-<l:l i="120">áž»</l:l>
-<l:l i="120">ážŒ</l:l>
-<l:l i="120">ážœ</l:l>
-<l:l i="130">M</l:l>
-<l:l i="130">m</l:l>
-<l:l i="130">É±</l:l>
-<l:l i="130">ážŸ</l:l>
-<l:l i="130">áž¿</l:l>
-<l:l i="130">á¹</l:l>
-<l:l i="130">á¹</l:l>
-<l:l i="130">á¹</l:l>
-<l:l i="130">á¹</l:l>
-<l:l i="140">N</l:l>
-<l:l i="140">n</l:l>
-<l:l i="140">Ã</l:l>
-<l:l i="140">Ã±</l:l>
-<l:l i="140">Å</l:l>
-<l:l i="140">Å</l:l>
-<l:l i="140">Å
-</l:l>
-<l:l i="140">Å</l:l>
-<l:l i="140">Å</l:l>
-<l:l i="140">Å</l:l>
-<l:l i="140">Æ</l:l>
-<l:l i="140">É²</l:l>
-<l:l i="140">Æ</l:l>
-<l:l i="140">È </l:l>
-<l:l i="140">Ç</l:l>
-<l:l i="140">Çž</l:l>
-<l:l i="140">Ç¹</l:l>
-<l:l i="140">Èµ</l:l>
-<l:l i="140">É³</l:l>
-<l:l i="140">á¹</l:l>
-<l:l i="140">á¹
-</l:l>
-<l:l i="140">á¹</l:l>
-<l:l i="140">á¹</l:l>
-<l:l i="140">á¹</l:l>
-<l:l i="140">á¹</l:l>
-<l:l i="140">á¹</l:l>
-<l:l i="140">á¹</l:l>
-<l:l i="150">O</l:l>
-<l:l i="150">o</l:l>
-<l:l i="150">Ã</l:l>
-<l:l i="150">Ã²</l:l>
-<l:l i="150">Ã</l:l>
-<l:l i="150">Ã³</l:l>
-<l:l i="150">Ã</l:l>
-<l:l i="150">ÃŽ</l:l>
-<l:l i="150">Ã</l:l>
-<l:l i="150">Ãµ</l:l>
-<l:l i="150">Ã</l:l>
-<l:l i="150">Ã¶</l:l>
-<l:l i="150">Ã</l:l>
-<l:l i="150">Ãž</l:l>
-<l:l i="150">Å</l:l>
-<l:l i="150">Å</l:l>
-<l:l i="150">Å</l:l>
-<l:l i="150">Å</l:l>
-<l:l i="150">Å</l:l>
-<l:l i="150">Å</l:l>
-<l:l i="150">Æ</l:l>
-<l:l i="150">Æ </l:l>
-<l:l i="150">Æ¡</l:l>
-<l:l i="150">Ç</l:l>
-<l:l i="150">Ç</l:l>
-<l:l i="150">Çª</l:l>
-<l:l i="150">Ç«</l:l>
-<l:l i="150">Ç¬</l:l>
-<l:l i="150">Ç­</l:l>
-<l:l i="150">ÇŸ</l:l>
-<l:l i="150">Ç¿</l:l>
-<l:l i="150">È</l:l>
-<l:l i="150">È</l:l>
-<l:l i="150">È</l:l>
-<l:l i="150">È</l:l>
-<l:l i="150">Èª</l:l>
-<l:l i="150">È«</l:l>
-<l:l i="150">È¬</l:l>
-<l:l i="150">È­</l:l>
-<l:l i="150">È®</l:l>
-<l:l i="150">È¯</l:l>
-<l:l i="150">È°</l:l>
-<l:l i="150">È±</l:l>
-<l:l i="150">á¹</l:l>
-<l:l i="150">á¹</l:l>
-<l:l i="150">á¹</l:l>
-<l:l i="150">á¹</l:l>
-<l:l i="150">á¹</l:l>
-<l:l i="150">á¹</l:l>
-<l:l i="150">á¹</l:l>
-<l:l i="150">á¹</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á» </l:l>
-<l:l i="150">á»¡</l:l>
-<l:l i="150">á»¢</l:l>
-<l:l i="150">á»£</l:l>
-<l:l i="160">P</l:l>
-<l:l i="160">p</l:l>
-<l:l i="160">Æ€</l:l>
-<l:l i="160">Æ¥</l:l>
-<l:l i="160">á¹</l:l>
-<l:l i="160">á¹</l:l>
-<l:l i="160">á¹</l:l>
-<l:l i="160">á¹</l:l>
-<l:l i="170">Q</l:l>
-<l:l i="170">q</l:l>
-<l:l i="170">Ê </l:l>
-<l:l i="180">R</l:l>
-<l:l i="180">r</l:l>
-<l:l i="180">Å</l:l>
-<l:l i="180">Å</l:l>
-<l:l i="180">Å</l:l>
-<l:l i="180">Å</l:l>
-<l:l i="180">Å</l:l>
-<l:l i="180">Å</l:l>
-<l:l i="180">È</l:l>
-<l:l i="180">È</l:l>
-<l:l i="180">È</l:l>
-<l:l i="180">È</l:l>
-<l:l i="180">ÉŒ</l:l>
-<l:l i="180">Éœ</l:l>
-<l:l i="180">ÉŸ</l:l>
-<l:l i="180">á¹</l:l>
-<l:l i="180">á¹</l:l>
-<l:l i="180">á¹</l:l>
-<l:l i="180">á¹</l:l>
-<l:l i="180">á¹</l:l>
-<l:l i="180">á¹</l:l>
-<l:l i="180">á¹</l:l>
-<l:l i="180">á¹</l:l>
-<l:l i="190">S</l:l>
-<l:l i="190">s</l:l>
-<l:l i="190">Å</l:l>
-<l:l i="190">Å</l:l>
-<l:l i="190">Å</l:l>
-<l:l i="190">Å</l:l>
-<l:l i="190">Å</l:l>
-<l:l i="190">Å</l:l>
-<l:l i="190">Å </l:l>
-<l:l i="190">Å¡</l:l>
-<l:l i="190">È</l:l>
-<l:l i="190">È</l:l>
-<l:l i="190">Ê</l:l>
-<l:l i="190">á¹ </l:l>
-<l:l i="190">á¹¡</l:l>
-<l:l i="190">á¹¢</l:l>
-<l:l i="190">á¹£</l:l>
-<l:l i="190">á¹€</l:l>
-<l:l i="190">á¹¥</l:l>
-<l:l i="190">á¹Š</l:l>
-<l:l i="190">á¹§</l:l>
-<l:l i="190">á¹š</l:l>
-<l:l i="190">á¹©</l:l>
-<l:l i="200">T</l:l>
-<l:l i="200">t</l:l>
-<l:l i="200">Å¢</l:l>
-<l:l i="200">Å£</l:l>
-<l:l i="200">Å€</l:l>
-<l:l i="200">Å¥</l:l>
-<l:l i="200">ÅŠ</l:l>
-<l:l i="200">Å§</l:l>
-<l:l i="200">Æ«</l:l>
-<l:l i="200">Æ¬</l:l>
-<l:l i="200">Æ­</l:l>
-<l:l i="200">Æ®</l:l>
-<l:l i="200">Ê</l:l>
-<l:l i="200">È</l:l>
-<l:l i="200">È</l:l>
-<l:l i="200">È¶</l:l>
-<l:l i="200">á¹ª</l:l>
-<l:l i="200">á¹«</l:l>
-<l:l i="200">á¹¬</l:l>
-<l:l i="200">á¹­</l:l>
-<l:l i="200">á¹®</l:l>
-<l:l i="200">á¹¯</l:l>
-<l:l i="200">á¹°</l:l>
-<l:l i="200">á¹±</l:l>
-<l:l i="200">áº</l:l>
-<l:l i="210">U</l:l>
-<l:l i="210">u</l:l>
-<l:l i="210">Ã</l:l>
-<l:l i="210">Ã¹</l:l>
-<l:l i="210">Ã</l:l>
-<l:l i="210">Ãº</l:l>
-<l:l i="210">Ã</l:l>
-<l:l i="210">Ã»</l:l>
-<l:l i="210">Ã</l:l>
-<l:l i="210">ÃŒ</l:l>
-<l:l i="210">Åš</l:l>
-<l:l i="210">Å©</l:l>
-<l:l i="210">Åª</l:l>
-<l:l i="210">Å«</l:l>
-<l:l i="210">Å¬</l:l>
-<l:l i="210">Å­</l:l>
-<l:l i="210">Å®</l:l>
-<l:l i="210">Å¯</l:l>
-<l:l i="210">Å°</l:l>
-<l:l i="210">Å±</l:l>
-<l:l i="210">Å²</l:l>
-<l:l i="210">Å³</l:l>
-<l:l i="210">Æ¯</l:l>
-<l:l i="210">Æ°</l:l>
-<l:l i="210">Ç</l:l>
-<l:l i="210">Ç</l:l>
-<l:l i="210">Ç</l:l>
-<l:l i="210">Ç</l:l>
-<l:l i="210">Ç</l:l>
-<l:l i="210">Ç</l:l>
-<l:l i="210">Ç</l:l>
-<l:l i="210">Ç</l:l>
-<l:l i="210">Ç</l:l>
-<l:l i="210">Ç</l:l>
-<l:l i="210">È</l:l>
-<l:l i="210">È</l:l>
-<l:l i="210">È</l:l>
-<l:l i="210">È</l:l>
-<l:l i="210">á¹²</l:l>
-<l:l i="210">á¹³</l:l>
-<l:l i="210">á¹Ž</l:l>
-<l:l i="210">á¹µ</l:l>
-<l:l i="210">á¹¶</l:l>
-<l:l i="210">á¹·</l:l>
-<l:l i="210">á¹ž</l:l>
-<l:l i="210">á¹¹</l:l>
-<l:l i="210">á¹º</l:l>
-<l:l i="210">á¹»</l:l>
-<l:l i="210">á»€</l:l>
-<l:l i="210">á»¥</l:l>
-<l:l i="210">á»Š</l:l>
-<l:l i="210">á»§</l:l>
-<l:l i="210">á»š</l:l>
-<l:l i="210">á»©</l:l>
-<l:l i="210">á»ª</l:l>
-<l:l i="210">á»«</l:l>
-<l:l i="210">á»¬</l:l>
-<l:l i="210">á»­</l:l>
-<l:l i="210">á»®</l:l>
-<l:l i="210">á»¯</l:l>
-<l:l i="210">á»°</l:l>
-<l:l i="210">á»±</l:l>
-<l:l i="220">V</l:l>
-<l:l i="220">v</l:l>
-<l:l i="220">Æ²</l:l>
-<l:l i="220">Ê</l:l>
-<l:l i="220">á¹Œ</l:l>
-<l:l i="220">á¹œ</l:l>
-<l:l i="220">á¹Ÿ</l:l>
-<l:l i="220">á¹¿</l:l>
-<l:l i="230">W</l:l>
-<l:l i="230">w</l:l>
-<l:l i="230">ÅŽ</l:l>
-<l:l i="230">Åµ</l:l>
-<l:l i="230">áº</l:l>
-<l:l i="230">áº</l:l>
-<l:l i="230">áº</l:l>
-<l:l i="230">áº</l:l>
-<l:l i="230">áº</l:l>
-<l:l i="230">áº
-</l:l>
-<l:l i="230">áº</l:l>
-<l:l i="230">áº</l:l>
-<l:l i="230">áº</l:l>
-<l:l i="230">áº</l:l>
-<l:l i="230">áº</l:l>
-<l:l i="240">X</l:l>
-<l:l i="240">x</l:l>
-<l:l i="240">áº</l:l>
-<l:l i="240">áº</l:l>
-<l:l i="240">áº</l:l>
-<l:l i="240">áº</l:l>
-<l:l i="250">Y</l:l>
-<l:l i="250">y</l:l>
-<l:l i="250">Ã</l:l>
-<l:l i="250">Ãœ</l:l>
-<l:l i="250">Ã¿</l:l>
-<l:l i="250">Åž</l:l>
-<l:l i="250">Å¶</l:l>
-<l:l i="250">Å·</l:l>
-<l:l i="250">Æ³</l:l>
-<l:l i="250">ÆŽ</l:l>
-<l:l i="250">È²</l:l>
-<l:l i="250">È³</l:l>
-<l:l i="250">áº</l:l>
-<l:l i="250">áº</l:l>
-<l:l i="250">áº</l:l>
-<l:l i="250">á»²</l:l>
-<l:l i="250">á»³</l:l>
-<l:l i="250">á»Ž</l:l>
-<l:l i="250">á»µ</l:l>
-<l:l i="250">á»¶</l:l>
-<l:l i="250">á»·</l:l>
-<l:l i="250">á»ž</l:l>
-<l:l i="250">á»¹</l:l>
-<l:l i="260">Z</l:l>
-<l:l i="260">z</l:l>
-<l:l i="260">Å¹</l:l>
-<l:l i="260">Åº</l:l>
-<l:l i="260">Å»</l:l>
-<l:l i="260">ÅŒ</l:l>
-<l:l i="260">Åœ</l:l>
-<l:l i="260">ÅŸ</l:l>
-<l:l i="260">Æµ</l:l>
-<l:l i="260">Æ¶</l:l>
-<l:l i="260">È€</l:l>
-<l:l i="260">È¥</l:l>
-<l:l i="260">Ê</l:l>
-<l:l i="260">Ê</l:l>
-<l:l i="260">áº</l:l>
-<l:l i="260">áº</l:l>
-<l:l i="260">áº</l:l>
-<l:l i="260">áº</l:l>
-<l:l i="260">áº</l:l>
-<l:l i="260">áº</l:l>
-</l:letters>
-</l:l10n>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/admon.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/admon.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,130 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<xsl:template match="note|important|warning|caution|tip">
-  <xsl:choose>
-    <xsl:when test="$admon.graphics != 0">
-      <xsl:call-template name="graphical.admonition"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="nongraphical.admonition"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="*" mode="admon.graphic.width">
-  <xsl:param name="node" select="."/>
-  <xsl:text>36pt</xsl:text>
-</xsl:template>
-
-<xsl:template name="admon.graphic">
-  <xsl:param name="node" select="."/>
-
-  <xsl:variable name="filename">
-    <xsl:value-of select="$admon.graphics.path"/>
-    <xsl:choose>
-      <xsl:when test="local-name($node)='note'">note</xsl:when>
-      <xsl:when test="local-name($node)='warning'">warning</xsl:when>
-      <xsl:when test="local-name($node)='caution'">caution</xsl:when>
-      <xsl:when test="local-name($node)='tip'">tip</xsl:when>
-      <xsl:when test="local-name($node)='important'">important</xsl:when>
-      <xsl:otherwise>note</xsl:otherwise>
-    </xsl:choose>
-    <xsl:value-of select="$admon.graphics.extension"/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$passivetex.extensions != 0
-                    or $fop.extensions != 0
-                    or $arbortext.extensions != 0">
-      <xsl:value-of select="$filename"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:text>url(</xsl:text>
-      <xsl:value-of select="$filename"/>
-      <xsl:text>)</xsl:text>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="graphical.admonition">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-  <xsl:variable name="graphic.width">
-     <xsl:apply-templates select="." mode="admon.graphic.width"/>
-  </xsl:variable>
-
-  <fo:block id="{$id}"
-            xsl:use-attribute-sets="graphical.admonition.properties">
-    <fo:list-block provisional-distance-between-starts="{$graphic.width} + 18pt"
-                    provisional-label-separation="18pt">
-      <fo:list-item>
-          <fo:list-item-label end-indent="label-end()">
-            <fo:block>
-              <fo:external-graphic width="auto" height="auto"
-                                         content-width="{$graphic.width}" >
-                <xsl:attribute name="src">
-                  <xsl:call-template name="admon.graphic"/>
-                </xsl:attribute>
-              </fo:external-graphic>
-            </fo:block>
-          </fo:list-item-label>
-          <fo:list-item-body start-indent="body-start()">
-            <xsl:if test="$admon.textlabel != 0 or title or info/title">
-              <fo:block xsl:use-attribute-sets="admonition.title.properties">
-                <xsl:apply-templates select="." mode="object.title.markup">
-		  <xsl:with-param name="allow-anchors" select="1"/>
-		</xsl:apply-templates>
-              </fo:block>
-            </xsl:if>
-            <fo:block xsl:use-attribute-sets="admonition.properties">
-              <xsl:apply-templates/>
-            </fo:block>
-          </fo:list-item-body>
-      </fo:list-item>
-    </fo:list-block>
-  </fo:block>
-</xsl:template>
-
-<xsl:template name="nongraphical.admonition">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <fo:block id="{$id}"
-            xsl:use-attribute-sets="nongraphical.admonition.properties">
-    <xsl:if test="$admon.textlabel != 0 or title or info/title">
-      <fo:block keep-with-next.within-column='always'
-                xsl:use-attribute-sets="admonition.title.properties">
-         <xsl:apply-templates select="." mode="object.title.markup">
-	   <xsl:with-param name="allow-anchors" select="1"/>
-	 </xsl:apply-templates>
-      </fo:block>
-    </xsl:if>
-
-    <fo:block xsl:use-attribute-sets="admonition.properties">
-      <xsl:apply-templates/>
-    </fo:block>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="note/title"></xsl:template>
-<xsl:template match="important/title"></xsl:template>
-<xsl:template match="warning/title"></xsl:template>
-<xsl:template match="caution/title"></xsl:template>
-<xsl:template match="tip/title"></xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/annotations.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/annotations.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,18 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<xsl:template match="annotation"/>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/autoidx-kimber.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/autoidx-kimber.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,178 +1,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE xsl:stylesheet [
-
-<!ENTITY primary   'normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""]))'>
-<!ENTITY secondary 'normalize-space(concat(secondary/@sortas, secondary[not(@sortas) or @sortas = ""]))'>
-<!ENTITY tertiary  'normalize-space(concat(tertiary/@sortas, tertiary[not(@sortas) or @sortas = ""]))'>
-
-<!ENTITY sep '" "'>
-<!-- Documents using the kimber index method must have a lang attribute -->
-<!-- Only one of these should be present in the entity -->
-<!ENTITY lang 'concat(/*/@lang, /*/@xml:lang)'>
-
-<!ENTITY scope 'count(ancestor::node()|$scope) = count(ancestor::node())
-                and ($role = @role or $type = @type or
-                (string-length($role) = 0 and string-length($type) = 0))'>
-]>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                xmlns:k="java:com.isogen.saxoni18n.Saxoni18nService"
-                exclude-result-prefixes="k"
-                version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the DocBook XSL Stylesheet distribution.
-     See ../README or http://docbook.sf.net/ for copyright
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-<!-- The "kimber" method contributed by Eliot Kimber of Innodata Isogen.  -->
-<!-- ==================================================================== -->
-<!--   *** THIS MODULE ONLY WORKS WITH SAXON 6 OR SAXON 8 ***             -->
-<!-- ==================================================================== -->
-
-<xsl:include href="../common/autoidx-kimber.xsl"/>
-
-<!-- Java sort apparently works only on lang part, not country -->
-<xsl:param name="sort.lang">
-  <xsl:choose>
-    <xsl:when test="contains(&lang;, '-')">
-      <xsl:value-of select="substring-before(&lang;, '-')"/>
-    </xsl:when>
-    <xsl:when test="contains(&lang;, '_')">
-      <xsl:value-of select="substring-before(&lang;, '_')"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="&lang;"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:param>
-
-<xsl:template name="generate-kimber-index">
-  <xsl:param name="scope" select="NOTANODE"/>
-
-  <xsl:variable name="vendor" select="system-property('xsl:vendor')"/>
-  <xsl:if test="not(contains($vendor, 'SAXON '))">
-    <xsl:message terminate="yes">
-      <xsl:text>ERROR: the 'kimber' index method requires the </xsl:text>
-      <xsl:text>Saxon version 6 or 8 XSLT processor.</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <xsl:if test="not(function-available('k:getIndexGroupKey'))">
-    <xsl:message terminate="yes">
-      <xsl:text>ERROR: the 'kimber' index method requires the </xsl:text>
-      <xsl:text>Innodata Isogen &#x0A;Java extensions for </xsl:text>
-      <xsl:text>internationalized indexes. &#x0A;Install those </xsl:text>
-      <xsl:text>extensions, or use a different index method.&#x0A;</xsl:text>
-      <xsl:text>For more information, see:&#x0A;</xsl:text>
-      <xsl:text>http://www.innodata-isogen.com/knowledge_center/tools_downloads/i18nsupport</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <xsl:variable name="role">
-    <xsl:if test="$index.on.role != 0">
-      <xsl:value-of select="@role"/>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:variable name="type">
-    <xsl:if test="$index.on.type != 0">
-      <xsl:value-of select="@type"/>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:variable name="terms"
-                select="//indexterm[count(.|key('k-group',
-                   k:getIndexGroupKey(&lang;, &primary;))
-                   [&scope;][1]) = 1
-                   and not(@class = 'endofrange')]"/>
-
-  <xsl:variable name="alphabetical"
-                select="$terms[not(starts-with(
-                k:getIndexGroupKey(&lang;, &primary;),
-                '#NUMERIC'
-                ))]"/>
-
-  <xsl:variable name="others"
-                select="$terms[starts-with(
-                k:getIndexGroupKey(&lang;, &primary;),
-                '#NUMERIC'
-                )]"/>
-
-  <fo:block>
-    <xsl:if test="$others">
-      <xsl:call-template name="indexdiv.title">
-        <xsl:with-param name="titlecontent">
-          <xsl:call-template name="gentext">
-            <xsl:with-param name="key" select="'index symbols'"/>
-          </xsl:call-template>
-        </xsl:with-param>
-      </xsl:call-template>
-
-      <fo:block>
-        <xsl:apply-templates select="$others"
-                             mode="index-symbol-div">
-          <xsl:with-param name="scope" select="$scope"/>
-          <xsl:with-param name="role" select="$role"/>
-          <xsl:with-param name="type" select="$type"/>
-          <xsl:sort lang="{$sort.lang}"
-              select="k:getIndexGroupSortKey(&lang;,
-                      k:getIndexGroupKey(&lang;, &primary;))"/>
-        </xsl:apply-templates>
-      </fo:block>
-    </xsl:if>
-
-    <xsl:apply-templates select="$alphabetical"
-                         mode="index-div-kimber">
-      <xsl:with-param name="scope" select="$scope"/>
-      <xsl:with-param name="role" select="$role"/>
-      <xsl:with-param name="type" select="$type"/>
-      <xsl:sort lang="{$sort.lang}"
-             select="k:getIndexGroupSortKey(&lang;,
-                     k:getIndexGroupKey(&lang;, &primary;))"/>
-    </xsl:apply-templates>
-  </fo:block>
-
-</xsl:template>
-
-<xsl:template match="indexterm" mode="index-div-kimber">
-  <xsl:param name="scope" select="."/>
-  <xsl:param name="role" select="''"/>
-  <xsl:param name="type" select="''"/>
-
-  <xsl:variable name="key"
-          select="k:getIndexGroupKey(&lang;, &primary;)"/>
-
-  <xsl:variable name="label"
-          select="k:getIndexGroupLabel(&lang;, $key)"/>
-
-  <xsl:if test="key('k-group', $key)[&scope;]
-                [count(.|key('primary', &primary;)[&scope;][1]) = 1]">
-    <fo:block>
-      <xsl:call-template name="indexdiv.title">
-        <xsl:with-param name="titlecontent">
-          <xsl:value-of select="$label"/>
-        </xsl:with-param>
-      </xsl:call-template>
-      <fo:block>
-        <xsl:apply-templates select="key('k-group', $key)[&scope;]
-                            [count(.|key('primary', &primary;)[&scope;]
-                            [1])=1]"
-                             mode="index-primary">
-          <xsl:sort select="&primary;" lang="{$sort.lang}"/>
-          <xsl:with-param name="scope" select="$scope"/>
-          <xsl:with-param name="role" select="$role"/>
-          <xsl:with-param name="type" select="$type"/>
-        </xsl:apply-templates>
-      </fo:block>
-    </fo:block>
-  </xsl:if>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/autoidx-kosek.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/autoidx-kosek.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,150 +1,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE xsl:stylesheet [
-
-<!ENTITY primary   'normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""]))'>
-<!ENTITY secondary 'normalize-space(concat(secondary/@sortas, secondary[not(@sortas) or @sortas = ""]))'>
-<!ENTITY tertiary  'normalize-space(concat(tertiary/@sortas, tertiary[not(@sortas) or @sortas = ""]))'>
-
-<!ENTITY sep '" "'>
-<!-- Documents using the kimber index method must have a lang attribute -->
-<!-- Only one of these should be present in the entity -->
-
-<!ENTITY scope 'count(ancestor::node()|$scope) = count(ancestor::node())
-                and ($role = @role or $type = @type or
-                (string-length($role) = 0 and string-length($type) = 0))'>
-]>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                xmlns:rx="http://www.renderx.com/XSL/Extensions"
-                xmlns:axf="http://www.antennahouse.com/names/XSL/Extensions"
-                xmlns:i="urn:cz-kosek:functions:index"
-                xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0"
-                xmlns:func="http://exslt.org/functions"
-                xmlns:exslt="http://exslt.org/common"
-                extension-element-prefixes="func exslt"
-                exclude-result-prefixes="func exslt i l"
-                version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the DocBook XSL Stylesheet distribution.
-     See ../README or http://docbook.sf.net/ for copyright
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-<!-- The "kosek" method contributed by Jirka Kosek. -->
-
-<xsl:include href="../common/autoidx-kosek.xsl"/>
-
-<xsl:template name="generate-kosek-index">
-  <xsl:param name="scope" select="NOTANODE"/>
-
-  <xsl:variable name="vendor" select="system-property('xsl:vendor')"/>
-  <xsl:if test="contains($vendor, 'libxslt')">
-    <xsl:message terminate="yes">
-      <xsl:text>ERROR: the 'kosek' index method does not </xsl:text>
-      <xsl:text>work with the xsltproc XSLT processor.</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <xsl:if test="contains($vendor, 'Saxonica')">
-    <xsl:message terminate="yes">
-      <xsl:text>ERROR: the 'kosek' index method does not </xsl:text>
-      <xsl:text>work with the Saxon 8 XSLT processor.</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-
-  <xsl:if test="not(function-available('exslt:node-set') or
-                    function-available('exslt:nodeSet'))">
-    <xsl:message terminate="yes">
-      <xsl:text>ERROR: the 'kosek' index method requires the </xsl:text>
-      <xsl:text>exslt:node-set() function. Use a processor that </xsl:text>
-      <xsl:text>has it, or use a different index method.</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <xsl:if test="not(function-available('i:group-index'))">
-    <xsl:message terminate="yes">
-      <xsl:text>ERROR: the 'kosek' index method requires the&#xA;</xsl:text>
-      <xsl:text>index extension functions be imported:&#xA;</xsl:text>
-      <xsl:text>  xsl:import href="common/autoidx-kosek.xsl"</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <xsl:variable name="role">
-    <xsl:if test="$index.on.role != 0">
-      <xsl:value-of select="@role"/>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:variable name="type">
-    <xsl:if test="$index.on.type != 0">
-      <xsl:value-of select="@type"/>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:variable name="terms"
-                select="//indexterm[count(.|key('group-code',
-                                          i:group-index(&primary;))
-                                          [&scope;][1]) = 1
-                                and not(@class = 'endofrange')]"/>
-  <fo:block>
-    <xsl:apply-templates select="$terms" mode="index-div-kosek">
-      <xsl:with-param name="scope" select="$scope"/>
-      <xsl:with-param name="role" select="$role"/>
-      <xsl:with-param name="type" select="$type"/>
-      <xsl:sort select="i:group-index(&primary;)" data-type="number"/>
-    </xsl:apply-templates>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="index-div-kosek">
-  <xsl:param name="scope" select="."/>
-  <xsl:param name="role" select="''"/>
-  <xsl:param name="type" select="''"/>
-
-  <xsl:variable name="key"
-                select="i:group-index(&primary;)"/>
-
-  <xsl:variable name="lang">
-    <xsl:call-template name="l10n.language"/>
-  </xsl:variable>
-
-  <xsl:if test="key('group-code', $key)[&scope;]
-                [count(.|key('primary', &primary;)[&scope;][1]) = 1]">
-    <fo:block>
-      <xsl:call-template name="indexdiv.title">
-        <xsl:with-param name="titlecontent">
-          <xsl:choose>
-            <xsl:when test="$key = 0">
-              <xsl:call-template name="gentext">
-                <xsl:with-param name="key" select="'index symbols'"/>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:value-of select="i:group-letter($key)"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:with-param>
-      </xsl:call-template>
-      <fo:block>
-        <xsl:apply-templates select="key('group-code', $key)[&scope;]
-                                     [count(.|key('primary', &primary;)
-                                     [&scope;][1])=1]"
-                             mode="index-primary">
-          <xsl:sort select="&primary;" lang="{$lang}"/>
-          <xsl:with-param name="scope" select="$scope"/>
-          <xsl:with-param name="role" select="$role"/>
-          <xsl:with-param name="type" select="$type"/>
-        </xsl:apply-templates>
-      </fo:block>
-    </fo:block>
-  </xsl:if>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/autoidx-ng.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/autoidx-ng.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the DocBook XSL Stylesheet distribution.
-     See ../README or http://docbook.sf.net/ for copyright
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- You should have this directly in your customization file. -->
-<!-- This file is there only to retain backward compatibility. -->
-<xsl:import href="autoidx-kosek.xsl"/>
-<xsl:param name="index.method">kosek</xsl:param>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/autoidx.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/autoidx.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,1310 +1,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE xsl:stylesheet [
-<!ENTITY % common.entities SYSTEM "../common/entities.ent">
-%common.entities;
-]>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                xmlns:rx="http://www.renderx.com/XSL/Extensions"
-                xmlns:axf="http://www.antennahouse.com/names/XSL/Extensions"
-                xmlns:exslt="http://exslt.org/common"
-                extension-element-prefixes="exslt"
-                exclude-result-prefixes="exslt"
-                version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the DocBook XSL Stylesheet distribution.
-     See ../README or http://docbook.sf.net/ for copyright
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-<!-- The "basic" method derived from Jeni Tennison's work. -->
-<!-- The "kosek" method contributed by Jirka Kosek. -->
-<!-- The "kimber" method contributed by Eliot Kimber of Innodata Isogen. -->
-
-<!-- Importing module for kimber or kosek method overrides one of these -->
-<xsl:param name="kimber.imported" select="0"/>
-<xsl:param name="kosek.imported" select="0"/>
-
-<!-- These keys used primary in all methods -->
-<xsl:key name="letter"
-         match="indexterm"
-         use="translate(substring(&primary;, 1, 1),&lowercase;,&uppercase;)"/>
-
-<xsl:key name="primary"
-         match="indexterm"
-         use="&primary;"/>
-
-<xsl:key name="secondary"
-         match="indexterm"
-         use="concat(&primary;, &sep;, &secondary;)"/>
-
-<xsl:key name="tertiary"
-         match="indexterm"
-         use="concat(&primary;, &sep;, &secondary;, &sep;, &tertiary;)"/>
-
-<xsl:key name="endofrange"
-         match="indexterm[@class='endofrange']"
-         use="@startref"/>
-
-<xsl:key name="see-also"
-         match="indexterm[seealso]"
-         use="concat(&primary;, &sep;, 
-                     &secondary;, &sep;, 
-                     &tertiary;, &sep;, seealso)"/>
-
-<xsl:key name="see"
-         match="indexterm[see]"
-         use="concat(&primary;, &sep;, 
-                     &secondary;, &sep;, 
-                     &tertiary;, &sep;, see)"/>
-
-
-<xsl:template name="generate-index">
-  <xsl:param name="scope" select="(ancestor::book|/)[last()]"/>
-
-  <xsl:choose>
-    <xsl:when test="$index.method = 'kosek'">
-      <xsl:call-template name="generate-kosek-index">
-        <xsl:with-param name="scope" select="$scope"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="$index.method = 'kimber'">
-      <xsl:call-template name="generate-kimber-index">
-        <xsl:with-param name="scope" select="$scope"/>
-      </xsl:call-template>
-    </xsl:when>
-
-    <xsl:otherwise>
-      <xsl:call-template name="generate-basic-index">
-        <xsl:with-param name="scope" select="$scope"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-      
-<xsl:template name="generate-basic-index">
-  <xsl:param name="scope" select="NOTANODE"/>
-
-  <xsl:variable name="role">
-    <xsl:if test="$index.on.role != 0">
-      <xsl:value-of select="@role"/>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:variable name="type">
-    <xsl:if test="$index.on.type != 0">
-      <xsl:value-of select="@type"/>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:variable name="terms"
-                select="//indexterm
-                        [count(.|key('letter',
-                          translate(substring(&primary;, 1, 1),
-                             &lowercase;,
-                             &uppercase;))
-                          [&scope;][1]) = 1
-                          and not(@class = 'endofrange')]"/>
-
-  <xsl:variable name="alphabetical"
-                select="$terms[contains(concat(&lowercase;, &uppercase;),
-                                        substring(&primary;, 1, 1))]"/>
-
-  <xsl:variable name="others" select="$terms[not(contains(
-                                        concat(&lowercase;,
-                                        &uppercase;),
-                                        substring(&primary;, 1, 1)))]"/>
-  <fo:block>
-    <xsl:if test="$others">
-      <xsl:call-template name="indexdiv.title">
-        <xsl:with-param name="titlecontent">
-          <xsl:call-template name="gentext">
-            <xsl:with-param name="key" select="'index symbols'"/>
-          </xsl:call-template>
-        </xsl:with-param>
-      </xsl:call-template>
-
-      <fo:block>
-        <xsl:apply-templates select="$others[count(.|key('primary',
-                                     &primary;)[&scope;][1]) = 1]"
-                             mode="index-symbol-div">
-          <xsl:with-param name="scope" select="$scope"/>
-          <xsl:with-param name="role" select="$role"/>
-          <xsl:with-param name="type" select="$type"/>
-          <xsl:sort select="translate(&primary;, &lowercase;, 
-                            &uppercase;)"/>
-        </xsl:apply-templates>
-      </fo:block>
-    </xsl:if>
-
-    <xsl:apply-templates select="$alphabetical[count(.|key('letter',
-                                 translate(substring(&primary;, 1, 1),
-                                           &lowercase;,&uppercase;))
-                                           [&scope;][1]) = 1]"
-                         mode="index-div-basic">
-      <xsl:with-param name="scope" select="$scope"/>
-      <xsl:with-param name="role" select="$role"/>
-      <xsl:with-param name="type" select="$type"/>
-      <xsl:sort select="translate(&primary;, &lowercase;, &uppercase;)"/>
-    </xsl:apply-templates>
-  </fo:block>
-</xsl:template>
-
-<!-- This template not used if fo/autoidx-kosek.xsl is imported -->
-<xsl:template name="generate-kosek-index">
-  <xsl:param name="scope" select="NOTANODE"/>
-
-  <xsl:variable name="vendor" select="system-property('xsl:vendor')"/>
-  <xsl:if test="contains($vendor, 'libxslt')">
-    <xsl:message terminate="yes">
-      <xsl:text>ERROR: the 'kosek' index method does not </xsl:text>
-      <xsl:text>work with the xsltproc XSLT processor.</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-
-  <xsl:if test="not(function-available('exslt:node-set') or
-                    function-available('exslt:nodeSet'))">
-    <xsl:message terminate="yes">
-      <xsl:text>ERROR: the 'kosek' index method requires the </xsl:text>
-      <xsl:text>exslt:node-set() function. Use a processor that </xsl:text>
-      <xsl:text>has it, or use a different index method.</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <xsl:if test="$kosek.imported = 0">
-    <xsl:message terminate="yes">
-      <xsl:text>ERROR: the 'kosek' index method requires the&#xA;</xsl:text>
-      <xsl:text>kosek index extensions be imported:&#xA;</xsl:text>
-      <xsl:text>  xsl:import href="fo/autoidx-kosek.xsl"</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-</xsl:template>
-
-
-<!-- This template not used if fo/autoidx-kimber.xsl is imported -->
-<xsl:template name="generate-kimber-index">
-  <xsl:param name="scope" select="NOTANODE"/>
-
-  <xsl:variable name="vendor" select="system-property('xsl:vendor')"/>
-  <xsl:if test="not(contains($vendor, 'SAXON '))">
-    <xsl:message terminate="yes">
-      <xsl:text>ERROR: the 'kimber' index method requires the </xsl:text>
-      <xsl:text>Saxon version 6 or 8 XSLT processor.</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <xsl:if test="$kimber.imported = 0">
-    <xsl:message terminate="yes">
-      <xsl:text>ERROR: the 'kimber' index method requires the&#xA;</xsl:text>
-      <xsl:text>kimber index extensions be imported:&#xA;</xsl:text>
-      <xsl:text>  xsl:import href="fo/autoidx-kimber.xsl"</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-</xsl:template>
-
-<xsl:template match="indexterm" mode="index-div-basic">
-  <xsl:param name="scope" select="."/>
-  <xsl:param name="role" select="''"/>
-  <xsl:param name="type" select="''"/>
-
-  <xsl:variable name="key"
-                select="translate(substring(&primary;, 1, 1),
-                         &lowercase;,&uppercase;)"/>
-
-  <xsl:if test="key('letter', $key)[&scope;]
-                [count(.|key('primary', &primary;)[&scope;][1]) = 1]">
-    <fo:block>
-      <xsl:if test="contains(concat(&lowercase;, &uppercase;), $key)">
-        <xsl:call-template name="indexdiv.title">
-          <xsl:with-param name="titlecontent">
-            <xsl:value-of select="translate($key, &lowercase;, &uppercase;)"/>
-          </xsl:with-param>
-        </xsl:call-template>
-      </xsl:if>
-      <fo:block xsl:use-attribute-sets="index.entry.properties">
-        <xsl:apply-templates select="key('letter', $key)[&scope;]
-                                     [count(.|key('primary', &primary;)
-                                     [&scope;][1])=1]"
-                             mode="index-primary">
-          <xsl:sort select="translate(&primary;, &lowercase;, &uppercase;)"/>
-          <xsl:with-param name="scope" select="$scope"/>
-          <xsl:with-param name="role" select="$role"/>
-          <xsl:with-param name="type" select="$type"/>
-        </xsl:apply-templates>
-      </fo:block>
-    </fo:block>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="index-symbol-div">
-  <xsl:param name="scope" select="."/>
-  <xsl:param name="role" select="''"/>
-  <xsl:param name="type" select="''"/>
-
-  <xsl:variable name="key"
-                select="translate(substring(&primary;, 1, 1),&lowercase;,&uppercase;)"/>
-
-  <fo:block xsl:use-attribute-sets="index.entry.properties">
-    <xsl:apply-templates select="key('letter', $key)[&scope;][count(.|key('primary', &primary;)[&scope;][1]) = 1]"
-                         mode="index-primary">
-      <xsl:with-param name="scope" select="$scope"/>
-      <xsl:with-param name="role" select="$role"/>
-      <xsl:with-param name="type" select="$type"/>
-      <xsl:sort select="translate(&primary;, &lowercase;, &uppercase;)"/>
-    </xsl:apply-templates>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="index-primary">
-  <xsl:param name="scope" select="."/>
-  <xsl:param name="role" select="''"/>
-  <xsl:param name="type" select="''"/>
-
-  <xsl:variable name="key" select="&primary;"/>
-  <xsl:variable name="refs" select="key('primary', $key)[&scope;]"/>
-
-  <xsl:variable name="term.separator">
-    <xsl:call-template name="index.separator">
-      <xsl:with-param name="key" select="'index.term.separator'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="range.separator">
-    <xsl:call-template name="index.separator">
-      <xsl:with-param name="key" select="'index.range.separator'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="number.separator">
-    <xsl:call-template name="index.separator">
-      <xsl:with-param name="key" select="'index.number.separator'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <fo:block>
-    <xsl:if test="$axf.extensions != 0">
-      <xsl:attribute name="axf:suppress-duplicate-page-number">true</xsl:attribute>
-    </xsl:if>
-    <xsl:value-of select="primary"/>
-
-    <xsl:choose>
-      <xsl:when test="$xep.extensions != 0">
-        <xsl:if test="$refs[not(see) and not(secondary)]">
-          <xsl:copy-of select="$term.separator"/>
-          <xsl:variable name="primary" select="&primary;"/>
-          <xsl:variable name="primary.significant" select="concat(&primary;, $significant.flag)"/>
-          <rx:page-index list-separator="{$number.separator}"
-                         range-separator="{$range.separator}">
-            <xsl:if test="$refs[@significance='preferred'][not(see) and not(secondary)]">
-              <rx:index-item xsl:use-attribute-sets="index.preferred.page.properties xep.index.item.properties"
-                ref-key="{$primary.significant}"/>
-            </xsl:if>
-            <xsl:if test="$refs[not(@significance) or @significance!='preferred'][not(see) and not(secondary)]">
-              <rx:index-item xsl:use-attribute-sets="xep.index.item.properties"
-                ref-key="{$primary}"/>
-            </xsl:if>
-          </rx:page-index>        
-        </xsl:if>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:variable name="page-number-citations">
-          <xsl:for-each select="$refs[not(see) 
-                                and not(secondary)]">
-            <xsl:apply-templates select="." mode="reference">
-              <xsl:with-param name="scope" select="$scope"/>
-              <xsl:with-param name="role" select="$role"/>
-              <xsl:with-param name="type" select="$type"/>
-              <xsl:with-param name="position" select="position()"/>
-            </xsl:apply-templates>
-          </xsl:for-each>
-        </xsl:variable>
-
-        <xsl:choose>
-          <xsl:when test="$passivetex.extensions != '0'">
-            <fotex:sort xmlns:fotex="http://www.tug.org/fotex">
-              <xsl:copy-of select="$page-number-citations"/>
-            </fotex:sort>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:copy-of select="$page-number-citations"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:otherwise>
-    </xsl:choose>
-
-    <xsl:if test="$refs[not(secondary)]/*[self::see]">
-      <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see', concat(&primary;, &sep;, &sep;, &sep;, see))[&scope;][1])]"
-                           mode="index-see">
-         <xsl:with-param name="scope" select="$scope"/>
-         <xsl:with-param name="role" select="$role"/>
-         <xsl:with-param name="type" select="$type"/>
-         <xsl:sort select="translate(see, &lowercase;, &uppercase;)"/>
-      </xsl:apply-templates>
-    </xsl:if>
-
-  </fo:block>
-
-  <xsl:if test="$refs/secondary or $refs[not(secondary)]/*[self::seealso]">
-    <fo:block start-indent="1pc">
-      <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see-also', concat(&primary;, &sep;, &sep;, &sep;, seealso))[&scope;][1])]"
-                           mode="index-seealso">
-         <xsl:with-param name="scope" select="$scope"/>
-         <xsl:with-param name="role" select="$role"/>
-         <xsl:with-param name="type" select="$type"/>
-         <xsl:sort select="translate(seealso, &lowercase;, &uppercase;)"/>
-      </xsl:apply-templates>
-      <xsl:apply-templates select="$refs[secondary and count(.|key('secondary', concat($key, &sep;, &secondary;))[&scope;][1]) = 1]"
-                           mode="index-secondary">
-       <xsl:with-param name="scope" select="$scope"/>
-       <xsl:with-param name="role" select="$role"/>
-       <xsl:with-param name="type" select="$type"/>
-       <xsl:sort select="translate(&secondary;, &lowercase;, &uppercase;)"/>
-      </xsl:apply-templates>
-    </fo:block>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="index-secondary">
-  <xsl:param name="scope" select="."/>
-  <xsl:param name="role" select="''"/>
-  <xsl:param name="type" select="''"/>
-
-  <xsl:variable name="key" select="concat(&primary;, &sep;, &secondary;)"/>
-  <xsl:variable name="refs" select="key('secondary', $key)[&scope;]"/>
-
-  <xsl:variable name="term.separator">
-    <xsl:call-template name="index.separator">
-      <xsl:with-param name="key" select="'index.term.separator'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="range.separator">
-    <xsl:call-template name="index.separator">
-      <xsl:with-param name="key" select="'index.range.separator'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="number.separator">
-    <xsl:call-template name="index.separator">
-      <xsl:with-param name="key" select="'index.number.separator'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <fo:block>
-    <xsl:if test="$axf.extensions != 0">
-      <xsl:attribute name="axf:suppress-duplicate-page-number">true</xsl:attribute>
-    </xsl:if>
-    <xsl:value-of select="secondary"/>
-
-    <xsl:choose>
-      <xsl:when test="$xep.extensions != 0">
-        <xsl:if test="$refs[not(see) and not(tertiary)]">
-          <xsl:copy-of select="$term.separator"/>
-          <xsl:variable name="primary" select="&primary;"/>
-          <xsl:variable name="secondary" select="&secondary;"/>
-          <xsl:variable name="primary.significant" select="concat(&primary;, $significant.flag)"/>
-          <rx:page-index list-separator="{$number.separator}"
-                         range-separator="{$range.separator}">
-            <xsl:if test="$refs[@significance='preferred'][not(see) and not(tertiary)]">
-              <rx:index-item xsl:use-attribute-sets="index.preferred.page.properties xep.index.item.properties">
-                <xsl:attribute name="ref-key">
-                  <xsl:value-of select="$primary.significant"/>
-                  <xsl:text>, </xsl:text>
-                  <xsl:value-of select="$secondary"/>
-                </xsl:attribute>
-              </rx:index-item>
-            </xsl:if>
-            <xsl:if test="$refs[not(@significance) or @significance!='preferred'][not(see) and not(tertiary)]">
-              <rx:index-item xsl:use-attribute-sets="xep.index.item.properties">
-                <xsl:attribute name="ref-key">
-                  <xsl:value-of select="$primary"/>
-                  <xsl:text>, </xsl:text>
-                  <xsl:value-of select="$secondary"/>
-                </xsl:attribute>
-              </rx:index-item>
-            </xsl:if>
-          </rx:page-index>
-        </xsl:if>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:variable name="page-number-citations">
-          <xsl:for-each select="$refs[not(see) 
-                                and not(tertiary)]">
-            <xsl:apply-templates select="." mode="reference">
-              <xsl:with-param name="scope" select="$scope"/>
-              <xsl:with-param name="role" select="$role"/>
-              <xsl:with-param name="type" select="$type"/>
-              <xsl:with-param name="position" select="position()"/>
-            </xsl:apply-templates>
-          </xsl:for-each>
-        </xsl:variable>
-
-        <xsl:choose>
-          <xsl:when test="$passivetex.extensions != '0'">
-            <fotex:sort xmlns:fotex="http://www.tug.org/fotex">
-              <xsl:copy-of select="$page-number-citations"/>
-            </fotex:sort>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:copy-of select="$page-number-citations"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:otherwise>
-    </xsl:choose>
-
-    <xsl:if test="$refs[not(tertiary)]/*[self::see]">
-      <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see', concat(&primary;, &sep;, &secondary;, &sep;, &sep;, see))[&scope;][1])]"
-                           mode="index-see">
-        <xsl:with-param name="scope" select="$scope"/>
-        <xsl:with-param name="role" select="$role"/>
-        <xsl:with-param name="type" select="$type"/>
-        <xsl:sort select="translate(see, &lowercase;, &uppercase;)"/>
-      </xsl:apply-templates>
-    </xsl:if>
-
-  </fo:block>
-
-  <xsl:if test="$refs/tertiary or $refs[not(tertiary)]/*[self::seealso]">
-    <fo:block start-indent="2pc">
-      <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see-also', concat(&primary;, &sep;, &secondary;, &sep;, &sep;, seealso))[&scope;][1])]"
-                           mode="index-seealso">
-          <xsl:with-param name="scope" select="$scope"/>
-          <xsl:with-param name="role" select="$role"/>
-          <xsl:with-param name="type" select="$type"/>
-          <xsl:sort select="translate(seealso, &lowercase;, &uppercase;)"/>
-      </xsl:apply-templates>
-      <xsl:apply-templates select="$refs[tertiary and count(.|key('tertiary', concat($key, &sep;, &tertiary;))[&scope;][1]) = 1]" 
-                           mode="index-tertiary">
-          <xsl:with-param name="scope" select="$scope"/>
-          <xsl:with-param name="role" select="$role"/>
-          <xsl:with-param name="type" select="$type"/>
-          <xsl:sort select="translate(&tertiary;, &lowercase;, &uppercase;)"/>
-      </xsl:apply-templates>
-    </fo:block>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="index-tertiary">
-  <xsl:param name="scope" select="."/>
-  <xsl:param name="role" select="''"/>
-  <xsl:param name="type" select="''"/>
-  <xsl:variable name="key" select="concat(&primary;, &sep;, &secondary;, &sep;, &tertiary;)"/>
-  <xsl:variable name="refs" select="key('tertiary', $key)[&scope;]"/>
-
-  <xsl:variable name="term.separator">
-    <xsl:call-template name="index.separator">
-      <xsl:with-param name="key" select="'index.term.separator'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="range.separator">
-    <xsl:call-template name="index.separator">
-      <xsl:with-param name="key" select="'index.range.separator'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="number.separator">
-    <xsl:call-template name="index.separator">
-      <xsl:with-param name="key" select="'index.number.separator'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <fo:block>
-    <xsl:if test="$axf.extensions != 0">
-      <xsl:attribute name="axf:suppress-duplicate-page-number">true</xsl:attribute>
-    </xsl:if>
-    <xsl:value-of select="tertiary"/>
-
-    <xsl:choose>
-      <xsl:when test="$xep.extensions != 0">
-        <xsl:if test="$refs[not(see)]">
-          <xsl:copy-of select="$term.separator"/>
-          <xsl:variable name="primary" select="&primary;"/>
-          <xsl:variable name="secondary" select="&secondary;"/>
-          <xsl:variable name="tertiary" select="&tertiary;"/>
-          <xsl:variable name="primary.significant" select="concat(&primary;, $significant.flag)"/>
-          <rx:page-index list-separator="{$number.separator}"
-                         range-separator="{$range.separator}">
-            <xsl:if test="$refs[@significance='preferred'][not(see)]">
-              <rx:index-item xsl:use-attribute-sets="index.preferred.page.properties xep.index.item.properties">
-                <xsl:attribute name="ref-key">
-                  <xsl:value-of select="$primary.significant"/>
-                  <xsl:text>, </xsl:text>
-                  <xsl:value-of select="$secondary"/>
-                  <xsl:text>, </xsl:text>
-                  <xsl:value-of select="$tertiary"/>
-                </xsl:attribute>
-              </rx:index-item>
-            </xsl:if>
-            <xsl:if test="$refs[not(@significance) or @significance!='preferred'][not(see)]">
-              <rx:index-item xsl:use-attribute-sets="xep.index.item.properties">
-                <xsl:attribute name="ref-key">
-                  <xsl:value-of select="$primary"/>
-                  <xsl:text>, </xsl:text>
-                  <xsl:value-of select="$secondary"/>
-                  <xsl:text>, </xsl:text>
-                  <xsl:value-of select="$tertiary"/>
-                </xsl:attribute>
-              </rx:index-item>
-            </xsl:if>
-          </rx:page-index>
-        </xsl:if>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:variable name="page-number-citations">
-          <xsl:for-each select="$refs[not(see)]">
-            <xsl:apply-templates select="." mode="reference">
-              <xsl:with-param name="scope" select="$scope"/>
-              <xsl:with-param name="role" select="$role"/>
-              <xsl:with-param name="type" select="$type"/>
-              <xsl:with-param name="position" select="position()"/>
-            </xsl:apply-templates>
-          </xsl:for-each>
-        </xsl:variable>
-
-        <xsl:choose>
-          <xsl:when test="$passivetex.extensions != '0'">
-            <fotex:sort xmlns:fotex="http://www.tug.org/fotex">
-              <xsl:copy-of select="$page-number-citations"/>
-            </fotex:sort>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:copy-of select="$page-number-citations"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:otherwise>
-    </xsl:choose>
-
-    <xsl:if test="$refs/see">
-      <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see', concat(&primary;, &sep;, &secondary;, &sep;, &tertiary;, &sep;, see))[&scope;][1])]"
-                           mode="index-see">
-        <xsl:with-param name="scope" select="$scope"/>
-        <xsl:with-param name="role" select="$role"/>
-        <xsl:with-param name="type" select="$type"/>
-        <xsl:sort select="translate(see, &lowercase;, &uppercase;)"/>
-      </xsl:apply-templates>
-    </xsl:if>
-
-  </fo:block>
-
-  <xsl:if test="$refs/seealso">
-    <fo:block>
-      <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see-also', concat(&primary;, &sep;, &secondary;, &sep;, &tertiary;, &sep;, seealso))[&scope;][1])]"
-                           mode="index-seealso">
-        <xsl:with-param name="scope" select="$scope"/>
-        <xsl:with-param name="role" select="$role"/>
-        <xsl:with-param name="type" select="$type"/>
-        <xsl:sort select="translate(seealso, &lowercase;, &uppercase;)"/>
-      </xsl:apply-templates>
-    </fo:block>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="reference">
-  <xsl:param name="scope" select="."/>
-  <xsl:param name="role" select="''"/>
-  <xsl:param name="type" select="''"/>
-  <xsl:param name="position" select="0"/>
-  <xsl:param name="separator" select="''"/>
-
-  <xsl:variable name="term.separator">
-    <xsl:call-template name="index.separator">
-      <xsl:with-param name="key" select="'index.term.separator'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="range.separator">
-    <xsl:call-template name="index.separator">
-      <xsl:with-param name="key" select="'index.range.separator'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="number.separator">
-    <xsl:call-template name="index.separator">
-      <xsl:with-param name="key" select="'index.number.separator'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$separator != ''">
-      <xsl:value-of select="$separator"/>
-    </xsl:when>
-    <xsl:when test="$position = 1">
-      <xsl:value-of select="$term.separator"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$number.separator"/>
-    </xsl:otherwise>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="@zone and string(@zone)">
-      <xsl:call-template name="reference">
-        <xsl:with-param name="zones" select="normalize-space(@zone)"/>
-        <xsl:with-param name="scope" select="$scope"/>
-        <xsl:with-param name="role" select="$role"/>
-        <xsl:with-param name="type" select="$type"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="ancestor::*[contains(local-name(),'info') and not(starts-with(local-name(),'info'))]">
-      <xsl:call-template name="info.reference">
-        <xsl:with-param name="scope" select="$scope"/>
-        <xsl:with-param name="role" select="$role"/>
-        <xsl:with-param name="type" select="$type"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:variable name="id">
-        <xsl:call-template name="object.id"/>
-      </xsl:variable>
-
-      <fo:basic-link internal-destination="{$id}"
-                     xsl:use-attribute-sets="index.page.number.properties">
-        <fo:page-number-citation ref-id="{$id}"/>
-      </fo:basic-link>
-
-      <xsl:if test="key('endofrange', $id)[&scope;]">
-        <xsl:apply-templates select="key('endofrange', $id)[&scope;][last()]"
-                             mode="reference">
-          <xsl:with-param name="scope" select="$scope"/>
-          <xsl:with-param name="role" select="$role"/>
-          <xsl:with-param name="type" select="$type"/>
-          <xsl:with-param name="separator" select="$range.separator"/>
-        </xsl:apply-templates>
-      </xsl:if>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="reference">
-  <xsl:param name="scope" select="."/>
-  <xsl:param name="role" select="''"/>
-  <xsl:param name="type" select="''"/>
-  <xsl:param name="zones"/>
-
-  <xsl:variable name="number.separator">
-    <xsl:call-template name="index.separator">
-      <xsl:with-param name="key" select="'index.number.separator'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="contains($zones, ' ')">
-      <xsl:variable name="zone" select="substring-before($zones, ' ')"/>
-      <xsl:variable name="target" select="key('id', $zone)[&scope;]"/>
-
-      <xsl:variable name="id">
-        <xsl:call-template name="object.id">
-           <xsl:with-param name="object" select="$target[1]"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <fo:basic-link internal-destination="{$id}"
-                     xsl:use-attribute-sets="index.page.number.properties">
-        <fo:page-number-citation ref-id="{$id}"/>
-      </fo:basic-link>
-
-      <xsl:if test="$passivetex.extensions = '0'">
-        <xsl:copy-of select="$number.separator"/>
-      </xsl:if>
-      <xsl:call-template name="reference">
-        <xsl:with-param name="zones" select="substring-after($zones, ' ')"/>
-        <xsl:with-param name="scope" select="$scope"/>
-        <xsl:with-param name="role" select="$role"/>
-        <xsl:with-param name="type" select="$type"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:variable name="zone" select="$zones"/>
-      <xsl:variable name="target" select="key('id', $zone)[&scope;]"/>
-
-      <xsl:variable name="id">
-        <xsl:call-template name="object.id">
-          <xsl:with-param name="object" select="$target[1]"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <fo:basic-link internal-destination="{$id}"
-                     xsl:use-attribute-sets="index.page.number.properties">
-        <fo:page-number-citation ref-id="{$id}"/>
-      </fo:basic-link>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="info.reference">
-  <!-- This is not perfect. It doesn't treat indexterm inside info element as a range covering whole parent of info.
-       It also not work when there is no ID generated for parent element. But it works in the most common cases. -->
-  <xsl:param name="scope" select="."/>
-  <xsl:param name="role" select="''"/>
-  <xsl:param name="type" select="''"/>
-
-  <xsl:variable name="target" select="(ancestor::appendix|ancestor::article|ancestor::bibliography|ancestor::book|
-                                       ancestor::chapter|ancestor::glossary|ancestor::part|ancestor::preface|
-                                       ancestor::refentry|ancestor::reference|ancestor::refsect1|ancestor::refsect2|
-                                       ancestor::refsect3|ancestor::refsection|ancestor::refsynopsisdiv|
-                                       ancestor::sect1|ancestor::sect2|ancestor::sect3|ancestor::sect4|ancestor::sect5|
-                                       ancestor::section|ancestor::setindex|ancestor::set|ancestor::sidebar)[&scope;]"/>
-  
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="$target[1]"/>
-    </xsl:call-template>
-  </xsl:variable>
-  
-  <fo:basic-link internal-destination="{$id}"
-                 xsl:use-attribute-sets="index.page.number.properties">
-    <fo:page-number-citation ref-id="{$id}"/>
-  </fo:basic-link>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="index-see">
-   <xsl:param name="scope" select="."/>
-  <xsl:param name="role" select="''"/>
-  <xsl:param name="type" select="''"/>
-
-   <fo:inline>
-     <xsl:text> (</xsl:text>
-     <xsl:call-template name="gentext">
-       <xsl:with-param name="key" select="'see'"/>
-     </xsl:call-template>
-     <xsl:text> </xsl:text>
-     <xsl:value-of select="see"/>
-     <xsl:text>)</xsl:text>
-   </fo:inline>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="index-seealso">
-   <xsl:param name="scope" select="."/>
-  <xsl:param name="role" select="''"/>
-  <xsl:param name="type" select="''"/>
-
-  <xsl:for-each select="seealso">
-    <xsl:sort select="translate(., &lowercase;, &uppercase;)"/>
-    <fo:block>
-      <xsl:text>(</xsl:text>
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'seealso'"/>
-      </xsl:call-template>
-      <xsl:text> </xsl:text>
-      <xsl:value-of select="."/>
-      <xsl:text>)</xsl:text>
-    </fo:block>
-  </xsl:for-each>
-
-</xsl:template>
-
-<!-- ====================================================================== -->
-
-<xsl:template name="generate-index-markup">
-  <xsl:param name="scope" select="(ancestor::book|/)[last()]"/>
-  <xsl:param name="role" select="@role"/>
-  <xsl:param name="type" select="@type"/>
-
-  <xsl:variable name="terms" select="$scope//indexterm[count(.|key('letter',
-                                     translate(substring(&primary;, 1, 1),&lowercase;,&uppercase;))[&scope;][1]) = 1]"/>
-  <xsl:variable name="alphabetical"
-                select="$terms[contains(concat(&lowercase;, &uppercase;),
-                                        substring(&primary;, 1, 1))]"/>
-  <xsl:variable name="others" select="$terms[not(contains(concat(&lowercase;,
-                                                 &uppercase;),
-                                             substring(&primary;, 1, 1)))]"/>
-
-  <xsl:text>&lt;index&gt;&#10;</xsl:text>
-  <xsl:if test="$others">
-    <xsl:text>&#10;&lt;indexdiv&gt;&#10;</xsl:text>
-    <xsl:text>&lt;title&gt;</xsl:text>
-    <xsl:call-template name="gentext">
-      <xsl:with-param name="key" select="'index symbols'"/>
-    </xsl:call-template>
-    <xsl:text>&lt;/title&gt;&#10;</xsl:text>
-    <xsl:apply-templates select="$others[count(.|key('primary',
-                                 &primary;)[&scope;][1]) = 1]"
-                         mode="index-symbol-div-markup">
-      <xsl:with-param name="scope" select="$scope"/>
-      <xsl:with-param name="role" select="$role"/>
-      <xsl:with-param name="type" select="$type"/>
-      <xsl:sort select="translate(&primary;, &lowercase;, &uppercase;)"/>
-    </xsl:apply-templates>
-    <xsl:text>&lt;/indexdiv&gt;&#10;</xsl:text>
-  </xsl:if>
-
-  <xsl:apply-templates select="$alphabetical[count(.|key('letter',
-                               translate(substring(&primary;, 1, 1),&lowercase;,&uppercase;))[&scope;][1]) = 1]"
-                       mode="index-div-markup">
-      <xsl:with-param name="scope" select="$scope"/>
-      <xsl:with-param name="role" select="$role"/>
-      <xsl:with-param name="type" select="$type"/>
-      <xsl:sort select="translate(&primary;, &lowercase;, &uppercase;)"/>
-  </xsl:apply-templates>
-  <xsl:text>&lt;/index&gt;&#10;</xsl:text>
-</xsl:template>
-
-<xsl:template match="*" mode="index-markup">
-  <xsl:param name="scope" select="."/>
-  <xsl:param name="role" select="''"/>
-  <xsl:param name="type" select="''"/>
-
-  <xsl:text>&lt;</xsl:text>
-  <xsl:value-of select="local-name(.)"/>
-  <xsl:text>&gt;&#10;</xsl:text>
-  <xsl:apply-templates mode="index-markup">
-    <xsl:with-param name="scope" select="$scope"/>
-    <xsl:with-param name="role" select="$role"/>
-    <xsl:with-param name="type" select="$type"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="index-div-markup">
-  <xsl:param name="scope" select="."/>
-  <xsl:param name="role" select="''"/>
-  <xsl:param name="type" select="''"/>
-  <xsl:variable name="key" select="translate(substring(&primary;, 1, 1),&lowercase;,&uppercase;)"/>
-  <xsl:text>&#10;&lt;indexdiv&gt;&#10;</xsl:text>
-  <xsl:text>&lt;title&gt;</xsl:text>
-  <xsl:value-of select="translate($key, &lowercase;, &uppercase;)"/>
-  <xsl:text>&lt;/title&gt;&#10;</xsl:text>
-
-  <xsl:apply-templates select="key('letter', $key)[&scope;][count(.|key('primary', &primary;)[&scope;][1]) = 1]"
-                       mode="index-primary-markup">
-    <xsl:with-param name="scope" select="$scope"/>
-    <xsl:with-param name="role" select="$role"/>
-    <xsl:with-param name="type" select="$type"/>
-    <xsl:sort select="translate(&primary;, &lowercase;, &uppercase;)"/>
-  </xsl:apply-templates>
-  <xsl:text>&lt;/indexdiv&gt;&#10;</xsl:text>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="index-symbol-div-markup">
-  <xsl:param name="scope" select="."/>
-  <xsl:param name="role" select="''"/>
-  <xsl:param name="type" select="''"/>
-  <xsl:variable name="key" select="translate(substring(&primary;, 1, 1),&lowercase;,&uppercase;)"/>
-
-  <xsl:apply-templates select="key('letter', $key)[&scope;][count(.|key('primary', &primary;)[&scope;][1]) = 1]"
-                       mode="index-primary-markup">
-    <xsl:with-param name="scope" select="$scope"/>
-    <xsl:with-param name="role" select="$role"/>
-    <xsl:with-param name="type" select="$type"/>
-    <xsl:sort select="translate(&primary;, &lowercase;, &uppercase;)"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="index-primary-markup">
-  <xsl:param name="scope" select="."/>
-  <xsl:param name="role" select="''"/>
-  <xsl:param name="type" select="''"/>
-  <xsl:variable name="key" select="&primary;"/>
-  <xsl:variable name="refs" select="key('primary', $key)[&scope;]"/>
-  <xsl:variable name="pages" select="$refs[not(see) and not(seealso)]"/>
-
-  <xsl:text>&#10;&lt;indexentry&gt;&#10;</xsl:text>
-  <xsl:text>&lt;primaryie&gt;</xsl:text>
-  <xsl:text>&lt;phrase&gt;</xsl:text>
-  <xsl:call-template name="escape-text">
-    <xsl:with-param name="text" select="string(primary)"/>
-  </xsl:call-template>
-  <xsl:text>&lt;/phrase&gt;</xsl:text>
-  <xsl:if test="$pages">,</xsl:if>
-  <xsl:text>&#10;</xsl:text>
-
-  <xsl:for-each select="$pages">
-    <xsl:apply-templates select="." mode="reference-markup">
-      <xsl:with-param name="scope" select="$scope"/>
-      <xsl:with-param name="role" select="$role"/>
-      <xsl:with-param name="type" select="$type"/>
-    </xsl:apply-templates>
-  </xsl:for-each>
-
-  <xsl:text>&lt;/primaryie&gt;&#10;</xsl:text>
-
-  <xsl:if test="$refs/secondary or $refs[not(secondary)]/*[self::see or self::seealso]">
-    <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see', concat(&primary;, &sep;, &sep;, &sep;, see))[&scope;][1])]"
-                         mode="index-see-markup">
-      <xsl:with-param name="scope" select="$scope"/>
-      <xsl:with-param name="role" select="$role"/>
-      <xsl:with-param name="type" select="$type"/>
-      <xsl:sort select="translate(see, &lowercase;, &uppercase;)"/>
-    </xsl:apply-templates>
-
-    <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see-also', concat(&primary;, &sep;, &sep;, &sep;, seealso))[&scope;][1])]"
-                         mode="index-seealso-markup">
-      <xsl:with-param name="scope" select="$scope"/>
-      <xsl:with-param name="role" select="$role"/>
-      <xsl:with-param name="type" select="$type"/>
-      <xsl:sort select="translate(seealso, &lowercase;, &uppercase;)"/>
-    </xsl:apply-templates>
-
-    <xsl:apply-templates select="$refs[secondary and count(.|key('secondary', concat($key, &sep;, &secondary;))[&scope;][1]) = 1]" 
-                         mode="index-secondary-markup">
-      <xsl:with-param name="scope" select="$scope"/>
-      <xsl:with-param name="role" select="$role"/>
-      <xsl:with-param name="type" select="$type"/>
-      <xsl:sort select="translate(&secondary;, &lowercase;, &uppercase;)"/>
-    </xsl:apply-templates>
-  </xsl:if>
-  <xsl:text>&lt;/indexentry&gt;&#10;</xsl:text>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="index-secondary-markup">
-  <xsl:param name="scope" select="."/>
-  <xsl:param name="role" select="''"/>
-  <xsl:param name="type" select="''"/>
-  <xsl:variable name="key" select="concat(&primary;, &sep;, &secondary;)"/>
-  <xsl:variable name="refs" select="key('secondary', $key)[&scope;]"/>
-  <xsl:variable name="pages" select="$refs[not(see) and not(seealso)]"/>
-
-  <xsl:text>&lt;secondaryie&gt;</xsl:text>
-  <xsl:text>&lt;phrase&gt;</xsl:text>
-  <xsl:call-template name="escape-text">
-    <xsl:with-param name="text" select="string(secondary)"/>
-  </xsl:call-template>
-  <xsl:text>&lt;/phrase&gt;</xsl:text>
-  <xsl:if test="$pages">,</xsl:if>
-  <xsl:text>&#10;</xsl:text>
-
-  <xsl:for-each select="$pages">
-    <xsl:apply-templates select="." mode="reference-markup">
-      <xsl:with-param name="scope" select="$scope"/>
-      <xsl:with-param name="role" select="$role"/>
-      <xsl:with-param name="type" select="$type"/>
-    </xsl:apply-templates>
-  </xsl:for-each>
-
-  <xsl:text>&lt;/secondaryie&gt;&#10;</xsl:text>
-
-  <xsl:if test="$refs/tertiary or $refs[not(tertiary)]/*[self::see or self::seealso]">
-    <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see', concat(&primary;, &sep;, &secondary;, &sep;, &sep;, see))[&scope;][1])]"
-                         mode="index-see-markup">
-      <xsl:with-param name="scope" select="$scope"/>
-      <xsl:with-param name="role" select="$role"/>
-      <xsl:with-param name="type" select="$type"/>
-      <xsl:sort select="translate(see, &lowercase;, &uppercase;)"/>
-    </xsl:apply-templates>
-    <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see-also', concat(&primary;, &sep;, &secondary;, &sep;, &sep;, seealso))[&scope;][1])]"
-                         mode="index-seealso-markup">
-      <xsl:with-param name="scope" select="$scope"/>
-      <xsl:with-param name="role" select="$role"/>
-      <xsl:with-param name="type" select="$type"/>
-      <xsl:sort select="translate(seealso, &lowercase;, &uppercase;)"/>
-    </xsl:apply-templates>
-    <xsl:apply-templates select="$refs[tertiary and count(.|key('tertiary', concat($key, &sep;, &tertiary;))[&scope;][1]) = 1]" 
-                         mode="index-tertiary-markup">
-      <xsl:with-param name="scope" select="$scope"/>
-      <xsl:with-param name="role" select="$role"/>
-      <xsl:with-param name="type" select="$type"/>
-      <xsl:sort select="translate(&tertiary;, &lowercase;, &uppercase;)"/>
-    </xsl:apply-templates>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="index-tertiary-markup">
-  <xsl:param name="scope" select="."/>
-  <xsl:param name="role" select="''"/>
-  <xsl:param name="type" select="''"/>
-  <xsl:variable name="key" select="concat(&primary;, &sep;, &secondary;, &sep;, &tertiary;)"/>
-  <xsl:variable name="refs" select="key('tertiary', $key)[&scope;]"/>
-  <xsl:variable name="pages" select="$refs[not(see) and not(seealso)]"/>
-
-  <xsl:text>&lt;tertiaryie&gt;</xsl:text>
-  <xsl:text>&lt;phrase&gt;</xsl:text>
-  <xsl:call-template name="escape-text">
-    <xsl:with-param name="text" select="string(tertiary)"/>
-  </xsl:call-template>
-  <xsl:text>&lt;/phrase&gt;</xsl:text>
-  <xsl:if test="$pages">,</xsl:if>
-  <xsl:text>&#10;</xsl:text>
-
-  <xsl:for-each select="$pages">
-    <xsl:apply-templates select="." mode="reference-markup">
-      <xsl:with-param name="scope" select="$scope"/>
-      <xsl:with-param name="role" select="$role"/>
-      <xsl:with-param name="type" select="$type"/>
-    </xsl:apply-templates>
-  </xsl:for-each>
-
-  <xsl:text>&lt;/tertiaryie&gt;&#10;</xsl:text>
-
-  <xsl:variable name="see" select="$refs/see | $refs/seealso"/>
-  <xsl:if test="$see">
-    <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see', concat(&primary;, &sep;, &secondary;, &sep;, &tertiary;, &sep;, see))[&scope;][1])]"
-                         mode="index-see-markup">
-      <xsl:with-param name="scope" select="$scope"/>
-      <xsl:with-param name="role" select="$role"/>
-      <xsl:with-param name="type" select="$type"/>
-      <xsl:sort select="translate(see, &lowercase;, &uppercase;)"/>
-    </xsl:apply-templates>
-    <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see-also', concat(&primary;, &sep;, &secondary;, &sep;, &tertiary;, &sep;, seealso))[&scope;][1])]"
-                         mode="index-seealso-markup">
-      <xsl:with-param name="scope" select="$scope"/>
-      <xsl:with-param name="role" select="$role"/>
-      <xsl:with-param name="type" select="$type"/>
-      <xsl:sort select="translate(seealso, &lowercase;, &uppercase;)"/>
-    </xsl:apply-templates>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="reference-markup">
-  <xsl:param name="scope" select="."/>
-  <xsl:param name="role" select="''"/>
-  <xsl:param name="type" select="''"/>
-
-  <xsl:choose>
-    <xsl:when test="@zone and string(@zone)">
-      <xsl:call-template name="reference-markup">
-        <xsl:with-param name="zones" select="normalize-space(@zone)"/>
-        <xsl:with-param name="scope" select="$scope"/>
-        <xsl:with-param name="role" select="$role"/>
-        <xsl:with-param name="type" select="$type"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:variable name="id">
-        <xsl:call-template name="object.id"/>
-      </xsl:variable>
-
-
-      <xsl:choose>
-        <xsl:when test="@startref and @class='endofrange'">
-          <xsl:text>&lt;phrase role="pageno"&gt;</xsl:text>
-          <xsl:text>&lt;link linkend="</xsl:text>
-          <xsl:value-of select="@startref"/>
-          <xsl:text>"&gt;</xsl:text>
-          <fo:basic-link internal-destination="{@startref}"
-                     xsl:use-attribute-sets="index.page.number.properties">
-            <fo:page-number-citation ref-id="{@startref}"/>
-            <xsl:text>-</xsl:text>
-            <fo:page-number-citation ref-id="{$id}"/>
-          </fo:basic-link>
-          <xsl:text>&lt;/link&gt;</xsl:text>
-          <xsl:text>&lt;/phrase&gt;&#10;</xsl:text>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:text>&lt;phrase role="pageno"&gt;</xsl:text>
-          <xsl:if test="$id">
-            <xsl:text>&lt;link linkend="</xsl:text>
-            <xsl:value-of select="$id"/>
-            <xsl:text>"&gt;</xsl:text>
-          </xsl:if>
-          <fo:basic-link internal-destination="{$id}"
-                     xsl:use-attribute-sets="index.page.number.properties">
-            <fo:page-number-citation ref-id="{$id}"/>
-          </fo:basic-link>
-          <xsl:if test="$id">
-            <xsl:text>&lt;/link&gt;</xsl:text>
-          </xsl:if>
-          <xsl:text>&lt;/phrase&gt;&#10;</xsl:text>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="reference-markup">
-  <xsl:param name="scope" select="."/>
-  <xsl:param name="role" select="''"/>
-  <xsl:param name="type" select="''"/>
-  <xsl:param name="zones"/>
-  <xsl:choose>
-    <xsl:when test="contains($zones, ' ')">
-      <xsl:variable name="zone" select="substring-before($zones, ' ')"/>
-      <xsl:variable name="target" select="key('id', $zone)[&scope;]"/>
-
-      <xsl:variable name="id">
-        <xsl:call-template name="object.id">
-          <xsl:with-param name="object" select="$target[1]"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <xsl:text>&lt;phrase fole="pageno"&gt;</xsl:text>
-      <xsl:if test="$target[1]/@id or $target[1]/@xml:id">
-        <xsl:text>&lt;link linkend="</xsl:text>
-        <xsl:value-of select="$id"/>
-        <xsl:text>"&gt;</xsl:text>
-      </xsl:if>
-      <fo:basic-link internal-destination="{$id}"
-                     xsl:use-attribute-sets="index.page.number.properties">
-        <fo:page-number-citation ref-id="{$id}"/>
-      </fo:basic-link>
-      <xsl:if test="$target[1]/@id or $target[1]/@xml:id">
-        <xsl:text>&lt;/link&gt;</xsl:text>
-      </xsl:if>
-      <xsl:text>&lt;/phrase&gt;&#10;</xsl:text>
-
-      <xsl:call-template name="reference">
-        <xsl:with-param name="zones" select="substring-after($zones, ' ')"/>
-        <xsl:with-param name="scope" select="$scope"/>
-        <xsl:with-param name="role" select="$role"/>
-        <xsl:with-param name="type" select="$type"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:variable name="zone" select="$zones"/>
-      <xsl:variable name="target" select="key('id', $zone)[&scope;]"/>
-
-      <xsl:variable name="id">
-        <xsl:call-template name="object.id">
-          <xsl:with-param name="object" select="$target[1]"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <xsl:text>&lt;phrase role="pageno"&gt;</xsl:text>
-      <xsl:if test="$target[1]/@id or target[1]/@xml:id">
-        <xsl:text>&lt;link linkend="</xsl:text>
-        <xsl:value-of select="$id"/>
-        <xsl:text>"&gt;</xsl:text>
-      </xsl:if>
-      <fo:basic-link internal-destination="{$id}"
-                     xsl:use-attribute-sets="index.page.number.properties">
-        <fo:page-number-citation ref-id="{$id}"/>
-      </fo:basic-link>
-      <xsl:if test="$target[1]/@id or target[1]/@xml:id">
-        <xsl:text>&lt;/link&gt;</xsl:text>
-      </xsl:if>
-      <xsl:text>&lt;/phrase&gt;&#10;</xsl:text>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="index-see-markup">
-  <xsl:param name="scope" select="."/>
-  <xsl:param name="role" select="''"/>
-  <xsl:param name="type" select="''"/>
-  <fo:block>
-    <xsl:text>&lt;seeie&gt;</xsl:text>
-    <xsl:text>&lt;phrase&gt;</xsl:text>
-    <xsl:call-template name="escape-text">
-      <xsl:with-param name="text" select="string(see)"/>
-    </xsl:call-template>
-    <xsl:text>&lt;/phrase&gt;</xsl:text>
-    <xsl:text>&lt;/seeie&gt;&#10;</xsl:text>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="index-seealso-markup">
-  <xsl:param name="scope" select="."/>
-  <xsl:param name="role" select="''"/>
-  <xsl:param name="type" select="''"/>
-  <fo:block>
-    <xsl:text>&lt;seealsoie&gt;</xsl:text>
-    <xsl:text>&lt;phrase&gt;</xsl:text>
-    <xsl:call-template name="escape-text">
-      <xsl:with-param name="text" select="string(seealso)"/>
-    </xsl:call-template>
-    <xsl:text>&lt;/phrase&gt;</xsl:text>
-    <xsl:text>&lt;/seealsoie&gt;&#10;</xsl:text>
-  </fo:block>
-</xsl:template>
-
-<xsl:template name="escape-text">
-  <xsl:param name="text" select="''"/>
-
-  <xsl:variable name="ltpos" select="substring-before($text, '&lt;')"/>
-  <xsl:variable name="amppos" select="substring-before($text, '&amp;')"/>
-
-  <xsl:choose>
-    <xsl:when test="contains($text,'&lt;') and contains($text, '&amp;')
-                    and string-length($ltpos) &lt; string-length($amppos)">
-      <xsl:value-of select="$ltpos"/>
-      <xsl:text>&amp;lt;</xsl:text>
-      <xsl:call-template name="escape-text">
-        <xsl:with-param name="text" select="substring-after($text, '&lt;')"/>
-      </xsl:call-template>
-    </xsl:when>
-
-    <xsl:when test="contains($text,'&lt;') and contains($text, '&amp;')
-                    and string-length($amppos) &lt; string-length($ltpos)">
-      <xsl:value-of select="$amppos"/>
-      <xsl:text>&amp;amp;</xsl:text>
-      <xsl:call-template name="escape-text">
-        <xsl:with-param name="text" select="substring-after($text, '&amp;')"/>
-      </xsl:call-template>
-    </xsl:when>
-
-    <xsl:when test="contains($text, '&lt;')">
-      <xsl:value-of select="$ltpos"/>
-      <xsl:text>&amp;lt;</xsl:text>
-      <xsl:call-template name="escape-text">
-        <xsl:with-param name="text" select="substring-after($text, '&lt;')"/>
-      </xsl:call-template>
-    </xsl:when>
-
-    <xsl:when test="contains($text, '&amp;')">
-      <xsl:value-of select="$amppos"/>
-      <xsl:text>&amp;amp;</xsl:text>
-      <xsl:call-template name="escape-text">
-        <xsl:with-param name="text" select="substring-after($text, '&amp;')"/>
-      </xsl:call-template>
-    </xsl:when>
-
-    <xsl:otherwise>
-      <xsl:value-of select="$text"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="index.separator">
-  <xsl:param name="key" select="''"/>
-  <xsl:param name="lang">
-    <xsl:call-template name="l10n.language"/>
-  </xsl:param>
-
-  <xsl:choose>
-    <xsl:when test="$key = 'index.term.separator'">
-      <xsl:choose>
-        <!-- Use the override if not blank -->
-        <xsl:when test="$index.term.separator != ''">
-          <xsl:copy-of select="$index.term.separator"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="gentext.template">
-            <xsl:with-param name="lang" select="$lang"/>
-            <xsl:with-param name="context">index</xsl:with-param>
-            <xsl:with-param name="name">term-separator</xsl:with-param>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:when test="$key = 'index.number.separator'">
-      <xsl:choose>
-        <!-- Use the override if not blank -->
-        <xsl:when test="$index.number.separator != ''">
-          <xsl:copy-of select="$index.number.separator"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="gentext.template">
-            <xsl:with-param name="lang" select="$lang"/>
-            <xsl:with-param name="context">index</xsl:with-param>
-            <xsl:with-param name="name">number-separator</xsl:with-param>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:when test="$key = 'index.range.separator'">
-      <xsl:choose>
-        <!-- Use the override if not blank -->
-        <xsl:when test="$index.range.separator != ''">
-          <xsl:copy-of select="$index.range.separator"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="gentext.template">
-            <xsl:with-param name="lang" select="$lang"/>
-            <xsl:with-param name="context">index</xsl:with-param>
-            <xsl:with-param name="name">range-separator</xsl:with-param>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/autotoc.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/autotoc.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,855 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                xmlns:axf="http://www.antennahouse.com/names/XSL/Extensions"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:template name="set.toc">
-  <xsl:param name="toc-context" select="."/>
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="cid">
-    <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="$toc-context"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="nodes" select="book|setindex"/>
-
-  <xsl:if test="$nodes">
-    <fo:block id="toc...{$id}"
-              xsl:use-attribute-sets="toc.margin.properties">
-      <xsl:if test="$axf.extensions != 0">
-        <xsl:attribute name="axf:outline-level">1</xsl:attribute>
-        <xsl:attribute name="axf:outline-expand">false</xsl:attribute>
-        <xsl:attribute name="axf:outline-title">
-          <xsl:call-template name="gentext">
-            <xsl:with-param name="key" select="'TableofContents'"/>
-          </xsl:call-template>
-        </xsl:attribute>
-      </xsl:if>
-      <xsl:call-template name="table.of.contents.titlepage"/>
-      <xsl:apply-templates select="$nodes" mode="toc">
-        <xsl:with-param name="toc-context" select="$toc-context"/>
-      </xsl:apply-templates>
-    </fo:block>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="division.toc">
-  <xsl:param name="toc-context" select="."/>
-  <xsl:param name="toc.title.p" select="true()"/>
-
-  <xsl:variable name="cid">
-    <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="$toc-context"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="nodes"
-                select="$toc-context/part
-                        |$toc-context/reference
-                        |$toc-context/preface
-                        |$toc-context/chapter
-                        |$toc-context/appendix
-                        |$toc-context/article
-                        |$toc-context/bibliography
-                        |$toc-context/glossary
-                        |$toc-context/index"/>
-
-  <xsl:if test="$nodes">
-    <fo:block id="toc...{$cid}"
-              xsl:use-attribute-sets="toc.margin.properties">
-      <xsl:if test="$axf.extensions != 0">
-        <xsl:attribute name="axf:outline-level">1</xsl:attribute>
-        <xsl:attribute name="axf:outline-expand">false</xsl:attribute>
-        <xsl:attribute name="axf:outline-title">
-          <xsl:call-template name="gentext">
-            <xsl:with-param name="key" select="'TableofContents'"/>
-          </xsl:call-template>
-        </xsl:attribute>
-      </xsl:if>
-      <xsl:if test="$toc.title.p">
-        <xsl:call-template name="table.of.contents.titlepage"/>
-      </xsl:if>
-      <xsl:apply-templates select="$nodes" mode="toc">
-        <xsl:with-param name="toc-context" select="$toc-context"/>
-      </xsl:apply-templates>
-    </fo:block>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="component.toc">
-  <xsl:param name="toc-context" select="."/>
-  <xsl:param name="toc.title.p" select="true()"/>
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="cid">
-    <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="$toc-context"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="nodes" select="section|sect1|refentry
-                                     |article|bibliography|glossary
-                                     |qandaset[$qanda.in.toc != 0]
-                                     |appendix|index"/>
-  <xsl:if test="$nodes">
-    <fo:block id="toc...{$id}"
-              xsl:use-attribute-sets="toc.margin.properties">
-      <xsl:if test="$toc.title.p">
-        <xsl:call-template name="table.of.contents.titlepage"/>
-      </xsl:if>
-      <xsl:apply-templates select="$nodes" mode="toc">
-        <xsl:with-param name="toc-context" select="$toc-context"/>
-      </xsl:apply-templates>
-    </fo:block>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="component.toc.separator">
-  <!-- Customize to output something between
-       component.toc and first output -->
-</xsl:template>
-
-<xsl:template name="section.toc">
-  <xsl:param name="toc-context" select="."/>
-  <xsl:param name="toc.title.p" select="true()"/>
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="cid">
-    <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="$toc-context"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="nodes"
-                select="section|sect1|sect2|sect3|sect4|sect5|refentry
-                        |qandaset[$qanda.in.toc != 0]
-                        |bridgehead[$bridgehead.in.toc != 0]"/>
-
-  <xsl:variable name="level">
-    <xsl:call-template name="section.level"/>
-  </xsl:variable>
-
-  <xsl:if test="$nodes">
-    <fo:block id="toc...{$id}"
-              xsl:use-attribute-sets="toc.margin.properties">
-
-      <xsl:if test="$toc.title.p">
-        <xsl:call-template name="section.heading">
-          <xsl:with-param name="level" select="$level + 1"/>
-          <xsl:with-param name="title">
-            <fo:block space-after="0.5em">
-              <xsl:call-template name="gentext">
-                <xsl:with-param name="key" select="'TableofContents'"/>
-              </xsl:call-template>
-            </fo:block>
-          </xsl:with-param>
-        </xsl:call-template>
-      </xsl:if>
-
-      <xsl:apply-templates select="$nodes" mode="toc">
-        <xsl:with-param name="toc-context" select="$toc-context"/>
-      </xsl:apply-templates>
-    </fo:block>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="section.toc.separator">
-  <!-- Customize to output something between
-       section.toc and first output -->
-</xsl:template>
-<!-- ==================================================================== -->
-
-<xsl:template name="toc.line">
-  <xsl:param name="toc-context" select="NOTANODE"/>
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="label">
-    <xsl:apply-templates select="." mode="label.markup"/>
-  </xsl:variable>
-
-  <fo:block xsl:use-attribute-sets="toc.line.properties">
-    <fo:inline keep-with-next.within-line="always">
-      <fo:basic-link internal-destination="{$id}">
-        <xsl:if test="$label != ''">
-          <xsl:copy-of select="$label"/>
-          <xsl:value-of select="$autotoc.label.separator"/>
-        </xsl:if>
-        <xsl:apply-templates select="." mode="titleabbrev.markup"/>
-      </fo:basic-link>
-    </fo:inline>
-    <fo:inline keep-together.within-line="always">
-      <xsl:text> </xsl:text>
-      <fo:leader leader-pattern="dots"
-                 leader-pattern-width="3pt"
-                 leader-alignment="reference-area"
-                 keep-with-next.within-line="always"/>
-      <xsl:text> </xsl:text> 
-      <fo:basic-link internal-destination="{$id}">
-        <fo:page-number-citation ref-id="{$id}"/>
-      </fo:basic-link>
-    </fo:inline>
-  </fo:block>
-</xsl:template>
-
-<!-- ==================================================================== -->
-<xsl:template name="qandaset.toc">
-  <xsl:param name="toc-context" select="."/>
-  <xsl:param name="toc.title.p" select="true()"/>
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="cid">
-    <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="$toc-context"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="nodes" select="qandadiv|qandaentry"/>
-
-  <xsl:if test="$nodes">
-    <fo:block id="toc...{$id}"
-              xsl:use-attribute-sets="toc.margin.properties">
-      <xsl:if test="$toc.title.p">
-        <xsl:call-template name="table.of.contents.titlepage"/>
-      </xsl:if>
-      <xsl:apply-templates select="$nodes" mode="toc">
-        <xsl:with-param name="toc-context" select="$toc-context"/>
-      </xsl:apply-templates>
-    </fo:block>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="qandaset.toc.separator">
-  <!-- Customize to output something between
-       qandaset.toc and first output -->
-</xsl:template>
-
-<xsl:template match="qandadiv" mode="toc">
-  <xsl:param name="toc-context" select="."/>
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="cid">
-    <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="$toc-context"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:call-template name="toc.line">
-    <xsl:with-param name="toc-context" select="$toc-context"/>
-  </xsl:call-template>
-
-  <xsl:variable name="nodes" select="qandadiv|qandaentry"/>
-
-  <xsl:if test="$nodes">
-    <fo:block id="toc.{$cid}.{$id}">
-      <xsl:attribute name="margin-left">
-        <xsl:call-template name="set.toc.indent"/>
-      </xsl:attribute>
-
-      <xsl:apply-templates select="$nodes" mode="toc">
-        <xsl:with-param name="toc-context" select="$toc-context"/>
-      </xsl:apply-templates>
-    </fo:block>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="qandaentry" mode="toc">
-  <xsl:apply-templates select="question" mode="toc"/>
-</xsl:template>
-
-<xsl:template match="question" mode="toc">
-  <xsl:variable name="firstchunk">
-    <xsl:apply-templates select="(*[local-name(.)!='label'])[1]/node()"/>
-  </xsl:variable>
-
-  <xsl:variable name="deflabel">
-    <xsl:choose>
-      <xsl:when test="ancestor-or-self::*[@defaultlabel]">
-        <xsl:value-of select="(ancestor-or-self::*[@defaultlabel])[last()]
-                              /@defaultlabel"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$qanda.defaultlabel"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="label">
-    <xsl:apply-templates select="." mode="label.markup"/>
-  </xsl:variable>
-
-  <fo:block xsl:use-attribute-sets="toc.line.properties"
-	    margin-left="3em"
-	    text-indent="-3em"
-            end-indent="{$toc.indent.width}pt"
-            last-line-end-indent="-{$toc.indent.width}pt">
-    <fo:inline keep-with-next.within-line="always">
-      <fo:basic-link internal-destination="{$id}">
-        <xsl:if test="$label != ''">
-          <xsl:copy-of select="$label"/>
-          <xsl:if test="$deflabel = 'number' and not(label)">
-            <xsl:value-of select="$autotoc.label.separator"/>
-          </xsl:if>
-	  <xsl:text> </xsl:text>
-        </xsl:if>
-        <xsl:copy-of select="$firstchunk"/>
-      </fo:basic-link>
-    </fo:inline>
-    <fo:inline keep-together.within-line="always">
-      <xsl:text> </xsl:text>
-      <fo:leader leader-pattern="dots"
-                 leader-pattern-width="3pt"
-                 leader-alignment="reference-area"
-                 keep-with-next.within-line="always"/>
-      <xsl:text> </xsl:text> 
-      <fo:basic-link internal-destination="{$id}">
-        <fo:page-number-citation ref-id="{$id}"/>
-      </fo:basic-link>
-    </fo:inline>
-  </fo:block>
-
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="book|setindex" mode="toc">
-  <xsl:param name="toc-context" select="."/>
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="cid">
-    <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="$toc-context"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:call-template name="toc.line">
-    <xsl:with-param name="toc-context" select="$toc-context"/>
-  </xsl:call-template>
-
-  <xsl:variable name="nodes" select="glossary|bibliography|preface|chapter
-                                     |reference|part|article|appendix|index"/>
-
-  <xsl:variable name="depth.from.context" select="count(ancestor::*)-count($toc-context/ancestor::*)"/>
-
-  <xsl:if test="$toc.section.depth > 0 
-                and $toc.max.depth > $depth.from.context
-                and $nodes">
-    <fo:block id="toc.{$cid}.{$id}">
-      <xsl:attribute name="margin-left">
-        <xsl:call-template name="set.toc.indent"/>
-      </xsl:attribute>
-
-      <xsl:apply-templates select="$nodes" mode="toc">
-        <xsl:with-param name="toc-context" select="$toc-context"/>
-      </xsl:apply-templates>
-    </fo:block>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="part" mode="toc">
-  <xsl:param name="toc-context" select="."/>
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="cid">
-    <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="$toc-context"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:call-template name="toc.line">
-    <xsl:with-param name="toc-context" select="$toc-context"/>
-  </xsl:call-template>
-
-  <xsl:variable name="nodes" select="chapter|appendix|preface|reference|
-                                     refentry|article|index|glossary|
-                                     bibliography"/>
-
-  <xsl:variable name="depth.from.context" select="count(ancestor::*)-count($toc-context/ancestor::*)"/>
-
-  <xsl:if test="$toc.section.depth > 0 
-                and $toc.max.depth > $depth.from.context
-                and $nodes">
-    <fo:block id="toc.{$cid}.{$id}">
-      <xsl:attribute name="margin-left">
-        <xsl:call-template name="set.toc.indent"/>
-      </xsl:attribute>
-      
-      <xsl:apply-templates select="$nodes" mode="toc">
-        <xsl:with-param name="toc-context" select="$toc-context"/>
-      </xsl:apply-templates>
-    </fo:block>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="reference" mode="toc">
-  <xsl:param name="toc-context" select="."/>
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="cid">
-    <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="$toc-context"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="depth.from.context" select="count(ancestor::*)-count($toc-context/ancestor::*)"/>
-
-  <xsl:call-template name="toc.line">
-    <xsl:with-param name="toc-context" select="$toc-context"/>
-  </xsl:call-template>
-
-  <xsl:if test="$toc.section.depth > 0
-                and $toc.max.depth > $depth.from.context
-                and refentry">
-    <fo:block id="toc.{$cid}.{$id}">
-      <xsl:attribute name="margin-left">
-        <xsl:call-template name="set.toc.indent"/>
-      </xsl:attribute>
-              
-      <xsl:apply-templates select="refentry" mode="toc">
-        <xsl:with-param name="toc-context" select="$toc-context"/>
-      </xsl:apply-templates>
-    </fo:block>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="refentry" mode="toc">
-  <xsl:param name="toc-context" select="."/>
-
-  <xsl:call-template name="toc.line">
-    <xsl:with-param name="toc-context" select="$toc-context"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="preface|chapter|appendix|article"
-              mode="toc">
-  <xsl:param name="toc-context" select="."/>
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="cid">
-    <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="$toc-context"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:call-template name="toc.line">
-    <xsl:with-param name="toc-context" select="$toc-context"/>
-  </xsl:call-template>
-
-  <xsl:variable name="nodes" select="section|sect1
-                                     |qandaset[$qanda.in.toc != 0]
-                                     |simplesect[$simplesect.in.toc != 0]
-                                     |refentry|appendix"/>
-
-  <xsl:variable name="depth.from.context" select="count(ancestor::*)-count($toc-context/ancestor::*)"/>
-
-  <xsl:if test="$toc.section.depth > 0 
-                and $toc.max.depth > $depth.from.context
-                and $nodes">
-    <fo:block id="toc.{$cid}.{$id}">
-      <xsl:attribute name="margin-left">
-        <xsl:call-template name="set.toc.indent"/>
-      </xsl:attribute>
-              
-      <xsl:apply-templates select="$nodes" mode="toc">
-        <xsl:with-param name="toc-context" select="$toc-context"/>
-      </xsl:apply-templates>
-    </fo:block>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="sect1" mode="toc">
-  <xsl:param name="toc-context" select="."/>
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="cid">
-    <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="$toc-context"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:call-template name="toc.line">
-    <xsl:with-param name="toc-context" select="$toc-context"/>
-  </xsl:call-template>
-
-  <xsl:variable name="depth.from.context" select="count(ancestor::*)-count($toc-context/ancestor::*)"/>
-
-  <xsl:if test="$toc.section.depth > 1 
-                and $toc.max.depth > $depth.from.context
-                and sect2">
-    <fo:block id="toc.{$cid}.{$id}">
-      <xsl:attribute name="margin-left">
-        <xsl:call-template name="set.toc.indent"/>
-      </xsl:attribute>
-              
-      <xsl:apply-templates select="sect2|qandaset[$qanda.in.toc != 0]" 
-                           mode="toc">
-        <xsl:with-param name="toc-context" select="$toc-context"/>
-      </xsl:apply-templates>
-    </fo:block>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="sect2" mode="toc">
-  <xsl:param name="toc-context" select="."/>
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="cid">
-    <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="$toc-context"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:call-template name="toc.line">
-    <xsl:with-param name="toc-context" select="$toc-context"/>
-  </xsl:call-template>
-
-  <xsl:variable name="reldepth"
-                select="count(ancestor::*)-count($toc-context/ancestor::*)"/>
-
-  <xsl:variable name="depth.from.context" select="count(ancestor::*)-count($toc-context/ancestor::*)"/>
-
-  <xsl:if test="$toc.section.depth > 2 
-                and $toc.max.depth > $depth.from.context
-                and sect3">
-    <fo:block id="toc.{$cid}.{$id}">
-      <xsl:attribute name="margin-left">
-        <xsl:call-template name="set.toc.indent">
-          <xsl:with-param name="reldepth" select="$reldepth"/>
-        </xsl:call-template>
-      </xsl:attribute>
-              
-      <xsl:apply-templates select="sect3|qandaset[$qanda.in.toc != 0]" 
-                           mode="toc">
-        <xsl:with-param name="toc-context" select="$toc-context"/>
-      </xsl:apply-templates>
-    </fo:block>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="sect3" mode="toc">
-  <xsl:param name="toc-context" select="."/>
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="cid">
-    <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="$toc-context"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:call-template name="toc.line">
-    <xsl:with-param name="toc-context" select="$toc-context"/>
-  </xsl:call-template>
-
-  <xsl:variable name="reldepth"
-                select="count(ancestor::*)-count($toc-context/ancestor::*)"/>
-
-  <xsl:variable name="depth.from.context" select="count(ancestor::*)-count($toc-context/ancestor::*)"/>
-
-  <xsl:if test="$toc.section.depth > 3 
-                and $toc.max.depth > $depth.from.context
-                and sect4">
-    <fo:block id="toc.{$cid}.{$id}">
-      <xsl:attribute name="margin-left">
-        <xsl:call-template name="set.toc.indent">
-          <xsl:with-param name="reldepth" select="$reldepth"/>
-        </xsl:call-template>
-      </xsl:attribute>
-              
-      <xsl:apply-templates select="sect4|qandaset[$qanda.in.toc != 0]" 
-                           mode="toc">
-        <xsl:with-param name="toc-context" select="$toc-context"/>
-      </xsl:apply-templates>
-    </fo:block>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="sect4" mode="toc">
-  <xsl:param name="toc-context" select="."/>
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="cid">
-    <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="$toc-context"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:call-template name="toc.line">
-    <xsl:with-param name="toc-context" select="$toc-context"/>
-  </xsl:call-template>
-
-  <xsl:variable name="reldepth"
-                select="count(ancestor::*)-count($toc-context/ancestor::*)"/>
-
-  <xsl:variable name="depth.from.context" select="count(ancestor::*)-count($toc-context/ancestor::*)"/>
-
-  <xsl:if test="$toc.section.depth > 4 
-                and $toc.max.depth > $depth.from.context
-                and sect5">
-    <fo:block id="toc.{$cid}.{$id}">
-      <xsl:attribute name="margin-left">
-        <xsl:call-template name="set.toc.indent">
-          <xsl:with-param name="reldepth" select="$reldepth"/>
-        </xsl:call-template>
-      </xsl:attribute>
-              
-      <xsl:apply-templates select="sect5|qandaset[$qanda.in.toc != 0]" 
-                           mode="toc">
-        <xsl:with-param name="toc-context" select="$toc-context"/>
-      </xsl:apply-templates>
-    </fo:block>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="sect5|simplesect" mode="toc">
-  <xsl:param name="toc-context" select="."/>
-
-  <xsl:call-template name="toc.line">
-    <xsl:with-param name="toc-context" select="$toc-context"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="set.toc.indent">
-  <xsl:param name="reldepth"/>
-
-  <xsl:variable name="depth">
-    <xsl:choose>
-      <xsl:when test="$reldepth != ''">
-        <xsl:value-of select="$reldepth"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="count(ancestor::*)"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$fop.extensions != 0 or $passivetex.extensions != 0">
-       <xsl:value-of select="concat($depth*$toc.indent.width, 'pt')"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="concat($toc.indent.width, 'pt')"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-
-<xsl:template match="section" mode="toc">
-  <xsl:param name="toc-context" select="."/>
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="cid">
-    <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="$toc-context"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="depth" select="count(ancestor::section) + 1"/>
-  <xsl:variable name="reldepth"
-                select="count(ancestor::*)-count($toc-context/ancestor::*)"/>
-
-  <xsl:variable name="depth.from.context" select="count(ancestor::*)-count($toc-context/ancestor::*)"/>
-
-  <xsl:if test="$toc.section.depth &gt;= $depth">
-    <xsl:call-template name="toc.line">
-      <xsl:with-param name="toc-context" select="$toc-context"/>
-    </xsl:call-template>
-
-    <xsl:if test="$toc.section.depth > $depth 
-                  and $toc.max.depth > $depth.from.context
-                  and section">
-      <fo:block id="toc.{$cid}.{$id}">
-        <xsl:attribute name="margin-left">
-          <xsl:call-template name="set.toc.indent">
-            <xsl:with-param name="reldepth" select="$reldepth"/>
-          </xsl:call-template>
-        </xsl:attribute>
-                
-        <xsl:apply-templates select="section|qandaset[$qanda.in.toc != 0]" 
-                           mode="toc">
-          <xsl:with-param name="toc-context" select="$toc-context"/>
-        </xsl:apply-templates>
-      </fo:block>
-    </xsl:if>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="bibliography|glossary"
-              mode="toc">
-  <xsl:param name="toc-context" select="."/>
-
-  <xsl:call-template name="toc.line">
-    <xsl:with-param name="toc-context" select="$toc-context"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="index" mode="toc">
-  <xsl:param name="toc-context" select="."/>
-
-  <xsl:if test="* or $generate.index != 0">
-    <xsl:call-template name="toc.line">
-    <xsl:with-param name="toc-context" select="$toc-context"/>
-  </xsl:call-template>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="title" mode="toc">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="list.of.titles">
-  <xsl:param name="titles" select="'table'"/>
-  <xsl:param name="nodes" select=".//table"/>
-  <xsl:param name="toc-context" select="."/>
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:if test="$nodes">
-    <fo:block id="lot...{$titles}...{$id}">
-      <xsl:choose>
-        <xsl:when test="$titles='table'">
-          <xsl:call-template name="list.of.tables.titlepage"/>
-        </xsl:when>
-        <xsl:when test="$titles='figure'">
-          <xsl:call-template name="list.of.figures.titlepage"/>
-        </xsl:when>
-        <xsl:when test="$titles='equation'">
-          <xsl:call-template name="list.of.equations.titlepage"/>
-        </xsl:when>
-        <xsl:when test="$titles='example'">
-          <xsl:call-template name="list.of.examples.titlepage"/>
-        </xsl:when>
-        <xsl:when test="$titles='procedure'">
-          <xsl:call-template name="list.of.procedures.titlepage"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="list.of.unknowns.titlepage"/>
-        </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="$nodes" mode="toc">
-        <xsl:with-param name="toc-context" select="$toc-context"/>
-      </xsl:apply-templates>
-    </fo:block>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="figure|table|example|equation|procedure" mode="toc">
-  <xsl:param name="toc-context" select="."/>
-  <xsl:call-template name="toc.line">
-    <xsl:with-param name="toc-context" select="$toc-context"/>
-  </xsl:call-template>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<!-- qandaset handled like a section when qanda.in.toc is set -->
-<xsl:template match="qandaset" mode="toc">
-  <xsl:param name="toc-context" select="."/>
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="cid">
-    <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="$toc-context"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="depth" select="count(ancestor::section) + 1"/>
-  <xsl:variable name="reldepth"
-                select="count(ancestor::*)-count($toc-context/ancestor::*)"/>
-
-  <xsl:variable name="depth.from.context" select="count(ancestor::*)-count($toc-context/ancestor::*)"/>
-
-  <xsl:if test="$toc.section.depth &gt;= $depth">
-    <xsl:call-template name="toc.line">
-      <xsl:with-param name="toc-context" select="$toc-context"/>
-    </xsl:call-template>
-
-    <xsl:if test="$toc.section.depth > $depth 
-                  and $toc.max.depth > $depth.from.context
-                  and (child::qandadiv or child::qandaentry)">
-      <fo:block id="toc.{$cid}.{$id}">
-        <xsl:attribute name="margin-left">
-          <xsl:call-template name="set.toc.indent">
-            <xsl:with-param name="reldepth" select="$reldepth"/>
-          </xsl:call-template>
-        </xsl:attribute>
-                
-        <xsl:apply-templates select="qandadiv|qandaentry" mode="toc">
-          <xsl:with-param name="toc-context" select="$toc-context"/>
-        </xsl:apply-templates>
-      </fo:block>
-    </xsl:if>
-  </xsl:if>
-</xsl:template>
-
-</xsl:stylesheet>
-
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/axf.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/axf.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,110 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                xmlns:axf="http://www.antennahouse.com/names/XSL/Extensions"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ******************************************************************** -->
-
-<xsl:template name="axf-document-information">
-
-    <xsl:variable name="authors" select="(//author|//editor|
-                                          //corpauthor|//authorgroup)[1]"/>
-    <xsl:if test="$authors">
-      <xsl:variable name="author">
-        <xsl:choose>
-          <xsl:when test="$authors[self::authorgroup]">
-            <xsl:call-template name="person.name.list">
-              <xsl:with-param name="person.list" 
-                 select="$authors/*[self::author|self::corpauthor|
-                               self::othercredit|self::editor]"/>
-            </xsl:call-template>
-          </xsl:when>
-          <xsl:when test="$authors[self::corpauthor]">
-            <xsl:value-of select="$authors"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:call-template name="person.name">
-              <xsl:with-param name="node" select="$authors"/>
-            </xsl:call-template>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-
-      <xsl:element name="axf:document-info">
-        <xsl:attribute name="name">author</xsl:attribute>
-        <xsl:attribute name="value">
-          <xsl:value-of select="normalize-space($author)"/>
-        </xsl:attribute>
-      </xsl:element>
-    </xsl:if>
-
-    <xsl:variable name="title">
-      <xsl:apply-templates select="/*[1]" mode="label.markup"/>
-      <xsl:apply-templates select="/*[1]" mode="title.markup"/>
-    </xsl:variable>
-
-    <!-- * see bug report #1465301 - mzjn -->
-    <axf:document-info name="title">
-      <xsl:attribute name="value">
-        <xsl:value-of select="normalize-space($title)"/>
-      </xsl:attribute>
-    </axf:document-info>
-
-    <xsl:if test="//keyword">
-      <xsl:element name="axf:document-info">
-        <xsl:attribute name="name">keywords</xsl:attribute>
-        <xsl:attribute name="value">
-          <xsl:for-each select="//keyword">
-            <xsl:value-of select="normalize-space(.)"/>
-            <xsl:if test="position() != last()">
-              <xsl:text>, </xsl:text>
-            </xsl:if>
-          </xsl:for-each>
-        </xsl:attribute>
-      </xsl:element>
-    </xsl:if>
-
-    <xsl:if test="//subjectterm">
-      <xsl:element name="axf:document-info">
-        <xsl:attribute name="name">subject</xsl:attribute>
-        <xsl:attribute name="value">
-          <xsl:for-each select="//subjectterm">
-            <xsl:value-of select="normalize-space(.)"/>
-            <xsl:if test="position() != last()">
-              <xsl:text>, </xsl:text>
-            </xsl:if>
-          </xsl:for-each>
-        </xsl:attribute>
-      </xsl:element>
-    </xsl:if>
-
-</xsl:template>
-
-<!-- These properties are added to fo:simple-page-master -->
-<xsl:template name="axf-page-master-properties">
-  <xsl:param name="page.master" select="''"/>
-
-  <xsl:if test="$crop.marks != 0">
-    <xsl:attribute name="axf:printer-marks">crop</xsl:attribute>
-    <xsl:attribute name="axf:bleed"><xsl:value-of
-                          select="$crop.mark.bleed"/></xsl:attribute>
-    <xsl:attribute name="axf:printer-marks-line-width"><xsl:value-of
-                          select="$crop.mark.width"/></xsl:attribute>
-    <xsl:attribute name="axf:crop-offset"><xsl:value-of
-                          select="$crop.mark.offset"/></xsl:attribute>
-  </xsl:if>
-
-  <xsl:call-template name="user-axf-page-master-properties">
-    <xsl:with-param name="page.master" select="$page.master"/>
-  </xsl:call-template>
-
-</xsl:template>
-
-<xsl:template name="user-axf-page-master-properties">
-  <xsl:param name="page.master" select="''"/>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/biblio-iso690.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/biblio-iso690.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,1300 +1,0 @@
-<?xml version="1.0" encoding="windows-1250"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     The original code for processing bibliography in ISO690 style
-     was provided by Jana Dvorakova <jana4u@seznam.cz>
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<!-- if biblioentry.alt.primary.seps is set to nonzero value then use alternative separators for primary responsibility - $alt.person.two.sep, $alt.person.last.sep, $alt.person.more.sep  -->
-<xsl:param name="biblioentry.alt.primary.seps" select="0"/>
-
-<!-- how many authors will be printed if there is more than three authors - set to number 1 (default value), 2 or 3 -->
-<xsl:param name="biblioentry.primary.count" select="1"/>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="iso690.makecitation">
-<!-- Types of resources -->
-  <xsl:choose>
-
-    <!-- SYSTEMS OF ELECTRONIC COMMUNICATION : ENTIRE MESSAGE SYSTEM -->
-    <!-- same as Monographs -->
-    <xsl:when test="./@role='messagesystem'">
-      <xsl:call-template name="iso690.monogr"/>
-    </xsl:when>
-
-    <!-- SYSTEMS OF ELECTRONIC COMMUNICATION : ELECTRONIC MESSAGES -->
-    <!-- same as Contributions to Monographs -->
-    <xsl:when test="./@role='message'">
-      <xsl:call-template name="iso690.paper.mon"/>
-    </xsl:when>
-
-    <!-- SERIALS -->
-    <xsl:when test="./@role='serial' or ./biblioid/@class='issn' or ./issn">
-      <xsl:call-template name="iso690.serial"/>
-    </xsl:when>
-
-    <!-- PARTS OF MONOGRAPHS -->
-    <xsl:when test="./@role='part' or (./bibliomisc[@role='secnum']|./bibliomisc[@role='sectitle'])">
-      <xsl:call-template name="iso690.monogr.part"/>
-    </xsl:when>
-
-    <!-- CONTRIBUTIONS TO MONOGRAPHS -->
-    <xsl:when test="./@role='contribution' or (./biblioset/@relation='part' and ./biblioset/@relation='book')">
-      <xsl:call-template name="iso690.paper.mon"/>
-    </xsl:when>
-
-    <!-- ARTICLES, ETC., IN SERIALS -->
-    <xsl:when test="./@role='article' or (./biblioset/@relation='journal' and ./biblioset/@relation='article')">
-      <xsl:call-template name="iso690.article"/>
-    </xsl:when>
-
-    <!-- PATENT DOCUMENTS -->
-    <xsl:when test="./@role='patent' or (./bibliomisc[@role='patenttype'] and ./bibliomisc[@role='patentnum'])">
-      <xsl:call-template name="iso690.patent"/>
-    </xsl:when>
-
-    <!-- MONOGRAPHS -->
-    <xsl:otherwise>
-      <xsl:call-template name="iso690.monogr"/>
-    </xsl:otherwise>
-
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<!-- MONOGRAPHS -->
-<xsl:template name="iso690.monogr">
-  <!-- Primary responsibility -->
-  <xsl:call-template name="iso690.primary"/>
-  <!-- Title and Type of medium -->
-  <xsl:call-template name="iso690.title"/>
-  <!-- Subordinate responsibility -->
-  <xsl:call-template name="iso690.secondary"/>
-  <!-- Edition -->
-  <xsl:call-template name="iso690.edition"/>
-  <!-- Place of publication, Publisher, Year/Date of publication, Date of update/revision, Date of citation -->
-  <xsl:call-template name="iso690.pub"/>
-  <!-- Extent -->
-  <xsl:call-template name="iso690.extent"/>
-  <!-- Series -->
-  <xsl:call-template name="iso690.serie"/>
-  <!-- Notes -->
-  <xsl:call-template name="iso690.notice"/>
-  <!-- Avaibility and access -->
-  <xsl:call-template name="iso690.access"/>
-  <!-- Standard number -->
-  <xsl:call-template name="iso690.isbn"/>
-</xsl:template>
-
-<!-- SERIALS -->
-<xsl:template name="iso690.serial">
-  <!-- Title and Type of medium -->
-  <xsl:call-template name="iso690.title"/>
-  <!-- Responsibility [nonEL] -->
-  <xsl:if test="not(./bibliomisc[@role='medium'])">
-    <xsl:call-template name="iso690.secondary"/>
-  </xsl:if>
-  <!-- Edition -->
-  <xsl:call-template name="iso690.edition">
-    <xsl:with-param name="after" select="./bibliomisc[@role='issuing']"/>
-  </xsl:call-template>
-  <!-- Issue designation (date and/or n°) [nonEL] -->
-  <xsl:if test="not(./bibliomisc[@role='medium'])">
-    <xsl:call-template name="iso690.issuing"/>
-  </xsl:if>
-  <!-- Place of publication, Publisher, Year/Date of publication, Date of update/revision, Date of citation -->
-  <xsl:call-template name="iso690.pub"/>
-  <!-- Series -->
-  <xsl:call-template name="iso690.serie"/>
-  <!-- Notes -->
-  <xsl:call-template name="iso690.notice"/>
-  <!-- Avaibility and access -->
-  <xsl:call-template name="iso690.access"/>
-  <!-- Standard number -->
-  <xsl:call-template name="iso690.issn"/>
-</xsl:template>
-
-<!-- PARTS OF MONOGRAPHS -->
-<xsl:template name="iso690.monogr.part">
-  <!-- Primary responsibility of host document -->
-  <xsl:call-template name="iso690.primary"/>
-  <!-- Title and Type of medium of host document -->
-  <xsl:call-template name="iso690.title"/>
-  <!-- Subordinate responsibility of host document [EL] -->
-  <xsl:if test="./bibliomisc[@role='medium']">
-    <xsl:call-template name="iso690.secondary"/>
-  </xsl:if>
-  <!-- Edition -->
-  <xsl:call-template name="iso690.edition">
-    <xsl:with-param name="after" select="./volumenum"/>
-  </xsl:call-template>
-  <!-- Numeration of the part [nonEL]-->
-  <xsl:if test="not(./bibliomisc[@role='medium'])">
-    <xsl:call-template name="iso690.partnr"/>
-  <!-- Subordinate responsibility [nonEL] -->
-    <xsl:call-template name="iso690.secondary"/>
-  </xsl:if>
-  <!-- Place of publication, Publisher, Year/Date of publication, Date of update/revision, Date of citation -->
-  <xsl:call-template name="iso690.pub"/>
-  <!-- Location within host -->
-  <xsl:call-template name="iso690.part.location"/>
-  <xsl:if test="./bibliomisc[@role='medium']">
-  <!-- Numeration within host document [EL] -->
-  <!-- Notes [EL] -->
-    <xsl:call-template name="iso690.notice"/>
-  <!-- Avaibility and access [EL] -->
-    <xsl:call-template name="iso690.access"/>
-  <!-- Standard number [EL] -->
-    <xsl:call-template name="iso690.isbn"/>
-  </xsl:if>
-</xsl:template>
-
-<!-- CONTRIBUTIONS TO MONOGRAPHS -->
-<xsl:template name="iso690.paper.mon">
-<!-- Contribution -->
-  <xsl:apply-templates mode="iso690.paper.part" select="./biblioset[@relation='part']"/>
-<!-- In -->
-  <xsl:text>In </xsl:text>
-<!-- Host -->
-  <xsl:apply-templates mode="iso690.paper.book" select="./biblioset[@relation='book']"/>
-</xsl:template>
-
-<xsl:template match="biblioset" mode="iso690.paper.part">
-<!-- Contribution -->
-  <!-- Primary responsibility -->
-  <xsl:call-template name="iso690.primary"/>
-  <!-- Title -->
-  <xsl:call-template name="iso690.title">
-    <xsl:with-param name="italic" select="0"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="biblioset" mode="iso690.paper.book">
-<!-- Host -->
-  <!-- Primary responsibility -->
-  <xsl:call-template name="iso690.primary"/>
-  <!-- Title and Type of medium -->
-  <xsl:call-template name="iso690.title"/>
-  <!-- Subordinate responsibility [EL] -->
-  <xsl:if test="./bibliomisc[@role='medium']">
-    <xsl:call-template name="iso690.secondary"/>
-  </xsl:if>
-  <!-- Edition -->
-  <xsl:call-template name="iso690.edition"/>
-  <!-- Place of publication, Publisher, Year/Date of publication, Date of update/revision, Date of citation -->
-  <xsl:call-template  name="iso690.paper.pub"/>
-  <!-- Numeration within host document [EL] -->
-  <!-- Location within host -->
-  <xsl:call-template name="iso690.location"/>
-  <xsl:if test="./bibliomisc[@role='medium']">
-  <!-- Notes [EL] -->
-    <xsl:call-template name="iso690.notice"/>
-  <!-- Avaibility and access [EL] -->
-    <xsl:call-template name="iso690.access"/>
-  <!-- Standard number [EL] -->
-    <xsl:call-template name="iso690.isbn"/>
-  </xsl:if>
-</xsl:template>
-
-<!-- ARTICLES, ETC., IN SERIALS -->
-<xsl:template name="iso690.article">
-<!-- Article -->
-  <xsl:apply-templates mode="iso690.article.art" select="./biblioset[@relation='article']"/>
-<!-- Serial -->
-  <xsl:apply-templates mode="iso690.article.jour" select="./biblioset[@relation='journal']"/>
-</xsl:template>
-
-<xsl:template match="biblioset" mode="iso690.article.art">
-<!-- Article -->
-  <!-- Primary responsibility -->
-  <xsl:call-template name="iso690.primary"/>
-  <!-- Title -->
-  <xsl:call-template name="iso690.title">
-    <xsl:with-param name="italic" select="0"/>
-  </xsl:call-template>
-  <!-- Subordinate responsibility [nonEL] -->
-  <xsl:if test="not(../*/bibliomisc[@role='medium'])">
-    <xsl:call-template name="iso690.secondary"/>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="biblioset" mode="iso690.article.jour">
-<!-- Serial -->
-  <!-- Title and Type of medium -->
-  <xsl:call-template name="iso690.title"/>
-  <!-- Edition -->
-  <xsl:call-template name="iso690.edition">
-    <xsl:with-param name="after" select="./pubdate[not(@role='issuing')]|./volumenum|./issuenum|./pagenums"/>
-  </xsl:call-template>
-  <!-- Number designation [EL] -->
-  <!-- Location within host -->
-  <xsl:call-template name="iso690.article.location"/>
-  <xsl:if test="./bibliomisc[@role='medium']">
-  <!-- Notes [EL] -->
-    <xsl:call-template name="iso690.notice"/>
-  <!-- Avaibility and access [EL] -->
-    <xsl:call-template name="iso690.access"/>
-  <!-- Standard number [EL] -->
-    <xsl:call-template name="iso690.issn"/>
-  </xsl:if>
-</xsl:template>
-
-<!-- PATENT DOCUMENTS -->
-<xsl:template name="iso690.patent">
-  <!-- Primary responsibility (applicant) -->
-  <xsl:call-template name="iso690.primary"/>
-  <!-- Title of the invention -->
-  <xsl:call-template name="iso690.title"/>
-  <!-- Subordinate responsibility -->
-  <xsl:call-template name="iso690.secondary"/>
-  <!-- Notes -->
-  <xsl:call-template name="iso690.notice"/>
-  <!-- Identification -->
-  <xsl:call-template name="iso690.pat.ident"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-<!-- Elements -->
-
-<!-- Primary responsibility -->
-<xsl:template name="iso690.primary">
-  <xsl:param name="primary.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'primary.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:choose>
-    <xsl:when test="./authorgroup/author|./author">
-      <xsl:call-template name="iso690.author.list">
-        <xsl:with-param name="person.list" select=".//authorgroup/author|.//author"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="./authorgroup/editor|./editor">
-      <xsl:call-template name="iso690.author.list">
-        <xsl:with-param name="person.list" select=".//authorgroup/editor|.//editor"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="./authorgroup/corpauthor|./corpauthor">
-      <xsl:call-template name="iso690.author.list">
-        <xsl:with-param name="person.list" select=".//authorgroup/corpauthor|.//corpauthor"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:if test="(./firstname)and(./surname)">
-        <xsl:call-template name="iso690.author"/>
-        <xsl:call-template name="iso690.endsep">
-          <xsl:with-param name="text" select="string(./firstname[1])"/>
-          <xsl:with-param name="sep" select="$primary.sep"/>
-        </xsl:call-template>
-      </xsl:if>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="iso690.author.list">
-  <xsl:param name="person.list"
-             select="author|corpauthor|editor"/>
-  <xsl:param name="person.count" select="count($person.list)"/>
-  <xsl:param name="count" select="1"/>
-  <xsl:param name="group" select="./authorgroup[@role='many']"/>
-  <xsl:param name="many" select="0"/>
-
-  <xsl:param name="primary.many">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'primary.many'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="primary.editor">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'primary.editor'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="primary.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'primary.sep'"/></xsl:call-template>
-  </xsl:param>
-
-  <xsl:choose>
-    <xsl:when test="$count &gt; $person.count"></xsl:when>
-    <xsl:otherwise>
-      <xsl:choose>
-        <xsl:when test="$person.count &lt; 4 and not($group)">
-          <xsl:call-template name="iso690.author">
-            <xsl:with-param name="node" select="$person.list[position()=$count]"/>
-          </xsl:call-template>
-          <xsl:choose>
-            <xsl:when test="$person.count = 2 and $count = 1 and $biblioentry.alt.primary.seps != 0">
-              <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'alt.person.two.sep'"/></xsl:call-template>
-            </xsl:when>
-            <xsl:when test="$person.count = 2 and $count = 1">
-              <xsl:call-template name="gentext.template">
-                <xsl:with-param name="context" select="'authorgroup'"/>
-                <xsl:with-param name="name" select="'sep2'"/>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:when test="$person.count &gt; 2 and $count+1 = $person.count and $biblioentry.alt.primary.seps != 0">
-              <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'alt.person.last.sep'"/></xsl:call-template>
-            </xsl:when>
-            <xsl:when test="$person.count &gt; 2 and $count+1 = $person.count">
-              <xsl:call-template name="gentext.template">
-                <xsl:with-param name="context" select="'authorgroup'"/>
-                <xsl:with-param name="name" select="'seplast'"/>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:when test="$count &lt; $person.count and $biblioentry.alt.primary.seps != 0">
-              <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'alt.person.more.sep'"/></xsl:call-template>
-            </xsl:when>
-            <xsl:when test="$count &lt; $person.count">
-              <xsl:call-template name="gentext.template">
-                <xsl:with-param name="context" select="'authorgroup'"/>
-                <xsl:with-param name="name" select="'sep'"/>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:when test="($count = $person.count)">
-              <xsl:choose>
-                <xsl:when test="$many!=0">
-                  <xsl:if test="name($person.list[position()=$count])='editor'">
-                    <xsl:value-of select="$primary.editor"/>
-                  </xsl:if>
-                  <xsl:value-of select="$primary.many"/>
-                  <xsl:call-template name="iso690.endsep">
-                    <xsl:with-param name="text" select="$primary.many"/>
-                    <xsl:with-param name="sep" select="$primary.sep"/>
-                  </xsl:call-template>
-                </xsl:when>
-                <xsl:when test="name($person.list[position()=$count])='editor'">
-                  <xsl:value-of select="$primary.editor"/>
-                  <xsl:value-of select="$primary.sep"/>
-                </xsl:when>
-                <xsl:when test="name($person.list[position()=$count])='corpauthor'">
-                  <xsl:call-template name="iso690.endsep">
-                    <xsl:with-param name="text" select="string($person.list[position()=$count])"/>
-                    <xsl:with-param name="sep" select="$primary.sep"/>
-                  </xsl:call-template>
-                </xsl:when>
-                <xsl:otherwise>
-                  <xsl:call-template name="iso690.endsep">
-                    <xsl:with-param name="text" select="string($person.list[position()=$count]//firstname[1])"/>
-                    <xsl:with-param name="sep" select="$primary.sep"/>
-                  </xsl:call-template>
-                </xsl:otherwise>
-              </xsl:choose>
-            </xsl:when>
-          </xsl:choose>
-
-          <xsl:call-template name="iso690.author.list">
-            <xsl:with-param name="person.list" select="$person.list"/>
-            <xsl:with-param name="person.count" select="$person.count"/>
-            <xsl:with-param name="count" select="$count+1"/>
-            <xsl:with-param name="many" select="$many"/>
-            <xsl:with-param name="group"/>
-          </xsl:call-template>
-        </xsl:when>
-
-        <xsl:otherwise>
-          <xsl:choose>
-            <xsl:when test="($biblioentry.primary.count&gt;=3) and ($person.count&gt;=3)">
-              <xsl:call-template name="iso690.author.list">
-                <xsl:with-param name="person.list" select="$person.list[1]|$person.list[2]|$person.list[3]"/>
-                <xsl:with-param name="person.count" select="3"/>
-                <xsl:with-param name="count" select="1"/>
-                <xsl:with-param name="many" select="1"/>
-                <xsl:with-param name="group"/>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:when test="($biblioentry.primary.count&gt;1) and  ($person.count&gt;1)">
-              <xsl:call-template name="iso690.author.list">
-                <xsl:with-param name="person.list" select="$person.list[1]|$person.list[2]"/>
-                <xsl:with-param name="person.count" select="2"/>
-                <xsl:with-param name="count" select="1"/>
-                <xsl:with-param name="many" select="1"/>
-                <xsl:with-param name="group"/>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:call-template name="iso690.author.list">
-                <xsl:with-param name="person.list" select="$person.list[1]"/>
-                <xsl:with-param name="person.count" select="1"/>
-                <xsl:with-param name="count" select="1"/>
-                <xsl:with-param name="many" select="1"/>
-                <xsl:with-param name="group"/>
-              </xsl:call-template>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="iso690.author">
-  <xsl:param name="node" select="."/>
-  <xsl:param name="lastfirst.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'lastfirst.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:choose>
-    <xsl:when test="name($node)!='corpauthor'">
-      <fo:inline text-transform="uppercase">
-        <xsl:apply-templates mode="iso690.mode" select="$node//surname[1]"/>
-      </fo:inline>
-      <xsl:if test="$node//surname and $node//firstname">
-        <xsl:value-of select="$lastfirst.sep"/>
-      </xsl:if>
-      <xsl:apply-templates mode="iso690.mode" select="$node//firstname[1]"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <fo:inline text-transform="uppercase">
-        <xsl:apply-templates mode="iso690.mode" select="$node"/>
-      </fo:inline>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="corpauthor|firstname|surname" mode="iso690.mode">
-  <xsl:apply-templates mode="iso690.mode"/>
-</xsl:template>
-
-<!-- Title and Type of medium -->
-<xsl:template name="iso690.title">
-  <xsl:param name="medium" select="./bibliomisc[@role='medium']"/>
-  <xsl:param name="italic" select="1"/>
-  <xsl:param name="sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'title.sep'"/></xsl:call-template>
-  </xsl:param>
-
-  <xsl:apply-templates mode="iso690.mode" select="./title">
-    <xsl:with-param name="medium" select="$medium"/>
-    <xsl:with-param name="italic" select="$italic"/>
-    <xsl:with-param name="sep" select="$sep"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="title" mode="iso690.mode">
-  <xsl:param name="medium"/>
-  <xsl:param name="italic" select="1"/>
-  <xsl:param name="sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'title.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="medium1">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'medium1'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="medium2">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'medium2'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:choose>
-    <xsl:when test="$italic=1">
-      <xsl:call-template name="iso690.italic.title"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="iso690.make.title"/>
-    </xsl:otherwise>
-  </xsl:choose>
-  <xsl:if test="$medium">
-    <xsl:value-of select="$medium1"/>
-    <xsl:apply-templates mode="iso690.mode" select="$medium"/>
-    <xsl:value-of select="$medium2"/>
-  </xsl:if>
-  <xsl:call-template name="iso690.endsep">
-    <xsl:with-param name="text" select="concat(string(.),string(../subtitle))"/>
-    <xsl:with-param name="sep" select="$sep"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="iso690.italic.title">
-  <fo:inline font-style="italic">
-    <xsl:call-template name="iso690.make.title"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template name="iso690.make.title">
-  <xsl:param name="submaintitle.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'submaintitle.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:apply-templates mode="iso690.mode"/>
-  <xsl:if test="../subtitle">
-    <xsl:value-of select="$submaintitle.sep"/>
-    <xsl:apply-templates mode="iso690.mode" select="../subtitle"/>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="iso690.mode">
-  <xsl:apply-templates mode="iso690.mode"/>
-</xsl:template>
-
-<xsl:template match="bibliomisc[@role='medium']" mode="iso690.mode">
-  <xsl:apply-templates mode="iso690.mode"/>
-</xsl:template>
-
-<!-- Subordinate responsibility -->
-<xsl:template name="iso690.secondary">
-  <xsl:param name="secondary.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'secondary.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="secondary.person.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'secondary.person.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:for-each select="./bibliomisc[@role='secondary']">
-    <xsl:apply-templates mode="iso690.mode" select="."/>
-    <xsl:choose>
-      <xsl:when test="position()=count(../bibliomisc[@role='secondary'])">
-        <xsl:call-template name="iso690.endsep">
-          <xsl:with-param name="text" select="string(.)"/>
-          <xsl:with-param name="sep" select="$secondary.sep"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$secondary.person.sep"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:for-each>
-</xsl:template>
-
-<xsl:template match="bibliomisc[@role='secondary']" mode="iso690.mode">
-  <xsl:apply-templates mode="iso690.mode"/>
-</xsl:template>
-
-<!-- Edition -->
-<xsl:template name="iso690.edition">
-  <xsl:param name="after"/>
-  <xsl:param name="edition.serial.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'edition.serial.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:choose>
-    <xsl:when test="string($after)!=''">
-      <xsl:apply-templates mode="iso690.mode" select="./edition">
-        <xsl:with-param name="sep" select="$edition.serial.sep"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates mode="iso690.mode" select="./edition"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="edition" mode="iso690.mode">
-  <xsl:param name="sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'edition.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:apply-templates mode="iso690.mode"/>
-  <xsl:call-template name="iso690.endsep">
-    <xsl:with-param name="text" select="string(.)"/>
-    <xsl:with-param name="sep" select="$sep"/>
-  </xsl:call-template>
-</xsl:template>
-
-<!-- Issue designation (date and/or n°) -->
-<xsl:template name="iso690.issuing">
-  <xsl:param name="issuing.div">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'issuing.div'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="issuing.range">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'issuing.range'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="issuing.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'issuing.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:choose>
-    <xsl:when test="./pubdate[@role='issuing'] and ./volumenum[2] and ./issuenum[2]">
-      <xsl:call-template name="iso690.issuedate"/>
-      <xsl:apply-templates mode="iso690.mode" select="./volumenum[1]">
-        <xsl:with-param name="sep" select="$issuing.div"/>
-      </xsl:apply-templates>
-      <xsl:apply-templates mode="iso690.mode" select="./issuenum[1]">
-        <xsl:with-param name="sep" select="$issuing.range"/>
-      </xsl:apply-templates>
-      <xsl:apply-templates mode="iso690.mode" select="./volumenum[2]">
-        <xsl:with-param name="sep" select="$issuing.div"/>
-      </xsl:apply-templates>
-      <xsl:apply-templates mode="iso690.mode" select="./issuenum[2]">
-        <xsl:with-param name="sep" select="$issuing.sep"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:when test="./pubdate[@role='issuing'] and ./volumenum[2]">
-      <xsl:call-template name="iso690.issuedate"/>
-      <xsl:apply-templates mode="iso690.mode" select="./volumenum[1]">
-        <xsl:with-param name="sep" select="$issuing.range"/>
-      </xsl:apply-templates>
-      <xsl:apply-templates mode="iso690.mode" select="./volumenum[2]">
-        <xsl:with-param name="sep" select="$issuing.sep"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:when test="./pubdate[@role='issuing'] and ./volumenum and ./issuenum">
-      <xsl:apply-templates mode="iso690.mode" select="./pubdate[@role='issuing']">
-        <xsl:with-param name="sep" select="$issuing.div"/>
-      </xsl:apply-templates>
-      <xsl:apply-templates mode="iso690.mode" select="./volumenum">
-        <xsl:with-param name="sep" select="$issuing.div"/>
-      </xsl:apply-templates>
-      <xsl:apply-templates mode="iso690.mode" select="./issuenum">
-        <xsl:with-param name="sep" select="$issuing.sep"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:when test="./pubdate[@role='issuing']">
-      <xsl:apply-templates mode="iso690.mode" select="./pubdate[@role='issuing']">
-        <xsl:with-param name="sep" select="$issuing.sep"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:when test="./volumenum">
-      <xsl:apply-templates mode="iso690.mode" select="./volumenum">
-        <xsl:with-param name="sep" select="$issuing.sep"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:when test="./issuenum">
-      <xsl:apply-templates mode="iso690.mode" select="./issuenum">
-        <xsl:with-param name="sep" select="$issuing.sep"/>
-      </xsl:apply-templates>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="iso690.issuedate">
-  <xsl:param name="issuing.div">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'issuing.div'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="issuing.range">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'issuing.range'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="issuing.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'issuing.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:choose>
-    <xsl:when test="./pubdate[@role='issuing'][2]">
-      <xsl:apply-templates mode="iso690.mode" select="./pubdate[@role='issuing'][1]">
-        <xsl:with-param name="sep" select="$issuing.range"/>
-      </xsl:apply-templates>
-      <xsl:apply-templates mode="iso690.mode" select="./pubdate[@role='issuing'][2]">
-        <xsl:with-param name="sep" select="$issuing.div"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates mode="iso690.mode" select="./pubdate[@role='issuing']">
-        <xsl:with-param name="sep" select="$issuing.div"/>
-      </xsl:apply-templates>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="pubdate[@role='issuing']" mode="iso690.mode">
-  <xsl:param name="sep"/>
-  <xsl:variable name="substr" select="substring(string(.),string-length(string(.)))"/>
-  <xsl:apply-templates mode="iso690.mode"/>
-  <xsl:call-template name="iso690.space">
-    <xsl:with-param name="text" select="$substr"/>
-  </xsl:call-template>
-  <xsl:choose>
-    <xsl:when test="$substr='-'">
-      <xsl:call-template name="iso690.endsep">
-        <xsl:with-param name="text" select="' '"/>
-        <xsl:with-param name="sep" select="$sep"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="iso690.endsep">
-        <xsl:with-param name="text" select="string(.)"/>
-        <xsl:with-param name="sep" select="$sep"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- Numeration of the part -->
-<xsl:template name="iso690.partnr">
-  <xsl:param name="partnr.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'partnr.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:apply-templates mode="iso690.mode" select="./volumenum">
-    <xsl:with-param name="sep" select="$partnr.sep"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<!-- Place of publication, Publisher, Year/Date of publication, Date of update/revision, Date of citation -->
-<xsl:template name="iso690.pub">
-  <xsl:param name="onlydate" select="0"/>
-  <xsl:param name="placesep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'placepubl.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="pubsep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'publyear.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="endsep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'pubinfo.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:choose>
-    <xsl:when test="(./publisher/publishername|./publishername|./publisher/address/city)and($onlydate=0)and(./pubdate[not(@role='issuing')]|./copyright/year|./date[@role='upd']|./date[@role='upd'])">
-      <xsl:apply-templates mode="iso690.mode" select="./publisher/address/city">
-        <xsl:with-param name="sep" select="$placesep"/>
-      </xsl:apply-templates>
-      <xsl:apply-templates mode="iso690.mode" select="./publisher/publishername|./publishername">
-        <xsl:with-param name="sep" select="$pubsep"/>
-      </xsl:apply-templates>
-      <xsl:apply-templates mode="iso690.mode" select="./pubdate[not(@role='issuing')]|./copyright/year">
-        <xsl:with-param name="sep" select="$endsep"/>
-      </xsl:apply-templates>
-      <xsl:if test="not(./pubdate[not(@role='issuing')]|./copyright/year)">
-        <xsl:call-template name="iso690.data">
-          <xsl:with-param name="sep" select="$endsep"/>
-        </xsl:call-template>
-      </xsl:if>
-    </xsl:when>
-    <xsl:when test="(./publisher/publishername|./publishername)and(./publisher/address/city)and($onlydate=0)">
-      <xsl:apply-templates mode="iso690.mode" select="./publisher/address/city">
-        <xsl:with-param name="sep" select="$placesep"/>
-      </xsl:apply-templates>
-      <xsl:apply-templates mode="iso690.mode" select="./publisher/publishername|./publishername">
-        <xsl:with-param name="sep" select="$endsep"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:when test="($onlydate=1)or(./pubdate[not(@role='issuing')]|./copyright/year)">
-      <xsl:apply-templates mode="iso690.mode" select="./pubdate[not(@role='issuing')]|./copyright/year">
-        <xsl:with-param name="sep" select="$endsep"/>
-      </xsl:apply-templates>
-      <xsl:if test="$onlydate=1">
-        <xsl:call-template name="iso690.location">
-          <xsl:with-param name="onlypages" select="1"/>
-        </xsl:call-template>
-      </xsl:if>
-    </xsl:when>
-    <xsl:when test="not(./pubdate[not(@role='issuing')]|./copyright/year)">
-      <xsl:call-template name="iso690.data">
-        <xsl:with-param name="sep" select="$endsep"/>
-      </xsl:call-template>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="iso690.paper.pub">
-  <xsl:param name="spec.pubinfo.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'spec.pubinfo.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:choose>
-    <xsl:when test="./volumnum|./issuenum|./pagenums">
-      <xsl:call-template name="iso690.pub">
-        <xsl:with-param name="endsep" select="$spec.pubinfo.sep"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="iso690.pub"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="iso690.data">
-  <xsl:param name="sep"/>
-  <xsl:param name="datecit2">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'datecit2'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:apply-templates mode="iso690.mode" select="./date[@role='upd']">
-    <xsl:with-param name="sep"/>
-  </xsl:apply-templates>
-  <xsl:apply-templates mode="iso690.mode" select="./date[@role='cit']"/>
-  <xsl:choose>
-    <xsl:when test="./date[@role='cit']">
-      <xsl:call-template name="iso690.endsep">
-        <xsl:with-param name="text" select="$datecit2"/>
-        <xsl:with-param name="sep" select="$sep"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="./date[@role='upd']">
-      <xsl:call-template name="iso690.endsep">
-        <xsl:with-param name="text" select="string(./date[@role='upd'])"/>
-        <xsl:with-param name="sep" select="$sep"/>
-      </xsl:call-template>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="publisher/address/city|publishername" mode="iso690.mode">
-  <xsl:param name="sep"/>
-  <xsl:param name="upd" select="0"/>
-  <xsl:apply-templates mode="iso690.mode"/>
-  <xsl:call-template name="iso690.endsep">
-    <xsl:with-param name="text" select="string(.)"/>
-    <xsl:with-param name="sep" select="$sep"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="pubdate|copyright/year" mode="iso690.mode">
-  <xsl:param name="sep"/>
-  <xsl:param name="upd" select="1"/>
-  <xsl:param name="datecit2">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'datecit2'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:variable name="substr" select="substring(string(.),string-length(string(.)))"/>
-  <xsl:if test="name(.)!='pubdate'">
-    <xsl:value-of select="'&#x00A9;'"/><!-- copyright -->
-  </xsl:if>
-  <xsl:apply-templates mode="iso690.mode"/>
-  <xsl:call-template name="iso690.space">
-    <xsl:with-param name="text" select="$substr"/>
-  </xsl:call-template>
-  <xsl:if test="$upd!=0">
-    <xsl:choose>
-      <xsl:when test="name(.)='pubdate'">
-        <xsl:apply-templates mode="iso690.mode" select="../date[@role='upd']"/>
-        <xsl:apply-templates mode="iso690.mode" select="../date[@role='cit']"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:apply-templates mode="iso690.mode" select="../../date[@role='upd']"/>
-        <xsl:apply-templates mode="iso690.mode" select="../../date[@role='cit']"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:if>
-  <xsl:choose>
-    <xsl:when test="../date[@role='cit']|../../date[@role='cit'] and $upd!=0">
-      <xsl:call-template name="iso690.endsep">
-        <xsl:with-param name="text" select="$datecit2"/>
-        <xsl:with-param name="sep" select="$sep"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="../date[@role='upd']|../../date[@role='upd'] and $upd!=0">
-      <xsl:call-template name="iso690.endsep">
-        <xsl:with-param name="text" select="string(../date[@role='upd'])"/>
-        <xsl:with-param name="sep" select="$sep"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="$substr='-'">
-      <xsl:call-template name="iso690.endsep">
-        <xsl:with-param name="text" select="' '"/>
-        <xsl:with-param name="sep" select="$sep"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="iso690.endsep">
-        <xsl:with-param name="text" select="string(.)"/>
-        <xsl:with-param name="sep" select="$sep"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="iso690.space">
-  <xsl:param name="text" select="substring(string(.),string-length(string(.)))"/>
-  <xsl:if test="$text='-'">
-    <xsl:value-of select="' '"/>
-  </xsl:if>
-</xsl:template>
-
-<!-- Date of update/revision -->
-<xsl:template match="date[@role='upd']" mode="iso690.mode">
-  <xsl:param name="sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'upd.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:value-of select="$sep"/>
-  <xsl:apply-templates mode="iso690.mode"/>
-</xsl:template>
-
-<!-- Date of citation -->
-<xsl:template match="date[@role='cit']" mode="iso690.mode">
-  <xsl:param name="datecit1">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'datecit1'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="datecit2">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'datecit2'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:value-of select="$datecit1"/>
-  <xsl:apply-templates mode="iso690.mode"/>
-  <xsl:value-of select="$datecit2"/>
-</xsl:template>
-
-<!-- Extent -->
-<xsl:template name="iso690.extent">
-  <xsl:param name="extent.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'extent.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:apply-templates mode="iso690.mode" select="./pagenums">
-    <xsl:with-param name="sep" select="$extent.sep"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<!-- Location within host -->
-<xsl:template name="iso690.part.location">
-  <xsl:param name="location.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'location.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:choose>
-    <xsl:when test="./pagenums">
-      <xsl:apply-templates mode="iso690.mode" select="./bibliomisc[@role='secnum']"/>
-      <xsl:apply-templates mode="iso690.mode" select="./bibliomisc[@role='sectitle']"/>
-      <xsl:apply-templates mode="iso690.mode" select="./pagenums"/>
-    </xsl:when>
-    <xsl:when test="./bibliomisc[@role='sectitle']">
-      <xsl:apply-templates mode="iso690.mode" select="./bibliomisc[@role='secnum']"/>
-      <xsl:apply-templates mode="iso690.mode" select="./bibliomisc[@role='sectitle']">
-        <xsl:with-param name="sep" select="$location.sep"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates mode="iso690.mode" select="./bibliomisc[@role='secnum']">
-        <xsl:with-param name="sep" select="$location.sep"/>
-      </xsl:apply-templates>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="iso690.article.location">
-  <xsl:param name="location.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'location.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="locs.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'locs.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:choose>
-    <xsl:when test="not(./date[@role='upd']|./date[@role='cit'])">
-      <xsl:choose>
-        <xsl:when test="./volumenum|./issuenum|./pagenums">
-          <xsl:apply-templates mode="iso690.mode" select="./pubdate[not(@role='issuing')]">
-            <xsl:with-param name="upd" select="0"/>
-            <xsl:with-param name="sep" select="$locs.sep"/>
-          </xsl:apply-templates>
-          <xsl:call-template name="iso690.location"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates mode="iso690.mode" select="./pubdate[not(@role='issuing')]">
-            <xsl:with-param name="sep" select="$location.sep"/>
-          </xsl:apply-templates>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:choose>
-        <xsl:when test="./volumenum|./issuenum|./pagenums">
-          <xsl:apply-templates mode="iso690.mode" select="./pubdate[not(@role='issuing')]">
-            <xsl:with-param name="upd" select="0"/>
-            <xsl:with-param name="sep" select="$locs.sep"/>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates mode="iso690.mode" select="./pubdate[not(@role='issuing')]">
-            <xsl:with-param name="upd" select="0"/>
-            <xsl:with-param name="sep" select="$location.sep"/>
-          </xsl:apply-templates>
-        </xsl:otherwise>
-      </xsl:choose>
-      <xsl:choose>
-        <xsl:when test="./issuenum">
-          <xsl:apply-templates mode="iso690.mode" select="./volumenum"/>
-          <xsl:apply-templates mode="iso690.mode" select="./issuenum">
-            <xsl:with-param name="sep"/>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates mode="iso690.mode" select="./volumenum">
-            <xsl:with-param name="sep"/>
-          </xsl:apply-templates>
-        </xsl:otherwise>
-      </xsl:choose>
-      <xsl:choose>
-        <xsl:when test="./pagenums">
-          <xsl:call-template name="iso690.data">
-            <xsl:with-param name="sep" select="$locs.sep"/>
-          </xsl:call-template>
-          <xsl:apply-templates mode="iso690.mode" select="./pagenums"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="iso690.data">
-            <xsl:with-param name="sep" select="$location.sep"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="iso690.location">
-  <xsl:param name="location.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'location.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:choose>
-    <xsl:when test="./volumenum and not(./issuenum) and not(./pagenums)">
-      <xsl:apply-templates mode="iso690.mode" select="./volumenum">
-        <xsl:with-param name="sep" select="$location.sep"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:when test="./issuenum and not(./pagenums)">
-      <xsl:apply-templates mode="iso690.mode" select="./volumenum"/>
-      <xsl:apply-templates mode="iso690.mode" select="./issuenum">
-        <xsl:with-param name="sep" select="$location.sep"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:when test="./pagenums">
-      <xsl:apply-templates mode="iso690.mode" select="./volumenum"/>
-      <xsl:apply-templates mode="iso690.mode" select="./issuenum"/>
-      <xsl:apply-templates mode="iso690.mode" select="./pagenums"/>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="bibliomisc[@role='secnum']|bibliomisc[@role='sectitle']" mode="iso690.mode">
-  <xsl:param name="sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'locs.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:apply-templates mode="iso690.mode"/>
-  <xsl:call-template name="iso690.endsep">
-    <xsl:with-param name="text" select="string(.)"/>
-    <xsl:with-param name="sep" select="$sep"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="volumenum|issuenum" mode="iso690.mode">
-  <xsl:param name="sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'locs.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:apply-templates mode="iso690.mode"/>
-  <xsl:call-template name="iso690.endsep">
-    <xsl:with-param name="text" select="string(.)"/>
-    <xsl:with-param name="sep" select="$sep"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="pagenums" mode="iso690.mode">
-  <xsl:param name="sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'location.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:apply-templates mode="iso690.mode"/>
-  <xsl:call-template name="iso690.endsep">
-    <xsl:with-param name="text" select="string(.)"/>
-    <xsl:with-param name="sep" select="$sep"/>
-  </xsl:call-template>
-</xsl:template>
-
-<!-- Series -->
-<xsl:template name="iso690.serie">
-  <xsl:apply-templates mode="iso690.mode" select=".//bibliomisc[@role='serie']"/>
-</xsl:template>
-
-<!-- Notes -->
-<xsl:template name="iso690.notice">
-  <xsl:apply-templates mode="iso690.mode" select=".//bibliomisc[not(@role)]"/>
-</xsl:template>
-
-<xsl:template match="bibliomisc[not(@role)]|bibliomisc[@role='serie']" mode="iso690.mode">
-  <xsl:param name="notice.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'notice.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:apply-templates mode="iso690.mode"/>
-  <xsl:call-template name="iso690.endsep">
-    <xsl:with-param name="text" select="string(.)"/>
-    <xsl:with-param name="sep" select="$notice.sep"/>
-  </xsl:call-template>
-</xsl:template>
-
-<!-- Avaibility and access -->
-<xsl:template name="iso690.access">
-  <xsl:for-each select="./biblioid[@class='uri']|./bibliomisc[@role='access']">
-    <xsl:choose>
-      <xsl:when test="position()=1">
-        <xsl:apply-templates mode="iso690.mode" select="."/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:apply-templates mode="iso690.mode" select=".">
-          <xsl:with-param name="firstacc" select="0"/>
-        </xsl:apply-templates>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:for-each>
-</xsl:template>
-
-<xsl:template match="biblioid[@class='uri']/ulink|bibliomisc[@role='access']/ulink" mode="iso690.mode">
-  <xsl:param name="link1">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'link1'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="link2">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'link2'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:value-of select="$link1"/>
-  <xsl:call-template name="ulink"/>
-  <xsl:value-of select="$link2"/>
-</xsl:template>
-
-<xsl:template match="biblioid[@class='uri']|bibliomisc[@role='access']" mode="iso690.mode">
-  <xsl:param name="firstacc" select="1"/>
-  <xsl:param name="access">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'access'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="acctoo">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'acctoo'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="onwww">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'onwww'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="oninet">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'oninet'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="access.end">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'access.end'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="access.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'access.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:choose>
-    <xsl:when test="$firstacc=1">
-      <xsl:value-of select="$access"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$acctoo"/>
-    </xsl:otherwise>
-  </xsl:choose>
-  <xsl:choose>
-    <xsl:when test="(./ulink)and(string(./ulink)=string(.))">
-      <xsl:choose>
-        <xsl:when test="(starts-with(./ulink/@url,'http://')or(starts-with(./ulink/@url,'https://')))">
-          <xsl:value-of select="$onwww"/>
-          <xsl:value-of select="$access.end"/>
-          <xsl:apply-templates mode="iso690.mode" select="./ulink"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="$oninet"/>
-          <xsl:value-of select="$access.end"/>
-          <xsl:apply-templates mode="iso690.mode" select="./ulink"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:when test="(./ulink)and(string(./ulink)!=string(.))">
-      <xsl:value-of select="text()[1]"/>
-      <xsl:call-template name="iso690.endsep">
-        <xsl:with-param name="text" select="text()[1]"/>
-        <xsl:with-param name="sep" select="$access.end"/>
-      </xsl:call-template>
-      <xsl:apply-templates mode="iso690.mode" select="./ulink"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates mode="iso690.mode"/>
-    </xsl:otherwise>
-  </xsl:choose>
-  <xsl:value-of select="$access.sep"/>
-</xsl:template>
-
-<!-- Standard number - ISBN -->
-<xsl:template name="iso690.isbn">
-  <xsl:choose>
-    <xsl:when test="./biblioid/@class='isbn'">
-      <xsl:apply-templates mode="iso690.mode" select="./biblioid[@class='isbn']"/>
-    </xsl:when>
-    <xsl:when test="./isbn">
-      <xsl:apply-templates mode="iso690.mode" select="./isbn"/>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="isbn|biblioid[@class='isbn']" mode="iso690.mode">
-  <xsl:param name="isbn">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'isbn'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="stdnum.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'stdnum.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:value-of select="$isbn"/>
-  <xsl:apply-templates mode="iso690.mode"/>
-  <xsl:value-of select="$stdnum.sep"/>
-</xsl:template>
-
-<!-- Standard number - ISSN -->
-<xsl:template name="iso690.issn">
-  <xsl:choose>
-    <xsl:when test="./biblioid/@class='issn'">
-      <xsl:apply-templates mode="iso690.mode" select="./biblioid[@class='issn']"/>
-    </xsl:when>
-    <xsl:when test="./issn">
-      <xsl:apply-templates mode="iso690.mode" select="./issn"/>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="issn|biblioid[@class='issn']" mode="iso690.mode">
-  <xsl:param name="issn">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'issn'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="stdnum.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'stdnum.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:value-of select="$issn"/>
-  <xsl:apply-templates mode="iso690.mode"/>
-  <xsl:value-of select="$stdnum.sep"/>
-</xsl:template>
-
-<!-- Identification of patent document -->
-<xsl:template name="iso690.pat.ident">
-  <xsl:param name="patdate.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'patdate.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:apply-templates mode="iso690.mode" select="./address/country"/>
-  <xsl:apply-templates mode="iso690.mode" select="./bibliomisc[@role='patenttype']"/>
-  <xsl:choose>
-    <xsl:when test="./biblioid[@class='other' and @otherclass='patentnum']">
-      <xsl:apply-templates mode="iso690.mode" select="./biblioid[@class='other' and @otherclass='patentnum']"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates mode="iso690.mode" select="./bibliomisc[@role='patentnum']"/>
-    </xsl:otherwise>
-  </xsl:choose>
-  <xsl:apply-templates mode="iso690.mode" select="./pubdate[not(@role='issuing')]">
-    <xsl:with-param name="sep" select="$patdate.sep"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<!-- Country or issuing office -->
-<xsl:template match="address/country" mode="iso690.mode">
-  <xsl:param name="patcountry.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'patcountry.sep'"/></xsl:call-template>
-  </xsl:param>
-  <fo:inline font-style="italic">
-    <xsl:apply-templates mode="iso690.mode"/>
-  </fo:inline>
-  <xsl:value-of select="$patcountry.sep"/>
-</xsl:template>
-
-<!-- Kind of patent document -->
-<xsl:template match="bibliomisc[@role='patenttype']" mode="iso690.mode">
-  <xsl:param name="pattype.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'pattype.sep'"/></xsl:call-template>
-  </xsl:param>
-  <fo:inline font-style="italic">
-    <xsl:apply-templates mode="iso690.mode"/>
-  </fo:inline>
-  <xsl:value-of select="$pattype.sep"/>
-</xsl:template>
-
-<!-- Number -->
-<xsl:template match="biblioid[@class='other' and @otherclass='patentnum']|bibliomisc[@role='patentnum']" mode="iso690.mode">
-  <xsl:param name="patnum.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'patnum.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:apply-templates mode="iso690.mode"/>
-  <xsl:value-of select="$patnum.sep"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-<!-- Supplementary templates -->
-
-<xsl:template name="iso690.endsep">
-  <xsl:param name="text"/>
-  <xsl:param name="sep" select=". "/>
-  <xsl:choose>
-    <xsl:when test="substring($text,string-length($text))!=substring($sep,1,1)">
-      <xsl:value-of select="$sep"/>
-    </xsl:when>
-    <xsl:when test="substring($text,string-length($text))=' '">
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="' '"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="*" mode="iso690.mode">
-  <xsl:apply-templates select="."/><!-- try the default mode -->
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/biblio.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/biblio.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,1169 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:template match="bibliography">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="not(parent::*) or parent::part or parent::book">
-      <xsl:variable name="master-reference">
-        <xsl:call-template name="select.pagemaster"/>
-      </xsl:variable>
-
-      <fo:page-sequence hyphenate="{$hyphenate}"
-                        master-reference="{$master-reference}">
-        <xsl:attribute name="language">
-          <xsl:call-template name="l10n.language"/>
-        </xsl:attribute>
-        <xsl:attribute name="format">
-          <xsl:call-template name="page.number.format">
-            <xsl:with-param name="master-reference" select="$master-reference"/>
-          </xsl:call-template>
-        </xsl:attribute>
-        <xsl:attribute name="initial-page-number">
-          <xsl:call-template name="initial.page.number">
-            <xsl:with-param name="master-reference" select="$master-reference"/>
-          </xsl:call-template>
-        </xsl:attribute>
-        <xsl:attribute name="force-page-count">
-          <xsl:call-template name="force.page.count">
-            <xsl:with-param name="master-reference" select="$master-reference"/>
-          </xsl:call-template>
-        </xsl:attribute>
-        <xsl:attribute name="hyphenation-character">
-          <xsl:call-template name="gentext">
-            <xsl:with-param name="key" select="'hyphenation-character'"/>
-          </xsl:call-template>
-        </xsl:attribute>
-        <xsl:attribute name="hyphenation-push-character-count">
-          <xsl:call-template name="gentext">
-            <xsl:with-param name="key" select="'hyphenation-push-character-count'"/>
-          </xsl:call-template>
-        </xsl:attribute>
-        <xsl:attribute name="hyphenation-remain-character-count">
-          <xsl:call-template name="gentext">
-            <xsl:with-param name="key" select="'hyphenation-remain-character-count'"/>
-          </xsl:call-template>
-        </xsl:attribute>
-
-        <xsl:apply-templates select="." mode="running.head.mode">
-          <xsl:with-param name="master-reference" select="$master-reference"/>
-        </xsl:apply-templates>
-        <xsl:apply-templates select="." mode="running.foot.mode">
-          <xsl:with-param name="master-reference" select="$master-reference"/>
-        </xsl:apply-templates>
-
-        <fo:flow flow-name="xsl-region-body">
-          <xsl:call-template name="set.flow.properties">
-            <xsl:with-param name="element" select="local-name(.)"/>
-            <xsl:with-param name="master-reference" select="$master-reference"/>
-          </xsl:call-template>
-
-          <fo:block id="{$id}">
-            <xsl:call-template name="bibliography.titlepage"/>
-          </fo:block>
-          <xsl:apply-templates/>
-        </fo:flow>
-      </fo:page-sequence>
-    </xsl:when>
-    <xsl:otherwise>
-      <fo:block id="{$id}"
-                space-before.minimum="1em"
-                space-before.optimum="1.5em"
-                space-before.maximum="2em">
-        <xsl:call-template name="bibliography.titlepage"/>
-      </fo:block>
-      <xsl:apply-templates/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="bibliography/bibliographyinfo"></xsl:template>
-<xsl:template match="bibliography/info"></xsl:template>
-<xsl:template match="bibliography/title"></xsl:template>
-<xsl:template match="bibliography/subtitle"></xsl:template>
-<xsl:template match="bibliography/titleabbrev"></xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="bibliodiv">
-  <fo:block>
-    <xsl:attribute name="id">
-      <xsl:call-template name="object.id"/>
-    </xsl:attribute>
-    <xsl:call-template name="bibliodiv.titlepage"/>
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="bibliodiv/title"/>
-<xsl:template match="bibliodiv/subtitle"/>
-<xsl:template match="bibliodiv/titleabbrev"/>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="bibliolist">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <fo:block id="{$id}"
-            space-before.minimum="1em"
-            space-before.optimum="1.5em"
-            space-before.maximum="2em">
-
-    <xsl:if test="blockinfo/title|info/title|title">
-      <xsl:call-template name="formal.object.heading"/>
-    </xsl:if>
-
-    <xsl:apply-templates select="*[not(self::blockinfo)
-                                   and not(self::info)
-                                   and not(self::title)
-                                   and not(self::titleabbrev)]"/>
-  </fo:block>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="biblioentry">
-  <xsl:param name="label">
-    <xsl:call-template name="biblioentry.label"/>
-  </xsl:param>
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="string(.) = ''">
-      <xsl:variable name="bib" select="document($bibliography.collection,.)"/>
-      <xsl:variable name="entry" select="$bib/bibliography/
-                                         *[@id=$id or @xml:id=$id][1]"/>
-      <xsl:choose>
-        <xsl:when test="$entry">
-          <xsl:choose>
-            <xsl:when test="$bibliography.numbered != 0">
-              <xsl:apply-templates select="$entry">
-                <xsl:with-param name="label" select="$label"/>
-              </xsl:apply-templates>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:apply-templates select="$entry"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:message>
-            <xsl:text>No bibliography entry: </xsl:text>
-            <xsl:value-of select="$id"/>
-            <xsl:text> found in </xsl:text>
-            <xsl:value-of select="$bibliography.collection"/>
-          </xsl:message>
-          <fo:block id="{$id}" xsl:use-attribute-sets="normal.para.spacing">
-            <xsl:text>Error: no bibliography entry: </xsl:text>
-            <xsl:value-of select="$id"/>
-            <xsl:text> found in </xsl:text>
-            <xsl:value-of select="$bibliography.collection"/>
-          </fo:block>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <fo:block id="{$id}" xsl:use-attribute-sets="biblioentry.properties">
-        <xsl:copy-of select="$label"/>
-	<xsl:choose>
-	  <xsl:when test="$bibliography.style = 'iso690'">
-	    <xsl:call-template name="iso690.makecitation"/>
-	  </xsl:when>
-	  <xsl:otherwise>
-	    <xsl:apply-templates mode="bibliography.mode"/>
-	  </xsl:otherwise>
-	</xsl:choose>
-      </fo:block>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="bibliomixed">
-  <xsl:param name="label">
-    <xsl:call-template name="biblioentry.label"/>
-  </xsl:param>
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="string(.) = ''">
-      <xsl:variable name="bib" select="document($bibliography.collection,.)"/>
-      <xsl:variable name="entry" select="$bib/bibliography/
-                                         *[@id=$id or @xml:id=$id][1]"/>
-      <xsl:choose>
-        <xsl:when test="$entry">
-          <xsl:choose>
-            <xsl:when test="$bibliography.numbered != 0">
-              <xsl:apply-templates select="$entry">
-                <xsl:with-param name="label" select="$label"/>
-              </xsl:apply-templates>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:apply-templates select="$entry"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:message>
-            <xsl:text>No bibliography entry: </xsl:text>
-            <xsl:value-of select="$id"/>
-            <xsl:text> found in </xsl:text>
-            <xsl:value-of select="$bibliography.collection"/>
-          </xsl:message>
-          <fo:block id="{$id}" xsl:use-attribute-sets="normal.para.spacing">
-            <xsl:text>Error: no bibliography entry: </xsl:text>
-            <xsl:value-of select="$id"/>
-            <xsl:text> found in </xsl:text>
-            <xsl:value-of select="$bibliography.collection"/>
-          </fo:block>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <fo:block id="{$id}" xsl:use-attribute-sets="biblioentry.properties">
-        <xsl:copy-of select="$label"/>
-        <xsl:apply-templates mode="bibliomixed.mode"/>
-      </fo:block>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="biblioentry.label">
-  <xsl:param name="node" select="."/>
-
-  <xsl:choose>
-    <xsl:when test="$bibliography.numbered != 0">
-      <xsl:text>[</xsl:text>
-      <xsl:number from="bibliography" count="biblioentry|bibliomixed"
-                  level="any" format="1"/>
-      <xsl:text>] </xsl:text>
-    </xsl:when>
-    <xsl:when test="local-name($node/child::*[1]) = 'abbrev'">
-      <xsl:text>[</xsl:text>
-      <xsl:apply-templates select="$node/abbrev[1]"/>
-      <xsl:text>] </xsl:text>
-    </xsl:when>
-    <xsl:when test="$node/@xreflabel">
-      <xsl:text>[</xsl:text>
-      <xsl:value-of select="$node/@xreflabel"/>
-      <xsl:text>] </xsl:text>
-    </xsl:when>
-    <xsl:when test="$node/@id or $node/@xml:id">
-      <xsl:text>[</xsl:text>
-      <xsl:value-of select="($node/@id|$node/@xml:id)[1]"/>
-      <xsl:text>] </xsl:text>
-    </xsl:when>
-    <xsl:otherwise><!-- nop --></xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="*" mode="bibliography.mode">
-  <xsl:apply-templates select="."/><!-- try the default mode -->
-</xsl:template>
-
-<xsl:template match="abbrev" mode="bibliography.mode">
-  <xsl:if test="preceding-sibling::*">
-    <fo:inline>
-      <xsl:apply-templates mode="bibliography.mode"/>
-    </fo:inline>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="abstract" mode="bibliography.mode">
-  <!-- suppressed -->
-</xsl:template>
-
-<xsl:template match="address" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="affiliation" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="shortaffil" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="jobtitle" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="artheader|articleinfo|article/info" 
-              mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="artpagenums" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="author" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:call-template name="person.name"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="authorblurb|personblurb" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:call-template name="person.name.list"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="authorinitials" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="bibliomisc" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="bibliomset" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<!-- ================================================== -->
-
-<xsl:template match="biblioset" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="biblioset/title|biblioset/citetitle" 
-              mode="bibliography.mode">
-  <xsl:variable name="relation" select="../@relation"/>
-  <xsl:choose>
-    <xsl:when test="$relation='article' or @pubwork='article'">
-      <xsl:call-template name="gentext.startquote"/>
-      <xsl:apply-templates mode="bibliography.mode"/>
-      <xsl:call-template name="gentext.endquote"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <fo:inline font-style="italic">
-        <xsl:apply-templates/>
-      </fo:inline>
-    </xsl:otherwise>
-  </xsl:choose>
-  <xsl:value-of select="$biblioentry.item.separator"/>
-</xsl:template>
-
-<!-- ================================================== -->
-
-<xsl:template match="bookbiblio" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="citetitle" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:choose>
-      <xsl:when test="@pubwork = 'article'">
-        <xsl:call-template name="gentext.startquote"/>
-        <xsl:apply-templates mode="bibliography.mode"/>
-        <xsl:call-template name="gentext.endquote"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <fo:inline font-style="italic">
-          <xsl:apply-templates mode="bibliography.mode"/>
-        </fo:inline>
-      </xsl:otherwise>
-    </xsl:choose>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="collab" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="confgroup" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="contractnum" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="contractsponsor" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="contrib" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<!-- ================================================== -->
-
-<xsl:template match="copyright" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:call-template name="gentext">
-      <xsl:with-param name="key" select="'Copyright'"/>
-    </xsl:call-template>
-    <xsl:call-template name="gentext.space"/>
-    <xsl:call-template name="dingbat">
-      <xsl:with-param name="dingbat">copyright</xsl:with-param>
-    </xsl:call-template>
-    <xsl:call-template name="gentext.space"/>
-    <xsl:apply-templates select="year" mode="bibliography.mode"/>
-    <xsl:if test="holder">
-      <xsl:call-template name="gentext.space"/>
-      <xsl:apply-templates select="holder" mode="bibliography.mode"/>
-    </xsl:if>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="year" mode="bibliography.mode">
-  <xsl:apply-templates/><xsl:text>, </xsl:text>
-</xsl:template>
-
-<xsl:template match="year[position()=last()]" mode="bibliography.mode">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="holder" mode="bibliography.mode">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<!-- ================================================== -->
-
-<xsl:template match="corpauthor" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="corpcredit" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="corpname" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="date" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="edition" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="editor" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:call-template name="person.name"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="firstname" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="honorific" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="bibliography.mode">
-  <xsl:apply-templates select="."/> 
-</xsl:template>
-
-<xsl:template match="invpartnumber" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="isbn" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="issn" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="issuenum" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="lineage" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="orgname" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="othername" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="pagenums" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="printhistory" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="productname" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="productnumber" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="publisher" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="publishername" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="pubsnumber" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="bibliography.mode">
-  <fo:block>
-    <xsl:apply-templates select="."/> <!-- use normal mode -->
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="seriesinfo" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="seriesvolnums" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="surname" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="title" mode="bibliography.mode">
-  <fo:inline>
-    <fo:inline font-style="italic">
-      <xsl:apply-templates mode="bibliography.mode"/>
-    </fo:inline>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="titleabbrev" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="volumenum" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="orgdiv" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="collabname" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="confdates" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="conftitle" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="confnum" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="confsponsor" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="bibliocoverage|biblioid|bibliorelation|bibliosource"
-              mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="*" mode="bibliomixed.mode">
-  <xsl:apply-templates select="."/><!-- try the default mode -->
-</xsl:template>
-
-<xsl:template match="abbrev" mode="bibliomixed.mode">
-  <xsl:if test="preceding-sibling::*">
-    <fo:inline>
-      <xsl:apply-templates mode="bibliomixed.mode"/>
-    </fo:inline>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="abstract" mode="bibliomixed.mode">
-  <fo:block start-indent="1in">
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="para" mode="bibliomixed.mode">
-  <fo:block>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="address" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="affiliation" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="shortaffil" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="jobtitle" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="artpagenums" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="author" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:call-template name="person.name"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="authorblurb|personblurb" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="authorinitials" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="bibliomisc" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<!-- ================================================== -->
-
-<xsl:template match="bibliomset" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="bibliomset/title|bibliomset/citetitle" 
-              mode="bibliomixed.mode">
-  <xsl:variable name="relation" select="../@relation"/>
-  <xsl:choose>
-    <xsl:when test="$relation='article' or @pubwork='article'">
-      <xsl:call-template name="gentext.startquote"/>
-      <xsl:apply-templates mode="bibliomixed.mode"/>
-      <xsl:call-template name="gentext.endquote"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <fo:inline font-style="italic">
-        <xsl:apply-templates/>
-      </fo:inline>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ================================================== -->
-
-<xsl:template match="biblioset" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="citetitle" mode="bibliomixed.mode">
-  <xsl:choose>
-    <xsl:when test="@pubwork = 'article'">
-      <xsl:call-template name="gentext.startquote"/>
-      <xsl:apply-templates mode="bibliomixed.mode"/>
-      <xsl:call-template name="gentext.endquote"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <fo:inline font-style="italic">
-        <xsl:apply-templates mode="bibliography.mode"/>
-      </fo:inline>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="collab" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="confgroup" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="contractnum" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="contractsponsor" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="contrib" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="copyright" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="corpcredit" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="corpname" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="date" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="edition" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="editor" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="firstname" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="honorific" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="bibliomixed.mode">
-  <xsl:apply-templates select="."/> 
-</xsl:template>
-
-<xsl:template match="invpartnumber" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="isbn" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="issn" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="issuenum" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="lineage" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="orgname" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="othername" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="pagenums" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="printhistory" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="productname" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="productnumber" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="publisher" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="publishername" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="pubsnumber" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="seriesvolnums" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="surname" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="title" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="titleabbrev" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="volumenum" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="bibliocoverage|biblioid|bibliorelation|bibliosource"
-              mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/block.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/block.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,600 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-<!-- What should we do about styling blockinfo? -->
-
-<xsl:template match="blockinfo|info">
-  <!-- suppress -->
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="block.object">
-  <fo:block>
-    <xsl:call-template name="anchor"/>
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="para">
-  <fo:block xsl:use-attribute-sets="normal.para.spacing">
-    <xsl:call-template name="anchor"/>
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="simpara">
-  <fo:block xsl:use-attribute-sets="normal.para.spacing">
-    <xsl:call-template name="anchor"/>
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="formalpara">
-  <fo:block xsl:use-attribute-sets="normal.para.spacing">
-    <xsl:call-template name="anchor"/>
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<!-- Only use title from info -->
-<xsl:template match="formalpara/info">
-  <xsl:apply-templates select="title"/>
-</xsl:template>
-
-<xsl:template match="formalpara/title|formalpara/info/title">
-  <xsl:variable name="titleStr">
-      <xsl:apply-templates/>
-  </xsl:variable>
-  <xsl:variable name="lastChar">
-    <xsl:if test="$titleStr != ''">
-      <xsl:value-of select="substring($titleStr,string-length($titleStr),1)"/>
-    </xsl:if>
-  </xsl:variable>
-
-  <fo:inline font-weight="bold"
-             keep-with-next.within-line="always"
-             padding-end="1em">
-    <xsl:copy-of select="$titleStr"/>
-    <xsl:if test="$lastChar != ''
-                  and not(contains($runinhead.title.end.punct, $lastChar))">
-      <xsl:value-of select="$runinhead.default.title.end.punct"/>
-    </xsl:if>
-    <xsl:text>&#160;</xsl:text>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="formalpara/para">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="blockquote">
-  <fo:block xsl:use-attribute-sets="blockquote.properties">
-    <xsl:call-template name="anchor"/>
-    <fo:block>
-      <xsl:if test="title|info/title">
-        <fo:block xsl:use-attribute-sets="formal.title.properties">
-          <xsl:apply-templates select="." mode="object.title.markup"/>
-        </fo:block>
-      </xsl:if>
-      <xsl:apply-templates select="*[local-name(.) != 'title'
-                                   and local-name(.) != 'attribution']"/>
-    </fo:block>
-    <xsl:if test="attribution">
-      <fo:block text-align="right">
-        <!-- mdash -->
-        <xsl:text>&#x2014;</xsl:text>
-        <xsl:apply-templates select="attribution"/>
-      </fo:block>
-    </xsl:if>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="epigraph">
-  <fo:block>
-    <xsl:call-template name="anchor"/>
-    <xsl:apply-templates select="para|simpara|formalpara|literallayout"/>
-    <xsl:if test="attribution">
-      <fo:inline>
-        <xsl:text>--</xsl:text>
-        <xsl:apply-templates select="attribution"/>
-      </fo:inline>
-    </xsl:if>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="attribution">
-  <fo:inline><xsl:apply-templates/></fo:inline>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="floater">
-  <xsl:param name="position" select="'none'"/>
-  <xsl:param name="clear" select="'both'"/>
-  <xsl:param name="width"/>
-  <xsl:param name="content"/>
-  <xsl:param name="start.indent">0pt</xsl:param>
-  <xsl:param name="end.indent">0pt</xsl:param>
-
-  <xsl:choose>
-    <xsl:when test="not($fop.extensions = 0)">
-      <!-- fop 0.20.5 does not support floats -->
-      <xsl:copy-of select="$content"/>
-    </xsl:when>
-    <xsl:when test="$position = 'none'">
-      <xsl:copy-of select="$content"/>
-    </xsl:when>
-    <xsl:when test="$position = 'before'">
-      <fo:float float="before">
-        <xsl:copy-of select="$content"/>
-      </fo:float>
-    </xsl:when>
-    <xsl:when test="$position = 'left' or
-                    $position = 'start' or
-                    $position = 'right' or
-                    $position = 'end' or
-                    $position = 'inside' or
-                    $position = 'outside'">
-      <xsl:variable name="float">
-        <fo:float float="{$position}"
-                  clear="{$clear}">
-          <fo:block-container 
-                    start-indent="{$start.indent}"
-                    end-indent="{$end.indent}">
-            <xsl:if test="$width != ''">
-              <xsl:attribute name="inline-progression-dimension">
-                <xsl:value-of select="$width"/>
-              </xsl:attribute>
-            </xsl:if>
-            <fo:block>
-              <xsl:copy-of select="$content"/>
-            </fo:block>
-          </fo:block-container>
-        </fo:float>
-      </xsl:variable>
-      <xsl:choose>
-        <xsl:when test="$axf.extensions != 0 and self::sidebar">
-          <fo:block xsl:use-attribute-sets="normal.para.spacing"
-                    space-after="0pt"
-                    space-after.precedence="force"
-                    start-indent="0pt" end-indent="0pt">
-            <xsl:copy-of select="$float"/>
-          </fo:block>
-        </xsl:when>
-        <xsl:when test="$axf.extensions != 0 and 
-                        ($position = 'left' or $position = 'start')">
-          <fo:float float="{$position}"
-                    clear="{$clear}">
-            <fo:block-container 
-                      inline-progression-dimension=".001mm"
-                      end-indent="{$start.indent} + {$width} + {$end.indent}">
-              <xsl:attribute name="start-indent">
-                <xsl:choose>
-                  <xsl:when test="ancestor::para">
-                    <!-- Special case for handling inline floats
-                         in Antenna House-->
-                    <xsl:value-of select="concat('-', $body.start.indent)"/>
-                  </xsl:when>
-                  <xsl:otherwise>0pt</xsl:otherwise>
-                </xsl:choose>
-              </xsl:attribute>
-              <fo:block start-indent="{$start.indent}"
-                        end-indent="-{$start.indent} - {$width}">
-                <xsl:copy-of select="$content"/>
-              </fo:block>
-            </fo:block-container>
-          </fo:float>
-
-        </xsl:when>
-        <xsl:when test="$axf.extensions != 0 and 
-                        ($position = 'right' or $position = 'end')">
-          <!-- Special case for handling inline floats in Antenna House-->
-          <fo:float float="{$position}"
-                    clear="{$clear}">
-            <fo:block-container 
-                      inline-progression-dimension=".001mm"
-                      end-indent="-{$body.end.indent}"
-                      start-indent="{$start.indent} + {$width} + {$end.indent}">
-              <fo:block end-indent="{$end.indent}"
-                        start-indent="-{$end.indent} - {$width}">
-                <xsl:copy-of select="$content"/>
-              </fo:block>
-            </fo:block-container>
-          </fo:float>
-
-        </xsl:when>
-        <xsl:when test="$xep.extensions != 0 and self::sidebar">
-          <!-- float needs some space above  to line up with following para -->
-          <fo:block xsl:use-attribute-sets="normal.para.spacing">
-            <xsl:copy-of select="$float"/>
-          </fo:block>
-        </xsl:when>
-        <xsl:when test="$xep.extensions != 0">
-          <xsl:copy-of select="$float"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:copy-of select="$float"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:copy-of select="$content"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="sidebar" name="sidebar">
-  <!-- Also does margin notes -->
-  <xsl:variable name="pi-type">
-    <xsl:call-template name="pi.dbfo_float-type"/>
-  </xsl:variable>
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$pi-type = 'margin.note'">
-      <xsl:call-template name="margin.note"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:variable name="content">
-        <fo:block xsl:use-attribute-sets="sidebar.properties"
-                  id="{$id}">
-          <xsl:call-template name="sidebar.titlepage"/>
-          <xsl:apply-templates select="node()[not(self::title) and
-                                         not(self::info) and
-                                         not(self::sidebarinfo)]"/>
-        </fo:block>
-      </xsl:variable>
-
-      <xsl:variable name="pi-width">
-        <xsl:call-template name="pi.dbfo_sidebar-width"/>
-      </xsl:variable>
-
-      <xsl:variable name="position">
-        <xsl:choose>
-          <xsl:when test="$pi-type != ''">
-            <xsl:value-of select="$pi-type"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="$sidebar.float.type"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-    
-      <xsl:call-template name="floater">
-        <xsl:with-param name="content" select="$content"/>
-        <xsl:with-param name="position" select="$position"/>
-        <xsl:with-param name="width">
-          <xsl:choose>
-            <xsl:when test="$pi-width != ''">
-              <xsl:value-of select="$pi-width"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:value-of select="$sidebar.float.width"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:with-param>
-        <xsl:with-param name="start.indent">
-          <xsl:choose>
-            <xsl:when test="$position = 'start' or 
-                            $position = 'left'">0pt</xsl:when>
-            <xsl:when test="$position = 'end' or 
-                            $position = 'right'">0.5em</xsl:when>
-            <xsl:otherwise>0pt</xsl:otherwise>
-          </xsl:choose>
-        </xsl:with-param>
-        <xsl:with-param name="end.indent">
-          <xsl:choose>
-            <xsl:when test="$position = 'start' or 
-                            $position = 'left'">0.5em</xsl:when>
-            <xsl:when test="$position = 'end' or 
-                            $position = 'right'">0pt</xsl:when>
-            <xsl:otherwise>0pt</xsl:otherwise>
-          </xsl:choose>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-
-</xsl:template>
-
-<xsl:template match="sidebar/title|sidebarinfo|sidebar/info"/>
-
-<xsl:template match="sidebar/title|sidebarinfo/title|sidebar/info/title"
-              mode="titlepage.mode" priority="1">
-  <fo:block xsl:use-attribute-sets="sidebar.title.properties">
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template name="margin.note">
-  <xsl:param name="content">
-    <fo:block xsl:use-attribute-sets="margin.note.properties">
-      <xsl:if test="./title">
-        <fo:block xsl:use-attribute-sets="margin.note.title.properties">
-          <xsl:apply-templates select="./title" mode="margin.note.title.mode"/>
-        </fo:block>
-      </xsl:if>
-      <xsl:apply-templates/>
-    </fo:block>
-  </xsl:param>
-
-  <xsl:variable name="pi-width">
-    <xsl:call-template name="pi.dbfo_sidebar-width"/>
-  </xsl:variable>
-
-  <xsl:variable name="position" select="$margin.note.float.type"/>
-
-  <xsl:call-template name="floater">
-    <xsl:with-param name="content" select="$content"/>
-    <xsl:with-param name="position" select="$position"/>
-    <xsl:with-param name="width" >
-      <xsl:choose>
-        <xsl:when test="$pi-width != ''">
-          <xsl:value-of select="$pi-width"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="$margin.note.width"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:with-param>
-    <xsl:with-param name="start.indent">
-      <xsl:choose>
-        <xsl:when test="$position = 'start' or 
-                        $position = 'left'">0pt</xsl:when>
-        <xsl:when test="$position = 'end' or 
-                        $position = 'right'">0.5em</xsl:when>
-        <xsl:otherwise>0pt</xsl:otherwise>
-      </xsl:choose>
-    </xsl:with-param>
-    <xsl:with-param name="end.indent">
-      <xsl:choose>
-        <xsl:when test="$position = 'start' or 
-                        $position = 'left'">0.5em</xsl:when>
-        <xsl:when test="$position = 'end' or 
-                        $position = 'right'">0pt</xsl:when>
-        <xsl:otherwise>0pt</xsl:otherwise>
-      </xsl:choose>
-    </xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="sidebar/title" mode="margin.note.title.mode">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="abstract">
-  <fo:block xsl:use-attribute-sets="abstract.properties">
-    <xsl:call-template name="anchor"/>
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="abstract/title|abstract/info/title">
-  <fo:block xsl:use-attribute-sets="abstract.title.properties">
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="msgset">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="msgentry">
-  <xsl:call-template name="block.object"/>
-</xsl:template>
-
-<xsl:template match="simplemsgentry">
-  <xsl:call-template name="block.object"/>
-</xsl:template>
-
-<xsl:template match="msg">
-  <xsl:call-template name="block.object"/>
-</xsl:template>
-
-<xsl:template match="msgmain">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="msgsub">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="msgrel">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="msgtext">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="msginfo">
-  <xsl:call-template name="block.object"/>
-</xsl:template>
-
-<xsl:template match="msglevel">
-  <fo:block>
-    <fo:inline font-weight="bold"
-               keep-with-next.within-line="always">
-      <xsl:call-template name="gentext.template">
-        <xsl:with-param name="context" select="'msgset'"/>
-        <xsl:with-param name="name" select="'MsgLevel'"/>
-      </xsl:call-template>
-    </fo:inline>
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="msgorig">
-  <fo:block>
-    <fo:inline font-weight="bold"
-               keep-with-next.within-line="always">
-      <xsl:call-template name="gentext.template">
-        <xsl:with-param name="context" select="'msgset'"/>
-        <xsl:with-param name="name" select="'MsgOrig'"/>
-      </xsl:call-template>
-    </fo:inline>
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="msgaud">
-  <fo:block>
-    <fo:inline font-weight="bold"
-               keep-with-next.within-line="always">
-      <xsl:call-template name="gentext.template">
-        <xsl:with-param name="context" select="'msgset'"/>
-        <xsl:with-param name="name" select="'MsgAud'"/>
-      </xsl:call-template>
-    </fo:inline>
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="msgexplan">
-  <xsl:call-template name="block.object"/>
-</xsl:template>
-
-<xsl:template match="msgexplan/title">
-  <fo:block font-weight="bold"
-            keep-with-next.within-column="always"
-            hyphenate="false">
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<!-- ==================================================================== -->
-<!-- For better or worse, revhistory is allowed in content... -->
-
-<xsl:template match="revhistory">
-  <fo:table table-layout="fixed" xsl:use-attribute-sets="revhistory.table.properties">
-    <xsl:call-template name="anchor"/>
-    <fo:table-column column-number="1" column-width="proportional-column-width(1)"/>
-    <fo:table-column column-number="2" column-width="proportional-column-width(1)"/>
-    <fo:table-column column-number="3" column-width="proportional-column-width(1)"/>
-    <fo:table-body start-indent="0pt" end-indent="0pt">
-      <fo:table-row>
-        <fo:table-cell number-columns-spanned="3" xsl:use-attribute-sets="revhistory.table.cell.properties">
-          <fo:block xsl:use-attribute-sets="revhistory.title.properties">
-            <xsl:call-template name="gentext">
-              <xsl:with-param name="key" select="'RevHistory'"/>
-            </xsl:call-template>
-          </fo:block>
-        </fo:table-cell>
-      </fo:table-row>
-      <xsl:apply-templates/>
-    </fo:table-body>
-  </fo:table>
-</xsl:template>
-
-<xsl:template match="revhistory/revision">
-  <xsl:variable name="revnumber" select="revnumber"/>
-  <xsl:variable name="revdate"   select="date"/>
-  <xsl:variable name="revauthor" select="authorinitials|author"/>
-  <xsl:variable name="revremark" select="revremark|revdescription"/>
-  <fo:table-row>
-    <fo:table-cell xsl:use-attribute-sets="revhistory.table.cell.properties">
-      <fo:block>
-        <xsl:call-template name="anchor"/>
-        <xsl:if test="$revnumber">
-          <xsl:call-template name="gentext">
-            <xsl:with-param name="key" select="'Revision'"/>
-          </xsl:call-template>
-          <xsl:call-template name="gentext.space"/>
-          <xsl:apply-templates select="$revnumber[1]"/>
-        </xsl:if>
-      </fo:block>
-    </fo:table-cell>
-    <fo:table-cell xsl:use-attribute-sets="revhistory.table.cell.properties">
-      <fo:block>
-        <xsl:apply-templates select="$revdate[1]"/>
-      </fo:block>
-    </fo:table-cell>
-    <fo:table-cell xsl:use-attribute-sets="revhistory.table.cell.properties">
-      <fo:block>
-        <xsl:for-each select="$revauthor">
-          <xsl:apply-templates select="."/>
-          <xsl:if test="position() != last()">
-            <xsl:text>, </xsl:text>
-          </xsl:if>
-        </xsl:for-each>
-      </fo:block>
-    </fo:table-cell>
-  </fo:table-row>
-  <xsl:if test="$revremark">
-    <fo:table-row>
-      <fo:table-cell number-columns-spanned="3" xsl:use-attribute-sets="revhistory.table.cell.properties">
-        <fo:block>
-          <xsl:apply-templates select="$revremark[1]"/>
-        </fo:block>
-      </fo:table-cell>
-    </fo:table-row>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="revision/revnumber">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="revision/date">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="revision/authorinitials">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="revision/author">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="revision/revremark">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="revision/revdescription">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="ackno">
-  <fo:block xsl:use-attribute-sets="normal.para.spacing">
-    <xsl:call-template name="anchor"/>
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="highlights">
-  <xsl:call-template name="block.object"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/callout.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/callout.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,231 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                xmlns:sverb="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.Verbatim"
-                xmlns:xverb="com.nwalsh.xalan.Verbatim"
-                xmlns:lxslt="http://xml.apache.org/xslt"
-                exclude-result-prefixes="sverb xverb lxslt"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<lxslt:component prefix="xverb"
-                 functions="insertCallouts"/>
-
-<xsl:template match="programlistingco|screenco">
-  <xsl:variable name="verbatim" select="programlisting|screen"/>
-  <xsl:variable name="vendor" select="system-property('xsl:vendor')"/>
-
-  <xsl:choose>
-    <xsl:when test="$use.extensions != '0'
-                    and $callouts.extension != '0'">
-      <xsl:variable name="rtf">
-        <xsl:apply-templates select="$verbatim">
-          <xsl:with-param name="suppress-numbers" select="'1'"/>
-        </xsl:apply-templates>
-      </xsl:variable>
-
-      <xsl:variable name="rtf-with-callouts">
-        <xsl:choose>
-          <xsl:when test="contains($vendor, 'SAXON ')">
-            <xsl:copy-of select="sverb:insertCallouts(areaspec,$rtf)"/>
-          </xsl:when>
-          <xsl:when test="contains($vendor, 'Apache Software Foundation')">
-            <xsl:copy-of select="xverb:insertCallouts(areaspec,$rtf)"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:message terminate="yes">
-              <xsl:text>Don't know how to do callouts with </xsl:text>
-              <xsl:value-of select="$vendor"/>
-            </xsl:message>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-
-      <xsl:choose>
-        <xsl:when test="$verbatim/@linenumbering = 'numbered'
-                        and $linenumbering.extension != '0'">
-          <xsl:call-template name="number.rtf.lines">
-            <xsl:with-param name="rtf" select="$rtf-with-callouts"/>
-            <xsl:with-param name="pi.context"
-                            select="programlisting|screen"/>
-          </xsl:call-template>
-          <xsl:apply-templates select="calloutlist"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:copy-of select="$rtf-with-callouts"/>
-          <xsl:apply-templates select="calloutlist"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="areaspec|areaset|area">
-</xsl:template>
-
-<xsl:template match="areaset" mode="conumber">
-  <xsl:number count="area|areaset" format="1"/>
-</xsl:template>
-
-<xsl:template match="area" mode="conumber">
-  <xsl:number count="area|areaset" format="1"/>
-</xsl:template>
-
-<xsl:template match="co">
-  <fo:inline>
-    <xsl:call-template name="anchor"/>
-    <xsl:apply-templates select="." mode="callout-bug"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="coref">
-  <!-- tricky; this relies on the fact that we can process the "co" that's -->
-  <!-- "over there" as if it were "right here" -->
-
-  <xsl:variable name="co" select="key('id', @linkend)"/>
-  <xsl:choose>
-    <xsl:when test="not($co)">
-      <xsl:message>
-        <xsl:text>Error: coref link is broken: </xsl:text>
-        <xsl:value-of select="@linkend"/>
-      </xsl:message>
-    </xsl:when>
-    <xsl:when test="local-name($co) != 'co'">
-      <xsl:message>
-        <xsl:text>Error: coref doesn't point to a co: </xsl:text>
-        <xsl:value-of select="@linkend"/>
-      </xsl:message>
-    </xsl:when>
-    <xsl:otherwise>
-      <fo:inline>
-        <xsl:call-template name="anchor"/>
-        <xsl:apply-templates select="$co" mode="callout-bug"/>
-      </fo:inline>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="co" mode="callout-bug">
-  <xsl:call-template name="callout-bug">
-    <xsl:with-param name="conum">
-      <xsl:number count="co"
-                  level="any"
-                  from="programlisting|screen|literallayout|synopsis"
-                  format="1"/>
-    </xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="callout-bug">
-  <xsl:param name="conum" select='1'/>
-
-  <xsl:choose>
-    <!-- Draw callouts as images -->
-    <xsl:when test="$callout.graphics != '0'
-                    and $conum &lt;= $callout.graphics.number.limit">
-      <xsl:variable name="filename"
-                    select="concat($callout.graphics.path, $conum,
-		                   $callout.graphics.extension)"/>
-
-      <fo:external-graphic content-width="{$callout.icon.size}"
-                           width="{$callout.icon.size}">
-        <xsl:attribute name="src">
-          <xsl:choose>
-            <xsl:when test="$passivetex.extensions != 0
-                            or $fop.extensions != 0
-                            or $arbortext.extensions != 0">
-              <xsl:value-of select="$filename"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:text>url(</xsl:text>
-              <xsl:value-of select="$filename"/>
-              <xsl:text>)</xsl:text>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:attribute>
-      </fo:external-graphic>
-    </xsl:when>
-
-    <xsl:when test="$callout.unicode != 0
-                    and $conum &lt;= $callout.unicode.number.limit">
-      <xsl:variable name="comarkup">
-        <xsl:choose>
-          <xsl:when test="$callout.unicode.start.character = 10102">
-            <xsl:choose>
-              <xsl:when test="$conum = 1">&#10102;</xsl:when>
-              <xsl:when test="$conum = 2">&#10103;</xsl:when>
-              <xsl:when test="$conum = 3">&#10104;</xsl:when>
-              <xsl:when test="$conum = 4">&#10105;</xsl:when>
-              <xsl:when test="$conum = 5">&#10106;</xsl:when>
-              <xsl:when test="$conum = 6">&#10107;</xsl:when>
-              <xsl:when test="$conum = 7">&#10108;</xsl:when>
-              <xsl:when test="$conum = 8">&#10109;</xsl:when>
-              <xsl:when test="$conum = 9">&#10110;</xsl:when>
-              <xsl:when test="$conum = 10">&#10111;</xsl:when>
-            </xsl:choose>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:message>
-              <xsl:text>Don't know how to generate Unicode callouts </xsl:text>
-              <xsl:text>when $callout.unicode.start.character is </xsl:text>
-              <xsl:value-of select="$callout.unicode.start.character"/>
-            </xsl:message>
-            <fo:inline background-color="#404040"
-                       color="white"
-                       padding-top="0.1em"
-                       padding-bottom="0.1em"
-                       padding-start="0.2em"
-                       padding-end="0.2em"
-                       baseline-shift="0.1em"
-                       font-family="{$body.fontset}"
-                       font-weight="bold"
-                       font-size="75%">
-              <xsl:value-of select="$conum"/>
-            </fo:inline>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-
-      <xsl:choose>
-        <xsl:when test="$callout.unicode.font != ''">
-          <fo:inline font-family="{$callout.unicode.font}">
-            <xsl:copy-of select="$comarkup"/>
-          </fo:inline>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:copy-of select="$comarkup"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-
-    <!-- Most safe: draw a dark gray square with a white number inside -->
-    <xsl:otherwise>
-      <fo:inline background-color="#404040"
-                 color="white"
-                 padding-top="0.1em"
-                 padding-bottom="0.1em"
-                 padding-start="0.2em"
-                 padding-end="0.2em"
-                 baseline-shift="0.1em"
-                 font-family="{$body.fontset}"
-                 font-weight="bold"
-                 font-size="75%">
-        <xsl:value-of select="$conum"/>
-      </fo:inline>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/component.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/component.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,797 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                xmlns:axf="http://www.antennahouse.com/names/XSL/Extensions"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-
-<xsl:template name="component.title">
-  <xsl:param name="node" select="."/>
-  <xsl:param name="pagewide" select="0"/>
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="$node"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="title">
-    <xsl:apply-templates select="$node" mode="object.title.markup">
-      <xsl:with-param name="allow-anchors" select="1"/>
-    </xsl:apply-templates>
-  </xsl:variable>
-
-  <xsl:variable name="titleabbrev">
-    <xsl:apply-templates select="$node" mode="titleabbrev.markup"/>
-  </xsl:variable>
-
-  <xsl:variable name="level">
-    <xsl:choose>
-      <xsl:when test="ancestor::section">
-        <xsl:value-of select="count(ancestor::section)+1"/>
-      </xsl:when>
-      <xsl:when test="ancestor::sect5">6</xsl:when>
-      <xsl:when test="ancestor::sect4">5</xsl:when>
-      <xsl:when test="ancestor::sect3">4</xsl:when>
-      <xsl:when test="ancestor::sect2">3</xsl:when>
-      <xsl:when test="ancestor::sect1">2</xsl:when>
-      <xsl:otherwise>1</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:if test="$passivetex.extensions != 0">
-    <fotex:bookmark xmlns:fotex="http://www.tug.org/fotex"
-                    fotex-bookmark-level="2"
-                    fotex-bookmark-label="{$id}">
-      <xsl:value-of select="$titleabbrev"/>
-    </fotex:bookmark>
-  </xsl:if>
-
-  <fo:block xsl:use-attribute-sets="component.title.properties">
-    <xsl:if test="$pagewide != 0">
-      <!-- Doesn't work to use 'all' here since not a child of fo:flow -->
-      <xsl:attribute name="span">inherit</xsl:attribute>
-    </xsl:if>
-    <xsl:attribute name="hyphenation-character">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-character'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="hyphenation-push-character-count">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-push-character-count'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="hyphenation-remain-character-count">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-remain-character-count'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:if test="$axf.extensions != 0">
-      <xsl:attribute name="axf:outline-level">
-        <xsl:value-of select="count($node/ancestor::*)"/>
-      </xsl:attribute>
-      <xsl:attribute name="axf:outline-expand">false</xsl:attribute>
-      <xsl:attribute name="axf:outline-title">
-        <xsl:value-of select="normalize-space($title)"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <!-- Let's handle the case where a component (bibliography, for example)
-         occurs inside a section; will we need parameters for this?
-         Danger Will Robinson: using section.title.level*.properties here
-         runs the risk that someone will set something other than
-         font-size there... -->
-    <xsl:choose>
-      <xsl:when test="$level=2">
-        <fo:block xsl:use-attribute-sets="section.title.level2.properties">
-          <xsl:copy-of select="$title"/>
-        </fo:block>
-      </xsl:when>
-      <xsl:when test="$level=3">
-        <fo:block xsl:use-attribute-sets="section.title.level3.properties">
-          <xsl:copy-of select="$title"/>
-        </fo:block>
-      </xsl:when>
-      <xsl:when test="$level=4">
-        <fo:block xsl:use-attribute-sets="section.title.level4.properties">
-          <xsl:copy-of select="$title"/>
-        </fo:block>
-      </xsl:when>
-      <xsl:when test="$level=5">
-        <fo:block xsl:use-attribute-sets="section.title.level5.properties">
-          <xsl:copy-of select="$title"/>
-        </fo:block>
-      </xsl:when>
-      <xsl:when test="$level=6">
-        <fo:block xsl:use-attribute-sets="section.title.level6.properties">
-          <xsl:copy-of select="$title"/>
-        </fo:block>
-      </xsl:when>
-      <xsl:otherwise>
-        <!-- not in a section: do nothing special -->
-        <xsl:copy-of select="$title"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </fo:block>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="dedication" mode="dedication">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="master-reference">
-    <xsl:call-template name="select.pagemaster"/>
-  </xsl:variable>
-
-  <fo:page-sequence hyphenate="{$hyphenate}"
-                    master-reference="{$master-reference}">
-    <xsl:attribute name="language">
-      <xsl:call-template name="l10n.language"/>
-    </xsl:attribute>
-    <xsl:attribute name="format">
-      <xsl:call-template name="page.number.format">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="initial-page-number">
-      <xsl:call-template name="initial.page.number">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="force-page-count">
-      <xsl:call-template name="force.page.count">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="hyphenation-character">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-character'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="hyphenation-push-character-count">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-push-character-count'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="hyphenation-remain-character-count">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-remain-character-count'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:apply-templates select="." mode="running.head.mode">
-      <xsl:with-param name="master-reference" select="$master-reference"/>
-    </xsl:apply-templates>
-
-    <xsl:apply-templates select="." mode="running.foot.mode">
-      <xsl:with-param name="master-reference" select="$master-reference"/>
-    </xsl:apply-templates>
-
-    <fo:flow flow-name="xsl-region-body">
-      <xsl:call-template name="set.flow.properties">
-        <xsl:with-param name="element" select="local-name(.)"/>
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-
-      <fo:block id="{$id}"
-                xsl:use-attribute-sets="component.titlepage.properties">
-        <xsl:call-template name="dedication.titlepage"/>
-      </fo:block>
-      <xsl:apply-templates/>
-    </fo:flow>
-  </fo:page-sequence>
-</xsl:template>
-
-<xsl:template match="dedication"></xsl:template> <!-- see mode="dedication" -->
-<xsl:template match="dedication/docinfo"></xsl:template>
-<xsl:template match="dedication/title"></xsl:template>
-<xsl:template match="dedication/subtitle"></xsl:template>
-<xsl:template match="dedication/titleabbrev"></xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="colophon">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="master-reference">
-    <xsl:call-template name="select.pagemaster"/>
-  </xsl:variable>
-
-  <fo:page-sequence hyphenate="{$hyphenate}"
-                    master-reference="{$master-reference}">
-    <xsl:attribute name="language">
-      <xsl:call-template name="l10n.language"/>
-    </xsl:attribute>
-    <xsl:attribute name="format">
-      <xsl:call-template name="page.number.format">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="initial-page-number">
-      <xsl:call-template name="initial.page.number">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="force-page-count">
-      <xsl:call-template name="force.page.count">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="hyphenation-character">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-character'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="hyphenation-push-character-count">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-push-character-count'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="hyphenation-remain-character-count">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-remain-character-count'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:apply-templates select="." mode="running.head.mode">
-      <xsl:with-param name="master-reference" select="$master-reference"/>
-    </xsl:apply-templates>
-
-    <xsl:apply-templates select="." mode="running.foot.mode">
-      <xsl:with-param name="master-reference" select="$master-reference"/>
-    </xsl:apply-templates>
-
-    <fo:flow flow-name="xsl-region-body">
-      <xsl:call-template name="set.flow.properties">
-        <xsl:with-param name="element" select="local-name(.)"/>
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-
-      <fo:block id="{$id}"
-                xsl:use-attribute-sets="component.titlepage.properties">
-        <xsl:call-template name="colophon.titlepage"/>
-      </fo:block>
-      <xsl:apply-templates/>
-    </fo:flow>
-  </fo:page-sequence>
-</xsl:template>
-
-<xsl:template match="colophon/title"></xsl:template>
-<xsl:template match="colophon/subtitle"></xsl:template>
-<xsl:template match="colophon/titleabbrev"></xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="preface">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="master-reference">
-    <xsl:call-template name="select.pagemaster"/>
-  </xsl:variable>
-
-  <fo:page-sequence hyphenate="{$hyphenate}"
-                    master-reference="{$master-reference}">
-    <xsl:attribute name="language">
-      <xsl:call-template name="l10n.language"/>
-    </xsl:attribute>
-    <xsl:attribute name="format">
-      <xsl:call-template name="page.number.format">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="initial-page-number">
-      <xsl:call-template name="initial.page.number">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="force-page-count">
-      <xsl:call-template name="force.page.count">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="hyphenation-character">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-character'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="hyphenation-push-character-count">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-push-character-count'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="hyphenation-remain-character-count">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-remain-character-count'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:apply-templates select="." mode="running.head.mode">
-      <xsl:with-param name="master-reference" select="$master-reference"/>
-    </xsl:apply-templates>
-
-    <xsl:apply-templates select="." mode="running.foot.mode">
-      <xsl:with-param name="master-reference" select="$master-reference"/>
-    </xsl:apply-templates>
-
-    <fo:flow flow-name="xsl-region-body">
-      <xsl:call-template name="set.flow.properties">
-        <xsl:with-param name="element" select="local-name(.)"/>
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-
-      <fo:block id="{$id}"
-                xsl:use-attribute-sets="component.titlepage.properties">
-        <xsl:call-template name="preface.titlepage"/>
-      </fo:block>
-
-      <xsl:variable name="toc.params">
-        <xsl:call-template name="find.path.params">
-          <xsl:with-param name="table" 
-                          select="normalize-space($generate.toc)"/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:if test="contains($toc.params, 'toc')">
-        <xsl:call-template name="component.toc">
-          <xsl:with-param name="toc.title.p" 
-                          select="contains($toc.params, 'title')"/>
-        </xsl:call-template>
-        <xsl:call-template name="component.toc.separator"/>
-      </xsl:if>
-
-      <xsl:apply-templates/>
-    </fo:flow>
-  </fo:page-sequence>
-</xsl:template>
-
-<xsl:template match="preface/docinfo|prefaceinfo"></xsl:template>
-<xsl:template match="preface/info"></xsl:template>
-<xsl:template match="preface/title"></xsl:template>
-<xsl:template match="preface/titleabbrev"></xsl:template>
-<xsl:template match="preface/subtitle"></xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="chapter">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="master-reference">
-    <xsl:call-template name="select.pagemaster"/>
-  </xsl:variable>
-
-  <fo:page-sequence hyphenate="{$hyphenate}"
-                    master-reference="{$master-reference}">
-    <xsl:attribute name="language">
-      <xsl:call-template name="l10n.language"/>
-    </xsl:attribute>
-    <xsl:attribute name="format">
-      <xsl:call-template name="page.number.format">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="initial-page-number">
-      <xsl:call-template name="initial.page.number">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="force-page-count">
-      <xsl:call-template name="force.page.count">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="hyphenation-character">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-character'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="hyphenation-push-character-count">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-push-character-count'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="hyphenation-remain-character-count">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-remain-character-count'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:apply-templates select="." mode="running.head.mode">
-      <xsl:with-param name="master-reference" select="$master-reference"/>
-    </xsl:apply-templates>
-
-    <xsl:apply-templates select="." mode="running.foot.mode">
-      <xsl:with-param name="master-reference" select="$master-reference"/>
-    </xsl:apply-templates>
-
-    <fo:flow flow-name="xsl-region-body">
-      <xsl:call-template name="set.flow.properties">
-        <xsl:with-param name="element" select="local-name(.)"/>
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-
-      <fo:block id="{$id}"
-                xsl:use-attribute-sets="component.titlepage.properties">
-        <xsl:call-template name="chapter.titlepage"/>
-      </fo:block>
-
-      <xsl:variable name="toc.params">
-        <xsl:call-template name="find.path.params">
-          <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:if test="contains($toc.params, 'toc')">
-        <xsl:call-template name="component.toc">
-          <xsl:with-param name="toc.title.p" 
-                          select="contains($toc.params, 'title')"/>
-        </xsl:call-template>
-        <xsl:call-template name="component.toc.separator"/>
-      </xsl:if>
-      <xsl:apply-templates/>
-    </fo:flow>
-  </fo:page-sequence>
-</xsl:template>
-
-<xsl:template match="chapter/docinfo|chapterinfo"></xsl:template>
-<xsl:template match="chapter/info"></xsl:template>
-<xsl:template match="chapter/title"></xsl:template>
-<xsl:template match="chapter/titleabbrev"></xsl:template>
-<xsl:template match="chapter/subtitle"></xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="appendix">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="master-reference">
-    <xsl:call-template name="select.pagemaster"/>
-  </xsl:variable>
-
-  <fo:page-sequence hyphenate="{$hyphenate}"
-                    master-reference="{$master-reference}">
-    <xsl:attribute name="language">
-      <xsl:call-template name="l10n.language"/>
-    </xsl:attribute>
-    <xsl:attribute name="format">
-      <xsl:call-template name="page.number.format">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="initial-page-number">
-      <xsl:call-template name="initial.page.number">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="force-page-count">
-      <xsl:call-template name="force.page.count">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="hyphenation-character">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-character'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="hyphenation-push-character-count">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-push-character-count'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="hyphenation-remain-character-count">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-remain-character-count'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:apply-templates select="." mode="running.head.mode">
-      <xsl:with-param name="master-reference" select="$master-reference"/>
-    </xsl:apply-templates>
-
-    <xsl:apply-templates select="." mode="running.foot.mode">
-      <xsl:with-param name="master-reference" select="$master-reference"/>
-    </xsl:apply-templates>
-
-    <fo:flow flow-name="xsl-region-body">
-      <xsl:call-template name="set.flow.properties">
-        <xsl:with-param name="element" select="local-name(.)"/>
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-
-      <fo:block id="{$id}"
-                xsl:use-attribute-sets="component.titlepage.properties">
-        <xsl:call-template name="appendix.titlepage"/>
-      </fo:block>
-
-      <xsl:variable name="toc.params">
-        <xsl:call-template name="find.path.params">
-          <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <xsl:if test="contains($toc.params, 'toc')">
-        <xsl:call-template name="component.toc">
-          <xsl:with-param name="toc.title.p" 
-                          select="contains($toc.params, 'title')"/>
-        </xsl:call-template>
-        <xsl:call-template name="component.toc.separator"/>
-      </xsl:if>
-      <xsl:apply-templates/>
-    </fo:flow>
-  </fo:page-sequence>
-</xsl:template>
-
-<xsl:template match="appendix/docinfo|appendixinfo"></xsl:template>
-<xsl:template match="appendix/info"></xsl:template>
-<xsl:template match="appendix/title"></xsl:template>
-<xsl:template match="appendix/titleabbrev"></xsl:template>
-<xsl:template match="appendix/subtitle"></xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="article">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="master-reference">
-    <xsl:call-template name="select.pagemaster"/>
-  </xsl:variable>
-
-  <fo:page-sequence hyphenate="{$hyphenate}"
-                    master-reference="{$master-reference}">
-    <xsl:attribute name="language">
-      <xsl:call-template name="l10n.language"/>
-    </xsl:attribute>
-    <xsl:attribute name="format">
-      <xsl:call-template name="page.number.format">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="initial-page-number">
-      <xsl:call-template name="initial.page.number">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="force-page-count">
-      <xsl:call-template name="force.page.count">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="hyphenation-character">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-character'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="hyphenation-push-character-count">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-push-character-count'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="hyphenation-remain-character-count">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-remain-character-count'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:apply-templates select="." mode="running.head.mode">
-      <xsl:with-param name="master-reference" select="$master-reference"/>
-    </xsl:apply-templates>
-
-    <xsl:apply-templates select="." mode="running.foot.mode">
-      <xsl:with-param name="master-reference" select="$master-reference"/>
-    </xsl:apply-templates>
-
-    <fo:flow flow-name="xsl-region-body">
-      <xsl:call-template name="set.flow.properties">
-        <xsl:with-param name="element" select="local-name(.)"/>
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-
-      <fo:block id="{$id}"
-                xsl:use-attribute-sets="component.titlepage.properties">
-        <xsl:call-template name="article.titlepage"/>
-      </fo:block>
-
-      <xsl:variable name="toc.params">
-        <xsl:call-template name="find.path.params">
-          <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <xsl:if test="contains($toc.params, 'toc')">
-        <xsl:call-template name="component.toc">
-          <xsl:with-param name="toc.title.p" 
-                          select="contains($toc.params, 'title')"/>
-        </xsl:call-template>
-        <xsl:call-template name="component.toc.separator"/>
-      </xsl:if>
-      <xsl:apply-templates/>
-    </fo:flow>
-  </fo:page-sequence>
-</xsl:template>
-
-<xsl:template match="article/artheader"></xsl:template>
-<xsl:template match="article/articleinfo"></xsl:template>
-<xsl:template match="article/info"></xsl:template>
-<xsl:template match="article/title"></xsl:template>
-<xsl:template match="article/subtitle"></xsl:template>
-<xsl:template match="article/titleabbrev"></xsl:template>
-
-<xsl:template match="article/appendix">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="title">
-    <xsl:apply-templates select="." mode="object.title.markup"/>
-  </xsl:variable>
-
-  <xsl:variable name="titleabbrev">
-    <xsl:apply-templates select="." mode="titleabbrev.markup"/>
-  </xsl:variable>
-
-  <fo:block id='{$id}'>
-    <xsl:if test="$axf.extensions != 0">
-      <xsl:attribute name="axf:outline-level">
-        <xsl:value-of select="count(ancestor::*)+2"/>
-      </xsl:attribute>
-      <xsl:attribute name="axf:outline-expand">false</xsl:attribute>
-      <xsl:attribute name="axf:outline-title">
-        <xsl:value-of select="normalize-space($titleabbrev)"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <xsl:if test="$passivetex.extensions != 0">
-      <fotex:bookmark xmlns:fotex="http://www.tug.org/fotex" 
-                      fotex-bookmark-level="{count(ancestor::*)+2}" 
-                      fotex-bookmark-label="{$id}">
-        <xsl:value-of select="$titleabbrev"/>
-      </fotex:bookmark>
-    </xsl:if>
-
-    <fo:block xsl:use-attribute-sets="article.appendix.title.properties">
-      <fo:marker marker-class-name="section.head.marker">
-        <xsl:choose>
-          <xsl:when test="$titleabbrev = ''">
-            <xsl:value-of select="$title"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="$titleabbrev"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </fo:marker>
-      <xsl:copy-of select="$title"/>
-    </fo:block>
-
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<!-- Utility template to create a page sequence for an element -->
-<xsl:template match="*" mode="page.sequence" name="page.sequence">
-  <xsl:param name="content">
-    <xsl:apply-templates/>
-  </xsl:param>
-  <xsl:param name="master-reference">
-    <xsl:call-template name="select.pagemaster"/>
-  </xsl:param>
-  <xsl:param name="element" select="local-name(.)"/>
-  <xsl:param name="gentext-key" select="local-name(.)"/>
-  <xsl:param name="language">
-    <xsl:call-template name="l10n.language"/>
-  </xsl:param>
-
-  <xsl:param name="format">
-    <xsl:call-template name="page.number.format">
-      <xsl:with-param name="master-reference" select="$master-reference"/>
-      <xsl:with-param name="element" select="$element"/>
-    </xsl:call-template>
-  </xsl:param>
-
-  <xsl:param name="initial-page-number">
-    <xsl:call-template name="initial.page.number">
-      <xsl:with-param name="master-reference" select="$master-reference"/>
-      <xsl:with-param name="element" select="$element"/>
-    </xsl:call-template>
-  </xsl:param>
-
-  <xsl:param name="force-page-count">
-    <xsl:call-template name="force.page.count">
-      <xsl:with-param name="master-reference" select="$master-reference"/>
-      <xsl:with-param name="element" select="$element"/>
-    </xsl:call-template>
-  </xsl:param>
-
-  <fo:page-sequence hyphenate="{$hyphenate}"
-                    master-reference="{$master-reference}">
-    <xsl:attribute name="language">
-      <xsl:value-of select="$language"/>
-    </xsl:attribute>
-    <xsl:attribute name="format">
-      <xsl:value-of select="$format"/>
-    </xsl:attribute>
-
-    <xsl:attribute name="initial-page-number">
-      <xsl:value-of select="$initial-page-number"/>
-    </xsl:attribute>
-
-    <xsl:attribute name="force-page-count">
-      <xsl:value-of select="$force-page-count"/>
-    </xsl:attribute>
-
-    <xsl:attribute name="hyphenation-character">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-character'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="hyphenation-push-character-count">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-push-character-count'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="hyphenation-remain-character-count">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-remain-character-count'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:apply-templates select="." mode="running.head.mode">
-      <xsl:with-param name="master-reference" select="$master-reference"/>
-      <xsl:with-param name="gentext-key" select="$gentext-key"/>
-    </xsl:apply-templates>
-
-    <xsl:apply-templates select="." mode="running.foot.mode">
-      <xsl:with-param name="master-reference" select="$master-reference"/>
-      <xsl:with-param name="gentext-key" select="$gentext-key"/>
-    </xsl:apply-templates>
-
-    <fo:flow flow-name="xsl-region-body">
-      <xsl:call-template name="set.flow.properties">
-        <xsl:with-param name="element" select="local-name(.)"/>
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-
-      <xsl:copy-of select="$content"/>
-
-    </fo:flow>
-  </fo:page-sequence>
-</xsl:template>
-
-</xsl:stylesheet>
-
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/division.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/division.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,611 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                xmlns:axf="http://www.antennahouse.com/names/XSL/Extensions"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:template name="division.title">
-  <xsl:param name="node" select="."/>
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="$node"/>
-    </xsl:call-template>
-  </xsl:variable>
-  <xsl:variable name="title">
-    <xsl:apply-templates select="$node" mode="object.title.markup"/>
-  </xsl:variable>
-
-  <xsl:if test="$passivetex.extensions != 0">
-    <fotex:bookmark xmlns:fotex="http://www.tug.org/fotex"
-                    fotex-bookmark-level="1"
-                    fotex-bookmark-label="{$id}">
-      <xsl:value-of select="$title"/>
-    </fotex:bookmark>
-  </xsl:if>
-
-  <fo:block keep-with-next.within-column="always"
-            hyphenate="false">
-    <xsl:if test="$axf.extensions != 0">
-      <xsl:attribute name="axf:outline-level">
-        <xsl:choose>
-          <xsl:when test="count($node/ancestor::*) > 0">
-            <xsl:value-of select="count($node/ancestor::*)"/>
-          </xsl:when>
-          <xsl:otherwise>1</xsl:otherwise>
-        </xsl:choose>
-      </xsl:attribute>
-      <xsl:attribute name="axf:outline-expand">false</xsl:attribute>
-      <xsl:attribute name="axf:outline-title">
-        <xsl:value-of select="normalize-space($title)"/>
-      </xsl:attribute>
-    </xsl:if>
-    <xsl:copy-of select="$title"/>
-  </fo:block>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="set">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="preamble"
-                select="*[not(self::book or self::setindex)]"/>
-
-  <xsl:variable name="content" select="book|setindex"/>
-
-  <xsl:variable name="titlepage-master-reference">
-    <xsl:call-template name="select.pagemaster">
-      <xsl:with-param name="pageclass" select="'titlepage'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="lot-master-reference">
-    <xsl:call-template name="select.pagemaster">
-      <xsl:with-param name="pageclass" select="'lot'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:if test="$preamble">
-    <fo:page-sequence hyphenate="{$hyphenate}"
-                      master-reference="{$titlepage-master-reference}">
-      <xsl:attribute name="language">
-        <xsl:call-template name="l10n.language"/>
-      </xsl:attribute>
-      <xsl:attribute name="format">
-        <xsl:call-template name="page.number.format">
-          <xsl:with-param name="master-reference" 
-                          select="$titlepage-master-reference"/>
-        </xsl:call-template>
-      </xsl:attribute>
-
-      <xsl:attribute name="initial-page-number">
-        <xsl:call-template name="initial.page.number">
-          <xsl:with-param name="master-reference" 
-                          select="$titlepage-master-reference"/>
-        </xsl:call-template>
-      </xsl:attribute>
-
-      <xsl:attribute name="force-page-count">
-        <xsl:call-template name="force.page.count">
-          <xsl:with-param name="master-reference" 
-                          select="$titlepage-master-reference"/>
-        </xsl:call-template>
-      </xsl:attribute>
-
-      <xsl:attribute name="hyphenation-character">
-        <xsl:call-template name="gentext">
-          <xsl:with-param name="key" select="'hyphenation-character'"/>
-        </xsl:call-template>
-      </xsl:attribute>
-      <xsl:attribute name="hyphenation-push-character-count">
-        <xsl:call-template name="gentext">
-          <xsl:with-param name="key" select="'hyphenation-push-character-count'"/>
-        </xsl:call-template>
-      </xsl:attribute>
-      <xsl:attribute name="hyphenation-remain-character-count">
-        <xsl:call-template name="gentext">
-          <xsl:with-param name="key" select="'hyphenation-remain-character-count'"/>
-        </xsl:call-template>
-      </xsl:attribute>
-
-      <xsl:apply-templates select="." mode="running.head.mode">
-        <xsl:with-param name="master-reference" select="$titlepage-master-reference"/>
-      </xsl:apply-templates>
-
-      <xsl:apply-templates select="." mode="running.foot.mode">
-        <xsl:with-param name="master-reference" select="$titlepage-master-reference"/>
-      </xsl:apply-templates>
-
-      <fo:flow flow-name="xsl-region-body">
-        <xsl:call-template name="set.flow.properties">
-          <xsl:with-param name="element" select="local-name(.)"/>
-          <xsl:with-param name="master-reference" 
-                          select="$titlepage-master-reference"/>
-        </xsl:call-template>
-
-        <fo:block id="{$id}">
-          <xsl:call-template name="set.titlepage"/>
-        </fo:block>
-      </fo:flow>
-    </fo:page-sequence>
-  </xsl:if>
-
-  <xsl:variable name="toc.params">
-    <xsl:call-template name="find.path.params">
-      <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:if test="contains($toc.params, 'toc')">
-    <fo:page-sequence hyphenate="{$hyphenate}"
-                      master-reference="{$lot-master-reference}">
-      <xsl:attribute name="language">
-        <xsl:call-template name="l10n.language"/>
-      </xsl:attribute>
-      <xsl:attribute name="format">
-        <xsl:call-template name="page.number.format">
-          <xsl:with-param name="element" select="'toc'"/>
-          <xsl:with-param name="master-reference"
-                          select="$lot-master-reference"/>
-        </xsl:call-template>
-      </xsl:attribute>
-      <xsl:attribute name="initial-page-number">
-        <xsl:call-template name="initial.page.number">
-          <xsl:with-param name="master-reference"
-                          select="$lot-master-reference"/>
-        </xsl:call-template>
-      </xsl:attribute>
-      <xsl:attribute name="force-page-count">
-        <xsl:call-template name="force.page.count">
-          <xsl:with-param name="master-reference"
-                          select="$lot-master-reference"/>
-        </xsl:call-template>
-      </xsl:attribute>
-
-      <xsl:attribute name="hyphenation-character">
-        <xsl:call-template name="gentext">
-          <xsl:with-param name="key" select="'hyphenation-character'"/>
-        </xsl:call-template>
-      </xsl:attribute>
-      <xsl:attribute name="hyphenation-push-character-count">
-        <xsl:call-template name="gentext">
-          <xsl:with-param name="key" select="'hyphenation-push-character-count'"/>
-        </xsl:call-template>
-      </xsl:attribute>
-      <xsl:attribute name="hyphenation-remain-character-count">
-        <xsl:call-template name="gentext">
-          <xsl:with-param name="key" select="'hyphenation-remain-character-count'"/>
-        </xsl:call-template>
-      </xsl:attribute>
-
-      <xsl:apply-templates select="." mode="running.head.mode">
-        <xsl:with-param name="master-reference" select="$lot-master-reference"/>
-      </xsl:apply-templates>
-
-      <xsl:apply-templates select="." mode="running.foot.mode">
-        <xsl:with-param name="master-reference" select="$lot-master-reference"/>
-      </xsl:apply-templates>
-
-      <fo:flow flow-name="xsl-region-body">
-        <xsl:call-template name="set.flow.properties">
-          <xsl:with-param name="element" select="local-name(.)"/>
-          <xsl:with-param name="master-reference" 
-                          select="$lot-master-reference"/>
-        </xsl:call-template>
-
-        <xsl:call-template name="set.toc"/>
-      </fo:flow>
-    </fo:page-sequence>
-  </xsl:if>
-
-  <xsl:apply-templates select="$content"/>
-</xsl:template>
-
-<xsl:template match="set/setinfo"></xsl:template>
-<xsl:template match="set/title"></xsl:template>
-<xsl:template match="set/subtitle"></xsl:template>
-<xsl:template match="set/titleabbrev"></xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="book">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="preamble"
-                select="title|subtitle|titleabbrev|bookinfo|info"/>
-
-  <xsl:variable name="content"
-                select="node()[not(self::title or self::subtitle
-                            or self::titleabbrev
-                            or self::info
-                            or self::bookinfo)]"/>
-
-  <xsl:variable name="titlepage-master-reference">
-    <xsl:call-template name="select.pagemaster">
-      <xsl:with-param name="pageclass" select="'titlepage'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:call-template name="front.cover"/>
-
-  <xsl:if test="$preamble">
-    <xsl:call-template name="page.sequence">
-      <xsl:with-param name="master-reference"
-                      select="$titlepage-master-reference"/>
-      <xsl:with-param name="content">
-        <fo:block id="{$id}">
-          <xsl:call-template name="book.titlepage"/>
-        </fo:block>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:if>
-
-  <xsl:apply-templates select="dedication" mode="dedication"/>
-
-  <xsl:call-template name="make.book.tocs"/>
-
-  <xsl:apply-templates select="$content"/>
-
-  <xsl:call-template name="back.cover"/>
-
-</xsl:template>
-
-<xsl:template match="book/bookinfo"></xsl:template>
-<xsl:template match="book/info"></xsl:template>
-<xsl:template match="book/title"></xsl:template>
-<xsl:template match="book/subtitle"></xsl:template>
-<xsl:template match="book/titleabbrev"></xsl:template>
-
-<!-- Placeholder templates -->
-<xsl:template name="front.cover"/>
-<xsl:template name="back.cover"/>
-
-<!-- ================================================================= -->
-<xsl:template name="make.book.tocs">
-
-  <xsl:variable name="lot-master-reference">
-    <xsl:call-template name="select.pagemaster">
-      <xsl:with-param name="pageclass" select="'lot'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="toc.params">
-    <xsl:call-template name="find.path.params">
-      <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:if test="contains($toc.params, 'toc')">
-    <xsl:call-template name="page.sequence">
-      <xsl:with-param name="master-reference"
-                      select="$lot-master-reference"/>
-      <xsl:with-param name="element" select="'toc'"/>
-      <xsl:with-param name="gentext-key" select="'TableofContents'"/>
-      <xsl:with-param name="content">
-        <xsl:call-template name="division.toc">
-          <xsl:with-param name="toc.title.p" 
-                          select="contains($toc.params, 'title')"/>
-        </xsl:call-template>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:if>
-
-  <xsl:if test="contains($toc.params,'figure') and .//figure">
-    <xsl:call-template name="page.sequence">
-      <xsl:with-param name="master-reference"
-                      select="$lot-master-reference"/>
-      <xsl:with-param name="element" select="'toc'"/>
-      <xsl:with-param name="gentext-key" select="'ListofFigures'"/>
-      <xsl:with-param name="content">
-        <xsl:call-template name="list.of.titles">
-          <xsl:with-param name="titles" select="'figure'"/>
-          <xsl:with-param name="nodes" select=".//figure"/>
-        </xsl:call-template>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:if>
-
-  <xsl:if test="contains($toc.params,'table') and .//table">
-    <xsl:call-template name="page.sequence">
-      <xsl:with-param name="master-reference"
-                      select="$lot-master-reference"/>
-      <xsl:with-param name="element" select="'toc'"/>
-      <xsl:with-param name="gentext-key" select="'ListofTables'"/>
-      <xsl:with-param name="content">
-        <xsl:call-template name="list.of.titles">
-          <xsl:with-param name="titles" select="'table'"/>
-          <xsl:with-param name="nodes" select=".//table"/>
-        </xsl:call-template>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:if>
-
-  <xsl:if test="contains($toc.params,'example') and .//example">
-    <xsl:call-template name="page.sequence">
-      <xsl:with-param name="master-reference"
-                      select="$lot-master-reference"/>
-      <xsl:with-param name="element" select="'toc'"/>
-      <xsl:with-param name="gentext-key" select="'ListofExample'"/>
-      <xsl:with-param name="content">
-        <xsl:call-template name="list.of.titles">
-          <xsl:with-param name="titles" select="'example'"/>
-          <xsl:with-param name="nodes" select=".//example"/>
-        </xsl:call-template>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:if>
-
-  <xsl:if test="contains($toc.params,'equation') and 
-                 .//equation[title or info/title]">
-    <xsl:call-template name="page.sequence">
-      <xsl:with-param name="master-reference"
-                      select="$lot-master-reference"/>
-      <xsl:with-param name="element" select="'toc'"/>
-      <xsl:with-param name="gentext-key" select="'ListofEquations'"/>
-      <xsl:with-param name="content">
-        <xsl:call-template name="list.of.titles">
-          <xsl:with-param name="titles" select="'equation'"/>
-          <xsl:with-param name="nodes" 
-                          select=".//equation[title or info/title]"/>
-        </xsl:call-template>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:if>
-
-  <xsl:if test="contains($toc.params,'procedure') and 
-                 .//procedure[title or info/title]">
-    <xsl:call-template name="page.sequence">
-      <xsl:with-param name="master-reference"
-                      select="$lot-master-reference"/>
-      <xsl:with-param name="element" select="'toc'"/>
-      <xsl:with-param name="gentext-key" select="'ListofProcedures'"/>
-      <xsl:with-param name="content">
-        <xsl:call-template name="list.of.titles">
-          <xsl:with-param name="titles" select="'procedure'"/>
-          <xsl:with-param name="nodes" 
-                          select=".//procedure[title or info/title]"/>
-        </xsl:call-template>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:if>
-</xsl:template>
-<!-- ==================================================================== -->
-
-<xsl:template match="part">
-  <xsl:if test="not(partintro)">
-    <xsl:apply-templates select="." mode="part.titlepage.mode"/>
-    <xsl:call-template name="generate.part.toc"/>
-  </xsl:if>
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="part" mode="part.titlepage.mode">
-  <!-- done this way to force the context node to be the part -->
-  <xsl:param name="additional.content"/>
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="titlepage-master-reference">
-    <xsl:call-template name="select.pagemaster">
-      <xsl:with-param name="pageclass" select="'titlepage'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <fo:page-sequence hyphenate="{$hyphenate}"
-                    master-reference="{$titlepage-master-reference}">
-    <xsl:attribute name="language">
-      <xsl:call-template name="l10n.language"/>
-    </xsl:attribute>
-    <xsl:attribute name="format">
-      <xsl:call-template name="page.number.format">
-        <xsl:with-param name="master-reference" 
-                        select="$titlepage-master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="initial-page-number">
-      <xsl:call-template name="initial.page.number">
-        <xsl:with-param name="master-reference" 
-                        select="$titlepage-master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="force-page-count">
-      <xsl:call-template name="force.page.count">
-        <xsl:with-param name="master-reference" 
-                        select="$titlepage-master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="hyphenation-character">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-character'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="hyphenation-push-character-count">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-push-character-count'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="hyphenation-remain-character-count">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-remain-character-count'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:apply-templates select="." mode="running.head.mode">
-      <xsl:with-param name="master-reference" select="$titlepage-master-reference"/>
-    </xsl:apply-templates>
-
-    <xsl:apply-templates select="." mode="running.foot.mode">
-      <xsl:with-param name="master-reference" select="$titlepage-master-reference"/>
-    </xsl:apply-templates>
-
-    <fo:flow flow-name="xsl-region-body">
-      <xsl:call-template name="set.flow.properties">
-        <xsl:with-param name="element" select="local-name(.)"/>
-        <xsl:with-param name="master-reference" 
-                        select="$titlepage-master-reference"/>
-      </xsl:call-template>
-
-      <fo:block id="{$id}">
-        <xsl:call-template name="part.titlepage"/>
-      </fo:block>
-      <xsl:copy-of select="$additional.content"/>
-    </fo:flow>
-  </fo:page-sequence>
-</xsl:template>
-
-<xsl:template match="part/docinfo|partinfo"></xsl:template>
-<xsl:template match="part/info"></xsl:template>
-<xsl:template match="part/title"></xsl:template>
-<xsl:template match="part/subtitle"></xsl:template>
-<xsl:template match="part/titleabbrev"></xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="generate.part.toc">
-  <xsl:param name="part" select="."/>
-
-  <xsl:variable name="lot-master-reference">
-    <xsl:call-template name="select.pagemaster">
-      <xsl:with-param name="pageclass" select="'lot'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="toc.params">
-    <xsl:call-template name="find.path.params">
-      <xsl:with-param name="node" select="$part"/>
-      <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="nodes" select="reference|
-                                     preface|
-                                     chapter|
-                                     appendix|
-                                     article|
-                                     bibliography|
-                                     glossary|
-                                     index"/>
-
-  <xsl:if test="count($nodes) &gt; 0 and contains($toc.params, 'toc')">
-    <fo:page-sequence hyphenate="{$hyphenate}"
-                      master-reference="{$lot-master-reference}">
-      <xsl:attribute name="language">
-        <xsl:call-template name="l10n.language"/>
-      </xsl:attribute>
-      <xsl:attribute name="format">
-        <xsl:call-template name="page.number.format">
-          <xsl:with-param name="element" select="'toc'"/>
-          <xsl:with-param name="master-reference" 
-                          select="$lot-master-reference"/>
-        </xsl:call-template>
-      </xsl:attribute>
-      <xsl:attribute name="initial-page-number">
-        <xsl:call-template name="initial.page.number">
-          <xsl:with-param name="element" select="'toc'"/>
-          <xsl:with-param name="master-reference" 
-                          select="$lot-master-reference"/>
-         </xsl:call-template>
-      </xsl:attribute>
-      <xsl:attribute name="force-page-count">
-        <xsl:call-template name="force.page.count">
-          <xsl:with-param name="master-reference" 
-                          select="$lot-master-reference"/>
-        </xsl:call-template>
-      </xsl:attribute>
-
-      <xsl:attribute name="hyphenation-character">
-        <xsl:call-template name="gentext">
-          <xsl:with-param name="key" select="'hyphenation-character'"/>
-        </xsl:call-template>
-      </xsl:attribute>
-      <xsl:attribute name="hyphenation-push-character-count">
-        <xsl:call-template name="gentext">
-          <xsl:with-param name="key" select="'hyphenation-push-character-count'"/>
-        </xsl:call-template>
-      </xsl:attribute>
-      <xsl:attribute name="hyphenation-remain-character-count">
-        <xsl:call-template name="gentext">
-          <xsl:with-param name="key" select="'hyphenation-remain-character-count'"/>
-        </xsl:call-template>
-      </xsl:attribute>
-
-      <xsl:apply-templates select="$part" mode="running.head.mode">
-        <xsl:with-param name="master-reference" select="$lot-master-reference"/>
-      </xsl:apply-templates>
-
-      <xsl:apply-templates select="$part" mode="running.foot.mode">
-        <xsl:with-param name="master-reference" select="$lot-master-reference"/>
-      </xsl:apply-templates>
-
-      <fo:flow flow-name="xsl-region-body">
-        <xsl:call-template name="set.flow.properties">
-          <xsl:with-param name="element" select="local-name(.)"/>
-          <xsl:with-param name="master-reference" 
-                          select="$lot-master-reference"/>
-        </xsl:call-template>
-
-        <xsl:call-template name="division.toc">
-          <xsl:with-param name="toc-context" select="$part"/>
-          <xsl:with-param name="toc.title.p" 
-                          select="contains($toc.params, 'title')"/>
-        </xsl:call-template>
-
-      </fo:flow>
-    </fo:page-sequence>
-  </xsl:if>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="part/partintro">
-  <xsl:apply-templates select=".." mode="part.titlepage.mode">
-    <xsl:with-param name="additional.content">
-      <xsl:if test="title">
-        <xsl:call-template name="partintro.titlepage"/>
-      </xsl:if>
-      <xsl:apply-templates/>
-    </xsl:with-param>
-  </xsl:apply-templates>
-
-  <xsl:call-template name="generate.part.toc">
-    <xsl:with-param name="part" select=".."/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="partintro/title"></xsl:template>
-<xsl:template match="partintro/subtitle"></xsl:template>
-<xsl:template match="partintro/titleabbrev"></xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="book" mode="division.number">
-  <xsl:number from="set" count="book" format="1."/>
-</xsl:template>
-
-<xsl:template match="part" mode="division.number">
-  <xsl:number from="book" count="part" format="I."/>
-</xsl:template>
-
-</xsl:stylesheet>
-
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/docbook.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/docbook.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,331 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:exsl="http://exslt.org/common"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                xmlns:ng="http://docbook.org/docbook-ng"
-                xmlns:db="http://docbook.org/ns/docbook"
-                exclude-result-prefixes="db ng exsl"
-                version='1.0'>
-
-<!-- It is important to use indent="no" here, otherwise verbatim -->
-<!-- environments get broken by indented tags...at least when the -->
-<!-- callout extension is used...at least with some processors -->
-<xsl:output method="xml" indent="no"/>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:include href="../VERSION"/>
-<xsl:include href="param.xsl"/>
-<xsl:include href="../lib/lib.xsl"/>
-<xsl:include href="../common/l10n.xsl"/>
-<xsl:include href="../common/common.xsl"/>
-<xsl:include href="../common/utility.xsl"/>
-<xsl:include href="../common/labels.xsl"/>
-<xsl:include href="../common/titles.xsl"/>
-<xsl:include href="../common/subtitles.xsl"/>
-<xsl:include href="../common/gentext.xsl"/>
-<xsl:include href="../common/olink.xsl"/>
-<xsl:include href="../common/targets.xsl"/>
-<xsl:include href="../common/pi.xsl"/>
-<xsl:include href="autotoc.xsl"/>
-<xsl:include href="autoidx.xsl"/>
-<xsl:include href="lists.xsl"/>
-<xsl:include href="callout.xsl"/>
-<xsl:include href="verbatim.xsl"/>
-<xsl:include href="graphics.xsl"/>
-<xsl:include href="xref.xsl"/>
-<xsl:include href="formal.xsl"/>
-<xsl:include href="table.xsl"/>
-<xsl:include href="htmltbl.xsl"/>
-<xsl:include href="sections.xsl"/>
-<xsl:include href="inline.xsl"/>
-<xsl:include href="footnote.xsl"/>
-<xsl:include href="fo.xsl"/>
-<xsl:include href="fo-rtf.xsl"/>
-<xsl:include href="info.xsl"/>
-<xsl:include href="keywords.xsl"/>
-<xsl:include href="division.xsl"/>
-<xsl:include href="index.xsl"/>
-<xsl:include href="toc.xsl"/>
-<xsl:include href="refentry.xsl"/>
-<xsl:include href="math.xsl"/>
-<xsl:include href="admon.xsl"/>
-<xsl:include href="component.xsl"/>
-<xsl:include href="biblio.xsl"/>
-<xsl:include href="biblio-iso690.xsl"/>
-<xsl:include href="glossary.xsl"/>
-<xsl:include href="block.xsl"/>
-<xsl:include href="task.xsl"/>
-<xsl:include href="qandaset.xsl"/>
-<xsl:include href="synop.xsl"/>
-<xsl:include href="titlepage.xsl"/>
-<xsl:include href="titlepage.templates.xsl"/>
-<xsl:include href="pagesetup.xsl"/>
-<xsl:include href="pi.xsl"/>
-<xsl:include href="spaces.xsl"/>
-<xsl:include href="ebnf.xsl"/>
-<xsl:include href="../html/chunker.xsl"/>
-<xsl:include href="annotations.xsl"/>
-<xsl:include href="../common/stripns.xsl"/>
-
-<xsl:include href="fop.xsl"/>
-<xsl:include href="fop1.xsl"/>
-<xsl:include href="passivetex.xsl"/>
-<xsl:include href="xep.xsl"/>
-<xsl:include href="axf.xsl"/>
-<xsl:include href="ptc.xsl"/>
-
-<xsl:param name="stylesheet.result.type" select="'fo'"/>
-
-<!-- ==================================================================== -->
-
-<xsl:key name="id" match="*" use="@id|@xml:id"/>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="*">
-  <xsl:message>
-    <xsl:value-of select="name(.)"/>
-    <xsl:text> encountered</xsl:text>
-    <xsl:if test="parent::*">
-      <xsl:text> in </xsl:text>
-      <xsl:value-of select="name(parent::*)"/>
-    </xsl:if>
-    <xsl:text>, but no template matches.</xsl:text>
-  </xsl:message>
-  <fo:block color="red">
-    <xsl:text>&lt;</xsl:text>
-    <xsl:value-of select="name(.)"/>
-    <xsl:text>&gt;</xsl:text>
-    <xsl:apply-templates/> 
-    <xsl:text>&lt;/</xsl:text>
-    <xsl:value-of select="name(.)"/>
-    <xsl:text>&gt;</xsl:text>
-  </fo:block>
-</xsl:template>
-
-<!-- Update this list if new root elements supported -->
-<xsl:variable name="root.elements" select="' appendix article bibliography book chapter colophon dedication glossary index part preface qandaset refentry reference sect1 section set setindex '"/>
-
-<xsl:template match="/">
-  <!-- * Get a title for current doc so that we let the user -->
-  <!-- * know what document we are processing at this point. -->
-  <xsl:variable name="doc.title">
-    <xsl:call-template name="get.doc.title"/>
-  </xsl:variable>
-  <xsl:choose>
-    <!-- Hack! If someone hands us a DocBook V5.x or DocBook NG document,
-         toss the namespace and continue.  Use the docbook5 namespaced
-         stylesheets for DocBook5 if you don't want to use this feature.-->
-    <!-- include extra test for Xalan quirk -->
-    <xsl:when test="(function-available('exsl:node-set') or
-                     contains(system-property('xsl:vendor'),
-                       'Apache Software Foundation'))
-                    and (*/self::ng:* or */self::db:*)">
-      <xsl:call-template name="log.message">
-        <xsl:with-param name="level">Note</xsl:with-param>
-        <xsl:with-param name="source" select="$doc.title"/>
-        <xsl:with-param name="context-desc">
-          <xsl:text>namesp. cut</xsl:text>
-        </xsl:with-param>
-        <xsl:with-param name="message">
-          <xsl:text>stripped namespace before processing</xsl:text>
-        </xsl:with-param>
-      </xsl:call-template>
-      <xsl:variable name="nons">
-        <xsl:apply-templates mode="stripNS"/>
-      </xsl:variable>
-      <xsl:call-template name="log.message">
-        <xsl:with-param name="level">Note</xsl:with-param>
-        <xsl:with-param name="source" select="$doc.title"/>
-        <xsl:with-param name="context-desc">
-          <xsl:text>namesp. cut</xsl:text>
-        </xsl:with-param>
-        <xsl:with-param name="message">
-          <xsl:text>processing stripped document</xsl:text>
-        </xsl:with-param>
-      </xsl:call-template>
-      <xsl:apply-templates select="exsl:node-set($nons)"/>
-    </xsl:when>
-    <!-- Can't process unless namespace removed -->
-    <xsl:when test="*/self::ng:* or */self::db:*">
-      <xsl:message terminate="yes">
-        <xsl:text>Unable to strip the namespace from DB5 document,</xsl:text>
-        <xsl:text> cannot proceed.</xsl:text>
-      </xsl:message>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:choose>
-        <xsl:when test="$rootid != ''">
-          <xsl:variable name="root.element" select="key('id', $rootid)"/>
-          <xsl:choose>
-            <xsl:when test="count($root.element) = 0">
-              <xsl:message terminate="yes">
-                <xsl:text>ID '</xsl:text>
-                <xsl:value-of select="$rootid"/>
-                <xsl:text>' not found in document.</xsl:text>
-              </xsl:message>
-            </xsl:when>
-            <xsl:when test="not(contains($root.elements, concat(' ', local-name($root.element), ' ')))">
-              <xsl:message terminate="yes">
-                <xsl:text>ERROR: Document root element ($rootid=</xsl:text>
-                <xsl:value-of select="$rootid"/>
-                <xsl:text>) for FO output </xsl:text>
-                <xsl:text>must be one of the following elements:</xsl:text>
-                <xsl:value-of select="$root.elements"/>
-              </xsl:message>
-            </xsl:when>
-            <!-- Otherwise proceed -->
-            <xsl:otherwise>
-              <xsl:if test="$collect.xref.targets = 'yes' or
-                            $collect.xref.targets = 'only'">
-                <xsl:apply-templates select="$root.element"
-                                     mode="collect.targets"/>
-              </xsl:if>
-              <xsl:if test="$collect.xref.targets != 'only'">
-                <xsl:apply-templates select="$root.element"
-                                     mode="process.root"/>
-              </xsl:if>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:when>
-        <!-- Otherwise process the document root element -->
-        <xsl:otherwise>
-          <xsl:variable name="document.element" select="*[1]"/>
-          <xsl:choose>
-            <xsl:when test="not(contains($root.elements,
-                     concat(' ', local-name($document.element), ' ')))">
-              <xsl:message terminate="yes">
-                <xsl:text>ERROR: Document root element for FO output </xsl:text>
-                <xsl:text>must be one of the following elements:</xsl:text>
-                <xsl:value-of select="$root.elements"/>
-              </xsl:message>
-            </xsl:when>
-            <!-- Otherwise proceed -->
-            <xsl:otherwise>
-              <xsl:if test="$collect.xref.targets = 'yes' or
-                            $collect.xref.targets = 'only'">
-                <xsl:apply-templates select="/"
-                                     mode="collect.targets"/>
-              </xsl:if>
-              <xsl:if test="$collect.xref.targets != 'only'">
-                <xsl:apply-templates select="/"
-                                     mode="process.root"/>
-              </xsl:if>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="*" mode="process.root">
-  <xsl:variable name="document.element" select="self::*"/>
-
-  <xsl:call-template name="root.messages"/>
-
-  <xsl:variable name="title">
-    <xsl:choose>
-      <xsl:when test="$document.element/title[1]">
-        <xsl:value-of select="$document.element/title[1]"/>
-      </xsl:when>
-      <xsl:otherwise>[could not find document title]</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-  
-  <!-- Include all id values in XEP output -->
-  <xsl:if test="$xep.extensions != 0">
-    <xsl:processing-instruction 
-     name="xep-pdf-drop-unused-destinations">false</xsl:processing-instruction>
-  </xsl:if>
-
-  <fo:root xsl:use-attribute-sets="root.properties">
-    <xsl:attribute name="language">
-      <xsl:call-template name="l10n.language">
-        <xsl:with-param name="target" select="/*[1]"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:if test="$xep.extensions != 0">
-      <xsl:call-template name="xep-pis"/>
-      <xsl:call-template name="xep-document-information"/>
-    </xsl:if>
-    <xsl:if test="$axf.extensions != 0">
-      <xsl:call-template name="axf-document-information"/>
-    </xsl:if>
-
-    <xsl:call-template name="setup.pagemasters"/>
-
-    <xsl:if test="$fop.extensions != 0">
-      <xsl:apply-templates select="$document.element" mode="fop.outline"/>
-    </xsl:if>
-
-    <xsl:if test="$fop1.extensions != 0">
-      <xsl:variable name="bookmarks">
-        <xsl:apply-templates select="$document.element" 
-                             mode="fop1.outline"/>
-      </xsl:variable>
-      <xsl:if test="string($bookmarks) != ''">
-        <fo:bookmark-tree>
-          <xsl:copy-of select="$bookmarks"/>
-        </fo:bookmark-tree>
-      </xsl:if>
-    </xsl:if>
-
-    <xsl:if test="$xep.extensions != 0">
-      <xsl:variable name="bookmarks">
-        <xsl:apply-templates select="$document.element" mode="xep.outline"/>
-      </xsl:variable>
-      <xsl:if test="string($bookmarks) != ''">
-        <rx:outline xmlns:rx="http://www.renderx.com/XSL/Extensions">
-          <xsl:copy-of select="$bookmarks"/>
-        </rx:outline>
-      </xsl:if>
-    </xsl:if>
-
-    <xsl:if test="$arbortext.extensions != 0 and $ati.xsl11.bookmarks != 0">
-      <xsl:variable name="bookmarks">
-        <xsl:apply-templates select="$document.element"
-                             mode="ati.xsl11.bookmarks"/>
-      </xsl:variable>
-      <xsl:if test="string($bookmarks) != ''">
-        <fo:bookmark-tree>
-          <xsl:copy-of select="$bookmarks"/>
-        </fo:bookmark-tree>
-      </xsl:if>
-    </xsl:if>
-
-    <xsl:apply-templates select="$document.element"/>
-  </fo:root>
-</xsl:template>
-
-<xsl:template name="root.messages">
-  <!-- redefine this any way you'd like to output messages -->
-  <!-- DO NOT OUTPUT ANYTHING FROM THIS TEMPLATE -->
-  <xsl:message>
-    <xsl:text>Making </xsl:text>
-    <xsl:value-of select="$page.orientation"/>
-    <xsl:text> pages on </xsl:text>
-    <xsl:value-of select="$paper.type"/>
-    <xsl:text> paper (</xsl:text>
-    <xsl:value-of select="$page.width"/>
-    <xsl:text>x</xsl:text>
-    <xsl:value-of select="$page.height"/>
-    <xsl:text>)</xsl:text>
-  </xsl:message>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/ebnf.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/ebnf.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,325 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"
-                exclude-result-prefixes="doc"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<doc:reference xmlns="">
-<referenceinfo>
-<releaseinfo role="meta">
-$Id$
-</releaseinfo>
-<author><surname>Walsh</surname>
-<firstname>Norman</firstname></author>
-<copyright><year>1999</year><year>2000</year><year>2001</year>
-<holder>Norman Walsh</holder>
-</copyright>
-</referenceinfo>
-<title>HTML EBNF Reference</title>
-
-<partintro>
-<section><title>Introduction</title>
-
-<para>This is technical reference documentation for the DocBook XSL
-Stylesheets; it documents (some of) the parameters, templates, and
-other elements of the stylesheets.</para>
-
-<para>This reference describes the templates and parameters relevant
-to formatting EBNF markup.</para>
-
-<para>This is not intended to be <quote>user</quote> documentation.
-It is provided for developers writing customization layers for the
-stylesheets, and for anyone who's interested in <quote>how it
-works</quote>.</para>
-
-<para>Although I am trying to be thorough, this documentation is known
-to be incomplete. Don't forget to read the source, too :-)</para>
-</section>
-</partintro>
-</doc:reference>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="productionset">
-  <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="title">
-      <fo:block id="{$id}" xsl:use-attribute-sets="formal.object.properties">
-        <xsl:call-template name="formal.object.heading">
-          <xsl:with-param name="placement" select="'before'"/>
-        </xsl:call-template>
-
-        <fo:table table-layout="fixed" width="100%">
-          <fo:table-column column-number="1" column-width="3%"/>
-          <fo:table-column column-number="2" column-width="15%"/>
-          <fo:table-column column-number="3" column-width="5%"/>
-          <fo:table-column column-number="4" column-width="52%"/>
-          <fo:table-column column-number="5" column-width="25%"/>
-          <fo:table-body start-indent="0pt" end-indent="0pt">
-            <xsl:apply-templates select="production|productionrecap"/>
-          </fo:table-body>
-        </fo:table>
-      </fo:block>
-    </xsl:when>
-    <xsl:otherwise>
-      <fo:table id="{$id}" table-layout="fixed" width="100%">
-        <fo:table-column column-number="1" column-width="3%"/>
-        <fo:table-column column-number="2" column-width="15%"/>
-        <fo:table-column column-number="3" column-width="5%"/>
-        <fo:table-column column-number="4" column-width="52%"/>
-        <fo:table-column column-number="5" column-width="25%"/>
-        <fo:table-body start-indent="0pt" end-indent="0pt">
-          <xsl:apply-templates select="production|productionrecap"/>
-        </fo:table-body>
-      </fo:table>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="productionset/title">
-  <!-- suppressed -->
-</xsl:template>
-
-<xsl:template match="production">
-  <xsl:param name="recap" select="false()"/>
-  <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
-  <fo:table-row>
-    <fo:table-cell>
-      <fo:block text-align="start">
-        <xsl:text>[</xsl:text>
-        <xsl:number count="production" level="any"/>
-        <xsl:text>]</xsl:text>
-      </fo:block>
-    </fo:table-cell>
-    <fo:table-cell>
-      <fo:block text-align="end">
-        <xsl:choose>
-          <xsl:when test="$recap">
-            <fo:basic-link internal-destination="{$id}"
-                           xsl:use-attribute-sets="xref.properties">
-              <xsl:apply-templates select="lhs"/>
-            </fo:basic-link>
-          </xsl:when>
-          <xsl:otherwise>
-            <fo:wrapper id="{$id}">
-              <xsl:apply-templates select="lhs"/>
-            </fo:wrapper>
-          </xsl:otherwise>
-        </xsl:choose>
-      </fo:block>
-    </fo:table-cell>
-    <fo:table-cell>
-      <fo:block text-align="center">
-        <xsl:copy-of select="$ebnf.assignment"/>
-      </fo:block>
-    </fo:table-cell>
-    <fo:table-cell>
-      <fo:block>
-        <xsl:apply-templates select="rhs"/>
-        <xsl:copy-of select="$ebnf.statement.terminator"/>
-      </fo:block>
-    </fo:table-cell>
-    <fo:table-cell border-start-width="3pt">
-      <fo:block text-align="start">
-        <xsl:choose>
-          <xsl:when test="rhs/lineannotation|constraint">
-            <xsl:apply-templates select="rhs/lineannotation" mode="rhslo"/>
-            <xsl:apply-templates select="constraint"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:text>&#160;</xsl:text>
-          </xsl:otherwise>
-        </xsl:choose>
-      </fo:block>
-    </fo:table-cell>
-  </fo:table-row>
-</xsl:template>
-
-<xsl:template match="productionrecap">
-  <xsl:variable name="targets" select="key('id',@linkend)"/>
-  <xsl:variable name="target" select="$targets[1]"/>
-
-  <xsl:if test="count($targets)=0">
-    <xsl:message>
-      <xsl:text>Error: no ID for productionrecap linkend: </xsl:text>
-      <xsl:value-of select="@linkend"/>
-      <xsl:text>.</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <xsl:if test="count($targets)>1">
-    <xsl:message>
-      <xsl:text>Warning: multiple "IDs" for productionrecap linkend: </xsl:text>
-      <xsl:value-of select="@linkend"/>
-      <xsl:text>.</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <xsl:apply-templates select="$target">
-    <xsl:with-param name="recap" select="true()"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="lhs">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="rhs">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="nonterminal">
-  <xsl:variable name="linkend">
-    <xsl:call-template name="xpointer.idref">
-      <xsl:with-param name="xpointer" select="@def"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:call-template name="check.id.unique">
-    <xsl:with-param name="linkend" select="$linkend"/>
-  </xsl:call-template>
-
-  <xsl:call-template name="check.idref.targets">
-    <xsl:with-param name="linkend" select="$linkend"/>
-    <xsl:with-param name="element-list">production</xsl:with-param>
-  </xsl:call-template>
-
-  <!-- If you don't provide content, you can't point outside this doc. -->
-  <xsl:choose>
-    <xsl:when test="*|text()"><!--nop--></xsl:when>
-    <xsl:otherwise>
-      <xsl:if test="$linkend = ''">
-	<xsl:message>
-	  <xsl:text>Non-terminals with no content must point to </xsl:text>
-	  <xsl:text>production elements in the current document.</xsl:text>
-	</xsl:message>
-	<xsl:message>
-	  <xsl:text>Invalid xpointer for empty nt: </xsl:text>
-	  <xsl:value-of select="@def"/>
-	</xsl:message>
-      </xsl:if>
-    </xsl:otherwise>
-  </xsl:choose>
-
-  <xsl:variable name="href">
-    <xsl:choose>
-      <xsl:when test="$linkend != ''">
-	<xsl:variable name="targets" select="key('id',$linkend)"/>
-	<xsl:variable name="target" select="$targets[1]"/>
-        <xsl:call-template name="object.id">
-          <xsl:with-param name="object" select="$target"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-	<xsl:value-of select="@def"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <fo:basic-link internal-destination="{$href}"
-                 xsl:use-attribute-sets="xref.properties">
-    <xsl:choose>
-      <xsl:when test="*|text()">
-        <xsl:apply-templates/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:choose>
-          <xsl:when test="$linkend != ''">
-            <xsl:variable name="targets" select="key('id',$linkend)"/>
-            <xsl:variable name="target" select="$targets[1]"/>
-            <xsl:apply-templates select="$target/lhs"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:text>???</xsl:text>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:otherwise>
-    </xsl:choose>
-  </fo:basic-link>
-</xsl:template>
-
-<xsl:template match="rhs/lineannotation">
-  <!--nop-->
-</xsl:template>
-
-<xsl:template match="rhs/lineannotation" mode="rhslo">
-  <xsl:text>/*&#160;</xsl:text>
-  <xsl:apply-templates/>
-  <xsl:text>&#160;*/</xsl:text>
-</xsl:template>
-
-<xsl:template match="constraint">
-  <xsl:call-template name="check.id.unique">
-    <xsl:with-param name="linkend" select="@linkend"/>
-  </xsl:call-template>
-
-  <xsl:call-template name="check.idref.targets">
-    <xsl:with-param name="linkend" select="@linkend"/>
-    <xsl:with-param name="element-list">constraintdef</xsl:with-param>
-  </xsl:call-template>
-
-  <xsl:variable name="href">
-    <xsl:variable name="targets" select="key('id',@linkend)"/>
-    <xsl:variable name="target" select="$targets[1]"/>
-    <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="$target"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:if test="preceding-sibling::constraint">
-    <fo:inline linefeed-treatment="preserve">&#xA;</fo:inline>
-  </xsl:if>
-  <xsl:text>[&#160;</xsl:text>
-
-  <xsl:choose>
-    <xsl:when test="@role">
-      <xsl:value-of select="@role"/>
-      <xsl:text>: </xsl:text>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:variable name="targets" select="key('id',@linkend)"/>
-      <xsl:variable name="target" select="$targets[1]"/>
-      <xsl:if test="$target/@role">
-	<xsl:value-of select="$target/@role"/>
-	<xsl:text>: </xsl:text>
-      </xsl:if>
-    </xsl:otherwise>
-  </xsl:choose>
-
-  <fo:basic-link internal-destination="{$href}"
-                 xsl:use-attribute-sets="xref.properties">
-    <xsl:variable name="targets" select="key('id',@linkend)"/>
-    <xsl:variable name="target" select="$targets[1]"/>
-    <xsl:apply-templates select="$target" mode="title.markup"/>
-  </fo:basic-link>
-  <xsl:text>&#160;]</xsl:text>
-</xsl:template>
-
-<xsl:template match="constraintdef">
-  <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
-  <fo:block id="{$id}">
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="constraintdef/title">
-  <fo:block font-weight="bold">
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/fo-rtf.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/fo-rtf.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,154 +1,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                xmlns:exsl="http://exslt.org/common"
-                xmlns:set="http://exslt.org/sets"
-                exclude-result-prefixes="exsl set"
-                version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the DocBook XSL Stylesheet distribution.
-     See ../README or http://docbook.sf.net/ for copyright
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- This module contains templates that match against FO nodes. It is used
-     to post-process result tree fragments for some sorts of cleanup.
-     These templates can only ever be fired by a processor that supports
-     exslt:node-set(). -->
-
-<!-- ==================================================================== -->
-
-<!-- insert.fo.fnum mode templates insert a particular RTF at the beginning
-     of the first paragraph in the primary RTF. In fact, they are inserting
-     a footnote-number, so we tinker a few other things too, like spacing and
-     font-sizes. -->
-
-<xsl:template match="/" mode="insert.fo.fnum">
-  <xsl:param name="mark" select="'?'"/>
-  <xsl:apply-templates mode="insert.fo.fnum">
-    <xsl:with-param name="mark" select="$mark"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="*" mode="insert.fo.fnum">
-  <xsl:param name="mark" select="'?'"/>
-  <xsl:copy>
-    <xsl:copy-of select="@*"/>
-    <xsl:apply-templates mode="insert.fo.fnum">
-      <xsl:with-param name="mark" select="$mark"/>
-    </xsl:apply-templates>
-  </xsl:copy>
-</xsl:template>
-
-<xsl:template match="fo:block" mode="insert.fo.fnum">
-  <xsl:param name="mark" select="'?'"/>
-  <xsl:copy>
-    <xsl:for-each select="@*">
-      <xsl:choose>
-        <xsl:when test="starts-with(name(.), 'space-before')"/>
-        <xsl:when test="starts-with(name(.), 'space-after')"/>
-        <xsl:when test="starts-with(name(.), 'font-size')"/>
-        <xsl:otherwise>
-          <xsl:copy-of select="."/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:for-each>
-    <xsl:if test="not(preceding::fo:block)">
-      <xsl:copy-of select="$mark"/>
-    </xsl:if>
-    <xsl:apply-templates mode="insert.fo.fnum">
-      <xsl:with-param name="mark" select="$mark"/>
-    </xsl:apply-templates>
-  </xsl:copy>
-</xsl:template>
-
-<xsl:template match="text()|processing-instruction()|comment()" mode="insert.fo.fnum">
-  <xsl:param name="mark" select="'?'"/>
-  <xsl:copy/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<!-- insert.fo.block mode templates insert a particular RTF at the beginning
-     of the first paragraph in the primary RTF. -->
-
-<xsl:template match="/" mode="insert.fo.block">
-  <xsl:param name="mark" select="'?'"/>
-  <xsl:apply-templates mode="insert.fo.block">
-    <xsl:with-param name="mark" select="$mark"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="*" mode="insert.fo.block">
-  <xsl:param name="mark" select="'?'"/>
-  <xsl:copy>
-    <xsl:copy-of select="@*"/>
-    <xsl:apply-templates mode="insert.fo.block">
-      <xsl:with-param name="mark" select="$mark"/>
-    </xsl:apply-templates>
-  </xsl:copy>
-</xsl:template>
-
-<xsl:template match="fo:block" mode="insert.fo.block">
-  <xsl:param name="mark" select="'?'"/>
-  <xsl:copy>
-    <xsl:copy-of select="@*"/>
-    <xsl:if test="not(preceding::fo:block)">
-      <xsl:copy-of select="$mark"/>
-    </xsl:if>
-    <xsl:apply-templates mode="insert.fo.block">
-      <xsl:with-param name="mark" select="$mark"/>
-    </xsl:apply-templates>
-  </xsl:copy>
-</xsl:template>
-
-<xsl:template match="text()|processing-instruction()|comment()" mode="insert.fo.block">
-  <xsl:param name="mark" select="'?'"/>
-  <xsl:copy/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<!-- insert.fo.text mode templates insert a particular RTF at the beginning
-     of the first text-node in the primary RTF. -->
-
-<xsl:template match="/" mode="insert.fo.text">
-  <xsl:param name="mark" select="'?'"/>
-  <xsl:apply-templates mode="insert.fo.text">
-    <xsl:with-param name="mark" select="$mark"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="*" mode="insert.fo.text">
-  <xsl:param name="mark" select="'?'"/>
-  <xsl:copy>
-    <xsl:copy-of select="@*"/>
-    <xsl:apply-templates mode="insert.fo.text">
-      <xsl:with-param name="mark" select="$mark"/>
-    </xsl:apply-templates>
-  </xsl:copy>
-</xsl:template>
-
-<xsl:template match="text()|processing-instruction()|comment()" mode="insert.fo.text">
-  <xsl:param name="mark" select="'?'"/>
-
-  <xsl:if test="not(preceding::text())">
-    <xsl:copy-of select="$mark"/>
-  </xsl:if>
-
-  <xsl:copy/>
-</xsl:template>
-
-<xsl:template match="processing-instruction()|comment()" mode="insert.fo.text">
-  <xsl:param name="mark" select="'?'"/>
-  <xsl:copy/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/fo.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/fo.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,71 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<xsl:template name="anchor">
-  <xsl:param name="node" select="."/>
-  <xsl:param name="conditional" select="1"/>
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="$node"/>
-    </xsl:call-template>
-  </xsl:variable>
-  <xsl:if test="$conditional = 0 or $node/@id or $node/@xml:id">
-    <xsl:attribute name="id"><xsl:value-of select="$id"/></xsl:attribute>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="dingbat">
-  <xsl:param name="dingbat">bullet</xsl:param>
-  <xsl:variable name="symbol">
-    <xsl:choose>
-      <xsl:when test="$dingbat='bullet'">o</xsl:when>
-      <xsl:when test="$dingbat='copyright'">&#x00A9;</xsl:when>
-      <xsl:when test="$dingbat='trademark'">&#x2122;</xsl:when>
-      <xsl:when test="$dingbat='trade'">&#x2122;</xsl:when>
-      <xsl:when test="$dingbat='registered'">&#x00AE;</xsl:when>
-      <xsl:when test="$dingbat='service'">(SM)</xsl:when>
-      <xsl:when test="$dingbat='ldquo'">"</xsl:when>
-      <xsl:when test="$dingbat='rdquo'">"</xsl:when>
-      <xsl:when test="$dingbat='lsquo'">'</xsl:when>
-      <xsl:when test="$dingbat='rsquo'">'</xsl:when>
-      <xsl:when test="$dingbat='em-dash'">&#x2014;</xsl:when>
-      <xsl:when test="$dingbat='en-dash'">-</xsl:when>
-      <xsl:otherwise>o</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$dingbat.font.family = ''">
-      <xsl:copy-of select="$symbol"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <fo:inline font-family="{$dingbat.font.family}">
-        <xsl:copy-of select="$symbol"/>
-      </fo:inline>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="href.target">
-  <xsl:param name="context" select="."/>
-  <xsl:param name="object" select="."/>
-  <xsl:text>#</xsl:text>
-  <xsl:call-template name="object.id">
-    <xsl:with-param name="object" select="$object"/>
-  </xsl:call-template>
-</xsl:template>
-
-</xsl:stylesheet>
-
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/footnote.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/footnote.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,186 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                xmlns:exsl="http://exslt.org/common"
-                exclude-result-prefixes="exsl"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<xsl:template name="format.footnote.mark">
-  <xsl:param name="mark" select="'?'"/>
-  <fo:inline xsl:use-attribute-sets="footnote.mark.properties">
-    <xsl:choose>
-      <xsl:when test="$fop.extensions != 0">
-        <xsl:attribute name="vertical-align">super</xsl:attribute>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:attribute name="baseline-shift">super</xsl:attribute>
-      </xsl:otherwise>
-    </xsl:choose>
-    <xsl:copy-of select="$mark"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="footnote">
-  <xsl:choose>
-    <xsl:when test="ancestor::table or ancestor::informaltable">
-      <xsl:call-template name="format.footnote.mark">
-        <xsl:with-param name="mark">
-          <xsl:apply-templates select="." mode="footnote.number"/>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <fo:footnote>
-        <fo:inline>
-          <xsl:call-template name="format.footnote.mark">
-            <xsl:with-param name="mark">
-              <xsl:apply-templates select="." mode="footnote.number"/>
-            </xsl:with-param>
-          </xsl:call-template>
-        </fo:inline>
-        <fo:footnote-body xsl:use-attribute-sets="footnote.properties">
-          <xsl:apply-templates/>
-        </fo:footnote-body>
-      </fo:footnote>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="footnoteref">
-  <xsl:variable name="footnote" select="key('id',@linkend)"/>
-  <xsl:call-template name="format.footnote.mark">
-    <xsl:with-param name="mark">
-      <xsl:apply-templates select="$footnote" mode="footnote.number"/>
-    </xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="footnote" mode="footnote.number">
-  <xsl:choose>
-    <xsl:when test="string-length(@label) != 0">
-      <xsl:value-of select="@label"/>
-    </xsl:when>
-    <xsl:when test="ancestor::table or ancestor::informaltable">
-      <xsl:variable name="tfnum">
-        <xsl:number level="any" from="table|informaltable" format="1"/>
-      </xsl:variable>
-
-      <xsl:choose>
-        <xsl:when test="string-length($table.footnote.number.symbols) &gt;= $tfnum">
-          <xsl:value-of select="substring($table.footnote.number.symbols, $tfnum, 1)"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:number level="any" from="table|informaltable"
-                      format="{$table.footnote.number.format}"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:variable name="fnum">
-        <!-- FIXME: list in @from is probably not complete -->
-        <xsl:number level="any" 
-                    from="chapter|appendix|preface|article|refentry|bibliography" 
-                    count="footnote[not(@label)][not(ancestor::table) and not(ancestor::informaltable)]|ulink[$ulink.footnotes != 0][node()][@url != .][not(ancestor::footnote)][$ulink.show != 0]" 
-                    format="1"/>
-      </xsl:variable>
-      <xsl:choose>
-        <xsl:when test="string-length($footnote.number.symbols) &gt;= $fnum">
-          <xsl:value-of select="substring($footnote.number.symbols, $fnum, 1)"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:number value="$fnum" format="{$footnote.number.format}"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="*" mode="footnote.body.number">
-  <xsl:variable name="footnote.mark">
-    <xsl:call-template name="format.footnote.mark">
-      <xsl:with-param name="mark">
-        <xsl:apply-templates select="ancestor::footnote" mode="footnote.number"/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="fo">
-    <xsl:apply-templates select="."/>
-  </xsl:variable>
-
-  <xsl:variable name="fo-nodes" select="exsl:node-set($fo)"/>
-
-  <xsl:choose>
-    <xsl:when test="$fo-nodes//fo:block">
-      <xsl:apply-templates select="$fo-nodes" mode="insert.fo.fnum">
-        <xsl:with-param name="mark" select="$footnote.mark"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates select="$fo-nodes" mode="insert.fo.text">
-        <xsl:with-param name="mark" select="$footnote.mark"/>
-      </xsl:apply-templates>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="footnote/para[1]
-                     |footnote/simpara[1]
-                     |footnote/formalpara[1]"
-              priority="2">
-  <!-- this only works if the first thing in a footnote is a para, -->
-  <!-- which is ok, because it usually is. -->
-  <fo:block>
-    <xsl:call-template name="format.footnote.mark">
-      <xsl:with-param name="mark">
-        <xsl:apply-templates select="ancestor::footnote" mode="footnote.number"/>
-      </xsl:with-param>
-    </xsl:call-template>
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="footnote" mode="table.footnote.mode">
-  <xsl:choose>
-    <xsl:when test="local-name(*[1]) = 'para' or local-name(*[1]) = 'simpara'">
-      <fo:block xsl:use-attribute-sets="table.footnote.properties">
-        <xsl:apply-templates/>
-      </fo:block>
-    </xsl:when>
-
-    <xsl:when test="function-available('exsl:node-set')">
-      <fo:block xsl:use-attribute-sets="table.footnote.properties">
-        <xsl:apply-templates select="*[1]" mode="footnote.body.number"/>
-        <xsl:apply-templates select="*[position() &gt; 1]"/>
-      </fo:block>
-    </xsl:when>
-
-    <xsl:otherwise>
-      <xsl:message>
-        <xsl:text>Warning: footnote number may not be generated </xsl:text>
-        <xsl:text>correctly; </xsl:text>
-        <xsl:value-of select="local-name(*[1])"/>
-        <xsl:text> unexpected as first child of footnote.</xsl:text>
-      </xsl:message>
-      <fo:block xsl:use-attribute-sets="table.footnote.properties">
-        <xsl:apply-templates/>
-      </fo:block>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/fop.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/fop.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,92 +1,0 @@
-<?xml version='1.0' encoding="utf-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                xmlns:fox="http://xml.apache.org/fop/extensions"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-     (c) Stephane Bline Peregrine Systems 2001
-     Driver file to allow pdf bookmarking (based on fop implementation).
-     ******************************************************************** -->
-<!--
-In PDF bookmarks can't be used characters with code>255. This version of file
-translates characters with code>255 back to ASCII.
-
-   Pavel Zampach (zampach@volny.cz)
--->
-
-<xsl:variable name="a-dia" select=
-"'&#257;&#259;&#261;&#263;&#265;&#267;&#269;&#271;&#273;&#275;&#277;&#279;&#281;&#283;&#339;&#285;&#287;&#289;&#291;&#293;&#295;&#297;&#299;&#301;&#303;&#305;&#309;&#311;&#314;&#316;&#318;&#320;&#322;&#324;&#326;&#328;&#331;&#333;&#335;&#337;&#341;&#343;&#345;&#347;&#349;&#351;&#353;&#355;&#357;&#359;&#361;&#363;&#365;&#367;&#369;&#371;&#373;&#375;&#378;&#380;&#382;&#256;&#258;&#260;&#262;&#264;&#266;&#268;&#270;&#272;&#274;&#276;&#278;&#280;&#282;&#338;&#284;&#286;&#288;&#290;&#292;&#294;&#296;&#298;&#300;&#302;&#304;&#308;&#310;&#313;&#315;&#317;&#319;&#321;&#323;&#325;&#327;&#330;&#332;&#334;&#336;&#340;&#342;&#344;&#346;&#348;&#350;&#352;&#354;&#356;&#358;&#360;&#362;&#364;&#366;&#368;&#370;&#372;&#374;&#376;&#377;&#379;&#381;'"/>
-<xsl:variable name="a-asc" select=
-"'aaaccccddeeeeeegggghhiiiiijklllllnnnnooorrrsssstttuuuuuuwyzzzAAACCCCDDEEEEEEGGGGHHIIIIIJKLLLLLNNNNOOORRRSSSSTTTUUUUUUWYYZZZ'"/>
-
-<xsl:template match="*" mode="fop.outline">
-  <xsl:variable name="id">
-    <xsl:value-of select="(@id|@xml:id)[1]"/>
-  </xsl:variable>
-  <xsl:if test="$id != ''">
-    <fox:destination internal-destination="{$id}"/>
-  </xsl:if>
-  <xsl:apply-templates select="*" mode="fop.outline"/>
-</xsl:template>
-
-<xsl:template match="set|book|part|reference|preface|chapter|appendix|article
-                     |glossary|bibliography|index|setindex
-                     |refentry
-                     |sect1|sect2|sect3|sect4|sect5|section"
-              mode="fop.outline">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-  <xsl:variable name="bookmark-label">
-    <xsl:apply-templates select="." mode="object.title.markup"/>
-  </xsl:variable>
-
-  <!-- Put the root element bookmark at the same level as its children -->
-  <!-- If the object is a set or book, generate a bookmark for the toc -->
-
-  <xsl:choose>
-    <xsl:when test="parent::*">
-      <fox:outline internal-destination="{$id}">
-        <fox:label>
-          <xsl:value-of select="normalize-space(translate($bookmark-label, $a-dia, $a-asc))"/>
-        </fox:label>
-        <xsl:apply-templates select="*" mode="fop.outline"/>
-      </fox:outline>
-    </xsl:when>
-    <xsl:otherwise>
-      <fox:outline internal-destination="{$id}">
-        <fox:label>
-          <xsl:value-of select="normalize-space(translate($bookmark-label, $a-dia, $a-asc))"/>
-        </fox:label>
-      </fox:outline>
-
-      <xsl:variable name="toc.params">
-        <xsl:call-template name="find.path.params">
-          <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <xsl:if test="contains($toc.params, 'toc')
-                    and (book|part|reference|preface|chapter|appendix|article
-                         |glossary|bibliography|index|setindex
-                         |refentry
-                         |sect1|sect2|sect3|sect4|sect5|section)">
-        <fox:outline internal-destination="toc...{$id}">
-          <fox:label>
-            <xsl:call-template name="gentext">
-              <xsl:with-param name="key" select="'TableofContents'"/>
-            </xsl:call-template>
-          </fox:label>
-        </fox:outline>
-      </xsl:if>
-      <xsl:apply-templates select="*" mode="fop.outline"/>
-    </xsl:otherwise>
-  </xsl:choose>
-  <fox:destination internal-destination="{$id}"/>
-</xsl:template>
-
-</xsl:stylesheet>
-
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/fop1.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/fop1.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,71 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version='1.0'>
-
-<xsl:template match="*" mode="fop1.outline">
-  <xsl:apply-templates select="*" mode="fop1.outline"/>
-</xsl:template>
-
-<xsl:template match="set|book|part|reference|
-                     preface|chapter|appendix|article
-                     |glossary|bibliography|index|setindex
-                     |refentry
-                     |sect1|sect2|sect3|sect4|sect5|section"
-              mode="fop1.outline">
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-  <xsl:variable name="bookmark-label">
-    <xsl:apply-templates select="." mode="object.title.markup"/>
-  </xsl:variable>
-
-  <!-- Put the root element bookmark at the same level as its children -->
-  <!-- If the object is a set or book, generate a bookmark for the toc -->
-
-  <xsl:choose>
-    <xsl:when test="parent::*">
-      <fo:bookmark internal-destination="{$id}">
-        <fo:bookmark-title>
-          <xsl:value-of select="normalize-space(translate($bookmark-label, $a-dia, $a-asc))"/>
-        </fo:bookmark-title>
-        <xsl:apply-templates select="*" mode="fop1.outline"/>
-      </fo:bookmark>
-    </xsl:when>
-    <xsl:otherwise>
-      <fo:bookmark internal-destination="{$id}">
-        <fo:bookmark-title>
-          <xsl:value-of select="normalize-space(translate($bookmark-label, $a-dia, $a-asc))"/>
-        </fo:bookmark-title>
-      </fo:bookmark>
-
-      <xsl:variable name="toc.params">
-        <xsl:call-template name="find.path.params">
-          <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <xsl:if test="contains($toc.params, 'toc')
-                    and (book|part|reference|preface|chapter|appendix|article
-                         |glossary|bibliography|index|setindex
-                         |refentry
-                         |sect1|sect2|sect3|sect4|sect5|section)">
-        <fo:bookmark internal-destination="toc...{$id}">
-          <fo:bookmark-title>
-            <xsl:call-template name="gentext">
-              <xsl:with-param name="key" select="'TableofContents'"/>
-            </xsl:call-template>
-          </fo:bookmark-title>
-        </fo:bookmark>
-      </xsl:if>
-      <xsl:apply-templates select="*" mode="fop1.outline"/>
-    </xsl:otherwise>
-  </xsl:choose>
-<!--
-  <fo:bookmark internal-destination="{$id}"/>
--->
-</xsl:template>
-
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/formal.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/formal.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,534 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- formal.object creates a basic block containing the
-     result of processing the object, including its title
-     and any keep-together properties.
-     The template calling formal.object may wrap these results in a
-     float or pgwide block. -->
-
-<xsl:template name="formal.object">
-  <xsl:param name="placement" select="'before'"/>
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="content">
-    <xsl:if test="$placement = 'before'">
-      <xsl:call-template name="formal.object.heading">
-        <xsl:with-param name="placement" select="$placement"/>
-      </xsl:call-template>
-    </xsl:if>
-    <xsl:apply-templates/>
-    <xsl:if test="$placement != 'before'">
-      <xsl:call-template name="formal.object.heading">
-        <xsl:with-param name="placement" select="$placement"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:variable name="keep.together">
-    <xsl:call-template name="pi.dbfo_keep-together"/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <!-- tables have their own templates and 
-         are not handled by formal.object -->
-    <xsl:when test="self::figure">
-      <fo:block id="{$id}"
-                xsl:use-attribute-sets="figure.properties">
-        <xsl:if test="$keep.together != ''">
-          <xsl:attribute name="keep-together.within-column"><xsl:value-of
-                          select="$keep.together"/></xsl:attribute>
-        </xsl:if>
-        <xsl:copy-of select="$content"/>
-      </fo:block>
-    </xsl:when>
-    <xsl:when test="self::example">
-      <fo:block id="{$id}"
-                xsl:use-attribute-sets="example.properties">
-        <xsl:if test="$keep.together != ''">
-          <xsl:attribute name="keep-together.within-column"><xsl:value-of
-                          select="$keep.together"/></xsl:attribute>
-        </xsl:if>
-        <xsl:copy-of select="$content"/>
-      </fo:block>
-    </xsl:when>
-    <xsl:when test="self::equation">
-      <fo:block id="{$id}"
-                xsl:use-attribute-sets="equation.properties">
-        <xsl:if test="$keep.together != ''">
-          <xsl:attribute name="keep-together.within-column"><xsl:value-of
-                          select="$keep.together"/></xsl:attribute>
-        </xsl:if>
-        <xsl:copy-of select="$content"/>
-      </fo:block>
-    </xsl:when>
-    <xsl:when test="self::procedure">
-      <fo:block id="{$id}"
-                xsl:use-attribute-sets="procedure.properties">
-        <xsl:if test="$keep.together != ''">
-          <xsl:attribute name="keep-together.within-column"><xsl:value-of
-                          select="$keep.together"/></xsl:attribute>
-        </xsl:if>
-        <xsl:copy-of select="$content"/>
-      </fo:block>
-    </xsl:when>
-    <xsl:otherwise>
-      <fo:block id="{$id}"
-                xsl:use-attribute-sets="formal.object.properties">
-        <xsl:if test="$keep.together != ''">
-          <xsl:attribute name="keep-together.within-column"><xsl:value-of
-                          select="$keep.together"/></xsl:attribute>
-        </xsl:if>
-        <xsl:copy-of select="$content"/>
-      </fo:block>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="formal.object.heading">
-  <xsl:param name="object" select="."/>
-  <xsl:param name="placement" select="'before'"/>
-
-  <fo:block xsl:use-attribute-sets="formal.title.properties">
-    <xsl:choose>
-      <xsl:when test="$placement = 'before'">
-        <xsl:attribute
-               name="keep-with-next.within-column">always</xsl:attribute>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:attribute
-               name="keep-with-previous.within-column">always</xsl:attribute>
-      </xsl:otherwise>
-    </xsl:choose>
-    <xsl:apply-templates select="$object" mode="object.title.markup">
-      <xsl:with-param name="allow-anchors" select="1"/>
-    </xsl:apply-templates>
-  </fo:block>
-</xsl:template>
-
-<xsl:template name="informal.object">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="keep.together">
-    <xsl:call-template name="pi.dbfo_keep-together"/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <!-- informaltables have their own templates and 
-         are not handled by formal.object -->
-    <xsl:when test="local-name(.) = 'equation'">
-      <fo:block id="{$id}"
-                xsl:use-attribute-sets="equation.properties">
-        <xsl:if test="$keep.together != ''">
-          <xsl:attribute name="keep-together.within-column"><xsl:value-of
-                          select="$keep.together"/></xsl:attribute>
-        </xsl:if>
-        <xsl:apply-templates/>
-      </fo:block>
-    </xsl:when>
-    <xsl:when test="local-name(.) = 'procedure'">
-      <fo:block id="{$id}"
-                xsl:use-attribute-sets="procedure.properties">
-        <xsl:if test="$keep.together != ''">
-          <xsl:attribute name="keep-together.within-column"><xsl:value-of
-                          select="$keep.together"/></xsl:attribute>
-        </xsl:if>
-        <xsl:apply-templates/>
-      </fo:block>
-    </xsl:when>
-    <xsl:when test="local-name(.) = 'informalfigure'">
-      <fo:block id="{$id}"
-                xsl:use-attribute-sets="informalfigure.properties">
-        <xsl:if test="$keep.together != ''">
-          <xsl:attribute name="keep-together.within-column"><xsl:value-of
-                          select="$keep.together"/></xsl:attribute>
-        </xsl:if>
-        <xsl:apply-templates/>
-      </fo:block>
-    </xsl:when>
-    <xsl:when test="local-name(.) = 'informalexample'">
-      <fo:block id="{$id}"
-                xsl:use-attribute-sets="informalexample.properties">
-        <xsl:if test="$keep.together != ''">
-          <xsl:attribute name="keep-together.within-column"><xsl:value-of
-                          select="$keep.together"/></xsl:attribute>
-        </xsl:if>
-        <xsl:apply-templates/>
-      </fo:block>
-    </xsl:when>
-    <xsl:when test="local-name(.) = 'informalequation'">
-      <fo:block id="{$id}"
-                xsl:use-attribute-sets="informalequation.properties">
-        <xsl:apply-templates/>
-      </fo:block>
-    </xsl:when>
-    <xsl:otherwise>
-      <fo:block id="{$id}" 
-                xsl:use-attribute-sets="informal.object.properties">
-        <xsl:if test="$keep.together != ''">
-          <xsl:attribute name="keep-together.within-column"><xsl:value-of
-                          select="$keep.together"/></xsl:attribute>
-        </xsl:if>
-        <xsl:apply-templates/>
-      </fo:block>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="semiformal.object">
-  <xsl:param name="placement" select="'before'"/>
-  <xsl:choose>
-    <xsl:when test="./title">
-      <xsl:call-template name="formal.object">
-        <xsl:with-param name="placement" select="$placement"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="informal.object"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="figure">
-  <xsl:variable name="param.placement"
-              select="substring-after(normalize-space($formal.title.placement),
-                                      concat(local-name(.), ' '))"/>
-
-  <xsl:variable name="placement">
-    <xsl:choose>
-      <xsl:when test="contains($param.placement, ' ')">
-        <xsl:value-of select="substring-before($param.placement, ' ')"/>
-      </xsl:when>
-      <xsl:when test="$param.placement = ''">before</xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$param.placement"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="figure">
-    <xsl:choose>
-      <xsl:when test="@pgwide = '1'">
-        <fo:block xsl:use-attribute-sets="pgwide.properties">
-          <xsl:call-template name="formal.object">
-            <xsl:with-param name="placement" select="$placement"/>
-          </xsl:call-template>
-        </fo:block>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="formal.object">
-          <xsl:with-param name="placement" select="$placement"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="floatstyle">
-    <xsl:call-template name="floatstyle"/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$floatstyle != ''">
-      <xsl:call-template name="floater">
-        <xsl:with-param name="position" select="$floatstyle"/>
-        <xsl:with-param name="content" select="$figure"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:copy-of select="$figure"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="example">
-  <xsl:variable name="param.placement"
-             select="substring-after(normalize-space($formal.title.placement),
-                                     concat(local-name(.), ' '))"/>
-
-  <xsl:variable name="placement">
-    <xsl:choose>
-      <xsl:when test="contains($param.placement, ' ')">
-        <xsl:value-of select="substring-before($param.placement, ' ')"/>
-      </xsl:when>
-      <xsl:when test="$param.placement = ''">before</xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$param.placement"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <!-- Example doesn't have a pgwide attribute, so may use a PI -->
-  <xsl:variable name="pgwide.pi">
-    <xsl:call-template name="pi.dbfo_pgwide"/>
-  </xsl:variable>
-
-  <xsl:variable name="pgwide">
-    <xsl:choose>
-      <xsl:when test="$pgwide.pi">
-        <xsl:value-of select="$pgwide.pi"/>
-      </xsl:when>
-      <!-- child element may set pgwide -->
-      <xsl:when test="*[@pgwide]">
-        <xsl:value-of select="*[@pgwide][1]/@pgwide"/>
-      </xsl:when>
-    </xsl:choose>
-  </xsl:variable>
-
-  <!-- Get align value from internal mediaobject -->
-  <xsl:variable name="align">
-    <xsl:if test="mediaobject|mediaobjectco">
-      <xsl:variable name="olist" select="mediaobject/imageobject
-                     |mediaobjectco/imageobjectco
-                     |mediaobject/videoobject
-                     |mediaobject/audioobject
-                     |mediaobject/textobject"/>
-
-      <xsl:variable name="object.index">
-        <xsl:call-template name="select.mediaobject.index">
-          <xsl:with-param name="olist" select="$olist"/>
-          <xsl:with-param name="count" select="1"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <xsl:variable name="object" select="$olist[position() = $object.index]"/>
-
-      <xsl:value-of select="$object/descendant::imagedata[@align][1]/@align"/>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:variable name="example">
-    <xsl:choose>
-      <xsl:when test="$pgwide = '1'">
-        <fo:block xsl:use-attribute-sets="pgwide.properties">
-          <xsl:if test="$align != ''">
-            <xsl:attribute name="text-align">
-              <xsl:value-of select="$align"/>
-            </xsl:attribute>
-          </xsl:if>
-          <xsl:call-template name="formal.object">
-            <xsl:with-param name="placement" select="$placement"/>
-          </xsl:call-template>
-        </fo:block>
-      </xsl:when>
-      <xsl:otherwise>
-        <fo:block>
-          <xsl:if test="$align != ''">
-            <xsl:attribute name="text-align">
-              <xsl:value-of select="$align"/>
-            </xsl:attribute>
-          </xsl:if>
-          <xsl:call-template name="formal.object">
-            <xsl:with-param name="placement" select="$placement"/>
-          </xsl:call-template>
-        </fo:block>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="floatstyle">
-    <xsl:call-template name="floatstyle"/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$floatstyle != ''">
-      <xsl:call-template name="floater">
-        <xsl:with-param name="position" select="$floatstyle"/>
-        <xsl:with-param name="content" select="$example"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:copy-of select="$example"/>
-    </xsl:otherwise>
-  </xsl:choose>
-
-</xsl:template>
-
-<!-- Unified handling of CALS and HTML tables, formal and not -->
-<!-- Creates a hierarchy of nested containers:
-     - Outer container does a float.
-     - Nested container does block-container for rotation
-     - Nested block contains title, layout table and footnotes
-     - Nested layout table placeholder template supports extensions.
-     - fo:table is innermost.
-     Created from the innermost and working out.
-     Not all layers apply to every table.
--->
-<xsl:template match="table|informaltable">
-  <xsl:if test="tgroup/tbody/tr
-                |tgroup/thead/tr
-                |tgroup/tfoot/tr">
-    <xsl:message terminate="yes">
-      <xsl:text>Broken table: tr descendent of CALS Table.</xsl:text>
-      <xsl:text>The text in the first tr is:&#10;</xsl:text>
-      <xsl:value-of 
-               select="(tgroup//tr)[1]"/>
-    </xsl:message>
-  </xsl:if>
-  <xsl:if test="not(tgroup) and .//row">
-    <xsl:message terminate="yes">
-      <xsl:text>Broken table: row descendent of HTML table.</xsl:text>
-      <xsl:text>The text in the first row is:&#10;</xsl:text>
-      <xsl:value-of 
-               select=".//row[1]"/>
-    </xsl:message>
-  </xsl:if>
-
-  <!-- Contains fo:table, not title or footnotes -->
-  <xsl:variable name="table.content">
-    <xsl:call-template name="make.table.content"/>
-  </xsl:variable>
-
-  <!-- Optional layout table template for extensions -->
-  <xsl:variable name="table.layout">
-    <xsl:call-template name="table.layout">
-      <xsl:with-param name="table.content" select="$table.content"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <!-- fo:block contains title, layout table, and footnotes  -->
-  <xsl:variable name="table.block">
-    <xsl:call-template name="table.block">
-      <xsl:with-param name="table.layout" select="$table.layout"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <!-- pgwide or orient container -->
-  <xsl:variable name="table.container">
-    <xsl:call-template name="table.container">
-      <xsl:with-param name="table.block" select="$table.block"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <!-- float or not -->
-  <xsl:variable name="floatstyle">
-    <xsl:call-template name="floatstyle"/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$floatstyle != ''">
-      <xsl:call-template name="floater">
-        <xsl:with-param name="position" select="$floatstyle"/>
-        <xsl:with-param name="content" select="$table.container"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:copy-of select="$table.container"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-
-<xsl:template match="equation">
-  <xsl:variable name="param.placement"
-              select="substring-after(normalize-space($formal.title.placement),
-                                      concat(local-name(.), ' '))"/>
-
-  <xsl:variable name="placement">
-    <xsl:choose>
-      <xsl:when test="contains($param.placement, ' ')">
-        <xsl:value-of select="substring-before($param.placement, ' ')"/>
-      </xsl:when>
-      <xsl:when test="$param.placement = ''">before</xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$param.placement"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <!-- Equation doesn't have a pgwide attribute, so may use a PI -->
-  <xsl:variable name="pgwide">
-    <xsl:call-template name="pi.dbfo_pgwide"/>
-  </xsl:variable>
-
-  <xsl:variable name="equation">
-    <xsl:choose>
-      <xsl:when test="$pgwide = '1'">
-        <fo:block xsl:use-attribute-sets="pgwide.properties">
-          <xsl:call-template name="semiformal.object">
-            <xsl:with-param name="placement" select="$placement"/>
-          </xsl:call-template>
-        </fo:block>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="semiformal.object">
-          <xsl:with-param name="placement" select="$placement"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="floatstyle">
-    <xsl:call-template name="floatstyle"/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$floatstyle != ''">
-      <xsl:call-template name="floater">
-        <xsl:with-param name="position" select="$floatstyle"/>
-        <xsl:with-param name="content" select="$equation"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:copy-of select="$equation"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="figure/title"></xsl:template>
-<xsl:template match="figure/titleabbrev"></xsl:template>
-<xsl:template match="table/title"></xsl:template>
-<xsl:template match="table/titleabbrev"></xsl:template>
-<xsl:template match="table/textobject"></xsl:template>
-<xsl:template match="example/title"></xsl:template>
-<xsl:template match="example/titleabbrev"></xsl:template>
-<xsl:template match="equation/title"></xsl:template>
-<xsl:template match="equation/titleabbrev"></xsl:template>
-
-<xsl:template match="informalfigure">
-  <xsl:call-template name="informal.object"/>
-</xsl:template>
-
-<xsl:template match="informalexample">
-  <xsl:call-template name="informal.object"/>
-</xsl:template>
-
-<xsl:template match="informaltable/textobject"></xsl:template>
-
-<xsl:template match="informalequation">
-  <xsl:call-template name="informal.object"/>
-</xsl:template>
-
-<xsl:template name="floatstyle">
-  <xsl:if test="(@float and @float != '0') or @floatstyle != ''">
-    <xsl:choose>
-      <xsl:when test="@floatstyle != ''">
-        <xsl:value-of select="@floatstyle"/>
-      </xsl:when>
-      <xsl:when test="@float = '1'">
-        <xsl:value-of select="$default.float.class"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="@float"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:if>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/glossary.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/glossary.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,1139 +1,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE xsl:stylesheet [
-<!ENTITY % common.entities SYSTEM "../common/entities.ent">
-%common.entities;
-]>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:template match="glossary">
-  <xsl:call-template name="make-glossary"/>
-</xsl:template>
-
-<xsl:template match="glossdiv/title"/>
-<xsl:template match="glossdiv/subtitle"/>
-<xsl:template match="glossdiv/titleabbrev"/>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="make-glossary">
-  <xsl:param name="divs" select="glossdiv"/>
-  <xsl:param name="entries" select="glossentry"/>
-  <xsl:param name="preamble" select="*[not(self::title
-                                           or self::subtitle
-                                           or self::glossdiv
-                                           or self::glossentry)]"/>
-
-  &setup-language-variable;
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="presentation">
-    <xsl:call-template name="pi.dbfo_glossary-presentation"/>
-  </xsl:variable>
-
-  <xsl:variable name="term-width">
-    <xsl:call-template name="pi.dbfo_glossterm-width"/>
-  </xsl:variable>
-
-  <xsl:variable name="width">
-    <xsl:choose>
-      <xsl:when test="$term-width = ''">
-        <xsl:value-of select="$glossterm.width"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$term-width"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <fo:block id="{$id}">
-    <xsl:call-template name="glossary.titlepage"/>
-  </fo:block>
-
-  <xsl:if test="$preamble">
-    <xsl:apply-templates select="$preamble"/>
-  </xsl:if>
-
-  <xsl:choose>
-    <xsl:when test="$presentation = 'list'">
-      <xsl:apply-templates select="$divs" mode="glossary.as.list">
-        <xsl:with-param name="width" select="$width"/>
-      </xsl:apply-templates>
-      <xsl:if test="$entries">
-        <fo:list-block provisional-distance-between-starts="{$width}"
-                       provisional-label-separation="{$glossterm.separation}"
-                       xsl:use-attribute-sets="normal.para.spacing">
-          <xsl:choose>
-            <xsl:when test="$glossary.sort != 0">
-              <xsl:apply-templates select="$entries" mode="glossary.as.list">
-                <xsl:sort lang="{$language}"
-                          select="translate(glossterm, $lowercase, 
-                                            $uppercase)"/>
-              </xsl:apply-templates>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:apply-templates select="$entries" mode="glossary.as.list"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </fo:list-block>
-      </xsl:if>
-    </xsl:when>
-    <xsl:when test="$presentation = 'blocks'">
-      <xsl:apply-templates select="$divs" mode="glossary.as.blocks"/>
-      <xsl:choose>
-        <xsl:when test="$glossary.sort != 0">
-          <xsl:apply-templates select="$entries" mode="glossary.as.blocks">
-            <xsl:sort lang="{$language}"
-                      select="translate(glossterm, $lowercase, 
-                                        $uppercase)"/>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates select="$entries" mode="glossary.as.blocks"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:when test="$glossary.as.blocks != 0">
-      <xsl:apply-templates select="$divs" mode="glossary.as.blocks"/>
-      <xsl:choose>
-        <xsl:when test="$glossary.sort != 0">
-          <xsl:apply-templates select="$entries" mode="glossary.as.blocks">
-            <xsl:sort lang="{$language}"
-                      select="translate(glossterm, $lowercase, 
-                                        $uppercase)"/>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates select="$entries" mode="glossary.as.blocks"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates select="$divs" mode="glossary.as.list">
-        <xsl:with-param name="width" select="$width"/>
-      </xsl:apply-templates>
-      <xsl:if test="$entries">
-        <fo:list-block provisional-distance-between-starts="{$width}"
-                       provisional-label-separation="{$glossterm.separation}"
-                       xsl:use-attribute-sets="normal.para.spacing">
-          <xsl:choose>
-            <xsl:when test="$glossary.sort != 0">
-              <xsl:apply-templates select="$entries" mode="glossary.as.list">
-                <xsl:sort lang="{$language}"
-                          select="translate(glossterm, $lowercase, 
-                                            $uppercase)"/>
-              </xsl:apply-templates>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:apply-templates select="$entries" mode="glossary.as.list"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </fo:list-block>
-      </xsl:if>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="book/glossary|part/glossary|/glossary" priority="2">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="master-reference">
-    <xsl:call-template name="select.pagemaster"/>
-  </xsl:variable>
-
-  <fo:page-sequence hyphenate="{$hyphenate}"
-                    master-reference="{$master-reference}">
-    <xsl:attribute name="language">
-      <xsl:call-template name="l10n.language"/>
-    </xsl:attribute>
-
-    <xsl:attribute name="format">
-      <xsl:call-template name="page.number.format">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    
-    <xsl:attribute name="initial-page-number">
-      <xsl:call-template name="initial.page.number">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="force-page-count">
-      <xsl:call-template name="force.page.count">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="hyphenation-character">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-character'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="hyphenation-push-character-count">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-push-character-count'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="hyphenation-remain-character-count">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-remain-character-count'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:apply-templates select="." mode="running.head.mode">
-      <xsl:with-param name="master-reference" select="$master-reference"/>
-    </xsl:apply-templates>
-    <xsl:apply-templates select="." mode="running.foot.mode">
-      <xsl:with-param name="master-reference" select="$master-reference"/>
-    </xsl:apply-templates>
-
-    <fo:flow flow-name="xsl-region-body">
-      <xsl:call-template name="set.flow.properties">
-        <xsl:with-param name="element" select="local-name(.)"/>
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-
-      <xsl:call-template name="make-glossary"/>
-    </fo:flow>
-  </fo:page-sequence>
-</xsl:template>
-
-<xsl:template match="glossary/glossaryinfo"></xsl:template>
-<xsl:template match="glossary/info"></xsl:template>
-<xsl:template match="glossary/title"></xsl:template>
-<xsl:template match="glossary/subtitle"></xsl:template>
-<xsl:template match="glossary/titleabbrev"></xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="glosslist">
-  &setup-language-variable;
-
-  <xsl:variable name="presentation">
-    <xsl:call-template name="pi.dbfo_glosslist-presentation"/>
-  </xsl:variable>
-
-  <xsl:variable name="term-width">
-    <xsl:call-template name="pi.dbfo_glossterm-width"/>
-  </xsl:variable>
-
-  <xsl:variable name="width">
-    <xsl:choose>
-      <xsl:when test="$term-width = ''">
-        <xsl:value-of select="$glossterm.width"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$term-width"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:if test="title or info/title">
-    <xsl:apply-templates select="(title|info/title)[1]" mode="list.title.mode"/>
-  </xsl:if>
-
-  <xsl:choose>
-    <xsl:when test="$presentation = 'list'">
-      <fo:list-block provisional-distance-between-starts="{$width}"
-                     provisional-label-separation="{$glossterm.separation}"
-                     xsl:use-attribute-sets="normal.para.spacing">
-        <xsl:choose>
-          <xsl:when test="$glossary.sort != 0">
-            <xsl:apply-templates select="glossentry" mode="glossary.as.list">
-              <xsl:sort lang="{$language}"
-                        select="translate(glossterm, $lowercase, 
-                                          $uppercase)"/>
-            </xsl:apply-templates>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:apply-templates select="glossentry" mode="glossary.as.list"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </fo:list-block>
-    </xsl:when>
-    <xsl:when test="$presentation = 'blocks'">
-      <xsl:choose>
-        <xsl:when test="$glossary.sort != 0">
-          <xsl:apply-templates select="glossentry" mode="glossary.as.blocks">
-            <xsl:sort lang="{$language}"
-                      select="translate(glossterm, $lowercase, 
-                                        $uppercase)"/>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates select="glossentry" mode="glossary.as.blocks"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:when test="$glosslist.as.blocks != 0">
-      <xsl:choose>
-        <xsl:when test="$glossary.sort != 0">
-          <xsl:apply-templates select="glossentry" mode="glossary.as.blocks">
-            <xsl:sort lang="{$language}"
-                      select="translate(glossterm, $lowercase, 
-                                        $uppercase)"/>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates select="glossentry" mode="glossary.as.blocks"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <fo:list-block provisional-distance-between-starts="{$width}"
-                     provisional-label-separation="{$glossterm.separation}"
-                     xsl:use-attribute-sets="normal.para.spacing">
-        <xsl:choose>
-          <xsl:when test="$glossary.sort != 0">
-            <xsl:apply-templates select="glossentry" mode="glossary.as.list">
-              <xsl:sort lang="{$language}"
-                        select="translate(glossterm, $lowercase, 
-                                          $uppercase)"/>
-            </xsl:apply-templates>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:apply-templates select="glossentry" mode="glossary.as.list"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </fo:list-block>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-<!-- Glossary collection -->
-
-<xsl:template match="glossary[@role='auto']" priority="2">
-  <xsl:variable name="collection" select="document($glossary.collection, .)"/>
-  <xsl:if test="$glossary.collection = ''">
-    <xsl:message>
-      <xsl:text>Warning: processing automatic glossary </xsl:text>
-      <xsl:text>without a glossary.collection file.</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <xsl:if test="not($collection) and $glossary.collection != ''">
-    <xsl:message>
-      <xsl:text>Warning: processing automatic glossary but unable to </xsl:text>
-      <xsl:text>open glossary.collection file '</xsl:text>
-      <xsl:value-of select="$glossary.collection"/>
-      <xsl:text>'</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <xsl:call-template name="make-auto-glossary"/>
-</xsl:template>
-
-<xsl:template name="make-auto-glossary">
-  <xsl:param name="collection" select="document($glossary.collection, .)"/>
-  <xsl:param name="terms" select="//glossterm[not(parent::glossdef)]|//firstterm"/>
-  <xsl:param name="preamble" select="*[not(self::title
-                                           or self::subtitle
-                                           or self::glossdiv
-                                           or self::glossentry)]"/>
-
-  &setup-language-variable;
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="presentation">
-    <xsl:call-template name="pi.dbfo_glossary-presentation"/>
-  </xsl:variable>
-
-  <xsl:variable name="term-width">
-    <xsl:call-template name="pi.dbfo_glossterm-width"/>
-  </xsl:variable>
-
-  <xsl:variable name="width">
-    <xsl:choose>
-      <xsl:when test="$term-width = ''">
-        <xsl:value-of select="$glossterm.width"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$term-width"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:if test="$glossary.collection = ''">
-    <xsl:message>
-      <xsl:text>Warning: processing automatic glossary </xsl:text>
-      <xsl:text>without a glossary.collection file.</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <fo:block id="{$id}">
-    <xsl:call-template name="glossary.titlepage"/>
-  </fo:block>
-
-  <xsl:if test="$preamble">
-    <xsl:apply-templates select="$preamble"/>
-  </xsl:if>
-
-  <xsl:choose>
-    <xsl:when test="glossdiv and $collection//glossdiv">
-      <xsl:for-each select="$collection//glossdiv">
-        <!-- first see if there are any in this div -->
-        <xsl:variable name="exist.test">
-          <xsl:for-each select="glossentry">
-            <xsl:variable name="cterm" select="glossterm"/>
-            <xsl:if test="$terms[@baseform = $cterm or . = $cterm]">
-              <xsl:value-of select="glossterm"/>
-            </xsl:if>
-          </xsl:for-each>
-        </xsl:variable>
-
-        <xsl:if test="$exist.test != ''">
-          <xsl:choose>
-            <xsl:when test="$presentation = 'list'">
-              <xsl:apply-templates select="." mode="auto-glossary-as-list">
-                <xsl:with-param name="width" select="$width"/>
-                <xsl:with-param name="terms" select="$terms"/>
-              </xsl:apply-templates>
-            </xsl:when>
-            <xsl:when test="$presentation = 'blocks'">
-              <xsl:apply-templates select="." mode="auto-glossary-as-blocks">
-                <xsl:with-param name="terms" select="$terms"/>
-              </xsl:apply-templates>
-            </xsl:when>
-            <xsl:when test="$glossary.as.blocks != 0">
-              <xsl:apply-templates select="." mode="auto-glossary-as-blocks">
-                <xsl:with-param name="terms" select="$terms"/>
-              </xsl:apply-templates>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:apply-templates select="." mode="auto-glossary-as-list">
-                <xsl:with-param name="width" select="$width"/>
-                <xsl:with-param name="terms" select="$terms"/>
-              </xsl:apply-templates>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:if>
-      </xsl:for-each>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:choose>
-        <xsl:when test="$presentation = 'list'">
-          <fo:list-block provisional-distance-between-starts="{$width}"
-                         provisional-label-separation="{$glossterm.separation}"
-                         xsl:use-attribute-sets="normal.para.spacing">
-            <xsl:choose>
-              <xsl:when test="$glossary.sort != 0">
-                <xsl:for-each select="$collection//glossentry">
-                  <xsl:sort lang="{$language}"
-                            select="translate(glossterm, $lowercase, 
-                                              $uppercase)"/>
-                  <xsl:variable name="cterm" select="glossterm"/>
-                  <xsl:if test="$terms[@baseform = $cterm or . = $cterm]">
-                    <xsl:apply-templates select="." 
-                                         mode="auto-glossary-as-list"/>
-                  </xsl:if>
-                </xsl:for-each>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:for-each select="$collection//glossentry">
-                  <xsl:variable name="cterm" select="glossterm"/>
-                  <xsl:if test="$terms[@baseform = $cterm or . = $cterm]">
-                    <xsl:apply-templates select="." 
-                                         mode="auto-glossary-as-list"/>
-                  </xsl:if>
-                </xsl:for-each>
-              </xsl:otherwise>
-            </xsl:choose>
-          </fo:list-block>
-        </xsl:when>
-        <xsl:when test="$presentation = 'blocks' or
-                        $glossary.as.blocks != 0">
-          <xsl:choose>
-            <xsl:when test="$glossary.sort != 0">
-              <xsl:for-each select="$collection//glossentry">
-                <xsl:sort lang="{$language}"
-                          select="translate(glossterm, $lowercase, 
-                                            $uppercase)"/>
-                <xsl:variable name="cterm" select="glossterm"/>
-                <xsl:if test="$terms[@baseform = $cterm or . = $cterm]">
-                  <xsl:apply-templates select="." 
-                                       mode="auto-glossary-as-blocks"/>
-                </xsl:if>
-              </xsl:for-each>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:for-each select="$collection//glossentry">
-                <xsl:variable name="cterm" select="glossterm"/>
-                <xsl:if test="$terms[@baseform = $cterm or . = $cterm]">
-                  <xsl:apply-templates select="." 
-                                       mode="auto-glossary-as-blocks"/>
-                </xsl:if>
-              </xsl:for-each>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:when>
-        <xsl:otherwise>
-          <fo:list-block provisional-distance-between-starts="{$width}"
-                         provisional-label-separation="{$glossterm.separation}"
-                         xsl:use-attribute-sets="normal.para.spacing">
-            <xsl:choose>
-              <xsl:when test="$glossary.sort != 0">
-                <xsl:for-each select="$collection//glossentry">
-                  <xsl:sort lang="{$language}"
-                            select="translate(glossterm, $lowercase, 
-                                              $uppercase)"/>
-                  <xsl:variable name="cterm" select="glossterm"/>
-                  <xsl:if test="$terms[@baseform = $cterm or . = $cterm]">
-                    <xsl:apply-templates select="." 
-                                         mode="auto-glossary-as-list"/>
-                  </xsl:if>
-                </xsl:for-each>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:for-each select="$collection//glossentry">
-                  <xsl:variable name="cterm" select="glossterm"/>
-                  <xsl:if test="$terms[@baseform = $cterm or . = $cterm]">
-                    <xsl:apply-templates select="." 
-                                         mode="auto-glossary-as-list"/>
-                  </xsl:if>
-                </xsl:for-each>
-              </xsl:otherwise>
-            </xsl:choose>
-          </fo:list-block>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="book/glossary[@role='auto']|
-                     part/glossary[@role='auto']|
-                     /glossary[@role='auto']" priority="2.5">
-  <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
-
-  <xsl:variable name="master-reference">
-    <xsl:call-template name="select.pagemaster"/>
-  </xsl:variable>
-
-  <xsl:if test="$glossary.collection = ''">
-    <xsl:message>
-      <xsl:text>Warning: processing automatic glossary </xsl:text>
-      <xsl:text>without a glossary.collection file.</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <fo:page-sequence hyphenate="{$hyphenate}"
-                    master-reference="{$master-reference}">
-    <xsl:attribute name="language">
-      <xsl:call-template name="l10n.language"/>
-    </xsl:attribute>
-    <xsl:attribute name="format">
-      <xsl:call-template name="page.number.format">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="initial-page-number">
-      <xsl:call-template name="initial.page.number">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="force-page-count">
-      <xsl:call-template name="force.page.count">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="hyphenation-character">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-character'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="hyphenation-push-character-count">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-push-character-count'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="hyphenation-remain-character-count">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-remain-character-count'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:apply-templates select="." mode="running.head.mode">
-      <xsl:with-param name="master-reference" select="$master-reference"/>
-    </xsl:apply-templates>
-    <xsl:apply-templates select="." mode="running.foot.mode">
-      <xsl:with-param name="master-reference" select="$master-reference"/>
-    </xsl:apply-templates>
-
-    <fo:flow flow-name="xsl-region-body">
-      <xsl:call-template name="set.flow.properties">
-        <xsl:with-param name="element" select="local-name(.)"/>
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-
-      <xsl:call-template name="make-auto-glossary"/>
-    </fo:flow>
-  </fo:page-sequence>
-</xsl:template>
-
-<xsl:template match="glossdiv" mode="auto-glossary-as-list">
-  <xsl:param name="width" select="$glossterm.width"/>
-  <xsl:param name="terms" select="."/>
-
-  &setup-language-variable;
-
-  <xsl:variable name="preamble"
-                select="*[not(self::title
-                            or self::subtitle
-                            or self::glossentry)]"/>
-
-  <xsl:call-template name="glossdiv.titlepage"/>
-
-  <xsl:apply-templates select="$preamble"/>
-
-  <fo:list-block provisional-distance-between-starts="{$width}"
-                 provisional-label-separation="{$glossterm.separation}"
-                 xsl:use-attribute-sets="normal.para.spacing">
-    <xsl:choose>
-      <xsl:when test="$glossary.sort != 0">
-        <xsl:for-each select="glossentry">
-          <xsl:sort lang="{$language}"
-                    select="translate(glossterm, $lowercase, $uppercase)"/>
-          <xsl:variable name="cterm" select="glossterm"/>
-          <xsl:if test="$terms[@baseform = $cterm or . = $cterm]">
-            <xsl:apply-templates select="." mode="auto-glossary-as-list"/>
-          </xsl:if>
-        </xsl:for-each>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:for-each select="glossentry">
-          <xsl:variable name="cterm" select="glossterm"/>
-          <xsl:if test="$terms[@baseform = $cterm or . = $cterm]">
-            <xsl:apply-templates select="." mode="auto-glossary-as-list"/>
-          </xsl:if>
-        </xsl:for-each>
-      </xsl:otherwise>
-    </xsl:choose>
-  </fo:list-block>
-</xsl:template>
-
-<xsl:template match="glossentry" mode="auto-glossary-as-list">
-  <xsl:apply-templates select="." mode="glossary.as.list"/>
-</xsl:template>
-
-<xsl:template match="glossdiv" mode="auto-glossary-as-blocks">
-  <xsl:param name="terms" select="."/>
-
-  &setup-language-variable;
-
-  <xsl:variable name="preamble"
-                select="*[not(self::title
-                            or self::subtitle
-                            or self::glossentry)]"/>
-
-  <xsl:call-template name="glossdiv.titlepage"/>
-
-  <xsl:apply-templates select="$preamble"/>
-
-  <xsl:choose>
-    <xsl:when test="$glossary.sort != 0">
-      <xsl:for-each select="glossentry">
-        <xsl:sort lang="{$language}"
-                  select="translate(glossterm, $lowercase, $uppercase)"/>
-        <xsl:variable name="cterm" select="glossterm"/>
-        <xsl:if test="$terms[@baseform = $cterm or . = $cterm]">
-          <xsl:apply-templates select="." mode="auto-glossary-as-blocks"/>
-        </xsl:if>
-      </xsl:for-each>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:for-each select="glossentry">
-        <xsl:variable name="cterm" select="glossterm"/>
-        <xsl:if test="$terms[@baseform = $cterm or . = $cterm]">
-          <xsl:apply-templates select="." mode="auto-glossary-as-blocks"/>
-        </xsl:if>
-      </xsl:for-each>
-    </xsl:otherwise>
-  </xsl:choose>
-
-</xsl:template>
-
-<xsl:template match="glossentry" mode="auto-glossary-as-blocks">
-  <xsl:apply-templates select="." mode="glossary.as.blocks"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-<!-- Format glossary as a list -->
-
-<xsl:template match="glossdiv" mode="glossary.as.list">
-  <xsl:param name="width" select="$glossterm.width"/>
-
-  &setup-language-variable;
-
-  <xsl:variable name="entries" select="glossentry"/>
-
-  <xsl:variable name="preamble"
-                select="*[not(self::title
-                            or self::subtitle
-                            or self::glossentry)]"/>
-
-  <xsl:call-template name="glossdiv.titlepage"/>
-
-  <xsl:apply-templates select="$preamble"/>
-
-  <fo:list-block provisional-distance-between-starts="{$width}"
-                 provisional-label-separation="{$glossterm.separation}"
-                 xsl:use-attribute-sets="normal.para.spacing">
-    <xsl:choose>
-      <xsl:when test="$glossary.sort != 0">
-        <xsl:apply-templates select="$entries" mode="glossary.as.list">
-          <xsl:sort lang="{$language}"
-                    select="translate(glossterm, $lowercase, 
-                                      $uppercase)"/>
-        </xsl:apply-templates>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:apply-templates select="$entries" mode="glossary.as.list"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </fo:list-block>
-</xsl:template>
-
-<!--
-GlossEntry ::=
-  GlossTerm, Acronym?, Abbrev?,
-  (IndexTerm)*,
-  RevHistory?,
-  (GlossSee | GlossDef+)
--->
-
-<xsl:template match="glossentry" mode="glossary.as.list">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <fo:list-item xsl:use-attribute-sets="normal.para.spacing">
-    <xsl:call-template name="anchor">
-      <xsl:with-param name="conditional">
-        <xsl:choose>
-          <xsl:when test="$glossterm.auto.link != 0
-                          or $glossary.collection != ''">0</xsl:when>
-          <xsl:otherwise>1</xsl:otherwise>
-        </xsl:choose>
-      </xsl:with-param>
-    </xsl:call-template>
-
-    <fo:list-item-label end-indent="label-end()">
-      <fo:block>
-        <xsl:choose>
-          <xsl:when test="$glossentry.show.acronym = 'primary'">
-            <xsl:choose>
-              <xsl:when test="acronym|abbrev">
-                <xsl:apply-templates select="acronym|abbrev" 
-                                     mode="glossary.as.list"/>
-                <xsl:text> (</xsl:text>
-                <xsl:apply-templates select="glossterm" 
-                                     mode="glossary.as.list"/>
-                <xsl:text>)</xsl:text>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:apply-templates select="glossterm" 
-                                     mode="glossary.as.list"/>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:when>
-
-          <xsl:when test="$glossentry.show.acronym = 'yes'">
-            <xsl:apply-templates select="glossterm" mode="glossary.as.list"/>
-
-            <xsl:if test="acronym|abbrev">
-              <xsl:text> (</xsl:text>
-              <xsl:apply-templates select="acronym|abbrev" 
-                                   mode="glossary.as.list"/>
-              <xsl:text>)</xsl:text>
-            </xsl:if>
-          </xsl:when>
-
-          <xsl:otherwise>
-            <xsl:apply-templates select="glossterm" mode="glossary.as.list"/>
-          </xsl:otherwise>
-        </xsl:choose>
-        <xsl:apply-templates select="indexterm"/>
-      </fo:block>
-    </fo:list-item-label>
-
-    <fo:list-item-body start-indent="body-start()">
-      <xsl:apply-templates select="glosssee|glossdef" mode="glossary.as.list"/>
-    </fo:list-item-body>
-  </fo:list-item>
-</xsl:template>
-
-<xsl:template match="glossentry/glossterm" mode="glossary.as.list">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-  <fo:inline id="{$id}">
-    <xsl:apply-templates/>
-  </fo:inline>
-  <xsl:if test="following-sibling::glossterm">, </xsl:if>
-</xsl:template>
-
-<xsl:template match="glossentry/acronym" mode="glossary.as.list">
-  <xsl:apply-templates/>
-  <xsl:if test="following-sibling::acronym|following-sibling::abbrev">, </xsl:if>
-</xsl:template>
-
-<xsl:template match="glossentry/abbrev" mode="glossary.as.list">
-  <xsl:apply-templates/>
-  <xsl:if test="following-sibling::acronym|following-sibling::abbrev">, </xsl:if>
-</xsl:template>
-
-<xsl:template match="glossentry/revhistory" mode="glossary.as.list">
-</xsl:template>
-
-<xsl:template match="glossentry/glosssee" mode="glossary.as.list">
-  <xsl:variable name="otherterm" select="@otherterm"/>
-  <xsl:variable name="targets" select="key('id', $otherterm)"/>
-  <xsl:variable name="target" select="$targets[1]"/>
-
-  <fo:block>
-    <xsl:variable name="template">
-      <xsl:call-template name="gentext.template">
-        <xsl:with-param name="context" select="'glossary'"/>
-        <xsl:with-param name="name" select="'see'"/>
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="title">
-      <xsl:choose>
-        <xsl:when test="$target">
-          <fo:basic-link internal-destination="{$otherterm}"
-                         xsl:use-attribute-sets="xref.properties">
-            <xsl:apply-templates select="$target" mode="xref-to"/>
-          </fo:basic-link>
-        </xsl:when>
-        <xsl:when test="$otherterm != '' and not($target)">
-          <xsl:message>
-            <xsl:text>Warning: glosssee @otherterm reference not found: </xsl:text>
-            <xsl:value-of select="$otherterm"/>
-          </xsl:message>
-          <xsl:apply-templates mode="glossary.as.list"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates mode="glossary.as.list"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:call-template name="substitute-markup">
-      <xsl:with-param name="template" select="$template"/>
-      <xsl:with-param name="title" select="$title"/>
-    </xsl:call-template>
-
-    <xsl:text>.</xsl:text>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="glossentry/glossdef" mode="glossary.as.list">
-  <xsl:apply-templates select="*[local-name(.) != 'glossseealso']"/>
-  <xsl:if test="glossseealso">
-    <fo:block>
-      <xsl:variable name="template">
-        <xsl:call-template name="gentext.template">
-          <xsl:with-param name="context" select="'glossary'"/>
-          <xsl:with-param name="name" select="'seealso'"/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:variable name="title">
-        <xsl:apply-templates select="glossseealso" mode="glossary.as.list"/>
-      </xsl:variable>
-      <xsl:call-template name="substitute-markup">
-        <xsl:with-param name="template" select="$template"/>
-        <xsl:with-param name="title" select="$title"/>
-      </xsl:call-template>
-    </fo:block>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="glossentry/glossdef/para[1]|glossentry/glossdef/simpara[1]"
-              mode="glossary.as.list">
-  <fo:block>
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="glossseealso" mode="glossary.as.list">
-  <xsl:variable name="otherterm" select="@otherterm"/>
-  <xsl:variable name="targets" select="key('id', $otherterm)"/>
-  <xsl:variable name="target" select="$targets[1]"/>
-
-  <xsl:choose>
-    <xsl:when test="$target">
-      <fo:basic-link internal-destination="{$otherterm}"
-                     xsl:use-attribute-sets="xref.properties">
-        <xsl:apply-templates select="$target" mode="xref-to"/>
-      </fo:basic-link>
-    </xsl:when>
-    <xsl:when test="$otherterm != '' and not($target)">
-      <xsl:message>
-        <xsl:text>Warning: glossseealso @otherterm reference not found: </xsl:text>
-        <xsl:value-of select="$otherterm"/>
-      </xsl:message>
-      <xsl:apply-templates mode="glossary.as.list"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates mode="glossary.as.list"/>
-    </xsl:otherwise>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="position() = last()">
-      <xsl:text>.</xsl:text>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:text>, </xsl:text>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-<!-- Format glossary blocks -->
-
-<xsl:template match="glossdiv" mode="glossary.as.blocks">
-  &setup-language-variable;
-  <xsl:variable name="entries" select="glossentry"/>
-  <xsl:variable name="preamble"
-                select="*[not(self::title
-                            or self::subtitle
-                            or self::glossentry)]"/>
-
-  <xsl:call-template name="glossdiv.titlepage"/>
-
-  <xsl:apply-templates select="$preamble"/>
-
-  <xsl:choose>
-    <xsl:when test="$glossary.sort != 0">
-      <xsl:apply-templates select="$entries" mode="glossary.as.blocks">
-        <xsl:sort lang="{$language}"
-                  select="translate(glossterm, $lowercase, 
-                                    $uppercase)"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates select="$entries" mode="glossary.as.blocks"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!--
-GlossEntry ::=
-  GlossTerm, Acronym?, Abbrev?,
-  (IndexTerm)*,
-  RevHistory?,
-  (GlossSee | GlossDef+)
--->
-
-<xsl:template match="glossentry" mode="glossary.as.blocks">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <fo:block xsl:use-attribute-sets="list.item.spacing"
-           keep-with-next.within-column="always" 
-           keep-together.within-column="always">
-    <xsl:call-template name="anchor">
-      <xsl:with-param name="conditional">
-        <xsl:choose>
-          <xsl:when test="$glossterm.auto.link != 0
-                          or $glossary.collection != ''">0</xsl:when>
-          <xsl:otherwise>1</xsl:otherwise>
-        </xsl:choose>
-      </xsl:with-param>
-    </xsl:call-template>
-
-    <xsl:choose>
-      <xsl:when test="$glossentry.show.acronym = 'primary'">
-        <xsl:choose>
-          <xsl:when test="acronym|abbrev">
-            <xsl:apply-templates select="acronym|abbrev" mode="glossary.as.blocks"/>
-            <xsl:text> (</xsl:text>
-            <xsl:apply-templates select="glossterm" mode="glossary.as.blocks"/>
-            <xsl:text>)</xsl:text>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:apply-templates select="glossterm" mode="glossary.as.blocks"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-
-      <xsl:when test="$glossentry.show.acronym = 'yes'">
-        <xsl:apply-templates select="glossterm" mode="glossary.as.blocks"/>
-
-        <xsl:if test="acronym|abbrev">
-          <xsl:text> (</xsl:text>
-          <xsl:apply-templates select="acronym|abbrev" mode="glossary.as.blocks"/>
-          <xsl:text>)</xsl:text>
-        </xsl:if>
-      </xsl:when>
-
-      <xsl:otherwise>
-        <xsl:apply-templates select="glossterm" mode="glossary.as.blocks"/>
-      </xsl:otherwise>
-    </xsl:choose>
-
-    <xsl:apply-templates select="indexterm"/>
-  </fo:block>
-
-  <fo:block margin-left="0.25in">
-    <xsl:apply-templates select="glosssee|glossdef" mode="glossary.as.blocks"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="glossentry/glossterm" mode="glossary.as.blocks">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-  <fo:inline id="{$id}">
-    <xsl:apply-templates/>
-  </fo:inline>
-  <xsl:if test="following-sibling::glossterm">, </xsl:if>
-</xsl:template>
-
-<xsl:template match="glossentry/acronym" mode="glossary.as.blocks">
-  <xsl:apply-templates/>
-  <xsl:if test="following-sibling::acronym|following-sibling::abbrev">, </xsl:if>
-</xsl:template>
-
-<xsl:template match="glossentry/abbrev" mode="glossary.as.blocks">
-  <xsl:apply-templates/>
-  <xsl:if test="following-sibling::acronym|following-sibling::abbrev">, </xsl:if>
-</xsl:template>
-
-<xsl:template match="glossentry/glosssee" mode="glossary.as.blocks">
-  <xsl:variable name="otherterm" select="@otherterm"/>
-  <xsl:variable name="targets" select="key('id', $otherterm)"/>
-  <xsl:variable name="target" select="$targets[1]"/>
-
-  <xsl:variable name="template">
-    <xsl:call-template name="gentext.template">
-      <xsl:with-param name="context" select="'glossary'"/>
-      <xsl:with-param name="name" select="'see'"/>
-    </xsl:call-template>
-  </xsl:variable>
-  <xsl:variable name="title">
-    <xsl:choose>
-      <xsl:when test="$target">
-        <fo:basic-link internal-destination="{$otherterm}"
-                       xsl:use-attribute-sets="xref.properties">
-          <xsl:apply-templates select="$target" mode="xref-to"/>
-        </fo:basic-link>
-      </xsl:when>
-      <xsl:when test="$otherterm != '' and not($target)">
-        <xsl:message>
-          <xsl:text>Warning: glosssee @otherterm reference not found: </xsl:text>
-          <xsl:value-of select="$otherterm"/>
-        </xsl:message>
-        <xsl:apply-templates mode="glossary.as.blocks"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:apply-templates mode="glossary.as.blocks"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-  <xsl:call-template name="substitute-markup">
-    <xsl:with-param name="template" select="$template"/>
-    <xsl:with-param name="title" select="$title"/>
-  </xsl:call-template>
-
-  <xsl:text>.</xsl:text>
-</xsl:template>
-
-<xsl:template match="glossentry/glossdef" mode="glossary.as.blocks">
-  <xsl:apply-templates select="*[local-name(.) != 'glossseealso']"
-                       mode="glossary.as.blocks"/>
-  <xsl:if test="glossseealso">
-    <fo:block>
-      <xsl:variable name="template">
-        <xsl:call-template name="gentext.template">
-          <xsl:with-param name="context" select="'glossary'"/>
-          <xsl:with-param name="name" select="'seealso'"/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:variable name="title">
-        <xsl:apply-templates select="glossseealso" mode="glossary.as.blocks"/>
-      </xsl:variable>
-      <xsl:call-template name="substitute-markup">
-        <xsl:with-param name="template" select="$template"/>
-        <xsl:with-param name="title" select="$title"/>
-      </xsl:call-template>
-    </fo:block>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="glossentry/glossdef/para[1]|glossentry/glossdef/simpara[1]"
-              mode="glossary.as.blocks">
-  <fo:block>
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<!-- Handle any other glossdef content normally -->
-<xsl:template match="*" mode="glossary.as.blocks">
-  <xsl:apply-templates select="." />
-</xsl:template>
-
-<xsl:template match="glossseealso" mode="glossary.as.blocks">
-  <xsl:variable name="otherterm" select="@otherterm"/>
-  <xsl:variable name="targets" select="key('id', $otherterm)"/>
-  <xsl:variable name="target" select="$targets[1]"/>
-
-  <xsl:choose>
-    <xsl:when test="$target">
-      <fo:basic-link internal-destination="{$otherterm}"
-                     xsl:use-attribute-sets="xref.properties">
-        <xsl:apply-templates select="$target" mode="xref-to"/>
-      </fo:basic-link>
-    </xsl:when>
-    <xsl:when test="$otherterm != '' and not($target)">
-      <xsl:message>
-        <xsl:text>Warning: glossseealso @otherterm reference not found: </xsl:text>
-        <xsl:value-of select="$otherterm"/>
-      </xsl:message>
-      <xsl:apply-templates mode="glossary.as.blocks"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates mode="glossary.as.blocks"/>
-    </xsl:otherwise>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="position() = last()">
-      <xsl:text>.</xsl:text>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:text>, </xsl:text>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/graphics.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/graphics.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,637 +1,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE xsl:stylesheet [
-<!ENTITY lowercase "'abcdefghijklmnopqrstuvwxyz'">
-<!ENTITY uppercase "'ABCDEFGHIJKLMNOPQRSTUVWXYZ'">
- ]>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                xmlns:xlink="http://www.w3.org/1999/xlink"
-                xmlns:stext="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.TextFactory"
-                xmlns:xtext="com.nwalsh.xalan.Text"
-                xmlns:lxslt="http://xml.apache.org/xslt"
-                exclude-result-prefixes="xlink stext xtext lxslt"
-                extension-element-prefixes="stext xtext"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     Contributors:
-     Colin Paul Adams, <colin@colina.demon.co.uk>
-     Paul Grosso, <pgrosso@arbortext.com>
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-<!-- Graphic format tests for the FO backend -->
-
-<xsl:param name="graphic.notations">
-  <!-- n.b. exactly one leading space, one trailing space, and one inter-word space -->
-  <xsl:choose>
-    <xsl:when test="$passivetex.extensions != 0">
-      <xsl:text> PNG PDF JPG JPEG linespecific </xsl:text>
-    </xsl:when>
-    <xsl:when test="$fop1.extensions != 0">
-      <xsl:text> BMP GIF TIFF SVG PNG EPS JPG JPEG linespecific </xsl:text>
-    </xsl:when>
-    <xsl:when test="$fop.extensions != 0">
-      <xsl:text> BMP GIF TIFF SVG PNG EPS JPG JPEG linespecific </xsl:text>
-    </xsl:when>
-    <xsl:when test="$arbortext.extensions != 0">
-      <xsl:text> PNG PDF JPG JPEG linespecific GIF GIF87a GIF89a TIFF BMP </xsl:text>
-    </xsl:when>
-    <xsl:when test="$xep.extensions != 0">
-      <xsl:text> SVG PNG PDF JPG JPEG linespecific GIF GIF87a GIF89a TIFF BMP </xsl:text>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:text> PNG PDF JPG JPEG linespecific GIF GIF87a GIF89a TIFF BMP </xsl:text>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:param>
-
-<xsl:template name="is.graphic.format">
-  <xsl:param name="format"/>
-  <xsl:if test="contains($graphic.notations, concat(' ',$format,' '))">1</xsl:if>
-</xsl:template>
-
-<xsl:param name="graphic.extensions">
-  <!-- n.b. exactly one leading space, one trailing space, and one inter-word space -->
-  <xsl:choose>
-    <xsl:when test="$passivetex.extensions != 0">
-      <xsl:text> png pdf jpg jpeg </xsl:text>
-    </xsl:when>
-    <xsl:when test="$fop1.extensions != 0">
-      <xsl:text> bmp gif tif tiff svg png pdf jpg jpeg eps </xsl:text>
-    </xsl:when>
-    <xsl:when test="$fop.extensions != 0">
-      <xsl:text> bmp gif tif tiff svg png pdf jpg jpeg eps </xsl:text>
-    </xsl:when>
-    <xsl:when test="$arbortext.extensions != 0">
-      <xsl:text> png pdf jpg jpeg gif tif tiff bmp </xsl:text>
-    </xsl:when>
-    <xsl:when test="$xep.extensions != 0">
-      <xsl:text> svg png pdf jpg jpeg gif tif tiff bmp eps </xsl:text>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:text> svg png pdf jpg jpeg gif tif tiff bmp eps </xsl:text>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:param>
-
-<xsl:template name="is.graphic.extension">
-  <xsl:param name="ext"/>
-  <xsl:variable name="lcext" select="translate($ext,
-                                       'ABCDEFGHIJKLMNOPQRSTUVWXYZ',
-                                       'abcdefghijklmnopqrstuvwxyz')"/>
-
-  <xsl:if test="contains($graphic.extensions,
-                         concat(' ', $lcext, ' '))">1</xsl:if>
-</xsl:template>
-
-<xsl:template name="graphic.format.content-type">
-  <xsl:param name="format"/>
-  <xsl:variable name="is.graphic.format">
-    <xsl:call-template name="is.graphic.format">
-      <xsl:with-param name="format" select="$format"/>
-    </xsl:call-template>
-  </xsl:variable>
-  <xsl:if test="$is.graphic.format">
-    <xsl:choose>
-      <xsl:when test="$format = ''"></xsl:when>
-      <xsl:when test="$format = 'linespecific'"></xsl:when>
-      <xsl:when test="$format = 'PS'">application/postscript</xsl:when>
-      <xsl:when test="$format = 'PDF'">application/pdf</xsl:when>
-      <xsl:when test="$format = 'PNG'">image/png</xsl:when>
-      <xsl:when test="$format = 'SVG'">image/svg+xml</xsl:when>
-      <xsl:when test="$format = 'JPG'">image/jpeg</xsl:when>
-      <xsl:when test="$format = 'GIF87a'">image/gif</xsl:when>
-      <xsl:when test="$format = 'GIF89a'">image/gif</xsl:when>
-      <xsl:otherwise>
-          <xsl:value-of select="concat('image/', 
-            translate($format, &uppercase;, &lowercase;))"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:if>
-</xsl:template>
-
-
-<!-- ==================================================================== -->
-
-<xsl:template match="screenshot">
-  <fo:block>
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="screeninfo">
-</xsl:template>
-
-<!-- ==================================================================== -->
-<!-- Override these templates for FO -->
-<!-- ==================================================================== -->
-
-<xsl:template name="process.image">
-  <!-- When this template is called, the current node should be  -->
-  <!-- a graphic, inlinegraphic, imagedata, or videodata. All    -->
-  <!-- those elements have the same set of attributes, so we can -->
-  <!-- handle them all in one place.                             -->
-
-  <xsl:variable name="scalefit">
-    <xsl:choose>
-      <xsl:when test="$ignore.image.scaling != 0">0</xsl:when>
-      <xsl:when test="@contentwidth">0</xsl:when>
-      <xsl:when test="@contentdepth and 
-                      @contentdepth != '100%'">0</xsl:when>
-      <xsl:when test="@scale">0</xsl:when>
-      <xsl:when test="@scalefit"><xsl:value-of select="@scalefit"/></xsl:when>
-      <xsl:when test="@width or @depth">1</xsl:when>
-      <xsl:otherwise>0</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="scale">
-    <xsl:choose>
-      <xsl:when test="$ignore.image.scaling != 0">0</xsl:when>
-      <xsl:when test="@contentwidth or @contentdepth">1.0</xsl:when>
-      <xsl:when test="@scale">
-        <xsl:value-of select="@scale div 100.0"/>
-      </xsl:when>
-      <xsl:otherwise>1.0</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="filename">
-    <xsl:choose>
-      <xsl:when test="local-name(.) = 'graphic'
-                      or local-name(.) = 'inlinegraphic'">
-        <!-- handle legacy graphic and inlinegraphic by new template --> 
-        <xsl:call-template name="mediaobject.filename">
-          <xsl:with-param name="object" select="."/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <!-- imagedata, videodata, audiodata -->
-        <xsl:call-template name="mediaobject.filename">
-          <xsl:with-param name="object" select=".."/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="content-type">
-    <xsl:if test="@format">
-      <xsl:call-template name="graphic.format.content-type">
-        <xsl:with-param name="format" select="@format"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:variable name="bgcolor">
-    <xsl:call-template name="pi.dbfo_background-color">
-      <xsl:with-param name="node" select=".."/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <fo:external-graphic>
-    <xsl:attribute name="src">
-      <xsl:call-template name="fo-external-image">
-        <xsl:with-param name="filename">
-          <xsl:if test="$img.src.path != '' and
-                        not(starts-with($filename, '/')) and
-                        not(contains($filename, '://'))">
-            <xsl:value-of select="$img.src.path"/>
-          </xsl:if>
-          <xsl:value-of select="$filename"/>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="width">
-      <xsl:choose>
-        <xsl:when test="$ignore.image.scaling != 0">auto</xsl:when>
-        <xsl:when test="contains(@width,'%')">
-          <xsl:value-of select="@width"/>
-        </xsl:when>
-        <xsl:when test="@width and not(@width = '')">
-          <xsl:call-template name="length-spec">
-            <xsl:with-param name="length" select="@width"/>
-            <xsl:with-param name="default.units" select="'px'"/>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:when test="not(@depth) and $default.image.width != ''">
-          <xsl:call-template name="length-spec">
-            <xsl:with-param name="length" select="$default.image.width"/>
-            <xsl:with-param name="default.units" select="'px'"/>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>auto</xsl:otherwise>
-      </xsl:choose>
-    </xsl:attribute>
-
-    <xsl:attribute name="height">
-      <xsl:choose>
-        <xsl:when test="$ignore.image.scaling != 0">auto</xsl:when>
-        <xsl:when test="contains(@depth,'%')">
-          <xsl:value-of select="@depth"/>
-        </xsl:when>
-        <xsl:when test="@depth">
-          <xsl:call-template name="length-spec">
-            <xsl:with-param name="length" select="@depth"/>
-            <xsl:with-param name="default.units" select="'px'"/>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>auto</xsl:otherwise>
-      </xsl:choose>
-    </xsl:attribute>
-
-    <xsl:attribute name="content-width">
-      <xsl:choose>
-        <xsl:when test="$ignore.image.scaling != 0">auto</xsl:when>
-        <xsl:when test="contains(@contentwidth,'%')">
-          <xsl:value-of select="@contentwidth"/>
-        </xsl:when>
-        <xsl:when test="@contentwidth">
-          <xsl:call-template name="length-spec">
-            <xsl:with-param name="length" select="@contentwidth"/>
-            <xsl:with-param name="default.units" select="'px'"/>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:when test="number($scale) != 1.0">
-          <xsl:value-of select="$scale * 100"/>
-          <xsl:text>%</xsl:text>
-        </xsl:when>
-        <xsl:when test="$scalefit = 1">scale-to-fit</xsl:when>
-        <xsl:otherwise>auto</xsl:otherwise>
-      </xsl:choose>
-    </xsl:attribute>
-
-    <xsl:attribute name="content-height">
-      <xsl:choose>
-        <xsl:when test="$ignore.image.scaling != 0">auto</xsl:when>
-        <xsl:when test="contains(@contentdepth,'%')">
-          <xsl:value-of select="@contentdepth"/>
-        </xsl:when>
-        <xsl:when test="@contentdepth">
-          <xsl:call-template name="length-spec">
-            <xsl:with-param name="length" select="@contentdepth"/>
-            <xsl:with-param name="default.units" select="'px'"/>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:when test="number($scale) != 1.0">
-          <xsl:value-of select="$scale * 100"/>
-          <xsl:text>%</xsl:text>
-        </xsl:when>
-        <xsl:when test="$scalefit = 1">scale-to-fit</xsl:when>
-        <xsl:otherwise>auto</xsl:otherwise>
-      </xsl:choose>
-    </xsl:attribute>
-
-    <xsl:if test="$content-type != ''">
-      <xsl:attribute name="content-type">
-        <xsl:value-of select="concat('content-type:',$content-type)"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <xsl:if test="$bgcolor != ''">
-      <xsl:attribute name="background-color">
-        <xsl:value-of select="$bgcolor"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <xsl:if test="@align">
-      <xsl:attribute name="text-align">
-        <xsl:value-of select="@align"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <xsl:if test="@valign">
-      <xsl:attribute name="display-align">
-        <xsl:choose>
-          <xsl:when test="@valign = 'top'">before</xsl:when>
-          <xsl:when test="@valign = 'middle'">center</xsl:when>
-          <xsl:when test="@valign = 'bottom'">after</xsl:when>
-          <xsl:otherwise>auto</xsl:otherwise>
-        </xsl:choose>
-      </xsl:attribute>
-    </xsl:if>
-  </fo:external-graphic>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="graphic">
-  <xsl:choose>
-    <xsl:when test="parent::inlineequation">
-      <xsl:call-template name="process.image"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <fo:block>
-        <xsl:if test="@align">
-          <xsl:attribute name="text-align">
-            <xsl:value-of select="@align"/>
-          </xsl:attribute>
-        </xsl:if>
-        <xsl:call-template name="process.image"/>
-      </fo:block>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="inlinegraphic">
-  <xsl:variable name="vendor" select="system-property('xsl:vendor')"/>
-  <xsl:variable name="filename">
-    <xsl:choose>
-      <xsl:when test="@entityref">
-        <xsl:value-of select="unparsed-entity-uri(@entityref)"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:apply-templates select="@fileref"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="@format='linespecific'">
-      <xsl:choose>
-        <xsl:when test="$use.extensions != '0'
-                        and $textinsert.extension != '0'">
-          <xsl:choose>
-            <xsl:when test="contains($vendor, 'SAXON')">
-              <stext:insertfile href="{$filename}" encoding="{$textdata.default.encoding}"/>
-            </xsl:when>
-            <xsl:when test="contains($vendor, 'Apache Software Foundation')">
-              <xtext:insertfile href="{$filename}"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:message terminate="yes">
-                <xsl:text>Don't know how to insert files with </xsl:text>
-                <xsl:value-of select="$vendor"/>
-              </xsl:message>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:when>
-	<xsl:otherwise>
-	  <xsl:message terminate="yes">
-	    <xsl:text>Cannot insert </xsl:text><xsl:value-of select="$filename"/>
-	    <xsl:text>. Check use.extensions and textinsert.extension parameters.</xsl:text> 
-	  </xsl:message>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="process.image"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="mediaobject|mediaobjectco">
-
-  <xsl:variable name="olist" select="imageobject|imageobjectco
-                     |videoobject|audioobject
-                     |textobject"/>
-
-  <xsl:variable name="object.index">
-    <xsl:call-template name="select.mediaobject.index">
-      <xsl:with-param name="olist" select="$olist"/>
-      <xsl:with-param name="count" select="1"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="object" select="$olist[position() = $object.index]"/>
-
-  <xsl:variable name="align">
-    <xsl:value-of select="$object/descendant::imagedata[@align][1]/@align"/>
-  </xsl:variable>
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <fo:block id="{$id}">
-    <xsl:if test="$align != '' ">
-      <xsl:attribute name="text-align">
-        <xsl:value-of select="$align"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <xsl:apply-templates select="$object"/>
-    <xsl:apply-templates select="caption"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="inlinemediaobject">
-  <xsl:call-template name="select.mediaobject"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="imageobjectco">
-  <xsl:apply-templates select="imageobject"/>
-  <xsl:apply-templates select="calloutlist"/>
-</xsl:template>
-
-<xsl:template match="imageobject">
-  <xsl:choose>
-    <xsl:when test="imagedata">
-      <xsl:apply-templates select="imagedata"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <fo:instream-foreign-object>
-        <xsl:apply-templates mode="copy-all"/>
-      </fo:instream-foreign-object>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="*" mode="copy-all">
-  <xsl:copy>
-    <xsl:for-each select="@*">
-      <xsl:copy/>
-    </xsl:for-each>
-    <xsl:apply-templates mode="copy-all"/>
-  </xsl:copy>
-</xsl:template>
-
-<xsl:template match="text()|comment()|processing-instruction()" mode="copy-all">
-  <xsl:copy/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="imagedata">
-  <xsl:variable name="vendor" select="system-property('xsl:vendor')"/>
-  <xsl:variable name="filename">
-    <xsl:call-template name="mediaobject.filename">
-      <xsl:with-param name="object" select=".."/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="@format='linespecific'">
-      <xsl:choose>
-        <xsl:when test="$use.extensions != '0'
-                        and $textinsert.extension != '0'">
-          <xsl:choose>
-            <xsl:when test="contains($vendor, 'SAXON')">
-              <stext:insertfile href="{$filename}" encoding="{$textdata.default.encoding}"/>
-            </xsl:when>
-            <xsl:when test="contains($vendor, 'Apache Software Foundation')">
-              <xtext:insertfile href="{$filename}"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:message terminate="yes">
-                <xsl:text>Don't know how to insert files with </xsl:text>
-                <xsl:value-of select="$vendor"/>
-              </xsl:message>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:when>
-        <xsl:otherwise>
-	  <xsl:message terminate="yes">
-	    <xsl:text>Cannot insert </xsl:text><xsl:value-of select="$filename"/>
-	    <xsl:text>. Check use.extensions and textinsert.extension parameters.</xsl:text> 
-	  </xsl:message>
-	</xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="process.image"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="videoobject">
-  <xsl:apply-templates select="videodata"/>
-</xsl:template>
-
-<xsl:template match="videodata">
-  <xsl:call-template name="process.image"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="audioobject">
-  <xsl:apply-templates select="audiodata"/>
-</xsl:template>
-
-<xsl:template match="audiodata">
-  <xsl:call-template name="process.image"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="textobject">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="textdata">
-  <xsl:variable name="vendor" select="system-property('xsl:vendor')"/>
-  <xsl:variable name="filename">
-    <xsl:choose>
-      <xsl:when test="@entityref">
-        <xsl:value-of select="unparsed-entity-uri(@entityref)"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:apply-templates select="@fileref"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="encoding">
-    <xsl:choose>
-      <xsl:when test="@encoding">
-        <xsl:value-of select="@encoding"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$textdata.default.encoding"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$use.extensions != '0'
-                    and $textinsert.extension != '0'">
-      <xsl:choose>
-        <xsl:when test="element-available('stext:insertfile')">
-          <stext:insertfile href="{$filename}" encoding="{$encoding}"/>
-        </xsl:when>
-        <xsl:when test="element-available('xtext:insertfile')">
-          <xtext:insertfile href="{$filename}"/>
-        </xsl:when>
-	<xsl:otherwise>
-	  <xsl:message terminate="yes">
-	    <xsl:text>Don't know how to insert files with </xsl:text>
-	    <xsl:value-of select="$vendor"/>
-	  </xsl:message>
-	</xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:message terminate="yes">
-	<xsl:text>Cannot insert </xsl:text><xsl:value-of select="$filename"/>
-	<xsl:text>. Check use.extensions and textinsert.extension parameters.</xsl:text> 
-      </xsl:message>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="caption">
-  <fo:block>
-    <xsl:if test="@align = 'right' or @align = 'left' or @align='center'">
-      <xsl:attribute name="text-align"><xsl:value-of
-                         select="@align"/></xsl:attribute>
-    </xsl:if>
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="fo-external-image">
-  <xsl:param name="filename"/>
-
-  <xsl:choose>
-    <xsl:when test="$passivetex.extensions != 0
-                    or $fop.extensions != 0">
-      <xsl:value-of select="$filename"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="concat('url(', $filename, ')')"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- Resolve xml:base attributes -->
-<xsl:template match="@fileref">
-  <!-- need a check for absolute urls -->
-  <xsl:choose>
-    <xsl:when test="contains(., ':') or starts-with(.,'/')">
-      <!-- it has a uri scheme or starts with '/', so it is an absolute uri -->
-      <xsl:value-of select="."/>
-    </xsl:when>
-    <xsl:when test="$keep.relative.image.uris != 0">
-      <!-- leave it alone -->
-      <xsl:value-of select="."/>
-    </xsl:when>
-    <xsl:otherwise>
-      <!-- its a relative uri -->
-      <xsl:call-template name="relative-uri">
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/highlight.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/highlight.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,57 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-		xmlns:fo="http://www.w3.org/1999/XSL/Format"
-		xmlns:xslthl="http://xslthl.sf.net"
-                exclude-result-prefixes="xslthl"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     and other information.
-
-     ******************************************************************** -->
-
-<xsl:template match='xslthl:keyword'>
-  <fo:inline font-weight="bold"><xsl:apply-templates/></fo:inline>
-</xsl:template>
-
-<xsl:template match='xslthl:string'>
-  <fo:inline font-weight="bold" font-style="italic"><xsl:apply-templates/></fo:inline>
-</xsl:template>
-
-<xsl:template match='xslthl:comment'>
-  <fo:inline font-style="italic"><xsl:apply-templates/></fo:inline>
-</xsl:template>
-
-<xsl:template match='xslthl:tag'>
-  <fo:inline font-weight="bold"><xsl:apply-templates/></fo:inline>
-</xsl:template>
-
-<xsl:template match='xslthl:attribute'>
-  <fo:inline font-weight="bold"><xsl:apply-templates/></fo:inline>
-</xsl:template>
-
-<xsl:template match='xslthl:value'>
-  <fo:inline font-weight="bold"><xsl:apply-templates/></fo:inline>
-</xsl:template>
-
-<!--
-<xsl:template match='xslthl:html'>
-  <span style='background:#AFF'><font color='blue'><xsl:apply-templates/></font></span>
-</xsl:template>
-
-<xsl:template match='xslthl:xslt'>
-  <span style='background:#AAA'><font color='blue'><xsl:apply-templates/></font></span>
-</xsl:template>
-
-<xsl:template match='xslthl:section'>
-  <span style='background:yellow'><xsl:apply-templates/></span>
-</xsl:template>
--->
-
-</xsl:stylesheet>
-
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/htmltbl.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/htmltbl.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,217 +1,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:attribute-set name="th.style">
-  <xsl:attribute name="font-weight">bold</xsl:attribute>
-</xsl:attribute-set>
-
-<!-- Outputs an fo:table only, not the caption -->
-<xsl:template match="table|informaltable" mode="htmlTable">
-
-  <xsl:variable name="numcols">
-    <xsl:call-template name="widest-html-row">
-      <xsl:with-param name="rows" select=".//tr"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="prop-columns"
-                select=".//col[contains(@width, '%')] |
-                        .//colgroup[contains(@width, '%')]"/>
-
-  <xsl:variable name="table.width">
-    <xsl:call-template name="table.width"/>
-  </xsl:variable>
-
-  <fo:table xsl:use-attribute-sets="table.table.properties">
-    <xsl:choose>
-      <xsl:when test="$fop.extensions != 0 or
-                      $passivetex.extensions != 0">
-        <xsl:attribute name="table-layout">fixed</xsl:attribute>
-      </xsl:when>
-    </xsl:choose>
-    <xsl:attribute name="width">
-      <xsl:choose>
-        <xsl:when test="@width">
-          <xsl:value-of select="@width"/>
-        </xsl:when>
-        <xsl:when test="$table.width">
-          <xsl:value-of select="$table.width"/>
-        </xsl:when>
-        <xsl:otherwise>100%</xsl:otherwise>
-      </xsl:choose>
-    </xsl:attribute>
-    <xsl:call-template name="make-html-table-columns">
-      <xsl:with-param name="count" select="$numcols"/>
-    </xsl:call-template>
-    <xsl:apply-templates select="thead" mode="htmlTable"/>
-    <xsl:apply-templates select="tfoot" mode="htmlTable"/>
-    <xsl:choose>
-      <xsl:when test="tbody">
-        <xsl:apply-templates select="tbody" mode="htmlTable"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <fo:table-body start-indent="0pt" end-indent="0pt">
-          <xsl:apply-templates select="tr" mode="htmlTable"/>
-        </fo:table-body>
-      </xsl:otherwise>
-    </xsl:choose>
-  </fo:table>
-
-</xsl:template>
-
-<xsl:template match="caption" mode="htmlTable">
-  <!-- Handled by formal.object.heading -->
-</xsl:template>
-
-<xsl:template name="widest-html-row">
-  <xsl:param name="rows" select="''"/>
-  <xsl:param name="count" select="0"/>
-  <xsl:choose>
-    <xsl:when test="count($rows) = 0">
-      <xsl:value-of select="$count"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:choose>
-        <xsl:when test="$count &gt; count($rows[1]/*)">
-          <xsl:call-template name="widest-html-row">
-            <xsl:with-param name="rows" select="$rows[position() &gt; 1]"/>
-            <xsl:with-param name="count" select="$count"/>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="widest-html-row">
-            <xsl:with-param name="rows" select="$rows[position() &gt; 1]"/>
-            <xsl:with-param name="count" select="count($rows[1]/*)"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="make-html-table-columns">
-  <xsl:param name="count" select="0"/>
-  <xsl:param name="number" select="1"/>
-
-  <xsl:choose>
-    <xsl:when test="col|colgroup/col">
-      <xsl:for-each select="col|colgroup/col">
-        <fo:table-column>
-          <xsl:attribute name="column-number">
-            <xsl:number from="table|informaltable" level="any" format="1"/>
-          </xsl:attribute>
-          <xsl:if test="@width">
-            <xsl:attribute name="column-width">
-              <xsl:choose>
-                <xsl:when test="$fop.extensions != 0 and 
-                                contains(@width, '%')">
-                  <xsl:value-of select="concat('proportional-column-width(',
-                                               substring-before(@width, '%'),
-                                               ')')"/>
-                </xsl:when>
-                <xsl:otherwise>
-                  <xsl:value-of select="@width"/>
-                </xsl:otherwise>
-              </xsl:choose>
-            </xsl:attribute>
-          </xsl:if>
-        </fo:table-column>
-      </xsl:for-each>
-    </xsl:when>
-    <xsl:when test="$fop.extensions != 0">
-      <xsl:if test="$number &lt;= $count">
-        <fo:table-column column-number="{$number}"
-                         column-width="{6.5 div $count}in"/>
-        <xsl:call-template name="make-html-table-columns">
-          <xsl:with-param name="count" select="$count"/>
-          <xsl:with-param name="number" select="$number + 1"/>
-        </xsl:call-template>
-      </xsl:if>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="tbody" mode="htmlTable">
-  <fo:table-body border-bottom-width="0.25pt"
-                 border-bottom-style="solid"
-                 border-bottom-color="black"
-                 start-indent="0pt"
-                 end-indent="0pt">
-    <xsl:apply-templates mode="htmlTable"/>
-  </fo:table-body>
-</xsl:template>
-
-<xsl:template match="td" mode="htmlTable">
-  <xsl:variable name="bgcolor">
-    <xsl:call-template name="pi.dbfo_bgcolor"/>
-  </xsl:variable>
-  <fo:table-cell xsl:use-attribute-sets="table.cell.padding">
-    <xsl:call-template name="table.cell.properties">
-      <xsl:with-param name="bgcolor.pi" select="$bgcolor"/>
-      <xsl:with-param name="rowsep.inherit" select="0"/>
-      <xsl:with-param name="colsep.inherit" select="0"/>
-    </xsl:call-template>
-    <fo:block>
-      <xsl:call-template name="table.cell.block.properties"/>
-      <xsl:apply-templates/>
-    </fo:block>
-  </fo:table-cell>
-</xsl:template>
-
-<xsl:template match="tfoot" mode="htmlTable">
-  <fo:table-footer start-indent="0pt"
-                   end-indent="0pt">
-    <xsl:apply-templates mode="htmlTable"/>
-  </fo:table-footer>
-</xsl:template>
-
-<xsl:template match="th" mode="htmlTable">
-  <xsl:variable name="bgcolor">
-    <xsl:call-template name="pi.dbfo_bgcolor"/>
-  </xsl:variable>
-  <fo:table-cell xsl:use-attribute-sets="th.style table.cell.padding">
-    <xsl:call-template name="table.cell.properties">
-      <xsl:with-param name="bgcolor.pi" select="$bgcolor"/>
-      <xsl:with-param name="rowsep.inherit" select="0"/>
-      <xsl:with-param name="colsep.inherit" select="0"/>
-    </xsl:call-template>
-    <fo:block>
-      <xsl:call-template name="table.cell.block.properties"/>
-      <xsl:apply-templates/>
-    </fo:block>
-  </fo:table-cell>
-</xsl:template>
-
-<xsl:template match="thead" mode="htmlTable">
-  <fo:table-header border-bottom-width="0.25pt"
-                   border-bottom-style="solid"
-                   border-bottom-color="black"
-                   start-indent="0pt"
-                   end-indent="0pt"
-                   font-weight="bold">
-    <xsl:apply-templates mode="htmlTable"/>
-  </fo:table-header>
-</xsl:template>
-
-<xsl:template match="tr" mode="htmlTable">
-  <fo:table-row>
-    <xsl:call-template name="table.row.properties"/>
-    <xsl:apply-templates mode="htmlTable"/>
-  </fo:table-row>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/index.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/index.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,479 +1,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE xsl:stylesheet [
-<!ENTITY primary   'normalize-space(concat(primary/@sortas, primary[not(@sortas)]))'>
-<!ENTITY secondary 'normalize-space(concat(secondary/@sortas, secondary[not(@sortas)]))'>
-<!ENTITY tertiary  'normalize-space(concat(tertiary/@sortas, tertiary[not(@sortas)]))'>
-]>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                xmlns:rx="http://www.renderx.com/XSL/Extensions"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:template match="index">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
- <xsl:if test="$generate.index != 0">
-  <xsl:choose>
-    <xsl:when test="$make.index.markup != 0">
-      <fo:block>
-        <xsl:call-template name="generate-index-markup">
-          <xsl:with-param name="scope" select="(ancestor::book|/)[last()]"/>
-        </xsl:call-template>
-      </fo:block>
-    </xsl:when>
-    <xsl:otherwise>
-      <fo:block id="{$id}">
-        <xsl:call-template name="index.titlepage"/>
-      </fo:block>
-      <xsl:apply-templates/>
-      <xsl:if test="count(indexentry) = 0 and count(indexdiv) = 0">
-        <xsl:call-template name="generate-index">
-          <xsl:with-param name="scope" select="(ancestor::book|/)[last()]"/>
-        </xsl:call-template>
-      </xsl:if>
-    </xsl:otherwise>
-  </xsl:choose>
- </xsl:if>
-</xsl:template>
-
-<xsl:template match="book/index|part/index">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
- <xsl:if test="$generate.index != 0">
-  <xsl:variable name="master-reference">
-    <xsl:call-template name="select.pagemaster">
-      <xsl:with-param name="pageclass">
-        <xsl:if test="$make.index.markup != 0">body</xsl:if>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <fo:page-sequence hyphenate="{$hyphenate}"
-                    master-reference="{$master-reference}">
-    <xsl:attribute name="language">
-      <xsl:call-template name="l10n.language"/>
-    </xsl:attribute>
-    <xsl:attribute name="format">
-      <xsl:call-template name="page.number.format">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="initial-page-number">
-      <xsl:call-template name="initial.page.number">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="force-page-count">
-      <xsl:call-template name="force.page.count">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="hyphenation-character">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-character'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="hyphenation-push-character-count">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-push-character-count'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="hyphenation-remain-character-count">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-remain-character-count'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:apply-templates select="." mode="running.head.mode">
-      <xsl:with-param name="master-reference" select="$master-reference"/>
-    </xsl:apply-templates>
-    <xsl:apply-templates select="." mode="running.foot.mode">
-      <xsl:with-param name="master-reference" select="$master-reference"/>
-    </xsl:apply-templates>
-
-    <fo:flow flow-name="xsl-region-body">
-      <xsl:call-template name="set.flow.properties">
-        <xsl:with-param name="element" select="local-name(.)"/>
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-
-      <fo:block id="{$id}">
-        <xsl:call-template name="index.titlepage"/>
-      </fo:block>
-      <xsl:apply-templates/>
-      <xsl:if test="count(indexentry) = 0 and count(indexdiv) = 0">
-
-        <xsl:choose>
-          <xsl:when test="$make.index.markup != 0">
-            <fo:block wrap-option='no-wrap'
-                      white-space-collapse='false'
-                      xsl:use-attribute-sets="monospace.verbatim.properties"
-                      linefeed-treatment="preserve">
-              <xsl:call-template name="generate-index-markup">
-                <xsl:with-param name="scope" select="(ancestor::book|/)[last()]"/>
-              </xsl:call-template>
-            </fo:block>
-          </xsl:when>
-          <xsl:when test="indexentry|indexdiv/indexentry">
-            <xsl:apply-templates/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:call-template name="generate-index">
-              <xsl:with-param name="scope" select="(ancestor::book|/)[last()]"/>
-            </xsl:call-template>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:if>
-    </fo:flow>
-  </fo:page-sequence>
- </xsl:if>
-</xsl:template>
-
-<xsl:template match="setindex">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
- <xsl:if test="$generate.index != 0">
-  <xsl:variable name="master-reference">
-    <xsl:call-template name="select.pagemaster">
-      <xsl:with-param name="pageclass">
-        <xsl:choose>
-          <xsl:when test="$make.index.markup != 0">body</xsl:when>
-          <xsl:otherwise>index</xsl:otherwise>
-        </xsl:choose>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <fo:page-sequence hyphenate="{$hyphenate}"
-                    master-reference="{$master-reference}">
-    <xsl:attribute name="language">
-      <xsl:call-template name="l10n.language"/>
-    </xsl:attribute>
-    <xsl:attribute name="format">
-      <xsl:call-template name="page.number.format">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="initial-page-number">
-      <xsl:call-template name="initial.page.number">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="force-page-count">
-      <xsl:call-template name="force.page.count">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="hyphenation-character">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-character'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="hyphenation-push-character-count">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-push-character-count'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="hyphenation-remain-character-count">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-remain-character-count'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:apply-templates select="." mode="running.head.mode">
-      <xsl:with-param name="master-reference" select="$master-reference"/>
-    </xsl:apply-templates>
-    <xsl:apply-templates select="." mode="running.foot.mode">
-      <xsl:with-param name="master-reference" select="$master-reference"/>
-    </xsl:apply-templates>
-
-    <fo:flow flow-name="xsl-region-body">
-      <xsl:call-template name="set.flow.properties">
-        <xsl:with-param name="element" select="local-name(.)"/>
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-
-      <fo:block id="{$id}">
-        <xsl:call-template name="setindex.titlepage"/>
-      </fo:block>
-      <xsl:apply-templates/>
-      <xsl:if test="count(indexentry) = 0 and count(indexdiv) = 0">
-
-        <xsl:choose>
-          <xsl:when test="$make.index.markup != 0">
-            <fo:block wrap-option='no-wrap'
-                      white-space-collapse='false'
-                      xsl:use-attribute-sets="monospace.verbatim.properties"
-                      linefeed-treatment="preserve">
-              <xsl:call-template name="generate-index-markup">
-                <xsl:with-param name="scope" select="/"/>
-              </xsl:call-template>
-            </fo:block>
-          </xsl:when>
-          <xsl:when test="indexentry|indexdiv/indexentry">
-            <xsl:apply-templates/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:call-template name="generate-index">
-              <xsl:with-param name="scope" select="/"/>
-            </xsl:call-template>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:if>
-    </fo:flow>
-  </fo:page-sequence>
- </xsl:if>
-</xsl:template>
-
-<xsl:template match="index/indexinfo"></xsl:template>
-<xsl:template match="index/info"></xsl:template>
-<xsl:template match="index/title"></xsl:template>
-<xsl:template match="index/subtitle"></xsl:template>
-<xsl:template match="index/titleabbrev"></xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="indexdiv.title">
-  <xsl:param name="title"/>
-  <xsl:param name="titlecontent"/>
-
-  <fo:block xsl:use-attribute-sets="index.div.title.properties">
-    <xsl:choose>
-      <xsl:when test="$title">
-        <xsl:apply-templates select="." mode="object.title.markup">
-          <xsl:with-param name="allow-anchors" select="1"/>
-        </xsl:apply-templates>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:copy-of select="$titlecontent"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="indexdiv">
-  <fo:block>
-    <xsl:call-template name="indexdiv.titlepage"/>
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="indexdiv/title"/>
-<xsl:template match="indexdiv/subtitle"/>
-<xsl:template match="indexdiv/titleabbrev"/>
-
-<!-- ==================================================================== -->
-
-<!-- Text used for distiguishing between normal and significant entries -->
-<xsl:variable name="significant.flag">.tnacifingis</xsl:variable>
-
-<xsl:template match="indexterm" name="indexterm">
-  <!-- Temporal workaround for bug in AXF -->
-  <xsl:variable name="wrapper.name">
-    <xsl:choose>
-      <xsl:when test="$axf.extensions != 0">
-        <xsl:call-template name="inline.or.block"/>
-      </xsl:when>
-      <xsl:otherwise>fo:wrapper</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:element name="{$wrapper.name}">
-    <xsl:attribute name="id">
-      <xsl:call-template name="object.id"/>
-    </xsl:attribute>
-    <xsl:choose>
-      <xsl:when test="$xep.extensions != 0">
-        <xsl:attribute name="rx:key">
-          <xsl:value-of select="&primary;"/>
-          <xsl:if test="@significance='preferred'"><xsl:value-of select="$significant.flag"/></xsl:if>
-          <xsl:if test="secondary">
-            <xsl:text>, </xsl:text>
-            <xsl:value-of select="&secondary;"/>
-          </xsl:if>
-          <xsl:if test="tertiary">
-            <xsl:text>, </xsl:text>
-            <xsl:value-of select="&tertiary;"/>
-          </xsl:if>
-        </xsl:attribute>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:comment>
-          <xsl:call-template name="comment-escape-string">
-            <xsl:with-param name="string">
-              <xsl:value-of select="primary"/>
-              <xsl:if test="secondary">
-                <xsl:text>, </xsl:text>
-                <xsl:value-of select="secondary"/>
-              </xsl:if>
-              <xsl:if test="tertiary">
-                <xsl:text>, </xsl:text>
-                <xsl:value-of select="tertiary"/>
-              </xsl:if>
-            </xsl:with-param>
-          </xsl:call-template>
-        </xsl:comment>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:element>
-</xsl:template>
-
-<xsl:template match="indexterm[@class='startofrange']">
-  <xsl:choose>
-    <xsl:when test="$xep.extensions != 0">
-      <rx:begin-index-range>
-        <xsl:call-template name="anchor"/>
-        <xsl:attribute name="rx:key">
-          <xsl:value-of select="&primary;"/>
-          <xsl:if test="@significance='preferred'"><xsl:value-of select="$significant.flag"/></xsl:if>
-          <xsl:if test="secondary">
-            <xsl:text>, </xsl:text>
-            <xsl:value-of select="&secondary;"/>
-          </xsl:if>
-          <xsl:if test="tertiary">
-            <xsl:text>, </xsl:text>
-            <xsl:value-of select="&tertiary;"/>
-          </xsl:if>
-        </xsl:attribute>
-      </rx:begin-index-range>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="indexterm"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="indexterm[@class='endofrange']">
-  <xsl:choose>
-    <xsl:when test="$xep.extensions != 0">
-      <rx:end-index-range>
-        <xsl:attribute name="ref-id">
-          <xsl:value-of select="@startref"/>
-        </xsl:attribute>
-      </rx:end-index-range>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="indexterm"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="indexentry">
-  <fo:block>
-    <!-- don't process 'seeie's from here -->
-    <xsl:apply-templates select="primaryie|secondaryie|tertiaryie|seealsoie"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="primaryie">
-  <fo:block>
-    <xsl:apply-templates/>
-    <xsl:if test="following-sibling::seeie">
-      <xsl:text> (</xsl:text>
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'see'"/>
-      </xsl:call-template>
-      <xsl:text> </xsl:text>
-      <xsl:apply-templates select="following-sibling::seeie"/>
-      <xsl:text>)</xsl:text>
-    </xsl:if>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="secondaryie">
-  <fo:block start-indent="1pc">
-    <xsl:apply-templates/>
-    <xsl:if test="following-sibling::seeie">
-      <xsl:text> (</xsl:text>
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'see'"/>
-      </xsl:call-template>
-      <xsl:text> </xsl:text>
-      <xsl:apply-templates select="following-sibling::seeie"/>
-      <xsl:text>)</xsl:text>
-    </xsl:if>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="tertiaryie">
-  <fo:block start-indent="2pc">
-    <xsl:apply-templates/>
-    <xsl:if test="following-sibling::seeie">
-      <xsl:text> (</xsl:text>
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'see'"/>
-      </xsl:call-template>
-      <xsl:text> </xsl:text>
-      <xsl:apply-templates select="following-sibling::seeie"/>
-      <xsl:text>)</xsl:text>
-    </xsl:if>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="seeie">
-  <fo:inline>
-    <xsl:apply-templates/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="seealsoie">
-  <fo:block>
-    <xsl:attribute name="start-indent">
-      <xsl:choose>
-        <xsl:when test="preceding-sibling::tertiaryie">3pc</xsl:when>
-        <xsl:when test="preceding-sibling::secondaryie">2pc</xsl:when>
-        <xsl:otherwise>1pc</xsl:otherwise>
-      </xsl:choose>
-    </xsl:attribute>
-    <xsl:text>(</xsl:text>
-    <xsl:call-template name="gentext">
-      <xsl:with-param name="key" select="'seealso'"/>
-    </xsl:call-template>
-    <xsl:text> </xsl:text>
-    <xsl:apply-templates/>
-    <xsl:text>)</xsl:text>
-  </fo:block>
-</xsl:template>
-
-<!-- Determines if an object should be inserted as an fo:inline
-     or an fo:block.  Used for indexterms -->
-<xsl:template name="inline.or.block">
-  <xsl:param name="parentnode" select=".."/>
-
-  <xsl:variable name="parent" select="local-name($parentnode)"/>
-
-  <xsl:variable name="block.parents" select="'|answer|appendix|appendixinfo|article|articleinfo|bibliodiv|bibliography|bibliographyinfo|blockinfo|blockquote|bookinfo|callout|caution|chapter|chapterinfo|dedication|example|figure|formalpara|funcsynopsisinfo|glossary|glossaryinfo|glossdef|glossdiv|glossentry|highlights|important|index|indexinfo|info|informalexample|informalfigure|informaltable|itemizedlist|legalnotice|listitem|msgexplan|msgtext|note|objectinfo|orderedlist|partinfo|partintro|preface|prefaceinfo|procedure|qandadiv|qandaset|question|refentry|refentryinfo|referenceinfo|refmeta|refmiscinfo|refsect1|refsect1info|refsect2|refsect2info|refsect3|refsect3info|refsection|refsectioninfo|refsynopsisdiv|refsynopsisdivinfo|revdescription|screeninfo|sect1|sect1info|sect2|sect2info|sect3|sect3info|sect4|sect4info|sect5|sect5info|section|sectioninfo|setindex|setindexinfo|setinfo|sidebar|sidebarinfo|simplesect|step|table|task|taskprerequisites|taskrelated|tasksummary|tip|variablelist|warning|'"/>
-
-  <xsl:choose>
-    <xsl:when test="contains($parent, $block.parents)">fo:block</xsl:when>
-    <xsl:otherwise>fo:inline</xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/info.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/info.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,34 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- These templates define the "default behavior" for info
-     elements.  Even if you don't process the *info wrappers,
-     some of these elements are needed because the elements are
-     processed from named templates that are called with modes.
-     Since modes aren't sticky, these rules apply. 
-     (TODO: clarify this comment) -->
-
-<!-- ==================================================================== -->
-<!-- called from named templates in a given mode -->
-
-<xsl:template match="corpauthor">
-  <fo:inline>
-    <xsl:apply-templates/>
-  </fo:inline>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/inline.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/inline.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,1234 +1,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE xsl:stylesheet [
-  <!ENTITY comment.block.parents "parent::answer|parent::appendix|parent::article|parent::bibliodiv|
-                                  parent::bibliography|parent::blockquote|parent::caution|parent::chapter|
-                                  parent::glossary|parent::glossdiv|parent::important|parent::index|
-                                  parent::indexdiv|parent::listitem|parent::note|parent::orderedlist|
-                                  parent::partintro|parent::preface|parent::procedure|parent::qandadiv|
-                                  parent::qandaset|parent::question|parent::refentry|parent::refnamediv|
-                                  parent::refsect1|parent::refsect2|parent::refsect3|parent::refsection|
-                                  parent::refsynopsisdiv|parent::sect1|parent::sect2|parent::sect3|parent::sect4|
-                                  parent::sect5|parent::section|parent::setindex|parent::sidebar|
-                                  parent::simplesect|parent::taskprerequisites|parent::taskrelated|
-                                  parent::tasksummary|parent::warning">
-]>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                xmlns:xlink='http://www.w3.org/1999/xlink'
-                exclude-result-prefixes="xlink"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<xsl:template name="simple.xlink">
-  <xsl:param name="node" select="."/>
-  <xsl:param name="content">
-    <xsl:apply-templates/>
-  </xsl:param>
-  <xsl:param name="linkend" select="$node/@linkend"/>
-  <xsl:param name="xhref" select="$node/@xlink:href"/>
-
-  <xsl:choose>
-    <xsl:when test="$xhref
-                    and (not($node/@xlink:type) or 
-                         $node/@xlink:type='simple')">
-
-      <!-- Is it a local idref? -->
-      <xsl:variable name="is.idref">
-        <xsl:choose>
-          <!-- if the href starts with # and does not contain an "(" -->
-          <!-- or if the href starts with #xpointer(id(, it's just an ID -->
-          <xsl:when test="starts-with($xhref,'#')
-                          and (not(contains($xhref,'&#40;'))
-                          or starts-with($xhref,
-                                     '#xpointer&#40;id&#40;'))">1</xsl:when>
-          <xsl:otherwise>0</xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-
-      <!-- Is it an olink ? -->
-      <xsl:variable name="is.olink">
-        <xsl:choose>
-	  <!-- If xlink:role="http://docbook.org/xlink/role/olink" -->
-          <!-- and if the href contains # -->
-          <xsl:when test="contains($xhref,'#') and
-	       @xlink:role = $xolink.role">1</xsl:when>
-          <xsl:otherwise>0</xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-
-      <xsl:choose>
-        <xsl:when test="$is.idref = 1">
-
-          <xsl:variable name="idref">
-            <xsl:call-template name="xpointer.idref">
-              <xsl:with-param name="xpointer" select="$xhref"/>
-            </xsl:call-template>
-          </xsl:variable>
-
-          <xsl:variable name="targets" select="key('id',$idref)"/>
-          <xsl:variable name="target" select="$targets[1]"/>
-
-          <xsl:call-template name="check.id.unique">
-            <xsl:with-param name="linkend" select="$idref"/>
-          </xsl:call-template>
-
-          <xsl:choose>
-            <xsl:when test="count($target) = 0">
-              <xsl:message>
-                <xsl:text>XLink to nonexistent id: </xsl:text>
-                <xsl:value-of select="$idref"/>
-              </xsl:message>
-              <xsl:copy-of select="$content"/>
-            </xsl:when>
-
-            <xsl:otherwise>
-              <fo:basic-link internal-destination="{$idref}">
-                <xsl:copy-of select="$content"/>
-              </fo:basic-link>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:when>
-
-        <xsl:when test="$is.olink = 1">
-	  <xsl:call-template name="olink">
-	    <xsl:with-param name="content" select="$content"/>
-	  </xsl:call-template>
-        </xsl:when>
-
-        <!-- otherwise it's a URI -->
-        <xsl:otherwise>
-          <fo:basic-link external-destination="url({$xhref})">
-            <xsl:copy-of select="$content"/>
-          </fo:basic-link>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-
-    <xsl:when test="$linkend">
-      <xsl:variable name="targets" select="key('id',$linkend)"/>
-      <xsl:variable name="target" select="$targets[1]"/>
-
-      <xsl:call-template name="check.id.unique">
-        <xsl:with-param name="linkend" select="$linkend"/>
-      </xsl:call-template>
-
-      <xsl:choose>
-        <xsl:when test="count($target) = 0">
-          <xsl:message>
-            <xsl:text>XLink to nonexistent id: </xsl:text>
-            <xsl:value-of select="$linkend"/>
-          </xsl:message>
-          <xsl:copy-of select="$content"/>
-        </xsl:when>
-
-        <xsl:otherwise>
-          <fo:basic-link internal-destination="{$linkend}">
-            <xsl:copy-of select="$content"/>
-          </fo:basic-link>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-
-    <xsl:otherwise>
-      <xsl:copy-of select="$content"/>
-    </xsl:otherwise>
-  </xsl:choose>
-
-</xsl:template>
-
-<xsl:template name="inline.charseq">
-  <xsl:param name="content">
-    <xsl:call-template name="simple.xlink">
-      <xsl:with-param name="content">
-        <xsl:apply-templates/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:param>
-
-  <xsl:choose>
-    <xsl:when test="@dir">
-      <fo:inline>
-        <xsl:attribute name="direction">
-          <xsl:choose>
-            <xsl:when test="@dir = 'ltr' or @dir = 'lro'">ltr</xsl:when>
-            <xsl:otherwise>rtl</xsl:otherwise>
-          </xsl:choose>
-        </xsl:attribute>
-        <xsl:copy-of select="$content"/>
-      </fo:inline>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:copy-of select="$content"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="inline.monoseq">
-  <xsl:param name="content">
-    <xsl:call-template name="simple.xlink">
-      <xsl:with-param name="content">
-        <xsl:apply-templates/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:param>
-
-  <fo:inline xsl:use-attribute-sets="monospace.properties">
-    <xsl:if test="@dir">
-      <xsl:attribute name="direction">
-        <xsl:choose>
-          <xsl:when test="@dir = 'ltr' or @dir = 'lro'">ltr</xsl:when>
-          <xsl:otherwise>rtl</xsl:otherwise>
-        </xsl:choose>
-      </xsl:attribute>
-    </xsl:if>
-    <xsl:copy-of select="$content"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template name="inline.boldseq">
-  <xsl:param name="content">
-    <xsl:call-template name="simple.xlink">
-      <xsl:with-param name="content">
-        <xsl:apply-templates/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:param>
-
-  <fo:inline font-weight="bold">
-    <xsl:if test="@dir">
-      <xsl:attribute name="direction">
-        <xsl:choose>
-          <xsl:when test="@dir = 'ltr' or @dir = 'lro'">ltr</xsl:when>
-          <xsl:otherwise>rtl</xsl:otherwise>
-        </xsl:choose>
-      </xsl:attribute>
-    </xsl:if>
-    <xsl:copy-of select="$content"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template name="inline.italicseq">
-  <xsl:param name="content">
-    <xsl:call-template name="simple.xlink">
-      <xsl:with-param name="content">
-        <xsl:apply-templates/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:param>
-
-  <fo:inline font-style="italic">
-    <xsl:call-template name="anchor"/>
-    <xsl:if test="@dir">
-      <xsl:attribute name="direction">
-        <xsl:choose>
-          <xsl:when test="@dir = 'ltr' or @dir = 'lro'">ltr</xsl:when>
-          <xsl:otherwise>rtl</xsl:otherwise>
-        </xsl:choose>
-      </xsl:attribute>
-    </xsl:if>
-    <xsl:copy-of select="$content"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template name="inline.boldmonoseq">
-  <xsl:param name="content">
-    <xsl:call-template name="simple.xlink">
-      <xsl:with-param name="content">
-        <xsl:apply-templates/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:param>
-
-  <fo:inline font-weight="bold" xsl:use-attribute-sets="monospace.properties">
-    <xsl:call-template name="anchor"/>
-    <xsl:if test="@dir">
-      <xsl:attribute name="direction">
-        <xsl:choose>
-          <xsl:when test="@dir = 'ltr' or @dir = 'lro'">ltr</xsl:when>
-          <xsl:otherwise>rtl</xsl:otherwise>
-        </xsl:choose>
-      </xsl:attribute>
-    </xsl:if>
-    <xsl:copy-of select="$content"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template name="inline.italicmonoseq">
-  <xsl:param name="content">
-    <xsl:call-template name="simple.xlink">
-      <xsl:with-param name="content">
-        <xsl:apply-templates/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:param>
-
-  <fo:inline font-style="italic" xsl:use-attribute-sets="monospace.properties">
-    <xsl:call-template name="anchor"/>
-    <xsl:if test="@dir">
-      <xsl:attribute name="direction">
-        <xsl:choose>
-          <xsl:when test="@dir = 'ltr' or @dir = 'lro'">ltr</xsl:when>
-          <xsl:otherwise>rtl</xsl:otherwise>
-        </xsl:choose>
-      </xsl:attribute>
-    </xsl:if>
-    <xsl:copy-of select="$content"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template name="inline.superscriptseq">
-  <xsl:param name="content">
-    <xsl:call-template name="simple.xlink">
-      <xsl:with-param name="content">
-        <xsl:apply-templates/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:param>
-
-  <fo:inline xsl:use-attribute-sets="superscript.properties">
-    <xsl:call-template name="anchor"/>
-    <xsl:if test="@dir">
-      <xsl:attribute name="direction">
-        <xsl:choose>
-          <xsl:when test="@dir = 'ltr' or @dir = 'lro'">ltr</xsl:when>
-          <xsl:otherwise>rtl</xsl:otherwise>
-        </xsl:choose>
-      </xsl:attribute>
-    </xsl:if>
-    <xsl:choose>
-      <xsl:when test="$fop.extensions != 0">
-        <xsl:attribute name="vertical-align">super</xsl:attribute>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:attribute name="baseline-shift">super</xsl:attribute>
-      </xsl:otherwise>
-    </xsl:choose>
-    <xsl:copy-of select="$content"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template name="inline.subscriptseq">
-  <xsl:param name="content">
-    <xsl:call-template name="simple.xlink">
-      <xsl:with-param name="content">
-        <xsl:apply-templates/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:param>
-
-  <fo:inline xsl:use-attribute-sets="subscript.properties">
-    <xsl:call-template name="anchor"/>
-    <xsl:if test="@dir">
-      <xsl:attribute name="direction">
-        <xsl:choose>
-          <xsl:when test="@dir = 'ltr' or @dir = 'lro'">ltr</xsl:when>
-          <xsl:otherwise>rtl</xsl:otherwise>
-        </xsl:choose>
-      </xsl:attribute>
-    </xsl:if>
-    <xsl:choose>
-      <xsl:when test="$fop.extensions != 0">
-        <xsl:attribute name="vertical-align">sub</xsl:attribute>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:attribute name="baseline-shift">sub</xsl:attribute>
-      </xsl:otherwise>
-    </xsl:choose>
-    <xsl:copy-of select="$content"/>
-  </fo:inline>
-</xsl:template>
-
-<!-- ==================================================================== -->
-<!-- some special cases -->
-
-<xsl:template match="author">
-  <xsl:call-template name="simple.xlink">
-    <xsl:with-param name="content">
-      <xsl:call-template name="person.name"/>
-    </xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="editor">
-  <xsl:call-template name="simple.xlink">
-    <xsl:with-param name="content">
-      <xsl:call-template name="person.name"/>
-    </xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="othercredit">
-  <xsl:call-template name="simple.xlink">
-    <xsl:with-param name="content">
-      <xsl:call-template name="person.name"/>
-    </xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="authorinitials">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="accel">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="action">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="application">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="classname">
-  <xsl:call-template name="inline.monoseq"/>
-</xsl:template>
-
-<xsl:template match="exceptionname">
-  <xsl:call-template name="inline.monoseq"/>
-</xsl:template>
-
-<xsl:template match="interfacename">
-  <xsl:call-template name="inline.monoseq"/>
-</xsl:template>
-
-<xsl:template match="methodname">
-  <xsl:call-template name="inline.monoseq"/>
-</xsl:template>
-
-<xsl:template match="command">
-  <xsl:call-template name="inline.boldseq"/>
-</xsl:template>
-
-<xsl:template match="computeroutput">
-  <xsl:call-template name="inline.monoseq"/>
-</xsl:template>
-
-<xsl:template match="constant">
-  <xsl:call-template name="inline.monoseq"/>
-</xsl:template>
-
-<xsl:template match="database">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="date">
-  <!-- should this support locale-specific formatting? how? -->
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="errorcode">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="errorname">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="errortype">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="errortext">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="envar">
-  <xsl:call-template name="inline.monoseq"/>
-</xsl:template>
-
-<xsl:template match="filename">
-  <xsl:call-template name="inline.monoseq"/>
-</xsl:template>
-
-<xsl:template match="function">
-  <xsl:choose>
-    <xsl:when test="$function.parens != '0'
-                    and (parameter or function or replaceable)">
-      <xsl:variable name="nodes" select="text()|*"/>
-      <xsl:call-template name="inline.monoseq">
-        <xsl:with-param name="content">
-          <xsl:call-template name="simple.xlink">
-            <xsl:with-param name="content">
-              <xsl:apply-templates select="$nodes[1]"/>
-            </xsl:with-param>
-          </xsl:call-template>
-        </xsl:with-param>
-      </xsl:call-template>
-      <xsl:text>(</xsl:text>
-      <xsl:apply-templates select="$nodes[position()>1]"/>
-      <xsl:text>)</xsl:text>
-    </xsl:when>
-    <xsl:otherwise>
-     <xsl:call-template name="inline.monoseq"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="function/parameter" priority="2">
-  <xsl:call-template name="inline.italicmonoseq"/>
-  <xsl:if test="following-sibling::*">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="function/replaceable" priority="2">
-  <xsl:call-template name="inline.italicmonoseq"/>
-  <xsl:if test="following-sibling::*">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="guibutton">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="guiicon">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="guilabel">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="guimenu">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="guimenuitem">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="guisubmenu">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="hardware">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="interface">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="interfacedefinition">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="keycap">
-  <xsl:call-template name="inline.boldseq"/>
-</xsl:template>
-
-<xsl:template match="keycode">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="keysym">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="literal">
-  <xsl:call-template name="inline.monoseq"/>
-</xsl:template>
-
-<xsl:template match="code">
-  <xsl:call-template name="inline.monoseq"/>
-</xsl:template>
-
-<xsl:template match="medialabel">
-  <xsl:call-template name="inline.italicseq"/>
-</xsl:template>
-
-<xsl:template match="shortcut">
-  <xsl:call-template name="inline.boldseq"/>
-</xsl:template>
-
-<xsl:template match="mousebutton">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="option">
-  <xsl:call-template name="inline.monoseq"/>
-</xsl:template>
-
-<xsl:template match="package">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="parameter">
-  <xsl:call-template name="inline.italicmonoseq"/>
-</xsl:template>
-
-<xsl:template match="property">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="prompt">
-  <xsl:call-template name="inline.monoseq"/>
-</xsl:template>
-
-<xsl:template match="replaceable">
-  <xsl:call-template name="inline.italicmonoseq"/>
-</xsl:template>
-
-<xsl:template match="returnvalue">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="structfield">
-  <xsl:call-template name="inline.italicmonoseq"/>
-</xsl:template>
-
-<xsl:template match="structname">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="symbol">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="systemitem">
-  <xsl:call-template name="inline.monoseq"/>
-</xsl:template>
-
-<xsl:template match="token">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="type">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="userinput">
-  <xsl:call-template name="inline.boldmonoseq"/>
-</xsl:template>
-
-<xsl:template match="abbrev">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="acronym">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="citerefentry">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="citetitle">
-  <xsl:choose>
-    <xsl:when test="@pubwork = 'article'">
-      <xsl:call-template name="gentext.startquote"/>
-      <xsl:call-template name="inline.charseq"/>
-      <xsl:call-template name="gentext.endquote"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="inline.italicseq"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="emphasis">
-  <xsl:variable name="depth">
-    <xsl:call-template name="dot.count">
-      <xsl:with-param name="string">
-        <xsl:number level="multiple"/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="@role='bold' or @role='strong'">
-      <xsl:call-template name="inline.boldseq"/>
-    </xsl:when>
-    <xsl:when test="@role='underline'">
-      <fo:inline text-decoration="underline">
-        <xsl:call-template name="inline.charseq"/>
-      </fo:inline>
-    </xsl:when>
-    <xsl:when test="@role='strikethrough'">
-      <fo:inline text-decoration="line-through">
-        <xsl:call-template name="inline.charseq"/>
-      </fo:inline>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:choose>
-        <xsl:when test="$depth mod 2 = 1">
-          <fo:inline font-style="normal">
-            <xsl:apply-templates/>
-          </fo:inline>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="inline.italicseq"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="foreignphrase">
-  <xsl:call-template name="inline.italicseq"/>
-</xsl:template>
-
-<xsl:template match="markup">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="phrase">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="quote">
-  <xsl:variable name="depth">
-    <xsl:call-template name="dot.count">
-      <xsl:with-param name="string"><xsl:number level="multiple"/></xsl:with-param>
-    </xsl:call-template>
-  </xsl:variable>
-  <xsl:choose>
-    <xsl:when test="$depth mod 2 = 0">
-      <xsl:call-template name="gentext.startquote"/>
-      <xsl:call-template name="inline.charseq"/>
-      <xsl:call-template name="gentext.endquote"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="gentext.nestedstartquote"/>
-      <xsl:call-template name="inline.charseq"/>
-      <xsl:call-template name="gentext.nestedendquote"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="varname">
-  <xsl:call-template name="inline.monoseq"/>
-</xsl:template>
-
-<xsl:template match="wordasword">
-  <xsl:call-template name="inline.italicseq"/>
-</xsl:template>
-
-<xsl:template match="lineannotation">
-  <fo:inline font-style="italic">
-    <xsl:call-template name="inline.charseq"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="superscript">
-  <xsl:call-template name="inline.superscriptseq"/>
-</xsl:template>
-
-<xsl:template match="subscript">
-  <xsl:call-template name="inline.subscriptseq"/>
-</xsl:template>
-
-<xsl:template match="trademark">
-  <xsl:call-template name="inline.charseq"/>
-  <xsl:choose>
-    <xsl:when test="@class = 'copyright'
-                    or @class = 'registered'">
-      <xsl:call-template name="dingbat">
-        <xsl:with-param name="dingbat" select="@class"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="@class = 'service'">
-      <xsl:call-template name="inline.superscriptseq">
-        <xsl:with-param name="content" select="'SM'"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="dingbat">
-        <xsl:with-param name="dingbat" select="'trademark'"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="firstterm">
-  <xsl:call-template name="glossterm">
-    <xsl:with-param name="firstterm" select="1"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="glossterm" name="glossterm">
-  <xsl:param name="firstterm" select="0"/>
-
-  <xsl:choose>
-    <xsl:when test="($firstterm.only.link = 0 or $firstterm = 1) and @linkend">
-      <xsl:variable name="targets" select="key('id',@linkend)"/>
-      <xsl:variable name="target" select="$targets[1]"/>
-
-      <xsl:choose>
-        <xsl:when test="$target">
-          <fo:basic-link internal-destination="{@linkend}" 
-                         xsl:use-attribute-sets="xref.properties">
-            <xsl:call-template name="inline.italicseq"/>
-          </fo:basic-link>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="inline.italicseq"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-
-    <xsl:when test="not(@linkend)
-                    and ($firstterm.only.link = 0 or $firstterm = 1)
-                    and ($glossterm.auto.link != 0)
-                    and $glossary.collection != ''">
-      <xsl:variable name="term">
-        <xsl:choose>
-          <xsl:when test="@baseform"><xsl:value-of select="@baseform"/></xsl:when>
-          <xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-      <xsl:variable name="cterm"
-           select="(document($glossary.collection,.)//glossentry[glossterm=$term])[1]"/>
-
-      <xsl:choose>
-        <xsl:when test="not($cterm)">
-          <xsl:message>
-            <xsl:text>There's no entry for </xsl:text>
-            <xsl:value-of select="$term"/>
-            <xsl:text> in </xsl:text>
-            <xsl:value-of select="$glossary.collection"/>
-          </xsl:message>
-          <xsl:call-template name="inline.italicseq"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:variable name="id">
-            <xsl:call-template name="object.id">
-              <xsl:with-param name="object" select="$cterm"/>
-            </xsl:call-template>
-          </xsl:variable>
-          <fo:basic-link internal-destination="{$id}"
-                         xsl:use-attribute-sets="xref.properties">
-            <xsl:call-template name="inline.italicseq"/>
-          </fo:basic-link>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-
-    <xsl:when test="not(@linkend)
-                    and ($firstterm.only.link = 0 or $firstterm = 1)
-                    and $glossterm.auto.link != 0">
-      <xsl:variable name="term">
-        <xsl:choose>
-          <xsl:when test="@baseform">
-            <xsl:value-of select="@baseform"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="."/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-
-      <xsl:variable name="targets"
-                    select="//glossentry[glossterm=$term or glossterm/@baseform=$term]"/>
-
-      <xsl:variable name="target" select="$targets[1]"/>
-
-      <xsl:choose>
-        <xsl:when test="count($targets)=0">
-          <xsl:message>
-            <xsl:text>Error: no glossentry for glossterm: </xsl:text>
-            <xsl:value-of select="."/>
-            <xsl:text>.</xsl:text>
-          </xsl:message>
-          <xsl:call-template name="inline.italicseq"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:variable name="termid">
-            <xsl:call-template name="object.id">
-              <xsl:with-param name="object" select="$target"/>
-            </xsl:call-template>
-          </xsl:variable>
-
-          <fo:basic-link internal-destination="{$termid}"
-                         xsl:use-attribute-sets="xref.properties">
-            <xsl:call-template name="inline.charseq"/>
-          </fo:basic-link>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="inline.italicseq"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="termdef">
-  <fo:inline>
-    <xsl:call-template name="gentext.template">
-      <xsl:with-param name="context" select="'termdef'"/>
-      <xsl:with-param name="name" select="'prefix'"/>
-    </xsl:call-template>
-    <xsl:apply-templates/>
-    <xsl:call-template name="gentext.template">
-      <xsl:with-param name="context" select="'termdef'"/>
-      <xsl:with-param name="name" select="'suffix'"/>
-    </xsl:call-template>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="sgmltag|tag">
-  <xsl:variable name="class">
-    <xsl:choose>
-      <xsl:when test="@class">
-        <xsl:value-of select="@class"/>
-      </xsl:when>
-      <xsl:otherwise>element</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$class='attribute'">
-      <xsl:call-template name="inline.monoseq"/>
-    </xsl:when>
-    <xsl:when test="$class='attvalue'">
-      <xsl:call-template name="inline.monoseq"/>
-    </xsl:when>
-    <xsl:when test="$class='element'">
-      <xsl:call-template name="inline.monoseq"/>
-    </xsl:when>
-    <xsl:when test="$class='endtag'">
-      <xsl:call-template name="inline.monoseq">
-        <xsl:with-param name="content">
-          <xsl:text>&lt;/</xsl:text>
-          <xsl:apply-templates/>
-          <xsl:text>&gt;</xsl:text>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="$class='genentity'">
-      <xsl:call-template name="inline.monoseq">
-        <xsl:with-param name="content">
-          <xsl:text>&amp;</xsl:text>
-          <xsl:apply-templates/>
-          <xsl:text>;</xsl:text>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="$class='numcharref'">
-      <xsl:call-template name="inline.monoseq">
-        <xsl:with-param name="content">
-          <xsl:text>&amp;#</xsl:text>
-          <xsl:apply-templates/>
-          <xsl:text>;</xsl:text>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="$class='paramentity'">
-      <xsl:call-template name="inline.monoseq">
-        <xsl:with-param name="content">
-          <xsl:text>%</xsl:text>
-          <xsl:apply-templates/>
-          <xsl:text>;</xsl:text>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="$class='pi'">
-      <xsl:call-template name="inline.monoseq">
-        <xsl:with-param name="content">
-          <xsl:text>&lt;?</xsl:text>
-          <xsl:apply-templates/>
-          <xsl:text>&gt;</xsl:text>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="$class='xmlpi'">
-      <xsl:call-template name="inline.monoseq">
-        <xsl:with-param name="content">
-          <xsl:text>&lt;?</xsl:text>
-          <xsl:apply-templates/>
-          <xsl:text>?&gt;</xsl:text>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="$class='starttag'">
-      <xsl:call-template name="inline.monoseq">
-        <xsl:with-param name="content">
-          <xsl:text>&lt;</xsl:text>
-          <xsl:apply-templates/>
-          <xsl:text>&gt;</xsl:text>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="$class='emptytag'">
-      <xsl:call-template name="inline.monoseq">
-        <xsl:with-param name="content">
-          <xsl:text>&lt;</xsl:text>
-          <xsl:apply-templates/>
-          <xsl:text>/&gt;</xsl:text>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="$class='sgmlcomment' or $class='comment'">
-      <xsl:call-template name="inline.monoseq">
-        <xsl:with-param name="content">
-          <xsl:text>&lt;!--</xsl:text>
-          <xsl:apply-templates/>
-          <xsl:text>--&gt;</xsl:text>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="inline.charseq"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="email">
-  <xsl:call-template name="inline.monoseq">
-    <xsl:with-param name="content">
-      <fo:inline keep-together.within-line="always" hyphenate="false">
-        <xsl:if test="not($email.delimiters.enabled = 0)">
-          <xsl:text>&lt;</xsl:text>
-        </xsl:if>
-        <xsl:apply-templates/>
-        <xsl:if test="not($email.delimiters.enabled = 0)">
-          <xsl:text>&gt;</xsl:text>
-        </xsl:if>
-      </fo:inline>
-    </xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="keycombo">
-  <xsl:variable name="action" select="@action"/>
-  <xsl:variable name="joinchar">
-    <xsl:choose>
-      <xsl:when test="$action='seq'"><xsl:text> </xsl:text></xsl:when>
-      <xsl:when test="$action='simul'">+</xsl:when>
-      <xsl:when test="$action='press'">-</xsl:when>
-      <xsl:when test="$action='click'">-</xsl:when>
-      <xsl:when test="$action='double-click'">-</xsl:when>
-      <xsl:when test="$action='other'"></xsl:when>
-      <xsl:otherwise>+</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-  <xsl:for-each select="*">
-    <xsl:if test="position()>1"><xsl:value-of select="$joinchar"/></xsl:if>
-    <xsl:apply-templates select="."/>
-  </xsl:for-each>
-</xsl:template>
-
-<xsl:template match="uri">
-  <xsl:call-template name="inline.monoseq"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="menuchoice">
-  <xsl:variable name="shortcut" select="./shortcut"/>
-  <xsl:call-template name="process.menuchoice"/>
-  <xsl:if test="$shortcut">
-    <xsl:text> (</xsl:text>
-    <xsl:apply-templates select="$shortcut"/>
-    <xsl:text>)</xsl:text>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="process.menuchoice">
-  <xsl:param name="nodelist" select="guibutton|guiicon|guilabel|guimenu|guimenuitem|guisubmenu|interface"/><!-- not(shortcut) -->
-  <xsl:param name="count" select="1"/>
-
-  <xsl:variable name="mm.separator">
-    <xsl:choose>
-      <xsl:when test="($fop.extensions != 0 or $fop1.extensions != 0 ) and
-                contains($menuchoice.menu.separator, '&#x2192;')">
-        <fo:inline font-family="Symbol">
-          <xsl:copy-of select="$menuchoice.menu.separator"/>
-        </fo:inline>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:copy-of select="$menuchoice.menu.separator"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$count>count($nodelist)"></xsl:when>
-    <xsl:when test="$count=1">
-      <xsl:apply-templates select="$nodelist[$count=position()]"/>
-      <xsl:call-template name="process.menuchoice">
-        <xsl:with-param name="nodelist" select="$nodelist"/>
-        <xsl:with-param name="count" select="$count+1"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:variable name="node" select="$nodelist[$count=position()]"/>
-      <xsl:choose>
-        <xsl:when test="local-name($node)='guimenuitem'
-                        or local-name($node)='guisubmenu'">
-          <xsl:copy-of select="$mm.separator"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:copy-of select="$menuchoice.separator"/>
-        </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="$node"/>
-      <xsl:call-template name="process.menuchoice">
-        <xsl:with-param name="nodelist" select="$nodelist"/>
-        <xsl:with-param name="count" select="$count+1"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="optional">
-  <xsl:value-of select="$arg.choice.opt.open.str"/>
-  <xsl:call-template name="inline.charseq"/>
-  <xsl:value-of select="$arg.choice.opt.close.str"/>
-</xsl:template>
-
-<xsl:template match="citation">
-  <!-- todo: integrate with bibliography collection -->
-  <xsl:variable name="targets" select="(//biblioentry | //bibliomixed)[abbrev = string(current())]"/>
-  <xsl:variable name="target" select="$targets[1]"/>
-
-  <xsl:choose>
-    <!-- try automatic linking based on match to abbrev -->
-    <xsl:when test="$target and not(xref) and not(link)">
-
-      <xsl:text>[</xsl:text>
-      <fo:basic-link>
-        <xsl:attribute name="internal-destination">
-          <xsl:call-template name="object.id">
-            <xsl:with-param name="object" select="$target"/>
-          </xsl:call-template>
-        </xsl:attribute>
-
-	<xsl:choose>
-	  <xsl:when test="$bibliography.numbered != 0">
-	    <xsl:apply-templates select="$target" mode="citation"/>
-	  </xsl:when>
-	  <xsl:otherwise>
-	    <xsl:call-template name="inline.charseq"/>
-	  </xsl:otherwise>
-	</xsl:choose>
-     
-      </fo:basic-link>
-      <xsl:text>]</xsl:text>
-    </xsl:when>
-
-    <xsl:otherwise>
-      <xsl:text>[</xsl:text>
-      <xsl:call-template name="inline.charseq"/>
-      <xsl:text>]</xsl:text>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="biblioentry|bibliomixed" mode="citation">
-  <xsl:number from="bibliography" count="biblioentry|bibliomixed"
-	      level="any" format="1"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="comment[&comment.block.parents;]|remark[&comment.block.parents;]">
-  <xsl:if test="$show.comments != 0">
-    <fo:block font-style="italic">
-      <xsl:call-template name="inline.charseq"/>
-    </fo:block>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="comment|remark">
-  <xsl:if test="$show.comments != 0">
-    <fo:inline font-style="italic">
-      <xsl:call-template name="inline.charseq"/>
-    </fo:inline>
-  </xsl:if>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="productname">
-  <xsl:call-template name="inline.charseq"/>
-  <xsl:if test="@class">
-    <xsl:call-template name="dingbat">
-      <xsl:with-param name="dingbat" select="@class"/>
-    </xsl:call-template>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="productnumber">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="pob|street|city|state|postcode|country|otheraddr">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="phone|fax">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<!-- in Addresses, for example -->
-<xsl:template match="honorific|firstname|surname|lineage|othername">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="person">
-  <xsl:apply-templates select="personname"/>
-</xsl:template>
-
-<xsl:template match="personname">
-  <xsl:call-template name="simple.xlink">
-    <xsl:with-param name="content">
-      <xsl:call-template name="person.name"/>
-    </xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="jobtitle">
-  <xsl:call-template name="simple.xlink">
-    <xsl:with-param name="content">
-      <xsl:apply-templates/>
-    </xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="org">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="orgname">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="orgdiv">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="affiliation">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="beginpage">
-  <!-- does nothing; this *is not* markup to force a page break. -->
-</xsl:template>
-
-</xsl:stylesheet>
-
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/keywords.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/keywords.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,21 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<xsl:template match="keywordset"></xsl:template>
-<xsl:template match="subjectset"></xsl:template>
-
-<!-- ==================================================================== -->
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/lists.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/lists.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,1287 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:template match="itemizedlist">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="pi-label-width">
-    <xsl:call-template name="pi.dbfo_label-width"/>
-  </xsl:variable>
-
-  <xsl:variable name="label-width">
-    <xsl:choose>
-      <xsl:when test="$pi-label-width = ''">
-	<xsl:value-of select="$itemizedlist.label.width"/>
-      </xsl:when>
-      <xsl:otherwise>
-	<xsl:value-of select="$pi-label-width"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:if test="title">
-    <xsl:apply-templates select="title" mode="list.title.mode"/>
-  </xsl:if>
-
-  <!-- Preserve order of PIs and comments -->
-  <xsl:apply-templates 
-      select="*[not(self::listitem
-                or self::title
-                or self::titleabbrev)]
-              |comment()[not(preceding-sibling::listitem)]
-              |processing-instruction()[not(preceding-sibling::listitem)]"/>
-
-  <xsl:variable name="content">
-    <xsl:apply-templates 
-          select="listitem
-                  |comment()[preceding-sibling::listitem]
-                  |processing-instruction()[preceding-sibling::listitem]"/>
-  </xsl:variable>
-
-  <!-- nested lists don't add extra list-block spacing -->
-  <xsl:choose>
-    <xsl:when test="ancestor::listitem">
-      <fo:list-block id="{$id}" xsl:use-attribute-sets="itemizedlist.properties">
-	<xsl:attribute name="provisional-distance-between-starts">
-	  <xsl:value-of select="$label-width"/>
-	</xsl:attribute>
-        <xsl:copy-of select="$content"/>
-      </fo:list-block>
-    </xsl:when>
-    <xsl:otherwise>
-      <fo:list-block id="{$id}" xsl:use-attribute-sets="list.block.spacing itemizedlist.properties">
-	<xsl:attribute name="provisional-distance-between-starts">
-	  <xsl:value-of select="$label-width"/>
-	</xsl:attribute>
-	<xsl:copy-of select="$content"/>
-      </fo:list-block>
-    </xsl:otherwise>
-  </xsl:choose>
-
-</xsl:template>
-
-<xsl:template match="itemizedlist/title|orderedlist/title">
-  <!--nop-->
-</xsl:template>
-
-<xsl:template match="variablelist/title" mode="vl.as.list">
-  <!--nop-->
-</xsl:template>
-
-<xsl:template match="variablelist/title" mode="vl.as.blocks">
-  <!--nop-->
-</xsl:template>
-
-<xsl:template match="itemizedlist/titleabbrev|orderedlist/titleabbrev">
-  <!--nop-->
-</xsl:template>
-
-<xsl:template match="procedure/titleabbrev">
-  <!--nop-->
-</xsl:template>
-
-<xsl:template match="variablelist/titleabbrev" mode="vl.as.list">
-  <!--nop-->
-</xsl:template>
-
-<xsl:template match="variablelist/titleabbrev" mode="vl.as.blocks">
-  <!--nop-->
-</xsl:template>
-
-<xsl:template match="itemizedlist/listitem">
-  <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
-
-  <xsl:variable name="item.contents">
-    <fo:list-item-label end-indent="label-end()" xsl:use-attribute-sets="itemizedlist.label.properties">
-      <fo:block>
-        <xsl:call-template name="itemizedlist.label.markup">
-          <xsl:with-param name="itemsymbol">
-            <xsl:call-template name="list.itemsymbol">
-              <xsl:with-param name="node" select="parent::itemizedlist"/>
-            </xsl:call-template>
-          </xsl:with-param>
-        </xsl:call-template>
-      </fo:block>
-    </fo:list-item-label>
-    <fo:list-item-body start-indent="body-start()">
-      <xsl:choose>
-        <!-- * work around broken passivetex list-item-body rendering -->
-        <xsl:when test="$passivetex.extensions = '1'">
-          <xsl:apply-templates/>
-        </xsl:when>
-        <xsl:otherwise>
-          <fo:block>
-            <xsl:apply-templates/>
-          </fo:block>
-        </xsl:otherwise>
-      </xsl:choose>
-    </fo:list-item-body>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="parent::*/@spacing = 'compact'">
-      <fo:list-item id="{$id}" xsl:use-attribute-sets="compact.list.item.spacing">
-        <xsl:copy-of select="$item.contents"/>
-      </fo:list-item>
-    </xsl:when>
-    <xsl:otherwise>
-      <fo:list-item id="{$id}" xsl:use-attribute-sets="list.item.spacing">
-        <xsl:copy-of select="$item.contents"/>
-      </fo:list-item>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="itemizedlist.label.markup">
-  <xsl:param name="itemsymbol" select="'disc'"/>
-
-  <xsl:choose>
-    <xsl:when test="$itemsymbol='none'"></xsl:when>
-    <xsl:when test="$itemsymbol='disc'">&#x2022;</xsl:when>
-    <xsl:when test="$itemsymbol='bullet'">&#x2022;</xsl:when>
-    <xsl:when test="$itemsymbol='endash'">&#x2013;</xsl:when>
-    <xsl:when test="$itemsymbol='emdash'">&#x2014;</xsl:when>
-    <!-- Some of these may work in your XSL-FO processor and fonts -->
-    <!--
-    <xsl:when test="$itemsymbol='square'">&#x25A0;</xsl:when>
-    <xsl:when test="$itemsymbol='box'">&#x25A0;</xsl:when>
-    <xsl:when test="$itemsymbol='smallblacksquare'">&#x25AA;</xsl:when>
-    <xsl:when test="$itemsymbol='circle'">&#x25CB;</xsl:when>
-    <xsl:when test="$itemsymbol='opencircle'">&#x25CB;</xsl:when>
-    <xsl:when test="$itemsymbol='whitesquare'">&#x25A1;</xsl:when>
-    <xsl:when test="$itemsymbol='smallwhitesquare'">&#x25AB;</xsl:when>
-    <xsl:when test="$itemsymbol='round'">&#x25CF;</xsl:when>
-    <xsl:when test="$itemsymbol='blackcircle'">&#x25CF;</xsl:when>
-    <xsl:when test="$itemsymbol='whitebullet'">&#x25E6;</xsl:when>
-    <xsl:when test="$itemsymbol='triangle'">&#x2023;</xsl:when>
-    <xsl:when test="$itemsymbol='point'">&#x203A;</xsl:when>
-    <xsl:when test="$itemsymbol='hand'"><fo:inline 
-                         font-family="Wingdings 2">A</fo:inline></xsl:when>
-    -->
-    <xsl:otherwise>&#x2022;</xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="orderedlist">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="pi-label-width">
-    <xsl:call-template name="pi.dbfo_label-width"/>
-  </xsl:variable>
-
-  <xsl:variable name="label-width">
-    <xsl:choose>
-      <xsl:when test="$pi-label-width = ''">
-	<xsl:value-of select="$orderedlist.label.width"/>
-      </xsl:when>
-      <xsl:otherwise>
-	<xsl:value-of select="$pi-label-width"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:if test="title">
-    <xsl:apply-templates select="title" mode="list.title.mode"/>
-  </xsl:if>
-
-  <!-- Preserve order of PIs and comments -->
-  <xsl:apply-templates 
-      select="*[not(self::listitem
-                or self::title
-                or self::titleabbrev)]
-              |comment()[not(preceding-sibling::listitem)]
-              |processing-instruction()[not(preceding-sibling::listitem)]"/>
-
-  <xsl:variable name="content">
-    <xsl:apply-templates 
-          select="listitem
-                  |comment()[preceding-sibling::listitem]
-                  |processing-instruction()[preceding-sibling::listitem]"/>
-  </xsl:variable>
-
-  <!-- nested lists don't add extra list-block spacing -->
-  <xsl:choose>
-    <xsl:when test="ancestor::listitem">
-      <fo:list-block id="{$id}" xsl:use-attribute-sets="orderedlist.properties">
-	<xsl:attribute name="provisional-distance-between-starts">
-	  <xsl:value-of select="$label-width"/>
-	</xsl:attribute>
-        <xsl:copy-of select="$content"/>
-      </fo:list-block>
-    </xsl:when>
-    <xsl:otherwise>
-      <fo:list-block id="{$id}" xsl:use-attribute-sets="list.block.spacing orderedlist.properties">
-	<xsl:attribute name="provisional-distance-between-starts">
-	  <xsl:value-of select="$label-width"/>
-	</xsl:attribute>
-        <xsl:copy-of select="$content"/>
-      </fo:list-block>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="orderedlist/listitem" mode="item-number">
-  <xsl:variable name="numeration">
-    <xsl:call-template name="list.numeration">
-      <xsl:with-param name="node" select="parent::orderedlist"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="type">
-    <xsl:choose>
-      <xsl:when test="$numeration='arabic'">1.</xsl:when>
-      <xsl:when test="$numeration='loweralpha'">a.</xsl:when>
-      <xsl:when test="$numeration='lowerroman'">i.</xsl:when>
-      <xsl:when test="$numeration='upperalpha'">A.</xsl:when>
-      <xsl:when test="$numeration='upperroman'">I.</xsl:when>
-      <!-- What!? This should never happen -->
-      <xsl:otherwise>
-        <xsl:message>
-          <xsl:text>Unexpected numeration: </xsl:text>
-          <xsl:value-of select="$numeration"/>
-        </xsl:message>
-        <xsl:value-of select="1."/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="item-number">
-    <xsl:call-template name="orderedlist-item-number"/>
-  </xsl:variable>
-
-  <xsl:if test="parent::orderedlist/@inheritnum='inherit'
-                and ancestor::listitem[parent::orderedlist]">
-    <xsl:apply-templates select="ancestor::listitem[parent::orderedlist][1]"
-                         mode="item-number"/>
-  </xsl:if>
-
-  <xsl:number value="$item-number" format="{$type}"/>
-</xsl:template>
-
-<xsl:template match="orderedlist/listitem">
-  <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
-
-  <xsl:variable name="item.contents">
-    <fo:list-item-label end-indent="label-end()" xsl:use-attribute-sets="orderedlist.label.properties">
-      <fo:block>
-        <xsl:apply-templates select="." mode="item-number"/>
-      </fo:block>
-    </fo:list-item-label>
-    <fo:list-item-body start-indent="body-start()">
-      <fo:block>
-        <xsl:apply-templates/>
-      </fo:block>
-    </fo:list-item-body>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="parent::*/@spacing = 'compact'">
-      <fo:list-item id="{$id}" xsl:use-attribute-sets="compact.list.item.spacing">
-        <xsl:copy-of select="$item.contents"/>
-      </fo:list-item>
-    </xsl:when>
-    <xsl:otherwise>
-      <fo:list-item id="{$id}" xsl:use-attribute-sets="list.item.spacing">
-        <xsl:copy-of select="$item.contents"/>
-      </fo:list-item>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="listitem/*[1][local-name()='para' or 
-                                   local-name()='simpara' or 
-                                   local-name()='formalpara']
-                     |glossdef/*[1][local-name()='para' or 
-                                   local-name()='simpara' or 
-                                   local-name()='formalpara']
-                     |step/*[1][local-name()='para' or 
-                                   local-name()='simpara' or 
-                                   local-name()='formalpara']
-                     |callout/*[1][local-name()='para' or 
-                                   local-name()='simpara' or 
-                                   local-name()='formalpara']"
-              priority="2">
-  <fo:block>
-    <xsl:call-template name="anchor"/>
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="variablelist">
-  <xsl:variable name="presentation">
-    <xsl:call-template name="pi.dbfo_list-presentation"/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$presentation = 'list'">
-      <xsl:apply-templates select="." mode="vl.as.list"/>
-    </xsl:when>
-    <xsl:when test="$presentation = 'blocks'">
-      <xsl:apply-templates select="." mode="vl.as.blocks"/>
-    </xsl:when>
-    <xsl:when test="$variablelist.as.blocks != 0">
-      <xsl:apply-templates select="." mode="vl.as.blocks"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates select="." mode="vl.as.list"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="variablelist" mode="vl.as.list">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="term-width">
-    <xsl:call-template name="pi.dbfo_term-width"/>
-  </xsl:variable>
-
-  <xsl:variable name="termlength">
-    <xsl:choose>
-      <xsl:when test="$term-width != ''">
-        <xsl:value-of select="$term-width"/>
-      </xsl:when>
-      <xsl:when test="@termlength">
-        <xsl:variable name="termlength.is.number">
-          <xsl:value-of select="@termlength + 0"/>
-        </xsl:variable>
-        <xsl:choose>
-          <xsl:when test="string($termlength.is.number) = 'NaN'">
-            <!-- if the term length isn't just a number, assume it's a measurement -->
-            <xsl:value-of select="@termlength"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="@termlength"/>
-            <xsl:choose>
-              <!-- workaround for passivetex lack of support for non-constant expressions -->
-              <xsl:when test="$passivetex.extensions != 0">
-                <xsl:text>em</xsl:text>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:text>em * 0.60</xsl:text>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="longest.term">
-          <xsl:with-param name="terms" select="varlistentry/term"/>
-          <xsl:with-param name="maxlength" select="$variablelist.max.termlength"/>
-        </xsl:call-template>
-        <xsl:choose>
-          <!-- workaround for passivetex lack of support for non-constant expressions -->
-          <xsl:when test="$passivetex.extensions != 0">
-            <xsl:text>em</xsl:text>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:text>em * 0.60</xsl:text>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-<!--
-  <xsl:message>
-    <xsl:text>term width: </xsl:text>
-    <xsl:value-of select="$termlength"/>
-  </xsl:message>
--->
-
-  <xsl:variable name="label-separation">1em</xsl:variable>
-  <xsl:variable name="distance-between-starts">
-    <xsl:choose>
-      <!-- workaround for passivetex lack of support for non-constant expressions -->
-      <xsl:when test="$passivetex.extensions != 0">
-        <xsl:value-of select="$termlength"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$termlength"/>
-        <xsl:text>+</xsl:text>
-        <xsl:value-of select="$label-separation"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:if test="title">
-    <xsl:apply-templates select="title" mode="list.title.mode"/>
-  </xsl:if>
-
-  <!-- Preserve order of PIs and comments -->
-  <xsl:apply-templates 
-    select="*[not(self::varlistentry
-              or self::title
-              or self::titleabbrev)]
-            |comment()[not(preceding-sibling::varlistentry)]
-            |processing-instruction()[not(preceding-sibling::varlistentry)]"/>
-
-  <xsl:variable name="content">
-    <xsl:apply-templates mode="vl.as.list"
-      select="varlistentry
-              |comment()[preceding-sibling::varlistentry]
-              |processing-instruction()[preceding-sibling::varlistentry]"/>
-  </xsl:variable>
-
-  <!-- nested lists don't add extra list-block spacing -->
-  <xsl:choose>
-    <xsl:when test="ancestor::listitem">
-      <fo:list-block id="{$id}"
-                     provisional-distance-between-starts=
-                        "{$distance-between-starts}"
-                     provisional-label-separation="{$label-separation}">
-        <xsl:copy-of select="$content"/>
-      </fo:list-block>
-    </xsl:when>
-    <xsl:otherwise>
-      <fo:list-block id="{$id}"
-                     provisional-distance-between-starts=
-                        "{$distance-between-starts}"
-                     provisional-label-separation="{$label-separation}"
-                     xsl:use-attribute-sets="list.block.spacing">
-        <xsl:copy-of select="$content"/>
-      </fo:list-block>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="longest.term">
-  <xsl:param name="longest" select="0"/>
-  <xsl:param name="terms" select="."/>
-  <xsl:param name="maxlength" select="-1"/>
-
-  <!-- Process out any indexterms in the term -->
-  <xsl:variable name="term.text">
-    <xsl:apply-templates select="$terms[1]"/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$longest &gt; $maxlength and $maxlength &gt; 0">
-      <xsl:value-of select="$maxlength"/>
-    </xsl:when>
-    <xsl:when test="not($terms)">
-      <xsl:value-of select="$longest"/>
-    </xsl:when>
-    <xsl:when test="string-length($term.text) &gt; $longest">
-      <xsl:call-template name="longest.term">
-        <xsl:with-param name="longest" 
-            select="string-length($term.text)"/>
-        <xsl:with-param name="maxlength" select="$maxlength"/>
-        <xsl:with-param name="terms" select="$terms[position() &gt; 1]"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="longest.term">
-        <xsl:with-param name="longest" select="$longest"/>
-        <xsl:with-param name="maxlength" select="$maxlength"/>
-        <xsl:with-param name="terms" select="$terms[position() &gt; 1]"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="varlistentry" mode="vl.as.list">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-  <xsl:variable name="item.contents">
-    <fo:list-item-label end-indent="label-end()" text-align="start">
-      <fo:block>
-        <xsl:apply-templates select="term"/>
-      </fo:block>
-    </fo:list-item-label>
-    <fo:list-item-body start-indent="body-start()">
-      <fo:block>
-        <xsl:apply-templates select="listitem"/>
-      </fo:block>
-    </fo:list-item-body>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="parent::*/@spacing = 'compact'">
-      <fo:list-item id="{$id}"
-          xsl:use-attribute-sets="compact.list.item.spacing">
-        <xsl:copy-of select="$item.contents"/>
-      </fo:list-item>
-    </xsl:when>
-    <xsl:otherwise>
-      <fo:list-item id="{$id}" xsl:use-attribute-sets="list.item.spacing">
-        <xsl:copy-of select="$item.contents"/>
-      </fo:list-item>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-
-<xsl:template match="variablelist" mode="vl.as.blocks">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <!-- termlength is irrelevant -->
-
-  <xsl:if test="title">
-    <xsl:apply-templates select="title" mode="list.title.mode"/>
-  </xsl:if>
-
-  <!-- Preserve order of PIs and comments -->
-  <xsl:apply-templates 
-    select="*[not(self::varlistentry
-              or self::title
-              or self::titleabbrev)]
-            |comment()[not(preceding-sibling::varlistentry)]
-            |processing-instruction()[not(preceding-sibling::varlistentry)]"/>
-
-  <xsl:variable name="content">
-    <xsl:apply-templates mode="vl.as.blocks"
-      select="varlistentry
-              |comment()[preceding-sibling::varlistentry]
-              |processing-instruction()[preceding-sibling::varlistentry]"/>
-  </xsl:variable>
-
-  <!-- nested lists don't add extra list-block spacing -->
-  <xsl:choose>
-    <xsl:when test="ancestor::listitem">
-      <fo:block id="{$id}">
-        <xsl:copy-of select="$content"/>
-      </fo:block>
-    </xsl:when>
-    <xsl:otherwise>
-      <fo:block id="{$id}" xsl:use-attribute-sets="list.block.spacing">
-        <xsl:copy-of select="$content"/>
-      </fo:block>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="varlistentry" mode="vl.as.blocks">
-  <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
-
-  <fo:block id="{$id}" xsl:use-attribute-sets="list.item.spacing"  
-      keep-together.within-column="always" 
-      keep-with-next.within-column="always">
-    <xsl:apply-templates select="term"/>
-  </fo:block>
-
-  <fo:block margin-left="0.25in">
-    <xsl:apply-templates select="listitem"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="varlistentry/term">
-  <fo:inline>
-    <xsl:call-template name="simple.xlink">
-      <xsl:with-param name="content">
-        <xsl:apply-templates/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </fo:inline>
-  <xsl:choose>
-    <xsl:when test="not(following-sibling::term)"/> <!-- do nothing -->
-    <xsl:otherwise>
-      <!-- * if we have multiple terms in the same varlistentry, generate -->
-      <!-- * a separator (", " by default) and/or an additional line -->
-      <!-- * break after each one except the last -->
-      <fo:inline><xsl:value-of select="$variablelist.term.separator"/></fo:inline>
-      <xsl:if test="not($variablelist.term.break.after = '0')">
-        <fo:block/>
-      </xsl:if>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="varlistentry/listitem">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="title" mode="list.title.mode">
-  <xsl:call-template name="formal.object.heading">
-    <xsl:with-param name="object" select=".."/>
-  </xsl:call-template>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="simplelist|simplelist[@type='vert']">
-  <!-- with no type specified, the default is 'vert' -->
-
-  <xsl:variable name="explicit.table.width">
-    <xsl:call-template name="dbfo-attribute">
-      <xsl:with-param name="pis"
-		      select="processing-instruction('dbfo')"/>
-      <xsl:with-param name="attribute" select="'list-width'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="table.width">
-    <xsl:choose>
-      <xsl:when test="$explicit.table.width != ''">
-        <xsl:value-of select="$explicit.table.width"/>
-      </xsl:when>
-      <xsl:when test="$default.table.width = ''">
-        <xsl:text>100%</xsl:text>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$default.table.width"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <fo:table xsl:use-attribute-sets="normal.para.spacing">
-
-    <xsl:choose>
-      <xsl:when test="$axf.extensions != 0 or $xep.extensions != 0">
-	<xsl:attribute name="table-layout">auto</xsl:attribute>
-        <xsl:if test="$explicit.table.width != ''">
-          <xsl:attribute name="width"><xsl:value-of 
-	  select="$explicit.table.width"/></xsl:attribute>
-        </xsl:if>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:attribute name="table-layout">fixed</xsl:attribute>
-        <xsl:attribute name="width"><xsl:value-of 
-                                      select="$table.width"/></xsl:attribute>
-      </xsl:otherwise>
-    </xsl:choose>
-
-    <xsl:call-template name="simplelist.table.columns">
-      <xsl:with-param name="cols">
-        <xsl:choose>
-          <xsl:when test="@columns">
-            <xsl:value-of select="@columns"/>
-          </xsl:when>
-          <xsl:otherwise>1</xsl:otherwise>
-        </xsl:choose>
-      </xsl:with-param>
-    </xsl:call-template>
-    <fo:table-body start-indent="0pt" end-indent="0pt">
-      <xsl:call-template name="simplelist.vert">
-        <xsl:with-param name="cols">
-          <xsl:choose>
-            <xsl:when test="@columns">
-              <xsl:value-of select="@columns"/>
-            </xsl:when>
-            <xsl:otherwise>1</xsl:otherwise>
-          </xsl:choose>
-        </xsl:with-param>
-      </xsl:call-template>
-    </fo:table-body>
-  </fo:table>
-</xsl:template>
-
-<xsl:template match="simplelist[@type='inline']">
-  <!-- if dbchoice PI exists, use that to determine the choice separator -->
-  <!-- (that is, equivalent of "and" or "or" in current locale), or literal -->
-  <!-- value of "choice" otherwise -->
-  <fo:inline><xsl:variable name="localized-choice-separator">
-    <xsl:choose>
-      <xsl:when test="processing-instruction('dbchoice')">
-        <xsl:call-template name="select.choice.separator"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <!-- empty -->
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:for-each select="member">
-    <xsl:apply-templates/>
-    <xsl:choose>
-      <xsl:when test="position() = last()"/> <!-- do nothing -->
-      <xsl:otherwise>
-	<xsl:text>, </xsl:text>
-	<xsl:if test="position() = last() - 1">
-	  <xsl:if test="$localized-choice-separator != ''">
-	    <xsl:value-of select="$localized-choice-separator"/>
-	    <xsl:text> </xsl:text>
-	  </xsl:if>
-	</xsl:if>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:for-each></fo:inline>
-</xsl:template>
-
-<xsl:template match="simplelist[@type='horiz']">
-
-  <xsl:variable name="explicit.table.width">
-    <xsl:call-template name="pi.dbfo_list-width"/>
-  </xsl:variable>
-
-  <xsl:variable name="table.width">
-    <xsl:choose>
-      <xsl:when test="$explicit.table.width != ''">
-        <xsl:value-of select="$explicit.table.width"/>
-      </xsl:when>
-      <xsl:when test="$default.table.width = ''">
-        <xsl:text>100%</xsl:text>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$default.table.width"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <fo:table xsl:use-attribute-sets="normal.para.spacing">
-    <xsl:choose>
-      <xsl:when test="$axf.extensions != 0 or $xep.extensions != 0">
-        <xsl:attribute name="table-layout">auto</xsl:attribute>
-        <xsl:if test="$explicit.table.width != ''">
-          <xsl:attribute name="width"><xsl:value-of 
-                             select="$explicit.table.width"/></xsl:attribute>
-        </xsl:if>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:attribute name="table-layout">fixed</xsl:attribute>
-        <xsl:attribute name="width"><xsl:value-of 
-                                      select="$table.width"/></xsl:attribute>
-      </xsl:otherwise>
-    </xsl:choose>
-    <xsl:call-template name="simplelist.table.columns">
-      <xsl:with-param name="cols">
-        <xsl:choose>
-          <xsl:when test="@columns">
-            <xsl:value-of select="@columns"/>
-          </xsl:when>
-          <xsl:otherwise>1</xsl:otherwise>
-        </xsl:choose>
-      </xsl:with-param>
-    </xsl:call-template>
-    <fo:table-body start-indent="0pt" end-indent="0pt">
-      <xsl:call-template name="simplelist.horiz">
-        <xsl:with-param name="cols">
-          <xsl:choose>
-            <xsl:when test="@columns">
-              <xsl:value-of select="@columns"/>
-            </xsl:when>
-            <xsl:otherwise>1</xsl:otherwise>
-          </xsl:choose>
-        </xsl:with-param>
-      </xsl:call-template>
-    </fo:table-body>
-  </fo:table>
-</xsl:template>
-
-<xsl:template name="simplelist.table.columns">
-  <xsl:param name="cols" select="1"/>
-  <xsl:param name="curcol" select="1"/>
-  <fo:table-column column-number="{$curcol}"
-                   column-width="proportional-column-width(1)"/>
-  <xsl:if test="$curcol &lt; $cols">
-    <xsl:call-template name="simplelist.table.columns">
-      <xsl:with-param name="cols" select="$cols"/>
-      <xsl:with-param name="curcol" select="$curcol + 1"/>
-    </xsl:call-template>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="simplelist.horiz">
-  <xsl:param name="cols">1</xsl:param>
-  <xsl:param name="cell">1</xsl:param>
-  <xsl:param name="members" select="./member"/>
-
-  <xsl:if test="$cell &lt;= count($members)">
-    <fo:table-row>
-      <xsl:call-template name="simplelist.horiz.row">
-        <xsl:with-param name="cols" select="$cols"/>
-        <xsl:with-param name="cell" select="$cell"/>
-        <xsl:with-param name="members" select="$members"/>
-      </xsl:call-template>
-   </fo:table-row>
-    <xsl:call-template name="simplelist.horiz">
-      <xsl:with-param name="cols" select="$cols"/>
-      <xsl:with-param name="cell" select="$cell + $cols"/>
-      <xsl:with-param name="members" select="$members"/>
-    </xsl:call-template>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="simplelist.horiz.row">
-  <xsl:param name="cols">1</xsl:param>
-  <xsl:param name="cell">1</xsl:param>
-  <xsl:param name="members" select="./member"/>
-  <xsl:param name="curcol">1</xsl:param>
-
-  <xsl:if test="$curcol &lt;= $cols">
-    <fo:table-cell>
-      <fo:block>
-        <xsl:if test="$members[position()=$cell]">
-          <xsl:apply-templates select="$members[position()=$cell]"/>
-        </xsl:if>
-      </fo:block>
-    </fo:table-cell>
-    <xsl:call-template name="simplelist.horiz.row">
-      <xsl:with-param name="cols" select="$cols"/>
-      <xsl:with-param name="cell" select="$cell+1"/>
-      <xsl:with-param name="members" select="$members"/>
-      <xsl:with-param name="curcol" select="$curcol+1"/>
-    </xsl:call-template>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="simplelist.vert">
-  <xsl:param name="cols">1</xsl:param>
-  <xsl:param name="cell">1</xsl:param>
-  <xsl:param name="members" select="./member"/>
-  <xsl:param name="rows"
-             select="floor((count($members)+$cols - 1) div $cols)"/>
-
-  <xsl:if test="$cell &lt;= $rows">
-    <fo:table-row>
-      <xsl:call-template name="simplelist.vert.row">
-        <xsl:with-param name="cols" select="$cols"/>
-        <xsl:with-param name="rows" select="$rows"/>
-        <xsl:with-param name="cell" select="$cell"/>
-        <xsl:with-param name="members" select="$members"/>
-      </xsl:call-template>
-   </fo:table-row>
-    <xsl:call-template name="simplelist.vert">
-      <xsl:with-param name="cols" select="$cols"/>
-      <xsl:with-param name="cell" select="$cell+1"/>
-      <xsl:with-param name="members" select="$members"/>
-      <xsl:with-param name="rows" select="$rows"/>
-    </xsl:call-template>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="simplelist.vert.row">
-  <xsl:param name="cols">1</xsl:param>
-  <xsl:param name="rows">1</xsl:param>
-  <xsl:param name="cell">1</xsl:param>
-  <xsl:param name="members" select="./member"/>
-  <xsl:param name="curcol">1</xsl:param>
-
-  <xsl:if test="$curcol &lt;= $cols">
-    <fo:table-cell>
-      <fo:block>
-        <xsl:if test="$members[position()=$cell]">
-          <xsl:apply-templates select="$members[position()=$cell]"/>
-        </xsl:if>
-      </fo:block>
-    </fo:table-cell>
-    <xsl:call-template name="simplelist.vert.row">
-      <xsl:with-param name="cols" select="$cols"/>
-      <xsl:with-param name="rows" select="$rows"/>
-      <xsl:with-param name="cell" select="$cell+$rows"/>
-      <xsl:with-param name="members" select="$members"/>
-      <xsl:with-param name="curcol" select="$curcol+1"/>
-    </xsl:call-template>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="member">
-  <xsl:call-template name="simple.xlink">
-    <xsl:with-param name="content">
-      <xsl:apply-templates/>
-    </xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="procedure">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="param.placement"
-                select="substring-after(normalize-space($formal.title.placement),
-                                        concat(local-name(.), ' '))"/>
-
-  <xsl:variable name="placement">
-    <xsl:choose>
-      <xsl:when test="contains($param.placement, ' ')">
-        <xsl:value-of select="substring-before($param.placement, ' ')"/>
-      </xsl:when>
-      <xsl:when test="$param.placement = ''">before</xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$param.placement"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <!-- Preserve order of PIs and comments -->
-  <xsl:variable name="preamble"
-        select="*[not(self::step
-                  or self::title
-                  or self::titleabbrev)]
-                |comment()[not(preceding-sibling::step)]
-                |processing-instruction()[not(preceding-sibling::step)]"/>
-
-  <xsl:variable name="steps" 
-                select="step
-                        |comment()[preceding-sibling::step]
-                        |processing-instruction()[preceding-sibling::step]"/>
-
-  <fo:block id="{$id}" xsl:use-attribute-sets="procedure.properties list.block.spacing">
-    <xsl:if test="./title and $placement = 'before'">
-      <!-- n.b. gentext code tests for $formal.procedures and may make an "informal" -->
-      <!-- heading even though we called formal.object.heading. odd but true. -->
-      <xsl:call-template name="formal.object.heading"/>
-    </xsl:if>
-
-    <xsl:apply-templates select="$preamble"/>
-
-    <fo:list-block xsl:use-attribute-sets="list.block.spacing"
-                   provisional-distance-between-starts="2em"
-                   provisional-label-separation="0.2em">
-      <xsl:apply-templates select="$steps"/>
-    </fo:list-block>
-
-    <xsl:if test="./title and $placement != 'before'">
-      <!-- n.b. gentext code tests for $formal.procedures and may make an "informal" -->
-      <!-- heading even though we called formal.object.heading. odd but true. -->
-      <xsl:call-template name="formal.object.heading"/>
-    </xsl:if>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="procedure/title">
-</xsl:template>
-
-<xsl:template match="substeps">
-  <fo:list-block xsl:use-attribute-sets="list.block.spacing"
-                 provisional-distance-between-starts="2em"
-                 provisional-label-separation="0.2em">
-    <xsl:apply-templates/>
-  </fo:list-block>
-</xsl:template>
-
-<xsl:template match="procedure/step|substeps/step">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <fo:list-item xsl:use-attribute-sets="list.item.spacing">
-    <fo:list-item-label end-indent="label-end()">
-      <fo:block id="{$id}">
-        <!-- dwc: fix for one step procedures. Use a bullet if there's no step 2 -->
-        <xsl:choose>
-          <xsl:when test="count(../step) = 1">
-            <xsl:text>&#x2022;</xsl:text>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:apply-templates select="." mode="number">
-              <xsl:with-param name="recursive" select="0"/>
-            </xsl:apply-templates>.
-          </xsl:otherwise>
-        </xsl:choose>
-      </fo:block>
-    </fo:list-item-label>
-    <fo:list-item-body start-indent="body-start()">
-      <fo:block>
-        <xsl:apply-templates/>
-      </fo:block>
-    </fo:list-item-body>
-  </fo:list-item>
-</xsl:template>
-
-<xsl:template match="stepalternatives">
-  <fo:list-block provisional-distance-between-starts="2em"
-                 provisional-label-separation="0.2em">
-    <xsl:apply-templates select="step"/>
-  </fo:list-block>
-</xsl:template>
-
-<xsl:template match="stepalternatives/step">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <fo:list-item xsl:use-attribute-sets="list.item.spacing">
-    <fo:list-item-label end-indent="label-end()">
-      <fo:block id="{$id}">
-        <xsl:text>&#x2022;</xsl:text>
-      </fo:block>
-    </fo:list-item-label>
-    <fo:list-item-body start-indent="body-start()">
-      <fo:block>
-        <xsl:apply-templates/>
-      </fo:block>
-    </fo:list-item-body>
-  </fo:list-item>
-</xsl:template>
-
-<xsl:template match="step/title">
-  <fo:block font-weight="bold"
-            keep-together.within-column="always" 
-            keep-with-next.within-column="always">
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="segmentedlist">
-  <xsl:variable name="presentation">
-    <xsl:call-template name="pi.dbfo_list-presentation"/>
-  </xsl:variable>
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$presentation = 'table'">
-      <fo:block id="{$id}">
-        <xsl:apply-templates select="." mode="seglist-table"/>
-      </fo:block>
-    </xsl:when>
-    <xsl:when test="$presentation = 'list'">
-      <fo:block id="{$id}">
-        <xsl:apply-templates/>
-      </fo:block>
-    </xsl:when>
-    <xsl:when test="$segmentedlist.as.table != 0">
-      <fo:block id="{$id}">
-        <xsl:apply-templates select="." mode="seglist-table"/>
-      </fo:block>
-    </xsl:when>
-    <xsl:otherwise>
-      <fo:block id="{$id}">
-        <xsl:apply-templates/>
-      </fo:block>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="segmentedlist/title">
-  <xsl:apply-templates select="." mode="list.title.mode" />
-</xsl:template>
-
-<xsl:template match="segtitle">
-</xsl:template>
-
-<xsl:template match="segtitle" mode="segtitle-in-seg">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="seglistitem">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-  <fo:block id="{$id}">
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="seg">
-  <xsl:variable name="segnum" select="count(preceding-sibling::seg)+1"/>
-  <xsl:variable name="seglist" select="ancestor::segmentedlist"/>
-  <xsl:variable name="segtitles" select="$seglist/segtitle"/>
-
-  <!--
-     Note: segtitle is only going to be the right thing in a well formed
-     SegmentedList.  If there are too many Segs or too few SegTitles,
-     you'll get something odd...maybe an error
-  -->
-
-  <fo:block>
-    <fo:inline font-weight="bold">
-      <xsl:apply-templates select="$segtitles[$segnum=position()]"
-                           mode="segtitle-in-seg"/>
-      <xsl:text>: </xsl:text>
-    </fo:inline>
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="segmentedlist" mode="seglist-table">
-  <xsl:apply-templates select="title" mode="list.title.mode" />
-  <fo:table>
-    <fo:table-column column-number="1" column-width="proportional-column-width(1)"/>
-    <fo:table-column column-number="2" column-width="proportional-column-width(1)"/>
-    <fo:table-header start-indent="0pt" end-indent="0pt">
-      <fo:table-row>
-        <xsl:apply-templates select="segtitle" mode="seglist-table"/>
-      </fo:table-row>
-    </fo:table-header>
-    <fo:table-body start-indent="0pt" end-indent="0pt">
-      <xsl:apply-templates select="seglistitem" mode="seglist-table"/>
-    </fo:table-body>
-  </fo:table>
-</xsl:template>
-
-<xsl:template match="segtitle" mode="seglist-table">
-  <fo:table-cell>
-    <fo:block font-weight="bold">
-      <xsl:apply-templates/>
-    </fo:block>
-  </fo:table-cell>
-</xsl:template>
-
-<xsl:template match="seglistitem" mode="seglist-table">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-  <fo:table-row id="{$id}">
-    <xsl:apply-templates mode="seglist-table"/>
-  </fo:table-row>
-</xsl:template>
-
-<xsl:template match="seg" mode="seglist-table">
-  <fo:table-cell>
-    <fo:block>
-      <xsl:apply-templates/>
-    </fo:block>
-  </fo:table-cell>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="calloutlist">
-  <xsl:variable name="id">
-  <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <fo:block id="{$id}"
-            text-align="{$alignment}">
-    <!-- The above restores alignment altered by image align attribute -->
-    <xsl:if test="title|info/title">
-      <xsl:apply-templates select="(title|info/title)[1]" 
-                           mode="list.title.mode"/>
-    </xsl:if>
-
-    <!-- Preserve order of PIs and comments -->
-    <xsl:apply-templates 
-         select="*[not(self::callout or self::title or self::titleabbrev)]
-                   |comment()[not(preceding-sibling::callout)]
-                   |processing-instruction()[not(preceding-sibling::callout)]"/>
-
-    <fo:list-block space-before.optimum="1em"
-                   space-before.minimum="0.8em"
-                   space-before.maximum="1.2em"
-                   provisional-distance-between-starts="2.2em"
-                   provisional-label-separation="0.2em">
-      <xsl:apply-templates select="callout
-                                |comment()[preceding-sibling::callout]
-                                |processing-instruction()[preceding-sibling::callout]"/>
-    </fo:list-block>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="calloutlist/title">
-</xsl:template>
-
-<xsl:template match="callout">
-  <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
-  <fo:list-item id="{$id}">
-    <fo:list-item-label end-indent="label-end()">
-      <fo:block>
-        <xsl:call-template name="callout.arearefs">
-          <xsl:with-param name="arearefs" select="@arearefs"/>
-        </xsl:call-template>
-      </fo:block>
-    </fo:list-item-label>
-    <fo:list-item-body start-indent="body-start()">
-      <fo:block>
-        <xsl:apply-templates/>
-      </fo:block>
-    </fo:list-item-body>
-  </fo:list-item>
-</xsl:template>
-
-<xsl:template name="callout.arearefs">
-  <xsl:param name="arearefs"></xsl:param>
-  <xsl:if test="$arearefs!=''">
-    <xsl:choose>
-      <xsl:when test="substring-before($arearefs,' ')=''">
-        <xsl:call-template name="callout.arearef">
-          <xsl:with-param name="arearef" select="$arearefs"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="callout.arearef">
-          <xsl:with-param name="arearef"
-                          select="substring-before($arearefs,' ')"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-    <xsl:call-template name="callout.arearefs">
-      <xsl:with-param name="arearefs"
-                      select="substring-after($arearefs,' ')"/>
-    </xsl:call-template>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="callout.arearef">
-  <xsl:param name="arearef"></xsl:param>
-  <xsl:variable name="targets" select="key('id',$arearef)"/>
-  <xsl:variable name="target" select="$targets[1]"/>
-
-  <xsl:choose>
-    <xsl:when test="count($target)=0">
-      <xsl:value-of select="$arearef"/>
-      <xsl:text>: ???</xsl:text>
-    </xsl:when>
-    <xsl:when test="local-name($target)='co'">
-      <xsl:apply-templates select="$target" mode="callout-bug"/>
-    </xsl:when>
-    <xsl:when test="local-name($target)='areaset'">
-      <xsl:call-template name="callout-bug">
-        <xsl:with-param name="conum">
-          <xsl:apply-templates select="$target" mode="conumber"/>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="local-name($target)='area'">
-      <xsl:choose>
-        <xsl:when test="$target/parent::areaset">
-          <xsl:call-template name="callout-bug">
-            <xsl:with-param name="conum">
-              <xsl:apply-templates select="$target/parent::areaset"
-                                   mode="conumber"/>
-            </xsl:with-param>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="callout-bug">
-            <xsl:with-param name="conum">
-              <xsl:apply-templates select="$target" mode="conumber"/>
-            </xsl:with-param>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:text>???</xsl:text>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="orderedlist-starting-number">
-  <xsl:param name="list" select="."/>
-  <xsl:variable name="pi-start">
-    <xsl:call-template name="pi.dbfo_start">
-      <xsl:with-param name="node" select="$list"/>
-    </xsl:call-template>
-  </xsl:variable>
-  <xsl:call-template name="output-orderedlist-starting-number">
-    <xsl:with-param name="list" select="$list"/>
-    <xsl:with-param name="pi-start" select="$pi-start"/>
-  </xsl:call-template>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/math.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/math.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,128 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                xmlns:mml="http://www.w3.org/1998/Math/MathML"
-                exclude-result-prefixes="mml"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<xsl:template match="inlineequation">
-  <xsl:choose>
-    <xsl:when test="$passivetex.extensions != 0 and $tex.math.in.alt != ''">
-      <xsl:apply-templates select="alt[@role='tex'] | inlinemediaobject/textobject[@role='tex']">
-        <xsl:with-param name="output.delims">
-          <xsl:call-template name="tex.math.output.delims"/>
-        </xsl:with-param>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="alt">
-</xsl:template>
-
-<xsl:template match="mathphrase">
-  <fo:inline>
-    <xsl:apply-templates/>
-  </fo:inline>
-</xsl:template>
-
-<!-- "Support" for MathML -->
-
-<xsl:template match="mml:math" xmlns:mml="http://www.w3.org/1998/Math/MathML">
-  <fo:instream-foreign-object>
-    <xsl:copy>
-      <xsl:copy-of select="@*"/>
-      <xsl:apply-templates/>
-    </xsl:copy>
-  </fo:instream-foreign-object>
-</xsl:template>
-
-<xsl:template match="mml:*" xmlns:mml="http://www.w3.org/1998/Math/MathML">
-  <xsl:copy>
-    <xsl:copy-of select="@*"/>
-    <xsl:apply-templates/>
-  </xsl:copy>
-</xsl:template>
-
-<xsl:template match="equation/graphic | informalequation/graphic">
-  <xsl:if test="$passivetex.extensions = 0 or $tex.math.in.alt = ''">
-    <fo:block>
-      <xsl:call-template name="process.image"/>
-    </fo:block>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="inlineequation/alt[@role='tex'] | 
-                     inlineequation/inlinemediaobject/textobject[@role='tex']" priority="1">
-  <xsl:param name="output.delims" select="1"/>
-  <xsl:if test="$passivetex.extensions != 0 and $tex.math.in.alt != ''">
-    <xsl:processing-instruction name="xmltex">
-      <xsl:if test="$output.delims != 0">
-        <xsl:text>$</xsl:text>
-      </xsl:if>
-      <xsl:value-of select="."/>
-      <xsl:if test="$output.delims != 0">
-        <xsl:text>$</xsl:text>
-      </xsl:if>
-    </xsl:processing-instruction>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="equation/alt[@role='tex'] | informalequation/alt[@role='tex'] |
-                     equation/mediaobject/textobject[@role='tex'] |
-                     informalequation/mediaobject/textobject[@role='tex']" priority="1">
-  <xsl:variable name="output.delims">
-    <xsl:call-template name="tex.math.output.delims"/>
-  </xsl:variable>
-  <xsl:if test="$passivetex.extensions != 0 and $tex.math.in.alt != ''">
-    <xsl:processing-instruction name="xmltex">
-      <xsl:if test="$output.delims != 0">
-        <xsl:text>$$</xsl:text>
-      </xsl:if>
-      <xsl:value-of select="."/>
-      <xsl:if test="$output.delims != 0">
-        <xsl:text>$$</xsl:text>
-      </xsl:if>
-    </xsl:processing-instruction>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="alt[@role='tex']">
-  <xsl:if test="$passivetex.extensions != 0 and $tex.math.in.alt != ''">
-    <xsl:message>
-      Your equation is misplaced. It should be in inlineequation, equation or informalequation.
-    </xsl:message>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="tex.math.output.delims">
-  <xsl:variable name="pi.delims">
-    <xsl:call-template name="pi-attribute">
-      <xsl:with-param name="pis" select=".//processing-instruction('dbtex')"/>
-      <xsl:with-param name="attribute" select="'delims'"/>
-    </xsl:call-template>
-  </xsl:variable>
-  <xsl:variable name="result">
-    <xsl:choose>
-      <xsl:when test="$pi.delims = 'no'">0</xsl:when>
-      <xsl:when test="$pi.delims = '' and $tex.math.delims = 0">0</xsl:when>
-      <xsl:otherwise>1</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-  <xsl:value-of select="$result"/>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/pagesetup.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/pagesetup.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,2314 +1,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the DocBook XSL Stylesheet distribution.
-     See ../README or http://docbook.sf.net/ for copyright
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:param name="body.fontset">
-  <xsl:value-of select="$body.font.family"/>
-  <xsl:if test="$body.font.family != ''
-                and $symbol.font.family  != ''">,</xsl:if>
-    <xsl:value-of select="$symbol.font.family"/>
-</xsl:param>
-
-<xsl:param name="title.fontset">
-  <xsl:value-of select="$title.font.family"/>
-  <xsl:if test="$title.font.family != ''
-                and $symbol.font.family  != ''">,</xsl:if>
-    <xsl:value-of select="$symbol.font.family"/>
-</xsl:param>
-
-<!-- PassiveTeX can't handle the math expression for
-     title.margin.left being negative, so ignore it.
-     margin-left="{$page.margin.outer} - {$title.margin.left}"
--->
-<xsl:param name="margin.left.outer">
-  <xsl:choose>
-    <xsl:when test="$passivetex.extensions != 0">
-      <xsl:value-of select="$page.margin.outer"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$page.margin.outer"/>
-      <xsl:text> - </xsl:text>
-      <xsl:value-of select="$title.margin.left"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:param>
-
-<xsl:param name="margin.left.inner">
-  <xsl:choose>
-    <xsl:when test="$passivetex.extensions != 0">
-      <xsl:value-of select="$page.margin.inner"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$page.margin.inner"/>
-      <xsl:text> - </xsl:text>
-      <xsl:value-of select="$title.margin.left"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:param>
-
-<xsl:template name="setup.pagemasters">
-  <fo:layout-master-set>
-    <!-- blank pages -->
-    <fo:simple-page-master master-name="blank"
-                           page-width="{$page.width}"
-                           page-height="{$page.height}"
-                           margin-top="{$page.margin.top}"
-                           margin-bottom="{$page.margin.bottom}"
-                           margin-left="{$margin.left.outer}"
-                           margin-right="{$page.margin.inner}">
-      <xsl:if test="$axf.extensions != 0">
-        <xsl:call-template name="axf-page-master-properties">
-          <xsl:with-param name="page.master">blank</xsl:with-param>
-        </xsl:call-template>
-      </xsl:if>
-      <fo:region-body display-align="center"
-                      margin-bottom="{$body.margin.bottom}"
-                      margin-top="{$body.margin.top}">
-        <xsl:if test="$fop.extensions = 0 and $fop1.extensions = 0">
-          <xsl:attribute name="region-name">blank-body</xsl:attribute>
-        </xsl:if>
-      </fo:region-body>
-      <fo:region-before region-name="xsl-region-before-blank"
-                        extent="{$region.before.extent}"
-                        display-align="before"/>
-      <fo:region-after region-name="xsl-region-after-blank"
-                       extent="{$region.after.extent}"
-                        display-align="after"/>
-    </fo:simple-page-master>
-
-    <!-- title pages -->
-    <fo:simple-page-master master-name="titlepage-first"
-                           page-width="{$page.width}"
-                           page-height="{$page.height}"
-                           margin-top="{$page.margin.top}"
-                           margin-bottom="{$page.margin.bottom}"
-                           margin-left="{$margin.left.inner}"
-                           margin-right="{$page.margin.outer}">
-      <xsl:if test="$axf.extensions != 0">
-        <xsl:call-template name="axf-page-master-properties">
-          <xsl:with-param name="page.master">titlepage-first</xsl:with-param>
-        </xsl:call-template>
-      </xsl:if>
-      <fo:region-body margin-bottom="{$body.margin.bottom}"
-                      margin-top="{$body.margin.top}"
-                      column-gap="{$column.gap.titlepage}"
-                      column-count="{$column.count.titlepage}">
-      </fo:region-body>
-      <fo:region-before region-name="xsl-region-before-first"
-                        extent="{$region.before.extent}"
-                        display-align="before"/>
-      <fo:region-after region-name="xsl-region-after-first"
-                       extent="{$region.after.extent}"
-                        display-align="after"/>
-    </fo:simple-page-master>
-
-    <fo:simple-page-master master-name="titlepage-odd"
-                           page-width="{$page.width}"
-                           page-height="{$page.height}"
-                           margin-top="{$page.margin.top}"
-                           margin-bottom="{$page.margin.bottom}"
-                           margin-left="{$margin.left.inner}"
-                           margin-right="{$page.margin.outer}">
-      <xsl:if test="$axf.extensions != 0">
-        <xsl:call-template name="axf-page-master-properties">
-          <xsl:with-param name="page.master">titlepage-odd</xsl:with-param>
-        </xsl:call-template>
-      </xsl:if>
-      <fo:region-body margin-bottom="{$body.margin.bottom}"
-                      margin-top="{$body.margin.top}"
-                      column-gap="{$column.gap.titlepage}"
-                      column-count="{$column.count.titlepage}">
-      </fo:region-body>
-      <fo:region-before region-name="xsl-region-before-odd"
-                        extent="{$region.before.extent}"
-                        display-align="before"/>
-      <fo:region-after region-name="xsl-region-after-odd"
-                       extent="{$region.after.extent}"
-                        display-align="after"/>
-    </fo:simple-page-master>
-
-    <fo:simple-page-master master-name="titlepage-even"
-                           page-width="{$page.width}"
-                           page-height="{$page.height}"
-                           margin-top="{$page.margin.top}"
-                           margin-bottom="{$page.margin.bottom}"
-                           margin-left="{$margin.left.outer}"
-                           margin-right="{$page.margin.inner}">
-      <xsl:if test="$axf.extensions != 0">
-        <xsl:call-template name="axf-page-master-properties">
-          <xsl:with-param name="page.master">titlepage-even</xsl:with-param>
-        </xsl:call-template>
-      </xsl:if>
-      <fo:region-body margin-bottom="{$body.margin.bottom}"
-                      margin-top="{$body.margin.top}"
-                      column-gap="{$column.gap.titlepage}"
-                      column-count="{$column.count.titlepage}">
-      </fo:region-body>
-      <fo:region-before region-name="xsl-region-before-even"
-                        extent="{$region.before.extent}"
-                        display-align="before"/>
-      <fo:region-after region-name="xsl-region-after-even"
-                       extent="{$region.after.extent}"
-                        display-align="after"/>
-    </fo:simple-page-master>
-
-    <!-- list-of-title pages -->
-    <fo:simple-page-master master-name="lot-first"
-                           page-width="{$page.width}"
-                           page-height="{$page.height}"
-                           margin-top="{$page.margin.top}"
-                           margin-bottom="{$page.margin.bottom}"
-                           margin-left="{$margin.left.inner}"
-                           margin-right="{$page.margin.outer}">
-      <xsl:if test="$axf.extensions != 0">
-        <xsl:call-template name="axf-page-master-properties">
-          <xsl:with-param name="page.master">lot-first</xsl:with-param>
-        </xsl:call-template>
-      </xsl:if>
-      <fo:region-body margin-bottom="{$body.margin.bottom}"
-                      margin-top="{$body.margin.top}"
-                      column-gap="{$column.gap.lot}"
-                      column-count="{$column.count.lot}">
-      </fo:region-body>
-      <fo:region-before region-name="xsl-region-before-first"
-                        extent="{$region.before.extent}"
-                        display-align="before"/>
-      <fo:region-after region-name="xsl-region-after-first"
-                       extent="{$region.after.extent}"
-                       display-align="after"/>
-    </fo:simple-page-master>
-
-    <fo:simple-page-master master-name="lot-odd"
-                           page-width="{$page.width}"
-                           page-height="{$page.height}"
-                           margin-top="{$page.margin.top}"
-                           margin-bottom="{$page.margin.bottom}"
-                           margin-left="{$margin.left.inner}"
-                           margin-right="{$page.margin.outer}">
-      <xsl:if test="$axf.extensions != 0">
-        <xsl:call-template name="axf-page-master-properties">
-          <xsl:with-param name="page.master">lot-odd</xsl:with-param>
-        </xsl:call-template>
-      </xsl:if>
-      <fo:region-body margin-bottom="{$body.margin.bottom}"
-                      margin-top="{$body.margin.top}"
-                      column-gap="{$column.gap.lot}"
-                      column-count="{$column.count.lot}">
-      </fo:region-body>
-      <fo:region-before region-name="xsl-region-before-odd"
-                        extent="{$region.before.extent}"
-                        display-align="before"/>
-      <fo:region-after region-name="xsl-region-after-odd"
-                       extent="{$region.after.extent}"
-                        display-align="after"/>
-    </fo:simple-page-master>
-
-    <fo:simple-page-master master-name="lot-even"
-                           page-width="{$page.width}"
-                           page-height="{$page.height}"
-                           margin-top="{$page.margin.top}"
-                           margin-bottom="{$page.margin.bottom}"
-                           margin-left="{$margin.left.outer}"
-                           margin-right="{$page.margin.inner}">
-      <xsl:if test="$axf.extensions != 0">
-        <xsl:call-template name="axf-page-master-properties">
-          <xsl:with-param name="page.master">lot-even</xsl:with-param>
-        </xsl:call-template>
-      </xsl:if>
-      <fo:region-body margin-bottom="{$body.margin.bottom}"
-                      margin-top="{$body.margin.top}"
-                      column-gap="{$column.gap.lot}"
-                      column-count="{$column.count.lot}">
-      </fo:region-body>
-      <fo:region-before region-name="xsl-region-before-even"
-                        extent="{$region.before.extent}"
-                        display-align="before"/>
-      <fo:region-after region-name="xsl-region-after-even"
-                       extent="{$region.after.extent}"
-                        display-align="after"/>
-    </fo:simple-page-master>
-
-    <!-- frontmatter pages -->
-    <fo:simple-page-master master-name="front-first"
-                           page-width="{$page.width}"
-                           page-height="{$page.height}"
-                           margin-top="{$page.margin.top}"
-                           margin-bottom="{$page.margin.bottom}"
-                           margin-left="{$margin.left.inner}"
-                           margin-right="{$page.margin.outer}">
-      <xsl:if test="$axf.extensions != 0">
-        <xsl:call-template name="axf-page-master-properties">
-          <xsl:with-param name="page.master">front-first</xsl:with-param>
-        </xsl:call-template>
-      </xsl:if>
-      <fo:region-body margin-bottom="{$body.margin.bottom}"
-                      margin-top="{$body.margin.top}"
-                      column-gap="{$column.gap.front}"
-                      column-count="{$column.count.front}">
-      </fo:region-body>
-      <fo:region-before region-name="xsl-region-before-first"
-                        extent="{$region.before.extent}"
-                        display-align="before"/>
-      <fo:region-after region-name="xsl-region-after-first"
-                       extent="{$region.after.extent}"
-                        display-align="after"/>
-    </fo:simple-page-master>
-
-    <fo:simple-page-master master-name="front-odd"
-                           page-width="{$page.width}"
-                           page-height="{$page.height}"
-                           margin-top="{$page.margin.top}"
-                           margin-bottom="{$page.margin.bottom}"
-                           margin-left="{$margin.left.inner}"
-                           margin-right="{$page.margin.outer}">
-      <xsl:if test="$axf.extensions != 0">
-        <xsl:call-template name="axf-page-master-properties">
-          <xsl:with-param name="page.master">front-odd</xsl:with-param>
-        </xsl:call-template>
-      </xsl:if>
-      <fo:region-body margin-bottom="{$body.margin.bottom}"
-                      margin-top="{$body.margin.top}"
-                      column-gap="{$column.gap.front}"
-                      column-count="{$column.count.front}">
-      </fo:region-body>
-      <fo:region-before region-name="xsl-region-before-odd"
-                        extent="{$region.before.extent}"
-                        display-align="before"/>
-      <fo:region-after region-name="xsl-region-after-odd"
-                       extent="{$region.after.extent}"
-                        display-align="after"/>
-    </fo:simple-page-master>
-
-    <fo:simple-page-master master-name="front-even"
-                           page-width="{$page.width}"
-                           page-height="{$page.height}"
-                           margin-top="{$page.margin.top}"
-                           margin-bottom="{$page.margin.bottom}"
-                           margin-left="{$margin.left.outer}"
-                           margin-right="{$page.margin.inner}">
-      <xsl:if test="$axf.extensions != 0">
-        <xsl:call-template name="axf-page-master-properties">
-          <xsl:with-param name="page.master">front-even</xsl:with-param>
-        </xsl:call-template>
-      </xsl:if>
-      <fo:region-body margin-bottom="{$body.margin.bottom}"
-                      margin-top="{$body.margin.top}"
-                      column-gap="{$column.gap.front}"
-                      column-count="{$column.count.front}">
-      </fo:region-body>
-      <fo:region-before region-name="xsl-region-before-even"
-                        extent="{$region.before.extent}"
-                        display-align="before"/>
-      <fo:region-after region-name="xsl-region-after-even"
-                       extent="{$region.after.extent}"
-                        display-align="after"/>
-    </fo:simple-page-master>
-
-    <!-- body pages -->
-    <fo:simple-page-master master-name="body-first"
-                           page-width="{$page.width}"
-                           page-height="{$page.height}"
-                           margin-top="{$page.margin.top}"
-                           margin-bottom="{$page.margin.bottom}"
-                           margin-left="{$margin.left.inner}"
-                           margin-right="{$page.margin.outer}">
-      <xsl:if test="$axf.extensions != 0">
-        <xsl:call-template name="axf-page-master-properties">
-          <xsl:with-param name="page.master">body-first</xsl:with-param>
-        </xsl:call-template>
-      </xsl:if>
-      <fo:region-body margin-bottom="{$body.margin.bottom}"
-                      margin-top="{$body.margin.top}"
-                      column-gap="{$column.gap.body}"
-                      column-count="{$column.count.body}">
-      </fo:region-body>
-      <fo:region-before region-name="xsl-region-before-first"
-                        extent="{$region.before.extent}"
-                        display-align="before"/>
-      <fo:region-after region-name="xsl-region-after-first"
-                       extent="{$region.after.extent}"
-                       display-align="after"/>
-    </fo:simple-page-master>
-
-    <fo:simple-page-master master-name="body-odd"
-                           page-width="{$page.width}"
-                           page-height="{$page.height}"
-                           margin-top="{$page.margin.top}"
-                           margin-bottom="{$page.margin.bottom}"
-                           margin-left="{$margin.left.inner}"
-                           margin-right="{$page.margin.outer}">
-      <xsl:if test="$axf.extensions != 0">
-        <xsl:call-template name="axf-page-master-properties">
-          <xsl:with-param name="page.master">body-odd</xsl:with-param>
-        </xsl:call-template>
-      </xsl:if>
-      <fo:region-body margin-bottom="{$body.margin.bottom}"
-                      margin-top="{$body.margin.top}"
-                      column-gap="{$column.gap.body}"
-                      column-count="{$column.count.body}">
-      </fo:region-body>
-      <fo:region-before region-name="xsl-region-before-odd"
-                        extent="{$region.before.extent}"
-                        display-align="before"/>
-      <fo:region-after region-name="xsl-region-after-odd"
-                       extent="{$region.after.extent}"
-                       display-align="after"/>
-    </fo:simple-page-master>
-
-    <fo:simple-page-master master-name="body-even"
-                           page-width="{$page.width}"
-                           page-height="{$page.height}"
-                           margin-top="{$page.margin.top}"
-                           margin-bottom="{$page.margin.bottom}"
-                           margin-left="{$margin.left.outer}"
-                           margin-right="{$page.margin.inner}">
-      <xsl:if test="$axf.extensions != 0">
-        <xsl:call-template name="axf-page-master-properties">
-          <xsl:with-param name="page.master">body-even</xsl:with-param>
-        </xsl:call-template>
-      </xsl:if>
-      <fo:region-body margin-bottom="{$body.margin.bottom}"
-                      margin-top="{$body.margin.top}"
-                      column-gap="{$column.gap.body}"
-                      column-count="{$column.count.body}">
-      </fo:region-body>
-      <fo:region-before region-name="xsl-region-before-even"
-                        extent="{$region.before.extent}"
-                        display-align="before"/>
-      <fo:region-after region-name="xsl-region-after-even"
-                       extent="{$region.after.extent}"
-                       display-align="after"/>
-    </fo:simple-page-master>
-
-    <!-- backmatter pages -->
-    <fo:simple-page-master master-name="back-first"
-                           page-width="{$page.width}"
-                           page-height="{$page.height}"
-                           margin-top="{$page.margin.top}"
-                           margin-bottom="{$page.margin.bottom}"
-                           margin-left="{$margin.left.inner}"
-                           margin-right="{$page.margin.outer}">
-      <xsl:if test="$axf.extensions != 0">
-        <xsl:call-template name="axf-page-master-properties">
-          <xsl:with-param name="page.master">back-first</xsl:with-param>
-        </xsl:call-template>
-      </xsl:if>
-      <fo:region-body margin-bottom="{$body.margin.bottom}"
-                      margin-top="{$body.margin.top}"
-                      column-gap="{$column.gap.back}"
-                      column-count="{$column.count.back}">
-      </fo:region-body>
-      <fo:region-before region-name="xsl-region-before-first"
-                        extent="{$region.before.extent}"
-                        display-align="before"/>
-      <fo:region-after region-name="xsl-region-after-first"
-                       extent="{$region.after.extent}"
-                       display-align="after"/>
-    </fo:simple-page-master>
-
-    <fo:simple-page-master master-name="back-odd"
-                           page-width="{$page.width}"
-                           page-height="{$page.height}"
-                           margin-top="{$page.margin.top}"
-                           margin-bottom="{$page.margin.bottom}"
-                           margin-left="{$margin.left.inner}"
-                           margin-right="{$page.margin.outer}">
-      <xsl:if test="$axf.extensions != 0">
-        <xsl:call-template name="axf-page-master-properties">
-          <xsl:with-param name="page.master">back-odd</xsl:with-param>
-        </xsl:call-template>
-      </xsl:if>
-      <fo:region-body margin-bottom="{$body.margin.bottom}"
-                      margin-top="{$body.margin.top}"
-                      column-gap="{$column.gap.back}"
-                      column-count="{$column.count.back}">
-      </fo:region-body>
-      <fo:region-before region-name="xsl-region-before-odd"
-                        extent="{$region.before.extent}"
-                        display-align="before"/>
-      <fo:region-after region-name="xsl-region-after-odd"
-                       extent="{$region.after.extent}"
-                       display-align="after"/>
-    </fo:simple-page-master>
-
-    <fo:simple-page-master master-name="back-even"
-                           page-width="{$page.width}"
-                           page-height="{$page.height}"
-                           margin-top="{$page.margin.top}"
-                           margin-bottom="{$page.margin.bottom}"
-                           margin-left="{$margin.left.outer}"
-                           margin-right="{$page.margin.inner}">
-      <xsl:if test="$axf.extensions != 0">
-        <xsl:call-template name="axf-page-master-properties">
-          <xsl:with-param name="page.master">back-even</xsl:with-param>
-        </xsl:call-template>
-      </xsl:if>
-      <fo:region-body margin-bottom="{$body.margin.bottom}"
-                      margin-top="{$body.margin.top}"
-                      column-gap="{$column.gap.back}"
-                      column-count="{$column.count.back}">
-      </fo:region-body>
-      <fo:region-before region-name="xsl-region-before-even"
-                        extent="{$region.before.extent}"
-                        display-align="before"/>
-      <fo:region-after region-name="xsl-region-after-even"
-                       extent="{$region.after.extent}"
-                       display-align="after"/>
-    </fo:simple-page-master>
-
-    <!-- index pages -->
-    <fo:simple-page-master master-name="index-first"
-                           page-width="{$page.width}"
-                           page-height="{$page.height}"
-                           margin-top="{$page.margin.top}"
-                           margin-bottom="{$page.margin.bottom}"
-                           margin-left="{$page.margin.inner}"
-                           margin-right="{$page.margin.outer}">
-      <xsl:if test="$axf.extensions != 0">
-        <xsl:call-template name="axf-page-master-properties">
-          <xsl:with-param name="page.master">index-first</xsl:with-param>
-        </xsl:call-template>
-      </xsl:if>
-      <fo:region-body margin-bottom="{$body.margin.bottom}"
-                      margin-top="{$body.margin.top}"
-                      column-gap="{$column.gap.index}"
-                      column-count="{$column.count.index}">
-      </fo:region-body>
-      <fo:region-before region-name="xsl-region-before-first"
-                        extent="{$region.before.extent}"
-                        display-align="before"/>
-      <fo:region-after region-name="xsl-region-after-first"
-                       extent="{$region.after.extent}"
-                       display-align="after"/>
-    </fo:simple-page-master>
-
-    <fo:simple-page-master master-name="index-odd"
-                           page-width="{$page.width}"
-                           page-height="{$page.height}"
-                           margin-top="{$page.margin.top}"
-                           margin-bottom="{$page.margin.bottom}"
-                           margin-left="{$page.margin.inner}"
-                           margin-right="{$page.margin.outer}">
-      <xsl:if test="$axf.extensions != 0">
-        <xsl:call-template name="axf-page-master-properties">
-          <xsl:with-param name="page.master">index-odd</xsl:with-param>
-        </xsl:call-template>
-      </xsl:if>
-      <fo:region-body margin-bottom="{$body.margin.bottom}"
-                      margin-top="{$body.margin.top}"
-                      column-gap="{$column.gap.index}"
-                      column-count="{$column.count.index}">
-      </fo:region-body>
-      <fo:region-before region-name="xsl-region-before-odd"
-                        extent="{$region.before.extent}"
-                        display-align="before"/>
-      <fo:region-after region-name="xsl-region-after-odd"
-                       extent="{$region.after.extent}"
-                       display-align="after"/>
-    </fo:simple-page-master>
-
-    <fo:simple-page-master master-name="index-even"
-                           page-width="{$page.width}"
-                           page-height="{$page.height}"
-                           margin-top="{$page.margin.top}"
-                           margin-bottom="{$page.margin.bottom}"
-                           margin-left="{$page.margin.outer}"
-                           margin-right="{$page.margin.inner}">
-      <xsl:if test="$axf.extensions != 0">
-        <xsl:call-template name="axf-page-master-properties">
-          <xsl:with-param name="page.master">index-even</xsl:with-param>
-        </xsl:call-template>
-      </xsl:if>
-      <fo:region-body margin-bottom="{$body.margin.bottom}"
-                      margin-top="{$body.margin.top}"
-                      column-gap="{$column.gap.index}"
-                      column-count="{$column.count.index}">
-      </fo:region-body>
-      <fo:region-before region-name="xsl-region-before-even"
-                        extent="{$region.before.extent}"
-                        display-align="before"/>
-      <fo:region-after region-name="xsl-region-after-even"
-                       extent="{$region.after.extent}"
-                       display-align="after"/>
-    </fo:simple-page-master>
-
-    <xsl:if test="$draft.mode != 'no'">
-      <!-- draft blank pages -->
-      <fo:simple-page-master master-name="blank-draft"
-                             page-width="{$page.width}"
-                             page-height="{$page.height}"
-                             margin-top="{$page.margin.top}"
-                             margin-bottom="{$page.margin.bottom}"
-                             margin-left="{$margin.left.outer}"
-                             margin-right="{$page.margin.inner}">
-        <xsl:if test="$axf.extensions != 0">
-          <xsl:call-template name="axf-page-master-properties">
-            <xsl:with-param name="page.master">blank-draft</xsl:with-param>
-          </xsl:call-template>
-        </xsl:if>
-        <fo:region-body margin-bottom="{$body.margin.bottom}"
-                        margin-top="{$body.margin.top}">
-          <xsl:if test="$draft.watermark.image != ''">
-            <xsl:attribute name="background-image">
-              <xsl:call-template name="fo-external-image">
-                <xsl:with-param name="filename" select="$draft.watermark.image"/>
-              </xsl:call-template>
-            </xsl:attribute>
-            <xsl:attribute name="background-attachment">fixed</xsl:attribute>
-            <xsl:attribute name="background-repeat">no-repeat</xsl:attribute>
-            <xsl:attribute name="background-position-horizontal">center</xsl:attribute>
-            <xsl:attribute name="background-position-vertical">center</xsl:attribute>
-          </xsl:if>
-        </fo:region-body>
-        <fo:region-before region-name="xsl-region-before-blank"
-                          extent="{$region.before.extent}"
-                          display-align="before"/>
-        <fo:region-after region-name="xsl-region-after-blank"
-                         extent="{$region.after.extent}"
-                         display-align="after"/>
-      </fo:simple-page-master>
-
-      <!-- draft title pages -->
-      <fo:simple-page-master master-name="titlepage-first-draft"
-                             page-width="{$page.width}"
-                             page-height="{$page.height}"
-                             margin-top="{$page.margin.top}"
-                             margin-bottom="{$page.margin.bottom}"
-                             margin-left="{$margin.left.inner}"
-                             margin-right="{$page.margin.outer}">
-        <xsl:if test="$axf.extensions != 0">
-          <xsl:call-template name="axf-page-master-properties">
-            <xsl:with-param name="page.master">titlepage-first-draft</xsl:with-param>
-          </xsl:call-template>
-        </xsl:if>
-        <fo:region-body margin-bottom="{$body.margin.bottom}"
-                        margin-top="{$body.margin.top}"
-                        column-gap="{$column.gap.titlepage}"
-                        column-count="{$column.count.titlepage}">
-          <xsl:if test="$draft.watermark.image != ''">
-            <xsl:attribute name="background-image">
-              <xsl:call-template name="fo-external-image">
-                <xsl:with-param name="filename" select="$draft.watermark.image"/>
-              </xsl:call-template>
-            </xsl:attribute>
-            <xsl:attribute name="background-attachment">fixed</xsl:attribute>
-            <xsl:attribute name="background-repeat">no-repeat</xsl:attribute>
-            <xsl:attribute name="background-position-horizontal">center</xsl:attribute>
-            <xsl:attribute name="background-position-vertical">center</xsl:attribute>
-          </xsl:if>
-        </fo:region-body>
-        <fo:region-before region-name="xsl-region-before-first"
-                          extent="{$region.before.extent}"
-                          display-align="before"/>
-        <fo:region-after region-name="xsl-region-after-first"
-                         extent="{$region.after.extent}"
-                         display-align="after"/>
-      </fo:simple-page-master>
-
-      <fo:simple-page-master master-name="titlepage-odd-draft"
-                             page-width="{$page.width}"
-                             page-height="{$page.height}"
-                             margin-top="{$page.margin.top}"
-                             margin-bottom="{$page.margin.bottom}"
-                             margin-left="{$margin.left.inner}"
-                             margin-right="{$page.margin.outer}">
-        <xsl:if test="$axf.extensions != 0">
-          <xsl:call-template name="axf-page-master-properties">
-            <xsl:with-param name="page.master">titlepage-odd-draft</xsl:with-param>
-          </xsl:call-template>
-        </xsl:if>
-        <fo:region-body margin-bottom="{$body.margin.bottom}"
-                        margin-top="{$body.margin.top}"
-                        column-gap="{$column.gap.titlepage}"
-                        column-count="{$column.count.titlepage}">
-          <xsl:if test="$draft.watermark.image != ''">
-            <xsl:attribute name="background-image">
-              <xsl:call-template name="fo-external-image">
-                <xsl:with-param name="filename" select="$draft.watermark.image"/>
-              </xsl:call-template>
-            </xsl:attribute>
-            <xsl:attribute name="background-attachment">fixed</xsl:attribute>
-            <xsl:attribute name="background-repeat">no-repeat</xsl:attribute>
-            <xsl:attribute name="background-position-horizontal">center</xsl:attribute>
-            <xsl:attribute name="background-position-vertical">center</xsl:attribute>
-          </xsl:if>
-        </fo:region-body>
-        <fo:region-before region-name="xsl-region-before-odd"
-                          extent="{$region.before.extent}"
-                          display-align="before"/>
-        <fo:region-after region-name="xsl-region-after-odd"
-                         extent="{$region.after.extent}"
-                         display-align="after"/>
-      </fo:simple-page-master>
-
-      <fo:simple-page-master master-name="titlepage-even-draft"
-                             page-width="{$page.width}"
-                             page-height="{$page.height}"
-                             margin-top="{$page.margin.top}"
-                             margin-bottom="{$page.margin.bottom}"
-                             margin-left="{$margin.left.outer}"
-                             margin-right="{$page.margin.inner}">
-        <xsl:if test="$axf.extensions != 0">
-          <xsl:call-template name="axf-page-master-properties">
-            <xsl:with-param name="page.master">titlepage-even-draft</xsl:with-param>
-          </xsl:call-template>
-        </xsl:if>
-        <fo:region-body margin-bottom="{$body.margin.bottom}"
-                        margin-top="{$body.margin.top}"
-                        column-gap="{$column.gap.titlepage}"
-                        column-count="{$column.count.titlepage}">
-          <xsl:if test="$draft.watermark.image != ''">
-            <xsl:attribute name="background-image">
-              <xsl:call-template name="fo-external-image">
-                <xsl:with-param name="filename" select="$draft.watermark.image"/>
-              </xsl:call-template>
-            </xsl:attribute>
-            <xsl:attribute name="background-attachment">fixed</xsl:attribute>
-            <xsl:attribute name="background-repeat">no-repeat</xsl:attribute>
-            <xsl:attribute name="background-position-horizontal">center</xsl:attribute>
-            <xsl:attribute name="background-position-vertical">center</xsl:attribute>
-          </xsl:if>
-        </fo:region-body>
-        <fo:region-before region-name="xsl-region-before-even"
-                          extent="{$region.before.extent}"
-                          display-align="before"/>
-        <fo:region-after region-name="xsl-region-after-even"
-                         extent="{$region.after.extent}"
-                         display-align="after"/>
-      </fo:simple-page-master>
-
-      <!-- draft list-of-title pages -->
-      <fo:simple-page-master master-name="lot-first-draft"
-                             page-width="{$page.width}"
-                             page-height="{$page.height}"
-                             margin-top="{$page.margin.top}"
-                             margin-bottom="{$page.margin.bottom}"
-                             margin-left="{$margin.left.inner}"
-                             margin-right="{$page.margin.outer}">
-        <xsl:if test="$axf.extensions != 0">
-          <xsl:call-template name="axf-page-master-properties">
-            <xsl:with-param name="page.master">lot-first-draft</xsl:with-param>
-          </xsl:call-template>
-        </xsl:if>
-        <fo:region-body margin-bottom="{$body.margin.bottom}"
-                        margin-top="{$body.margin.top}"
-                        column-gap="{$column.gap.lot}"
-                        column-count="{$column.count.lot}">
-          <xsl:if test="$draft.watermark.image != ''">
-            <xsl:attribute name="background-image">
-              <xsl:call-template name="fo-external-image">
-                <xsl:with-param name="filename" select="$draft.watermark.image"/>
-              </xsl:call-template>
-            </xsl:attribute>
-            <xsl:attribute name="background-attachment">fixed</xsl:attribute>
-            <xsl:attribute name="background-repeat">no-repeat</xsl:attribute>
-            <xsl:attribute name="background-position-horizontal">center</xsl:attribute>
-            <xsl:attribute name="background-position-vertical">center</xsl:attribute>
-          </xsl:if>
-        </fo:region-body>
-        <fo:region-before region-name="xsl-region-before-first"
-                          extent="{$region.before.extent}"
-                          display-align="before"/>
-        <fo:region-after region-name="xsl-region-after-first"
-                         extent="{$region.after.extent}"
-                         display-align="after"/>
-      </fo:simple-page-master>
-
-      <fo:simple-page-master master-name="lot-odd-draft"
-                             page-width="{$page.width}"
-                             page-height="{$page.height}"
-                             margin-top="{$page.margin.top}"
-                             margin-bottom="{$page.margin.bottom}"
-                             margin-left="{$margin.left.inner}"
-                             margin-right="{$page.margin.outer}">
-        <xsl:if test="$axf.extensions != 0">
-          <xsl:call-template name="axf-page-master-properties">
-            <xsl:with-param name="page.master">lot-odd-draft</xsl:with-param>
-          </xsl:call-template>
-        </xsl:if>
-        <fo:region-body margin-bottom="{$body.margin.bottom}"
-                        margin-top="{$body.margin.top}"
-                        column-gap="{$column.gap.lot}"
-                        column-count="{$column.count.lot}">
-          <xsl:if test="$draft.watermark.image != ''">
-            <xsl:attribute name="background-image">
-              <xsl:call-template name="fo-external-image">
-                <xsl:with-param name="filename" select="$draft.watermark.image"/>
-              </xsl:call-template>
-            </xsl:attribute>
-            <xsl:attribute name="background-attachment">fixed</xsl:attribute>
-            <xsl:attribute name="background-repeat">no-repeat</xsl:attribute>
-            <xsl:attribute name="background-position-horizontal">center</xsl:attribute>
-            <xsl:attribute name="background-position-vertical">center</xsl:attribute>
-          </xsl:if>
-        </fo:region-body>
-        <fo:region-before region-name="xsl-region-before-odd"
-                          extent="{$region.before.extent}"
-                          display-align="before"/>
-        <fo:region-after region-name="xsl-region-after-odd"
-                         extent="{$region.after.extent}"
-                         display-align="after"/>
-      </fo:simple-page-master>
-
-      <fo:simple-page-master master-name="lot-even-draft"
-                             page-width="{$page.width}"
-                             page-height="{$page.height}"
-                             margin-top="{$page.margin.top}"
-                             margin-bottom="{$page.margin.bottom}"
-                             margin-left="{$margin.left.outer}"
-                             margin-right="{$page.margin.inner}">
-        <xsl:if test="$axf.extensions != 0">
-          <xsl:call-template name="axf-page-master-properties">
-            <xsl:with-param name="page.master">lot-even-draft</xsl:with-param>
-          </xsl:call-template>
-        </xsl:if>
-        <fo:region-body margin-bottom="{$body.margin.bottom}"
-                        margin-top="{$body.margin.top}"
-                        column-gap="{$column.gap.lot}"
-                        column-count="{$column.count.lot}">
-          <xsl:if test="$draft.watermark.image != ''">
-            <xsl:attribute name="background-image">
-              <xsl:call-template name="fo-external-image">
-                <xsl:with-param name="filename" select="$draft.watermark.image"/>
-              </xsl:call-template>
-            </xsl:attribute>
-            <xsl:attribute name="background-attachment">fixed</xsl:attribute>
-            <xsl:attribute name="background-repeat">no-repeat</xsl:attribute>
-            <xsl:attribute name="background-position-horizontal">center</xsl:attribute>
-            <xsl:attribute name="background-position-vertical">center</xsl:attribute>
-          </xsl:if>
-        </fo:region-body>
-        <fo:region-before region-name="xsl-region-before-even"
-                          extent="{$region.before.extent}"
-                          display-align="before"/>
-        <fo:region-after region-name="xsl-region-after-even"
-                         extent="{$region.after.extent}"
-                         display-align="after"/>
-      </fo:simple-page-master>
-
-      <!-- draft frontmatter pages -->
-      <fo:simple-page-master master-name="front-first-draft"
-                             page-width="{$page.width}"
-                             page-height="{$page.height}"
-                             margin-top="{$page.margin.top}"
-                             margin-bottom="{$page.margin.bottom}"
-                             margin-left="{$margin.left.inner}"
-                             margin-right="{$page.margin.outer}">
-        <xsl:if test="$axf.extensions != 0">
-          <xsl:call-template name="axf-page-master-properties">
-            <xsl:with-param name="page.master">front-first-draft</xsl:with-param>
-          </xsl:call-template>
-        </xsl:if>
-        <fo:region-body margin-bottom="{$body.margin.bottom}"
-                        margin-top="{$body.margin.top}"
-                        column-gap="{$column.gap.front}"
-                        column-count="{$column.count.front}">
-          <xsl:if test="$draft.watermark.image != ''">
-            <xsl:attribute name="background-image">
-              <xsl:call-template name="fo-external-image">
-                <xsl:with-param name="filename" select="$draft.watermark.image"/>
-              </xsl:call-template>
-            </xsl:attribute>
-            <xsl:attribute name="background-attachment">fixed</xsl:attribute>
-            <xsl:attribute name="background-repeat">no-repeat</xsl:attribute>
-            <xsl:attribute name="background-position-horizontal">center</xsl:attribute>
-            <xsl:attribute name="background-position-vertical">center</xsl:attribute>
-          </xsl:if>
-        </fo:region-body>
-        <fo:region-before region-name="xsl-region-before-first"
-                          extent="{$region.before.extent}"
-                          display-align="before"/>
-        <fo:region-after region-name="xsl-region-after-first"
-                         extent="{$region.after.extent}"
-                         display-align="after"/>
-      </fo:simple-page-master>
-
-      <fo:simple-page-master master-name="front-odd-draft"
-                             page-width="{$page.width}"
-                             page-height="{$page.height}"
-                             margin-top="{$page.margin.top}"
-                             margin-bottom="{$page.margin.bottom}"
-                             margin-left="{$margin.left.inner}"
-                             margin-right="{$page.margin.outer}">
-        <xsl:if test="$axf.extensions != 0">
-          <xsl:call-template name="axf-page-master-properties">
-            <xsl:with-param name="page.master">front-odd-draft</xsl:with-param>
-          </xsl:call-template>
-        </xsl:if>
-        <fo:region-body margin-bottom="{$body.margin.bottom}"
-                        margin-top="{$body.margin.top}"
-                        column-gap="{$column.gap.front}"
-                        column-count="{$column.count.front}">
-          <xsl:if test="$draft.watermark.image != ''">
-            <xsl:attribute name="background-image">
-              <xsl:call-template name="fo-external-image">
-                <xsl:with-param name="filename" select="$draft.watermark.image"/>
-              </xsl:call-template>
-            </xsl:attribute>
-            <xsl:attribute name="background-attachment">fixed</xsl:attribute>
-            <xsl:attribute name="background-repeat">no-repeat</xsl:attribute>
-            <xsl:attribute name="background-position-horizontal">center</xsl:attribute>
-            <xsl:attribute name="background-position-vertical">center</xsl:attribute>
-          </xsl:if>
-        </fo:region-body>
-        <fo:region-before region-name="xsl-region-before-odd"
-                          extent="{$region.before.extent}"
-                          display-align="before"/>
-        <fo:region-after region-name="xsl-region-after-odd"
-                         extent="{$region.after.extent}"
-                         display-align="after"/>
-      </fo:simple-page-master>
-
-      <fo:simple-page-master master-name="front-even-draft"
-                             page-width="{$page.width}"
-                             page-height="{$page.height}"
-                             margin-top="{$page.margin.top}"
-                             margin-bottom="{$page.margin.bottom}"
-                             margin-left="{$margin.left.outer}"
-                             margin-right="{$page.margin.inner}">
-        <xsl:if test="$axf.extensions != 0">
-          <xsl:call-template name="axf-page-master-properties">
-            <xsl:with-param name="page.master">front-even-draft</xsl:with-param>
-          </xsl:call-template>
-        </xsl:if>
-        <fo:region-body margin-bottom="{$body.margin.bottom}"
-                        margin-top="{$body.margin.top}"
-                        column-gap="{$column.gap.front}"
-                        column-count="{$column.count.front}">
-          <xsl:if test="$draft.watermark.image != ''">
-            <xsl:attribute name="background-image">
-              <xsl:call-template name="fo-external-image">
-                <xsl:with-param name="filename" select="$draft.watermark.image"/>
-              </xsl:call-template>
-            </xsl:attribute>
-            <xsl:attribute name="background-attachment">fixed</xsl:attribute>
-            <xsl:attribute name="background-repeat">no-repeat</xsl:attribute>
-            <xsl:attribute name="background-position-horizontal">center</xsl:attribute>
-            <xsl:attribute name="background-position-vertical">center</xsl:attribute>
-          </xsl:if>
-        </fo:region-body>
-        <fo:region-before region-name="xsl-region-before-even"
-                          extent="{$region.before.extent}"
-                          display-align="before"/>
-        <fo:region-after region-name="xsl-region-after-even"
-                         extent="{$region.after.extent}"
-                         display-align="after"/>
-      </fo:simple-page-master>
-
-      <!-- draft body pages -->
-      <fo:simple-page-master master-name="body-first-draft"
-                             page-width="{$page.width}"
-                             page-height="{$page.height}"
-                             margin-top="{$page.margin.top}"
-                             margin-bottom="{$page.margin.bottom}"
-                             margin-left="{$margin.left.inner}"
-                             margin-right="{$page.margin.outer}">
-        <xsl:if test="$axf.extensions != 0">
-          <xsl:call-template name="axf-page-master-properties">
-            <xsl:with-param name="page.master">body-first-draft</xsl:with-param>
-          </xsl:call-template>
-        </xsl:if>
-        <fo:region-body margin-bottom="{$body.margin.bottom}"
-                        margin-top="{$body.margin.top}"
-                        column-gap="{$column.gap.body}"
-                        column-count="{$column.count.body}">
-          <xsl:if test="$draft.watermark.image != ''">
-            <xsl:attribute name="background-image">
-              <xsl:call-template name="fo-external-image">
-                <xsl:with-param name="filename" select="$draft.watermark.image"/>
-              </xsl:call-template>
-            </xsl:attribute>
-            <xsl:attribute name="background-attachment">fixed</xsl:attribute>
-            <xsl:attribute name="background-repeat">no-repeat</xsl:attribute>
-            <xsl:attribute name="background-position-horizontal">center</xsl:attribute>
-            <xsl:attribute name="background-position-vertical">center</xsl:attribute>
-          </xsl:if>
-        </fo:region-body>
-        <fo:region-before region-name="xsl-region-before-first"
-                          extent="{$region.before.extent}"
-                          display-align="before"/>
-        <fo:region-after region-name="xsl-region-after-first"
-                         extent="{$region.after.extent}"
-                         display-align="after"/>
-      </fo:simple-page-master>
-
-      <fo:simple-page-master master-name="body-odd-draft"
-                             page-width="{$page.width}"
-                             page-height="{$page.height}"
-                             margin-top="{$page.margin.top}"
-                             margin-bottom="{$page.margin.bottom}"
-                             margin-left="{$margin.left.inner}"
-                             margin-right="{$page.margin.outer}">
-        <xsl:if test="$axf.extensions != 0">
-          <xsl:call-template name="axf-page-master-properties">
-            <xsl:with-param name="page.master">body-odd-draft</xsl:with-param>
-          </xsl:call-template>
-        </xsl:if>
-        <fo:region-body margin-bottom="{$body.margin.bottom}"
-                        margin-top="{$body.margin.top}"
-                        column-gap="{$column.gap.body}"
-                        column-count="{$column.count.body}">
-          <xsl:if test="$draft.watermark.image != ''">
-            <xsl:attribute name="background-image">
-              <xsl:call-template name="fo-external-image">
-                <xsl:with-param name="filename" select="$draft.watermark.image"/>
-              </xsl:call-template>
-            </xsl:attribute>
-            <xsl:attribute name="background-attachment">fixed</xsl:attribute>
-            <xsl:attribute name="background-repeat">no-repeat</xsl:attribute>
-            <xsl:attribute name="background-position-horizontal">center</xsl:attribute>
-            <xsl:attribute name="background-position-vertical">center</xsl:attribute>
-          </xsl:if>
-        </fo:region-body>
-        <fo:region-before region-name="xsl-region-before-odd"
-                          extent="{$region.before.extent}"
-                          display-align="before"/>
-        <fo:region-after region-name="xsl-region-after-odd"
-                         extent="{$region.after.extent}"
-                         display-align="after"/>
-      </fo:simple-page-master>
-
-      <fo:simple-page-master master-name="body-even-draft"
-                             page-width="{$page.width}"
-                             page-height="{$page.height}"
-                             margin-top="{$page.margin.top}"
-                             margin-bottom="{$page.margin.bottom}"
-                             margin-left="{$margin.left.outer}"
-                             margin-right="{$page.margin.inner}">
-        <xsl:if test="$axf.extensions != 0">
-          <xsl:call-template name="axf-page-master-properties">
-            <xsl:with-param name="page.master">body-even-draft</xsl:with-param>
-          </xsl:call-template>
-        </xsl:if>
-        <fo:region-body margin-bottom="{$body.margin.bottom}"
-                        margin-top="{$body.margin.top}"
-                        column-gap="{$column.gap.body}"
-                        column-count="{$column.count.body}">
-          <xsl:if test="$draft.watermark.image != ''">
-            <xsl:attribute name="background-image">
-              <xsl:call-template name="fo-external-image">
-                <xsl:with-param name="filename" select="$draft.watermark.image"/>
-              </xsl:call-template>
-            </xsl:attribute>
-            <xsl:attribute name="background-attachment">fixed</xsl:attribute>
-            <xsl:attribute name="background-repeat">no-repeat</xsl:attribute>
-            <xsl:attribute name="background-position-horizontal">center</xsl:attribute>
-            <xsl:attribute name="background-position-vertical">center</xsl:attribute>
-          </xsl:if>
-        </fo:region-body>
-        <fo:region-before region-name="xsl-region-before-even"
-                          extent="{$region.before.extent}"
-                          display-align="before"/>
-        <fo:region-after region-name="xsl-region-after-even"
-                         extent="{$region.after.extent}"
-                         display-align="after"/>
-      </fo:simple-page-master>
-
-      <!-- draft backmatter pages -->
-      <fo:simple-page-master master-name="back-first-draft"
-                             page-width="{$page.width}"
-                             page-height="{$page.height}"
-                             margin-top="{$page.margin.top}"
-                             margin-bottom="{$page.margin.bottom}"
-                             margin-left="{$margin.left.inner}"
-                             margin-right="{$page.margin.outer}">
-        <xsl:if test="$axf.extensions != 0">
-          <xsl:call-template name="axf-page-master-properties">
-            <xsl:with-param name="page.master">back-first-draft</xsl:with-param>
-          </xsl:call-template>
-        </xsl:if>
-        <fo:region-body margin-bottom="{$body.margin.bottom}"
-                        margin-top="{$body.margin.top}"
-                        column-gap="{$column.gap.back}"
-                        column-count="{$column.count.back}">
-          <xsl:if test="$draft.watermark.image != ''">
-            <xsl:attribute name="background-image">
-              <xsl:call-template name="fo-external-image">
-                <xsl:with-param name="filename" select="$draft.watermark.image"/>
-              </xsl:call-template>
-            </xsl:attribute>
-            <xsl:attribute name="background-attachment">fixed</xsl:attribute>
-            <xsl:attribute name="background-repeat">no-repeat</xsl:attribute>
-            <xsl:attribute name="background-position-horizontal">center</xsl:attribute>
-            <xsl:attribute name="background-position-vertical">center</xsl:attribute>
-          </xsl:if>
-        </fo:region-body>
-        <fo:region-before region-name="xsl-region-before-first"
-                          extent="{$region.before.extent}"
-                          display-align="before"/>
-        <fo:region-after region-name="xsl-region-after-first"
-                         extent="{$region.after.extent}"
-                         display-align="after"/>
-      </fo:simple-page-master>
-
-      <fo:simple-page-master master-name="back-odd-draft"
-                             page-width="{$page.width}"
-                             page-height="{$page.height}"
-                             margin-top="{$page.margin.top}"
-                             margin-bottom="{$page.margin.bottom}"
-                             margin-left="{$margin.left.inner}"
-                             margin-right="{$page.margin.outer}">
-        <xsl:if test="$axf.extensions != 0">
-          <xsl:call-template name="axf-page-master-properties">
-            <xsl:with-param name="page.master">back-odd-draft</xsl:with-param>
-          </xsl:call-template>
-        </xsl:if>
-        <fo:region-body margin-bottom="{$body.margin.bottom}"
-                        margin-top="{$body.margin.top}"
-                        column-gap="{$column.gap.back}"
-                        column-count="{$column.count.back}">
-          <xsl:if test="$draft.watermark.image != ''">
-            <xsl:attribute name="background-image">
-              <xsl:call-template name="fo-external-image">
-                <xsl:with-param name="filename" select="$draft.watermark.image"/>
-              </xsl:call-template>
-            </xsl:attribute>
-            <xsl:attribute name="background-attachment">fixed</xsl:attribute>
-            <xsl:attribute name="background-repeat">no-repeat</xsl:attribute>
-            <xsl:attribute name="background-position-horizontal">center</xsl:attribute>
-            <xsl:attribute name="background-position-vertical">center</xsl:attribute>
-          </xsl:if>
-        </fo:region-body>
-        <fo:region-before region-name="xsl-region-before-odd"
-                          extent="{$region.before.extent}"
-                          display-align="before"/>
-        <fo:region-after region-name="xsl-region-after-odd"
-                         extent="{$region.after.extent}"
-                         display-align="after"/>
-      </fo:simple-page-master>
-
-      <fo:simple-page-master master-name="back-even-draft"
-                             page-width="{$page.width}"
-                             page-height="{$page.height}"
-                             margin-top="{$page.margin.top}"
-                             margin-bottom="{$page.margin.bottom}"
-                             margin-left="{$margin.left.outer}"
-                             margin-right="{$page.margin.inner}">
-        <xsl:if test="$axf.extensions != 0">
-          <xsl:call-template name="axf-page-master-properties">
-            <xsl:with-param name="page.master">back-even-draft</xsl:with-param>
-          </xsl:call-template>
-        </xsl:if>
-        <fo:region-body margin-bottom="{$body.margin.bottom}"
-                        margin-top="{$body.margin.top}"
-                        column-gap="{$column.gap.back}"
-                        column-count="{$column.count.back}">
-          <xsl:if test="$draft.watermark.image != ''">
-            <xsl:attribute name="background-image">
-              <xsl:call-template name="fo-external-image">
-                <xsl:with-param name="filename" select="$draft.watermark.image"/>
-              </xsl:call-template>
-            </xsl:attribute>
-            <xsl:attribute name="background-attachment">fixed</xsl:attribute>
-            <xsl:attribute name="background-repeat">no-repeat</xsl:attribute>
-            <xsl:attribute name="background-position-horizontal">center</xsl:attribute>
-            <xsl:attribute name="background-position-vertical">center</xsl:attribute>
-          </xsl:if>
-        </fo:region-body>
-        <fo:region-before region-name="xsl-region-before-even"
-                          extent="{$region.before.extent}"
-                          display-align="before"/>
-        <fo:region-after region-name="xsl-region-after-even"
-                         extent="{$region.after.extent}"
-                         display-align="after"/>
-      </fo:simple-page-master>
-
-      <!-- draft index pages -->
-      <fo:simple-page-master master-name="index-first-draft"
-                             page-width="{$page.width}"
-                             page-height="{$page.height}"
-                             margin-top="{$page.margin.top}"
-                             margin-bottom="{$page.margin.bottom}"
-                             margin-left="{$page.margin.inner}"
-                             margin-right="{$page.margin.outer}">
-        <xsl:if test="$axf.extensions != 0">
-          <xsl:call-template name="axf-page-master-properties">
-            <xsl:with-param name="page.master">index-first-draft</xsl:with-param>
-          </xsl:call-template>
-        </xsl:if>
-        <fo:region-body margin-bottom="{$body.margin.bottom}"
-                        margin-top="{$body.margin.top}"
-                        column-gap="{$column.gap.index}"
-                        column-count="{$column.count.index}">
-          <xsl:if test="$draft.watermark.image != ''">
-            <xsl:attribute name="background-image">
-              <xsl:call-template name="fo-external-image">
-                <xsl:with-param name="filename" select="$draft.watermark.image"/>
-              </xsl:call-template>
-            </xsl:attribute>
-            <xsl:attribute name="background-attachment">fixed</xsl:attribute>
-            <xsl:attribute name="background-repeat">no-repeat</xsl:attribute>
-            <xsl:attribute name="background-position-horizontal">center</xsl:attribute>
-            <xsl:attribute name="background-position-vertical">center</xsl:attribute>
-          </xsl:if>
-        </fo:region-body>
-        <fo:region-before region-name="xsl-region-before-first"
-                          extent="{$region.before.extent}"
-                          display-align="before"/>
-        <fo:region-after region-name="xsl-region-after-first"
-                         extent="{$region.after.extent}"
-                         display-align="after"/>
-      </fo:simple-page-master>
-
-      <fo:simple-page-master master-name="index-odd-draft"
-                             page-width="{$page.width}"
-                             page-height="{$page.height}"
-                             margin-top="{$page.margin.top}"
-                             margin-bottom="{$page.margin.bottom}"
-                             margin-left="{$page.margin.inner}"
-                             margin-right="{$page.margin.outer}">
-        <xsl:if test="$axf.extensions != 0">
-          <xsl:call-template name="axf-page-master-properties">
-            <xsl:with-param name="page.master">index-odd-draft</xsl:with-param>
-          </xsl:call-template>
-        </xsl:if>
-        <fo:region-body margin-bottom="{$body.margin.bottom}"
-                        margin-top="{$body.margin.top}"
-                        column-gap="{$column.gap.index}"
-                        column-count="{$column.count.index}">
-          <xsl:if test="$draft.watermark.image != ''">
-            <xsl:attribute name="background-image">
-              <xsl:call-template name="fo-external-image">
-                <xsl:with-param name="filename" select="$draft.watermark.image"/>
-              </xsl:call-template>
-            </xsl:attribute>
-            <xsl:attribute name="background-attachment">fixed</xsl:attribute>
-            <xsl:attribute name="background-repeat">no-repeat</xsl:attribute>
-            <xsl:attribute name="background-position-horizontal">center</xsl:attribute>
-            <xsl:attribute name="background-position-vertical">center</xsl:attribute>
-          </xsl:if>
-        </fo:region-body>
-        <fo:region-before region-name="xsl-region-before-odd"
-                          extent="{$region.before.extent}"
-                          display-align="before"/>
-        <fo:region-after region-name="xsl-region-after-odd"
-                         extent="{$region.after.extent}"
-                         display-align="after"/>
-      </fo:simple-page-master>
-
-      <fo:simple-page-master master-name="index-even-draft"
-                             page-width="{$page.width}"
-                             page-height="{$page.height}"
-                             margin-top="{$page.margin.top}"
-                             margin-bottom="{$page.margin.bottom}"
-                             margin-right="{$page.margin.inner}"
-                             margin-left="{$page.margin.outer}">
-        <xsl:if test="$axf.extensions != 0">
-          <xsl:call-template name="axf-page-master-properties">
-            <xsl:with-param name="page.master">index-even-draft</xsl:with-param>
-          </xsl:call-template>
-        </xsl:if>
-        <fo:region-body margin-bottom="{$body.margin.bottom}"
-                        margin-top="{$body.margin.top}"
-                        column-gap="{$column.gap.index}"
-                        column-count="{$column.count.index}">
-          <xsl:if test="$draft.watermark.image != ''">
-            <xsl:attribute name="background-image">
-              <xsl:call-template name="fo-external-image">
-                <xsl:with-param name="filename" select="$draft.watermark.image"/>
-              </xsl:call-template>
-            </xsl:attribute>
-            <xsl:attribute name="background-attachment">fixed</xsl:attribute>
-            <xsl:attribute name="background-repeat">no-repeat</xsl:attribute>
-            <xsl:attribute name="background-position-horizontal">center</xsl:attribute>
-            <xsl:attribute name="background-position-vertical">center</xsl:attribute>
-          </xsl:if>
-        </fo:region-body>
-        <fo:region-before region-name="xsl-region-before-even"
-                          extent="{$region.before.extent}"
-                          display-align="before"/>
-        <fo:region-after region-name="xsl-region-after-even"
-                         extent="{$region.after.extent}"
-                         display-align="after"/>
-      </fo:simple-page-master>
-    </xsl:if>
-
-    <!-- setup for title page(s) -->
-    <fo:page-sequence-master master-name="titlepage">
-      <fo:repeatable-page-master-alternatives>
-        <fo:conditional-page-master-reference master-reference="blank"
-                                              blank-or-not-blank="blank"/>
-        <fo:conditional-page-master-reference master-reference="titlepage-first"
-                                              page-position="first"/>
-        <fo:conditional-page-master-reference master-reference="titlepage-odd"
-                                              odd-or-even="odd"/>
-        <fo:conditional-page-master-reference 
-                                              odd-or-even="even">
-          <xsl:attribute name="master-reference">
-            <xsl:choose>
-              <xsl:when test="$double.sided != 0">titlepage-even</xsl:when>
-              <xsl:otherwise>titlepage-odd</xsl:otherwise>
-            </xsl:choose>
-          </xsl:attribute>
-        </fo:conditional-page-master-reference>
-      </fo:repeatable-page-master-alternatives>
-    </fo:page-sequence-master>
-
-    <!-- setup for lots -->
-    <fo:page-sequence-master master-name="lot">
-      <fo:repeatable-page-master-alternatives>
-        <fo:conditional-page-master-reference master-reference="blank"
-                                              blank-or-not-blank="blank"/>
-        <fo:conditional-page-master-reference master-reference="lot-first"
-                                              page-position="first"/>
-        <fo:conditional-page-master-reference master-reference="lot-odd"
-                                              odd-or-even="odd"/>
-        <fo:conditional-page-master-reference 
-                                              odd-or-even="even">
-          <xsl:attribute name="master-reference">
-            <xsl:choose>
-              <xsl:when test="$double.sided != 0">lot-even</xsl:when>
-              <xsl:otherwise>lot-odd</xsl:otherwise>
-            </xsl:choose>
-          </xsl:attribute>
-        </fo:conditional-page-master-reference>
-      </fo:repeatable-page-master-alternatives>
-    </fo:page-sequence-master>
-
-    <!-- setup front matter -->
-    <fo:page-sequence-master master-name="front">
-      <fo:repeatable-page-master-alternatives>
-        <fo:conditional-page-master-reference master-reference="blank"
-                                              blank-or-not-blank="blank"/>
-        <fo:conditional-page-master-reference master-reference="front-first"
-                                              page-position="first"/>
-        <fo:conditional-page-master-reference master-reference="front-odd"
-                                              odd-or-even="odd"/>
-        <fo:conditional-page-master-reference 
-                                              odd-or-even="even">
-          <xsl:attribute name="master-reference">
-            <xsl:choose>
-              <xsl:when test="$double.sided != 0">front-even</xsl:when>
-              <xsl:otherwise>front-odd</xsl:otherwise>
-            </xsl:choose>
-          </xsl:attribute>
-        </fo:conditional-page-master-reference>
-      </fo:repeatable-page-master-alternatives>
-    </fo:page-sequence-master>
-
-    <!-- setup for body pages -->
-    <fo:page-sequence-master master-name="body">
-      <fo:repeatable-page-master-alternatives>
-        <fo:conditional-page-master-reference master-reference="blank"
-                                              blank-or-not-blank="blank"/>
-        <fo:conditional-page-master-reference master-reference="body-first"
-                                              page-position="first"/>
-        <fo:conditional-page-master-reference master-reference="body-odd"
-                                              odd-or-even="odd"/>
-        <fo:conditional-page-master-reference 
-                                              odd-or-even="even">
-          <xsl:attribute name="master-reference">
-            <xsl:choose>
-              <xsl:when test="$double.sided != 0">body-even</xsl:when>
-              <xsl:otherwise>body-odd</xsl:otherwise>
-            </xsl:choose>
-          </xsl:attribute>
-        </fo:conditional-page-master-reference>
-      </fo:repeatable-page-master-alternatives>
-    </fo:page-sequence-master>
-
-    <!-- setup back matter -->
-    <fo:page-sequence-master master-name="back">
-      <fo:repeatable-page-master-alternatives>
-        <fo:conditional-page-master-reference master-reference="blank"
-                                              blank-or-not-blank="blank"/>
-        <fo:conditional-page-master-reference master-reference="back-first"
-                                              page-position="first"/>
-        <fo:conditional-page-master-reference master-reference="back-odd"
-                                              odd-or-even="odd"/>
-        <fo:conditional-page-master-reference 
-                                              odd-or-even="even">
-          <xsl:attribute name="master-reference">
-            <xsl:choose>
-              <xsl:when test="$double.sided != 0">back-even</xsl:when>
-              <xsl:otherwise>back-odd</xsl:otherwise>
-            </xsl:choose>
-          </xsl:attribute>
-        </fo:conditional-page-master-reference>
-      </fo:repeatable-page-master-alternatives>
-    </fo:page-sequence-master>
-
-    <!-- setup back matter -->
-    <fo:page-sequence-master master-name="index">
-      <fo:repeatable-page-master-alternatives>
-        <fo:conditional-page-master-reference master-reference="blank"
-                                              blank-or-not-blank="blank"/>
-        <fo:conditional-page-master-reference master-reference="index-first"
-                                              page-position="first"/>
-        <fo:conditional-page-master-reference master-reference="index-odd"
-                                              odd-or-even="odd"/>
-        <fo:conditional-page-master-reference 
-                                              odd-or-even="even">
-          <xsl:attribute name="master-reference">
-            <xsl:choose>
-              <xsl:when test="$double.sided != 0">index-even</xsl:when>
-              <xsl:otherwise>index-odd</xsl:otherwise>
-            </xsl:choose>
-          </xsl:attribute>
-        </fo:conditional-page-master-reference>
-      </fo:repeatable-page-master-alternatives>
-    </fo:page-sequence-master>
-
-    <xsl:if test="$draft.mode != 'no'">
-      <!-- setup for draft title page(s) -->
-      <fo:page-sequence-master master-name="titlepage-draft">
-        <fo:repeatable-page-master-alternatives>
-          <fo:conditional-page-master-reference master-reference="blank-draft"
-                                                blank-or-not-blank="blank"/>
-          <fo:conditional-page-master-reference master-reference="titlepage-first-draft"
-                                                page-position="first"/>
-          <fo:conditional-page-master-reference master-reference="titlepage-odd-draft"
-                                                odd-or-even="odd"/>
-          <fo:conditional-page-master-reference 
-                                                odd-or-even="even">
-            <xsl:attribute name="master-reference">
-              <xsl:choose>
-                <xsl:when test="$double.sided != 0">titlepage-even-draft</xsl:when>
-                <xsl:otherwise>titlepage-odd-draft</xsl:otherwise>
-              </xsl:choose>
-            </xsl:attribute>
-          </fo:conditional-page-master-reference>
-        </fo:repeatable-page-master-alternatives>
-      </fo:page-sequence-master>
-
-      <!-- setup for draft lots -->
-      <fo:page-sequence-master master-name="lot-draft">
-        <fo:repeatable-page-master-alternatives>
-          <fo:conditional-page-master-reference master-reference="blank-draft"
-                                                blank-or-not-blank="blank"/>
-          <fo:conditional-page-master-reference master-reference="lot-first-draft"
-                                                page-position="first"/>
-          <fo:conditional-page-master-reference master-reference="lot-odd-draft"
-                                                odd-or-even="odd"/>
-          <fo:conditional-page-master-reference 
-                                                odd-or-even="even">
-            <xsl:attribute name="master-reference">
-              <xsl:choose>
-                <xsl:when test="$double.sided != 0">lot-even-draft</xsl:when>
-                <xsl:otherwise>lot-odd-draft</xsl:otherwise>
-              </xsl:choose>
-            </xsl:attribute>
-          </fo:conditional-page-master-reference>
-        </fo:repeatable-page-master-alternatives>
-      </fo:page-sequence-master>
-
-      <!-- setup draft front matter -->
-      <fo:page-sequence-master master-name="front-draft">
-        <fo:repeatable-page-master-alternatives>
-          <fo:conditional-page-master-reference master-reference="blank-draft"
-                                                blank-or-not-blank="blank"/>
-          <fo:conditional-page-master-reference master-reference="front-first-draft"
-                                                page-position="first"/>
-          <fo:conditional-page-master-reference master-reference="front-odd-draft"
-                                                odd-or-even="odd"/>
-          <fo:conditional-page-master-reference 
-                                                odd-or-even="even">
-            <xsl:attribute name="master-reference">
-              <xsl:choose>
-                <xsl:when test="$double.sided != 0">front-even-draft</xsl:when>
-                <xsl:otherwise>front-odd-draft</xsl:otherwise>
-              </xsl:choose>
-            </xsl:attribute>
-          </fo:conditional-page-master-reference>
-        </fo:repeatable-page-master-alternatives>
-      </fo:page-sequence-master>
-
-      <!-- setup for draft body pages -->
-      <fo:page-sequence-master master-name="body-draft">
-        <fo:repeatable-page-master-alternatives>
-          <fo:conditional-page-master-reference master-reference="blank-draft"
-                                                blank-or-not-blank="blank"/>
-          <fo:conditional-page-master-reference master-reference="body-first-draft"
-                                                page-position="first"/>
-          <fo:conditional-page-master-reference master-reference="body-odd-draft"
-                                                odd-or-even="odd"/>
-          <fo:conditional-page-master-reference 
-                                                odd-or-even="even">
-            <xsl:attribute name="master-reference">
-              <xsl:choose>
-                <xsl:when test="$double.sided != 0">body-even-draft</xsl:when>
-                <xsl:otherwise>body-odd-draft</xsl:otherwise>
-              </xsl:choose>
-            </xsl:attribute>
-          </fo:conditional-page-master-reference>
-        </fo:repeatable-page-master-alternatives>
-      </fo:page-sequence-master>
-
-      <!-- setup draft back matter -->
-      <fo:page-sequence-master master-name="back-draft">
-        <fo:repeatable-page-master-alternatives>
-          <fo:conditional-page-master-reference master-reference="blank-draft"
-                                                blank-or-not-blank="blank"/>
-          <fo:conditional-page-master-reference master-reference="back-first-draft"
-                                                page-position="first"/>
-          <fo:conditional-page-master-reference master-reference="back-odd-draft"
-                                                odd-or-even="odd"/>
-          <fo:conditional-page-master-reference 
-                                                odd-or-even="even">
-            <xsl:attribute name="master-reference">
-              <xsl:choose>
-                <xsl:when test="$double.sided != 0">back-even-draft</xsl:when>
-                <xsl:otherwise>back-odd-draft</xsl:otherwise>
-              </xsl:choose>
-            </xsl:attribute>
-          </fo:conditional-page-master-reference>
-        </fo:repeatable-page-master-alternatives>
-      </fo:page-sequence-master>
-
-      <!-- setup draft index pages -->
-      <fo:page-sequence-master master-name="index-draft">
-        <fo:repeatable-page-master-alternatives>
-          <fo:conditional-page-master-reference master-reference="blank-draft"
-                                                blank-or-not-blank="blank"/>
-          <fo:conditional-page-master-reference master-reference="index-first-draft"
-                                                page-position="first"/>
-          <fo:conditional-page-master-reference master-reference="index-odd-draft"
-                                                odd-or-even="odd"/>
-          <fo:conditional-page-master-reference 
-                                                odd-or-even="even">
-            <xsl:attribute name="master-reference">
-              <xsl:choose>
-                <xsl:when test="$double.sided != 0">index-even-draft</xsl:when>
-                <xsl:otherwise>index-odd-draft</xsl:otherwise>
-              </xsl:choose>
-            </xsl:attribute>
-          </fo:conditional-page-master-reference>
-        </fo:repeatable-page-master-alternatives>
-      </fo:page-sequence-master>
-    </xsl:if>
-
-    <xsl:call-template name="user.pagemasters"/>
-
-    </fo:layout-master-set>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="user.pagemasters"/> <!-- intentionally empty -->
-
-<!-- ==================================================================== -->
-
-<xsl:template name="select.pagemaster">
-  <xsl:param name="element" select="local-name(.)"/>
-  <xsl:param name="pageclass" select="''"/>
-
-  <xsl:variable name="pagemaster">
-    <xsl:choose>
-      <xsl:when test="$pageclass != ''">
-        <xsl:value-of select="$pageclass"/>
-      </xsl:when>
-      <xsl:when test="$pageclass = 'lot'">lot</xsl:when>
-      <xsl:when test="$element = 'dedication'">front</xsl:when>
-      <xsl:when test="$element = 'preface'">front</xsl:when>
-      <xsl:when test="$element = 'appendix'">back</xsl:when>
-      <xsl:when test="$element = 'glossary'">back</xsl:when>
-      <xsl:when test="$element = 'bibliography'">back</xsl:when>
-      <xsl:when test="$element = 'index'">index</xsl:when>
-      <xsl:when test="$element = 'colophon'">back</xsl:when>
-      <xsl:otherwise>body</xsl:otherwise>
-    </xsl:choose>
-
-    <xsl:choose>
-      <xsl:when test="$draft.mode = 'yes'">
-        <xsl:text>-draft</xsl:text>
-      </xsl:when>
-      <xsl:when test="$draft.mode = 'no'">
-        <!-- nop -->
-      </xsl:when>
-      <xsl:when test="ancestor-or-self::*[@status][1]/@status = 'draft'">
-        <xsl:text>-draft</xsl:text>
-      </xsl:when>
-      <xsl:otherwise>
-        <!-- nop -->
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:call-template name="select.user.pagemaster">
-    <xsl:with-param name="element" select="$element"/>
-    <xsl:with-param name="pageclass" select="$pageclass"/>
-    <xsl:with-param name="default-pagemaster" select="$pagemaster"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="select.user.pagemaster">
-  <xsl:param name="element"/>
-  <xsl:param name="pageclass"/>
-  <xsl:param name="default-pagemaster"/>
-
-  <!-- by default, return the default. But if you've created your own
-       pagemasters in user.pagemasters, you might want to select one here. -->
-  <xsl:value-of select="$default-pagemaster"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="head.sep.rule">
-  <xsl:param name="pageclass"/>
-  <xsl:param name="sequence"/>
-  <xsl:param name="gentext-key"/>
-
-  <xsl:if test="$header.rule != 0">
-    <xsl:attribute name="border-bottom-width">0.5pt</xsl:attribute>
-    <xsl:attribute name="border-bottom-style">solid</xsl:attribute>
-    <xsl:attribute name="border-bottom-color">black</xsl:attribute>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="foot.sep.rule">
-  <xsl:param name="pageclass"/>
-  <xsl:param name="sequence"/>
-  <xsl:param name="gentext-key"/>
-
-  <xsl:if test="$footer.rule != 0">
-    <xsl:attribute name="border-top-width">0.5pt</xsl:attribute>
-    <xsl:attribute name="border-top-style">solid</xsl:attribute>
-    <xsl:attribute name="border-top-color">black</xsl:attribute>
-  </xsl:if>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="*" mode="running.head.mode">
-  <xsl:param name="master-reference" select="'unknown'"/>
-  <xsl:param name="gentext-key" select="local-name(.)"/>
-
-  <!-- remove -draft from reference -->
-  <xsl:variable name="pageclass">
-    <xsl:choose>
-      <xsl:when test="contains($master-reference, '-draft')">
-        <xsl:value-of select="substring-before($master-reference, '-draft')"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$master-reference"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <fo:static-content flow-name="xsl-region-before-first">
-    <fo:block xsl:use-attribute-sets="header.content.properties">
-      <xsl:call-template name="header.table">
-        <xsl:with-param name="pageclass" select="$pageclass"/>
-        <xsl:with-param name="sequence" select="'first'"/>
-        <xsl:with-param name="gentext-key" select="$gentext-key"/>
-      </xsl:call-template>
-    </fo:block>
-  </fo:static-content>
-
-  <fo:static-content flow-name="xsl-region-before-odd">
-    <fo:block xsl:use-attribute-sets="header.content.properties">
-      <xsl:call-template name="header.table">
-        <xsl:with-param name="pageclass" select="$pageclass"/>
-        <xsl:with-param name="sequence" select="'odd'"/>
-        <xsl:with-param name="gentext-key" select="$gentext-key"/>
-      </xsl:call-template>
-    </fo:block>
-  </fo:static-content>
-
-  <fo:static-content flow-name="xsl-region-before-even">
-    <fo:block xsl:use-attribute-sets="header.content.properties">
-      <xsl:call-template name="header.table">
-        <xsl:with-param name="pageclass" select="$pageclass"/>
-        <xsl:with-param name="sequence" select="'even'"/>
-        <xsl:with-param name="gentext-key" select="$gentext-key"/>
-      </xsl:call-template>
-    </fo:block>
-  </fo:static-content>
-
-  <fo:static-content flow-name="xsl-region-before-blank">
-    <fo:block xsl:use-attribute-sets="header.content.properties">
-      <xsl:call-template name="header.table">
-        <xsl:with-param name="pageclass" select="$pageclass"/>
-        <xsl:with-param name="sequence" select="'blank'"/>
-        <xsl:with-param name="gentext-key" select="$gentext-key"/>
-      </xsl:call-template>
-    </fo:block>
-  </fo:static-content>
-
-  <xsl:call-template name="footnote-separator"/>
-
-  <xsl:if test="$fop.extensions = 0 and $fop1.extensions = 0">
-    <xsl:call-template name="blank.page.content"/>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="footnote-separator">
-  <fo:static-content flow-name="xsl-footnote-separator">
-    <fo:block>
-      <fo:leader xsl:use-attribute-sets="footnote.sep.leader.properties"/>
-    </fo:block>
-  </fo:static-content>
-</xsl:template>
-
-<xsl:template name="blank.page.content">
-  <fo:static-content flow-name="blank-body">
-    <fo:block text-align="center"/>
-  </fo:static-content>
-</xsl:template>
-
-<xsl:template name="header.table">
-  <xsl:param name="pageclass" select="''"/>
-  <xsl:param name="sequence" select="''"/>
-  <xsl:param name="gentext-key" select="''"/>
-
-  <!-- default is a single table style for all headers -->
-  <!-- Customize it for different page classes or sequence location -->
-
-  <xsl:choose>
-      <xsl:when test="$pageclass = 'index'">
-          <xsl:attribute name="margin-left">0pt</xsl:attribute>
-      </xsl:when>
-  </xsl:choose>
-
-  <xsl:variable name="column1">
-    <xsl:choose>
-      <xsl:when test="$double.sided = 0">1</xsl:when>
-      <xsl:when test="$sequence = 'first' or $sequence = 'odd'">1</xsl:when>
-      <xsl:otherwise>3</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="column3">
-    <xsl:choose>
-      <xsl:when test="$double.sided = 0">3</xsl:when>
-      <xsl:when test="$sequence = 'first' or $sequence = 'odd'">3</xsl:when>
-      <xsl:otherwise>1</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="candidate">
-    <fo:table xsl:use-attribute-sets="header.table.properties">
-      <xsl:call-template name="head.sep.rule">
-        <xsl:with-param name="pageclass" select="$pageclass"/>
-        <xsl:with-param name="sequence" select="$sequence"/>
-        <xsl:with-param name="gentext-key" select="$gentext-key"/>
-      </xsl:call-template>
-
-      <fo:table-column column-number="1">
-        <xsl:attribute name="column-width">
-          <xsl:text>proportional-column-width(</xsl:text>
-          <xsl:call-template name="header.footer.width">
-            <xsl:with-param name="location">header</xsl:with-param>
-            <xsl:with-param name="position" select="$column1"/>
-          </xsl:call-template>
-          <xsl:text>)</xsl:text>
-        </xsl:attribute>
-      </fo:table-column>
-      <fo:table-column column-number="2">
-        <xsl:attribute name="column-width">
-          <xsl:text>proportional-column-width(</xsl:text>
-          <xsl:call-template name="header.footer.width">
-            <xsl:with-param name="location">header</xsl:with-param>
-            <xsl:with-param name="position" select="2"/>
-          </xsl:call-template>
-          <xsl:text>)</xsl:text>
-        </xsl:attribute>
-      </fo:table-column>
-      <fo:table-column column-number="3">
-        <xsl:attribute name="column-width">
-          <xsl:text>proportional-column-width(</xsl:text>
-          <xsl:call-template name="header.footer.width">
-            <xsl:with-param name="location">header</xsl:with-param>
-            <xsl:with-param name="position" select="$column3"/>
-          </xsl:call-template>
-          <xsl:text>)</xsl:text>
-        </xsl:attribute>
-      </fo:table-column>
-
-      <fo:table-body>
-        <fo:table-row>
-          <xsl:attribute name="block-progression-dimension.minimum">
-            <xsl:value-of select="$header.table.height"/>
-          </xsl:attribute>
-          <fo:table-cell text-align="left"
-                         display-align="before">
-            <xsl:if test="$fop.extensions = 0">
-              <xsl:attribute name="relative-align">baseline</xsl:attribute>
-            </xsl:if>
-            <fo:block>
-              <xsl:call-template name="header.content">
-                <xsl:with-param name="pageclass" select="$pageclass"/>
-                <xsl:with-param name="sequence" select="$sequence"/>
-                <xsl:with-param name="position" select="'left'"/>
-                <xsl:with-param name="gentext-key" select="$gentext-key"/>
-              </xsl:call-template>
-            </fo:block>
-          </fo:table-cell>
-          <fo:table-cell text-align="center"
-                         display-align="before">
-            <xsl:if test="$fop.extensions = 0">
-              <xsl:attribute name="relative-align">baseline</xsl:attribute>
-            </xsl:if>
-            <fo:block>
-              <xsl:call-template name="header.content">
-                <xsl:with-param name="pageclass" select="$pageclass"/>
-                <xsl:with-param name="sequence" select="$sequence"/>
-                <xsl:with-param name="position" select="'center'"/>
-                <xsl:with-param name="gentext-key" select="$gentext-key"/>
-              </xsl:call-template>
-            </fo:block>
-          </fo:table-cell>
-          <fo:table-cell text-align="right"
-                         display-align="before">
-            <xsl:if test="$fop.extensions = 0">
-              <xsl:attribute name="relative-align">baseline</xsl:attribute>
-            </xsl:if>
-            <fo:block>
-              <xsl:call-template name="header.content">
-                <xsl:with-param name="pageclass" select="$pageclass"/>
-                <xsl:with-param name="sequence" select="$sequence"/>
-                <xsl:with-param name="position" select="'right'"/>
-                <xsl:with-param name="gentext-key" select="$gentext-key"/>
-              </xsl:call-template>
-            </fo:block>
-          </fo:table-cell>
-        </fo:table-row>
-      </fo:table-body>
-    </fo:table>
-  </xsl:variable>
-
-  <!-- Really output a header? -->
-  <xsl:choose>
-    <xsl:when test="$pageclass = 'titlepage' and $gentext-key = 'book'
-                    and $sequence='first'">
-      <!-- no, book titlepages have no headers at all -->
-    </xsl:when>
-    <xsl:when test="$sequence = 'blank' and $headers.on.blank.pages = 0">
-      <!-- no output -->
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:copy-of select="$candidate"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="header.content">
-  <xsl:param name="pageclass" select="''"/>
-  <xsl:param name="sequence" select="''"/>
-  <xsl:param name="position" select="''"/>
-  <xsl:param name="gentext-key" select="''"/>
-
-<!--
-  <fo:block>
-    <xsl:value-of select="$pageclass"/>
-    <xsl:text>, </xsl:text>
-    <xsl:value-of select="$sequence"/>
-    <xsl:text>, </xsl:text>
-    <xsl:value-of select="$position"/>
-    <xsl:text>, </xsl:text>
-    <xsl:value-of select="$gentext-key"/>
-  </fo:block>
--->
-
-  <fo:block>
-
-    <!-- sequence can be odd, even, first, blank -->
-    <!-- position can be left, center, right -->
-    <xsl:choose>
-      <xsl:when test="$sequence = 'blank'">
-        <!-- nothing -->
-      </xsl:when>
-
-      <xsl:when test="$position='left'">
-        <!-- Same for odd, even, empty, and blank sequences -->
-        <xsl:call-template name="draft.text"/>
-      </xsl:when>
-
-      <xsl:when test="($sequence='odd' or $sequence='even') and $position='center'">
-        <xsl:if test="$pageclass != 'titlepage'">
-          <xsl:choose>
-            <xsl:when test="ancestor::book and ($double.sided != 0)">
-              <fo:retrieve-marker retrieve-class-name="section.head.marker"
-                                  retrieve-position="first-including-carryover"
-                                  retrieve-boundary="page-sequence"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:apply-templates select="." mode="titleabbrev.markup"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:if>
-      </xsl:when>
-
-      <xsl:when test="$position='center'">
-        <!-- nothing for empty and blank sequences -->
-      </xsl:when>
-
-      <xsl:when test="$position='right'">
-        <!-- Same for odd, even, empty, and blank sequences -->
-        <xsl:call-template name="draft.text"/>
-      </xsl:when>
-
-      <xsl:when test="$sequence = 'first'">
-        <!-- nothing for first pages -->
-      </xsl:when>
-
-      <xsl:when test="$sequence = 'blank'">
-        <!-- nothing for blank pages -->
-      </xsl:when>
-    </xsl:choose>
-  </fo:block>
-</xsl:template>
-
-<xsl:template name="header.footer.width">
-  <xsl:param name="location" select="'header'"/>
-  <xsl:param name="position" select="1"/>
-
-  <xsl:variable name="width.set">
-    <xsl:choose>
-      <xsl:when test="$location = 'header'">
-        <xsl:value-of select="normalize-space($header.column.widths)"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="normalize-space($footer.column.widths)"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-
-  <xsl:variable name="width">
-    <xsl:choose>
-      <xsl:when test="$position = 1">
-        <xsl:value-of select="substring-before($width.set, ' ')"/>
-      </xsl:when>
-      <xsl:when test="$position = 2">
-        <xsl:value-of select="substring-before(substring-after($width.set, ' '), ' ')"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="substring-after(substring-after($width.set, ' '), ' ')"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <!-- Make sure it is a number -->
-  <xsl:choose>
-    <xsl:when test = "$width = number($width)">
-      <xsl:value-of select="$width"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:message>Error: value in <xsl:value-of select="$location"/>.column.widths at position <xsl:value-of select="$position"/> is not a number.</xsl:message>
-      <xsl:text>1</xsl:text>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="draft.text">
-  <xsl:choose>
-    <xsl:when test="$draft.mode = 'yes'">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'Draft'"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="$draft.mode = 'no'">
-      <!-- nop -->
-    </xsl:when>
-    <xsl:when test="ancestor-or-self::*[@status][1]/@status = 'draft'">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'Draft'"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <!-- nop -->
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="*" mode="running.foot.mode">
-  <xsl:param name="master-reference" select="'unknown'"/>
-  <xsl:param name="gentext-key" select="local-name(.)"/>
-
-  <!-- remove -draft from reference -->
-  <xsl:variable name="pageclass">
-    <xsl:choose>
-      <xsl:when test="contains($master-reference, '-draft')">
-        <xsl:value-of select="substring-before($master-reference, '-draft')"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$master-reference"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <fo:static-content flow-name="xsl-region-after-first">
-    <fo:block xsl:use-attribute-sets="footer.content.properties">
-      <xsl:call-template name="footer.table">
-        <xsl:with-param name="pageclass" select="$pageclass"/>
-        <xsl:with-param name="sequence" select="'first'"/>
-        <xsl:with-param name="gentext-key" select="$gentext-key"/>
-      </xsl:call-template>
-    </fo:block>
-  </fo:static-content>
-
-  <fo:static-content flow-name="xsl-region-after-odd">
-    <fo:block xsl:use-attribute-sets="footer.content.properties">
-      <xsl:call-template name="footer.table">
-        <xsl:with-param name="pageclass" select="$pageclass"/>
-        <xsl:with-param name="sequence" select="'odd'"/>
-        <xsl:with-param name="gentext-key" select="$gentext-key"/>
-      </xsl:call-template>
-    </fo:block>
-  </fo:static-content>
-
-  <fo:static-content flow-name="xsl-region-after-even">
-    <fo:block xsl:use-attribute-sets="footer.content.properties">
-      <xsl:call-template name="footer.table">
-        <xsl:with-param name="pageclass" select="$pageclass"/>
-        <xsl:with-param name="sequence" select="'even'"/>
-        <xsl:with-param name="gentext-key" select="$gentext-key"/>
-      </xsl:call-template>
-    </fo:block>
-  </fo:static-content>
-
-  <fo:static-content flow-name="xsl-region-after-blank">
-    <fo:block xsl:use-attribute-sets="footer.content.properties">
-      <xsl:call-template name="footer.table">
-        <xsl:with-param name="pageclass" select="$pageclass"/>
-        <xsl:with-param name="sequence" select="'blank'"/>
-        <xsl:with-param name="gentext-key" select="$gentext-key"/>
-      </xsl:call-template>
-    </fo:block>
-  </fo:static-content>
-</xsl:template>
-
-<xsl:template name="footer.table">
-  <xsl:param name="pageclass" select="''"/>
-  <xsl:param name="sequence" select="''"/>
-  <xsl:param name="gentext-key" select="''"/>
-
-  <!-- default is a single table style for all footers -->
-  <!-- Customize it for different page classes or sequence location -->
-
-  <xsl:choose>
-      <xsl:when test="$pageclass = 'index'">
-          <xsl:attribute name="margin-left">0pt</xsl:attribute>
-      </xsl:when>
-  </xsl:choose>
-
-  <xsl:variable name="column1">
-    <xsl:choose>
-      <xsl:when test="$double.sided = 0">1</xsl:when>
-      <xsl:when test="$sequence = 'first' or $sequence = 'odd'">1</xsl:when>
-      <xsl:otherwise>3</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="column3">
-    <xsl:choose>
-      <xsl:when test="$double.sided = 0">3</xsl:when>
-      <xsl:when test="$sequence = 'first' or $sequence = 'odd'">3</xsl:when>
-      <xsl:otherwise>1</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="candidate">
-    <fo:table xsl:use-attribute-sets="footer.table.properties">
-      <xsl:call-template name="foot.sep.rule">
-        <xsl:with-param name="pageclass" select="$pageclass"/>
-        <xsl:with-param name="sequence" select="$sequence"/>
-        <xsl:with-param name="gentext-key" select="$gentext-key"/>
-      </xsl:call-template>
-      <fo:table-column column-number="1">
-        <xsl:attribute name="column-width">
-          <xsl:text>proportional-column-width(</xsl:text>
-          <xsl:call-template name="header.footer.width">
-            <xsl:with-param name="location">footer</xsl:with-param>
-            <xsl:with-param name="position" select="$column1"/>
-          </xsl:call-template>
-          <xsl:text>)</xsl:text>
-        </xsl:attribute>
-      </fo:table-column>
-      <fo:table-column column-number="2">
-        <xsl:attribute name="column-width">
-          <xsl:text>proportional-column-width(</xsl:text>
-          <xsl:call-template name="header.footer.width">
-            <xsl:with-param name="location">footer</xsl:with-param>
-            <xsl:with-param name="position" select="2"/>
-          </xsl:call-template>
-          <xsl:text>)</xsl:text>
-        </xsl:attribute>
-      </fo:table-column>
-      <fo:table-column column-number="3">
-        <xsl:attribute name="column-width">
-          <xsl:text>proportional-column-width(</xsl:text>
-          <xsl:call-template name="header.footer.width">
-            <xsl:with-param name="location">footer</xsl:with-param>
-            <xsl:with-param name="position" select="$column3"/>
-          </xsl:call-template>
-          <xsl:text>)</xsl:text>
-        </xsl:attribute>
-      </fo:table-column>
-
-      <fo:table-body>
-        <fo:table-row>
-          <xsl:attribute name="block-progression-dimension.minimum">
-            <xsl:value-of select="$footer.table.height"/>
-          </xsl:attribute>
-          <fo:table-cell text-align="left"
-                         display-align="after">
-            <xsl:if test="$fop.extensions = 0">
-              <xsl:attribute name="relative-align">baseline</xsl:attribute>
-            </xsl:if>
-            <fo:block>
-              <xsl:call-template name="footer.content">
-                <xsl:with-param name="pageclass" select="$pageclass"/>
-                <xsl:with-param name="sequence" select="$sequence"/>
-                <xsl:with-param name="position" select="'left'"/>
-                <xsl:with-param name="gentext-key" select="$gentext-key"/>
-              </xsl:call-template>
-            </fo:block>
-          </fo:table-cell>
-          <fo:table-cell text-align="center"
-                         display-align="after">
-            <xsl:if test="$fop.extensions = 0">
-              <xsl:attribute name="relative-align">baseline</xsl:attribute>
-            </xsl:if>
-            <fo:block>
-              <xsl:call-template name="footer.content">
-                <xsl:with-param name="pageclass" select="$pageclass"/>
-                <xsl:with-param name="sequence" select="$sequence"/>
-                <xsl:with-param name="position" select="'center'"/>
-                <xsl:with-param name="gentext-key" select="$gentext-key"/>
-              </xsl:call-template>
-            </fo:block>
-          </fo:table-cell>
-          <fo:table-cell text-align="right"
-                         display-align="after">
-            <xsl:if test="$fop.extensions = 0">
-              <xsl:attribute name="relative-align">baseline</xsl:attribute>
-            </xsl:if>
-            <fo:block>
-              <xsl:call-template name="footer.content">
-                <xsl:with-param name="pageclass" select="$pageclass"/>
-                <xsl:with-param name="sequence" select="$sequence"/>
-                <xsl:with-param name="position" select="'right'"/>
-                <xsl:with-param name="gentext-key" select="$gentext-key"/>
-              </xsl:call-template>
-            </fo:block>
-          </fo:table-cell>
-        </fo:table-row>
-      </fo:table-body>
-    </fo:table>
-  </xsl:variable>
-
-  <!-- Really output a footer? -->
-  <xsl:choose>
-    <xsl:when test="$pageclass='titlepage' and $gentext-key='book'
-                    and $sequence='first'">
-      <!-- no, book titlepages have no footers at all -->
-    </xsl:when>
-    <xsl:when test="$sequence = 'blank' and $footers.on.blank.pages = 0">
-      <!-- no output -->
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:copy-of select="$candidate"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="footer.content">
-  <xsl:param name="pageclass" select="''"/>
-  <xsl:param name="sequence" select="''"/>
-  <xsl:param name="position" select="''"/>
-  <xsl:param name="gentext-key" select="''"/>
-
-<!--
-  <fo:block>
-    <xsl:value-of select="$pageclass"/>
-    <xsl:text>, </xsl:text>
-    <xsl:value-of select="$sequence"/>
-    <xsl:text>, </xsl:text>
-    <xsl:value-of select="$position"/>
-    <xsl:text>, </xsl:text>
-    <xsl:value-of select="$gentext-key"/>
-  </fo:block>
--->
-
-  <fo:block>
-    <!-- pageclass can be front, body, back -->
-    <!-- sequence can be odd, even, first, blank -->
-    <!-- position can be left, center, right -->
-    <xsl:choose>
-      <xsl:when test="$pageclass = 'titlepage'">
-        <!-- nop; no footer on title pages -->
-      </xsl:when>
-
-      <xsl:when test="$double.sided != 0 and $sequence = 'even'
-                      and $position='left'">
-        <fo:page-number/>
-      </xsl:when>
-
-      <xsl:when test="$double.sided != 0 and ($sequence = 'odd' or $sequence = 'first')
-                      and $position='right'">
-        <fo:page-number/>
-      </xsl:when>
-
-      <xsl:when test="$double.sided = 0 and $position='center'">
-        <fo:page-number/>
-      </xsl:when>
-
-      <xsl:when test="$sequence='blank'">
-        <xsl:choose>
-          <xsl:when test="$double.sided != 0 and $position = 'left'">
-            <fo:page-number/>
-          </xsl:when>
-          <xsl:when test="$double.sided = 0 and $position = 'center'">
-            <fo:page-number/>
-          </xsl:when>
-          <xsl:otherwise>
-            <!-- nop -->
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-
-
-      <xsl:otherwise>
-        <!-- nop -->
-      </xsl:otherwise>
-    </xsl:choose>
-  </fo:block>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="page.number.format">
-  <xsl:param name="element" select="local-name(.)"/>
-  <xsl:param name="master-reference" select="''"/>
-
-  <xsl:choose>
-    <xsl:when test="$element = 'toc' and self::book">i</xsl:when>
-    <xsl:when test="$element = 'preface'">i</xsl:when>
-    <xsl:when test="$element = 'dedication'">i</xsl:when>
-    <xsl:otherwise>1</xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="initial.page.number">
-  <xsl:param name="element" select="local-name(.)"/>
-  <xsl:param name="master-reference" select="''"/>
-
-  <!-- Select the first content that the stylesheet places
-       after the TOC -->
-  <xsl:variable name="first.book.content" 
-                select="ancestor::book/*[
-                          not(self::title or
-                              self::subtitle or
-                              self::titleabbrev or
-                              self::bookinfo or
-                              self::info or
-                              self::dedication or
-                              self::preface or
-                              self::toc or
-                              self::lot)][1]"/>
-  <xsl:choose>
-    <!-- double-sided output -->
-    <xsl:when test="$double.sided != 0">
-      <xsl:choose>
-        <xsl:when test="$element = 'toc'">auto-odd</xsl:when>
-        <xsl:when test="$element = 'book'">1</xsl:when>
-        <!-- preface typically continues TOC roman numerals -->
-        <!-- Change page.number.format if not -->
-        <xsl:when test="$element = 'preface'">auto-odd</xsl:when>
-        <xsl:when test="($element = 'dedication' or $element = 'article') 
-                    and not(preceding::chapter
-                            or preceding::preface
-                            or preceding::appendix
-                            or preceding::article
-                            or preceding::dedication
-                            or parent::part
-                            or parent::reference)">1</xsl:when>
-        <xsl:when test="generate-id($first.book.content) =
-                        generate-id(.)">1</xsl:when>
-        <xsl:otherwise>auto-odd</xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-
-    <!-- single-sided output -->
-    <xsl:otherwise>
-      <xsl:choose>
-        <xsl:when test="$element = 'toc'">auto</xsl:when>
-        <xsl:when test="$element = 'book'">1</xsl:when>
-        <xsl:when test="$element = 'preface'">auto</xsl:when>
-       <xsl:when test="($element = 'dedication' or $element = 'article') and
-                        not(preceding::chapter
-                            or preceding::preface
-                            or preceding::appendix
-                            or preceding::article
-                            or preceding::dedication
-                            or parent::part
-                            or parent::reference)">1</xsl:when>
-        <xsl:when test="generate-id($first.book.content) =
-                        generate-id(.)">1</xsl:when>
-        <xsl:otherwise>auto</xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="force.page.count">
-  <xsl:param name="element" select="local-name(.)"/>
-  <xsl:param name="master-reference" select="''"/>
-
-  <xsl:choose>
-    <!-- double-sided output -->
-    <xsl:when test="$double.sided != 0">end-on-even</xsl:when>
-    <!-- single-sided output -->
-    <xsl:otherwise>no-force</xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="set.flow.properties">
-  <xsl:param name="element" select="local-name(.)"/>
-  <xsl:param name="master-reference" select="''"/>
-
-  <!-- This template is called after each <fo:flow> starts. -->
-  <!-- Customize this template to set attributes on fo:flow -->
-
-  <!-- remove -draft from reference -->
-  <xsl:variable name="pageclass">
-    <xsl:choose>
-      <xsl:when test="contains($master-reference, '-draft')">
-        <xsl:value-of select="substring-before($master-reference, '-draft')"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$master-reference"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$fop.extensions != 0 or $passivetex.extensions != 0">
-      <!-- body.start.indent does not work well with these processors -->
-    </xsl:when>
-    <xsl:when test="starts-with($pageclass, 'body') or
-                    starts-with($pageclass, 'lot') or
-                    starts-with($pageclass, 'front') or
-                    $element = 'preface' or
-                    (starts-with($pageclass, 'back') and
-                    $element = 'appendix')">
-      <xsl:attribute name="start-indent">
-        <xsl:value-of select="$body.start.indent"/>
-      </xsl:attribute>
-      <xsl:attribute name="end-indent">
-        <xsl:value-of select="$body.end.indent"/>
-      </xsl:attribute>
-    </xsl:when>
-  </xsl:choose>
-
-</xsl:template>
-<!-- ==================================================================== -->
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/param.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/param.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,891 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
-<!-- This file is generated from param.xweb -->
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<xsl:attribute-set name="abstract.properties">
-  <xsl:attribute name="start-indent">0.0in</xsl:attribute>
-  <xsl:attribute name="end-indent">0.0in</xsl:attribute>
-</xsl:attribute-set>
-<xsl:attribute-set name="abstract.title.properties">
-  <xsl:attribute name="font-family"><xsl:value-of select="$title.fontset"/></xsl:attribute>
-  <xsl:attribute name="font-weight">bold</xsl:attribute>
-  <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
-  <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
-  <xsl:attribute name="space-before.optimum"><xsl:value-of select="concat($body.font.master, 'pt')"/></xsl:attribute>
-  <xsl:attribute name="space-before.minimum"><xsl:value-of select="concat($body.font.master, 'pt * 0.8')"/></xsl:attribute>
-  <xsl:attribute name="space-before.maximum"><xsl:value-of select="concat($body.font.master, 'pt * 1.2')"/></xsl:attribute>
-  <xsl:attribute name="hyphenate">false</xsl:attribute>
-  <xsl:attribute name="text-align">center</xsl:attribute>
-</xsl:attribute-set>
-<xsl:param name="admon.graphics.extension">.png</xsl:param>
-<xsl:param name="admon.graphics" select="0"/>
-<xsl:param name="admon.graphics.path">images/</xsl:param>
-<xsl:param name="admon.textlabel" select="1"/>
-<xsl:attribute-set name="admonition.properties"/>
-<xsl:attribute-set name="admonition.title.properties">
-  <xsl:attribute name="font-size">14pt</xsl:attribute>
-  <xsl:attribute name="font-weight">bold</xsl:attribute>
-  <xsl:attribute name="hyphenate">false</xsl:attribute>
-  <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
-</xsl:attribute-set>
-<xsl:attribute-set name="graphical.admonition.properties">
-  <xsl:attribute name="space-before.optimum">1em</xsl:attribute>
-  <xsl:attribute name="space-before.minimum">0.8em</xsl:attribute>
-  <xsl:attribute name="space-before.maximum">1.2em</xsl:attribute>
-  <xsl:attribute name="space-after.optimum">1em</xsl:attribute>
-  <xsl:attribute name="space-after.minimum">0.8em</xsl:attribute>
-  <xsl:attribute name="space-after.maximum">1.2em</xsl:attribute>
-</xsl:attribute-set>
-<xsl:attribute-set name="nongraphical.admonition.properties">
-  <xsl:attribute name="space-before.minimum">0.8em</xsl:attribute>
-  <xsl:attribute name="space-before.optimum">1em</xsl:attribute>
-  <xsl:attribute name="space-before.maximum">1.2em</xsl:attribute>
-  <xsl:attribute name="margin-left">0.25in</xsl:attribute>
-  <xsl:attribute name="margin-right">0.25in</xsl:attribute>
-</xsl:attribute-set>
-<xsl:param name="alignment">justify</xsl:param>
-<xsl:param name="appendix.autolabel">A</xsl:param>
-<xsl:param name="arbortext.extensions" select="0"/>
-<xsl:attribute-set name="article.appendix.title.properties" use-attribute-sets="section.title.properties                          section.title.level1.properties">
-  <xsl:attribute name="margin-left">
-    <xsl:value-of select="$title.margin.left"/>
-  </xsl:attribute>
-</xsl:attribute-set>
-<xsl:param name="author.othername.in.middle" select="1"/>
-<xsl:param name="autotoc.label.separator">. </xsl:param>
-<xsl:param name="axf.extensions" select="0"/>
-<xsl:param name="biblioentry.item.separator">. </xsl:param>
-<xsl:attribute-set name="biblioentry.properties" use-attribute-sets="normal.para.spacing">
-  <xsl:attribute name="start-indent">0.5in</xsl:attribute>
-  <xsl:attribute name="text-indent">-0.5in</xsl:attribute>
-</xsl:attribute-set>
-<xsl:param name="bibliography.collection">http://docbook.sourceforge.net/release/bibliography/bibliography.xml</xsl:param>
-
-<xsl:param name="bibliography.numbered" select="0"/>
-<xsl:param name="bibliography.style">normal</xsl:param>
-<xsl:attribute-set name="blockquote.properties">
-<xsl:attribute name="margin-left">0.5in</xsl:attribute>
-<xsl:attribute name="margin-right">0.5in</xsl:attribute>
-<xsl:attribute name="space-after.minimum">0.5em</xsl:attribute>
-<xsl:attribute name="space-after.optimum">1em</xsl:attribute>
-<xsl:attribute name="space-after.maximum">2em</xsl:attribute>
-</xsl:attribute-set>
-<xsl:param name="body.font.family">serif</xsl:param>
-<xsl:param name="body.font.master">10</xsl:param>
-<xsl:param name="body.font.size">
- <xsl:value-of select="$body.font.master"/><xsl:text>pt</xsl:text>
-</xsl:param>
-<xsl:param name="body.margin.bottom">0.5in</xsl:param>
-<xsl:param name="body.margin.top">0.5in</xsl:param>
-<xsl:param name="body.start.indent">
-  <xsl:choose>
-    <xsl:when test="$fop.extensions != 0">0pt</xsl:when>
-    <xsl:when test="$passivetex.extensions != 0">0pt</xsl:when>
-    <xsl:otherwise>4pc</xsl:otherwise>
-  </xsl:choose>
-</xsl:param>
-<xsl:param name="body.end.indent">0pt</xsl:param>
-<xsl:param name="bridgehead.in.toc" select="0"/>
-<xsl:param name="callout.defaultcolumn">60</xsl:param>
-
-<xsl:param name="callout.graphics.extension">.svg</xsl:param>
-<xsl:param name="callout.graphics" select="1"/>
-<xsl:param name="callout.icon.size">7pt</xsl:param>
-
-<xsl:param name="callout.graphics.number.limit">30</xsl:param>
-<xsl:param name="callout.graphics.path">images/callouts/</xsl:param>
-<xsl:param name="callout.unicode.font">ZapfDingbats</xsl:param>
-<xsl:param name="callout.unicode" select="0"/>
-<xsl:param name="callout.unicode.number.limit">10</xsl:param>
-<xsl:param name="callout.unicode.start.character">10102</xsl:param>
-<xsl:param name="callouts.extension" select="1"/>
-<xsl:param name="chapter.autolabel" select="1"/>
-<xsl:param name="collect.xref.targets">no</xsl:param>
-<xsl:param name="column.count.back" select="1"/>
-<xsl:param name="column.count.body" select="1"/>
-<xsl:param name="column.count.front" select="1"/>
-<xsl:param name="column.count.index">2</xsl:param>
-<xsl:param name="column.count.lot" select="1"/>
-<xsl:param name="column.count.titlepage" select="1"/>
-<xsl:param name="column.gap.back">12pt</xsl:param>
-<xsl:param name="column.gap.body">12pt</xsl:param>
-<xsl:param name="column.gap.front">12pt</xsl:param>
-<xsl:param name="column.gap.index">12pt</xsl:param>
-<xsl:param name="column.gap.lot">12pt</xsl:param>
-<xsl:param name="column.gap.titlepage">12pt</xsl:param>
-<xsl:attribute-set name="compact.list.item.spacing">
-  <xsl:attribute name="space-before.optimum">0em</xsl:attribute>
-  <xsl:attribute name="space-before.minimum">0em</xsl:attribute>
-  <xsl:attribute name="space-before.maximum">0.2em</xsl:attribute>
-</xsl:attribute-set>
-<xsl:param name="component.label.includes.part.label" select="0"/>
-<xsl:attribute-set name="component.title.properties">
-  <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
-  <xsl:attribute name="space-before.optimum"><xsl:value-of select="concat($body.font.master, 'pt')"/></xsl:attribute>
-  <xsl:attribute name="space-before.minimum"><xsl:value-of select="concat($body.font.master, 'pt * 0.8')"/></xsl:attribute>
-  <xsl:attribute name="space-before.maximum"><xsl:value-of select="concat($body.font.master, 'pt * 1.2')"/></xsl:attribute>
-  <xsl:attribute name="hyphenate">false</xsl:attribute>
-  <xsl:attribute name="text-align">
-    <xsl:choose>
-      <xsl:when test="((parent::article | parent::articleinfo | parent::info/parent::article) and not(ancestor::book) and not(self::bibliography))         or (parent::slides | parent::slidesinfo)">center</xsl:when>
-      <xsl:otherwise>left</xsl:otherwise>
-    </xsl:choose>
-  </xsl:attribute>
-  <xsl:attribute name="start-indent"><xsl:value-of select="$title.margin.left"/></xsl:attribute>
-</xsl:attribute-set>
-<xsl:attribute-set name="component.titlepage.properties">
-</xsl:attribute-set>
-<xsl:param name="crop.marks" select="0"/>
-<xsl:param name="crop.mark.width">0.5pt</xsl:param>
-<xsl:param name="crop.mark.offset">24pt</xsl:param>
-<xsl:param name="crop.mark.bleed">6pt</xsl:param>
-<xsl:param name="current.docid"/>
-<xsl:param name="default.float.class">
-  <xsl:choose>
-    <xsl:when test="contains($stylesheet.result.type,'html')">left</xsl:when>
-    <xsl:otherwise>before</xsl:otherwise>
-  </xsl:choose>
-</xsl:param>
-<xsl:param name="default.image.width"/>
-<xsl:param name="default.table.width"/>
-<xsl:param name="default.table.frame">all</xsl:param>
-<xsl:param name="default.units">pt</xsl:param>
-<xsl:param name="dingbat.font.family">serif</xsl:param>
-<xsl:param name="double.sided" select="0"/>
-<xsl:param name="draft.mode">maybe</xsl:param>
-<xsl:param name="draft.watermark.image">http://docbook.sourceforge.net/release/images/draft.png</xsl:param>
-
-<xsl:param name="ebnf.assignment">
-  <fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="{$monospace.font.family}">
-    <xsl:text>::=</xsl:text>
-  </fo:inline>
-</xsl:param>
-
-<xsl:param name="ebnf.statement.terminator"/>
-<xsl:param name="email.delimiters.enabled" select="1"/>
-<xsl:attribute-set name="equation.properties" use-attribute-sets="formal.object.properties"/>
-<xsl:attribute-set name="example.properties" use-attribute-sets="formal.object.properties"/>
-<xsl:attribute-set name="figure.properties" use-attribute-sets="formal.object.properties"/>
-<xsl:param name="firstterm.only.link" select="0"/>
-<xsl:attribute-set name="footer.content.properties">
-  <xsl:attribute name="font-family">
-    <xsl:value-of select="$body.fontset"/>
-  </xsl:attribute>
-  <xsl:attribute name="margin-left">
-    <xsl:value-of select="$title.margin.left"/>
-  </xsl:attribute>
-</xsl:attribute-set>
-<xsl:param name="footer.rule" select="1"/>
-<xsl:param name="footer.column.widths">1 1 1</xsl:param>
-<xsl:param name="footer.table.height">14pt</xsl:param>
-<xsl:attribute-set name="footer.table.properties">
-  <xsl:attribute name="table-layout">fixed</xsl:attribute>
-  <xsl:attribute name="width">100%</xsl:attribute>
-</xsl:attribute-set>
-<xsl:param name="footers.on.blank.pages" select="1"/>
-<xsl:param name="footnote.font.size">
- <xsl:value-of select="$body.font.master * 0.8"/><xsl:text>pt</xsl:text>
-</xsl:param>
-<xsl:param name="footnote.number.format">1</xsl:param>
-<xsl:param name="footnote.number.symbols"/>
-<xsl:attribute-set name="footnote.mark.properties">
-  <xsl:attribute name="font-size">75%</xsl:attribute>
-  <xsl:attribute name="font-weight">normal</xsl:attribute>
-  <xsl:attribute name="font-style">normal</xsl:attribute>
-</xsl:attribute-set>
-<xsl:attribute-set name="footnote.properties">
-  <xsl:attribute name="font-family"><xsl:value-of select="$body.fontset"/></xsl:attribute>
-  <xsl:attribute name="font-size"><xsl:value-of select="$footnote.font.size"/></xsl:attribute>
-  <xsl:attribute name="font-weight">normal</xsl:attribute>
-  <xsl:attribute name="font-style">normal</xsl:attribute>
-  <xsl:attribute name="text-align"><xsl:value-of select="$alignment"/></xsl:attribute>
-  <xsl:attribute name="start-indent">0pt</xsl:attribute>
-  <xsl:attribute name="text-indent">0pt</xsl:attribute>
-</xsl:attribute-set>
-<xsl:attribute-set name="footnote.sep.leader.properties">
-  <xsl:attribute name="color">black</xsl:attribute>
-  <xsl:attribute name="leader-pattern">rule</xsl:attribute>
-  <xsl:attribute name="leader-length">1in</xsl:attribute>
-</xsl:attribute-set>
-<xsl:param name="fop.extensions" select="0"/>
-<xsl:param name="fop1.extensions" select="0"/>
-<xsl:attribute-set name="formal.object.properties">
-  <xsl:attribute name="space-before.minimum">0.5em</xsl:attribute>
-  <xsl:attribute name="space-before.optimum">1em</xsl:attribute>
-  <xsl:attribute name="space-before.maximum">2em</xsl:attribute>
-  <xsl:attribute name="space-after.minimum">0.5em</xsl:attribute>
-  <xsl:attribute name="space-after.optimum">1em</xsl:attribute>
-  <xsl:attribute name="space-after.maximum">2em</xsl:attribute>
-  <xsl:attribute name="keep-together.within-column">always</xsl:attribute>
-</xsl:attribute-set>
-<xsl:param name="formal.procedures" select="1"/>
-<xsl:param name="formal.title.placement">
-figure before
-example before
-equation before
-table before
-procedure before
-task before
-</xsl:param>
-<xsl:attribute-set name="formal.title.properties" use-attribute-sets="normal.para.spacing">
-  <xsl:attribute name="font-weight">bold</xsl:attribute>
-  <xsl:attribute name="font-size">
-    <xsl:value-of select="$body.font.master * 1.2"/>
-    <xsl:text>pt</xsl:text>
-  </xsl:attribute>
-  <xsl:attribute name="hyphenate">false</xsl:attribute>
-  <xsl:attribute name="space-after.minimum">0.4em</xsl:attribute>
-  <xsl:attribute name="space-after.optimum">0.6em</xsl:attribute>
-  <xsl:attribute name="space-after.maximum">0.8em</xsl:attribute>
-</xsl:attribute-set>
-<xsl:param name="funcsynopsis.decoration" select="1"/>
-<xsl:param name="funcsynopsis.style">kr</xsl:param>
-<xsl:param name="function.parens" select="0"/>
-<xsl:param name="generate.index" select="1"/>
-<xsl:param name="generate.section.toc.level" select="0"/>
-
-<xsl:param name="generate.toc">
-/appendix toc,title
-article/appendix  nop
-/article  toc,title
-book      toc,title,figure,table,example,equation
-/chapter  toc,title
-part      toc,title
-/preface  toc,title
-reference toc,title
-/sect1    toc
-/sect2    toc
-/sect3    toc
-/sect4    toc
-/sect5    toc
-/section  toc
-set       toc,title
-</xsl:param>
-<xsl:param name="glossary.as.blocks" select="0"/>
-<xsl:param name="glossary.collection"/>
-<xsl:param name="glossary.sort" select="0"/>
-<xsl:param name="glossentry.show.acronym">no</xsl:param>
-<xsl:param name="glosslist.as.blocks" select="0"/>
-<xsl:param name="glossterm.auto.link" select="0"/>
-<xsl:param name="glossterm.separation">0.25in</xsl:param>
-<xsl:param name="glossterm.width">2in</xsl:param>
-<xsl:param name="graphic.default.extension"/>
-<xsl:attribute-set name="header.content.properties">
-  <xsl:attribute name="font-family">
-    <xsl:value-of select="$body.fontset"/>
-  </xsl:attribute>
-  <xsl:attribute name="margin-left">
-    <xsl:value-of select="$title.margin.left"/>
-  </xsl:attribute>
-</xsl:attribute-set>
-<xsl:param name="header.rule" select="1"/>
-<xsl:param name="header.column.widths">1 1 1</xsl:param>
-<xsl:param name="header.table.height">14pt</xsl:param>
-<xsl:attribute-set name="header.table.properties">
-  <xsl:attribute name="table-layout">fixed</xsl:attribute>
-  <xsl:attribute name="width">100%</xsl:attribute>
-</xsl:attribute-set>
-<xsl:param name="headers.on.blank.pages" select="1"/>
-<xsl:param name="highlight.default.language"/>
-<xsl:param name="highlight.source" select="0"/>
-<xsl:param name="hyphenate">true</xsl:param>
-<xsl:param name="hyphenate.verbatim" select="0"/>
-<xsl:param name="hyphenate.verbatim.characters"/>
-<xsl:param name="ignore.image.scaling" select="0"/>
-<xsl:param name="img.src.path"/>
-<xsl:param name="index.method">basic</xsl:param>
-<xsl:param name="index.on.role" select="0"/>
-<xsl:param name="index.on.type" select="0"/>
-<xsl:attribute-set name="index.page.number.properties">
-</xsl:attribute-set>
-<xsl:attribute-set name="informalequation.properties" use-attribute-sets="informal.object.properties"/>
-<xsl:attribute-set name="informalexample.properties" use-attribute-sets="informal.object.properties"/>
-<xsl:attribute-set name="informalfigure.properties" use-attribute-sets="informal.object.properties"/>
-<xsl:attribute-set name="informal.object.properties">
-  <xsl:attribute name="space-before.minimum">0.5em</xsl:attribute>
-  <xsl:attribute name="space-before.optimum">1em</xsl:attribute>
-  <xsl:attribute name="space-before.maximum">2em</xsl:attribute>
-  <xsl:attribute name="space-after.minimum">0.5em</xsl:attribute>
-  <xsl:attribute name="space-after.optimum">1em</xsl:attribute>
-  <xsl:attribute name="space-after.maximum">2em</xsl:attribute>
-</xsl:attribute-set>
-<xsl:attribute-set name="informaltable.properties" use-attribute-sets="informal.object.properties"/>
-<xsl:attribute-set name="index.preferred.page.properties">
-  <xsl:attribute name="font-weight">bold</xsl:attribute>
-</xsl:attribute-set>
-<xsl:attribute-set name="index.div.title.properties">
-  <xsl:attribute name="margin-left">0pt</xsl:attribute>
-  <xsl:attribute name="font-size">14.4pt</xsl:attribute>
-  <xsl:attribute name="font-family"><xsl:value-of select="$title.fontset"/></xsl:attribute>
-  <xsl:attribute name="font-weight">bold</xsl:attribute>
-  <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
-  <xsl:attribute name="space-before.optimum"><xsl:value-of select="concat($body.font.master,'pt')"/></xsl:attribute>
-  <xsl:attribute name="space-before.minimum"><xsl:value-of select="concat($body.font.master,'pt * 0.8')"/></xsl:attribute>
-  <xsl:attribute name="space-before.maximum"><xsl:value-of select="concat($body.font.master,'pt * 1.2')"/></xsl:attribute>
-  <xsl:attribute name="start-indent">0pt</xsl:attribute>
-</xsl:attribute-set>
-<xsl:attribute-set name="index.entry.properties">
-  <xsl:attribute name="start-indent">0pt</xsl:attribute>
-</xsl:attribute-set>
-<xsl:param name="index.number.separator"/>
-<xsl:param name="index.range.separator"/>
-<xsl:param name="index.term.separator"/>
-<xsl:param name="insert.link.page.number">no</xsl:param>
-<xsl:param name="insert.xref.page.number">no</xsl:param>
-<xsl:attribute-set name="itemizedlist.properties" use-attribute-sets="list.block.properties">
-</xsl:attribute-set>
-<xsl:attribute-set name="itemizedlist.label.properties">
-</xsl:attribute-set>
-    <xsl:param name="itemizedlist.label.width">1.0em</xsl:param>
-  
-
-<xsl:param name="keep.relative.image.uris" select="0"/>
-<xsl:param name="l10n.gentext.default.language">en</xsl:param>
-<xsl:param name="l10n.gentext.language"/>
-<xsl:param name="l10n.gentext.use.xref.language" select="0"/>
-<xsl:param name="l10n.lang.value.rfc.compliant" select="1"/>
-<xsl:param name="label.from.part" select="0"/>
-<xsl:param name="line-height">normal</xsl:param>
-<xsl:param name="linenumbering.everyNth">5</xsl:param>
-<xsl:param name="linenumbering.extension" select="1"/>
-<xsl:param name="linenumbering.separator"><xsl:text> </xsl:text></xsl:param>
-<xsl:param name="linenumbering.width">3</xsl:param>
-<xsl:attribute-set name="list.block.properties">
-  <xsl:attribute name="provisional-label-separation">0.2em</xsl:attribute>
-  <xsl:attribute name="provisional-distance-between-starts">1.5em</xsl:attribute>
-</xsl:attribute-set>
-<xsl:attribute-set name="list.block.spacing">
-  <xsl:attribute name="space-before.optimum">1em</xsl:attribute>
-  <xsl:attribute name="space-before.minimum">0.8em</xsl:attribute>
-  <xsl:attribute name="space-before.maximum">1.2em</xsl:attribute>
-  <xsl:attribute name="space-after.optimum">1em</xsl:attribute>
-  <xsl:attribute name="space-after.minimum">0.8em</xsl:attribute>
-  <xsl:attribute name="space-after.maximum">1.2em</xsl:attribute>
-</xsl:attribute-set>
-<xsl:attribute-set name="list.item.spacing">
-  <xsl:attribute name="space-before.optimum">1em</xsl:attribute>
-  <xsl:attribute name="space-before.minimum">0.8em</xsl:attribute>
-  <xsl:attribute name="space-before.maximum">1.2em</xsl:attribute>
-</xsl:attribute-set>
-<xsl:param name="make.index.markup" select="0"/>
-<xsl:param name="make.single.year.ranges" select="0"/>
-<xsl:param name="make.year.ranges" select="0"/>
-<xsl:attribute-set name="margin.note.properties">
-  <xsl:attribute name="font-size">90%</xsl:attribute>
-  <xsl:attribute name="text-align">start</xsl:attribute>
-</xsl:attribute-set>
-<xsl:attribute-set name="margin.note.title.properties">
-  <xsl:attribute name="font-weight">bold</xsl:attribute>
-  <xsl:attribute name="hyphenate">false</xsl:attribute>
-  <xsl:attribute name="text-align">start</xsl:attribute>
-  <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
-</xsl:attribute-set>
-<xsl:param name="margin.note.float.type">none</xsl:param>
-<xsl:param name="margin.note.width">1in</xsl:param>
-<xsl:param name="marker.section.level">2</xsl:param>
-<xsl:param name="menuchoice.menu.separator"> &#8594; </xsl:param>
-<xsl:param name="menuchoice.separator">+</xsl:param>
-<xsl:param name="monospace.font.family">monospace</xsl:param>
-<xsl:attribute-set name="monospace.properties">
-  <xsl:attribute name="font-family">
-    <xsl:value-of select="$monospace.font.family"/>
-  </xsl:attribute>
-</xsl:attribute-set>
-<xsl:attribute-set name="monospace.verbatim.properties" use-attribute-sets="verbatim.properties monospace.properties">
-  <xsl:attribute name="text-align">start</xsl:attribute>
-  <xsl:attribute name="wrap-option">no-wrap</xsl:attribute>
-</xsl:attribute-set>
-<xsl:param name="nominal.table.width">6in</xsl:param>
-<xsl:attribute-set name="normal.para.spacing">
-  <xsl:attribute name="space-before.optimum">1em</xsl:attribute>
-  <xsl:attribute name="space-before.minimum">0.8em</xsl:attribute>
-  <xsl:attribute name="space-before.maximum">1.2em</xsl:attribute>
-</xsl:attribute-set>
-<xsl:param name="olink.doctitle">no</xsl:param> 
-<xsl:param name="olink.base.uri"/>
-<xsl:param name="olink.debug" select="0"/>
-<xsl:attribute-set name="olink.properties">
-  <xsl:attribute name="show-destination">replace</xsl:attribute>
-</xsl:attribute-set>
-<xsl:param name="olink.lang.fallback.sequence"/>
-<xsl:attribute-set name="orderedlist.properties" use-attribute-sets="list.block.properties">
-  <xsl:attribute name="provisional-distance-between-starts">2em</xsl:attribute>
-</xsl:attribute-set>
-<xsl:attribute-set name="orderedlist.label.properties">
-</xsl:attribute-set>
-<xsl:param name="orderedlist.label.width">1.2em</xsl:param>
-<xsl:param name="prefer.internal.olink" select="0"/>
-<xsl:param name="insert.olink.page.number">no</xsl:param>
-<xsl:param name="insert.olink.pdf.frag" select="0"/>
-<xsl:param name="page.height">
-  <xsl:choose>
-    <xsl:when test="$page.orientation = 'portrait'">
-      <xsl:value-of select="$page.height.portrait"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$page.width.portrait"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:param>
-<xsl:param name="page.height.portrait">
-  <xsl:choose>
-    <xsl:when test="$paper.type = 'A4landscape'">210mm</xsl:when>
-    <xsl:when test="$paper.type = 'USletter'">11in</xsl:when>
-    <xsl:when test="$paper.type = 'USlandscape'">8.5in</xsl:when>
-    <xsl:when test="$paper.type = '4A0'">2378mm</xsl:when>
-    <xsl:when test="$paper.type = '2A0'">1682mm</xsl:when>
-    <xsl:when test="$paper.type = 'A0'">1189mm</xsl:when>
-    <xsl:when test="$paper.type = 'A1'">841mm</xsl:when>
-    <xsl:when test="$paper.type = 'A2'">594mm</xsl:when>
-    <xsl:when test="$paper.type = 'A3'">420mm</xsl:when>
-    <xsl:when test="$paper.type = 'A4'">297mm</xsl:when>
-    <xsl:when test="$paper.type = 'A5'">210mm</xsl:when>
-    <xsl:when test="$paper.type = 'A6'">148mm</xsl:when>
-    <xsl:when test="$paper.type = 'A7'">105mm</xsl:when>
-    <xsl:when test="$paper.type = 'A8'">74mm</xsl:when>
-    <xsl:when test="$paper.type = 'A9'">52mm</xsl:when>
-    <xsl:when test="$paper.type = 'A10'">37mm</xsl:when>
-    <xsl:when test="$paper.type = 'B0'">1414mm</xsl:when>
-    <xsl:when test="$paper.type = 'B1'">1000mm</xsl:when>
-    <xsl:when test="$paper.type = 'B2'">707mm</xsl:when>
-    <xsl:when test="$paper.type = 'B3'">500mm</xsl:when>
-    <xsl:when test="$paper.type = 'B4'">353mm</xsl:when>
-    <xsl:when test="$paper.type = 'B5'">250mm</xsl:when>
-    <xsl:when test="$paper.type = 'B6'">176mm</xsl:when>
-    <xsl:when test="$paper.type = 'B7'">125mm</xsl:when>
-    <xsl:when test="$paper.type = 'B8'">88mm</xsl:when>
-    <xsl:when test="$paper.type = 'B9'">62mm</xsl:when>
-    <xsl:when test="$paper.type = 'B10'">44mm</xsl:when>
-    <xsl:when test="$paper.type = 'C0'">1297mm</xsl:when>
-    <xsl:when test="$paper.type = 'C1'">917mm</xsl:when>
-    <xsl:when test="$paper.type = 'C2'">648mm</xsl:when>
-    <xsl:when test="$paper.type = 'C3'">458mm</xsl:when>
-    <xsl:when test="$paper.type = 'C4'">324mm</xsl:when>
-    <xsl:when test="$paper.type = 'C5'">229mm</xsl:when>
-    <xsl:when test="$paper.type = 'C6'">162mm</xsl:when>
-    <xsl:when test="$paper.type = 'C7'">114mm</xsl:when>
-    <xsl:when test="$paper.type = 'C8'">81mm</xsl:when>
-    <xsl:when test="$paper.type = 'C9'">57mm</xsl:when>
-    <xsl:when test="$paper.type = 'C10'">40mm</xsl:when>
-    <xsl:otherwise>11in</xsl:otherwise>
-  </xsl:choose>
-</xsl:param>
-<xsl:param name="page.margin.bottom">0.5in</xsl:param>
-<xsl:param name="page.margin.inner">
-  <xsl:choose>
-    <xsl:when test="$double.sided != 0">1.25in</xsl:when>
-    <xsl:otherwise>1in</xsl:otherwise>
-  </xsl:choose>
-</xsl:param>
-<xsl:param name="page.margin.outer">
-  <xsl:choose>
-    <xsl:when test="$double.sided != 0">0.75in</xsl:when>
-    <xsl:otherwise>1in</xsl:otherwise>
-  </xsl:choose>
-</xsl:param>
-<xsl:param name="page.margin.top">0.5in</xsl:param>
-<xsl:param name="page.orientation">portrait</xsl:param>
-<xsl:param name="page.width">
-  <xsl:choose>
-    <xsl:when test="$page.orientation = 'portrait'">
-      <xsl:value-of select="$page.width.portrait"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$page.height.portrait"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:param>
-<xsl:param name="page.width.portrait">
-  <xsl:choose>
-    <xsl:when test="$paper.type = 'USletter'">8.5in</xsl:when>
-    <xsl:when test="$paper.type = '4A0'">1682mm</xsl:when>
-    <xsl:when test="$paper.type = '2A0'">1189mm</xsl:when>
-    <xsl:when test="$paper.type = 'A0'">841mm</xsl:when>
-    <xsl:when test="$paper.type = 'A1'">594mm</xsl:when>
-    <xsl:when test="$paper.type = 'A2'">420mm</xsl:when>
-    <xsl:when test="$paper.type = 'A3'">297mm</xsl:when>
-    <xsl:when test="$paper.type = 'A4'">210mm</xsl:when>
-    <xsl:when test="$paper.type = 'A5'">148mm</xsl:when>
-    <xsl:when test="$paper.type = 'A6'">105mm</xsl:when>
-    <xsl:when test="$paper.type = 'A7'">74mm</xsl:when>
-    <xsl:when test="$paper.type = 'A8'">52mm</xsl:when>
-    <xsl:when test="$paper.type = 'A9'">37mm</xsl:when>
-    <xsl:when test="$paper.type = 'A10'">26mm</xsl:when>
-    <xsl:when test="$paper.type = 'B0'">1000mm</xsl:when>
-    <xsl:when test="$paper.type = 'B1'">707mm</xsl:when>
-    <xsl:when test="$paper.type = 'B2'">500mm</xsl:when>
-    <xsl:when test="$paper.type = 'B3'">353mm</xsl:when>
-    <xsl:when test="$paper.type = 'B4'">250mm</xsl:when>
-    <xsl:when test="$paper.type = 'B5'">176mm</xsl:when>
-    <xsl:when test="$paper.type = 'B6'">125mm</xsl:when>
-    <xsl:when test="$paper.type = 'B7'">88mm</xsl:when>
-    <xsl:when test="$paper.type = 'B8'">62mm</xsl:when>
-    <xsl:when test="$paper.type = 'B9'">44mm</xsl:when>
-    <xsl:when test="$paper.type = 'B10'">31mm</xsl:when>
-    <xsl:when test="$paper.type = 'C0'">917mm</xsl:when>
-    <xsl:when test="$paper.type = 'C1'">648mm</xsl:when>
-    <xsl:when test="$paper.type = 'C2'">458mm</xsl:when>
-    <xsl:when test="$paper.type = 'C3'">324mm</xsl:when>
-    <xsl:when test="$paper.type = 'C4'">229mm</xsl:when>
-    <xsl:when test="$paper.type = 'C5'">162mm</xsl:when>
-    <xsl:when test="$paper.type = 'C6'">114mm</xsl:when>
-    <xsl:when test="$paper.type = 'C7'">81mm</xsl:when>
-    <xsl:when test="$paper.type = 'C8'">57mm</xsl:when>
-    <xsl:when test="$paper.type = 'C9'">40mm</xsl:when>
-    <xsl:when test="$paper.type = 'C10'">28mm</xsl:when>
-    <xsl:otherwise>8.5in</xsl:otherwise>
-  </xsl:choose>
-</xsl:param>
-<xsl:param name="paper.type">USletter</xsl:param>
-<xsl:param name="part.autolabel">I</xsl:param>
-<xsl:param name="passivetex.extensions" select="0"/>
-<xsl:attribute-set name="pgwide.properties">
-  <xsl:attribute name="start-indent">0pt</xsl:attribute>
-</xsl:attribute-set>
-<xsl:param name="preface.autolabel" select="0"/>
-<xsl:param name="preferred.mediaobject.role"/>
-<xsl:attribute-set name="procedure.properties" use-attribute-sets="formal.object.properties">
-  <xsl:attribute name="keep-together.within-column">auto</xsl:attribute>
-</xsl:attribute-set>
-<xsl:param name="process.empty.source.toc" select="0"/>
-<xsl:param name="process.source.toc" select="0"/>
-<xsl:param name="profile.arch"/>
-<xsl:param name="profile.audience"/>
-<xsl:param name="profile.attribute"/>
-<xsl:param name="profile.condition"/>
-<xsl:param name="profile.conformance"/>
-<xsl:param name="profile.lang"/>
-<xsl:param name="profile.os"/>
-<xsl:param name="profile.revision"/>
-<xsl:param name="profile.revisionflag"/>
-<xsl:param name="profile.role"/>
-<xsl:param name="profile.security"/>
-<xsl:param name="profile.separator">;</xsl:param>
-<xsl:param name="profile.status"/>
-<xsl:param name="profile.userlevel"/>
-<xsl:param name="profile.value"/>
-<xsl:param name="profile.vendor"/>
-<xsl:param name="profile.wordsize"/>
-<xsl:param name="punct.honorific">.</xsl:param>
-<xsl:param name="qanda.defaultlabel">number</xsl:param>
-<xsl:param name="qanda.in.toc" select="0"/>
-<xsl:param name="qanda.nested.in.toc" select="0"/>
-<xsl:param name="qanda.inherit.numeration" select="1"/>
-<xsl:param name="qandadiv.autolabel" select="1"/>
-<xsl:attribute-set name="qanda.title.level1.properties">
-  <xsl:attribute name="font-size">
-    <xsl:value-of select="$body.font.master * 2.0736"/>
-    <xsl:text>pt</xsl:text>
-  </xsl:attribute>
-</xsl:attribute-set>
-<xsl:attribute-set name="qanda.title.level2.properties">
-  <xsl:attribute name="font-size">
-    <xsl:value-of select="$body.font.master * 1.728"/>
-    <xsl:text>pt</xsl:text>
-  </xsl:attribute>
-</xsl:attribute-set>
-<xsl:attribute-set name="qanda.title.level3.properties">
-  <xsl:attribute name="font-size">
-    <xsl:value-of select="$body.font.master * 1.44"/>
-    <xsl:text>pt</xsl:text>
-  </xsl:attribute>
-</xsl:attribute-set>
-<xsl:attribute-set name="qanda.title.level4.properties">
-  <xsl:attribute name="font-size">
-    <xsl:value-of select="$body.font.master * 1.2"/>
-    <xsl:text>pt</xsl:text>
-  </xsl:attribute>
-</xsl:attribute-set>
-<xsl:attribute-set name="qanda.title.level5.properties">
-  <xsl:attribute name="font-size">
-    <xsl:value-of select="$body.font.master"/>
-    <xsl:text>pt</xsl:text>
-  </xsl:attribute>
-</xsl:attribute-set>
-<xsl:attribute-set name="qanda.title.level6.properties">
-  <xsl:attribute name="font-size">
-    <xsl:value-of select="$body.font.master"/>
-    <xsl:text>pt</xsl:text>
-  </xsl:attribute>
-</xsl:attribute-set>
-<xsl:attribute-set name="qanda.title.properties">
-  <xsl:attribute name="font-family">
-    <xsl:value-of select="$title.font.family"/>
-  </xsl:attribute>
-  <xsl:attribute name="font-weight">bold</xsl:attribute>
-  <!-- font size is calculated dynamically by qanda.heading template -->
-  <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
-  <xsl:attribute name="space-before.minimum">0.8em</xsl:attribute>
-  <xsl:attribute name="space-before.optimum">1.0em</xsl:attribute>
-  <xsl:attribute name="space-before.maximum">1.2em</xsl:attribute>
-</xsl:attribute-set>
-<xsl:param name="refentry.generate.name" select="1"/>
-<xsl:param name="refentry.generate.title" select="0"/>
-<xsl:param name="refentry.pagebreak" select="1"/>
-<xsl:attribute-set name="refentry.title.properties">
-  <xsl:attribute name="font-family">
-    <xsl:value-of select="$title.font.family"/>
-  </xsl:attribute>
-  <xsl:attribute name="font-size">18pt</xsl:attribute>
-  <xsl:attribute name="font-weight">bold</xsl:attribute>
-  <xsl:attribute name="space-after">1em</xsl:attribute>
-  <xsl:attribute name="hyphenate">false</xsl:attribute>
-  <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
-  <xsl:attribute name="space-before.minimum">0.8em</xsl:attribute>
-  <xsl:attribute name="space-before.optimum">1.0em</xsl:attribute>
-  <xsl:attribute name="space-before.maximum">1.2em</xsl:attribute>
-  <xsl:attribute name="space-after.optimum">0.5em</xsl:attribute>
-  <xsl:attribute name="space-after.minimum">0.4em</xsl:attribute>
-  <xsl:attribute name="space-after.maximum">0.6em</xsl:attribute>
-  <xsl:attribute name="start-indent"><xsl:value-of select="$title.margin.left"/></xsl:attribute>
-</xsl:attribute-set>
-<xsl:param name="refentry.xref.manvolnum" select="1"/>
-  <xsl:param name="reference.autolabel">I</xsl:param>
-<xsl:param name="refclass.suppress" select="0"/>
-<xsl:param name="region.after.extent">0.4in</xsl:param>
-<xsl:param name="region.before.extent">0.4in</xsl:param>
-<xsl:attribute-set name="revhistory.table.properties">
-</xsl:attribute-set>
-<xsl:attribute-set name="revhistory.table.cell.properties">
-</xsl:attribute-set>
-<xsl:attribute-set name="revhistory.title.properties">
-</xsl:attribute-set>
-<xsl:attribute-set name="root.properties">
-  <xsl:attribute name="font-family">
-    <xsl:value-of select="$body.fontset"/>
-  </xsl:attribute>
-  <xsl:attribute name="font-size">
-    <xsl:value-of select="$body.font.size"/>
-  </xsl:attribute>
-  <xsl:attribute name="text-align">
-    <xsl:value-of select="$alignment"/>
-  </xsl:attribute>
-  <xsl:attribute name="line-height">
-    <xsl:value-of select="$line-height"/>
-  </xsl:attribute>
-  <xsl:attribute name="font-selection-strategy">character-by-character</xsl:attribute>
-  <xsl:attribute name="line-height-shift-adjustment">disregard-shifts</xsl:attribute>
-</xsl:attribute-set>
-<xsl:param name="rootid"/>
-<xsl:param name="runinhead.default.title.end.punct">.</xsl:param>
-<xsl:param name="runinhead.title.end.punct">.!?:</xsl:param>
-<xsl:param name="sans.font.family">sans-serif</xsl:param>
-<xsl:param name="section.autolabel" select="0"/>
-<xsl:param name="section.autolabel.max.depth">8</xsl:param>
-<xsl:param name="section.container.element">block</xsl:param>
-<xsl:param name="section.label.includes.component.label" select="0"/>
-<xsl:attribute-set name="section.title.level1.properties">
-  <xsl:attribute name="font-size">
-    <xsl:value-of select="$body.font.master * 2.0736"/>
-    <xsl:text>pt</xsl:text>
-  </xsl:attribute>
-</xsl:attribute-set>
-<xsl:attribute-set name="section.title.level2.properties">
-  <xsl:attribute name="font-size">
-    <xsl:value-of select="$body.font.master * 1.728"/>
-    <xsl:text>pt</xsl:text>
-  </xsl:attribute>
-</xsl:attribute-set>
-<xsl:attribute-set name="section.title.level3.properties">
-  <xsl:attribute name="font-size">
-    <xsl:value-of select="$body.font.master * 1.44"/>
-    <xsl:text>pt</xsl:text>
-  </xsl:attribute>
-</xsl:attribute-set>
-<xsl:attribute-set name="section.title.level4.properties">
-  <xsl:attribute name="font-size">
-    <xsl:value-of select="$body.font.master * 1.2"/>
-    <xsl:text>pt</xsl:text>
-  </xsl:attribute>
-</xsl:attribute-set>
-<xsl:attribute-set name="section.title.level5.properties">
-  <xsl:attribute name="font-size">
-    <xsl:value-of select="$body.font.master"/>
-    <xsl:text>pt</xsl:text>
-  </xsl:attribute>
-</xsl:attribute-set>
-<xsl:attribute-set name="section.title.level6.properties">
-  <xsl:attribute name="font-size">
-    <xsl:value-of select="$body.font.master"/>
-    <xsl:text>pt</xsl:text>
-  </xsl:attribute>
-</xsl:attribute-set>
-<xsl:attribute-set name="section.title.properties">
-  <xsl:attribute name="font-family">
-    <xsl:value-of select="$title.font.family"/>
-  </xsl:attribute>
-  <xsl:attribute name="font-weight">bold</xsl:attribute>
-  <!-- font size is calculated dynamically by section.heading template -->
-  <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
-  <xsl:attribute name="space-before.minimum">0.8em</xsl:attribute>
-  <xsl:attribute name="space-before.optimum">1.0em</xsl:attribute>
-  <xsl:attribute name="space-before.maximum">1.2em</xsl:attribute>
-  <xsl:attribute name="text-align">left</xsl:attribute>
-  <xsl:attribute name="start-indent"><xsl:value-of select="$title.margin.left"/></xsl:attribute>
-</xsl:attribute-set>
-<xsl:attribute-set name="section.level1.properties" use-attribute-sets="section.properties">
-</xsl:attribute-set>
-<xsl:attribute-set name="section.level2.properties" use-attribute-sets="section.properties">
-</xsl:attribute-set>
-<xsl:attribute-set name="section.level3.properties" use-attribute-sets="section.properties">
-</xsl:attribute-set>
-<xsl:attribute-set name="section.level4.properties" use-attribute-sets="section.properties">
-</xsl:attribute-set>
-<xsl:attribute-set name="section.level5.properties" use-attribute-sets="section.properties">
-</xsl:attribute-set>
-<xsl:attribute-set name="section.level6.properties" use-attribute-sets="section.properties">
-</xsl:attribute-set>
-<xsl:attribute-set name="section.properties">
-</xsl:attribute-set>
-<xsl:param name="segmentedlist.as.table" select="0"/>
-<xsl:param name="shade.verbatim" select="0"/>
-
-<xsl:attribute-set name="shade.verbatim.style">
-  <xsl:attribute name="background-color">#E0E0E0</xsl:attribute>
-</xsl:attribute-set>
-<xsl:param name="show.comments" select="1"/>
-<xsl:attribute-set name="sidebar.properties" use-attribute-sets="formal.object.properties">
-  <xsl:attribute name="border-style">solid</xsl:attribute>
-  <xsl:attribute name="border-width">1pt</xsl:attribute>
-  <xsl:attribute name="border-color">black</xsl:attribute>
-  <xsl:attribute name="background-color">#DDDDDD</xsl:attribute>
-  <xsl:attribute name="padding-left">12pt</xsl:attribute>
-  <xsl:attribute name="padding-right">12pt</xsl:attribute>
-  <xsl:attribute name="padding-top">6pt</xsl:attribute>
-  <xsl:attribute name="padding-bottom">6pt</xsl:attribute>
-  <xsl:attribute name="margin-left">0pt</xsl:attribute>
-  <xsl:attribute name="margin-right">0pt</xsl:attribute>
-<!--
-  <xsl:attribute name="margin-top">6pt</xsl:attribute>
-  <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
--->
-</xsl:attribute-set>
-<xsl:attribute-set name="sidebar.title.properties">
-  <xsl:attribute name="font-weight">bold</xsl:attribute>
-  <xsl:attribute name="hyphenate">false</xsl:attribute>
-  <xsl:attribute name="text-align">start</xsl:attribute>
-  <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
-</xsl:attribute-set>
-<xsl:param name="sidebar.float.type">none</xsl:param>
-<xsl:param name="sidebar.float.width">1in</xsl:param>
-<xsl:param name="simplesect.in.toc" select="0"/>
-<xsl:attribute-set name="subscript.properties">
-  <xsl:attribute name="font-size">75%</xsl:attribute>
-</xsl:attribute-set>
-<xsl:attribute-set name="superscript.properties">
-  <xsl:attribute name="font-size">75%</xsl:attribute>
-</xsl:attribute-set>
-<xsl:param name="symbol.font.family">Symbol,ZapfDingbats</xsl:param>
-
-<xsl:param name="table.cell.border.color">black</xsl:param>
-<xsl:param name="table.cell.border.style">solid</xsl:param>
-<xsl:param name="table.cell.border.thickness">0.5pt</xsl:param>
-<xsl:attribute-set name="table.cell.padding">
-  <xsl:attribute name="padding-left">2pt</xsl:attribute>
-  <xsl:attribute name="padding-right">2pt</xsl:attribute>
-  <xsl:attribute name="padding-top">2pt</xsl:attribute>
-  <xsl:attribute name="padding-bottom">2pt</xsl:attribute>
-</xsl:attribute-set>
-<xsl:param name="table.footnote.number.format">a</xsl:param>
-<xsl:param name="table.footnote.number.symbols"/>
-<xsl:attribute-set name="table.footnote.properties">
-  <xsl:attribute name="font-family"><xsl:value-of select="$body.fontset"/></xsl:attribute>
-  <xsl:attribute name="font-size"><xsl:value-of select="$footnote.font.size"/></xsl:attribute>
-  <xsl:attribute name="font-weight">normal</xsl:attribute>
-  <xsl:attribute name="font-style">normal</xsl:attribute>
-  <xsl:attribute name="space-before">2pt</xsl:attribute>
-  <xsl:attribute name="text-align"><xsl:value-of select="$alignment"/></xsl:attribute>
-</xsl:attribute-set>
-
-<xsl:param name="table.frame.border.color">black</xsl:param>
-<xsl:param name="table.frame.border.style">solid</xsl:param>
-<xsl:param name="table.frame.border.thickness">0.5pt</xsl:param>
-<xsl:attribute-set name="table.properties" use-attribute-sets="formal.object.properties"/>
-<xsl:param name="tablecolumns.extension" select="1"/>
-<xsl:attribute-set name="table.table.properties">
-  <xsl:attribute name="border-before-width.conditionality">retain</xsl:attribute>
-  <xsl:attribute name="border-collapse">collapse</xsl:attribute>
-</xsl:attribute-set>
- <xsl:param name="target.database.document">olinkdb.xml</xsl:param>
-<xsl:param name="targets.filename">target.db</xsl:param>
-<xsl:param name="textdata.default.encoding"/>
-<xsl:param name="tex.math.delims" select="1"/>
-<xsl:param name="tex.math.in.alt"/>
-  <xsl:param name="textinsert.extension" select="1"/>
-<xsl:param name="title.font.family">sans-serif</xsl:param>
-<xsl:param name="title.margin.left">
-  <xsl:choose>
-    <xsl:when test="$fop.extensions != 0">-4pc</xsl:when>
-    <xsl:when test="$passivetex.extensions != 0">0pt</xsl:when>
-    <xsl:otherwise>0pt</xsl:otherwise>
-  </xsl:choose>
-</xsl:param>
-<xsl:param name="toc.indent.width">24</xsl:param>
-<!-- inconsistant point specification? -->
-<xsl:attribute-set name="toc.line.properties">
-  <xsl:attribute name="text-align-last">justify</xsl:attribute>
-  <xsl:attribute name="text-align">start</xsl:attribute>
-  <xsl:attribute name="end-indent"><xsl:value-of select="concat($toc.indent.width, 'pt')"/></xsl:attribute>
-  <xsl:attribute name="last-line-end-indent"><xsl:value-of select="concat('-', $toc.indent.width, 'pt')"/></xsl:attribute>
-</xsl:attribute-set>
-<xsl:attribute-set name="toc.margin.properties">
-  <xsl:attribute name="space-before.minimum">0.5em</xsl:attribute>
-  <xsl:attribute name="space-before.optimum">1em</xsl:attribute>
-  <xsl:attribute name="space-before.maximum">2em</xsl:attribute>
-  <xsl:attribute name="space-after.minimum">0.5em</xsl:attribute>
-  <xsl:attribute name="space-after.optimum">1em</xsl:attribute>
-  <xsl:attribute name="space-after.maximum">2em</xsl:attribute>
-</xsl:attribute-set>
-<xsl:param name="toc.max.depth">8</xsl:param>
-<xsl:param name="toc.section.depth">2</xsl:param>
-<xsl:param name="ulink.footnotes" select="0"/>
-<xsl:param name="ulink.hyphenate"/>
-<xsl:param name="ulink.hyphenate.chars">/</xsl:param>
-<xsl:param name="ulink.show" select="1"/>
-<xsl:param name="use.extensions" select="0"/>
-<xsl:param name="use.local.olink.style" select="0"/> 
-<xsl:param name="use.role.as.xrefstyle" select="1"/>
-<xsl:param name="use.role.for.mediaobject" select="1"/>
-<xsl:param name="use.svg" select="1"/>
-<xsl:param name="variablelist.as.blocks" select="0"/>
-<xsl:param name="variablelist.max.termlength">24</xsl:param>
-<xsl:param name="variablelist.term.separator">, </xsl:param>
-<xsl:param name="variablelist.term.break.after">0</xsl:param>
-<xsl:attribute-set name="verbatim.properties">
-  <xsl:attribute name="space-before.minimum">0.8em</xsl:attribute>
-  <xsl:attribute name="space-before.optimum">1em</xsl:attribute>
-  <xsl:attribute name="space-before.maximum">1.2em</xsl:attribute>
-  <xsl:attribute name="space-after.minimum">0.8em</xsl:attribute>
-  <xsl:attribute name="space-after.optimum">1em</xsl:attribute>
-  <xsl:attribute name="space-after.maximum">1.2em</xsl:attribute>
-  <xsl:attribute name="hyphenate">false</xsl:attribute>
-  <xsl:attribute name="wrap-option">no-wrap</xsl:attribute>
-  <xsl:attribute name="white-space-collapse">false</xsl:attribute>
-  <xsl:attribute name="white-space-treatment">preserve</xsl:attribute>
-  <xsl:attribute name="linefeed-treatment">preserve</xsl:attribute>
-  <xsl:attribute name="text-align">start</xsl:attribute>
-</xsl:attribute-set>
-<xsl:param name="xep.extensions" select="0"/>
-<xsl:attribute-set name="xep.index.item.properties" use-attribute-sets="index.page.number.properties">
-  <xsl:attribute name="merge-subsequent-page-numbers">true</xsl:attribute>
-  <xsl:attribute name="link-back">true</xsl:attribute>
-</xsl:attribute-set>
-<xsl:param name="xref.label-page.separator"><xsl:text> </xsl:text></xsl:param>
-<xsl:param name="xref.label-title.separator">: </xsl:param>
-<xsl:attribute-set name="xref.properties">
-</xsl:attribute-set>
-<xsl:param name="xref.title-page.separator"><xsl:text> </xsl:text></xsl:param>
-<xsl:param name="xref.with.number.and.title" select="1"/>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/passivetex.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/passivetex.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,36 +1,0 @@
-<?xml version='1.0' encoding="utf-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-      This extension stops PassiveTeX from merging subsequent '-' to 
-      dashes. You must set passivetex.extensions to '1' if you want get
-      this functionality.
-     ******************************************************************** -->
-
-<xsl:template name="passivetex.dash.subst">
-  <xsl:param name="string"/>
-
-  <xsl:choose>
-    <xsl:when test="contains($string, '--')">
-      <xsl:variable name="rest">
-        <xsl:call-template name="passivetex.dash.subst">
-          <xsl:with-param name="string"
-                          select="concat('-', substring-after($string, '--'))"/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:value-of select="concat(substring-before($string, '--'),
-                                   '-&#x200b;',
-                                   $rest)"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$string"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-</xsl:stylesheet>
-
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/pdf2index
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/pdf2index	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,140 +1,0 @@
-#!/usr/bin/perl -- # -*- Perl -*-
-
-# this needs some cleanup...
-
-my $PSTOTEXT = "pstotext";
-
-my $pdf = shift @ARGV;
-
-my $index = "";
-my $inindex = 0;
-open (F, "$PSTOTEXT $pdf |");
-while (<F>) {
-    if (/^<\/index/) {
-	$index .= $_;
-	$inindex = 0;
-    }
-    $inindex = 1 if /^<index/;
-
-    if ($inindex) {
-	$index .= $_ if /^\s*</;
-    }
-}
-
-my $cindex = "";
-while ($index =~ /^(.*?)((<phrase role=\"pageno\">.*?<\/phrase>\s*)+)/s) {
-    $cindex .= $1;
-    $_ = $2;
-    $index = $'; # '
-
-    my @pages = m/<phrase role=\"pageno\">.*?<\/phrase>\s*/sg;
-
-    # Expand ranges
-    if ($#pages >= 0) {
-	my @mpages = ();
-	foreach my $page (@pages) {
-	    my $pageno = &pageno($page);
-	    if ($pageno =~ /^([0-9]+)[^0-9]([0-9]+)$/) { # funky -
-		for (my $count = $1; $count <= $2; $count++) {
-		    push (@mpages, "<phrase role=\"$pageno\">$count</phrase>");
-		}
-	    } else {
-		push (@mpages, $page);
-	    }
-	}
-	@pages = sort rangesort @mpages;
-    }
-
-    # Remove duplicates...
-    if ($#pages > 0) {
-	my @mpages = ();
-	my $current = "";
-	foreach my $page (@pages) {
-	    my $pageno = &pageno($page);
-	    if ($pageno ne $current) {
-		push (@mpages, $page);
-		$current = $pageno;
-	    }
-	}
-	@pages = @mpages;
-    }
-
-    # Collapse ranges...
-    if ($#pages > 1) {
-	my @cpages = ();
-	while (@pages) {
-	    my $count = 0;
-	    my $len = &rangelen($count, @pages);
-	    if ($len <= 2) {
-		my $page = shift @pages;
-		push (@cpages, $page);
-	    } else {
-		my $fpage = shift @pages;
-		my $lpage = "";
-		while ($len > 1) {
-		    $lpage = shift @pages;
-		    $len--;
-		}
-		my $fpno = &pageno($fpage);
-		my $lpno = &pageno($lpage);
-		$fpage =~ s/>$fpno</>${fpno}-$lpno</s;
-		push (@cpages, $fpage);
-	    }
-	}
-	@pages = @cpages;
-    }
-
-    my $page = shift @pages;
-    $page =~ s/\s*$//s;
-    $cindex .= $page;
-    while (@pages) {
-	$page = shift @pages;
-	$page =~ s/\s*$//s;
-	$cindex .= ", $page";
-    }
-}
-$cindex .= $index;
-
-print "$cindex\n";
-
-sub pageno {
-    my $page = shift;
-
-    $page =~ s/^<phrase.*?>//;
-    $page =~ s/^<link.*?>//;
-
-    return $1 if $page =~ /^([^<>]+)/;
-    return "?";
-}
-
-sub rangesort {
-    my $apno = &pageno($a);
-    my $bpno = &pageno($b);
-
-    # Make sure roman pages come before arabic ones, otherwise sort them in order
-    return -1 if ($apno !~ /^\d+/ && $bpno =~ /^\d+/);
-    return  1 if ($apno =~ /^\d+/ && $bpno !~ /^\d+/);
-    return $apno <=> $bpno;
-}
-
-sub rangelen {
-    my $count = shift;
-    my @pages = @_;
-    my $len = 1;
-    my $inrange = 1;
-
-    my $current = &pageno($pages[$count]);
-    while ($count < $#pages && $inrange) {
-	$count++;
-	my $next = &pageno($pages[$count]);
-	if ($current + 1 eq $next) {
-	    $current = $next;
-	    $inrange = 1;
-	    $len++;
-	} else {
-	    $inrange = 0;
-	}
-    }
-
-    return $len;
-}
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/pi.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/pi.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,1008 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"
-  xmlns:fo="http://www.w3.org/1999/XSL/Format"
-  xmlns:xlink="http://www.w3.org/1999/xlink"
-  exclude-result-prefixes="doc"
-  version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<doc:reference xmlns=""><info><title>FO Processing Instruction Reference</title>
-    <releaseinfo role="meta">
-      $Id$
-    </releaseinfo>
-  </info>
-
-  <partintro id="partintro">
-    <title>Introduction</title>
-
-    <para>This is generated reference documentation for all
-      user-specifiable processing instructions (PIs) in the DocBook
-      XSL stylesheets for FO output.
-      <note>
-        <para>You add these PIs at particular points in a document to
-          cause specific âexceptionsâ to formatting/output behavior. To
-          make global changes in formatting/output behavior across an
-          entire document, itâs better to do it by setting an
-          appropriate stylesheet parameter (if there is one).</para>
-      </note>
-    </para>
-  </partintro>
-</doc:reference>
-
-<!-- ==================================================================== -->
-
-<doc:pi name="dbfo_background-color" xmlns="">
-  <refpurpose>Sets background color for an image</refpurpose>
-  <refdescription>
-    <para>Use the <tag class="xmlpi">dbfo background-color</tag> PI before or
-      after an image (<tag>graphic</tag>, <tag>inlinegraphic</tag>,
-      <tag>imagedata</tag>, or <tag>videodata</tag> element) as a
-      sibling to the element, to set a background color for the
-      image.</para>
-  </refdescription>
-  <refsynopsisdiv>
-    <synopsis><tag class="xmlpi">dbfo background-color="<replaceable>color</replaceable>"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter>
-    <variablelist>
-      <varlistentry><term>background-color="<replaceable>color</replaceable>"</term>
-        <listitem>
-          <para>An HTML color value</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee role="tcg">
-    <para><link role="tcg"
-        xlink:href="BGcolor.html"
-        >Background color</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbfo_background-color">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbfo-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbfo')"/>
-    <xsl:with-param name="attribute" select="'background-color'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi name="dbfo_bgcolor" xmlns="">
-  <refpurpose>Sets background color on a table row or table cell</refpurpose>
-  <refdescription>
-    <para>Use the <tag class="xmlpi">dbfo bgcolor</tag> PI as child of a table row
-      or cell to set a background color for that table row or cell.</para>
-  </refdescription>
-  <refsynopsisdiv>
-    <synopsis><tag class="xmlpi">dbfo bgcolor="<replaceable>color</replaceable>"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter>
-    <variablelist>
-      <varlistentry><term>bgcolor="<replaceable>color</replaceable>"</term>
-        <listitem>
-          <para>An HTML color value</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee role="tcg">
-    <para><link role="tcg"
-        xlink:href="BGtableColor.html#CellBGColor"
-        >Cell background color</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbfo_bgcolor">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbfo-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbfo')"/>
-    <xsl:with-param name="attribute" select="'bgcolor'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi name="dbfo_float-type" xmlns="">
-  <refpurpose>Specifies float behavior for a sidebar</refpurpose>
-  <refdescription>
-    <para>Use the <tag class="xmlpi">dbfo float-type</tag> PI to specify the float
-      behavior for a <tag>sidebar</tag> (to cause the sidebar to be
-      displayed as a marginal note).</para>
-  </refdescription>
-  <refsynopsisdiv>
-    <synopsis><tag class="xmlpi">dbfo float-type="margin.note"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter>
-    <variablelist>
-      <varlistentry><term>float-type="margin.note"</term>
-        <listitem>
-          <para>Specifies that the <tag>sidebar</tag> should be
-            displayed as a marginal note.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee role="params">
-    <para><parameter>sidebar.float.type parameter</parameter>,
-      <parameter>sidebar.float.width parameter</parameter>, 
-      <parameter>sidebar.properties attribute-set</parameter>,
-      <parameter>sidebar.title.properties</parameter>
-    </para>
-  </refsee>
-  <refsee role="tcg">
-    <para><link xlink:href="SideFloats.html#SidebarFloats" >A sidebar as
-        side float</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbfo_float-type">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbfo-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbfo')"/>
-    <xsl:with-param name="attribute" select="'float-type'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi name="dbfo_glossary-presentation" xmlns="">
-  <refpurpose>Specifies presentation style for a glossary</refpurpose>
-  <refdescription>
-    <para>Use the <tag class="xmlpi">dbfo glossary-presentation</tag> PI as a child of
-      a <tag>glossary</tag> to control its presentation style.</para>
-  </refdescription>
-  <refsynopsisdiv>
-    <synopsis><tag class="xmlpi">dbfo glossary-presentation="list"|"blocks"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter>
-    <variablelist>
-      <varlistentry><term>glossary-presentation="list"</term>
-        <listitem>
-          <para>Displays the glossary as a list</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry><term>glossary-presentation="blocks"</term>
-        <listitem>
-          <para>Displays the glossary as blocks</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee role="params">
-    <para><parameter>glossary.as.blocks</parameter></para>
-  </refsee>
-  <refsee role="tcg">
-    <para><link xlink:href="Glossaries.html#GlossaryFormatPrint" >Glossary
-        formatting in print</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbfo_glossary-presentation">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbfo-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbfo')"/>
-    <xsl:with-param name="attribute" select="'glossary-presentation'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi name="dbfo_glosslist-presentation" xmlns="">
-  <refpurpose>Specifies presentation style for a glosslist</refpurpose>
-  <refdescription>
-    <para>Use the <tag class="xmlpi">dbfo glosslist-presentation</tag> PI as a child of
-      a <tag>glosslist</tag> to control its presentation style.</para>
-  </refdescription>
-  <refsynopsisdiv>
-    <synopsis><tag class="xmlpi">dbfo glosslist-presentation="list"|"blocks"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter>
-    <variablelist>
-      <varlistentry><term>glosslist-presentation="list"</term>
-        <listitem>
-          <para>Displays the glosslist as a list</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry><term>glosslist-presentation="blocks"</term>
-        <listitem>
-          <para>Displays the glosslist as blocks</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee role="params">
-    <para><parameter>glosslist.as.blocks</parameter> </para>
-  </refsee>
-  <refsee role="tcg">
-    <para><link xlink:href="Glossaries.html#GlossaryFormatPrint" >Glossary
-        formatting in print</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbfo_glosslist-presentation">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbfo-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbfo')"/>
-    <xsl:with-param name="attribute" select="'glosslist-presentation'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi name="dbfo_glossterm-width" xmlns="">
-  <refpurpose>Specifies the glossterm width for a glossary or
-    glosslist</refpurpose>
-  <refdescription>
-    <para>Use the <tag class="xmlpi">dbfo glossterm-width</tag> PI as a child of a
-      <tag>glossary</tag> or <tag>glosslist</tag> to specify the
-      width for output of <tag>glossterm</tag> instances in the
-      output.</para>
-  </refdescription>
-  <refsynopsisdiv>
-    <synopsis><tag class="xmlpi">dbfo glossterm-width="<replaceable>width</replaceable>"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter>
-    <variablelist>
-      <varlistentry><term>glossterm-width="<replaceable>width</replaceable>"</term>
-        <listitem>
-          <para>Specifies the glossterm width (including units)</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee role="params">
-    <para><parameter>glossterm.width</parameter>,
-      <parameter>glossterm.separation</parameter>
-    </para>
-  </refsee>
-  <refsee role="tcg">
-    <para><link xlink:href="Glossaries.html#GlossaryFormatPrint" >Glossary
-        formatting in print</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbfo_glossterm-width">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbfo-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbfo')"/>
-    <xsl:with-param name="attribute" select="'glossterm-width'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi name="dbfo_keep-together" xmlns="">
-  <refpurpose>Specifies âkeepâ behavior for a table, example,
-    figure, or equation</refpurpose>
-  <refdescription>
-    <para>Use the <tag class="xmlpi">dbfo keep-together</tag> PI as a child of a
-      formal object (<tag>table</tag>, <tag>example</tag>,
-      <tag>figure</tag>, or <tag>equation</tag>) or their informal
-      equivalents) to specify âkeepâ behavior for the object (to
-      allow the object to âbreakâ across a page).</para>
-  </refdescription>
-  <refsynopsisdiv>
-    <synopsis><tag class="xmlpi">dbfo keep-together="auto"|"always"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter>
-    <variablelist>
-      <varlistentry><term>keep-together="auto"</term>
-        <listitem>
-          <para>Enables the object to break across a page</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry><term>keep-together="always"</term>
-        <listitem>
-          <para>Prevents the object from breaking across a page (the
-            default stylesheet behavior)</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee role="params">
-    <para>formal.object.properties</para>
-  </refsee>
-  <refsee role="tcg">
-    <para><link xlink:href="PageBreaking.html#KeepTogetherPI"
-        >Keep-together processing instruction</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbfo_keep-together">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbfo-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbfo')"/>
-    <xsl:with-param name="attribute" select="'keep-together'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi name="dbfo_label-width" xmlns="">
-  <refpurpose>Specifies the label width for a qandaset</refpurpose>
-  <refdescription>
-    <para>Use the <tag class="xmlpi">dbfo label-width</tag> PI as a child of a
-      <tag>qandaset</tag> to specify the width of labels.</para>
-  </refdescription>
-  <refsynopsisdiv>
-    <synopsis><tag class="xmlpi">dbfo label-width="<replaceable>width</replaceable>"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter>
-    <variablelist>
-      <varlistentry><term>label-width="<replaceable>width</replaceable>"</term>
-        <listitem>
-          <para>Specifies the label width (including units)</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee role="tcg">
-    <para><link role="tcg"
-        xlink:href="QandAformat.html"
-        >Q and A formatting</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbfo_label-width">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbfo-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbfo')"/>
-    <xsl:with-param name="attribute" select="'label-width'"/>
-  </xsl:call-template>
-</xsl:template> 
-
-<doc:pi name="dbfo_linenumbering.everyNth" xmlns="">
-  <refpurpose>Specifies interval for lines numbers in verbatims</refpurpose>
-  <refdescription>
-    <para>Use the <tag class="xmlpi">dbfo linenumbering.everyNth</tag> PI as a child
-      of a âverbatimâ element â <tag>programlisting</tag>,
-      <tag>screen</tag>, <tag>synopsis</tag> â to specify
-      the interval at which lines are numbered.</para>
-  </refdescription>
-  <refsynopsisdiv>
-    <synopsis><tag class="xmlpi">dbfo linenumbering.everyNth="<replaceable>N</replaceable>"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter>
-    <variablelist>
-      <varlistentry><term>linenumbering.everyNth="<replaceable>N</replaceable>"</term>
-        <listitem>
-          <para>Specifies numbering interval; a number is output
-            before every <replaceable>N</replaceable>th line</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee role="params">
-    <para><parameter>linenumbering.everyNth</parameter></para>
-  </refsee>
-  <refsee role="tcg">
-    <para><link role="tcg"
-        xlink:href="AnnotateListing.html#LineNumbering"
-        >Line numbering</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbfo_linenumbering.everyNth">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbfo-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbfo')"/>
-    <xsl:with-param name="attribute" select="'linenumbering.everyNth'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi name="dbfo_linenumbering.separator" xmlns="">
-  <refpurpose>Specifies separator text for line numbers in verbatims</refpurpose>
-  <refdescription>
-    <para>Use the <tag class="xmlpi">dbfo linenumbering.separator</tag> PI as a child
-      of a âverbatimâ element â <tag>programlisting</tag>,
-      <tag>screen</tag>, <tag>synopsis</tag> â to specify
-      the separator text output between the line numbers and content.</para>
-  </refdescription>
-  <refsynopsisdiv>
-    <synopsis><tag class="xmlpi">dbfo linenumbering.separator="<replaceable>text</replaceable>"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter>
-    <variablelist>
-      <varlistentry><term>linenumbering.separator="<replaceable>text</replaceable>"</term>
-        <listitem>
-          <para>Specifies the text (zero or more characters)</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee role="params">
-    <para><parameter>linenumbering.separator</parameter></para>
-  </refsee>
-  <refsee role="tcg">
-    <para><link role="tcg"
-        xlink:href="AnnotateListing.html#LineNumbering"
-        >Line numbering</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbfo_linenumbering.separator">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbfo-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbfo')"/>
-    <xsl:with-param name="attribute" select="'linenumbering.separator'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi name="dbfo_linenumbering.width" xmlns="">
-  <refpurpose>Specifies width for line numbers in verbatims</refpurpose>
-  <refdescription>
-    <para>Use the <tag class="xmlpi">dbfo linenumbering.width</tag> PI as a child
-      of a âverbatimâ element â <tag>programlisting</tag>,
-      <tag>screen</tag>, <tag>synopsis</tag> â to specify
-      the width set aside for line numbers.</para>
-  </refdescription>
-  <refsynopsisdiv>
-    <synopsis><tag class="xmlpi">dbfo linenumbering.width="<replaceable>width</replaceable>"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter>
-    <variablelist>
-      <varlistentry><term>linenumbering.width="<replaceable>width</replaceable>"</term>
-        <listitem>
-          <para>Specifies the width (inluding units)</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee role="params">
-    <para><parameter>linenumbering.width</parameter></para>
-  </refsee>
-  <refsee role="tcg">
-    <para><link role="tcg"
-        xlink:href="AnnotateListing.html#LineNumbering"
-        >Line numbering</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbfo_linenumbering.width">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbfo-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbfo')"/>
-    <xsl:with-param name="attribute" select="'linenumbering.width'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi name="dbfo_list-presentation" xmlns="">
-  <refpurpose>Specifies presentation style for a variablelist or
-    segmentedlist</refpurpose>
-  <refdescription>
-    <para>Use the <tag class="xmlpi">dbfo list-presentation</tag> PI as a child of
-      a <tag>variablelist</tag> or <tag>segmentedlist</tag> to
-      control the presentation style for the list (to cause it, for
-      example, to be displayed as a table).</para>
-  </refdescription>
-  <refsynopsisdiv>
-    <synopsis><tag class="xmlpi">dbfo list-presentation="list"|"blocks"|"table"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter>
-    <variablelist>
-      <varlistentry><term>list-presentation="list"</term>
-        <listitem>
-          <para>Displays the list as a list</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry><term>list-presentation="blocks"</term>
-        <listitem>
-          <para>(<tag>variablelist</tag> only) Displays the list as blocks</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry><term>list-presentation="table"</term>
-        <listitem>
-          <para>(<tag>segmentedlist</tag> only) Displays the list as a table</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee role="params">
-    <itemizedlist>
-      <listitem>
-        <para><parameter>variablelist.as.blocks</parameter></para>
-      </listitem>
-      <listitem>
-        <para><parameter>variablelist.as.table</parameter></para>
-      </listitem>
-    </itemizedlist>
-  </refsee>
-  <refsee role="tcg">
-    <para><link role="tcg"
-        xlink:href="Variablelists.html#ListIndents"
-        >Variable list formatting in print</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbfo_list-presentation">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbfo-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbfo')"/>
-    <xsl:with-param name="attribute" select="'list-presentation'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi name="dbfo_list-width" xmlns="">
-  <refpurpose>Specifies the width of a horizontal simplelist</refpurpose>
-  <refdescription>
-    <para>Use the <tag class="xmlpi">dbfo list-width</tag> PI as a child of a
-      <tag>simplelist</tag> whose <tag class="attribute">class</tag>
-      value is <literal>horizontal</literal>, to specify the width
-      of the <tag>simplelist</tag>.</para>
-  </refdescription>
-  <refsynopsisdiv>
-    <synopsis><tag class="xmlpi">dbfo list-width="<replaceable>width</replaceable>"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter>
-    <variablelist>
-      <varlistentry><term>list-width="<replaceable>width</replaceable>"</term>
-        <listitem>
-          <para>Specifies the <tag>simplelist</tag> width (including units)</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-</doc:pi>
-<xsl:template name="pi.dbfo_list-width">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbfo-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbfo')"/>
-    <xsl:with-param name="attribute" select="'list-width'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi name="dbfo_orientation" xmlns="">
-  <refpurpose>Specifies the orientation for table row or cell</refpurpose>
-  <refdescription>
-    <para>Use the <tag class="xmlpi">dbfo orientation</tag> PI as a child of an
-      <tag>table</tag> row or cell to specify the orientation
-      (rotation) for the row or cell.</para>
-  </refdescription>
-  <refsynopsisdiv>
-    <synopsis><tag class="xmlpi">dbfo orientation="0"|"90"|"180"|"270"|"-90"|"-180"|"-270"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter>
-    <variablelist>
-      <varlistentry><term>orientation="0"|"90"|"180"|"270"|"-90"|"-180"|"-270"</term>
-        <listitem>
-          <para>Specifies the number of degrees by which the cell or
-            row is rotated</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-</doc:pi>
-<xsl:template name="pi.dbfo_orientation">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbfo-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbfo')"/>
-    <xsl:with-param name="attribute" select="'orientation'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi name="dbfo_pgwide" xmlns="">
-  <refpurpose>Specifies if an <tag>equation</tag> or <tag>example</tag> goes across full page width</refpurpose>
-  <refdescription>
-    <para>Use the <tag class="xmlpi">dbfo pgwide</tag> PI as a child of an
-      <tag>equation</tag> or <tag>example</tag> to specify that the
-      content should rendered across the full width of the page.</para>
-  </refdescription>
-  <refsynopsisdiv>
-    <synopsis><tag class="xmlpi">dbfo pgwide="0"|"1"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter>
-    <variablelist>
-      <varlistentry><term>pgwide="0"</term>
-        <listitem>
-          <para>If zero, the content is rendered across the current
-            text flow</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry><term>pgwide="1"</term>
-        <listitem>
-          <para>If <code>1</code> (or any non-zero value), the
-            content is rendered across the full width of the page</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee role="params">
-    <para><parameter>pgwide.properties</parameter></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbfo_pgwide">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbfo-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbfo')"/>
-    <xsl:with-param name="attribute" select="'pgwide'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi name="dbfo_rotated-width" xmlns="">
-  <refpurpose>Specifies the width for a table <tag>entry</tag> or
-    <tag>row</tag></refpurpose>
-  <refdescription>
-    <para>Use the <tag class="xmlpi">dbfo rotated-width</tag> PI as a child of an
-      <tag>entry</tag> or <tag>row</tag> instance to specify the
-      width of that the <tag>entry</tag> or <tag>row</tag>; or
-      use it higher up in table to cause the width to be inherited
-      recursively down.</para>
-  </refdescription>
-  <refsynopsisdiv>
-    <synopsis><tag class="xmlpi">dbfo rotated-width="<replaceable>width</replaceable>"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter>
-    <variablelist>
-      <varlistentry><term>rotated-width="<replaceable>width</replaceable>"</term>
-        <listitem>
-          <para>Specifies the width of a row or cell (including units)</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-</doc:pi>
-<xsl:template name="pi.dbfo_rotated-width">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbfo-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbfo')"/>
-    <xsl:with-param name="attribute" select="'rotated-width'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi name="dbfo_sidebar-width" xmlns="">
-  <refpurpose>Specifies the width of a sidebar</refpurpose>
-  <refdescription>
-    <para>Use the <tag class="xmlpi">dbfo sidebar-width</tag> PI as a child of a
-      <tag>sidebar</tag> to specify the width of the sidebar.</para>
-  </refdescription>
-  <refsynopsisdiv>
-    <synopsis><tag class="xmlpi">dbfo sidebar-width="<replaceable>width</replaceable>"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter>
-    <variablelist>
-      <varlistentry><term>sidebar-width="<replaceable>width</replaceable>"</term>
-        <listitem>
-          <para>Specifies the <tag>sidebar</tag> width (including units)</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee role="params">
-    <para><parameter>sidebar.float.type parameter</parameter>,
-      <parameter>sidebar.float.width parameter</parameter>, 
-      <parameter>sidebar.properties attribute-set</parameter>,
-      <parameter>sidebar.title.properties</parameter>
-    </para>
-  </refsee>
-  <refsee role="tcg">
-    <para><link xlink:href="SideFloats.html#SidebarFloats" >A sidebar as
-        side float</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbfo_sidebar-width">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbfo-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbfo')"/>
-    <xsl:with-param name="attribute" select="'sidebar-width'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi name="dbfo_start" xmlns="">
-  <refpurpose>(obsolete) Sets the starting number on an ordered list</refpurpose>
-  <refdescription>
-    <para><emphasis>This PI is obsolete</emphasis>. The intent of
-      it was to provide a means for setting a specific starting
-      number for an ordered list. Instead of this PI, set a value
-      for the <literal>override</literal> attribute on the first
-      <tag>listitem</tag> in the list; that will have the same
-      effect as what this PI was intended for.</para>
-  </refdescription>
-  <refsynopsisdiv>
-    <synopsis><tag class="xmlpi">dbfo start="<replaceable>character</replaceable>"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter>
-    <variablelist>
-      <varlistentry><term>start="<replaceable>character</replaceable>"</term>
-        <listitem>
-          <para>Specifies the character to use as the starting
-            number; use 0-9, a-z, A-Z, or lowercase or uppercase
-            Roman numerals</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee role="tcg">
-    <para><link role="tcg"
-        xlink:href="Orderedlists.html#ListStartNum"
-        >List starting number</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbfo_start">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="pi-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbfo')"/>
-    <xsl:with-param name="attribute" select="'start'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi name="dbfo_table-width" xmlns="">
-  <refpurpose>Specifies the width for a table or for revhistory
-    output</refpurpose>
-  <refdescription>
-    <para>Use the <tag class="xmlpi">dbfo table-width</tag> PI as a child or
-      sibling of a <tag>table</tag>, or as a child of an
-      <tag>informaltable</tag>, <tag>entrybl</tag>, or
-      <tag>revhistory</tag> instance (which is rendered as a table
-      in output) to specify the width of the table in output.</para>
-  </refdescription>
-  <refsynopsisdiv>
-    <synopsis><tag class="xmlpi">dbfo table-width="<replaceable>width</replaceable>"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter>
-    <variablelist>
-      <varlistentry><term>table-width="<replaceable>width</replaceable>"</term>
-        <listitem>
-          <para>Specifies the table width (including units or as a percentage)</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee role="tcg">
-    <para><link role="tcg"
-        xlink:href="Tables.html#TableWidth"
-        >Table width</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbfo_table-width">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbfo-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbfo')"/>
-    <xsl:with-param name="attribute" select="'table-width'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi name="dbfo_term-width" xmlns="">
-  <refpurpose>Specifies the term width for a variablelist</refpurpose>
-  <refdescription>
-    <para>Use the <tag class="xmlpi">dbfo term-width</tag> PI as a child of a
-      <tag>variablelist</tag> to specify the width for
-      <tag>term</tag> output.</para>
-  </refdescription>
-  <refsynopsisdiv>
-    <synopsis><tag class="xmlpi">dbfo term-width="<replaceable>width</replaceable>"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter>
-    <variablelist>
-      <varlistentry><term>term-width="<replaceable>width</replaceable>"</term>
-        <listitem>
-          <para>Specifies the term width (including units)</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee role="tcg">
-    <para><link role="tcg"
-        xlink:href="Variablelists.html#ListIndents"
-        >Variable list formatting in print</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbfo_term-width">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbfo-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbfo')"/>
-    <xsl:with-param name="attribute" select="'term-width'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi name="dbfo_toc" xmlns="">
-  <refpurpose>Specifies whether a TOC should be generated for a qandaset</refpurpose>
-  <refdescription>
-    <para>Use the <tag class="xmlpi">dbfo toc</tag> PI as a child of a
-      <tag>qandaset</tag> to specify whether a table of contents
-      (TOC) is generated for the <tag>qandaset</tag>.</para>
-  </refdescription>
-  <refsynopsisdiv>
-    <synopsis><tag class="xmlpi">dbfo toc="0"|"1"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter>
-    <variablelist>
-      <varlistentry><term>toc="0"</term>
-        <listitem>
-          <para>If zero, no TOC is generated</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry><term>toc="1"</term>
-        <listitem>
-          <para>If <code>1</code> (or any non-zero value),
-            a TOC is generated</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee role="tcg">
-    <para><link role="tcg"
-        xlink:href="QandAtoc.html"
-        >Q and A list of questions</link>,
-      <link role="tcg"
-        xlink:href="QandAformat.html"
-        >Q and A formatting</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbfo_toc">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbfo-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbfo')"/>
-    <xsl:with-param name="attribute" select="'toc'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi name="dbfo-need" xmlns="">
-  <refpurpose>Specify a need for space (a kind of soft page break)</refpurpose>
-  <refdescription>
-    <para>A âneedâ is a request for space on a page.  If the
-      requested space is not available, the page breaks and the
-      content that follows the need request appears on the next
-      page. If the requested space is available, then no page break
-      is inserted.</para>
-  </refdescription>
-  <refsynopsisdiv>
-    <synopsis><tag class="xmlpi">dbfo-need height="<replaceable>n</replaceable>" [space-before="<replaceable>n</replaceable>"]</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter>
-    <variablelist>
-      <varlistentry><term>height="<replaceable>n</replaceable>"</term>
-        <listitem>
-          <para>The amount of height needed (including units)</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry><term>space-before="<replaceable>n</replaceable>"</term>
-        <listitem>
-          <para>The amount of extra vertical space to add (including units)</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee role="tcg">
-    <para><link role="tcg"
-        xlink:href="PageBreaking.html#SoftPageBreaks"
-        >Soft page breaks</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbfo-need">
-  <xsl:variable name="pi-height">
-    <xsl:call-template name="dbfo-attribute">
-      <xsl:with-param name="pis" select="."/>
-      <xsl:with-param name="attribute" select="'height'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="height">
-    <xsl:choose>
-      <xsl:when test="$pi-height != ''">
-        <xsl:value-of select="$pi-height"/>
-      </xsl:when>
-      <xsl:otherwise>0pt</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="pi-before">
-    <xsl:call-template name="dbfo-attribute">
-      <xsl:with-param name="pis" select="."/>
-      <xsl:with-param name="attribute" select="'space-before'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="spacer">
-    <fo:block-container width="100%" height="{$height}">
-      <fo:block><fo:leader leader-length="0pt"/></fo:block>
-    </fo:block-container>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$fop.extensions != 0">
-      <!-- Doesn't work in fop -->
-    </xsl:when>
-    <xsl:when test="$pi-before != '' and
-      not(following-sibling::listitem) and
-      not(following-sibling::step)">
-      <fo:block space-after="0pt" space-before="{$pi-before}">
-        <xsl:copy-of select="$spacer"/>
-      </fo:block>
-    </xsl:when>
-    <xsl:when test="following-sibling::para">
-      <fo:block space-after="0pt" 
-        xsl:use-attribute-sets="normal.para.spacing">
-        <xsl:copy-of select="$spacer"/>
-      </fo:block>
-    </xsl:when>
-    <xsl:when test="following-sibling::table or
-      following-sibling::figure or
-      following-sibling::example or
-      following-sibling::equation">
-      <fo:block space-after="0pt" 
-        xsl:use-attribute-sets="formal.object.properties">
-        <xsl:copy-of select="$spacer"/>
-      </fo:block>
-    </xsl:when>
-    <xsl:when test="following-sibling::informaltable or
-      following-sibling::informalfigure or
-      following-sibling::informalexample or
-      following-sibling::informalequation">
-      <fo:block space-after="0pt" 
-        xsl:use-attribute-sets="informal.object.properties">
-        <xsl:copy-of select="$spacer"/>
-      </fo:block>
-    </xsl:when>
-    <xsl:when test="following-sibling::itemizedlist or
-      following-sibling::orderedlist or
-      following-sibling::variablelist or
-      following-sibling::simplelist">
-      <fo:block space-after="0pt" 
-        xsl:use-attribute-sets="informal.object.properties">
-        <xsl:copy-of select="$spacer"/>
-      </fo:block>
-    </xsl:when>
-    <xsl:when test="following-sibling::listitem or
-      following-sibling::step">
-      <fo:list-item space-after="0pt" 
-        xsl:use-attribute-sets="informal.object.properties">
-        <fo:list-item-label/>
-        <fo:list-item-body start-indent="0pt" end-indent="0pt">
-          <xsl:copy-of select="$spacer"/>
-        </fo:list-item-body>
-      </fo:list-item>
-    </xsl:when>
-    <xsl:when test="following-sibling::sect1 or
-      following-sibling::sect2 or
-      following-sibling::sect3 or
-      following-sibling::sect4 or
-      following-sibling::sect5 or
-      following-sibling::section">
-      <fo:block space-after="0pt" 
-        xsl:use-attribute-sets="section.title.properties">
-        <xsl:copy-of select="$spacer"/>
-      </fo:block>
-    </xsl:when>
-    <xsl:otherwise>
-      <fo:block space-after="0pt" space-before="0em">
-        <xsl:copy-of select="$spacer"/>
-      </fo:block>
-    </xsl:otherwise>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="$fop.extensions != 0">
-      <!-- Doesn't work in fop -->
-    </xsl:when>
-    <xsl:when test="following-sibling::listitem or
-      following-sibling::step">
-      <fo:list-item space-before.precedence="force"
-        space-before="-{$height}"
-        space-after="0pt"
-        space-after.precedence="force">
-        <fo:list-item-label/>
-        <fo:list-item-body start-indent="0pt" end-indent="0pt"/>
-      </fo:list-item>
-    </xsl:when>
-    <xsl:otherwise>
-      <fo:block space-before.precedence="force"
-        space-before="-{$height}"
-        space-after="0pt"
-        space-after.precedence="force">
-      </fo:block>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="dbfo-attribute">
-  <!-- * dbfo-attribute is an interal utility template for retrieving -->
-  <!-- * pseudo-attributes/parameters from PIs -->
-  <xsl:param name="pis" select="processing-instruction('dbfo')"/>
-  <xsl:param name="attribute">filename</xsl:param>
-  <xsl:call-template name="pi-attribute">
-    <xsl:with-param name="pis" select="$pis"/>
-    <xsl:with-param name="attribute" select="$attribute"/>
-  </xsl:call-template>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="processing-instruction()">
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="processing-instruction('dbfo-need')">
-  <xsl:call-template name="pi.dbfo-need"/>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/profile-docbook.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/profile-docbook.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,284 +1,0 @@
-<?xml version="1.0" encoding="US-ASCII"?>
-<!--This file was created automatically by xsl2profile-->
-<!--from the DocBook XSL stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exsl="http://exslt.org/common" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:ng="http://docbook.org/docbook-ng" xmlns:db="http://docbook.org/ns/docbook" xmlns:exslt="http://exslt.org/common" exslt:dummy="dummy" ng:dummy="dummy" db:dummy="dummy" extension-element-prefixes="exslt" exclude-result-prefixes="db ng exsl exslt" version="1.0">
-
-<!-- It is important to use indent="no" here, otherwise verbatim -->
-<!-- environments get broken by indented tags...at least when the -->
-<!-- callout extension is used...at least with some processors -->
-<xsl:output method="xml" indent="no"/>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:include href="../VERSION"/>
-<xsl:include href="param.xsl"/>
-<xsl:include href="../lib/lib.xsl"/>
-<xsl:include href="../common/l10n.xsl"/>
-<xsl:include href="../common/common.xsl"/>
-<xsl:include href="../common/utility.xsl"/>
-<xsl:include href="../common/labels.xsl"/>
-<xsl:include href="../common/titles.xsl"/>
-<xsl:include href="../common/subtitles.xsl"/>
-<xsl:include href="../common/gentext.xsl"/>
-<xsl:include href="../common/olink.xsl"/>
-<xsl:include href="../common/targets.xsl"/>
-<xsl:include href="../common/pi.xsl"/>
-<xsl:include href="autotoc.xsl"/>
-<xsl:include href="autoidx.xsl"/>
-<xsl:include href="lists.xsl"/>
-<xsl:include href="callout.xsl"/>
-<xsl:include href="verbatim.xsl"/>
-<xsl:include href="graphics.xsl"/>
-<xsl:include href="xref.xsl"/>
-<xsl:include href="formal.xsl"/>
-<xsl:include href="table.xsl"/>
-<xsl:include href="htmltbl.xsl"/>
-<xsl:include href="sections.xsl"/>
-<xsl:include href="inline.xsl"/>
-<xsl:include href="footnote.xsl"/>
-<xsl:include href="fo.xsl"/>
-<xsl:include href="fo-rtf.xsl"/>
-<xsl:include href="info.xsl"/>
-<xsl:include href="keywords.xsl"/>
-<xsl:include href="division.xsl"/>
-<xsl:include href="index.xsl"/>
-<xsl:include href="toc.xsl"/>
-<xsl:include href="refentry.xsl"/>
-<xsl:include href="math.xsl"/>
-<xsl:include href="admon.xsl"/>
-<xsl:include href="component.xsl"/>
-<xsl:include href="biblio.xsl"/>
-<xsl:include href="biblio-iso690.xsl"/>
-<xsl:include href="glossary.xsl"/>
-<xsl:include href="block.xsl"/>
-<xsl:include href="task.xsl"/>
-<xsl:include href="qandaset.xsl"/>
-<xsl:include href="synop.xsl"/>
-<xsl:include href="titlepage.xsl"/>
-<xsl:include href="titlepage.templates.xsl"/>
-<xsl:include href="pagesetup.xsl"/>
-<xsl:include href="pi.xsl"/>
-<xsl:include href="spaces.xsl"/>
-<xsl:include href="ebnf.xsl"/>
-<xsl:include href="../html/chunker.xsl"/>
-<xsl:include href="annotations.xsl"/>
-<xsl:include href="../common/stripns.xsl"/>
-
-<xsl:include href="fop.xsl"/>
-<xsl:include href="fop1.xsl"/>
-<xsl:include href="passivetex.xsl"/>
-<xsl:include href="xep.xsl"/>
-<xsl:include href="axf.xsl"/>
-<xsl:include href="ptc.xsl"/>
-
-<xsl:param name="stylesheet.result.type" select="'fo'"/>
-
-<!-- ==================================================================== -->
-
-<xsl:key name="id" match="*" use="@id|@xml:id"/>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="*">
-  <xsl:message>
-    <xsl:value-of select="name(.)"/>
-    <xsl:text> encountered</xsl:text>
-    <xsl:if test="parent::*">
-      <xsl:text> in </xsl:text>
-      <xsl:value-of select="name(parent::*)"/>
-    </xsl:if>
-    <xsl:text>, but no template matches.</xsl:text>
-  </xsl:message>
-  <fo:block color="red">
-    <xsl:text>&lt;</xsl:text>
-    <xsl:value-of select="name(.)"/>
-    <xsl:text>&gt;</xsl:text>
-    <xsl:apply-templates/> 
-    <xsl:text>&lt;/</xsl:text>
-    <xsl:value-of select="name(.)"/>
-    <xsl:text>&gt;</xsl:text>
-  </fo:block>
-</xsl:template>
-
-<!-- Update this list if new root elements supported -->
-<xsl:variable name="root.elements" select="' appendix article bibliography book chapter colophon dedication glossary index part preface qandaset refentry reference sect1 section set setindex '"/>
-
-<xslo:include xmlns:xslo="http://www.w3.org/1999/XSL/Transform" href="../profiling/profile-mode.xsl"/><xslo:variable xmlns:xslo="http://www.w3.org/1999/XSL/Transform" name="profiled-content"><xslo:choose><xslo:when test="*/self::ng:* or */self::db:*"><xslo:message>Note: namesp. cut : stripped namespace before processing</xslo:message><xslo:variable name="stripped-content"><xslo:apply-templates select="/" mode="stripNS"/></xslo:variable><xslo:message>Note: namesp. cut : processing stripped document</xslo:message><xslo:apply-templates select="exslt:node-set($stripped-content)" mode="profile"/></xslo:when><xslo:otherwise><xslo:apply-templates select="/" mode="profile"/></xslo:otherwise></xslo:choose></xslo:variable><xslo:variable xmlns:xslo="http://www.w3.org/1999/XSL/Transform" name="profiled-nodes" select="exslt:node-set($profiled-content)"/><xsl:template match="/">
-  <!-- * Get a title for current doc so that we let the user -->
-  <!-- * know what document we are processing at this point. -->
-  <xsl:variable name="doc.title">
-    <xsl:call-template name="get.doc.title"/>
-  </xsl:variable>
-  <xsl:choose>
-    <!-- Hack! If someone hands us a DocBook V5.x or DocBook NG document,
-         toss the namespace and continue.  Use the docbook5 namespaced
-         stylesheets for DocBook5 if you don't want to use this feature.-->
-    <!-- include extra test for Xalan quirk -->
-    <xsl:when test="false()"/>
-    <!-- Can't process unless namespace removed -->
-    <xsl:when test="false()"/>
-    <xsl:otherwise>
-      <xsl:choose>
-        <xsl:when test="$rootid != ''">
-          <xsl:variable name="root.element" select="key('id', $rootid)"/>
-          <xsl:choose>
-            <xsl:when test="count($root.element) = 0">
-              <xsl:message terminate="yes">
-                <xsl:text>ID '</xsl:text>
-                <xsl:value-of select="$rootid"/>
-                <xsl:text>' not found in document.</xsl:text>
-              </xsl:message>
-            </xsl:when>
-            <xsl:when test="not(contains($root.elements, concat(' ', local-name($root.element), ' ')))">
-              <xsl:message terminate="yes">
-                <xsl:text>ERROR: Document root element ($rootid=</xsl:text>
-                <xsl:value-of select="$rootid"/>
-                <xsl:text>) for FO output </xsl:text>
-                <xsl:text>must be one of the following elements:</xsl:text>
-                <xsl:value-of select="$root.elements"/>
-              </xsl:message>
-            </xsl:when>
-            <!-- Otherwise proceed -->
-            <xsl:otherwise>
-              <xsl:if test="$collect.xref.targets = 'yes' or                             $collect.xref.targets = 'only'">
-                <xsl:apply-templates select="$root.element" mode="collect.targets"/>
-              </xsl:if>
-              <xsl:if test="$collect.xref.targets != 'only'">
-                <xsl:apply-templates select="$root.element" mode="process.root"/>
-              </xsl:if>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:when>
-        <!-- Otherwise process the document root element -->
-        <xsl:otherwise>
-          <xsl:variable name="document.element" select="*[1]"/>
-          <xsl:choose>
-            <xsl:when test="not(contains($root.elements,                      concat(' ', local-name($document.element), ' ')))">
-              <xsl:message terminate="yes">
-                <xsl:text>ERROR: Document root element for FO output </xsl:text>
-                <xsl:text>must be one of the following elements:</xsl:text>
-                <xsl:value-of select="$root.elements"/>
-              </xsl:message>
-            </xsl:when>
-            <!-- Otherwise proceed -->
-            <xsl:otherwise>
-              <xsl:if test="$collect.xref.targets = 'yes' or                             $collect.xref.targets = 'only'">
-                <xsl:apply-templates select="$profiled-nodes" mode="collect.targets"/>
-              </xsl:if>
-              <xsl:if test="$collect.xref.targets != 'only'">
-                <xsl:apply-templates select="$profiled-nodes" mode="process.root"/>
-              </xsl:if>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="*" mode="process.root">
-  <xsl:variable name="document.element" select="self::*"/>
-
-  <xsl:call-template name="root.messages"/>
-
-  <xsl:variable name="title">
-    <xsl:choose>
-      <xsl:when test="$document.element/title[1]">
-        <xsl:value-of select="$document.element/title[1]"/>
-      </xsl:when>
-      <xsl:otherwise>[could not find document title]</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-  
-  <!-- Include all id values in XEP output -->
-  <xsl:if test="$xep.extensions != 0">
-    <xsl:processing-instruction name="xep-pdf-drop-unused-destinations">false</xsl:processing-instruction>
-  </xsl:if>
-
-  <fo:root xsl:use-attribute-sets="root.properties">
-    <xsl:attribute name="language">
-      <xsl:call-template name="l10n.language">
-        <xsl:with-param name="target" select="/*[1]"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:if test="$xep.extensions != 0">
-      <xsl:call-template name="xep-pis"/>
-      <xsl:call-template name="xep-document-information"/>
-    </xsl:if>
-    <xsl:if test="$axf.extensions != 0">
-      <xsl:call-template name="axf-document-information"/>
-    </xsl:if>
-
-    <xsl:call-template name="setup.pagemasters"/>
-
-    <xsl:if test="$fop.extensions != 0">
-      <xsl:apply-templates select="$document.element" mode="fop.outline"/>
-    </xsl:if>
-
-    <xsl:if test="$fop1.extensions != 0">
-      <xsl:variable name="bookmarks">
-        <xsl:apply-templates select="$document.element" mode="fop1.outline"/>
-      </xsl:variable>
-      <xsl:if test="string($bookmarks) != ''">
-        <fo:bookmark-tree>
-          <xsl:copy-of select="$bookmarks"/>
-        </fo:bookmark-tree>
-      </xsl:if>
-    </xsl:if>
-
-    <xsl:if test="$xep.extensions != 0">
-      <xsl:variable name="bookmarks">
-        <xsl:apply-templates select="$document.element" mode="xep.outline"/>
-      </xsl:variable>
-      <xsl:if test="string($bookmarks) != ''">
-        <rx:outline xmlns:rx="http://www.renderx.com/XSL/Extensions">
-          <xsl:copy-of select="$bookmarks"/>
-        </rx:outline>
-      </xsl:if>
-    </xsl:if>
-
-    <xsl:if test="$arbortext.extensions != 0 and $ati.xsl11.bookmarks != 0">
-      <xsl:variable name="bookmarks">
-        <xsl:apply-templates select="$document.element" mode="ati.xsl11.bookmarks"/>
-      </xsl:variable>
-      <xsl:if test="string($bookmarks) != ''">
-        <fo:bookmark-tree>
-          <xsl:copy-of select="$bookmarks"/>
-        </fo:bookmark-tree>
-      </xsl:if>
-    </xsl:if>
-
-    <xsl:apply-templates select="$document.element"/>
-  </fo:root>
-</xsl:template>
-
-<xsl:template name="root.messages">
-  <!-- redefine this any way you'd like to output messages -->
-  <!-- DO NOT OUTPUT ANYTHING FROM THIS TEMPLATE -->
-  <xsl:message>
-    <xsl:text>Making </xsl:text>
-    <xsl:value-of select="$page.orientation"/>
-    <xsl:text> pages on </xsl:text>
-    <xsl:value-of select="$paper.type"/>
-    <xsl:text> paper (</xsl:text>
-    <xsl:value-of select="$page.width"/>
-    <xsl:text>x</xsl:text>
-    <xsl:value-of select="$page.height"/>
-    <xsl:text>)</xsl:text>
-  </xsl:message>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/ptc.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/ptc.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,76 +1,0 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-		xmlns:fo="http://www.w3.org/1999/XSL/Format"
-		version="1.0">
-
-<!-- ================================================================ -->
-<!--                                                                  -->
-<!-- PTC/Arbortext Code for XSL 1.1 bookmark support                  -->
-<!--                                                                  -->
-<!-- ================================================================ -->
-
-<xsl:param name="ati.xsl11.bookmarks" select="1"/>
-
-<xsl:variable name="ati-a-dia" select=
-"'&#257;&#259;&#261;&#263;&#265;&#267;&#269;&#271;&#273;&#275;&#277;&#279;&#281;&#283;&#339;&#285;&#287;&#289;&#291;&#293;&#295;&#297;&#299;&#301;&#303;&#305;&#309;&#311;&#314;&#316;&#318;&#320;&#322;&#324;&#326;&#328;&#331;&#333;&#335;&#337;&#341;&#343;&#345;&#347;&#349;&#351;&#353;&#355;&#357;&#359;&#361;&#363;&#365;&#367;&#369;&#371;&#373;&#375;&#378;&#380;&#382;&#256;&#258;&#260;&#262;&#264;&#266;&#268;&#270;&#272;&#274;&#276;&#278;&#280;&#282;&#338;&#284;&#286;&#288;&#290;&#292;&#294;&#296;&#298;&#300;&#302;&#304;&#308;&#310;&#313;&#315;&#317;&#319;&#321;&#323;&#325;&#327;&#330;&#332;&#334;&#336;&#340;&#342;&#344;&#346;&#348;&#350;&#352;&#354;&#356;&#358;&#360;&#362;&#364;&#366;&#368;&#370;&#372;&#374;&#376;&#377;&#379;&#381;'"/>
-
-<xsl:variable name="ati-a-asc" select=
-"'aaaccccddeeeeeegggghhiiiiijklllllnnnnooorrrsssstttuuuuuuwyzzzAAACCCCDDEEEEEEGGGGHHIIIIIJKLLLLLNNNNOOORRRSSSSTTTUUUUUUWYYZZZ'"/>
-
-<xsl:template match="*" mode="ati.xsl11.bookmarks">
-  <xsl:apply-templates select="*" mode="ati.xsl11.bookmarks"/>
-</xsl:template>
-
-<xsl:template match="set|book|part|reference|preface|chapter|appendix|article
-                     |glossary|bibliography|index|setindex
-                     |refentry
-                     |sect1|sect2|sect3|sect4|sect5|section"
-              mode="ati.xsl11.bookmarks">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-  <xsl:variable name="bookmark-label">
-    <xsl:apply-templates select="." mode="object.title.markup"/>
-  </xsl:variable>
-
-  <!-- Put the root element bookmark at the same level as its children -->
-  <!-- If the object is a set or book, generate a bookmark for the toc -->
-
-  <xsl:choose>
-    <xsl:when test="parent::*">
-      <fo:bookmark internal-destination="{$id}">
-        <fo:bookmark-title>
-          <xsl:value-of select="translate($bookmark-label, $ati-a-dia, $ati-a-asc)"/>
-        </fo:bookmark-title>
-        <xsl:apply-templates select="*" mode="ati.xsl11.bookmarks"/>
-      </fo:bookmark>
-    </xsl:when>
-    <xsl:otherwise>
-      <fo:bookmark internal-destination="{$id}">
-        <fo:bookmark-title>
-          <xsl:value-of select="translate($bookmark-label, $ati-a-dia, $ati-a-asc)"/>
-        </fo:bookmark-title>
-      </fo:bookmark>
-
-      <xsl:variable name="toc.params">
-        <xsl:call-template name="find.path.params">
-          <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:if test="contains($toc.params, 'toc')
-                    and section|sect1|refentry
-                        |article|bibliography|glossary
-                        |appendix">
-        <fo:bookmark internal-destination="toc...{$id}">
-          <fo:bookmark-title>
-            <xsl:call-template name="gentext">
-              <xsl:with-param name="key" select="'TableofContents'"/>
-            </xsl:call-template>
-          </fo:bookmark-title>
-        </fo:bookmark>
-      </xsl:if>
-      <xsl:apply-templates select="*" mode="ati.xsl11.bookmarks"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/qandaset.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/qandaset.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,393 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:template match="qandaset" name="process.qandaset">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="label-width">
-    <xsl:call-template name="pi.dbfo_label-width"/>
-  </xsl:variable>
-
-  <xsl:variable name="label-length">
-    <xsl:choose>
-      <xsl:when test="$label-width != ''">
-        <xsl:value-of select="$label-width"/>
-      </xsl:when>
-      <xsl:when test="descendant::label">
-        <xsl:call-template name="longest.term">
-          <xsl:with-param name="terms" select="descendant::label"/>
-          <xsl:with-param name="maxlength" select="20"/>
-        </xsl:call-template>
-        <xsl:text>em * 0.50</xsl:text>
-      </xsl:when>
-      <xsl:otherwise>2.5em</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-  
-  <xsl:variable name="toc">
-    <xsl:call-template name="pi.dbfo_toc"/>
-  </xsl:variable>
-
-  <xsl:variable name="toc.params">
-    <xsl:call-template name="find.path.params">
-      <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="content">
-    <fo:block id="{$id}">
-      <xsl:choose>
-        <xsl:when test="parent::*">
-          <xsl:if test="blockinfo/title|info/title|title">
-            <xsl:apply-templates select="(blockinfo/title|
-                                          info/title|title)[1]"/>
-          </xsl:if>
-        </xsl:when>
-        <!-- If it is the root element -->
-        <xsl:otherwise>
-          <xsl:call-template name="qandaset.titlepage"/>
-        </xsl:otherwise>
-      </xsl:choose>
-  
-      <xsl:if test="(contains($toc.params, 'toc') and $toc != '0') 
-                    or $toc = '1'">
-        <xsl:call-template name="qandaset.toc">
-          <xsl:with-param name="toc.title.p"
-                          select="contains($toc.params, 'title')"/>
-        </xsl:call-template>
-      </xsl:if>
-
-      <xsl:call-template name="qandaset.toc.separator"/>
-
-      <xsl:apply-templates select="*[local-name(.) != 'title'
-                                   and local-name(.) != 'titleabbrev'
-                                   and local-name(.) != 'qandadiv'
-                                   and local-name(.) != 'qandaentry']"/>
-      <xsl:apply-templates select="qandadiv"/>
-  
-      <xsl:if test="qandaentry">
-        <fo:list-block xsl:use-attribute-sets="list.block.spacing"
-                       provisional-label-separation="0.2em">
-          <xsl:attribute name="provisional-distance-between-starts">
-            <xsl:choose>
-              <xsl:when test="$label-length != ''">
-                <xsl:value-of select="$label-length"/>
-              </xsl:when>
-              <xsl:otherwise>2.5em</xsl:otherwise>
-            </xsl:choose>
-          </xsl:attribute>
-          <xsl:apply-templates select="qandaentry"/>
-        </fo:list-block>
-      </xsl:if>
-    </fo:block>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="parent::*">
-      <xsl:copy-of select="$content"/>
-    </xsl:when>
-    <!-- Otherwise create a page sequence -->
-    <xsl:otherwise>
-      <xsl:apply-templates select="." mode="page.sequence">
-        <xsl:with-param name="content" select="$content"/>
-        <xsl:with-param name="master-reference" select="'body'"/>
-      </xsl:apply-templates>
-    </xsl:otherwise>
-  </xsl:choose>
-  
-</xsl:template>
-
-<xsl:template match="qandaset/blockinfo/title|qandset/info/title|qandaset/title">
-  <xsl:variable name="enclsect" select="(ancestor::section
-                                        | ancestor::simplesect
-                                        | ancestor::sect5
-                                        | ancestor::sect4
-                                        | ancestor::sect3
-                                        | ancestor::sect2
-                                        | ancestor::sect1
-                                        | ancestor::refsect3
-                                        | ancestor::refsect2
-                                        | ancestor::refsect1)[last()]"/>
-  <xsl:variable name="sectlvl">
-    <xsl:call-template name="section.level">
-      <xsl:with-param name="node" select="$enclsect"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:call-template name="qanda.heading">
-    <xsl:with-param name="level" select="$sectlvl + 1"/>
-    <xsl:with-param name="marker" select="0"/>
-    <xsl:with-param name="title">
-      <xsl:apply-templates/>
-    </xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="qandaset/blockinfo|qandaset/info">
-  <!-- what should this template really do? -->
-  <xsl:apply-templates select="legalnotice" mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="qandadiv">
-  <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
-
-  <xsl:variable name="label-width">
-    <xsl:call-template name="pi.dbfo_label-width"/>
-  </xsl:variable>
-
-  <xsl:variable name="label-length">
-    <xsl:choose>
-      <xsl:when test="$label-width != ''">
-        <xsl:value-of select="$label-width"/>
-      </xsl:when>
-      <xsl:when test="descendant::label">
-        <xsl:call-template name="longest.term">
-          <xsl:with-param name="terms" select="descendant::label"/>
-          <xsl:with-param name="maxlength" select="20"/>
-        </xsl:call-template>
-        <xsl:text>*0.6em</xsl:text>
-      </xsl:when>
-      <xsl:otherwise>2.5em</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <fo:block id="{$id}">
-    <xsl:apply-templates select="(blockinfo/title|info/title|title)[1]"/>
-    <xsl:apply-templates select="*[local-name(.) != 'title'
-                                 and local-name(.) != 'titleabbrev'
-                                 and local-name(.) != 'qandadiv'
-                                 and local-name(.) != 'qandaentry']"/>
-    <fo:block>
-      <xsl:apply-templates select="qandadiv"/>
-
-      <xsl:if test="qandaentry">
-        <fo:list-block xsl:use-attribute-sets="list.block.spacing"
-                       provisional-label-separation="0.2em">
-          <xsl:attribute name="provisional-distance-between-starts">
-            <xsl:choose>
-              <xsl:when test="$label-length != ''">
-                <xsl:value-of select="$label-length"/>
-              </xsl:when>
-              <xsl:otherwise>2.5em</xsl:otherwise>
-            </xsl:choose>
-          </xsl:attribute>
-          <xsl:apply-templates select="qandaentry"/>
-        </fo:list-block>
-      </xsl:if>
-    </fo:block>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="qandadiv/blockinfo/title|qandadiv/info/title|qandadiv/title">
-  <xsl:variable name="enclsect" select="(ancestor::section
-                                        | ancestor::simplesect
-                                        | ancestor::sect5
-                                        | ancestor::sect4
-                                        | ancestor::sect3
-                                        | ancestor::sect2
-                                        | ancestor::sect1
-                                        | ancestor::refsect3
-                                        | ancestor::refsect2
-                                        | ancestor::refsect1)[last()]"/>
-  <xsl:variable name="sectlvl">
-    <xsl:call-template name="section.level">
-      <xsl:with-param name="node" select="$enclsect"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:call-template name="qanda.heading">
-    <xsl:with-param name="level"  select="$sectlvl + 1 + count(ancestor::qandadiv)"/>
-    <xsl:with-param name="marker" select="0"/>
-    <xsl:with-param name="title">
-      <xsl:apply-templates select="parent::qandadiv" mode="label.markup"/>
-      <xsl:if test="$qandadiv.autolabel != 0">
-        <xsl:apply-templates select="." mode="intralabel.punctuation"/>
-        <xsl:text> </xsl:text>
-      </xsl:if>
-      <xsl:apply-templates/>
-    </xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="qandaentry">
-  <!-- Omit revhistory from fo:list-block because it is a table -->
-  <xsl:apply-templates select="question|answer"/>
-</xsl:template>
-
-<xsl:template match="question">
-  <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
-
-  <xsl:variable name="entry.id">
-    <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="parent::*"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="deflabel">
-    <xsl:choose>
-      <xsl:when test="ancestor-or-self::*[@defaultlabel]">
-        <xsl:value-of select="(ancestor-or-self::*[@defaultlabel])[last()]
-                              /@defaultlabel"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$qanda.defaultlabel"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-
-      <xsl:variable name="label.content">
-        <xsl:apply-templates select="." mode="label.markup"/>
-        <xsl:if test="$deflabel = 'number' and not(label)">
-          <xsl:apply-templates select="." mode="intralabel.punctuation"/>
-        </xsl:if>
-      </xsl:variable>
-
-  <fo:list-item id="{$entry.id}" xsl:use-attribute-sets="list.item.spacing">
-    <fo:list-item-label id="{$id}" end-indent="label-end()">
-        <xsl:if test="string-length($label.content) &gt; 0">
-			<fo:block font-weight="bold">
-			  <xsl:copy-of select="$label.content"/>          
-			</fo:block>
-        </xsl:if>
-    </fo:list-item-label>
-    <fo:list-item-body start-indent="body-start()">
-      <xsl:choose>
-        <xsl:when test="$deflabel = 'none' and not(label)">
-          <fo:block font-weight="bold">
-            <xsl:apply-templates select="*[local-name(.)!='label']"/>
-          </fo:block>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates select="*[local-name(.)!='label']"/>
-        </xsl:otherwise>
-      </xsl:choose>
-      <!-- Uncomment this line to get revhistory output in the question -->
-      <!-- <xsl:apply-templates select="preceding-sibling::revhistory"/> -->
-    </fo:list-item-body>
-  </fo:list-item>
-</xsl:template>
-
-<xsl:template match="answer">
-  <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
-  <xsl:variable name="entry.id">
-    <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="parent::*"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="deflabel">
-    <xsl:choose>
-      <xsl:when test="ancestor-or-self::*[@defaultlabel]">
-        <xsl:value-of select="(ancestor-or-self::*[@defaultlabel])[last()]
-                              /@defaultlabel"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$qanda.defaultlabel"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-      <xsl:variable name="answer.label">
-        <xsl:apply-templates select="." mode="label.markup"/>
-      </xsl:variable>
-
-  <fo:list-item xsl:use-attribute-sets="list.item.spacing">
-    <fo:list-item-label id="{$id}" end-indent="label-end()">
-      <xsl:choose>
-        <xsl:when test="string-length($answer.label) &gt; 0">
-			<fo:block font-weight="bold">
-			  <xsl:copy-of select="$answer.label"/>
-			</fo:block>
-        </xsl:when>
-        <xsl:otherwise>
-			<fo:block/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </fo:list-item-label>
-    <fo:list-item-body start-indent="body-start()">
-      <xsl:apply-templates select="*[local-name(.)!='label' and local-name(.) != 'qandaentry']"/>
-      <!-- * handle nested answer/qandaentry instances -->
-      <!-- * (bug 1509043 from Daniel Leidert) -->
-      <xsl:if test="descendant::question">
-        <xsl:call-template name="process.qandaset"/>
-      </xsl:if>
-    </fo:list-item-body>
-  </fo:list-item>
-</xsl:template>
-
-<xsl:template match="label">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template name="qanda.heading">
-  <xsl:param name="level" select="1"/>
-  <xsl:param name="marker" select="0"/>
-  <xsl:param name="title"/>
-  <xsl:param name="titleabbrev"/>
-
-  <fo:block xsl:use-attribute-sets="qanda.title.properties">
-    <xsl:if test="$marker != 0">
-      <fo:marker marker-class-name="section.head.marker">
-        <xsl:choose>
-          <xsl:when test="$titleabbrev = ''">
-            <xsl:value-of select="$title"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="$titleabbrev"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </fo:marker>
-    </xsl:if>
-    <xsl:choose>
-      <xsl:when test="$level=1">
-        <fo:block xsl:use-attribute-sets="qanda.title.level1.properties">
-          <xsl:copy-of select="$title"/>
-        </fo:block>
-      </xsl:when>
-      <xsl:when test="$level=2">
-        <fo:block xsl:use-attribute-sets="qanda.title.level2.properties">
-          <xsl:copy-of select="$title"/>
-        </fo:block>
-      </xsl:when>
-      <xsl:when test="$level=3">
-        <fo:block xsl:use-attribute-sets="qanda.title.level3.properties">
-          <xsl:copy-of select="$title"/>
-        </fo:block>
-      </xsl:when>
-      <xsl:when test="$level=4">
-        <fo:block xsl:use-attribute-sets="qanda.title.level4.properties">
-          <xsl:copy-of select="$title"/>
-        </fo:block>
-      </xsl:when>
-      <xsl:when test="$level=5">
-        <fo:block xsl:use-attribute-sets="qanda.title.level5.properties">
-          <xsl:copy-of select="$title"/>
-        </fo:block>
-      </xsl:when>
-      <xsl:otherwise>
-        <fo:block xsl:use-attribute-sets="qanda.title.level6.properties">
-          <xsl:copy-of select="$title"/>
-        </fo:block>
-      </xsl:otherwise>
-    </xsl:choose>
-  </fo:block>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/refentry.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/refentry.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,637 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                xmlns:axf="http://www.antennahouse.com/names/XSL/Extensions"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:template match="reference">
-   <xsl:if test="not(partintro)">
-    <xsl:variable name="id">
-      <xsl:call-template name="object.id"/>
-    </xsl:variable>
-    <xsl:variable name="master-reference">
-      <xsl:call-template name="select.pagemaster"/>
-    </xsl:variable>
-
-    <fo:page-sequence hyphenate="{$hyphenate}"
-                      master-reference="{$master-reference}">
-      <xsl:attribute name="language">
-        <xsl:call-template name="l10n.language"/>
-      </xsl:attribute>
-      <xsl:attribute name="format">
-        <xsl:call-template name="page.number.format">
-          <xsl:with-param name="master-reference" select="$master-reference"/>
-        </xsl:call-template>
-      </xsl:attribute>
-
-      <xsl:attribute name="initial-page-number">
-        <xsl:call-template name="initial.page.number">
-          <xsl:with-param name="master-reference" select="$master-reference"/>
-        </xsl:call-template>
-      </xsl:attribute>
-
-      <xsl:attribute name="force-page-count">
-        <xsl:call-template name="force.page.count">
-          <xsl:with-param name="master-reference" select="$master-reference"/>
-        </xsl:call-template>
-      </xsl:attribute>
-
-      <xsl:attribute name="hyphenation-character">
-        <xsl:call-template name="gentext">
-          <xsl:with-param name="key" select="'hyphenation-character'"/>
-        </xsl:call-template>
-      </xsl:attribute>
-      <xsl:attribute name="hyphenation-push-character-count">
-        <xsl:call-template name="gentext">
-          <xsl:with-param name="key" select="'hyphenation-push-character-count'"/>
-        </xsl:call-template>
-      </xsl:attribute>
-      <xsl:attribute name="hyphenation-remain-character-count">
-        <xsl:call-template name="gentext">
-          <xsl:with-param name="key" select="'hyphenation-remain-character-count'"/>
-        </xsl:call-template>
-      </xsl:attribute>
-
-      <xsl:apply-templates select="." mode="running.head.mode">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:apply-templates>
-      <xsl:apply-templates select="." mode="running.foot.mode">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:apply-templates>
-
-      <fo:flow flow-name="xsl-region-body">
-        <xsl:call-template name="set.flow.properties">
-          <xsl:with-param name="element" select="local-name(.)"/>
-          <xsl:with-param name="master-reference" select="$master-reference"/>
-        </xsl:call-template>
-
-        <fo:block id="{$id}">
-          <xsl:call-template name="reference.titlepage"/>
-        </fo:block>
-        <!-- Create one page sequence if no pagebreaks needed -->
-        <xsl:if test="$refentry.pagebreak = 0">
-          <xsl:apply-templates select="refentry"/>
-        </xsl:if>
-      </fo:flow>
-    </fo:page-sequence>
-  </xsl:if>
-  <xsl:apply-templates select="partintro"/>
-  <xsl:if test="$refentry.pagebreak != 0">
-    <xsl:apply-templates select="refentry"/>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="reference" mode="reference.titlepage.mode">
-  <xsl:call-template name="reference.titlepage"/>
-</xsl:template>
-
-<xsl:template match="reference/partintro">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="ancestor::reference"/>
-    </xsl:call-template>
-  </xsl:variable>
-  <xsl:variable name="master-reference">
-    <xsl:call-template name="select.pagemaster"/>
-  </xsl:variable>
-
-  <fo:page-sequence hyphenate="{$hyphenate}"
-                    master-reference="{$master-reference}">
-    <xsl:attribute name="language">
-      <xsl:call-template name="l10n.language"/>
-    </xsl:attribute>
-    <xsl:attribute name="format">
-      <xsl:call-template name="page.number.format">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="initial-page-number">
-      <xsl:call-template name="initial.page.number">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="force-page-count">
-      <xsl:call-template name="force.page.count">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="hyphenation-character">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-character'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="hyphenation-push-character-count">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-push-character-count'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="hyphenation-remain-character-count">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-remain-character-count'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:apply-templates select="." mode="running.head.mode">
-      <xsl:with-param name="master-reference" select="$master-reference"/>
-    </xsl:apply-templates>
-    <xsl:apply-templates select="." mode="running.foot.mode">
-      <xsl:with-param name="master-reference" select="$master-reference"/>
-    </xsl:apply-templates>
-
-    <fo:flow flow-name="xsl-region-body">
-      <xsl:call-template name="set.flow.properties">
-        <xsl:with-param name="element" select="local-name(.)"/>
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-      <fo:block id="{$id}">
-        <xsl:apply-templates select=".." mode="reference.titlepage.mode"/>
-      </fo:block>
-      <xsl:if test="title">
-        <xsl:call-template name="partintro.titlepage"/>
-      </xsl:if>
-      <xsl:apply-templates/>
-      <!-- Create one page sequence if no pagebreaks needed -->
-      <xsl:if test="$refentry.pagebreak = 0">
-        <xsl:apply-templates select="../refentry"/>
-      </xsl:if>
-    </fo:flow>
-  </fo:page-sequence>
-</xsl:template>
-
-<xsl:template match="reference/docinfo|refentry/refentryinfo"></xsl:template>
-<xsl:template match="reference/info"></xsl:template>
-<xsl:template match="reference/title"></xsl:template>
-<xsl:template match="reference/subtitle"></xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="refentry">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="master-reference">
-    <xsl:call-template name="select.pagemaster"/>
-  </xsl:variable>
-
-  <xsl:variable name="refentry.content">
-    <fo:block id="{$id}">
-      <xsl:apply-templates/>
-    </fo:block>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="not(parent::*) or 
-                    (parent::reference and $refentry.pagebreak != 0) or 
-                    parent::part">
-      <!-- make a page sequence -->
-      <fo:page-sequence hyphenate="{$hyphenate}"
-                        master-reference="{$master-reference}">
-        <xsl:attribute name="language">
-          <xsl:call-template name="l10n.language"/>
-        </xsl:attribute>
-        <xsl:attribute name="format">
-          <xsl:call-template name="page.number.format">
-            <xsl:with-param name="master-reference" select="$master-reference"/>
-          </xsl:call-template>
-        </xsl:attribute>
-
-        <xsl:attribute name="initial-page-number">
-          <xsl:call-template name="initial.page.number">
-            <xsl:with-param name="master-reference" select="$master-reference"/>
-          </xsl:call-template>
-        </xsl:attribute>
-
-        <xsl:attribute name="force-page-count">
-          <xsl:call-template name="force.page.count">
-            <xsl:with-param name="master-reference" select="$master-reference"/>
-          </xsl:call-template>
-        </xsl:attribute>
-
-        <xsl:attribute name="hyphenation-character">
-          <xsl:call-template name="gentext">
-            <xsl:with-param name="key" select="'hyphenation-character'"/>
-          </xsl:call-template>
-        </xsl:attribute>
-        <xsl:attribute name="hyphenation-push-character-count">
-          <xsl:call-template name="gentext">
-            <xsl:with-param name="key" select="'hyphenation-push-character-count'"/>
-          </xsl:call-template>
-        </xsl:attribute>
-        <xsl:attribute name="hyphenation-remain-character-count">
-          <xsl:call-template name="gentext">
-            <xsl:with-param name="key" select="'hyphenation-remain-character-count'"/>
-          </xsl:call-template>
-        </xsl:attribute>
-
-        <xsl:apply-templates select="." mode="running.head.mode">
-          <xsl:with-param name="master-reference" select="$master-reference"/>
-        </xsl:apply-templates>
-        <xsl:apply-templates select="." mode="running.foot.mode">
-          <xsl:with-param name="master-reference" select="$master-reference"/>
-        </xsl:apply-templates>
-
-        <fo:flow flow-name="xsl-region-body">
-          <xsl:call-template name="set.flow.properties">
-            <xsl:with-param name="element" select="local-name(.)"/>
-            <xsl:with-param name="master-reference" select="$master-reference"/>
-          </xsl:call-template>
-
-          <xsl:copy-of select="$refentry.content"/>
-        </fo:flow>
-      </fo:page-sequence>
-    </xsl:when>
-    <xsl:otherwise>
-      <fo:block>
-        <xsl:if test="$refentry.pagebreak != 0">
-          <xsl:attribute name="break-before">page</xsl:attribute>
-        </xsl:if>
-        <xsl:copy-of select="$refentry.content"/>
-      </fo:block>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="refmeta">
-</xsl:template>
-
-<xsl:template match="manvolnum">
-  <xsl:if test="$refentry.xref.manvolnum != 0">
-    <xsl:text>(</xsl:text>
-    <xsl:apply-templates/>
-    <xsl:text>)</xsl:text>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="refmiscinfo">
-</xsl:template>
-
-<xsl:template match="refentrytitle">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="refnamediv">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <fo:block id="{$id}">
-
-    <!-- if refentry.generate.name is non-zero, then we need to generate a -->
-    <!-- localized "Name" subheading for this refnamdiv (unless it has a -->
-    <!-- preceding sibling that is a refnamediv, in which case we have already -->
-    <!-- generated a "Name" subheading, so we don't need to do it again -->
-    <xsl:if test="$refentry.generate.name != 0">
-        <xsl:choose>
-          <xsl:when test="preceding-sibling::refnamediv">
-            <!-- no generated title on secondary refnamedivs! -->
-          </xsl:when>
-          <xsl:otherwise>
-            <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                      xsl:use-attribute-sets="refnamediv.titlepage.recto.style"
-                      font-family="{$title.fontset}">
-              <!-- Contents of what is now the format.refentry.subheading -->
-              <!-- template were formerly intended to be used only to -->
-              <!-- process those subsections of Refentry that have "real" -->
-              <!-- title children. So as a kludge to get around the fact -->
-              <!-- that the template still basically "expects" to be -->
-              <!-- processing that kind of a node, when we call the -->
-              <!-- template to process generated titles, we must call it -->
-              <!-- with values for the "offset" and "section" parameters -->
-              <!-- that are different from the default values in the -->
-              <!-- format.refentry.subheading template itself. Because -->
-              <!-- those defaults are the values appropriate for processing -->
-              <!-- "real" title nodes. -->
-              <xsl:call-template name="format.refentry.subheading">
-                <xsl:with-param name="section" select="self::*"/>
-                <xsl:with-param name="offset" select="1"/>
-                <xsl:with-param name="gentext.key" select="'RefName'"/>
-              </xsl:call-template>
-            </fo:block>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:if>
-
-      <xsl:if test="$refentry.generate.title != 0">
-  <xsl:variable name="section.level">
-    <xsl:call-template name="refentry.level">
-      <xsl:with-param name="node" select="ancestor::refentry"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="reftitle">
-        <xsl:choose>
-          <xsl:when test="../refmeta/refentrytitle">
-            <xsl:apply-templates select="../refmeta/refentrytitle"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:apply-templates select="refname[1]"/>
-          </xsl:otherwise>
-        </xsl:choose>
-  </xsl:variable>
-
-  <!-- xsl:use-attribute-sets takes only a Qname, not a variable -->
-    <xsl:choose>
-      <xsl:when test="preceding-sibling::refnamediv">
-	<!-- no title on secondary refnamedivs! -->
-      </xsl:when>
-      <xsl:when test="$section.level = 1">
-        <fo:block xsl:use-attribute-sets="refentry.title.properties">
-          <fo:block xsl:use-attribute-sets="section.title.level1.properties">
-            <xsl:value-of select="$reftitle"/>
-          </fo:block>
-        </fo:block>
-      </xsl:when>
-      <xsl:when test="$section.level = 2">
-        <fo:block xsl:use-attribute-sets="refentry.title.properties">
-          <fo:block xsl:use-attribute-sets="section.title.level2.properties">
-            <xsl:value-of select="$reftitle"/>
-          </fo:block>
-        </fo:block>
-      </xsl:when>
-      <xsl:when test="$section.level = 3">
-        <fo:block xsl:use-attribute-sets="refentry.title.properties">
-          <fo:block xsl:use-attribute-sets="section.title.level3.properties">
-            <xsl:value-of select="$reftitle"/>
-          </fo:block>
-        </fo:block>
-      </xsl:when>
-      <xsl:when test="$section.level = 4">
-        <fo:block xsl:use-attribute-sets="refentry.title.properties">
-          <fo:block xsl:use-attribute-sets="section.title.level4.properties">
-            <xsl:value-of select="$reftitle"/>
-          </fo:block>
-        </fo:block>
-      </xsl:when>
-      <xsl:when test="$section.level = 5">
-        <fo:block xsl:use-attribute-sets="refentry.title.properties">
-          <fo:block xsl:use-attribute-sets="section.title.level5.properties">
-            <xsl:value-of select="$reftitle"/>
-          </fo:block>
-        </fo:block>
-      </xsl:when>
-      <xsl:otherwise>
-        <fo:block xsl:use-attribute-sets="refentry.title.properties">
-          <fo:block xsl:use-attribute-sets="section.title.level6.properties">
-            <xsl:value-of select="$reftitle"/>
-          </fo:block>
-        </fo:block>
-      </xsl:otherwise>
-    </xsl:choose>
-    </xsl:if>
-
-    <fo:block>
-      <xsl:if test="not(following-sibling::refnamediv)">
-	<xsl:attribute name="space-after">1em</xsl:attribute>
-      </xsl:if>
-      <xsl:apply-templates/>
-    </fo:block>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="refname">
-  <xsl:if test="not(preceding-sibling::refdescriptor)">
-    <xsl:apply-templates/>
-    <xsl:if test="following-sibling::refname">
-      <xsl:text>, </xsl:text>
-    </xsl:if>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="refpurpose">
-  <xsl:if test="node()">
-    <xsl:text> </xsl:text>
-    <xsl:call-template name="dingbat">
-      <xsl:with-param name="dingbat">em-dash</xsl:with-param>
-    </xsl:call-template>
-    <xsl:text> </xsl:text>
-    <xsl:apply-templates/>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="refdescriptor">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="refclass">
-  <xsl:if test="$refclass.suppress = 0">
-  <fo:block font-weight="bold">
-    <xsl:if test="@role">
-      <xsl:value-of select="@role"/>
-      <xsl:text>: </xsl:text>
-    </xsl:if>
-    <xsl:apply-templates/>
-  </fo:block>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="refsynopsisdiv">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <fo:block id="{$id}">
-    <xsl:if test="not(refsynopsisdivinfo/title|docinfo/title|info/title|title)">
-      <!-- * if we there is no appropriate title for this Refsynopsisdiv, -->
-      <!-- * then we need to call format.refentry.subheading to generate one -->
-      <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                xsl:use-attribute-sets="refsynopsisdiv.titlepage.recto.style"
-                font-family="{$title.fontset}">
-        <!-- Contents of what is now the format.refentry.subheading -->
-        <!-- template were formerly intended to be used only to -->
-        <!-- process those subsections of Refentry that have "real" -->
-        <!-- title children. So as a kludge to get around the fact -->
-        <!-- that the template still basically "expects" to be -->
-        <!-- processing that kind of a node, when we call the -->
-        <!-- template to process generated titles, we must call it -->
-        <!-- with values for the "offset" and "section" parameters -->
-        <!-- that are different from the default values in the -->
-        <!-- format.refentry.subheading template itself. Because -->
-        <!-- those defaults are the values appropriate for processing -->
-        <!-- "real" title nodes. -->
-        <xsl:call-template name="format.refentry.subheading">
-          <xsl:with-param name="section" select="parent::*"/>
-          <xsl:with-param name="offset" select="1"/>
-          <xsl:with-param name="gentext.key" select="'RefSynopsisDiv'"/>
-        </xsl:call-template>
-      </fo:block>
-    </xsl:if>
-    <xsl:call-template name="refsynopsisdiv.titlepage"/>
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="refsection">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <fo:block id="{$id}">
-    <xsl:call-template name="refsection.titlepage"/>
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="refsect1">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <fo:block id="{$id}">
-    <xsl:call-template name="refsect1.titlepage"/>
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="refsect2">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <fo:block id="{$id}">
-    <xsl:call-template name="refsect2.titlepage"/>
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="refsect3">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <fo:block id="{$id}">
-    <xsl:call-template name="refsect3.titlepage"/>
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="refsynopsisdiv/title
-                     |refsection/title
-                     |refsect1/title
-                     |refsect2/title
-                     |refsect3/title">
-  <!-- nop; titlepage.mode instead -->
-</xsl:template>
-
-<xsl:template match="refsynopsisdiv/title
-                     |refsection/title
-                     |refsect1/title
-                     |refsect2/title
-                     |refsect3/title
-                     |refsynopsisdiv/info/title
-                     |refsection/info/title
-                     |refsect1/info/title
-                     |refsect2/info/title
-                     |refsect3/info/title"
-              mode="titlepage.mode"
-              priority="2">
-  <xsl:call-template name="format.refentry.subheading"/>
-</xsl:template>
-
-<xsl:template name="format.refentry.subheading">
-<!-- This template is now called to process generated titles for -->
-<!-- Refnamediv and Refsynopsisdiv, as well as "real" titles for -->
-<!-- Refsynopsisdiv, Refsection, and Refsect[1-3]. -->
-<!-- -->
-<!-- But the contents of this template were formerly intended to be used -->
-<!-- only to process those subsections of Refentry that have "real" title -->
-<!-- children. So as a kludge to get around the fact that the template -->
-<!-- still basically "expects" to be processing that kind of a node, the -->
-<!-- "offset" parameter was added and the "section" variable was changed to -->
-<!-- a parameter so that when called for a generated title on a Refnamediv -->
-<!-- or Refsynopsisdiv, we can call it like this: -->
-<!-- -->
-<!--     <xsl:call-template name="format.refentry.subheading"> -->
-<!--       <xsl:with-param name="section" select="self::*"/> -->
-<!--       <xsl:with-param name="offset" select="1"/> -->
-<!--       <xsl:with-param name="gentext.key" select="'RefName'"/> -->
-<!--     </xsl:call-template> -->
-<!-- -->
-  <xsl:param name="section" 
-             select="(ancestor::refsynopsysdiv 
-                     |ancestor::refsection
-                     |ancestor::refsect1
-                     |ancestor::refsect2
-                     |ancestor::refsect3)[last()]"/>
-  <xsl:param name="offset" select="0"/>
-  <xsl:param name="gentext.key"/>
-
-  <fo:block keep-with-next.within-column="always">
-    <xsl:variable name="id">
-      <xsl:call-template name="object.id">
-        <xsl:with-param name="object" select="$section"/>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <xsl:variable name="level">
-      <xsl:call-template name="section.level">
-        <xsl:with-param name="node" select="$section"/>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <xsl:variable name="title">
-      <!-- If we have a non-empty value for the $gentext.key param, then we -->
-      <!-- generate an appropriate title here. Otherwise, we have a real -->
-      <!-- title child, so we copy contents of that to the result tree. -->
-      <xsl:choose>
-        <xsl:when test="$gentext.key != ''">
-          <xsl:call-template name="gentext">
-            <xsl:with-param name="key" select="$gentext.key"/>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates select="$section" mode="object.title.markup">
-            <xsl:with-param name="allow-anchors" select="1"/>
-          </xsl:apply-templates>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-
-    <xsl:if test="$passivetex.extensions != 0">
-      <fotex:bookmark xmlns:fotex="http://www.tug.org/fotex" 
-                      fotex-bookmark-level="{$level + 2 + $offset}" 
-                      fotex-bookmark-label="{$id}">
-        <xsl:value-of select="$title"/>
-      </fotex:bookmark>
-    </xsl:if>
-
-    <xsl:if test="$axf.extensions != 0">
-      <xsl:attribute name="axf:outline-level">
-        <xsl:value-of select="count(ancestor::*)-1 + $offset"/>
-      </xsl:attribute>
-      <xsl:attribute name="axf:outline-expand">false</xsl:attribute>
-      <xsl:attribute name="axf:outline-title">
-        <xsl:value-of select="$title"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <xsl:call-template name="section.heading">
-      <xsl:with-param name="level" select="$level + $offset"/>
-      <xsl:with-param name="title" select="$title"/>
-    </xsl:call-template>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="refsectioninfo|refsection/info"></xsl:template>
-<xsl:template match="refsect1info|refsect1/info"></xsl:template>
-<xsl:template match="refsect2info|refsect2/info"></xsl:template>
-<xsl:template match="refsect3info|refsect3/info"></xsl:template>
-
-<!-- ==================================================================== -->
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/sections.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/sections.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,764 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                xmlns:axf="http://www.antennahouse.com/names/XSL/Extensions"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:template match="section">
-  <xsl:choose>
-    <xsl:when test="$rootid = @id or $rootid = @xml:id">
-      <xsl:call-template name="section.page.sequence"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:variable name="id">
-        <xsl:call-template name="object.id"/>
-      </xsl:variable>
-
-      <xsl:variable name="renderas">
-        <xsl:choose>
-          <xsl:when test="@renderas = 'sect1'">1</xsl:when>
-          <xsl:when test="@renderas = 'sect2'">2</xsl:when>
-          <xsl:when test="@renderas = 'sect3'">3</xsl:when>
-          <xsl:when test="@renderas = 'sect4'">4</xsl:when>
-          <xsl:when test="@renderas = 'sect5'">5</xsl:when>
-          <xsl:otherwise><xsl:value-of select="''"/></xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-
-      <xsl:variable name="level">
-        <xsl:choose>
-          <xsl:when test="$renderas != ''">
-            <xsl:value-of select="$renderas"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:call-template name="section.level"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-
-      <!-- xsl:use-attribute-sets takes only a Qname, not a variable -->
-      <xsl:choose>
-        <xsl:when test="$level = 1">
-          <xsl:element name="fo:{$section.container.element}"
-		       use-attribute-sets="section.level1.properties">
-            <xsl:attribute name="id"><xsl:value-of 
-                                select="$id"/></xsl:attribute>
-            <xsl:call-template name="section.content"/>
-          </xsl:element>
-        </xsl:when>
-        <xsl:when test="$level = 2">
-          <xsl:element name="fo:{$section.container.element}"
-		       use-attribute-sets="section.level2.properties">
-            <xsl:attribute name="id"><xsl:value-of 
-                                select="$id"/></xsl:attribute>
-            <xsl:call-template name="section.content"/>
-          </xsl:element>
-        </xsl:when>
-        <xsl:when test="$level = 3">
-          <xsl:element name="fo:{$section.container.element}"
-                       use-attribute-sets="section.level3.properties">
-            <xsl:attribute name="id"><xsl:value-of 
-                                select="$id"/></xsl:attribute>
-            <xsl:call-template name="section.content"/>
-          </xsl:element>
-        </xsl:when>
-        <xsl:when test="$level = 4">
-          <xsl:element name="fo:{$section.container.element}"
-                       use-attribute-sets="section.level4.properties">
-            <xsl:attribute name="id"><xsl:value-of 
-                                select="$id"/></xsl:attribute>
-            <xsl:call-template name="section.content"/>
-          </xsl:element>
-        </xsl:when>
-        <xsl:when test="$level = 5">
-          <xsl:element name="fo:{$section.container.element}"
-		       use-attribute-sets="section.level5.properties">
-            <xsl:attribute name="id"><xsl:value-of 
-                                select="$id"/></xsl:attribute>
-            <xsl:call-template name="section.content"/>
-          </xsl:element>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:element name="fo:{$section.container.element}"
-		       use-attribute-sets="section.level6.properties">
-            <xsl:attribute name="id"><xsl:value-of 
-                                select="$id"/></xsl:attribute>
-            <xsl:call-template name="section.content"/>
-          </xsl:element>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="section.content">
-  <xsl:call-template name="section.titlepage"/>
-
-  <xsl:variable name="toc.params">
-    <xsl:call-template name="find.path.params">
-      <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:if test="contains($toc.params, 'toc')
-                and (count(ancestor::section)+1) &lt;= 
-		$generate.section.toc.level">
-    <xsl:call-template name="section.toc">
-      <xsl:with-param name="toc.title.p" 
-                      select="contains($toc.params, 'title')"/>
-    </xsl:call-template>
-   <xsl:call-template name="section.toc.separator"/>
-  </xsl:if>
-
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="/section" name="section.page.sequence">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="master-reference">
-    <xsl:call-template name="select.pagemaster"/>
-  </xsl:variable>
-
-  <fo:page-sequence hyphenate="{$hyphenate}"
-                    master-reference="{$master-reference}">
-    <xsl:attribute name="language">
-      <xsl:call-template name="l10n.language"/>
-    </xsl:attribute>
-    <xsl:attribute name="format">
-      <xsl:call-template name="page.number.format">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="initial-page-number">
-      <xsl:call-template name="initial.page.number">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="force-page-count">
-      <xsl:call-template name="force.page.count">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="hyphenation-character">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-character'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="hyphenation-push-character-count">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-push-character-count'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="hyphenation-remain-character-count">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-remain-character-count'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:apply-templates select="." mode="running.head.mode">
-      <xsl:with-param name="master-reference" select="$master-reference"/>
-    </xsl:apply-templates>
-    <xsl:apply-templates select="." mode="running.foot.mode">
-      <xsl:with-param name="master-reference" select="$master-reference"/>
-    </xsl:apply-templates>
-
-    <fo:flow flow-name="xsl-region-body">
-      <xsl:call-template name="set.flow.properties">
-        <xsl:with-param name="element" select="local-name(.)"/>
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-
-      <fo:block id="{$id}" 
-            xsl:use-attribute-sets="section.level1.properties">
-        <xsl:call-template name="section.titlepage"/>
-      </fo:block>
-
-      <xsl:variable name="toc.params">
-        <xsl:call-template name="find.path.params">
-          <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <xsl:if test="contains($toc.params, 'toc')
-                    and (count(ancestor::section)+1) &lt;= 
-		    $generate.section.toc.level">
-        <xsl:call-template name="section.toc">
-          <xsl:with-param name="toc.title.p" 
-                          select="contains($toc.params, 'title')"/>
-        </xsl:call-template>
-        <xsl:call-template name="section.toc.separator"/>
-      </xsl:if>
-
-      <xsl:apply-templates/>
-   </fo:flow>
-  </fo:page-sequence>
-</xsl:template>
-
-<xsl:template match="section/title
-                     |simplesect/title
-                     |sect1/title
-                     |sect2/title
-                     |sect3/title
-                     |sect4/title
-                     |sect5/title
-                     |section/info/title
-                     |simplesect/info/title
-                     |sect1/info/title
-                     |sect2/info/title
-                     |sect3/info/title
-                     |sect4/info/title
-                     |sect5/info/title
-                     |section/sectioninfo/title
-                     |sect1/sect1info/title
-                     |sect2/sect2info/title
-                     |sect3/sect3info/title
-                     |sect4/sect4info/title
-                     |sect5/sect5info/title"
-              mode="titlepage.mode"
-              priority="2">
-
-  <xsl:variable name="section" 
-                select="(ancestor::section |
-                        ancestor::simplesect |
-                        ancestor::sect1 |
-                        ancestor::sect2 |
-                        ancestor::sect3 |
-                        ancestor::sect4 |
-                        ancestor::sect5)[position() = last()]"/>
-
-  <fo:block keep-with-next.within-column="always">
-    <xsl:variable name="id">
-      <xsl:call-template name="object.id">
-        <xsl:with-param name="object" select="$section"/>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <xsl:variable name="renderas">
-      <xsl:choose>
-        <xsl:when test="$section/@renderas = 'sect1'">1</xsl:when>
-        <xsl:when test="$section/@renderas = 'sect2'">2</xsl:when>
-        <xsl:when test="$section/@renderas = 'sect3'">3</xsl:when>
-        <xsl:when test="$section/@renderas = 'sect4'">4</xsl:when>
-        <xsl:when test="$section/@renderas = 'sect5'">5</xsl:when>
-        <xsl:otherwise><xsl:value-of select="''"/></xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-  
-    <xsl:variable name="level">
-      <xsl:choose>
-        <xsl:when test="$renderas != ''">
-          <xsl:value-of select="$renderas"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="section.level">
-            <xsl:with-param name="node" select="$section"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-
-    <xsl:variable name="marker">
-      <xsl:choose>
-        <xsl:when test="$level &lt;= $marker.section.level">1</xsl:when>
-        <xsl:otherwise>0</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-
-    <xsl:variable name="title">
-      <xsl:apply-templates select="$section" mode="object.title.markup">
-        <xsl:with-param name="allow-anchors" select="1"/>
-      </xsl:apply-templates>
-    </xsl:variable>
-
-    <xsl:variable name="marker.title">
-      <xsl:apply-templates select="$section" mode="titleabbrev.markup">
-        <xsl:with-param name="allow-anchors" select="0"/>
-      </xsl:apply-templates>
-    </xsl:variable>
-
-    <xsl:if test="$passivetex.extensions != 0">
-      <fotex:bookmark xmlns:fotex="http://www.tug.org/fotex" 
-                      fotex-bookmark-level="{$level + 2}" 
-                      fotex-bookmark-label="{$id}">
-        <xsl:value-of select="$marker.title"/>
-      </fotex:bookmark>
-    </xsl:if>
-
-    <xsl:if test="$axf.extensions != 0">
-      <xsl:attribute name="axf:outline-level">
-        <xsl:value-of select="count(ancestor::*)-1"/>
-      </xsl:attribute>
-      <xsl:attribute name="axf:outline-expand">false</xsl:attribute>
-      <xsl:attribute name="axf:outline-title">
-        <xsl:value-of select="normalize-space($title)"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <xsl:call-template name="section.heading">
-      <xsl:with-param name="level" select="$level"/>
-      <xsl:with-param name="title" select="$title"/>
-      <xsl:with-param name="marker" select="$marker"/>
-      <xsl:with-param name="marker.title" select="$marker.title"/>
-    </xsl:call-template>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="sect1">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:element name="fo:{$section.container.element}"
-               use-attribute-sets="section.level1.properties">
-    <xsl:attribute name="id"><xsl:value-of 
-                        select="$id"/></xsl:attribute>
-    <xsl:call-template name="sect1.titlepage"/>
-
-    <xsl:variable name="toc.params">
-      <xsl:call-template name="find.path.params">
-        <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <xsl:if test="contains($toc.params, 'toc')
-                  and $generate.section.toc.level &gt;= 1">
-      <xsl:call-template name="section.toc">
-        <xsl:with-param name="toc.title.p" 
-                        select="contains($toc.params, 'title')"/>
-      </xsl:call-template>
-      <xsl:call-template name="section.toc.separator"/>
-    </xsl:if>
-
-    <xsl:apply-templates/>
-  </xsl:element>
-</xsl:template>
-
-<xsl:template match="/sect1">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-  <xsl:variable name="master-reference">
-    <xsl:call-template name="select.pagemaster"/>
-  </xsl:variable>
-
-  <fo:page-sequence hyphenate="{$hyphenate}"
-                    master-reference="{$master-reference}">
-    <xsl:attribute name="language">
-      <xsl:call-template name="l10n.language"/>
-    </xsl:attribute>
-    <xsl:attribute name="format">
-      <xsl:call-template name="page.number.format">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="initial-page-number">
-      <xsl:call-template name="initial.page.number">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="force-page-count">
-      <xsl:call-template name="force.page.count">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="hyphenation-character">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-character'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="hyphenation-push-character-count">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-push-character-count'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="hyphenation-remain-character-count">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-remain-character-count'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:apply-templates select="." mode="running.head.mode">
-      <xsl:with-param name="master-reference" select="$master-reference"/>
-    </xsl:apply-templates>
-    <xsl:apply-templates select="." mode="running.foot.mode">
-      <xsl:with-param name="master-reference" select="$master-reference"/>
-    </xsl:apply-templates>
-
-    <fo:flow flow-name="xsl-region-body">
-      <xsl:call-template name="set.flow.properties">
-        <xsl:with-param name="element" select="local-name(.)"/>
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-
-      <fo:block id="{$id}" 
-                xsl:use-attribute-sets="section.level1.properties">
-        <xsl:call-template name="sect1.titlepage"/>
-      </fo:block>
-
-      <xsl:variable name="toc.params">
-        <xsl:call-template name="find.path.params">
-          <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <xsl:if test="contains($toc.params, 'toc')
-                    and $generate.section.toc.level &gt;= 1">
-        <xsl:call-template name="section.toc">
-          <xsl:with-param name="toc.title.p" 
-                          select="contains($toc.params, 'title')"/>
-        </xsl:call-template>
-        <xsl:call-template name="section.toc.separator"/>
-      </xsl:if>
-
-      <xsl:apply-templates/>
-   </fo:flow>
-  </fo:page-sequence>
-</xsl:template>
-
-<xsl:template match="sect2">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:element name="fo:{$section.container.element}"
-	       use-attribute-sets="section.level2.properties">
-    <xsl:attribute name="id"><xsl:value-of 
-                        select="$id"/></xsl:attribute>
-    <xsl:call-template name="sect2.titlepage"/>
-
-    <xsl:variable name="toc.params">
-      <xsl:call-template name="find.path.params">
-        <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <xsl:if test="contains($toc.params, 'toc')
-                   and $generate.section.toc.level &gt;= 2">
-      <xsl:call-template name="section.toc">
-        <xsl:with-param name="toc.title.p" 
-                        select="contains($toc.params, 'title')"/>
-      </xsl:call-template>
-      <xsl:call-template name="section.toc.separator"/>
-    </xsl:if>
-
-    <xsl:apply-templates/>
-  </xsl:element>
-</xsl:template>
-
-<xsl:template match="sect3">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:element name="fo:{$section.container.element}"
-	       use-attribute-sets="section.level3.properties">
-    <xsl:attribute name="id"><xsl:value-of 
-                        select="$id"/></xsl:attribute>
-    <xsl:call-template name="sect3.titlepage"/>
-
-    <xsl:variable name="toc.params">
-      <xsl:call-template name="find.path.params">
-        <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <xsl:if test="contains($toc.params, 'toc')
-                  and $generate.section.toc.level &gt;= 3">
-      <xsl:call-template name="section.toc">
-        <xsl:with-param name="toc.title.p" 
-                        select="contains($toc.params, 'title')"/>
-      </xsl:call-template>
-      <xsl:call-template name="section.toc.separator"/>
-    </xsl:if>
-
-    <xsl:apply-templates/>
-  </xsl:element>
-</xsl:template>
-
-<xsl:template match="sect4">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:element name="fo:{$section.container.element}"
-	       use-attribute-sets="section.level4.properties">
-    <xsl:attribute name="id"><xsl:value-of 
-                        select="$id"/></xsl:attribute>
-    <xsl:call-template name="sect4.titlepage"/>
-
-    <xsl:variable name="toc.params">
-      <xsl:call-template name="find.path.params">
-        <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <xsl:if test="contains($toc.params, 'toc')
-                  and $generate.section.toc.level &gt;= 4">
-      <xsl:call-template name="section.toc">
-        <xsl:with-param name="toc.title.p" 
-                        select="contains($toc.params, 'title')"/>
-      </xsl:call-template>
-      <xsl:call-template name="section.toc.separator"/>
-    </xsl:if>
-
-    <xsl:apply-templates/>
-  </xsl:element>
-</xsl:template>
-
-<xsl:template match="sect5">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:element name="fo:{$section.container.element}"
-	       use-attribute-sets="section.level5.properties">
-    <xsl:attribute name="id"><xsl:value-of 
-                        select="$id"/></xsl:attribute>
-    <xsl:call-template name="sect5.titlepage"/>
-
-    <xsl:variable name="toc.params">
-      <xsl:call-template name="find.path.params">
-        <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <xsl:if test="contains($toc.params, 'toc')
-                  and $generate.section.toc.level &gt;= 5">
-      <xsl:call-template name="section.toc">
-        <xsl:with-param name="toc.title.p" 
-                        select="contains($toc.params, 'title')"/>
-      </xsl:call-template>
-      <xsl:call-template name="section.toc.separator"/>
-    </xsl:if>
-
-    <xsl:apply-templates/>
-  </xsl:element>
-</xsl:template>
-
-<xsl:template match="simplesect">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:element name="fo:{$section.container.element}">
-    <xsl:attribute name="id"><xsl:value-of 
-                        select="$id"/></xsl:attribute>
-    <xsl:call-template name="simplesect.titlepage"/>
-    <xsl:apply-templates/>
-  </xsl:element>
-</xsl:template>
-
-<xsl:template match="sectioninfo"></xsl:template>
-<xsl:template match="section/info"></xsl:template>
-<xsl:template match="section/title"></xsl:template>
-<xsl:template match="section/titleabbrev"></xsl:template>
-<xsl:template match="section/subtitle"></xsl:template>
-
-<xsl:template match="sect1info"></xsl:template>
-<xsl:template match="sect1/info"></xsl:template>
-<xsl:template match="sect1/title"></xsl:template>
-<xsl:template match="sect1/titleabbrev"></xsl:template>
-<xsl:template match="sect1/subtitle"></xsl:template>
-
-<xsl:template match="sect2info"></xsl:template>
-<xsl:template match="sect2/info"></xsl:template>
-<xsl:template match="sect2/title"></xsl:template>
-<xsl:template match="sect2/titleabbrev"></xsl:template>
-<xsl:template match="sect2/subtitle"></xsl:template>
-
-<xsl:template match="sect3info"></xsl:template>
-<xsl:template match="sect3/info"></xsl:template>
-<xsl:template match="sect3/title"></xsl:template>
-<xsl:template match="sect3/titleabbrev"></xsl:template>
-<xsl:template match="sect3/subtitle"></xsl:template>
-
-<xsl:template match="sect4info"></xsl:template>
-<xsl:template match="sect4/info"></xsl:template>
-<xsl:template match="sect4/title"></xsl:template>
-<xsl:template match="sect4/titleabbrev"></xsl:template>
-<xsl:template match="sect4/subtitle"></xsl:template>
-
-<xsl:template match="sect5info"></xsl:template>
-<xsl:template match="sect5/info"></xsl:template>
-<xsl:template match="sect5/title"></xsl:template>
-<xsl:template match="sect5/titleabbrev"></xsl:template>
-<xsl:template match="sect5/subtitle"></xsl:template>
-
-<xsl:template match="simplesect/info"></xsl:template>
-<xsl:template match="simplesect/title"></xsl:template>
-<xsl:template match="simplesect/titleabbrev"></xsl:template>
-<xsl:template match="simplesect/subtitle"></xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="section.heading">
-  <xsl:param name="level" select="1"/>
-  <xsl:param name="marker" select="1"/>
-  <xsl:param name="title"/>
-  <xsl:param name="marker.title"/>
-
-  <fo:block xsl:use-attribute-sets="section.title.properties">
-    <xsl:if test="$marker != 0">
-      <fo:marker marker-class-name="section.head.marker">
-        <xsl:copy-of select="$marker.title"/>
-      </fo:marker>
-    </xsl:if>
-
-    <xsl:choose>
-      <xsl:when test="$level=1">
-        <fo:block xsl:use-attribute-sets="section.title.level1.properties">
-          <xsl:copy-of select="$title"/>
-        </fo:block>
-      </xsl:when>
-      <xsl:when test="$level=2">
-        <fo:block xsl:use-attribute-sets="section.title.level2.properties">
-          <xsl:copy-of select="$title"/>
-        </fo:block>
-      </xsl:when>
-      <xsl:when test="$level=3">
-        <fo:block xsl:use-attribute-sets="section.title.level3.properties">
-          <xsl:copy-of select="$title"/>
-        </fo:block>
-      </xsl:when>
-      <xsl:when test="$level=4">
-        <fo:block xsl:use-attribute-sets="section.title.level4.properties">
-          <xsl:copy-of select="$title"/>
-        </fo:block>
-      </xsl:when>
-      <xsl:when test="$level=5">
-        <fo:block xsl:use-attribute-sets="section.title.level5.properties">
-          <xsl:copy-of select="$title"/>
-        </fo:block>
-      </xsl:when>
-      <xsl:otherwise>
-        <fo:block xsl:use-attribute-sets="section.title.level6.properties">
-          <xsl:copy-of select="$title"/>
-        </fo:block>
-      </xsl:otherwise>
-    </xsl:choose>
-  </fo:block>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="bridgehead">
-  <xsl:variable name="container"
-                select="(ancestor::appendix
-                        |ancestor::article
-                        |ancestor::bibliography
-                        |ancestor::chapter
-                        |ancestor::glossary
-                        |ancestor::glossdiv
-                        |ancestor::index
-                        |ancestor::partintro
-                        |ancestor::preface
-                        |ancestor::refsect1
-                        |ancestor::refsect2
-                        |ancestor::refsect3
-                        |ancestor::sect1
-                        |ancestor::sect2
-                        |ancestor::sect3
-                        |ancestor::sect4
-                        |ancestor::sect5
-                        |ancestor::section
-                        |ancestor::setindex
-                        |ancestor::simplesect)[last()]"/>
-
-  <xsl:variable name="clevel">
-    <xsl:choose>
-      <xsl:when test="local-name($container) = 'appendix'
-                      or local-name($container) = 'chapter'
-                      or local-name($container) = 'article'
-                      or local-name($container) = 'bibliography'
-                      or local-name($container) = 'glossary'
-                      or local-name($container) = 'index'
-                      or local-name($container) = 'partintro'
-                      or local-name($container) = 'preface'
-                      or local-name($container) = 'setindex'">2</xsl:when>
-      <xsl:when test="local-name($container) = 'glossdiv'">
-        <xsl:value-of select="count(ancestor::glossdiv)+2"/>
-      </xsl:when>
-      <xsl:when test="local-name($container) = 'sect1'
-                      or local-name($container) = 'sect2'
-                      or local-name($container) = 'sect3'
-                      or local-name($container) = 'sect4'
-                      or local-name($container) = 'sect5'
-                      or local-name($container) = 'refsect1'
-                      or local-name($container) = 'refsect2'
-                      or local-name($container) = 'refsect3'
-                      or local-name($container) = 'section'
-                      or local-name($container) = 'simplesect'">
-        <xsl:variable name="slevel">
-          <xsl:call-template name="section.level">
-            <xsl:with-param name="node" select="$container"/>
-          </xsl:call-template>
-        </xsl:variable>
-        <xsl:value-of select="$slevel + 1"/>
-      </xsl:when>
-      <xsl:otherwise>2</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="level">
-    <xsl:choose>
-      <xsl:when test="@renderas = 'sect1'">1</xsl:when>
-      <xsl:when test="@renderas = 'sect2'">2</xsl:when>
-      <xsl:when test="@renderas = 'sect3'">3</xsl:when>
-      <xsl:when test="@renderas = 'sect4'">4</xsl:when>
-      <xsl:when test="@renderas = 'sect5'">5</xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$clevel"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="marker">
-    <xsl:choose>
-      <xsl:when test="$level &lt;= $marker.section.level">1</xsl:when>
-      <xsl:otherwise>0</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="marker.title">
-    <xsl:apply-templates/>
-  </xsl:variable>
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <fo:block id="{$id}">
-    <xsl:call-template name="section.heading">
-      <xsl:with-param name="level" select="$level"/>
-      <xsl:with-param name="title">
-        <xsl:apply-templates/>
-      </xsl:with-param>
-      <xsl:with-param name="marker" select="$marker"/>
-      <xsl:with-param name="marker.title" select="$marker.title"/>
-    </xsl:call-template>
-  </fo:block>
-</xsl:template>
-
-</xsl:stylesheet>
-
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/spaces.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/spaces.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,273 +1,0 @@
-<?xml version='1.0' encoding="utf-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-     XSL-FO specification treats all space characters like ordinary spaces.
-     We need to map them to fo:leader with different widths in order to
-     simulate desired behaviour.
-     ******************************************************************** -->
-
-<xsl:template match="text()[namespace-uri(..) = '']">
-  <xsl:choose>
-    <xsl:when test="$passivetex.extensions != 0">
-      <xsl:call-template name="passivetex.dash.subst">
-        <xsl:with-param name="string">
-	  <xsl:call-template name="space.2000.subst">
-	    <xsl:with-param name="string" select="."/>
-	  </xsl:call-template>
-	</xsl:with-param>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="space.2000.subst">
-	<xsl:with-param name="string" select="."/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:param name="space.enquad.width">0.5em</xsl:param>   <!-- U+2000 -->
-<xsl:param name="space.emquad.width">1em</xsl:param>     <!-- U+2001 -->
-<xsl:param name="space.enspace.width">0.5em</xsl:param>  <!-- U+2002 -->
-<xsl:param name="space.emspace.width">1em</xsl:param>    <!-- U+2003 -->
-<xsl:param name="space.3emspace.width">0.33em</xsl:param><!-- U+2004 -->
-<xsl:param name="space.4emspace.width">0.25em</xsl:param><!-- U+2005 -->
-<xsl:param name="space.6emspace.width">0.16em</xsl:param><!-- U+2006 -->
-<xsl:param name="space.figspace.width"></xsl:param>      <!-- U+2007 -->
-<xsl:param name="space.punctspace.width"></xsl:param>    <!-- U+2008 -->
-<xsl:param name="space.thinspace.width">0.2em</xsl:param><!-- U+2009 -->
-<xsl:param name="space.hairspace.width">0.1em</xsl:param><!-- U+200A -->
-
-<xsl:template name="space.2000.subst">
-  <xsl:param name="string"/>
-
-  <xsl:choose>
-    <xsl:when test="contains($string, '&#x2000;') and $space.enquad.width != ''">
-      <xsl:call-template name="space.2001.subst">
-	<xsl:with-param name="string" select="substring-before($string, '&#x2000;')"/>
-      </xsl:call-template>
-      <fo:leader leader-length="{$space.enquad.width}"/>
-      <xsl:call-template name="space.2000.subst">
-	<xsl:with-param name="string" select="substring-after($string, '&#x2000;')"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="space.2001.subst">
-	<xsl:with-param name="string" select="$string"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="space.2001.subst">
-  <xsl:param name="string"/>
-
-  <xsl:choose>
-    <xsl:when test="contains($string, '&#x2001;') and $space.emquad.width != ''">
-      <xsl:call-template name="space.2002.subst">
-	<xsl:with-param name="string" select="substring-before($string, '&#x2001;')"/>
-      </xsl:call-template>
-      <fo:leader leader-length="{$space.emquad.width}"/>
-      <xsl:call-template name="space.2001.subst">
-	<xsl:with-param name="string" select="substring-after($string, '&#x2001;')"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="space.2002.subst">
-	<xsl:with-param name="string" select="$string"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="space.2002.subst">
-  <xsl:param name="string"/>
-
-  <xsl:choose>
-    <xsl:when test="contains($string, '&#x2002;') and $space.enspace.width != ''">
-      <xsl:call-template name="space.2003.subst">
-	<xsl:with-param name="string" select="substring-before($string, '&#x2002;')"/>
-      </xsl:call-template>
-      <fo:leader leader-length="{$space.enspace.width}"/>
-      <xsl:call-template name="space.2002.subst">
-	<xsl:with-param name="string" select="substring-after($string, '&#x2002;')"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="space.2003.subst">
-	<xsl:with-param name="string" select="$string"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="space.2003.subst">
-  <xsl:param name="string"/>
-
-  <xsl:choose>
-    <xsl:when test="contains($string, '&#x2003;') and $space.emspace.width != ''">
-      <xsl:call-template name="space.2004.subst">
-	<xsl:with-param name="string" select="substring-before($string, '&#x2003;')"/>
-      </xsl:call-template>
-      <fo:leader leader-length="{$space.emspace.width}"/>
-      <xsl:call-template name="space.2003.subst">
-	<xsl:with-param name="string" select="substring-after($string, '&#x2003;')"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="space.2004.subst">
-	<xsl:with-param name="string" select="$string"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="space.2004.subst">
-  <xsl:param name="string"/>
-
-  <xsl:choose>
-    <xsl:when test="contains($string, '&#x2004;') and $space.3emspace.width != ''">
-      <xsl:call-template name="space.2005.subst">
-	<xsl:with-param name="string" select="substring-before($string, '&#x2004;')"/>
-      </xsl:call-template>
-      <fo:leader leader-length="{$space.3emspace.width}"/>
-      <xsl:call-template name="space.2004.subst">
-	<xsl:with-param name="string" select="substring-after($string, '&#x2004;')"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="space.2005.subst">
-	<xsl:with-param name="string" select="$string"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="space.2005.subst">
-  <xsl:param name="string"/>
-
-  <xsl:choose>
-    <xsl:when test="contains($string, '&#x2005;') and $space.4emspace.width != ''">
-      <xsl:call-template name="space.2006.subst">
-	<xsl:with-param name="string" select="substring-before($string, '&#x2005;')"/>
-      </xsl:call-template>
-      <fo:leader leader-length="{$space.4emspace.width}"/>
-      <xsl:call-template name="space.2005.subst">
-	<xsl:with-param name="string" select="substring-after($string, '&#x2005;')"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="space.2006.subst">
-	<xsl:with-param name="string" select="$string"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="space.2006.subst">
-  <xsl:param name="string"/>
-
-  <xsl:choose>
-    <xsl:when test="contains($string, '&#x2006;') and $space.6emspace.width != ''">
-      <xsl:call-template name="space.2007.subst">
-	<xsl:with-param name="string" select="substring-before($string, '&#x2006;')"/>
-      </xsl:call-template>
-      <fo:leader leader-length="{$space.6emspace.width}"/>
-      <xsl:call-template name="space.2006.subst">
-	<xsl:with-param name="string" select="substring-after($string, '&#x2006;')"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="space.2007.subst">
-	<xsl:with-param name="string" select="$string"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="space.2007.subst">
-  <xsl:param name="string"/>
-
-  <xsl:choose>
-    <xsl:when test="contains($string, '&#x2007;') and $space.figspace.width != ''">
-      <xsl:call-template name="space.2008.subst">
-	<xsl:with-param name="string" select="substring-before($string, '&#x2007;')"/>
-      </xsl:call-template>
-      <fo:leader leader-length="{$space.figspace.width}"/>
-      <xsl:call-template name="space.2007.subst">
-	<xsl:with-param name="string" select="substring-after($string, '&#x2007;')"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="space.2008.subst">
-	<xsl:with-param name="string" select="$string"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="space.2008.subst">
-  <xsl:param name="string"/>
-
-  <xsl:choose>
-    <xsl:when test="contains($string, '&#x2008;') and $space.punctspace.width != ''">
-      <xsl:call-template name="space.2009.subst">
-	<xsl:with-param name="string" select="substring-before($string, '&#x2008;')"/>
-      </xsl:call-template>
-      <fo:leader leader-length="{$space.punctspace.width}"/>
-      <xsl:call-template name="space.2008.subst">
-	<xsl:with-param name="string" select="substring-after($string, '&#x2008;')"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="space.2009.subst">
-	<xsl:with-param name="string" select="$string"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="space.2009.subst">
-  <xsl:param name="string"/>
-
-  <xsl:choose>
-    <xsl:when test="contains($string, '&#x2009;') and $space.thinspace.width != ''">
-      <xsl:call-template name="space.200A.subst">
-	<xsl:with-param name="string" select="substring-before($string, '&#x2009;')"/>
-      </xsl:call-template>
-      <fo:leader leader-length="{$space.thinspace.width}"/>
-      <xsl:call-template name="space.2009.subst">
-	<xsl:with-param name="string" select="substring-after($string, '&#x2009;')"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="space.200A.subst">
-	<xsl:with-param name="string" select="$string"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="space.200A.subst">
-  <xsl:param name="string"/>
-
-  <xsl:choose>
-    <xsl:when test="contains($string, '&#x200A;') and $space.hairspace.width != ''">
-      <xsl:value-of select="substring-before($string, '&#x200A;')"/>
-      <fo:leader leader-length="{$space.hairspace.width}"/>
-      <xsl:call-template name="space.200A.subst">
-	<xsl:with-param name="string" select="substring-after($string, '&#x200A;')"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$string"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-</xsl:stylesheet>
-
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/synop.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/synop.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,967 +1,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE xsl:stylesheet [
-<!ENTITY RE "&#10;">
-<!ENTITY nbsp "&#160;">
-]>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<!-- synopsis is in verbatim -->
-
-<!-- ==================================================================== -->
-
-<xsl:template match="cmdsynopsis">
-  <fo:block xsl:use-attribute-sets="normal.para.spacing">
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="cmdsynopsis/command">
-  <xsl:call-template name="inline.monoseq"/>
-  <xsl:text> </xsl:text>
-</xsl:template>
-
-<xsl:template match="cmdsynopsis/command[1]" priority="2">
-  <xsl:call-template name="inline.monoseq"/>
-  <xsl:text> </xsl:text>
-</xsl:template>
-
-<xsl:template match="group|arg" name="group-or-arg">
-  <xsl:variable name="choice" select="@choice"/>
-  <xsl:variable name="rep" select="@rep"/>
-  <xsl:variable name="sepchar">
-    <xsl:choose>
-      <xsl:when test="ancestor-or-self::*/@sepchar">
-        <xsl:value-of select="ancestor-or-self::*/@sepchar"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:text> </xsl:text>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-  <xsl:if test="preceding-sibling::*">
-    <xsl:value-of select="$sepchar"/>
-  </xsl:if>
-  <xsl:choose>
-    <xsl:when test="$choice='plain'">
-      <xsl:value-of select="$arg.choice.plain.open.str"/>
-    </xsl:when>
-    <xsl:when test="$choice='req'">
-      <xsl:value-of select="$arg.choice.req.open.str"/>
-    </xsl:when>
-    <xsl:when test="$choice='opt'">
-      <xsl:value-of select="$arg.choice.opt.open.str"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$arg.choice.def.open.str"/>
-    </xsl:otherwise>
-  </xsl:choose>
-  <xsl:apply-templates/>
-  <xsl:choose>
-    <xsl:when test="$rep='repeat'">
-      <xsl:value-of select="$arg.rep.repeat.str"/>
-    </xsl:when>
-    <xsl:when test="$rep='norepeat'">
-      <xsl:value-of select="$arg.rep.norepeat.str"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$arg.rep.def.str"/>
-    </xsl:otherwise>
-  </xsl:choose>
-  <xsl:choose>
-    <xsl:when test="$choice='plain'">
-      <xsl:value-of select="$arg.choice.plain.close.str"/>
-    </xsl:when>
-    <xsl:when test="$choice='req'">
-      <xsl:value-of select="$arg.choice.req.close.str"/>
-    </xsl:when>
-    <xsl:when test="$choice='opt'">
-      <xsl:value-of select="$arg.choice.opt.close.str"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$arg.choice.def.close.str"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="group/arg">
-  <xsl:variable name="choice" select="@choice"/>
-  <xsl:variable name="rep" select="@rep"/>
-  <xsl:if test="preceding-sibling::*">
-    <xsl:value-of select="$arg.or.sep"/>
-  </xsl:if>
-  <xsl:call-template name="group-or-arg"/>
-</xsl:template>
-
-<xsl:template match="sbr">
-  <fo:block/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="synopfragmentref">
-  <xsl:variable name="target" select="key('id',@linkend)"/>
-  <xsl:variable name="snum">
-    <xsl:apply-templates select="$target" mode="synopfragment.number"/>
-  </xsl:variable>
-  <fo:inline font-style="italic">
-    <fo:basic-link internal-destination="{@linkend}"
-                   xsl:use-attribute-sets="xref.properties">
-      <xsl:text>(</xsl:text>
-      <xsl:value-of select="$snum"/>
-      <xsl:text>)</xsl:text>
-    </fo:basic-link>
-    <xsl:text>&#160;</xsl:text>
-    <xsl:apply-templates/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="synopfragment" mode="synopfragment.number">
-  <xsl:number format="1"/>
-</xsl:template>
-
-<xsl:template match="synopfragment">
-  <xsl:variable name="snum">
-    <xsl:apply-templates select="." mode="synopfragment.number"/>
-  </xsl:variable>
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-  <fo:block id="{$id}">
-    <xsl:text>(</xsl:text>
-    <xsl:value-of select="$snum"/>
-    <xsl:text>)</xsl:text>
-    <xsl:text> </xsl:text>
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="funcsynopsis">
-  <xsl:call-template name="informal.object"/>
-</xsl:template>
-
-<xsl:template match="funcsynopsisinfo">
-  <fo:block space-after.minimum="0.8em"
-            space-after.optimum="1em"
-            space-after.maximum="1.2em">
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="funcprototype">
-  <fo:block font-family="{$monospace.font.family}"
-          space-before.minimum="0.8em"
-          space-before.optimum="1em"
-          space-before.maximum="1.2em">
-    <xsl:apply-templates/>
-    <xsl:if test="$funcsynopsis.style='kr'">
-      <fo:block
-          space-before.minimum="0.8em"
-          space-before.optimum="1em"
-          space-before.maximum="1.2em">
-      <xsl:apply-templates select="./paramdef" mode="kr-funcsynopsis-mode"/>
-      </fo:block>
-    </xsl:if>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="funcdef">
-  <fo:inline font-family="{$monospace.font.family}">
-    <xsl:apply-templates/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="funcdef/function">
-  <xsl:choose>
-    <xsl:when test="$funcsynopsis.decoration != 0">
-      <fo:inline font-weight="bold">
-        <xsl:apply-templates/>
-      </fo:inline>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="void">
-  <xsl:choose>
-    <xsl:when test="$funcsynopsis.style='ansi'">
-      <xsl:text>(void);</xsl:text>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:text>();</xsl:text>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="varargs">
-  <xsl:text>(...);</xsl:text>
-</xsl:template>
-
-<xsl:template match="paramdef">
-  <xsl:variable name="paramnum">
-    <xsl:number count="paramdef" format="1"/>
-  </xsl:variable>
-  <xsl:if test="$paramnum=1">(</xsl:if>
-  <xsl:choose>
-    <xsl:when test="$funcsynopsis.style='ansi'">
-      <xsl:apply-templates/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates select="./parameter"/>
-    </xsl:otherwise>
-  </xsl:choose>
-  <xsl:choose>
-    <xsl:when test="following-sibling::paramdef">
-      <xsl:text>, </xsl:text>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:text>);</xsl:text>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="paramdef/parameter">
-  <xsl:choose>
-    <xsl:when test="$funcsynopsis.decoration != 0">
-      <xsl:call-template name="inline.italicseq"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates/>
-    </xsl:otherwise>
-  </xsl:choose>
-  <xsl:if test="following-sibling::parameter">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="paramdef" mode="kr-funcsynopsis-mode">
-  <fo:block>
-    <xsl:apply-templates/>
-    <xsl:text>;</xsl:text>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="funcparams">
-  <xsl:text>(</xsl:text>
-  <xsl:apply-templates/>
-  <xsl:text>)</xsl:text>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:variable name="default-classsynopsis-language">java</xsl:variable>
-
-<xsl:template match="classsynopsis
-                     |fieldsynopsis
-                     |methodsynopsis
-                     |constructorsynopsis
-                     |destructorsynopsis">
-  <xsl:param name="language">
-    <xsl:choose>
-      <xsl:when test="@language">
-	<xsl:value-of select="@language"/>
-      </xsl:when>
-      <xsl:otherwise>
-	<xsl:value-of select="$default-classsynopsis-language"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:param>
-
-  <!--
-  <xsl:message>process <xsl:value-of select="local-name(.)"/> in <xsl:value-of select="$language"/></xsl:message>
-  -->
-
-  <xsl:choose>
-    <xsl:when test="$language='java' or $language='Java'">
-      <xsl:apply-templates select="." mode="java"/>
-    </xsl:when>
-    <xsl:when test="$language='perl' or $language='Perl'">
-      <xsl:apply-templates select="." mode="perl"/>
-    </xsl:when>
-    <xsl:when test="$language='idl' or $language='IDL'">
-      <xsl:apply-templates select="." mode="idl"/>
-    </xsl:when>
-    <xsl:when test="$language='cpp' or $language='c++' or $language='C++'">
-      <xsl:apply-templates select="." mode="cpp"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:message>
-	<xsl:text>Unrecognized language on </xsl:text>
-        <xsl:value-of select="local-name(.)"/>
-        <xsl:text>: </xsl:text>
-	<xsl:value-of select="$language"/>
-      </xsl:message>
-      <xsl:apply-templates select=".">
-	<xsl:with-param name="language"
-	  select="$default-classsynopsis-language"/>
-      </xsl:apply-templates>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="synop-break">
-  <xsl:if test="parent::classsynopsis
-                or (following-sibling::fieldsynopsis
-                    |following-sibling::methodsynopsis
-                    |following-sibling::constructorsynopsis
-                    |following-sibling::destructorsynopsis)">
-    <fo:inline>&RE;</fo:inline>
-  </xsl:if>
-</xsl:template>
-
-<!-- ===== Java ======================================================== -->
-
-<xsl:template match="classsynopsis" mode="java">
-  <fo:block wrap-option='no-wrap'
-            white-space-collapse='false'
-            linefeed-treatment="preserve"
-            xsl:use-attribute-sets="monospace.verbatim.properties">
-    <xsl:apply-templates select="ooclass[1]" mode="java"/>
-    <xsl:if test="ooclass[preceding-sibling::*]">
-      <xsl:text> extends</xsl:text>
-      <xsl:apply-templates select="ooclass[preceding-sibling::*]" mode="java"/>
-      <xsl:if test="oointerface|ooexception">
-        <xsl:text>&RE;&nbsp;&nbsp;&nbsp;&nbsp;</xsl:text>
-      </xsl:if>
-    </xsl:if>
-    <xsl:if test="oointerface">
-      <xsl:text>implements</xsl:text>
-      <xsl:apply-templates select="oointerface" mode="java"/>
-      <xsl:if test="ooexception">
-	<xsl:text>&RE;&nbsp;&nbsp;&nbsp;&nbsp;</xsl:text>
-      </xsl:if>
-    </xsl:if>
-    <xsl:if test="ooexception">
-      <xsl:text>throws</xsl:text>
-      <xsl:apply-templates select="ooexception" mode="java"/>
-    </xsl:if>
-    <xsl:text>&nbsp;{&RE;</xsl:text>
-    <xsl:apply-templates select="constructorsynopsis
-                                 |destructorsynopsis
-                                 |fieldsynopsis
-                                 |methodsynopsis
-                                 |classsynopsisinfo" mode="java"/>
-    <xsl:text>}</xsl:text>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="classsynopsisinfo" mode="java">
-  <xsl:apply-templates mode="java"/>
-</xsl:template>
-
-<xsl:template match="ooclass|oointerface|ooexception" mode="java">
-  <xsl:choose>
-    <xsl:when test="preceding-sibling::*">
-      <xsl:text>, </xsl:text>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:text> </xsl:text>
-    </xsl:otherwise>
-  </xsl:choose>
-  <xsl:apply-templates mode="java"/>
-</xsl:template>
-
-<xsl:template match="modifier|package" mode="java">
-  <xsl:apply-templates mode="java"/>
-  <xsl:if test="following-sibling::*">
-    <xsl:text>&nbsp;</xsl:text>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="classname" mode="java">
-  <xsl:if test="local-name(preceding-sibling::*[1]) = 'classname'">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <xsl:apply-templates mode="java"/>
-</xsl:template>
-
-<xsl:template match="interfacename" mode="java">
-  <xsl:if test="local-name(preceding-sibling::*[1]) = 'interfacename'">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <xsl:apply-templates mode="java"/>
-</xsl:template>
-
-<xsl:template match="exceptionname" mode="java">
-  <xsl:if test="local-name(preceding-sibling::*[1]) = 'exceptionname'">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <xsl:apply-templates mode="java"/>
-</xsl:template>
-
-<xsl:template match="fieldsynopsis" mode="java">
-  <fo:block wrap-option='no-wrap'
-            white-space-collapse='false'
-            linefeed-treatment="preserve"
-            xsl:use-attribute-sets="monospace.verbatim.properties">
-    <xsl:text>&nbsp;&nbsp;</xsl:text>
-    <xsl:apply-templates mode="java"/>
-    <xsl:text>;</xsl:text>
-    <xsl:call-template name="synop-break"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="type" mode="java">
-  <xsl:apply-templates mode="java"/>
-  <xsl:text>&nbsp;</xsl:text>
-</xsl:template>
-
-<xsl:template match="varname" mode="java">
-  <xsl:apply-templates mode="java"/>
-  <xsl:text>&nbsp;</xsl:text>
-</xsl:template>
-
-<xsl:template match="initializer" mode="java">
-  <xsl:text>=&nbsp;</xsl:text>
-  <xsl:apply-templates mode="java"/>
-</xsl:template>
-
-<xsl:template match="void" mode="java">
-  <xsl:text>void&nbsp;</xsl:text>
-</xsl:template>
-
-<xsl:template match="methodname" mode="java">
-  <xsl:apply-templates mode="java"/>
-</xsl:template>
-
-<xsl:template match="methodparam" mode="java">
-  <xsl:param name="indent">0</xsl:param>
-  <xsl:if test="preceding-sibling::methodparam">
-    <xsl:text>,&RE;</xsl:text>
-    <xsl:if test="$indent &gt; 0">
-      <xsl:call-template name="copy-string">
-	<xsl:with-param name="string">&nbsp;</xsl:with-param>
-	<xsl:with-param name="count" select="$indent + 1"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:if>
-  <xsl:apply-templates mode="java"/>
-</xsl:template>
-
-<xsl:template match="parameter" mode="java">
-  <xsl:apply-templates mode="java"/>
-</xsl:template>
-
-<xsl:template mode="java"
-  match="constructorsynopsis|destructorsynopsis|methodsynopsis">
-  <xsl:variable name="start-modifiers" select="modifier[following-sibling::*[local-name(.) != 'modifier']]"/>
-  <xsl:variable name="notmod" select="*[local-name(.) != 'modifier']"/>
-  <xsl:variable name="end-modifiers" select="modifier[preceding-sibling::*[local-name(.) != 'modifier']]"/>
-  <xsl:variable name="decl">
-    <xsl:text>  </xsl:text>
-    <xsl:apply-templates select="$start-modifiers" mode="java"/>
-
-    <!-- type -->
-    <xsl:if test="local-name($notmod[1]) != 'methodname'">
-      <xsl:apply-templates select="$notmod[1]" mode="java"/>
-    </xsl:if>
-
-    <xsl:apply-templates select="methodname" mode="java"/>
-  </xsl:variable>
-
-  <fo:block wrap-option='no-wrap'
-            white-space-collapse='false'
-            linefeed-treatment="preserve"
-            xsl:use-attribute-sets="monospace.verbatim.properties">
-    <xsl:copy-of select="$decl"/>
-    <xsl:text>(</xsl:text>
-    <xsl:apply-templates select="methodparam" mode="java">
-      <xsl:with-param name="indent" select="string-length($decl)"/>
-    </xsl:apply-templates>
-    <xsl:text>)</xsl:text>
-    <xsl:if test="exceptionname">
-      <xsl:text>&RE;&nbsp;&nbsp;&nbsp;&nbsp;throws&nbsp;</xsl:text>
-      <xsl:apply-templates select="exceptionname" mode="java"/>
-    </xsl:if>
-    <xsl:if test="modifier[preceding-sibling::*[local-name(.) != 'modifier']]">
-      <xsl:text> </xsl:text>
-      <xsl:apply-templates select="$end-modifiers" mode="java"/>
-    </xsl:if>
-    <xsl:text>;</xsl:text>
-  </fo:block>
-  <xsl:call-template name="synop-break"/>
-</xsl:template>
-
-<!-- ===== C++ ========================================================= -->
-
-<xsl:template match="classsynopsis" mode="cpp">
-  <fo:block wrap-option='no-wrap'
-            white-space-collapse='false'
-            linefeed-treatment="preserve"
-            xsl:use-attribute-sets="monospace.verbatim.properties">
-    <xsl:apply-templates select="ooclass[1]" mode="cpp"/>
-    <xsl:if test="ooclass[preceding-sibling::*]">
-      <xsl:text>: </xsl:text>
-      <xsl:apply-templates select="ooclass[preceding-sibling::*]" mode="cpp"/>
-      <xsl:if test="oointerface|ooexception">
-	<xsl:text>&RE;&nbsp;&nbsp;&nbsp;&nbsp;</xsl:text>
-      </xsl:if>
-    </xsl:if>
-    <xsl:if test="oointerface">
-      <xsl:text> implements</xsl:text>
-      <xsl:apply-templates select="oointerface" mode="cpp"/>
-      <xsl:if test="ooexception">
-	<xsl:text>&RE;&nbsp;&nbsp;&nbsp;&nbsp;</xsl:text>
-      </xsl:if>
-    </xsl:if>
-    <xsl:if test="ooexception">
-      <xsl:text> throws</xsl:text>
-      <xsl:apply-templates select="ooexception" mode="cpp"/>
-    </xsl:if>
-    <xsl:text>&nbsp;{&RE;</xsl:text>
-    <xsl:apply-templates select="constructorsynopsis
-                                 |destructorsynopsis
-                                 |fieldsynopsis
-                                 |methodsynopsis
-                                 |classsynopsisinfo" mode="cpp"/>
-    <xsl:text>}</xsl:text>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="classsynopsisinfo" mode="cpp">
-  <xsl:apply-templates mode="cpp"/>
-</xsl:template>
-
-<xsl:template match="ooclass|oointerface|ooexception" mode="cpp">
-  <xsl:if test="preceding-sibling::*">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <xsl:apply-templates mode="cpp"/>
-</xsl:template>
-
-<xsl:template match="modifier|package" mode="cpp">
-  <xsl:apply-templates mode="cpp"/>
-    <xsl:if test="following-sibling::*">
-      <xsl:text>&nbsp;</xsl:text>
-    </xsl:if>
-</xsl:template>
-
-<xsl:template match="classname" mode="cpp">
-  <xsl:if test="local-name(preceding-sibling::*[1]) = 'classname'">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <xsl:apply-templates mode="cpp"/>
-</xsl:template>
-
-<xsl:template match="interfacename" mode="cpp">
-  <xsl:if test="local-name(preceding-sibling::*[1]) = 'interfacename'">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <xsl:apply-templates mode="cpp"/>
-</xsl:template>
-
-<xsl:template match="exceptionname" mode="cpp">
-  <xsl:if test="local-name(preceding-sibling::*[1]) = 'exceptionname'">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <xsl:apply-templates mode="cpp"/>
-</xsl:template>
-
-<xsl:template match="fieldsynopsis" mode="cpp">
-  <fo:block wrap-option='no-wrap'
-            white-space-collapse='false'
-            linefeed-treatment="preserve"
-            xsl:use-attribute-sets="monospace.verbatim.properties">
-    <xsl:text>&nbsp;&nbsp;</xsl:text>
-    <xsl:apply-templates mode="cpp"/>
-    <xsl:text>;</xsl:text>
-  </fo:block>
-  <xsl:call-template name="synop-break"/>
-</xsl:template>
-
-<xsl:template match="type" mode="cpp">
-  <xsl:apply-templates mode="cpp"/>
-  <xsl:text>&nbsp;</xsl:text>
-</xsl:template>
-
-<xsl:template match="varname" mode="cpp">
-  <xsl:apply-templates mode="cpp"/>
-  <xsl:text>&nbsp;</xsl:text>
-</xsl:template>
-
-<xsl:template match="initializer" mode="cpp">
-  <xsl:text>=&nbsp;</xsl:text>
-  <xsl:apply-templates mode="cpp"/>
-</xsl:template>
-
-<xsl:template match="void" mode="cpp">
-  <xsl:text>void&nbsp;</xsl:text>
-</xsl:template>
-
-<xsl:template match="methodname" mode="cpp">
-  <xsl:apply-templates mode="cpp"/>
-</xsl:template>
-
-<xsl:template match="methodparam" mode="cpp">
-  <xsl:if test="preceding-sibling::methodparam">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <xsl:apply-templates mode="cpp"/>
-</xsl:template>
-
-<xsl:template match="parameter" mode="cpp">
-  <xsl:apply-templates mode="cpp"/>
-</xsl:template>
-
-<xsl:template mode="cpp"
-  match="constructorsynopsis|destructorsynopsis|methodsynopsis">
-  <xsl:variable name="start-modifiers" select="modifier[following-sibling::*[local-name(.) != 'modifier']]"/>
-  <xsl:variable name="notmod" select="*[local-name(.) != 'modifier']"/>
-  <xsl:variable name="end-modifiers" select="modifier[preceding-sibling::*[local-name(.) != 'modifier']]"/>
-
-  <fo:block wrap-option='no-wrap'
-            white-space-collapse='false'
-            linefeed-treatment="preserve"
-            xsl:use-attribute-sets="monospace.verbatim.properties">
-    <xsl:text>  </xsl:text>
-    <xsl:apply-templates select="$start-modifiers" mode="cpp"/>
-
-    <!-- type -->
-    <xsl:if test="local-name($notmod[1]) != 'methodname'">
-      <xsl:apply-templates select="$notmod[1]" mode="cpp"/>
-    </xsl:if>
-
-    <xsl:apply-templates select="methodname" mode="cpp"/>
-    <xsl:text>(</xsl:text>
-    <xsl:apply-templates select="methodparam" mode="cpp"/>
-    <xsl:text>)</xsl:text>
-    <xsl:if test="exceptionname">
-      <xsl:text>&RE;&nbsp;&nbsp;&nbsp;&nbsp;throws&nbsp;</xsl:text>
-      <xsl:apply-templates select="exceptionname" mode="cpp"/>
-    </xsl:if>
-    <xsl:if test="modifier[preceding-sibling::*[local-name(.) != 'modifier']]">
-      <xsl:text> </xsl:text>
-      <xsl:apply-templates select="$end-modifiers" mode="cpp"/>
-    </xsl:if>
-    <xsl:text>;</xsl:text>
-  </fo:block>
-  <xsl:call-template name="synop-break"/>
-</xsl:template>
-
-<!-- ===== IDL ========================================================= -->
-
-<xsl:template match="classsynopsis" mode="idl">
-  <fo:block wrap-option='no-wrap'
-            white-space-collapse='false'
-            linefeed-treatment="preserve"
-            xsl:use-attribute-sets="monospace.verbatim.properties">
-    <xsl:text>interface </xsl:text>
-    <xsl:apply-templates select="ooclass[1]" mode="idl"/>
-    <xsl:if test="ooclass[preceding-sibling::*]">
-      <xsl:text>: </xsl:text>
-      <xsl:apply-templates select="ooclass[preceding-sibling::*]" mode="idl"/>
-      <xsl:if test="oointerface|ooexception">
-	<xsl:text>&RE;&nbsp;&nbsp;&nbsp;&nbsp;</xsl:text>
-      </xsl:if>
-    </xsl:if>
-    <xsl:if test="oointerface">
-      <xsl:text> implements</xsl:text>
-      <xsl:apply-templates select="oointerface" mode="idl"/>
-      <xsl:if test="ooexception">
-	<xsl:text>&RE;&nbsp;&nbsp;&nbsp;&nbsp;</xsl:text>
-      </xsl:if>
-    </xsl:if>
-    <xsl:if test="ooexception">
-      <xsl:text> throws</xsl:text>
-      <xsl:apply-templates select="ooexception" mode="idl"/>
-    </xsl:if>
-    <xsl:text>&nbsp;{&RE;</xsl:text>
-    <xsl:apply-templates select="constructorsynopsis
-                                 |destructorsynopsis
-                                 |fieldsynopsis
-                                 |methodsynopsis
-                                 |classsynopsisinfo" mode="idl"/>
-    <xsl:text>}</xsl:text>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="classsynopsisinfo" mode="idl">
-  <xsl:apply-templates mode="idl"/>
-</xsl:template>
-
-<xsl:template match="ooclass|oointerface|ooexception" mode="idl">
-  <xsl:if test="preceding-sibling::*">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <xsl:apply-templates mode="idl"/>
-</xsl:template>
-
-<xsl:template match="modifier|package" mode="idl">
-  <xsl:apply-templates mode="idl"/>
-    <xsl:if test="following-sibling::*">
-      <xsl:text>&nbsp;</xsl:text>
-    </xsl:if>
-</xsl:template>
-
-<xsl:template match="classname" mode="idl">
-  <xsl:if test="local-name(preceding-sibling::*[1]) = 'classname'">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <xsl:apply-templates mode="idl"/>
-</xsl:template>
-
-<xsl:template match="interfacename" mode="idl">
-  <xsl:if test="local-name(preceding-sibling::*[1]) = 'interfacename'">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <xsl:apply-templates mode="idl"/>
-</xsl:template>
-
-<xsl:template match="exceptionname" mode="idl">
-  <xsl:if test="local-name(preceding-sibling::*[1]) = 'exceptionname'">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <xsl:apply-templates mode="idl"/>
-</xsl:template>
-
-<xsl:template match="fieldsynopsis" mode="idl">
-  <fo:block wrap-option='no-wrap'
-            white-space-collapse='false'
-            linefeed-treatment="preserve"
-            xsl:use-attribute-sets="monospace.verbatim.properties">
-    <xsl:text>&nbsp;&nbsp;</xsl:text>
-    <xsl:apply-templates mode="idl"/>
-    <xsl:text>;</xsl:text>
-  </fo:block>
-  <xsl:call-template name="synop-break"/>
-</xsl:template>
-
-<xsl:template match="type" mode="idl">
-  <xsl:apply-templates mode="idl"/>
-  <xsl:text>&nbsp;</xsl:text>
-</xsl:template>
-
-<xsl:template match="varname" mode="idl">
-  <xsl:apply-templates mode="idl"/>
-  <xsl:text>&nbsp;</xsl:text>
-</xsl:template>
-
-<xsl:template match="initializer" mode="idl">
-  <xsl:text>=&nbsp;</xsl:text>
-  <xsl:apply-templates mode="idl"/>
-</xsl:template>
-
-<xsl:template match="void" mode="idl">
-  <xsl:text>void&nbsp;</xsl:text>
-</xsl:template>
-
-<xsl:template match="methodname" mode="idl">
-  <xsl:apply-templates mode="idl"/>
-</xsl:template>
-
-<xsl:template match="methodparam" mode="idl">
-  <xsl:if test="preceding-sibling::methodparam">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <xsl:apply-templates mode="idl"/>
-</xsl:template>
-
-<xsl:template match="parameter" mode="idl">
-  <xsl:apply-templates mode="idl"/>
-</xsl:template>
-
-<xsl:template mode="idl"
-  match="constructorsynopsis|destructorsynopsis|methodsynopsis">
-  <xsl:variable name="start-modifiers" select="modifier[following-sibling::*[local-name(.) != 'modifier']]"/>
-  <xsl:variable name="notmod" select="*[local-name(.) != 'modifier']"/>
-  <xsl:variable name="end-modifiers" select="modifier[preceding-sibling::*[local-name(.) != 'modifier']]"/>
-
-  <fo:block wrap-option='no-wrap'
-            white-space-collapse='false'
-            linefeed-treatment="preserve"
-            xsl:use-attribute-sets="monospace.verbatim.properties">
-    <xsl:text>  </xsl:text>
-    <xsl:apply-templates select="$start-modifiers" mode="idl"/>
-
-    <!-- type -->
-    <xsl:if test="local-name($notmod[1]) != 'methodname'">
-      <xsl:apply-templates select="$notmod[1]" mode="idl"/>
-    </xsl:if>
-
-    <xsl:apply-templates select="methodname" mode="idl"/>
-    <xsl:text>(</xsl:text>
-    <xsl:apply-templates select="methodparam" mode="idl"/>
-    <xsl:text>)</xsl:text>
-    <xsl:if test="exceptionname">
-      <xsl:text>&RE;&nbsp;&nbsp;&nbsp;&nbsp;raises(</xsl:text>
-      <xsl:apply-templates select="exceptionname" mode="idl"/>
-      <xsl:text>)</xsl:text>
-    </xsl:if>
-    <xsl:if test="modifier[preceding-sibling::*[local-name(.) != 'modifier']]">
-      <xsl:text> </xsl:text>
-      <xsl:apply-templates select="$end-modifiers" mode="idl"/>
-    </xsl:if>
-    <xsl:text>;</xsl:text>
-  </fo:block>
-  <xsl:call-template name="synop-break"/>
-</xsl:template>
-
-<!-- ===== Perl ======================================================== -->
-
-<xsl:template match="classsynopsis" mode="perl">
-  <fo:block wrap-option='no-wrap'
-            white-space-collapse='false'
-            linefeed-treatment="preserve"
-            xsl:use-attribute-sets="monospace.verbatim.properties">
-    <xsl:text>package </xsl:text>
-    <xsl:apply-templates select="ooclass[1]" mode="perl"/>
-    <xsl:text>;&RE;</xsl:text>
-
-    <xsl:if test="ooclass[preceding-sibling::*]">
-      <xsl:text>@ISA = (</xsl:text>
-      <xsl:apply-templates select="ooclass[preceding-sibling::*]" mode="perl"/>
-      <xsl:text>);&RE;</xsl:text>
-    </xsl:if>
-
-    <xsl:apply-templates select="constructorsynopsis
-                                 |destructorsynopsis
-                                 |fieldsynopsis
-                                 |methodsynopsis
-                                 |classsynopsisinfo" mode="perl"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="classsynopsisinfo" mode="perl">
-  <xsl:apply-templates mode="perl"/>
-</xsl:template>
-
-<xsl:template match="ooclass|oointerface|ooexception" mode="perl">
-  <xsl:if test="preceding-sibling::*">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <xsl:apply-templates mode="perl"/>
-</xsl:template>
-
-<xsl:template match="modifier|package" mode="perl">
-  <xsl:apply-templates mode="perl"/>
-    <xsl:if test="following-sibling::*">
-      <xsl:text>&nbsp;</xsl:text>
-    </xsl:if>
-</xsl:template>
-
-<xsl:template match="classname" mode="perl">
-  <xsl:if test="local-name(preceding-sibling::*[1]) = 'classname'">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <xsl:apply-templates mode="perl"/>
-</xsl:template>
-
-<xsl:template match="interfacename" mode="perl">
-  <xsl:if test="local-name(preceding-sibling::*[1]) = 'interfacename'">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <xsl:apply-templates mode="perl"/>
-</xsl:template>
-
-<xsl:template match="exceptionname" mode="perl">
-  <xsl:if test="local-name(preceding-sibling::*[1]) = 'exceptionname'">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <xsl:apply-templates mode="perl"/>
-</xsl:template>
-
-<xsl:template match="fieldsynopsis" mode="perl">
-  <fo:block wrap-option='no-wrap'
-            white-space-collapse='false'
-            linefeed-treatment="preserve"
-            xsl:use-attribute-sets="monospace.verbatim.properties">
-    <xsl:text>&nbsp;&nbsp;</xsl:text>
-    <xsl:apply-templates mode="perl"/>
-    <xsl:text>;</xsl:text>
-  </fo:block>
-  <xsl:call-template name="synop-break"/>
-</xsl:template>
-
-<xsl:template match="type" mode="perl">
-  <xsl:apply-templates mode="perl"/>
-  <xsl:text>&nbsp;</xsl:text>
-</xsl:template>
-
-<xsl:template match="varname" mode="perl">
-  <xsl:apply-templates mode="perl"/>
-  <xsl:text>&nbsp;</xsl:text>
-</xsl:template>
-
-<xsl:template match="initializer" mode="perl">
-  <xsl:text>=&nbsp;</xsl:text>
-  <xsl:apply-templates mode="perl"/>
-</xsl:template>
-
-<xsl:template match="void" mode="perl">
-  <xsl:text>void&nbsp;</xsl:text>
-</xsl:template>
-
-<xsl:template match="methodname" mode="perl">
-  <xsl:apply-templates mode="perl"/>
-</xsl:template>
-
-<xsl:template match="methodparam" mode="perl">
-  <xsl:if test="preceding-sibling::methodparam">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <xsl:apply-templates mode="perl"/>
-</xsl:template>
-
-<xsl:template match="parameter" mode="perl">
-  <xsl:apply-templates mode="perl"/>
-</xsl:template>
-
-<xsl:template mode="perl"
-  match="constructorsynopsis|destructorsynopsis|methodsynopsis">
-  <xsl:variable name="start-modifiers" select="modifier[following-sibling::*[local-name(.) != 'modifier']]"/>
-  <xsl:variable name="notmod" select="*[local-name(.) != 'modifier']"/>
-  <xsl:variable name="end-modifiers" select="modifier[preceding-sibling::*[local-name(.) != 'modifier']]"/>
-
-  <fo:block wrap-option='no-wrap'
-            white-space-collapse='false'
-            linefeed-treatment="preserve"
-            xsl:use-attribute-sets="monospace.verbatim.properties">
-    <xsl:text>sub </xsl:text>
-
-    <xsl:apply-templates select="methodname" mode="perl"/>
-    <xsl:text> { ... };</xsl:text>
-    <xsl:call-template name="synop-break"/>
-  </fo:block>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<!-- * DocBook 5 allows linking elements (link, olink, and xref) -->
-<!-- * within the OO *synopsis elements (classsynopsis, fieldsynopsis, -->
-<!-- * methodsynopsis, constructorsynopsis, destructorsynopsis) and -->
-<!-- * their children. So we need to have mode="java|cpp|idl|perl" -->
-<!-- * per-mode matches for those linking elements in order for them -->
-<!-- * to be processed as expected. -->
-
-<xsl:template match="link|olink|xref" mode="java">
-  <xsl:apply-templates select="."/>
-</xsl:template>
-
-<xsl:template match="link|olink|xref" mode="cpp">
-  <xsl:apply-templates select="."/>
-</xsl:template>
-
-<xsl:template match="link|olink|xref" mode="idl">
-  <xsl:apply-templates select="."/>
-</xsl:template>
-
-<xsl:template match="link|olink|xref" mode="perl">
-  <xsl:apply-templates select="."/>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/table.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/table.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,1535 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                xmlns:rx="http://www.renderx.com/XSL/Extensions"
-                xmlns:stbl="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.Table"
-                xmlns:xtbl="com.nwalsh.xalan.Table"
-                xmlns:lxslt="http://xml.apache.org/xslt"
-                xmlns:ptbl="http://nwalsh.com/xslt/ext/xsltproc/python/Table"
-                exclude-result-prefixes="doc stbl xtbl lxslt ptbl"
-                version='1.0'>
-
-<xsl:include href="../common/table.xsl"/>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<doc:reference xmlns="" xml:id="table-templates">
-  <?dbhtml dir="fo"?>
-  <info>
-    <title>Formatting Object Table Reference</title>
-    <releaseinfo role="meta">
-      $Id$
-    </releaseinfo>
-  </info>
-  <partintro xml:id="partintro">
-    <title>Introduction</title>
-    <para>This is technical reference documentation for the FO
-      table-processing templates in the DocBook XSL Stylesheets.</para>
-    <para>This is not intended to be user documentation.  It is
-      provided for developers writing customization layers for the
-      stylesheets.</para>
-  </partintro>
-</doc:reference>
-
-<!-- ==================================================================== -->
-
-<lxslt:component prefix="xtbl"
-                 functions="adjustColumnWidths"/>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="make.table.content">
-  <xsl:choose>
-    <xsl:when test="tgroup|mediaobject|graphic">
-      <xsl:call-template name="calsTable"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates select="." mode="htmlTable"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="calsTable">
-
-  <xsl:variable name="keep.together">
-    <xsl:call-template name="pi.dbfo_keep-together"/>
-  </xsl:variable>
-
-  <xsl:for-each select="tgroup">
-
-    <fo:table xsl:use-attribute-sets="table.table.properties">
-      <xsl:if test="$keep.together != ''">
-        <xsl:attribute name="keep-together.within-column">
-          <xsl:value-of select="$keep.together"/>
-        </xsl:attribute>
-      </xsl:if>
-      <xsl:call-template name="table.frame"/>
-      <xsl:if test="following-sibling::tgroup">
-        <xsl:attribute name="border-bottom-width">0pt</xsl:attribute>
-        <xsl:attribute name="border-bottom-style">none</xsl:attribute>
-        <xsl:attribute name="padding-bottom">0pt</xsl:attribute>
-        <xsl:attribute name="margin-bottom">0pt</xsl:attribute>
-        <xsl:attribute name="space-after">0pt</xsl:attribute>
-        <xsl:attribute name="space-after.minimum">0pt</xsl:attribute>
-        <xsl:attribute name="space-after.optimum">0pt</xsl:attribute>
-        <xsl:attribute name="space-after.maximum">0pt</xsl:attribute>
-      </xsl:if>
-      <xsl:if test="preceding-sibling::tgroup">
-        <xsl:attribute name="border-top-width">0pt</xsl:attribute>
-        <xsl:attribute name="border-top-style">none</xsl:attribute>
-        <xsl:attribute name="padding-top">0pt</xsl:attribute>
-        <xsl:attribute name="margin-top">0pt</xsl:attribute>
-        <xsl:attribute name="space-before">0pt</xsl:attribute>
-        <xsl:attribute name="space-before.minimum">0pt</xsl:attribute>
-        <xsl:attribute name="space-before.optimum">0pt</xsl:attribute>
-        <xsl:attribute name="space-before.maximum">0pt</xsl:attribute>
-      </xsl:if>
-      <xsl:apply-templates select="."/>
-    </fo:table>
-  </xsl:for-each>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<!-- Placeholder template enables wrapping a fo:table in
-     another table for purposes of layout or applying
-     extensions such as XEP table-omit-initial-header to
-     create "continued" titles on page breaks. -->
-<xsl:template name="table.layout">
-  <xsl:param name="table.content" select="NOTANODE"/>
-
-  <xsl:copy-of select="$table.content"/>
-</xsl:template>
-
-<xsl:template name="table.block">
-  <xsl:param name="table.layout" select="NOTANODE"/>
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="param.placement"
-                select="substring-after(normalize-space(
-                   $formal.title.placement), concat(local-name(.), ' '))"/>
-
-  <xsl:variable name="placement">
-    <xsl:choose>
-      <xsl:when test="contains($param.placement, ' ')">
-        <xsl:value-of select="substring-before($param.placement, ' ')"/>
-      </xsl:when>
-      <xsl:when test="$param.placement = ''">before</xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$param.placement"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="self::table">
-      <fo:block id="{$id}"
-                xsl:use-attribute-sets="table.properties">
-        <xsl:if test="$placement = 'before'">
-          <xsl:call-template name="formal.object.heading">
-            <xsl:with-param name="placement" select="$placement"/>
-          </xsl:call-template>
-        </xsl:if>
-        <xsl:copy-of select="$table.layout"/>
-        <xsl:call-template name="table.footnote.block"/>
-        <xsl:if test="$placement != 'before'">
-          <xsl:call-template name="formal.object.heading">
-            <xsl:with-param name="placement" select="$placement"/>
-          </xsl:call-template>
-        </xsl:if>
-      </fo:block>
-    </xsl:when>
-    <xsl:otherwise>
-      <fo:block id="{$id}"
-                xsl:use-attribute-sets="informaltable.properties">
-        <xsl:copy-of select="$table.layout"/>
-        <xsl:call-template name="table.footnote.block"/>
-      </fo:block>
-    </xsl:otherwise>
-  </xsl:choose>
-
-
-</xsl:template>
-
-<!-- Output a table's footnotes in a block -->
-<xsl:template name="table.footnote.block">
-  <xsl:if test=".//footnote">
-    <fo:block keep-with-previous.within-column="always">
-      <xsl:apply-templates select=".//footnote" mode="table.footnote.mode"/>
-    </fo:block>
-  </xsl:if>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="table.container">
-  <xsl:param name="table.block"/>
-  <xsl:choose>
-    <xsl:when test="@orient='land' and 
-                    $fop.extensions = 0 and 
-                    $passivetex.extensions = 0" >
-      <fo:block-container reference-orientation="90"
-            padding="6pt"
-            xsl:use-attribute-sets="list.block.spacing">
-        <xsl:attribute name="width">
-          <xsl:call-template name="table.width"/>
-        </xsl:attribute>
-        <fo:block start-indent="0pt" end-indent="0pt">
-          <xsl:copy-of select="$table.block"/>
-        </fo:block>
-      </fo:block-container>
-    </xsl:when>
-    <xsl:when test="@pgwide = 1">
-      <fo:block xsl:use-attribute-sets="pgwide.properties">
-        <xsl:copy-of select="$table.block"/>
-      </fo:block>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:copy-of select="$table.block"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="empty.table.cell">
-  <xsl:param name="colnum" select="0"/>
-
-  <xsl:variable name="rowsep">
-    <xsl:choose>
-      <!-- If this is the last row, rowsep never applies. -->
-      <xsl:when test="not(ancestor-or-self::row[1]/following-sibling::row
-                          or ancestor-or-self::thead/following-sibling::tbody
-                          or ancestor-or-self::tbody/preceding-sibling::tfoot)">
-        <xsl:value-of select="0"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="inherited.table.attribute">
-          <xsl:with-param name="entry" select="NOT-AN-ELEMENT-NAME"/>
-          <xsl:with-param name="row" select="ancestor-or-self::row[1]"/>
-          <xsl:with-param name="colnum" select="$colnum"/>
-          <xsl:with-param name="attribute" select="'rowsep'"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="colsep">
-    <xsl:choose>
-      <!-- If this is the last column, colsep never applies. -->
-      <xsl:when test="number($colnum) &gt;= ancestor::tgroup/@cols">0</xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="inherited.table.attribute">
-          <xsl:with-param name="entry" select="NOT-AN-ELEMENT-NAME"/>
-          <xsl:with-param name="row" select="ancestor-or-self::row[1]"/>
-          <xsl:with-param name="colnum" select="$colnum"/>
-          <xsl:with-param name="attribute" select="'colsep'"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <fo:table-cell text-align="center"
-                 display-align="center"
-                 xsl:use-attribute-sets="table.cell.padding">
-    <xsl:if test="$xep.extensions != 0">
-      <!-- Suggested by RenderX to workaround a bug in their implementation -->
-      <xsl:attribute name="keep-together.within-column">always</xsl:attribute>
-    </xsl:if>
-    <xsl:if test="$rowsep &gt; 0">
-      <xsl:call-template name="border">
-        <xsl:with-param name="side" select="'bottom'"/>
-      </xsl:call-template>
-    </xsl:if>
-
-    <xsl:if test="$colsep &gt; 0 and number($colnum) &lt; ancestor::tgroup/@cols">
-      <xsl:call-template name="border">
-        <xsl:with-param name="side" select="'right'"/>
-      </xsl:call-template>
-    </xsl:if>
-
-    <!-- fo:table-cell should not be empty -->
-    <fo:block/>
-  </fo:table-cell>
-</xsl:template>
-
-<!-- ==================================================================== -->
-<xsl:template name="table.frame">
-  <xsl:variable name="frame">
-    <xsl:choose>
-      <xsl:when test="../@frame">
-        <xsl:value-of select="../@frame"/>
-      </xsl:when>
-      <xsl:when test="$default.table.frame != ''">
-        <xsl:value-of select="$default.table.frame"/>
-      </xsl:when>
-      <xsl:otherwise>all</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$frame='all'">
-      <xsl:attribute name="border-left-style">
-        <xsl:value-of select="$table.frame.border.style"/>
-      </xsl:attribute>
-      <xsl:attribute name="border-right-style">
-        <xsl:value-of select="$table.frame.border.style"/>
-      </xsl:attribute>
-      <xsl:attribute name="border-top-style">
-        <xsl:value-of select="$table.frame.border.style"/>
-      </xsl:attribute>
-      <xsl:attribute name="border-bottom-style">
-        <xsl:value-of select="$table.frame.border.style"/>
-      </xsl:attribute>
-      <xsl:attribute name="border-left-width">
-        <xsl:value-of select="$table.frame.border.thickness"/>
-      </xsl:attribute>
-      <xsl:attribute name="border-right-width">
-        <xsl:value-of select="$table.frame.border.thickness"/>
-      </xsl:attribute>
-      <xsl:attribute name="border-top-width">
-        <xsl:value-of select="$table.frame.border.thickness"/>
-      </xsl:attribute>
-      <xsl:attribute name="border-bottom-width">
-        <xsl:value-of select="$table.frame.border.thickness"/>
-      </xsl:attribute>
-      <xsl:attribute name="border-left-color">
-        <xsl:value-of select="$table.frame.border.color"/>
-      </xsl:attribute>
-      <xsl:attribute name="border-right-color">
-        <xsl:value-of select="$table.frame.border.color"/>
-      </xsl:attribute>
-      <xsl:attribute name="border-top-color">
-        <xsl:value-of select="$table.frame.border.color"/>
-      </xsl:attribute>
-      <xsl:attribute name="border-bottom-color">
-        <xsl:value-of select="$table.frame.border.color"/>
-      </xsl:attribute>
-    </xsl:when>
-    <xsl:when test="$frame='bottom'">
-      <xsl:attribute name="border-left-style">none</xsl:attribute>
-      <xsl:attribute name="border-right-style">none</xsl:attribute>
-      <xsl:attribute name="border-top-style">none</xsl:attribute>
-      <xsl:attribute name="border-bottom-style">
-        <xsl:value-of select="$table.frame.border.style"/>
-      </xsl:attribute>
-      <xsl:attribute name="border-bottom-width">
-        <xsl:value-of select="$table.frame.border.thickness"/>
-      </xsl:attribute>
-      <xsl:attribute name="border-bottom-color">
-        <xsl:value-of select="$table.frame.border.color"/>
-      </xsl:attribute>
-    </xsl:when>
-    <xsl:when test="$frame='sides'">
-      <xsl:attribute name="border-left-style">
-        <xsl:value-of select="$table.frame.border.style"/>
-      </xsl:attribute>
-      <xsl:attribute name="border-right-style">
-        <xsl:value-of select="$table.frame.border.style"/>
-      </xsl:attribute>
-      <xsl:attribute name="border-top-style">none</xsl:attribute>
-      <xsl:attribute name="border-bottom-style">none</xsl:attribute>
-      <xsl:attribute name="border-left-width">
-        <xsl:value-of select="$table.frame.border.thickness"/>
-      </xsl:attribute>
-      <xsl:attribute name="border-right-width">
-        <xsl:value-of select="$table.frame.border.thickness"/>
-      </xsl:attribute>
-      <xsl:attribute name="border-left-color">
-        <xsl:value-of select="$table.frame.border.color"/>
-      </xsl:attribute>
-      <xsl:attribute name="border-right-color">
-        <xsl:value-of select="$table.frame.border.color"/>
-      </xsl:attribute>
-    </xsl:when>
-    <xsl:when test="$frame='top'">
-      <xsl:attribute name="border-left-style">none</xsl:attribute>
-      <xsl:attribute name="border-right-style">none</xsl:attribute>
-      <xsl:attribute name="border-top-style">
-        <xsl:value-of select="$table.frame.border.style"/>
-      </xsl:attribute>
-      <xsl:attribute name="border-bottom-style">none</xsl:attribute>
-      <xsl:attribute name="border-top-width">
-        <xsl:value-of select="$table.frame.border.thickness"/>
-      </xsl:attribute>
-      <xsl:attribute name="border-top-color">
-        <xsl:value-of select="$table.frame.border.color"/>
-      </xsl:attribute>
-    </xsl:when>
-    <xsl:when test="$frame='topbot'">
-      <xsl:attribute name="border-left-style">none</xsl:attribute>
-      <xsl:attribute name="border-right-style">none</xsl:attribute>
-      <xsl:attribute name="border-top-style">
-        <xsl:value-of select="$table.frame.border.style"/>
-      </xsl:attribute>
-      <xsl:attribute name="border-bottom-style">
-        <xsl:value-of select="$table.frame.border.style"/>
-      </xsl:attribute>
-      <xsl:attribute name="border-top-width">
-        <xsl:value-of select="$table.frame.border.thickness"/>
-      </xsl:attribute>
-      <xsl:attribute name="border-bottom-width">
-        <xsl:value-of select="$table.frame.border.thickness"/>
-      </xsl:attribute>
-      <xsl:attribute name="border-top-color">
-        <xsl:value-of select="$table.frame.border.color"/>
-      </xsl:attribute>
-      <xsl:attribute name="border-bottom-color">
-        <xsl:value-of select="$table.frame.border.color"/>
-      </xsl:attribute>
-    </xsl:when>
-    <xsl:when test="$frame='none'">
-      <xsl:attribute name="border-left-style">none</xsl:attribute>
-      <xsl:attribute name="border-right-style">none</xsl:attribute>
-      <xsl:attribute name="border-top-style">none</xsl:attribute>
-      <xsl:attribute name="border-bottom-style">none</xsl:attribute>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:message>
-        <xsl:text>Impossible frame on table: </xsl:text>
-        <xsl:value-of select="$frame"/>
-      </xsl:message>
-      <xsl:attribute name="border-left-style">none</xsl:attribute>
-      <xsl:attribute name="border-right-style">none</xsl:attribute>
-      <xsl:attribute name="border-top-style">none</xsl:attribute>
-      <xsl:attribute name="border-bottom-style">none</xsl:attribute>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="border">
-  <xsl:param name="side" select="'left'"/>
-
-  <xsl:attribute name="border-{$side}-width">
-    <xsl:value-of select="$table.cell.border.thickness"/>
-  </xsl:attribute>
-  <xsl:attribute name="border-{$side}-style">
-    <xsl:value-of select="$table.cell.border.style"/>
-  </xsl:attribute>
-  <xsl:attribute name="border-{$side}-color">
-    <xsl:value-of select="$table.cell.border.color"/>
-  </xsl:attribute>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="tgroup" name="tgroup">
-  <xsl:if test="not(@cols) or @cols = '' or string(number(@cols)) = 'NaN'">
-    <xsl:message terminate="yes">
-      <xsl:text>Error: CALS tables must specify the number of columns.</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <xsl:variable name="table.width">
-    <xsl:call-template name="table.width"/>
-  </xsl:variable>
-
-  <xsl:variable name="colspecs">
-    <xsl:choose>
-      <xsl:when test="$use.extensions != 0
-                      and $tablecolumns.extension != 0">
-        <xsl:call-template name="generate.colgroup.raw">
-          <xsl:with-param name="cols" select="@cols"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="generate.colgroup">
-          <xsl:with-param name="cols" select="@cols"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="prop-columns"
-                select=".//colspec[contains(@colwidth, '*')]"/>
-  <xsl:if test="count($prop-columns) != 0 or
-                $fop.extensions != 0 or
-                $fop1.extensions != 0 or
-                $passivetex.extensions != 0">
-    <xsl:attribute name="table-layout">fixed</xsl:attribute>
-  </xsl:if>
- 
-    <xsl:attribute name="width">
-      <xsl:value-of select="$table.width"/>
-    </xsl:attribute>
- 
-  <xsl:choose>
-    <xsl:when test="$use.extensions != 0
-                    and $tablecolumns.extension != 0">
-      <xsl:choose>
-        <xsl:when test="function-available('stbl:adjustColumnWidths')">
-          <xsl:copy-of select="stbl:adjustColumnWidths($colspecs)"/>
-        </xsl:when>
-        <xsl:when test="function-available('xtbl:adjustColumnWidths')">
-          <xsl:copy-of select="xtbl:adjustColumnWidths($colspecs)"/>
-        </xsl:when>
-        <xsl:when test="function-available('ptbl:adjustColumnWidths')">
-          <xsl:copy-of select="ptbl:adjustColumnWidths($colspecs)"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:message terminate="yes">
-            <xsl:text>No adjustColumnWidths function available.</xsl:text>
-          </xsl:message>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:copy-of select="$colspecs"/>
-    </xsl:otherwise>
-  </xsl:choose>
-
-  <xsl:apply-templates select="thead"/>
-  <xsl:apply-templates select="tfoot"/>
-  <xsl:apply-templates select="tbody"/>
-</xsl:template>
-
-<xsl:template match="colspec"></xsl:template>
-
-<xsl:template name="table.width">
-
-  <xsl:variable name="numcols">
-    <xsl:call-template name="widest-html-row">
-      <xsl:with-param name="rows" select=".//tr"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="explicit.table.width">
-    <xsl:choose>
-      <xsl:when test="self::entrytbl">
-        <xsl:call-template name="pi.dbfo_table-width"/>
-      </xsl:when>
-      <xsl:when test="self::table or self::informaltable">
-        <xsl:call-template name="pi.dbfo_table-width"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <!-- * no dbfo@table-width PI as a child of this table, so check -->
-        <!-- * the parent of this table to see if the table has any -->
-        <!-- * sibling dbfo@table-width PIs (FIXME: 2007-07 MikeSmith: we -->
-        <!-- * should really instead be checking here just to see if the -->
-        <!-- * first preceding sibling of this table is a -->
-        <!-- * dbfo@table-width PI) -->
-        <xsl:call-template name="pi.dbfo_table-width">
-          <xsl:with-param name="node" select=".."/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="column.sum">
-    <xsl:choose>
-      <!-- CALS table -->
-      <xsl:when test="@cols">
-        <xsl:if test="count(colspec) = @cols">
-          <xsl:for-each select="colspec">
-            <xsl:if test="position() != 1">
-              <xsl:text> + </xsl:text>
-            </xsl:if>
-            <xsl:choose>
-              <xsl:when test="not(@colwidth)">NOWIDTH</xsl:when>
-              <xsl:when test="contains(@colwidth, '*')">NOWIDTH</xsl:when>
-              <xsl:otherwise>
-                <xsl:value-of select="@colwidth"/>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:for-each>
-        </xsl:if>
-      </xsl:when>
-      <xsl:otherwise>
-        <!-- HTML table -->
-        <xsl:if test="count(col|colgroup/col) = $numcols">
-          <xsl:for-each select="col|colgroup/col">
-            <xsl:if test="position() != 1">
-              <xsl:text> + </xsl:text>
-            </xsl:if>
-            <xsl:choose>
-              <xsl:when test="not(@width)">NOWIDTH</xsl:when>
-              <xsl:when test="contains(@width, '%')">NOWIDTH</xsl:when>
-              <xsl:otherwise>
-                <xsl:value-of select="@width"/>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:for-each>
-        </xsl:if>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="column.sum.width">
-    <xsl:if test="not(contains($column.sum, 'NOWIDTH'))">
-      <xsl:value-of select="$column.sum"/>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:variable name="prop-columns"
-                select=".//colspec[contains(@colwidth, '*')]"/>
-
-  <xsl:variable name="table.width">
-    <xsl:choose>
-      <xsl:when test="$explicit.table.width != ''">
-        <xsl:value-of select="$explicit.table.width"/>
-      </xsl:when>
-      <xsl:when test="$column.sum.width != ''">
-        <xsl:value-of select="$column.sum.width"/>
-      </xsl:when>
-      <xsl:when test="$default.table.width = ''">
-        <xsl:choose>
-          <!-- These processors don't support table-layout="auto" -->
-          <xsl:when test="$fop.extensions != 0 or
-                          $fop1.extensions != 0 or
-                          $passivetex.extensions != 0">
-            <xsl:text>100%</xsl:text>
-          </xsl:when>
-          <!-- Proportional columns imply 100% width -->
-          <xsl:when test="count($prop-columns) != 0">
-            <xsl:text>100%</xsl:text>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:text>auto</xsl:text>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$default.table.width"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-  <xsl:value-of select="$table.width"/>
-
-</xsl:template>
-
-<xsl:template match="spanspec"></xsl:template>
-
-<xsl:template match="thead">
-  <xsl:variable name="tgroup" select="parent::*"/>
-
-  <fo:table-header start-indent="0pt" end-indent="0pt">
-    <xsl:apply-templates select="row[1]">
-      <xsl:with-param name="spans">
-        <xsl:call-template name="blank.spans">
-          <xsl:with-param name="cols" select="../@cols"/>
-        </xsl:call-template>
-      </xsl:with-param>
-    </xsl:apply-templates>
-  </fo:table-header>
-</xsl:template>
-
-<xsl:template match="tfoot">
-  <xsl:variable name="tgroup" select="parent::*"/>
-
-  <fo:table-footer start-indent="0pt" end-indent="0pt">
-    <xsl:apply-templates select="row[1]">
-      <xsl:with-param name="spans">
-        <xsl:call-template name="blank.spans">
-          <xsl:with-param name="cols" select="../@cols"/>
-        </xsl:call-template>
-      </xsl:with-param>
-    </xsl:apply-templates>
-
-  </fo:table-footer>
-</xsl:template>
-
-<xsl:template match="tbody">
-  <xsl:variable name="tgroup" select="parent::*"/>
-
-  <fo:table-body start-indent="0pt" end-indent="0pt">
-    <xsl:apply-templates select="row[1]">
-      <xsl:with-param name="spans">
-        <xsl:call-template name="blank.spans">
-          <xsl:with-param name="cols" select="../@cols"/>
-        </xsl:call-template>
-      </xsl:with-param>
-    </xsl:apply-templates>
-  </fo:table-body>
-</xsl:template>
-
-<xsl:template match="row">
-  <xsl:param name="spans"/>
-
-  <xsl:choose>
-    <xsl:when test="contains($spans, '0')">
-      <xsl:call-template name="normal-row">
-        <xsl:with-param name="spans" select="$spans"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <!--
-      <xsl:message>
-        <xsl:text>Ignoring row: </xsl:text>
-        <xsl:value-of select="$spans"/>
-        <xsl:text> = </xsl:text>
-        <xsl:call-template name="consume-row">
-          <xsl:with-param name="spans" select="$spans"/>
-        </xsl:call-template>
-      </xsl:message>
-      -->
-
-      <xsl:if test="normalize-space(.//text()) != ''">
-        <xsl:message>Warning: overlapped row contains content!</xsl:message>
-      </xsl:if>
-
-      <fo:table-row>
-        <xsl:comment> This row intentionally left blank </xsl:comment>
-        <fo:table-cell><fo:block/></fo:table-cell>
-      </fo:table-row>
-
-      <xsl:apply-templates select="following-sibling::row[1]">
-        <xsl:with-param name="spans">
-          <xsl:call-template name="consume-row">
-            <xsl:with-param name="spans" select="$spans"/>
-          </xsl:call-template>
-        </xsl:with-param>
-      </xsl:apply-templates>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="normal-row">
-  <xsl:param name="spans"/>
-
-  <fo:table-row>
-    <xsl:call-template name="table.row.properties"/>
-    <xsl:call-template name="anchor"/>
-
-    <xsl:apply-templates select="(entry|entrytbl)[1]">
-      <xsl:with-param name="spans" select="$spans"/>
-    </xsl:apply-templates>
-  </fo:table-row>
-
-  <xsl:if test="following-sibling::row">
-    <xsl:variable name="nextspans">
-      <xsl:apply-templates select="(entry|entrytbl)[1]" mode="span">
-        <xsl:with-param name="spans" select="$spans"/>
-      </xsl:apply-templates>
-    </xsl:variable>
-
-    <xsl:apply-templates select="following-sibling::row[1]">
-      <xsl:with-param name="spans" select="$nextspans"/>
-    </xsl:apply-templates>
-  </xsl:if>
-</xsl:template>
-
-<!-- customize this template to add row properties -->
-<xsl:template name="table.row.properties">
-  <xsl:variable name="bgcolor">
-    <xsl:call-template name="pi.dbfo_bgcolor"/>
-  </xsl:variable>
-  <xsl:if test="$bgcolor != ''">
-    <xsl:attribute name="background-color">
-      <xsl:value-of select="$bgcolor"/>
-    </xsl:attribute>
-  </xsl:if>
-
-  <!-- Keep header row with next row -->
-  <xsl:if test="ancestor::thead">
-    <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
-  </xsl:if>
-
-</xsl:template>
-
-<xsl:template match="entry|entrytbl" name="entry">
-  <xsl:param name="col" select="1"/>
-  <xsl:param name="spans"/>
-
-  <xsl:variable name="row" select="parent::row"/>
-  <xsl:variable name="group" select="$row/parent::*[1]"/>
-  <xsl:variable name="frame" select="ancestor::tgroup/parent::*/@frame"/>
-
-  <xsl:variable name="empty.cell" select="count(node()) = 0"/>
-
-  <xsl:variable name="named.colnum">
-    <xsl:call-template name="entry.colnum"/>
-  </xsl:variable>
-
-  <xsl:variable name="entry.colnum">
-    <xsl:choose>
-      <xsl:when test="$named.colnum &gt; 0">
-        <xsl:value-of select="$named.colnum"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$col"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="entry.colspan">
-    <xsl:choose>
-      <xsl:when test="@spanname or @namest">
-        <xsl:call-template name="calculate.colspan"/>
-      </xsl:when>
-      <xsl:otherwise>1</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="following.spans">
-    <xsl:call-template name="calculate.following.spans">
-      <xsl:with-param name="colspan" select="$entry.colspan"/>
-      <xsl:with-param name="spans" select="$spans"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="rowsep">
-    <xsl:choose>
-      <!-- If this is the last row, rowsep never applies. -->
-      <xsl:when test="not(ancestor-or-self::row[1]/following-sibling::row
-                          or ancestor-or-self::thead/following-sibling::tbody
-                          or ancestor-or-self::tbody/preceding-sibling::tfoot)">
-        <xsl:value-of select="0"/>
-      </xsl:when>
-      <!-- Check for morerows too -->
-      <xsl:when test="(@morerows and count(ancestor-or-self::row[1]/
-                       following-sibling::row) = @morerows )
-                      and not (ancestor-or-self::thead/following-sibling::tbody
-                       or ancestor-or-self::tbody/preceding-sibling::tfoot)">
-        <xsl:value-of select="0"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="inherited.table.attribute">
-          <xsl:with-param name="entry" select="."/>
-          <xsl:with-param name="colnum" select="$entry.colnum"/>
-          <xsl:with-param name="attribute" select="'rowsep'"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-<!--
-  <xsl:message><xsl:value-of select="."/>: <xsl:value-of select="$rowsep"/></xsl:message>
--->
-
-  <xsl:variable name="colsep">
-    <xsl:choose>
-      <!-- If this is the last column, colsep never applies. -->
-      <xsl:when test="$following.spans = ''">0</xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="inherited.table.attribute">
-          <xsl:with-param name="entry" select="."/>
-          <xsl:with-param name="colnum" select="$entry.colnum"/>
-          <xsl:with-param name="attribute" select="'colsep'"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="valign">
-    <xsl:call-template name="inherited.table.attribute">
-      <xsl:with-param name="entry" select="."/>
-      <xsl:with-param name="colnum" select="$entry.colnum"/>
-      <xsl:with-param name="attribute" select="'valign'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="align">
-    <xsl:call-template name="inherited.table.attribute">
-      <xsl:with-param name="entry" select="."/>
-      <xsl:with-param name="colnum" select="$entry.colnum"/>
-      <xsl:with-param name="attribute" select="'align'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="char">
-    <xsl:call-template name="inherited.table.attribute">
-      <xsl:with-param name="entry" select="."/>
-      <xsl:with-param name="colnum" select="$entry.colnum"/>
-      <xsl:with-param name="attribute" select="'char'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="charoff">
-    <xsl:call-template name="inherited.table.attribute">
-      <xsl:with-param name="entry" select="."/>
-      <xsl:with-param name="colnum" select="$entry.colnum"/>
-      <xsl:with-param name="attribute" select="'charoff'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$spans != '' and not(starts-with($spans,'0:'))">
-      <xsl:call-template name="entry">
-        <xsl:with-param name="col" select="$col+1"/>
-        <xsl:with-param name="spans" select="substring-after($spans,':')"/>
-      </xsl:call-template>
-    </xsl:when>
-
-    <xsl:when test="number($entry.colnum) &gt; $col">
-      <xsl:call-template name="empty.table.cell">
-        <xsl:with-param name="colnum" select="$col"/>
-      </xsl:call-template>
-      <xsl:call-template name="entry">
-        <xsl:with-param name="col" select="$col+1"/>
-        <xsl:with-param name="spans" select="substring-after($spans,':')"/>
-      </xsl:call-template>
-    </xsl:when>
-
-    <xsl:otherwise>
-      <xsl:variable name="cell.content">
-        <fo:block>
-          <xsl:call-template name="table.cell.block.properties"/>
-
-          <!-- are we missing any indexterms? -->
-          <xsl:if test="not(preceding-sibling::entry)
-                        and not(parent::row/preceding-sibling::row)">
-            <!-- this is the first entry of the first row -->
-            <xsl:if test="ancestor::thead or
-                          (ancestor::tbody
-                           and not(ancestor::tbody/preceding-sibling::thead
-                                   or ancestor::tbody/preceding-sibling::tbody))">
-              <!-- of the thead or the first tbody -->
-              <xsl:apply-templates select="ancestor::tgroup/preceding-sibling::indexterm"/>
-            </xsl:if>
-          </xsl:if>
-
-          <!--
-          <xsl:text>(</xsl:text>
-          <xsl:value-of select="$rowsep"/>
-          <xsl:text>,</xsl:text>
-          <xsl:value-of select="$colsep"/>
-          <xsl:text>)</xsl:text>
-          -->
-          <xsl:choose>
-            <xsl:when test="$empty.cell">
-              <xsl:text>&#160;</xsl:text>
-            </xsl:when>
-            <xsl:when test="self::entrytbl">
-              <xsl:variable name="prop-columns"
-                            select=".//colspec[contains(@colwidth, '*')]"/>
-              <fo:table xsl:use-attribute-sets="table.table.properties">
-                <xsl:if test="count($prop-columns) != 0">
-                  <xsl:attribute name="table-layout">fixed</xsl:attribute>
-                </xsl:if>
-                <xsl:call-template name="tgroup"/>
-              </fo:table>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:apply-templates/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </fo:block>
-      </xsl:variable>
-
-      <xsl:variable name="cell-orientation">
-        <xsl:call-template name="pi.dbfo_orientation">
-          <xsl:with-param name="node" select="ancestor-or-self::entry"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <xsl:variable name="row-orientation">
-        <xsl:call-template name="pi.dbfo_orientation">
-          <xsl:with-param name="node" select="ancestor-or-self::row"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <xsl:variable name="cell-width">
-        <xsl:call-template name="pi.dbfo_rotated-width">
-          <xsl:with-param name="node" select="ancestor-or-self::entry"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <xsl:variable name="row-width">
-        <xsl:call-template name="pi.dbfo_rotated-width">
-          <xsl:with-param name="node" select="ancestor-or-self::row"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <xsl:variable name="orientation">
-        <xsl:choose>
-          <xsl:when test="$cell-orientation != ''">
-            <xsl:value-of select="$cell-orientation"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="$row-orientation"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-
-      <xsl:variable name="rotated-width">
-        <xsl:choose>
-          <xsl:when test="$cell-width != ''">
-            <xsl:value-of select="$cell-width"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="$row-width"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-
-      <xsl:variable name="bgcolor">
-        <xsl:call-template name="pi.dbfo_bgcolor">
-          <xsl:with-param name="node" select="ancestor-or-self::entry"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <fo:table-cell xsl:use-attribute-sets="table.cell.padding">
-        <xsl:call-template name="table.cell.properties">
-          <xsl:with-param name="bgcolor.pi" select="$bgcolor"/>
-          <xsl:with-param name="rowsep.inherit" select="$rowsep"/>
-          <xsl:with-param name="colsep.inherit" select="$colsep"/>
-          <xsl:with-param name="col" select="$col"/>
-          <xsl:with-param name="valign.inherit" select="$valign"/>
-          <xsl:with-param name="align.inherit" select="$align"/>
-          <xsl:with-param name="char.inherit" select="$char"/>
-        </xsl:call-template>
-
-        <xsl:call-template name="anchor"/>
-
-        <xsl:if test="@morerows">
-          <xsl:attribute name="number-rows-spanned">
-            <xsl:value-of select="@morerows+1"/>
-          </xsl:attribute>
-        </xsl:if>
-
-        <xsl:if test="$entry.colspan &gt; 1">
-          <xsl:attribute name="number-columns-spanned">
-            <xsl:value-of select="$entry.colspan"/>
-          </xsl:attribute>
-        </xsl:if>
-
-<!--
-        <xsl:if test="@charoff">
-          <xsl:attribute name="charoff">
-            <xsl:value-of select="@charoff"/>
-          </xsl:attribute>
-        </xsl:if>
--->
-
-        <xsl:choose>
-          <xsl:when test="$fop.extensions = 0 and $passivetex.extensions = 0
-                          and $orientation != ''">
-            <fo:block-container reference-orientation="{$orientation}">
-              <xsl:if test="$rotated-width != ''">
-                <xsl:attribute name="width">
-                  <xsl:value-of select="$rotated-width"/>
-                </xsl:attribute>
-              </xsl:if>
-              <xsl:copy-of select="$cell.content"/>
-            </fo:block-container>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:copy-of select="$cell.content"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </fo:table-cell>
-
-      <xsl:choose>
-        <xsl:when test="following-sibling::entry|following-sibling::entrytbl">
-          <xsl:apply-templates select="(following-sibling::entry
-                                       |following-sibling::entrytbl)[1]">
-            <xsl:with-param name="col" select="$col+$entry.colspan"/>
-            <xsl:with-param name="spans" select="$following.spans"/>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="finaltd">
-            <xsl:with-param name="spans" select="$following.spans"/>
-            <xsl:with-param name="col" select="$col+$entry.colspan"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- Expand this template to add properties to any fo:table-cell -->
-<xsl:template name="table.cell.properties">
-  <xsl:param name="bgcolor.pi" select="''"/>
-  <xsl:param name="rowsep.inherit" select="1"/>
-  <xsl:param name="colsep.inherit" select="1"/>
-  <xsl:param name="col" select="1"/>
-  <xsl:param name="valign.inherit" select="''"/>
-  <xsl:param name="align.inherit" select="''"/>
-  <xsl:param name="char.inherit" select="''"/>
-
-  <xsl:choose>
-    <xsl:when test="ancestor::tgroup">
-      <xsl:if test="$bgcolor.pi != ''">
-        <xsl:attribute name="background-color">
-          <xsl:value-of select="$bgcolor.pi"/>
-        </xsl:attribute>
-      </xsl:if>
-
-      <xsl:if test="$rowsep.inherit &gt; 0">
-        <xsl:call-template name="border">
-          <xsl:with-param name="side" select="'bottom'"/>
-        </xsl:call-template>
-      </xsl:if>
-
-      <xsl:if test="$colsep.inherit &gt; 0 and 
-                      $col &lt; ancestor::tgroup/@cols">
-        <xsl:call-template name="border">
-          <xsl:with-param name="side" select="'right'"/>
-        </xsl:call-template>
-      </xsl:if>
-
-      <xsl:if test="$valign.inherit != ''">
-        <xsl:attribute name="display-align">
-          <xsl:choose>
-            <xsl:when test="$valign.inherit='top'">before</xsl:when>
-            <xsl:when test="$valign.inherit='middle'">center</xsl:when>
-            <xsl:when test="$valign.inherit='bottom'">after</xsl:when>
-            <xsl:otherwise>
-              <xsl:message>
-                <xsl:text>Unexpected valign value: </xsl:text>
-                <xsl:value-of select="$valign.inherit"/>
-                <xsl:text>, center used.</xsl:text>
-              </xsl:message>
-              <xsl:text>center</xsl:text>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:attribute>
-      </xsl:if>
-
-      <xsl:choose>
-        <xsl:when test="$align.inherit = 'char' and $char.inherit != ''">
-          <xsl:attribute name="text-align">
-            <xsl:value-of select="$char.inherit"/>
-          </xsl:attribute>
-        </xsl:when>
-        <xsl:when test="$align.inherit != ''">
-          <xsl:attribute name="text-align">
-            <xsl:value-of select="$align.inherit"/>
-          </xsl:attribute>
-        </xsl:when>
-      </xsl:choose>
-
-    </xsl:when>
-    <xsl:otherwise>
-      <!-- HTML table -->
-      <xsl:variable name="border" 
-                    select="(ancestor::table |
-                             ancestor::informaltable)[last()]/@border"/>
-      <xsl:if test="$border != '' and $border != 0">
-        <xsl:attribute name="border">
-          <xsl:value-of select="$table.cell.border.thickness"/>
-          <xsl:text> </xsl:text>
-          <xsl:value-of select="$table.cell.border.style"/>
-          <xsl:text> </xsl:text>
-          <xsl:value-of select="$table.cell.border.color"/>
-        </xsl:attribute>
-      </xsl:if>
-    </xsl:otherwise>
-  </xsl:choose>
-
-</xsl:template>
-
-<!-- Expand this template to add properties to any cell's block -->
-<xsl:template name="table.cell.block.properties">
-  <!-- highlight this entry? -->
-  <xsl:if test="ancestor::thead or ancestor::tfoot">
-    <xsl:attribute name="font-weight">bold</xsl:attribute>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="entry|entrytbl" name="sentry" mode="span">
-  <xsl:param name="col" select="1"/>
-  <xsl:param name="spans"/>
-
-  <xsl:variable name="entry.colnum">
-    <xsl:call-template name="entry.colnum"/>
-  </xsl:variable>
-
-  <xsl:variable name="entry.colspan">
-    <xsl:choose>
-      <xsl:when test="@spanname or @namest">
-        <xsl:call-template name="calculate.colspan"/>
-      </xsl:when>
-      <xsl:otherwise>1</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="following.spans">
-    <xsl:call-template name="calculate.following.spans">
-      <xsl:with-param name="colspan" select="$entry.colspan"/>
-      <xsl:with-param name="spans" select="$spans"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$spans != '' and not(starts-with($spans,'0:'))">
-      <xsl:value-of select="substring-before($spans,':')-1"/>
-      <xsl:text>:</xsl:text>
-      <xsl:call-template name="sentry">
-        <xsl:with-param name="col" select="$col+1"/>
-        <xsl:with-param name="spans" select="substring-after($spans,':')"/>
-      </xsl:call-template>
-    </xsl:when>
-
-    <xsl:when test="number($entry.colnum) &gt; $col">
-      <xsl:text>0:</xsl:text>
-      <xsl:call-template name="sentry">
-        <xsl:with-param name="col" select="$col+$entry.colspan"/>
-        <xsl:with-param name="spans" select="$following.spans"/>
-      </xsl:call-template>
-    </xsl:when>
-
-    <xsl:otherwise>
-      <xsl:call-template name="copy-string">
-        <xsl:with-param name="count" select="$entry.colspan"/>
-        <xsl:with-param name="string">
-          <xsl:choose>
-            <xsl:when test="@morerows">
-              <xsl:value-of select="@morerows"/>
-            </xsl:when>
-            <xsl:otherwise>0</xsl:otherwise>
-          </xsl:choose>
-          <xsl:text>:</xsl:text>
-        </xsl:with-param>
-      </xsl:call-template>
-
-      <xsl:choose>
-        <xsl:when test="following-sibling::entry|following-sibling::entrytbl">
-          <xsl:apply-templates select="(following-sibling::entry
-                                       |following-sibling::entrytbl)[1]"
-                               mode="span">
-            <xsl:with-param name="col" select="$col+$entry.colspan"/>
-            <xsl:with-param name="spans" select="$following.spans"/>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="sfinaltd">
-            <xsl:with-param name="spans" select="$following.spans"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="generate.colgroup.raw">
-  <xsl:param name="cols" select="1"/>
-  <xsl:param name="count" select="1"/>
-
-  <xsl:choose>
-    <xsl:when test="$count>$cols"></xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="generate.col.raw">
-        <xsl:with-param name="countcol" select="$count"/>
-      </xsl:call-template>
-      <xsl:call-template name="generate.colgroup.raw">
-        <xsl:with-param name="cols" select="$cols"/>
-        <xsl:with-param name="count" select="$count+1"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="generate.colgroup">
-  <xsl:param name="cols" select="1"/>
-  <xsl:param name="count" select="1"/>
-
-  <xsl:choose>
-    <xsl:when test="$count>$cols"></xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="generate.col">
-        <xsl:with-param name="countcol" select="$count"/>
-      </xsl:call-template>
-      <xsl:call-template name="generate.colgroup">
-        <xsl:with-param name="cols" select="$cols"/>
-        <xsl:with-param name="count" select="$count+1"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="generate.col.raw">
-  <!-- generate the table-column for column countcol -->
-  <xsl:param name="countcol">1</xsl:param>
-  <xsl:param name="colspecs" select="./colspec"/>
-  <xsl:param name="count">1</xsl:param>
-  <xsl:param name="colnum">1</xsl:param>
-
-  <xsl:choose>
-    <xsl:when test="$count>count($colspecs)">
-      <fo:table-column column-number="{$countcol}"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:variable name="colspec" select="$colspecs[$count=position()]"/>
-
-      <xsl:variable name="colspec.colnum">
-        <xsl:choose>
-          <xsl:when test="$colspec/@colnum">
-            <xsl:value-of select="$colspec/@colnum"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="$colnum"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-
-      <xsl:variable name="colspec.colwidth">
-        <xsl:choose>
-          <xsl:when test="$colspec/@colwidth">
-            <xsl:value-of select="$colspec/@colwidth"/>
-          </xsl:when>
-          <xsl:otherwise>1*</xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-
-      <xsl:choose>
-        <xsl:when test="$colspec.colnum=$countcol">
-          <fo:table-column column-number="{$countcol}">
-            <xsl:attribute name="column-width">
-              <xsl:value-of select="$colspec.colwidth"/>
-            </xsl:attribute>
-          </fo:table-column>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="generate.col.raw">
-            <xsl:with-param name="countcol" select="$countcol"/>
-            <xsl:with-param name="colspecs" select="$colspecs"/>
-            <xsl:with-param name="count" select="$count+1"/>
-            <xsl:with-param name="colnum">
-              <xsl:choose>
-                <xsl:when test="$colspec/@colnum">
-                  <xsl:value-of select="$colspec/@colnum + 1"/>
-                </xsl:when>
-                <xsl:otherwise>
-                  <xsl:value-of select="$colnum + 1"/>
-                </xsl:otherwise>
-              </xsl:choose>
-            </xsl:with-param>
-           </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="generate.col">
-  <!-- generate the table-column for column countcol -->
-  <xsl:param name="countcol">1</xsl:param>
-  <xsl:param name="colspecs" select="./colspec"/>
-  <xsl:param name="count">1</xsl:param>
-  <xsl:param name="colnum">1</xsl:param>
-
-  <xsl:choose>
-    <xsl:when test="$count>count($colspecs)">
-      <fo:table-column column-number="{$countcol}">
-        <xsl:variable name="colwidth">
-          <xsl:call-template name="calc.column.width"/>
-        </xsl:variable>
-        <xsl:if test="$colwidth != 'proportional-column-width(1)'">
-          <xsl:attribute name="column-width">
-            <xsl:value-of select="$colwidth"/>
-          </xsl:attribute>
-        </xsl:if>
-      </fo:table-column>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:variable name="colspec" select="$colspecs[$count=position()]"/>
-
-      <xsl:variable name="colspec.colnum">
-        <xsl:choose>
-          <xsl:when test="$colspec/@colnum">
-            <xsl:value-of select="$colspec/@colnum"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="$colnum"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-
-      <xsl:variable name="colspec.colwidth">
-        <xsl:choose>
-          <xsl:when test="$colspec/@colwidth">
-            <xsl:value-of select="$colspec/@colwidth"/>
-          </xsl:when>
-          <xsl:otherwise>1*</xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-
-      <xsl:choose>
-        <xsl:when test="$colspec.colnum=$countcol">
-          <fo:table-column column-number="{$countcol}">
-            <xsl:variable name="colwidth">
-              <xsl:call-template name="calc.column.width">
-                <xsl:with-param name="colwidth">
-                  <xsl:value-of select="$colspec.colwidth"/>
-                </xsl:with-param>
-              </xsl:call-template>
-            </xsl:variable>
-            <xsl:if test="$colwidth != 'proportional-column-width(1)'">
-              <xsl:attribute name="column-width">
-                <xsl:value-of select="$colwidth"/>
-              </xsl:attribute>
-            </xsl:if>
-          </fo:table-column>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="generate.col">
-            <xsl:with-param name="countcol" select="$countcol"/>
-            <xsl:with-param name="colspecs" select="$colspecs"/>
-            <xsl:with-param name="count" select="$count+1"/>
-            <xsl:with-param name="colnum">
-              <xsl:choose>
-                <xsl:when test="$colspec/@colnum">
-                  <xsl:value-of select="$colspec/@colnum + 1"/>
-                </xsl:when>
-                <xsl:otherwise>
-                  <xsl:value-of select="$colnum + 1"/>
-                </xsl:otherwise>
-              </xsl:choose>
-            </xsl:with-param>
-           </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<doc:template name="calc.column.width" xmlns="">
-<refpurpose>Calculate an XSL FO table column width specification from a
-CALS table column width specification.</refpurpose>
-
-<refdescription>
-<para>CALS expresses table column widths in the following basic
-forms:</para>
-
-<itemizedlist>
-<listitem>
-<para><emphasis>99.99units</emphasis>, a fixed length specifier.</para>
-</listitem>
-<listitem>
-<para><emphasis>99.99</emphasis>, a fixed length specifier without any units.</para>
-</listitem>
-<listitem>
-<para><emphasis>99.99*</emphasis>, a relative length specifier.</para>
-</listitem>
-<listitem>
-<para><emphasis>99.99*+99.99units</emphasis>, a combination of both.</para>
-</listitem>
-</itemizedlist>
-
-<para>The CALS units are points (pt), picas (pi), centimeters (cm),
-millimeters (mm), and inches (in). These are the same units as XSL,
-except that XSL abbreviates picas "pc" instead of "pi". If a length
-specifier has no units, the CALS default unit (pt) is assumed.</para>
-
-<para>Relative length specifiers are represented in XSL with the
-proportional-column-width() function.</para>
-
-<para>Here are some examples:</para>
-
-<itemizedlist>
-<listitem>
-<para>"36pt" becomes "36pt"</para>
-</listitem>
-<listitem>
-<para>"3pi" becomes "3pc"</para>
-</listitem>
-<listitem>
-<para>"36" becomes "36pt"</para>
-</listitem>
-<listitem>
-<para>"3*" becomes "proportional-column-width(3)"</para>
-</listitem>
-<listitem>
-<para>"3*+2pi" becomes "proportional-column-width(3)+2pc"</para>
-</listitem>
-<listitem>
-<para>"1*+2" becomes "proportional-column-width(1)+2pt"</para>
-</listitem>
-</itemizedlist>
-</refdescription>
-
-<refparameter>
-<variablelist>
-<varlistentry><term>colwidth</term>
-<listitem>
-<para>The CALS column width specification.</para>
-</listitem>
-</varlistentry>
-</variablelist>
-</refparameter>
-
-<refreturn>
-<para>The XSL column width specification.</para>
-</refreturn>
-</doc:template>
-
-<xsl:template name="calc.column.width">
-  <xsl:param name="colwidth">1*</xsl:param>
-
-  <!-- Ok, the colwidth could have any one of the following forms: -->
-  <!--        1*       = proportional width -->
-  <!--         *       = same as 1* -->
-  <!--     1unit       = 1.0 units wide -->
-  <!--         1       = 1pt wide -->
-  <!--  1*+1unit       = proportional width + some fixed width -->
-  <!--      1*+1       = proportional width + some fixed width -->
-
-  <!-- If it has a proportional width, translate it to XSL -->
-  <xsl:if test="contains($colwidth, '*')">
-    <xsl:text>proportional-column-width(</xsl:text>
-    <xsl:choose>
-      <xsl:when test="substring-before($colwidth, '*') != ''"> 
-        <xsl:value-of select="substring-before($colwidth, '*')"/>
-      </xsl:when>
-      <xsl:otherwise>
-         <xsl:text>1.00</xsl:text>
-      </xsl:otherwise>
-    </xsl:choose>
-    <xsl:text>)</xsl:text>
-  </xsl:if>
-
-  <!-- Now grab the non-proportional part of the specification -->
-  <xsl:variable name="width-units">
-    <xsl:choose>
-      <xsl:when test="contains($colwidth, '*')">
-        <xsl:value-of
-             select="normalize-space(substring-after($colwidth, '*'))"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="normalize-space($colwidth)"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <!-- Ok, now the width-units could have any one of the following forms: -->
-  <!--                 = <empty string> -->
-  <!--     1unit       = 1.0 units wide -->
-  <!--         1       = 1pt wide -->
-  <!-- with an optional leading sign -->
-
-  <!-- Grab the width part by blanking out the units part and discarding -->
-  <!-- whitespace. It's not pretty, but it works. -->
-  <xsl:variable name="width"
-       select="normalize-space(translate($width-units,
-                                         '+-0123456789.abcdefghijklmnopqrstuvwxyz',
-                                         '+-0123456789.'))"/>
-
-  <!-- Grab the units part by blanking out the width part and discarding -->
-  <!-- whitespace. It's not pretty, but it works. -->
-  <xsl:variable name="units"
-       select="normalize-space(translate($width-units,
-                                         'abcdefghijklmnopqrstuvwxyz+-0123456789.',
-                                         'abcdefghijklmnopqrstuvwxyz'))"/>
-
-  <!-- Output the width -->
-  <xsl:value-of select="$width"/>
-
-  <!-- Output the units, translated appropriately -->
-  <xsl:choose>
-    <xsl:when test="$units = 'pi'">pc</xsl:when>
-    <xsl:when test="$units = '' and $width != ''">pt</xsl:when>
-    <xsl:otherwise><xsl:value-of select="$units"/></xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/task.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/task.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,81 +1,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:template match="task">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="param.placement"
-                select="substring-after(normalize-space($formal.title.placement),
-                                        concat(local-name(.), ' '))"/>
-
-  <xsl:variable name="placement">
-    <xsl:choose>
-      <xsl:when test="contains($param.placement, ' ')">
-        <xsl:value-of select="substring-before($param.placement, ' ')"/>
-      </xsl:when>
-      <xsl:when test="$param.placement = ''">before</xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$param.placement"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="preamble"
-                select="*[not(self::title
-                              or self::titleabbrev)]"/>
-
-  <fo:block id="{$id}"
-            xsl:use-attribute-sets="formal.object.properties">
-    <xsl:call-template name="anchor"/>
-
-    <xsl:if test="title and $placement = 'before'">
-      <xsl:call-template name="formal.object.heading"/>
-    </xsl:if>
-
-    <xsl:apply-templates select="$preamble"/>
-
-    <xsl:if test="title and $placement != 'before'">
-      <xsl:call-template name="formal.object.heading"/>
-    </xsl:if>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="task/title">
-  <!-- nop -->
-</xsl:template>
-
-<xsl:template match="tasksummary">
-  <xsl:call-template name="semiformal.object"/>
-</xsl:template>
-
-<xsl:template match="tasksummary/title"/>
-
-<xsl:template match="taskprerequisites">
-  <xsl:call-template name="semiformal.object"/>
-</xsl:template>
-
-<xsl:template match="taskprerequisites/title"/>
-
-<xsl:template match="taskrelated">
-  <xsl:call-template name="semiformal.object"/>
-</xsl:template>
-
-<xsl:template match="taskrelated/title"/>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/titlepage.templates.xml
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/titlepage.templates.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,1311 +1,0 @@
-<!DOCTYPE t:templates [
-<!ENTITY hsize0 "10pt">
-<!ENTITY hsize1 "12pt">
-<!ENTITY hsize2 "14.4pt">
-<!ENTITY hsize3 "17.28pt">
-<!ENTITY hsize4 "20.736pt">
-<!ENTITY hsize5 "24.8832pt">
-<!ENTITY hsize0space "7.5pt"> <!-- 0.75 * hsize0 -->
-<!ENTITY hsize1space "9pt"> <!-- 0.75 * hsize1 -->
-<!ENTITY hsize2space "10.8pt"> <!-- 0.75 * hsize2 -->
-<!ENTITY hsize3space "12.96pt"> <!-- 0.75 * hsize3 -->
-<!ENTITY hsize4space "15.552pt"> <!-- 0.75 * hsize4 -->
-<!ENTITY hsize5space "18.6624pt"> <!-- 0.75 * hsize5 -->
-]>
-<t:templates xmlns:t="http://nwalsh.com/docbook/xsl/template/1.0"
-	     xmlns:param="http://nwalsh.com/docbook/xsl/template/1.0/param"
-             xmlns:fo="http://www.w3.org/1999/XSL/Format"
-             xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the DocBook XSL Stylesheet distribution.
-     See ../README or http://docbook.sf.net/ for copyright
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<t:titlepage t:element="article" t:wrapper="fo:block"
-             font-family="{$title.fontset}">
-
-  <t:titlepage-content t:side="recto"
-	     start-indent="0pt"
-             text-align="center">
-
-    <title t:named-template="component.title"
-	   param:node="ancestor-or-self::article[1]"
-	   keep-with-next.within-column="always"
-	   font-size="&hsize5;"
-	   font-weight="bold"/>
-
-    <subtitle/>
-
-    <corpauthor space-before="0.5em"
-                font-size="&hsize2;"/>
-    <authorgroup space-before="0.5em"
-                 font-size="&hsize2;"/>
-    <author space-before="0.5em"
-            font-size="&hsize2;"/>
-
-    <othercredit space-before="0.5em"/>
-    <releaseinfo space-before="0.5em"/>
-    <copyright space-before="0.5em"/>
-    <legalnotice text-align="start"
-                 margin-left="0.5in"
-                 margin-right="0.5in"
-                 font-family="{$body.fontset}"/>
-    <pubdate space-before="0.5em"/>
-    <revision space-before="0.5em"/>
-    <revhistory space-before="0.5em"/>
-    <abstract space-before="0.5em"
-	      text-align="start"
-	      margin-left="0.5in"
-              margin-right="0.5in"
-              font-family="{$body.fontset}"/>
-  </t:titlepage-content>
-
-  <t:titlepage-content t:side="verso">
-  </t:titlepage-content>
-
-  <t:titlepage-separator>
-  </t:titlepage-separator>
-
-  <t:titlepage-before t:side="recto">
-  </t:titlepage-before>
-
-  <t:titlepage-before t:side="verso">
-  </t:titlepage-before>
-</t:titlepage>
-
-<!-- ==================================================================== -->
-
-<t:titlepage t:element="set" t:wrapper="fo:block">
-  <t:titlepage-content t:side="recto">
-      <title
-	     t:named-template="division.title"
-	     param:node="ancestor-or-self::set[1]"
-	     text-align="center"
-	     font-size="&hsize5;"
-	     space-before="&hsize5space;"
-	     font-weight="bold"
-	     font-family="{$title.fontset}"/>
-    <subtitle
-	      font-family="{$title.fontset}"
-	      text-align="center"/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
-  </t:titlepage-content>
-
-  <t:titlepage-content t:side="verso">
-  </t:titlepage-content>
-
-  <t:titlepage-separator>
-  </t:titlepage-separator>
-
-  <t:titlepage-before t:side="recto">
-  </t:titlepage-before>
-
-  <t:titlepage-before t:side="verso">
-  </t:titlepage-before>
-</t:titlepage>
-
-<!-- ==================================================================== -->
-
-  <t:titlepage t:element="book" t:wrapper="fo:block">
-    <t:titlepage-content t:side="recto">
-      <title
-	     t:named-template="division.title"
-	     param:node="ancestor-or-self::book[1]"
-	     text-align="center"
-	     font-size="&hsize5;"
-	     space-before="&hsize5space;"
-	     font-weight="bold"
-	     font-family="{$title.fontset}"/>
-      <subtitle
-		text-align="center"
-		font-size="&hsize4;"
-		space-before="&hsize4space;"
-		font-family="{$title.fontset}"/>
-      <corpauthor font-size="&hsize3;"
-		  keep-with-next.within-column="always"
-		  space-before="2in"/>
-      <authorgroup space-before="2in"/>
-      <author font-size="&hsize3;"
-	      space-before="&hsize2space;"
-	      keep-with-next.within-column="always"/>
-    </t:titlepage-content>
-
-  <t:titlepage-content t:side="verso">
-      <title
-	     t:named-template="book.verso.title"
-	     font-size="&hsize2;"
-	     font-weight="bold"
-	     font-family="{$title.fontset}"/>
-      <corpauthor/>
-      <authorgroup t:named-template="verso.authorgroup"/>
-      <author/>
-      <othercredit/>
-      <releaseinfo space-before="0.5em"/>
-      <pubdate space-before="1em"/>
-      <copyright/>
-      <abstract/>
-      <legalnotice font-size="8pt"/>
-  </t:titlepage-content>
-
-  <t:titlepage-separator>
-      <fo:block break-after="page"/>
-  </t:titlepage-separator>
-
-  <t:titlepage-before t:side="recto">
-  </t:titlepage-before>
-
-  <t:titlepage-before t:side="verso">
-      <fo:block break-after="page"/>
-  </t:titlepage-before>
-</t:titlepage>
-
-<!-- ==================================================================== -->
-
-<t:titlepage t:element="part" t:wrapper="fo:block">
-  <t:titlepage-content t:side="recto">
-      <title
-	     t:named-template="division.title"
-	     param:node="ancestor-or-self::part[1]"
-	     text-align="center"
-	     font-size="&hsize5;"
-	     space-before="&hsize5space;"
-	     font-weight="bold"
-	     font-family="{$title.fontset}"/>
-    <subtitle
-	      text-align="center"
-	      font-size="&hsize4;"
-	      space-before="&hsize4space;"
-	      font-weight='bold'
-	      font-style='italic'
-	      font-family="{$title.fontset}"/>
-  </t:titlepage-content>
-
-  <t:titlepage-content t:side="verso">
-  </t:titlepage-content>
-
-  <t:titlepage-separator>
-  </t:titlepage-separator>
-
-  <t:titlepage-before t:side="recto">
-  </t:titlepage-before>
-
-  <t:titlepage-before t:side="verso">
-  </t:titlepage-before>
-</t:titlepage>
-
-<t:titlepage t:element="partintro" t:wrapper="fo:block">
-  <t:titlepage-content t:side="recto">
-    <title
-	   text-align="center"
-	   font-size="&hsize5;"
-	   font-weight="bold"
-	   space-before="1em"
-	   font-family="{$title.fontset}"/>
-    <subtitle
-	      text-align="center"
-	      font-size="&hsize2;"
-	      font-weight="bold"
-	      font-style="italic"
-	      font-family="{$title.fontset}"/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
-  </t:titlepage-content>
-
-  <t:titlepage-content t:side="verso">
-  </t:titlepage-content>
-
-  <t:titlepage-separator>
-  </t:titlepage-separator>
-
-  <t:titlepage-before t:side="recto">
-  </t:titlepage-before>
-
-  <t:titlepage-before t:side="verso">
-  </t:titlepage-before>
-</t:titlepage>
-
-<!-- ==================================================================== -->
-
-<t:titlepage t:element="reference" t:wrapper="fo:block">
-  <t:titlepage-content t:side="recto">
-      <title
-	     t:named-template="division.title"
-	     param:node="ancestor-or-self::reference[1]"
-	     text-align="center"
-	     font-size="&hsize5;"
-	     space-before="&hsize5space;"
-	     font-weight="bold"
-	     font-family="{$title.fontset}"/>
-    <subtitle
-	      font-family="{$title.fontset}"
-	      text-align="center"/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
-  </t:titlepage-content>
-
-  <t:titlepage-content t:side="verso">
-  </t:titlepage-content>
-
-  <t:titlepage-separator>
-  </t:titlepage-separator>
-
-  <t:titlepage-before t:side="recto">
-  </t:titlepage-before>
-
-  <t:titlepage-before t:side="verso">
-  </t:titlepage-before>
-</t:titlepage>
-
-<!-- ==================================================================== -->
-
-<t:titlepage t:element="refsynopsisdiv" t:wrapper="fo:block">
-  <t:titlepage-content t:side="recto">
-    <title
-	   font-family="{$title.fontset}"/>
-  </t:titlepage-content>
-
-  <t:titlepage-content t:side="verso">
-  </t:titlepage-content>
-
-  <t:titlepage-separator>
-  </t:titlepage-separator>
-
-  <t:titlepage-before t:side="recto">
-  </t:titlepage-before>
-
-  <t:titlepage-before t:side="verso">
-  </t:titlepage-before>
-</t:titlepage>
-
-<!-- ==================================================================== -->
-
-<t:titlepage t:element="refsection" t:wrapper="fo:block">
-  <t:titlepage-content t:side="recto">
-    <title
-	   font-family="{$title.fontset}"/>
-  </t:titlepage-content>
-
-  <t:titlepage-content t:side="verso">
-  </t:titlepage-content>
-
-  <t:titlepage-separator>
-  </t:titlepage-separator>
-
-  <t:titlepage-before t:side="recto">
-  </t:titlepage-before>
-
-  <t:titlepage-before t:side="verso">
-  </t:titlepage-before>
-</t:titlepage>
-
-<!-- ==================================================================== -->
-
-<t:titlepage t:element="refsect1" t:wrapper="fo:block">
-  <t:titlepage-content t:side="recto">
-    <title
-	   font-family="{$title.fontset}"/>
-  </t:titlepage-content>
-
-  <t:titlepage-content t:side="verso">
-  </t:titlepage-content>
-
-  <t:titlepage-separator>
-  </t:titlepage-separator>
-
-  <t:titlepage-before t:side="recto">
-  </t:titlepage-before>
-
-  <t:titlepage-before t:side="verso">
-  </t:titlepage-before>
-</t:titlepage>
-
-<!-- ==================================================================== -->
-
-<t:titlepage t:element="refsect2" t:wrapper="fo:block">
-  <t:titlepage-content t:side="recto">
-    <title
-	   font-family="{$title.fontset}"/>
-  </t:titlepage-content>
-
-  <t:titlepage-content t:side="verso">
-  </t:titlepage-content>
-
-  <t:titlepage-separator>
-  </t:titlepage-separator>
-
-  <t:titlepage-before t:side="recto">
-  </t:titlepage-before>
-
-  <t:titlepage-before t:side="verso">
-  </t:titlepage-before>
-</t:titlepage>
-
-<!-- ==================================================================== -->
-
-<t:titlepage t:element="refsect3" t:wrapper="fo:block">
-  <t:titlepage-content t:side="recto">
-    <title
-	   font-family="{$title.fontset}"/>
-  </t:titlepage-content>
-
-  <t:titlepage-content t:side="verso">
-  </t:titlepage-content>
-
-  <t:titlepage-separator>
-  </t:titlepage-separator>
-
-  <t:titlepage-before t:side="recto">
-  </t:titlepage-before>
-
-  <t:titlepage-before t:side="verso">
-  </t:titlepage-before>
-</t:titlepage>
-
-<!-- ==================================================================== -->
-
-  <t:titlepage t:element="dedication" t:wrapper="fo:block">
-    <t:titlepage-content t:side="recto">
-      <title
-	     t:force="1"
-	     t:named-template="component.title"
-	     param:node="ancestor-or-self::dedication[1]"
-	     margin-left="{$title.margin.left}"
-	     font-size="&hsize5;"
-	     font-family="{$title.fontset}"
-	     font-weight="bold"/>
-      <subtitle
-		font-family="{$title.fontset}"/>
-    </t:titlepage-content>
-
-  <t:titlepage-content t:side="verso">
-  </t:titlepage-content>
-
-  <t:titlepage-separator>
-  </t:titlepage-separator>
-
-  <t:titlepage-before t:side="recto">
-  </t:titlepage-before>
-
-  <t:titlepage-before t:side="verso">
-  </t:titlepage-before>
-</t:titlepage>
-
-<!-- ==================================================================== -->
-
-  <t:titlepage t:element="preface" t:wrapper="fo:block">
-    <t:titlepage-content t:side="recto">
-      <title
-	     t:force="1"
-	     t:named-template="component.title"
-	     param:node="ancestor-or-self::preface[1]"
-	     margin-left="{$title.margin.left}"
-	     font-size="&hsize5;"
-	     font-family="{$title.fontset}"
-	     font-weight="bold"/>
-      <subtitle
-		font-family="{$title.fontset}"/>
-      <corpauthor/>
-      <authorgroup/>
-      <author/>
-      <othercredit/>
-      <releaseinfo/>
-      <copyright/>
-      <legalnotice/>
-      <pubdate/>
-      <revision/>
-      <revhistory/>
-      <abstract/>
-    </t:titlepage-content>
-
-  <t:titlepage-content t:side="verso">
-  </t:titlepage-content>
-
-  <t:titlepage-separator>
-  </t:titlepage-separator>
-
-  <t:titlepage-before t:side="recto">
-  </t:titlepage-before>
-
-  <t:titlepage-before t:side="verso">
-  </t:titlepage-before>
-</t:titlepage>
-
-<!-- ==================================================================== -->
-
-  <t:titlepage t:element="chapter" t:wrapper="fo:block"
-               font-family="{$title.fontset}">
-    <t:titlepage-content t:side="recto" margin-left="{$title.margin.left}">
-      <title t:named-template="component.title"
-	     param:node="ancestor-or-self::chapter[1]"
-	     font-size="&hsize5;"
-	     font-weight="bold"/>
-
-      <subtitle space-before="0.5em"
-		font-style="italic"
-		font-size="&hsize2;"
-		font-weight="bold"/>
-
-      <corpauthor  space-before="0.5em"
-	           space-after="0.5em"
-                   font-size="&hsize2;"/>
-
-      <authorgroup space-before="0.5em"
-	           space-after="0.5em"
-                   font-size="&hsize2;"/>
-
-      <author      space-before="0.5em"
-	           space-after="0.5em"
-                   font-size="&hsize2;"/>
-
-      <othercredit/>
-      <releaseinfo/>
-      <copyright/>
-      <legalnotice/>
-      <pubdate/>
-      <revision/>
-      <revhistory/>
-      <abstract/>
-    </t:titlepage-content>
-
-  <t:titlepage-content t:side="verso">
-  </t:titlepage-content>
-
-  <t:titlepage-separator>
-  </t:titlepage-separator>
-
-  <t:titlepage-before t:side="recto">
-  </t:titlepage-before>
-
-  <t:titlepage-before t:side="verso">
-  </t:titlepage-before>
-</t:titlepage>
-
-<!-- ==================================================================== -->
-
-  <t:titlepage t:element="appendix" t:wrapper="fo:block">
-    <t:titlepage-content t:side="recto">
-      <title
-	     t:named-template="component.title"
-	     param:node="ancestor-or-self::appendix[1]"
-	     margin-left="{$title.margin.left}"
-	     font-size="&hsize5;"
-	     font-weight="bold"
-	     font-family="{$title.fontset}"/>
-      <subtitle
-		font-family="{$title.fontset}"/>
-      <corpauthor/>
-      <authorgroup/>
-      <author/>
-      <othercredit/>
-      <releaseinfo/>
-      <copyright/>
-      <legalnotice/>
-      <pubdate/>
-      <revision/>
-      <revhistory/>
-      <abstract/>
-    </t:titlepage-content>
-
-  <t:titlepage-content t:side="verso">
-  </t:titlepage-content>
-
-  <t:titlepage-separator>
-  </t:titlepage-separator>
-
-  <t:titlepage-before t:side="recto">
-  </t:titlepage-before>
-
-  <t:titlepage-before t:side="verso">
-  </t:titlepage-before>
-</t:titlepage>
-
-<!-- ==================================================================== -->
-
-<t:titlepage t:element="section" t:wrapper="fo:block">
-  <t:titlepage-content t:side="recto">
-    <title
-	   margin-left="{$title.margin.left}"
-	   font-family="{$title.fontset}"/>
-    <subtitle
-	      font-family="{$title.fontset}"/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
-  </t:titlepage-content>
-
-  <t:titlepage-content t:side="verso">
-  </t:titlepage-content>
-
-  <t:titlepage-separator>
-  </t:titlepage-separator>
-
-  <t:titlepage-before t:side="recto">
-  </t:titlepage-before>
-
-  <t:titlepage-before t:side="verso">
-  </t:titlepage-before>
-</t:titlepage>
-
-<t:titlepage t:element="sect1" t:wrapper="fo:block">
-  <t:titlepage-content t:side="recto">
-    <title
-	   margin-left="{$title.margin.left}"
-	   font-family="{$title.fontset}"/>
-    <subtitle
-	      font-family="{$title.fontset}"/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
-  </t:titlepage-content>
-
-  <t:titlepage-content t:side="verso">
-  </t:titlepage-content>
-
-  <t:titlepage-separator>
-  </t:titlepage-separator>
-
-  <t:titlepage-before t:side="recto">
-  </t:titlepage-before>
-
-  <t:titlepage-before t:side="verso">
-  </t:titlepage-before>
-</t:titlepage>
-
-<t:titlepage t:element="sect2" t:wrapper="fo:block">
-  <t:titlepage-content t:side="recto">
-    <title
-	   margin-left="{$title.margin.left}"
-	   font-family="{$title.fontset}"/>
-    <subtitle
-	      font-family="{$title.fontset}"/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
-  </t:titlepage-content>
-
-  <t:titlepage-content t:side="verso">
-  </t:titlepage-content>
-
-  <t:titlepage-separator>
-  </t:titlepage-separator>
-
-  <t:titlepage-before t:side="recto">
-  </t:titlepage-before>
-
-  <t:titlepage-before t:side="verso">
-  </t:titlepage-before>
-</t:titlepage>
-
-<t:titlepage t:element="sect3" t:wrapper="fo:block">
-  <t:titlepage-content t:side="recto">
-    <title
-	   margin-left="{$title.margin.left}"
-	   font-family="{$title.fontset}"/>
-    <subtitle
-	      font-family="{$title.fontset}"/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
-  </t:titlepage-content>
-
-  <t:titlepage-content t:side="verso">
-  </t:titlepage-content>
-
-  <t:titlepage-separator>
-  </t:titlepage-separator>
-
-  <t:titlepage-before t:side="recto">
-  </t:titlepage-before>
-
-  <t:titlepage-before t:side="verso">
-  </t:titlepage-before>
-</t:titlepage>
-
-<t:titlepage t:element="sect4" t:wrapper="fo:block">
-  <t:titlepage-content t:side="recto">
-    <title
-	   margin-left="{$title.margin.left}"
-	   font-family="{$title.fontset}"/>
-    <subtitle
-	      font-family="{$title.fontset}"/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
-  </t:titlepage-content>
-
-  <t:titlepage-content t:side="verso">
-  </t:titlepage-content>
-
-  <t:titlepage-separator>
-  </t:titlepage-separator>
-
-  <t:titlepage-before t:side="recto">
-  </t:titlepage-before>
-
-  <t:titlepage-before t:side="verso">
-  </t:titlepage-before>
-</t:titlepage>
-
-<t:titlepage t:element="sect5" t:wrapper="fo:block">
-  <t:titlepage-content t:side="recto">
-    <title
-	   margin-left="{$title.margin.left}"
-	   font-family="{$title.fontset}"/>
-    <subtitle
-	      font-family="{$title.fontset}"/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
-  </t:titlepage-content>
-
-  <t:titlepage-content t:side="verso">
-  </t:titlepage-content>
-
-  <t:titlepage-separator>
-  </t:titlepage-separator>
-
-  <t:titlepage-before t:side="recto">
-  </t:titlepage-before>
-
-  <t:titlepage-before t:side="verso">
-  </t:titlepage-before>
-</t:titlepage>
-
-<t:titlepage t:element="simplesect" t:wrapper="fo:block">
-  <t:titlepage-content t:side="recto">
-    <title
-	   margin-left="{$title.margin.left}"
-	   font-family="{$title.fontset}"/>
-    <subtitle
-	      font-family="{$title.fontset}"/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
-  </t:titlepage-content>
-
-  <t:titlepage-content t:side="verso">
-  </t:titlepage-content>
-
-  <t:titlepage-separator>
-  </t:titlepage-separator>
-
-  <t:titlepage-before t:side="recto">
-  </t:titlepage-before>
-
-  <t:titlepage-before t:side="verso">
-  </t:titlepage-before>
-</t:titlepage>
-
-<!-- ==================================================================== -->
-
-  <t:titlepage t:element="bibliography" t:wrapper="fo:block">
-    <t:titlepage-content t:side="recto">
-      <title
-	     t:force="1"
-	     t:named-template="component.title"
-	     param:node="ancestor-or-self::bibliography[1]"
-	     margin-left="{$title.margin.left}"
-	     font-size="&hsize5;"
-	     font-family="{$title.fontset}"
-	     font-weight="bold"/>
-      <subtitle
-		font-family="{$title.fontset}"/>
-    </t:titlepage-content>
-
-    <t:titlepage-content t:side="verso">
-    </t:titlepage-content>
-
-    <t:titlepage-separator>
-    </t:titlepage-separator>
-
-    <t:titlepage-before t:side="recto">
-    </t:titlepage-before>
-
-    <t:titlepage-before t:side="verso">
-    </t:titlepage-before>
-  </t:titlepage>
-
-<!-- ==================================================================== -->
-
-  <t:titlepage t:element="bibliodiv" t:wrapper="fo:block">
-    <t:titlepage-content t:side="recto">
-      <title t:named-template="component.title"
-	     param:node="ancestor-or-self::bibliodiv[1]"
-	     margin-left="{$title.margin.left}"
-	     font-size="&hsize4;"
-	     font-family="{$title.fontset}"
-	     font-weight="bold"/>
-      <subtitle
-		font-family="{$title.fontset}"/>
-    </t:titlepage-content>
-
-    <t:titlepage-content t:side="verso">
-    </t:titlepage-content>
-
-    <t:titlepage-separator>
-    </t:titlepage-separator>
-
-    <t:titlepage-before t:side="recto">
-    </t:titlepage-before>
-
-    <t:titlepage-before t:side="verso">
-    </t:titlepage-before>
-  </t:titlepage>
-
-<!-- ==================================================================== -->
-
-  <t:titlepage t:element="glossary" t:wrapper="fo:block">
-    <t:titlepage-content t:side="recto">
-      <title
-	     t:force="1"
-	     t:named-template="component.title"
-	     param:node="ancestor-or-self::glossary[1]"
-	     margin-left="{$title.margin.left}"
-	     font-size="&hsize5;"
-	     font-family="{$title.fontset}"
-	     font-weight="bold"/>
-      <subtitle
-		font-family="{$title.fontset}"/>
-    </t:titlepage-content>
-
-    <t:titlepage-content t:side="verso">
-    </t:titlepage-content>
-
-    <t:titlepage-separator>
-    </t:titlepage-separator>
-
-    <t:titlepage-before t:side="recto">
-    </t:titlepage-before>
-
-    <t:titlepage-before t:side="verso">
-    </t:titlepage-before>
-  </t:titlepage>
-
-<!-- ==================================================================== -->
-
-  <t:titlepage t:element="glossdiv" t:wrapper="fo:block">
-    <t:titlepage-content t:side="recto">
-      <title t:named-template="component.title"
-	     param:node="ancestor-or-self::glossdiv[1]"
-	     margin-left="{$title.margin.left}"
-	     font-size="&hsize4;"
-	     font-family="{$title.fontset}"
-	     font-weight="bold"/>
-      <subtitle
-		font-family="{$title.fontset}"/>
-    </t:titlepage-content>
-
-    <t:titlepage-content t:side="verso">
-    </t:titlepage-content>
-
-    <t:titlepage-separator>
-    </t:titlepage-separator>
-
-    <t:titlepage-before t:side="recto">
-    </t:titlepage-before>
-
-    <t:titlepage-before t:side="verso">
-    </t:titlepage-before>
-  </t:titlepage>
-
-<!-- ==================================================================== -->
-
-  <t:titlepage t:element="index" t:wrapper="fo:block">
-    <t:titlepage-content t:side="recto">
-      <title
-	     t:force="1"
-	     t:named-template="component.title"
-	     param:node="ancestor-or-self::index[1]"
-             param:pagewide="1"
-	     margin-left="0pt"
-	     font-size="&hsize5;"
-	     font-family="{$title.fontset}"
-	     font-weight="bold"/>
-      <subtitle
-		font-family="{$title.fontset}"/>
-    </t:titlepage-content>
-
-    <t:titlepage-content t:side="verso">
-    </t:titlepage-content>
-
-    <t:titlepage-separator>
-    </t:titlepage-separator>
-
-    <t:titlepage-before t:side="recto">
-    </t:titlepage-before>
-
-    <t:titlepage-before t:side="verso">
-    </t:titlepage-before>
-  </t:titlepage>
-
-<!-- ==================================================================== -->
-
-  <!-- The indexdiv.title template is used so that manual and -->
-  <!-- automatically generated indexdiv titles get the same -->
-  <!-- formatting. -->
-
-  <t:titlepage t:element="indexdiv" t:wrapper="fo:block">
-    <t:titlepage-content t:side="recto">
-      <title t:force="1"
-	     t:named-template="indexdiv.title"
-	     param:title="title"/>
-      <subtitle
-		font-family="{$title.fontset}"/>
-    </t:titlepage-content>
-
-    <t:titlepage-content t:side="verso">
-    </t:titlepage-content>
-
-    <t:titlepage-separator>
-    </t:titlepage-separator>
-
-    <t:titlepage-before t:side="recto">
-    </t:titlepage-before>
-
-    <t:titlepage-before t:side="verso">
-    </t:titlepage-before>
-  </t:titlepage>
-
-<!-- ==================================================================== -->
-
-  <t:titlepage t:element="setindex" t:wrapper="fo:block">
-    <t:titlepage-content t:side="recto">
-      <title
-	     t:force="1"
-	     t:named-template="component.title"
-	     param:node="ancestor-or-self::setindex[1]"
-             param:pagewide="1"
-	     margin-left="0pt"
-	     font-size="&hsize5;"
-	     font-family="{$title.fontset}"
-	     font-weight="bold"/>
-      <subtitle
-		font-family="{$title.fontset}"/>
-    </t:titlepage-content>
-
-    <t:titlepage-content t:side="verso">
-    </t:titlepage-content>
-
-    <t:titlepage-separator>
-    </t:titlepage-separator>
-
-    <t:titlepage-before t:side="recto">
-    </t:titlepage-before>
-
-    <t:titlepage-before t:side="verso">
-    </t:titlepage-before>
-  </t:titlepage>
-
-<!-- ==================================================================== -->
-
-  <t:titlepage t:element="colophon" t:wrapper="fo:block">
-    <t:titlepage-content t:side="recto">
-      <title
-	     t:force="1"
-	     t:named-template="component.title"
-	     param:node="ancestor-or-self::colophon[1]"
-	     margin-left="{$title.margin.left}"
-	     font-size="&hsize5;"
-	     font-family="{$title.fontset}"
-	     font-weight="bold"/>
-      <subtitle
-		font-family="{$title.fontset}"/>
-    </t:titlepage-content>
-
-  <t:titlepage-content t:side="verso">
-  </t:titlepage-content>
-
-  <t:titlepage-separator>
-  </t:titlepage-separator>
-
-  <t:titlepage-before t:side="recto">
-  </t:titlepage-before>
-
-  <t:titlepage-before t:side="verso">
-  </t:titlepage-before>
-</t:titlepage>
-
-<!-- ==================================================================== -->
-
-  <t:titlepage t:element="sidebar" t:wrapper="fo:block">
-    <t:titlepage-content t:side="recto">
-      <title 
-	     font-family="{$title.fontset}"
-	     font-weight="bold"/>
-      <subtitle
-		font-family="{$title.fontset}"/>
-    </t:titlepage-content>
-
-    <t:titlepage-content t:side="verso">
-    </t:titlepage-content>
-
-    <t:titlepage-separator>
-    </t:titlepage-separator>
-
-    <t:titlepage-before t:side="recto">
-    </t:titlepage-before>
-
-    <t:titlepage-before t:side="verso">
-    </t:titlepage-before>
-  </t:titlepage>
-
-<!-- ==================================================================== -->
-<t:titlepage t:element="qandaset" t:wrapper="fo:block"
-             font-family="{$title.fontset}">
-
-  <t:titlepage-content t:side="recto"
-	     start-indent="0pt"
-             text-align="center">
-
-    <title t:named-template="component.title"
-	   param:node="ancestor-or-self::qandaset[1]"
-	   keep-with-next.within-column="always"
-	   font-size="&hsize5;"
-	   font-weight="bold"/>
-
-    <subtitle/>
-
-    <corpauthor space-before="0.5em"
-                font-size="&hsize2;"/>
-    <authorgroup space-before="0.5em"
-                 font-size="&hsize2;"/>
-    <author space-before="0.5em"
-            font-size="&hsize2;"/>
-
-    <othercredit space-before="0.5em"/>
-    <releaseinfo space-before="0.5em"/>
-    <copyright space-before="0.5em"/>
-    <legalnotice text-align="start"
-                 margin-left="0.5in"
-                 margin-right="0.5in"
-                 font-family="{$body.fontset}"/>
-    <pubdate space-before="0.5em"/>
-    <revision space-before="0.5em"/>
-    <revhistory space-before="0.5em"/>
-    <abstract space-before="0.5em"
-	      text-align="start"
-	      margin-left="0.5in"
-              margin-right="0.5in"
-              font-family="{$body.fontset}"/>
-  </t:titlepage-content>
-
-  <t:titlepage-content t:side="verso">
-  </t:titlepage-content>
-
-  <t:titlepage-separator>
-  </t:titlepage-separator>
-
-  <t:titlepage-before t:side="recto">
-  </t:titlepage-before>
-
-  <t:titlepage-before t:side="verso">
-  </t:titlepage-before>
-</t:titlepage>
-
-<!-- ==================================================================== -->
-
-  <t:titlepage t:element="table.of.contents" t:wrapper="fo:block">
-    <t:titlepage-content t:side="recto">
-      <title
-	     t:force="1"
-	     t:named-template="gentext"
-	     param:key="'TableofContents'"
-             space-before.minimum="1em"
-             space-before.optimum="1.5em"
-             space-before.maximum="2em"
-	     space-after="0.5em"
-	     margin-left="{$title.margin.left}"
-	     start-indent="0pt"
-	     font-size="&hsize3;"
-	     font-weight="bold"
-	     font-family="{$title.fontset}"/>
-    </t:titlepage-content>
-
-    <t:titlepage-content t:side="verso">
-    </t:titlepage-content>
-
-    <t:titlepage-separator>
-    </t:titlepage-separator>
-
-    <t:titlepage-before t:side="recto">
-    </t:titlepage-before>
-
-    <t:titlepage-before t:side="verso">
-    </t:titlepage-before>
-  </t:titlepage>
-
-  <t:titlepage t:element="list.of.tables" t:wrapper="fo:block">
-    <t:titlepage-content t:side="recto">
-      <title
-	     t:force="1"
-	     t:named-template="gentext"
-	     param:key="'ListofTables'"
-             space-before.minimum="1em"
-             space-before.optimum="1.5em"
-             space-before.maximum="2em"
-	     space-after="0.5em"
-	     margin-left="{$title.margin.left}"
-	     start-indent="0pt"
-	     font-size="&hsize3;"
-	     font-weight="bold"
-	     font-family="{$title.fontset}"/>
-    </t:titlepage-content>
-
-    <t:titlepage-content t:side="verso">
-    </t:titlepage-content>
-
-    <t:titlepage-separator>
-    </t:titlepage-separator>
-
-    <t:titlepage-before t:side="recto">
-    </t:titlepage-before>
-
-    <t:titlepage-before t:side="verso">
-    </t:titlepage-before>
-  </t:titlepage>
-
-  <t:titlepage t:element="list.of.figures" t:wrapper="fo:block">
-    <t:titlepage-content t:side="recto">
-      <title
-	     t:force="1"
-	     t:named-template="gentext"
-	     param:key="'ListofFigures'"
-             space-before.minimum="1em"
-             space-before.optimum="1.5em"
-             space-before.maximum="2em"
-	     space-after="0.5em"
-	     margin-left="{$title.margin.left}"
-	     start-indent="0pt"
-	     font-size="&hsize3;"
-	     font-weight="bold"
-	     font-family="{$title.fontset}"/>
-    </t:titlepage-content>
-
-    <t:titlepage-content t:side="verso">
-    </t:titlepage-content>
-
-    <t:titlepage-separator>
-    </t:titlepage-separator>
-
-    <t:titlepage-before t:side="recto">
-    </t:titlepage-before>
-
-    <t:titlepage-before t:side="verso">
-    </t:titlepage-before>
-  </t:titlepage>
-
-  <t:titlepage t:element="list.of.examples" t:wrapper="fo:block">
-    <t:titlepage-content t:side="recto">
-      <title
-	     t:force="1"
-	     t:named-template="gentext"
-	     param:key="'ListofExamples'"
-             space-before.minimum="1em"
-             space-before.optimum="1.5em"
-             space-before.maximum="2em"
-	     space-after="0.5em"
-	     margin-left="{$title.margin.left}"
-	     start-indent="0pt"
-	     font-size="&hsize3;"
-	     font-weight="bold"
-	     font-family="{$title.fontset}"/>
-    </t:titlepage-content>
-
-    <t:titlepage-content t:side="verso">
-    </t:titlepage-content>
-
-    <t:titlepage-separator>
-    </t:titlepage-separator>
-
-    <t:titlepage-before t:side="recto">
-    </t:titlepage-before>
-
-    <t:titlepage-before t:side="verso">
-    </t:titlepage-before>
-  </t:titlepage>
-
-  <t:titlepage t:element="list.of.equations" t:wrapper="fo:block">
-    <t:titlepage-content t:side="recto">
-      <title
-	     t:force="1"
-	     t:named-template="gentext"
-	     param:key="'ListofEquations'"
-             space-before.minimum="1em"
-             space-before.optimum="1.5em"
-             space-before.maximum="2em"
-	     space-after="0.5em"
-	     margin-left="{$title.margin.left}"
-	     start-indent="0pt"
-	     font-size="&hsize3;"
-	     font-weight="bold"
-	     font-family="{$title.fontset}"/>
-    </t:titlepage-content>
-
-    <t:titlepage-content t:side="verso">
-    </t:titlepage-content>
-
-    <t:titlepage-separator>
-    </t:titlepage-separator>
-
-    <t:titlepage-before t:side="recto">
-    </t:titlepage-before>
-
-    <t:titlepage-before t:side="verso">
-    </t:titlepage-before>
-  </t:titlepage>
-
-  <t:titlepage t:element="list.of.procedures" t:wrapper="fo:block">
-    <t:titlepage-content t:side="recto">
-      <title
-	     t:force="1"
-	     t:named-template="gentext"
-	     param:key="'ListofProcedures'"
-             space-before.minimum="1em"
-             space-before.optimum="1.5em"
-             space-before.maximum="2em"
-	     space-after="0.5em"
-	     margin-left="{$title.margin.left}"
-	     start-indent="0pt"
-	     font-size="&hsize3;"
-	     font-weight="bold"
-	     font-family="{$title.fontset}"/>
-    </t:titlepage-content>
-
-    <t:titlepage-content t:side="verso">
-    </t:titlepage-content>
-
-    <t:titlepage-separator>
-    </t:titlepage-separator>
-
-    <t:titlepage-before t:side="recto">
-    </t:titlepage-before>
-
-    <t:titlepage-before t:side="verso">
-    </t:titlepage-before>
-  </t:titlepage>
-
-  <t:titlepage t:element="list.of.unknowns" t:wrapper="fo:block">
-    <t:titlepage-content t:side="recto">
-      <title
-	     t:force="1"
-	     t:named-template="gentext"
-	     param:key="'ListofUnknown'"
-             space-before.minimum="1em"
-             space-before.optimum="1.5em"
-             space-before.maximum="2em"
-	     space-after="0.5em"
-	     margin-left="{$title.margin.left}"
-	     start-indent="0pt"
-	     font-size="&hsize3;"
-	     font-weight="bold"
-	     font-family="{$title.fontset}"/>
-    </t:titlepage-content>
-
-    <t:titlepage-content t:side="verso">
-    </t:titlepage-content>
-
-    <t:titlepage-separator>
-    </t:titlepage-separator>
-
-    <t:titlepage-before t:side="recto">
-    </t:titlepage-before>
-
-    <t:titlepage-before t:side="verso">
-    </t:titlepage-before>
-  </t:titlepage>
-
-<!-- ==================================================================== -->
-
-</t:templates>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/titlepage.templates.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/titlepage.templates.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,5094 +1,0 @@
-<?xml version="1.0"?>
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exsl="http://exslt.org/common" version="1.0" exclude-result-prefixes="exsl">
-
-<!-- This stylesheet was created by template/titlepage.xsl-->
-
-<xsl:template name="article.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="articleinfo/title">
-      <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/title"/>
-    </xsl:when>
-    <xsl:when test="artheader/title">
-      <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="articleinfo/subtitle">
-      <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="artheader/subtitle">
-      <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/corpauthor"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/corpauthor"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/corpauthor"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/authorgroup"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/authorgroup"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/authorgroup"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/author"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/author"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/author"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/othercredit"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/othercredit"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/othercredit"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/releaseinfo"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/releaseinfo"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/releaseinfo"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/copyright"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/copyright"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/copyright"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/legalnotice"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/legalnotice"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/legalnotice"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/pubdate"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/pubdate"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/pubdate"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/revision"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/revision"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/revision"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/revhistory"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/revhistory"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/revhistory"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/abstract"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/abstract"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/abstract"/>
-</xsl:template>
-
-<xsl:template name="article.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="article.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="article.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="article.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="article.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="{$title.fontset}">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="article.titlepage.before.recto"/>
-      <xsl:call-template name="article.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block start-indent="0pt" text-align="center"><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="article.titlepage.before.verso"/>
-      <xsl:call-template name="article.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="article.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="article.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="article.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="article.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="article.titlepage.recto.style" keep-with-next.within-column="always" font-size="24.8832pt" font-weight="bold">
-<xsl:call-template name="component.title">
-<xsl:with-param name="node" select="ancestor-or-self::article[1]"/>
-</xsl:call-template>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="article.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="article.titlepage.recto.style">
-<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="article.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="article.titlepage.recto.style" space-before="0.5em" font-size="14.4pt">
-<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="article.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="article.titlepage.recto.style" space-before="0.5em" font-size="14.4pt">
-<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="author" mode="article.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="article.titlepage.recto.style" space-before="0.5em" font-size="14.4pt">
-<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="article.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="article.titlepage.recto.style" space-before="0.5em">
-<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="article.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="article.titlepage.recto.style" space-before="0.5em">
-<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="copyright" mode="article.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="article.titlepage.recto.style" space-before="0.5em">
-<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="article.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="article.titlepage.recto.style" text-align="start" margin-left="0.5in" margin-right="0.5in" font-family="{$body.fontset}">
-<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="article.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="article.titlepage.recto.style" space-before="0.5em">
-<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="revision" mode="article.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="article.titlepage.recto.style" space-before="0.5em">
-<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="article.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="article.titlepage.recto.style" space-before="0.5em">
-<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="abstract" mode="article.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="article.titlepage.recto.style" space-before="0.5em" text-align="start" margin-left="0.5in" margin-right="0.5in" font-family="{$body.fontset}">
-<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template name="set.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="setinfo/title">
-      <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="setinfo/subtitle">
-      <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/corpauthor"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/corpauthor"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/authorgroup"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/authorgroup"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/author"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/author"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/othercredit"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/othercredit"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/releaseinfo"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/releaseinfo"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/copyright"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/copyright"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/legalnotice"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/legalnotice"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/pubdate"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/pubdate"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/revision"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/revision"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/revhistory"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/revhistory"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/abstract"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/abstract"/>
-</xsl:template>
-
-<xsl:template name="set.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="set.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="set.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="set.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="set.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="set.titlepage.before.recto"/>
-      <xsl:call-template name="set.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="set.titlepage.before.verso"/>
-      <xsl:call-template name="set.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="set.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="set.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="set.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="set.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="set.titlepage.recto.style" text-align="center" font-size="24.8832pt" space-before="18.6624pt" font-weight="bold" font-family="{$title.fontset}">
-<xsl:call-template name="division.title">
-<xsl:with-param name="node" select="ancestor-or-self::set[1]"/>
-</xsl:call-template>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="set.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="set.titlepage.recto.style" font-family="{$title.fontset}" text-align="center">
-<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="set.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="set.titlepage.recto.style">
-<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="set.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="set.titlepage.recto.style">
-<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="author" mode="set.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="set.titlepage.recto.style">
-<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="set.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="set.titlepage.recto.style">
-<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="set.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="set.titlepage.recto.style">
-<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="copyright" mode="set.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="set.titlepage.recto.style">
-<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="set.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="set.titlepage.recto.style">
-<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="set.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="set.titlepage.recto.style">
-<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="revision" mode="set.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="set.titlepage.recto.style">
-<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="set.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="set.titlepage.recto.style">
-<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="abstract" mode="set.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="set.titlepage.recto.style">
-<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template name="book.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="bookinfo/title">
-      <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="bookinfo/subtitle">
-      <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/corpauthor"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/corpauthor"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/authorgroup"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/authorgroup"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/author"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/author"/>
-</xsl:template>
-
-<xsl:template name="book.titlepage.verso">
-  <xsl:choose>
-    <xsl:when test="bookinfo/title">
-      <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/corpauthor"/>
-  <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="info/corpauthor"/>
-  <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/authorgroup"/>
-  <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="info/authorgroup"/>
-  <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/author"/>
-  <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="info/author"/>
-  <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/othercredit"/>
-  <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="info/othercredit"/>
-  <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/releaseinfo"/>
-  <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="info/releaseinfo"/>
-  <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/pubdate"/>
-  <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="info/pubdate"/>
-  <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/copyright"/>
-  <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="info/copyright"/>
-  <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/abstract"/>
-  <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="info/abstract"/>
-  <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/legalnotice"/>
-  <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="info/legalnotice"/>
-</xsl:template>
-
-<xsl:template name="book.titlepage.separator"><fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" break-after="page"/>
-</xsl:template>
-
-<xsl:template name="book.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="book.titlepage.before.verso"><fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" break-after="page"/>
-</xsl:template>
-
-<xsl:template name="book.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="book.titlepage.before.recto"/>
-      <xsl:call-template name="book.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="book.titlepage.before.verso"/>
-      <xsl:call-template name="book.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="book.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="book.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="book.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="book.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="book.titlepage.recto.style" text-align="center" font-size="24.8832pt" space-before="18.6624pt" font-weight="bold" font-family="{$title.fontset}">
-<xsl:call-template name="division.title">
-<xsl:with-param name="node" select="ancestor-or-self::book[1]"/>
-</xsl:call-template>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="book.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="book.titlepage.recto.style" text-align="center" font-size="20.736pt" space-before="15.552pt" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="book.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="book.titlepage.recto.style" font-size="17.28pt" keep-with-next.within-column="always" space-before="2in">
-<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="book.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="book.titlepage.recto.style" space-before="2in">
-<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="author" mode="book.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="book.titlepage.recto.style" font-size="17.28pt" space-before="10.8pt" keep-with-next.within-column="always">
-<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="title" mode="book.titlepage.verso.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="book.titlepage.verso.style" font-size="14.4pt" font-weight="bold" font-family="{$title.fontset}">
-<xsl:call-template name="book.verso.title">
-</xsl:call-template>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="book.titlepage.verso.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="book.titlepage.verso.style">
-<xsl:apply-templates select="." mode="book.titlepage.verso.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="book.titlepage.verso.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="book.titlepage.verso.style">
-<xsl:call-template name="verso.authorgroup">
-</xsl:call-template>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="author" mode="book.titlepage.verso.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="book.titlepage.verso.style">
-<xsl:apply-templates select="." mode="book.titlepage.verso.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="book.titlepage.verso.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="book.titlepage.verso.style">
-<xsl:apply-templates select="." mode="book.titlepage.verso.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="book.titlepage.verso.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="book.titlepage.verso.style" space-before="0.5em">
-<xsl:apply-templates select="." mode="book.titlepage.verso.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="book.titlepage.verso.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="book.titlepage.verso.style" space-before="1em">
-<xsl:apply-templates select="." mode="book.titlepage.verso.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="copyright" mode="book.titlepage.verso.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="book.titlepage.verso.style">
-<xsl:apply-templates select="." mode="book.titlepage.verso.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="abstract" mode="book.titlepage.verso.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="book.titlepage.verso.style">
-<xsl:apply-templates select="." mode="book.titlepage.verso.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="book.titlepage.verso.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="book.titlepage.verso.style" font-size="8pt">
-<xsl:apply-templates select="." mode="book.titlepage.verso.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template name="part.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="partinfo/title">
-      <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/title"/>
-    </xsl:when>
-    <xsl:when test="docinfo/title">
-      <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="docinfo/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="partinfo/subtitle">
-      <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="docinfo/subtitle">
-      <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-</xsl:template>
-
-<xsl:template name="part.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="part.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="part.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="part.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="part.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="part.titlepage.before.recto"/>
-      <xsl:call-template name="part.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="part.titlepage.before.verso"/>
-      <xsl:call-template name="part.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="part.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="part.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="part.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="part.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="part.titlepage.recto.style" text-align="center" font-size="24.8832pt" space-before="18.6624pt" font-weight="bold" font-family="{$title.fontset}">
-<xsl:call-template name="division.title">
-<xsl:with-param name="node" select="ancestor-or-self::part[1]"/>
-</xsl:call-template>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="part.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="part.titlepage.recto.style" text-align="center" font-size="20.736pt" space-before="15.552pt" font-weight="bold" font-style="italic" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="part.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template name="partintro.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="partintroinfo/title">
-      <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/title"/>
-    </xsl:when>
-    <xsl:when test="docinfo/title">
-      <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="partintroinfo/subtitle">
-      <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="docinfo/subtitle">
-      <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/corpauthor"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/corpauthor"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/corpauthor"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/authorgroup"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/authorgroup"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/authorgroup"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/author"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/author"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/author"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/othercredit"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/othercredit"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/othercredit"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/releaseinfo"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/releaseinfo"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/releaseinfo"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/copyright"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/copyright"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/copyright"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/legalnotice"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/legalnotice"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/legalnotice"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/pubdate"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/pubdate"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/pubdate"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/revision"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/revision"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/revision"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/revhistory"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/revhistory"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/revhistory"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/abstract"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/abstract"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/abstract"/>
-</xsl:template>
-
-<xsl:template name="partintro.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="partintro.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="partintro.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="partintro.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="partintro.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="partintro.titlepage.before.recto"/>
-      <xsl:call-template name="partintro.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="partintro.titlepage.before.verso"/>
-      <xsl:call-template name="partintro.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="partintro.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="partintro.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="partintro.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="partintro.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="partintro.titlepage.recto.style" text-align="center" font-size="24.8832pt" font-weight="bold" space-before="1em" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="partintro.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="partintro.titlepage.recto.style" text-align="center" font-size="14.4pt" font-weight="bold" font-style="italic" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="partintro.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="partintro.titlepage.recto.style">
-<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="partintro.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="partintro.titlepage.recto.style">
-<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="author" mode="partintro.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="partintro.titlepage.recto.style">
-<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="partintro.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="partintro.titlepage.recto.style">
-<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="partintro.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="partintro.titlepage.recto.style">
-<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="copyright" mode="partintro.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="partintro.titlepage.recto.style">
-<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="partintro.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="partintro.titlepage.recto.style">
-<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="partintro.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="partintro.titlepage.recto.style">
-<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="revision" mode="partintro.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="partintro.titlepage.recto.style">
-<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="partintro.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="partintro.titlepage.recto.style">
-<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="abstract" mode="partintro.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="partintro.titlepage.recto.style">
-<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template name="reference.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="referenceinfo/title">
-      <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/title"/>
-    </xsl:when>
-    <xsl:when test="docinfo/title">
-      <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="referenceinfo/subtitle">
-      <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="docinfo/subtitle">
-      <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/corpauthor"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/corpauthor"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/corpauthor"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/authorgroup"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/authorgroup"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/authorgroup"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/author"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/author"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/author"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/othercredit"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/othercredit"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/othercredit"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/releaseinfo"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/releaseinfo"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/releaseinfo"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/copyright"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/copyright"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/copyright"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/legalnotice"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/legalnotice"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/legalnotice"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/pubdate"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/pubdate"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/pubdate"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/revision"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/revision"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/revision"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/revhistory"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/revhistory"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/revhistory"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/abstract"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/abstract"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/abstract"/>
-</xsl:template>
-
-<xsl:template name="reference.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="reference.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="reference.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="reference.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="reference.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="reference.titlepage.before.recto"/>
-      <xsl:call-template name="reference.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="reference.titlepage.before.verso"/>
-      <xsl:call-template name="reference.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="reference.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="reference.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="reference.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="reference.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="reference.titlepage.recto.style" text-align="center" font-size="24.8832pt" space-before="18.6624pt" font-weight="bold" font-family="{$title.fontset}">
-<xsl:call-template name="division.title">
-<xsl:with-param name="node" select="ancestor-or-self::reference[1]"/>
-</xsl:call-template>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="reference.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="reference.titlepage.recto.style" font-family="{$title.fontset}" text-align="center">
-<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="reference.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="reference.titlepage.recto.style">
-<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="reference.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="reference.titlepage.recto.style">
-<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="author" mode="reference.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="reference.titlepage.recto.style">
-<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="reference.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="reference.titlepage.recto.style">
-<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="reference.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="reference.titlepage.recto.style">
-<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="copyright" mode="reference.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="reference.titlepage.recto.style">
-<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="reference.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="reference.titlepage.recto.style">
-<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="reference.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="reference.titlepage.recto.style">
-<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="revision" mode="reference.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="reference.titlepage.recto.style">
-<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="reference.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="reference.titlepage.recto.style">
-<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="abstract" mode="reference.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="reference.titlepage.recto.style">
-<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template name="refsynopsisdiv.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="refsynopsisdivinfo/title">
-      <xsl:apply-templates mode="refsynopsisdiv.titlepage.recto.auto.mode" select="refsynopsisdivinfo/title"/>
-    </xsl:when>
-    <xsl:when test="docinfo/title">
-      <xsl:apply-templates mode="refsynopsisdiv.titlepage.recto.auto.mode" select="docinfo/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="refsynopsisdiv.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="refsynopsisdiv.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-</xsl:template>
-
-<xsl:template name="refsynopsisdiv.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="refsynopsisdiv.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="refsynopsisdiv.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="refsynopsisdiv.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="refsynopsisdiv.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="refsynopsisdiv.titlepage.before.recto"/>
-      <xsl:call-template name="refsynopsisdiv.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="refsynopsisdiv.titlepage.before.verso"/>
-      <xsl:call-template name="refsynopsisdiv.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="refsynopsisdiv.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="refsynopsisdiv.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="refsynopsisdiv.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="refsynopsisdiv.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="refsynopsisdiv.titlepage.recto.style" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="refsynopsisdiv.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template name="refsection.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="refsectioninfo/title">
-      <xsl:apply-templates mode="refsection.titlepage.recto.auto.mode" select="refsectioninfo/title"/>
-    </xsl:when>
-    <xsl:when test="docinfo/title">
-      <xsl:apply-templates mode="refsection.titlepage.recto.auto.mode" select="docinfo/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="refsection.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="refsection.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-</xsl:template>
-
-<xsl:template name="refsection.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="refsection.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="refsection.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="refsection.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="refsection.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="refsection.titlepage.before.recto"/>
-      <xsl:call-template name="refsection.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="refsection.titlepage.before.verso"/>
-      <xsl:call-template name="refsection.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="refsection.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="refsection.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="refsection.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="refsection.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="refsection.titlepage.recto.style" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="refsection.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template name="refsect1.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="refsect1info/title">
-      <xsl:apply-templates mode="refsect1.titlepage.recto.auto.mode" select="refsect1info/title"/>
-    </xsl:when>
-    <xsl:when test="docinfo/title">
-      <xsl:apply-templates mode="refsect1.titlepage.recto.auto.mode" select="docinfo/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="refsect1.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="refsect1.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-</xsl:template>
-
-<xsl:template name="refsect1.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="refsect1.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="refsect1.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="refsect1.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="refsect1.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="refsect1.titlepage.before.recto"/>
-      <xsl:call-template name="refsect1.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="refsect1.titlepage.before.verso"/>
-      <xsl:call-template name="refsect1.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="refsect1.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="refsect1.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="refsect1.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="refsect1.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="refsect1.titlepage.recto.style" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="refsect1.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template name="refsect2.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="refsect2info/title">
-      <xsl:apply-templates mode="refsect2.titlepage.recto.auto.mode" select="refsect2info/title"/>
-    </xsl:when>
-    <xsl:when test="docinfo/title">
-      <xsl:apply-templates mode="refsect2.titlepage.recto.auto.mode" select="docinfo/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="refsect2.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="refsect2.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-</xsl:template>
-
-<xsl:template name="refsect2.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="refsect2.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="refsect2.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="refsect2.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="refsect2.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="refsect2.titlepage.before.recto"/>
-      <xsl:call-template name="refsect2.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="refsect2.titlepage.before.verso"/>
-      <xsl:call-template name="refsect2.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="refsect2.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="refsect2.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="refsect2.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="refsect2.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="refsect2.titlepage.recto.style" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="refsect2.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template name="refsect3.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="refsect3info/title">
-      <xsl:apply-templates mode="refsect3.titlepage.recto.auto.mode" select="refsect3info/title"/>
-    </xsl:when>
-    <xsl:when test="docinfo/title">
-      <xsl:apply-templates mode="refsect3.titlepage.recto.auto.mode" select="docinfo/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="refsect3.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="refsect3.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-</xsl:template>
-
-<xsl:template name="refsect3.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="refsect3.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="refsect3.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="refsect3.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="refsect3.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="refsect3.titlepage.before.recto"/>
-      <xsl:call-template name="refsect3.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="refsect3.titlepage.before.verso"/>
-      <xsl:call-template name="refsect3.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="refsect3.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="refsect3.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="refsect3.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="refsect3.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="refsect3.titlepage.recto.style" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="refsect3.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template name="dedication.titlepage.recto">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="dedication.titlepage.recto.style" margin-left="{$title.margin.left}" font-size="24.8832pt" font-family="{$title.fontset}" font-weight="bold">
-<xsl:call-template name="component.title">
-<xsl:with-param name="node" select="ancestor-or-self::dedication[1]"/>
-</xsl:call-template></fo:block>
-  <xsl:choose>
-    <xsl:when test="dedicationinfo/subtitle">
-      <xsl:apply-templates mode="dedication.titlepage.recto.auto.mode" select="dedicationinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="docinfo/subtitle">
-      <xsl:apply-templates mode="dedication.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="dedication.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="dedication.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-</xsl:template>
-
-<xsl:template name="dedication.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="dedication.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="dedication.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="dedication.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="dedication.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="dedication.titlepage.before.recto"/>
-      <xsl:call-template name="dedication.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="dedication.titlepage.before.verso"/>
-      <xsl:call-template name="dedication.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="dedication.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="dedication.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="dedication.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="dedication.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="dedication.titlepage.recto.style" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="dedication.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template name="preface.titlepage.recto">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="preface.titlepage.recto.style" margin-left="{$title.margin.left}" font-size="24.8832pt" font-family="{$title.fontset}" font-weight="bold">
-<xsl:call-template name="component.title">
-<xsl:with-param name="node" select="ancestor-or-self::preface[1]"/>
-</xsl:call-template></fo:block>
-  <xsl:choose>
-    <xsl:when test="prefaceinfo/subtitle">
-      <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="docinfo/subtitle">
-      <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/corpauthor"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/corpauthor"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/corpauthor"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/authorgroup"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/authorgroup"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/authorgroup"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/author"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/author"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/author"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/othercredit"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/othercredit"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/othercredit"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/releaseinfo"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/releaseinfo"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/releaseinfo"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/copyright"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/copyright"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/copyright"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/legalnotice"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/legalnotice"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/legalnotice"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/pubdate"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/pubdate"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/pubdate"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/revision"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/revision"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/revision"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/revhistory"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/revhistory"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/revhistory"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/abstract"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/abstract"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/abstract"/>
-</xsl:template>
-
-<xsl:template name="preface.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="preface.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="preface.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="preface.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="preface.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="preface.titlepage.before.recto"/>
-      <xsl:call-template name="preface.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="preface.titlepage.before.verso"/>
-      <xsl:call-template name="preface.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="preface.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="preface.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="preface.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="preface.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="preface.titlepage.recto.style" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="preface.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="preface.titlepage.recto.style">
-<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="preface.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="preface.titlepage.recto.style">
-<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="author" mode="preface.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="preface.titlepage.recto.style">
-<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="preface.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="preface.titlepage.recto.style">
-<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="preface.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="preface.titlepage.recto.style">
-<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="copyright" mode="preface.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="preface.titlepage.recto.style">
-<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="preface.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="preface.titlepage.recto.style">
-<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="preface.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="preface.titlepage.recto.style">
-<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="revision" mode="preface.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="preface.titlepage.recto.style">
-<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="preface.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="preface.titlepage.recto.style">
-<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="abstract" mode="preface.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="preface.titlepage.recto.style">
-<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template name="chapter.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="chapterinfo/title">
-      <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/title"/>
-    </xsl:when>
-    <xsl:when test="docinfo/title">
-      <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="chapterinfo/subtitle">
-      <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="docinfo/subtitle">
-      <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/corpauthor"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/corpauthor"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/corpauthor"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/authorgroup"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/authorgroup"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/authorgroup"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/author"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/author"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/author"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/othercredit"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/othercredit"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/othercredit"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/releaseinfo"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/releaseinfo"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/releaseinfo"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/copyright"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/copyright"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/copyright"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/legalnotice"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/legalnotice"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/legalnotice"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/pubdate"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/pubdate"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/pubdate"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/revision"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/revision"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/revision"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/revhistory"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/revhistory"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/revhistory"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/abstract"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/abstract"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/abstract"/>
-</xsl:template>
-
-<xsl:template name="chapter.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="chapter.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="chapter.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="chapter.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="chapter.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="{$title.fontset}">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="chapter.titlepage.before.recto"/>
-      <xsl:call-template name="chapter.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block margin-left="{$title.margin.left}"><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="chapter.titlepage.before.verso"/>
-      <xsl:call-template name="chapter.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="chapter.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="chapter.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="chapter.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="chapter.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="chapter.titlepage.recto.style" font-size="24.8832pt" font-weight="bold">
-<xsl:call-template name="component.title">
-<xsl:with-param name="node" select="ancestor-or-self::chapter[1]"/>
-</xsl:call-template>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="chapter.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="chapter.titlepage.recto.style" space-before="0.5em" font-style="italic" font-size="14.4pt" font-weight="bold">
-<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="chapter.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="chapter.titlepage.recto.style" space-before="0.5em" space-after="0.5em" font-size="14.4pt">
-<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="chapter.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="chapter.titlepage.recto.style" space-before="0.5em" space-after="0.5em" font-size="14.4pt">
-<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="author" mode="chapter.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="chapter.titlepage.recto.style" space-before="0.5em" space-after="0.5em" font-size="14.4pt">
-<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="chapter.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="chapter.titlepage.recto.style">
-<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="chapter.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="chapter.titlepage.recto.style">
-<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="copyright" mode="chapter.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="chapter.titlepage.recto.style">
-<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="chapter.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="chapter.titlepage.recto.style">
-<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="chapter.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="chapter.titlepage.recto.style">
-<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="revision" mode="chapter.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="chapter.titlepage.recto.style">
-<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="chapter.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="chapter.titlepage.recto.style">
-<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="abstract" mode="chapter.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="chapter.titlepage.recto.style">
-<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template name="appendix.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="appendixinfo/title">
-      <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/title"/>
-    </xsl:when>
-    <xsl:when test="docinfo/title">
-      <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="appendixinfo/subtitle">
-      <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="docinfo/subtitle">
-      <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/corpauthor"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/corpauthor"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/corpauthor"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/authorgroup"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/authorgroup"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/authorgroup"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/author"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/author"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/author"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/othercredit"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/othercredit"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/othercredit"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/releaseinfo"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/releaseinfo"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/releaseinfo"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/copyright"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/copyright"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/copyright"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/legalnotice"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/legalnotice"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/legalnotice"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/pubdate"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/pubdate"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/pubdate"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/revision"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/revision"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/revision"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/revhistory"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/revhistory"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/revhistory"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/abstract"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/abstract"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/abstract"/>
-</xsl:template>
-
-<xsl:template name="appendix.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="appendix.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="appendix.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="appendix.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="appendix.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="appendix.titlepage.before.recto"/>
-      <xsl:call-template name="appendix.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="appendix.titlepage.before.verso"/>
-      <xsl:call-template name="appendix.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="appendix.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="appendix.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="appendix.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="appendix.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="appendix.titlepage.recto.style" margin-left="{$title.margin.left}" font-size="24.8832pt" font-weight="bold" font-family="{$title.fontset}">
-<xsl:call-template name="component.title">
-<xsl:with-param name="node" select="ancestor-or-self::appendix[1]"/>
-</xsl:call-template>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="appendix.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="appendix.titlepage.recto.style" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="appendix.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="appendix.titlepage.recto.style">
-<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="appendix.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="appendix.titlepage.recto.style">
-<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="author" mode="appendix.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="appendix.titlepage.recto.style">
-<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="appendix.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="appendix.titlepage.recto.style">
-<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="appendix.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="appendix.titlepage.recto.style">
-<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="copyright" mode="appendix.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="appendix.titlepage.recto.style">
-<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="appendix.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="appendix.titlepage.recto.style">
-<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="appendix.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="appendix.titlepage.recto.style">
-<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="revision" mode="appendix.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="appendix.titlepage.recto.style">
-<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="appendix.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="appendix.titlepage.recto.style">
-<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="abstract" mode="appendix.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="appendix.titlepage.recto.style">
-<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template name="section.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="sectioninfo/title">
-      <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="sectioninfo/subtitle">
-      <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/corpauthor"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/corpauthor"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/authorgroup"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/authorgroup"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/author"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/author"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/othercredit"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/othercredit"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/releaseinfo"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/releaseinfo"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/copyright"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/copyright"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/legalnotice"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/legalnotice"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/pubdate"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/pubdate"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/revision"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/revision"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/revhistory"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/revhistory"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/abstract"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/abstract"/>
-</xsl:template>
-
-<xsl:template name="section.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="section.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="section.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="section.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="section.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="section.titlepage.before.recto"/>
-      <xsl:call-template name="section.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="section.titlepage.before.verso"/>
-      <xsl:call-template name="section.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="section.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="section.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="section.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="section.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="section.titlepage.recto.style" margin-left="{$title.margin.left}" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="section.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="section.titlepage.recto.style" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="section.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="section.titlepage.recto.style">
-<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="section.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="section.titlepage.recto.style">
-<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="author" mode="section.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="section.titlepage.recto.style">
-<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="section.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="section.titlepage.recto.style">
-<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="section.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="section.titlepage.recto.style">
-<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="copyright" mode="section.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="section.titlepage.recto.style">
-<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="section.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="section.titlepage.recto.style">
-<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="section.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="section.titlepage.recto.style">
-<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="revision" mode="section.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="section.titlepage.recto.style">
-<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="section.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="section.titlepage.recto.style">
-<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="abstract" mode="section.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="section.titlepage.recto.style">
-<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template name="sect1.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="sect1info/title">
-      <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="sect1info/subtitle">
-      <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/corpauthor"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/corpauthor"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/authorgroup"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/authorgroup"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/author"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/author"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/othercredit"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/othercredit"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/releaseinfo"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/releaseinfo"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/copyright"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/copyright"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/legalnotice"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/legalnotice"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/pubdate"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/pubdate"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/revision"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/revision"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/revhistory"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/revhistory"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/abstract"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/abstract"/>
-</xsl:template>
-
-<xsl:template name="sect1.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="sect1.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="sect1.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="sect1.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="sect1.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="sect1.titlepage.before.recto"/>
-      <xsl:call-template name="sect1.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="sect1.titlepage.before.verso"/>
-      <xsl:call-template name="sect1.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="sect1.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="sect1.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="sect1.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="sect1.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect1.titlepage.recto.style" margin-left="{$title.margin.left}" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="sect1.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect1.titlepage.recto.style" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="sect1.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect1.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="sect1.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect1.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="author" mode="sect1.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect1.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="sect1.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect1.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="sect1.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect1.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="copyright" mode="sect1.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect1.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="sect1.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect1.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="sect1.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect1.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="revision" mode="sect1.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect1.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="sect1.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect1.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="abstract" mode="sect1.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect1.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template name="sect2.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="sect2info/title">
-      <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="sect2info/subtitle">
-      <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/corpauthor"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/corpauthor"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/authorgroup"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/authorgroup"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/author"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/author"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/othercredit"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/othercredit"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/releaseinfo"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/releaseinfo"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/copyright"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/copyright"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/legalnotice"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/legalnotice"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/pubdate"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/pubdate"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/revision"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/revision"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/revhistory"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/revhistory"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/abstract"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/abstract"/>
-</xsl:template>
-
-<xsl:template name="sect2.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="sect2.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="sect2.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="sect2.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="sect2.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="sect2.titlepage.before.recto"/>
-      <xsl:call-template name="sect2.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="sect2.titlepage.before.verso"/>
-      <xsl:call-template name="sect2.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="sect2.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="sect2.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="sect2.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="sect2.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect2.titlepage.recto.style" margin-left="{$title.margin.left}" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="sect2.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect2.titlepage.recto.style" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="sect2.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect2.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="sect2.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect2.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="author" mode="sect2.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect2.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="sect2.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect2.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="sect2.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect2.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="copyright" mode="sect2.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect2.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="sect2.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect2.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="sect2.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect2.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="revision" mode="sect2.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect2.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="sect2.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect2.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="abstract" mode="sect2.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect2.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template name="sect3.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="sect3info/title">
-      <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="sect3info/subtitle">
-      <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/corpauthor"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/corpauthor"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/authorgroup"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/authorgroup"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/author"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/author"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/othercredit"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/othercredit"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/releaseinfo"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/releaseinfo"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/copyright"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/copyright"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/legalnotice"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/legalnotice"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/pubdate"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/pubdate"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/revision"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/revision"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/revhistory"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/revhistory"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/abstract"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/abstract"/>
-</xsl:template>
-
-<xsl:template name="sect3.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="sect3.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="sect3.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="sect3.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="sect3.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="sect3.titlepage.before.recto"/>
-      <xsl:call-template name="sect3.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="sect3.titlepage.before.verso"/>
-      <xsl:call-template name="sect3.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="sect3.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="sect3.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="sect3.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="sect3.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect3.titlepage.recto.style" margin-left="{$title.margin.left}" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="sect3.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect3.titlepage.recto.style" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="sect3.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect3.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="sect3.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect3.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="author" mode="sect3.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect3.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="sect3.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect3.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="sect3.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect3.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="copyright" mode="sect3.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect3.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="sect3.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect3.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="sect3.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect3.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="revision" mode="sect3.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect3.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="sect3.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect3.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="abstract" mode="sect3.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect3.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template name="sect4.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="sect4info/title">
-      <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="sect4info/subtitle">
-      <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/corpauthor"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/corpauthor"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/authorgroup"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/authorgroup"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/author"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/author"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/othercredit"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/othercredit"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/releaseinfo"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/releaseinfo"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/copyright"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/copyright"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/legalnotice"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/legalnotice"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/pubdate"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/pubdate"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/revision"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/revision"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/revhistory"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/revhistory"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/abstract"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/abstract"/>
-</xsl:template>
-
-<xsl:template name="sect4.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="sect4.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="sect4.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="sect4.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="sect4.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="sect4.titlepage.before.recto"/>
-      <xsl:call-template name="sect4.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="sect4.titlepage.before.verso"/>
-      <xsl:call-template name="sect4.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="sect4.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="sect4.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="sect4.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="sect4.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect4.titlepage.recto.style" margin-left="{$title.margin.left}" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="sect4.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect4.titlepage.recto.style" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="sect4.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect4.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="sect4.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect4.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="author" mode="sect4.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect4.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="sect4.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect4.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="sect4.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect4.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="copyright" mode="sect4.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect4.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="sect4.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect4.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="sect4.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect4.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="revision" mode="sect4.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect4.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="sect4.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect4.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="abstract" mode="sect4.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect4.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template name="sect5.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="sect5info/title">
-      <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="sect5info/subtitle">
-      <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/corpauthor"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/corpauthor"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/authorgroup"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/authorgroup"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/author"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/author"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/othercredit"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/othercredit"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/releaseinfo"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/releaseinfo"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/copyright"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/copyright"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/legalnotice"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/legalnotice"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/pubdate"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/pubdate"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/revision"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/revision"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/revhistory"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/revhistory"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/abstract"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/abstract"/>
-</xsl:template>
-
-<xsl:template name="sect5.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="sect5.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="sect5.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="sect5.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="sect5.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="sect5.titlepage.before.recto"/>
-      <xsl:call-template name="sect5.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="sect5.titlepage.before.verso"/>
-      <xsl:call-template name="sect5.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="sect5.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="sect5.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="sect5.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="sect5.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect5.titlepage.recto.style" margin-left="{$title.margin.left}" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="sect5.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect5.titlepage.recto.style" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="sect5.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect5.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="sect5.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect5.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="author" mode="sect5.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect5.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="sect5.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect5.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="sect5.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect5.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="copyright" mode="sect5.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect5.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="sect5.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect5.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="sect5.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect5.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="revision" mode="sect5.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect5.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="sect5.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect5.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="abstract" mode="sect5.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect5.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template name="simplesect.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="simplesectinfo/title">
-      <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/title"/>
-    </xsl:when>
-    <xsl:when test="docinfo/title">
-      <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="simplesectinfo/subtitle">
-      <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="docinfo/subtitle">
-      <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/corpauthor"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/corpauthor"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/corpauthor"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/authorgroup"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/authorgroup"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/authorgroup"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/author"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/author"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/author"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/othercredit"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/othercredit"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/othercredit"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/releaseinfo"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/releaseinfo"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/releaseinfo"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/copyright"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/copyright"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/copyright"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/legalnotice"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/legalnotice"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/legalnotice"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/pubdate"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/pubdate"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/pubdate"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/revision"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/revision"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/revision"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/revhistory"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/revhistory"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/revhistory"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/abstract"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/abstract"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/abstract"/>
-</xsl:template>
-
-<xsl:template name="simplesect.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="simplesect.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="simplesect.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="simplesect.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="simplesect.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="simplesect.titlepage.before.recto"/>
-      <xsl:call-template name="simplesect.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="simplesect.titlepage.before.verso"/>
-      <xsl:call-template name="simplesect.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="simplesect.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="simplesect.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="simplesect.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="simplesect.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="simplesect.titlepage.recto.style" margin-left="{$title.margin.left}" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="simplesect.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="simplesect.titlepage.recto.style" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="simplesect.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="simplesect.titlepage.recto.style">
-<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="simplesect.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="simplesect.titlepage.recto.style">
-<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="author" mode="simplesect.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="simplesect.titlepage.recto.style">
-<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="simplesect.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="simplesect.titlepage.recto.style">
-<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="simplesect.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="simplesect.titlepage.recto.style">
-<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="copyright" mode="simplesect.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="simplesect.titlepage.recto.style">
-<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="simplesect.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="simplesect.titlepage.recto.style">
-<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="simplesect.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="simplesect.titlepage.recto.style">
-<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="revision" mode="simplesect.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="simplesect.titlepage.recto.style">
-<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="simplesect.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="simplesect.titlepage.recto.style">
-<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="abstract" mode="simplesect.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="simplesect.titlepage.recto.style">
-<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template name="bibliography.titlepage.recto">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="bibliography.titlepage.recto.style" margin-left="{$title.margin.left}" font-size="24.8832pt" font-family="{$title.fontset}" font-weight="bold">
-<xsl:call-template name="component.title">
-<xsl:with-param name="node" select="ancestor-or-self::bibliography[1]"/>
-</xsl:call-template></fo:block>
-  <xsl:choose>
-    <xsl:when test="bibliographyinfo/subtitle">
-      <xsl:apply-templates mode="bibliography.titlepage.recto.auto.mode" select="bibliographyinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="docinfo/subtitle">
-      <xsl:apply-templates mode="bibliography.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="bibliography.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="bibliography.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-</xsl:template>
-
-<xsl:template name="bibliography.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="bibliography.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="bibliography.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="bibliography.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="bibliography.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="bibliography.titlepage.before.recto"/>
-      <xsl:call-template name="bibliography.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="bibliography.titlepage.before.verso"/>
-      <xsl:call-template name="bibliography.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="bibliography.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="bibliography.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="bibliography.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="bibliography.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="bibliography.titlepage.recto.style" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="bibliography.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template name="bibliodiv.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="bibliodivinfo/title">
-      <xsl:apply-templates mode="bibliodiv.titlepage.recto.auto.mode" select="bibliodivinfo/title"/>
-    </xsl:when>
-    <xsl:when test="docinfo/title">
-      <xsl:apply-templates mode="bibliodiv.titlepage.recto.auto.mode" select="docinfo/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="bibliodiv.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="bibliodiv.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="bibliodivinfo/subtitle">
-      <xsl:apply-templates mode="bibliodiv.titlepage.recto.auto.mode" select="bibliodivinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="docinfo/subtitle">
-      <xsl:apply-templates mode="bibliodiv.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="bibliodiv.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="bibliodiv.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-</xsl:template>
-
-<xsl:template name="bibliodiv.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="bibliodiv.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="bibliodiv.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="bibliodiv.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="bibliodiv.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="bibliodiv.titlepage.before.recto"/>
-      <xsl:call-template name="bibliodiv.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="bibliodiv.titlepage.before.verso"/>
-      <xsl:call-template name="bibliodiv.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="bibliodiv.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="bibliodiv.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="bibliodiv.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="bibliodiv.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="bibliodiv.titlepage.recto.style" margin-left="{$title.margin.left}" font-size="20.736pt" font-family="{$title.fontset}" font-weight="bold">
-<xsl:call-template name="component.title">
-<xsl:with-param name="node" select="ancestor-or-self::bibliodiv[1]"/>
-</xsl:call-template>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="bibliodiv.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="bibliodiv.titlepage.recto.style" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="bibliodiv.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template name="glossary.titlepage.recto">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="glossary.titlepage.recto.style" margin-left="{$title.margin.left}" font-size="24.8832pt" font-family="{$title.fontset}" font-weight="bold">
-<xsl:call-template name="component.title">
-<xsl:with-param name="node" select="ancestor-or-self::glossary[1]"/>
-</xsl:call-template></fo:block>
-  <xsl:choose>
-    <xsl:when test="glossaryinfo/subtitle">
-      <xsl:apply-templates mode="glossary.titlepage.recto.auto.mode" select="glossaryinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="docinfo/subtitle">
-      <xsl:apply-templates mode="glossary.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="glossary.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="glossary.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-</xsl:template>
-
-<xsl:template name="glossary.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="glossary.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="glossary.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="glossary.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="glossary.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="glossary.titlepage.before.recto"/>
-      <xsl:call-template name="glossary.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="glossary.titlepage.before.verso"/>
-      <xsl:call-template name="glossary.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="glossary.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="glossary.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="glossary.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="glossary.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="glossary.titlepage.recto.style" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="glossary.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template name="glossdiv.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="glossdivinfo/title">
-      <xsl:apply-templates mode="glossdiv.titlepage.recto.auto.mode" select="glossdivinfo/title"/>
-    </xsl:when>
-    <xsl:when test="docinfo/title">
-      <xsl:apply-templates mode="glossdiv.titlepage.recto.auto.mode" select="docinfo/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="glossdiv.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="glossdiv.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="glossdivinfo/subtitle">
-      <xsl:apply-templates mode="glossdiv.titlepage.recto.auto.mode" select="glossdivinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="docinfo/subtitle">
-      <xsl:apply-templates mode="glossdiv.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="glossdiv.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="glossdiv.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-</xsl:template>
-
-<xsl:template name="glossdiv.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="glossdiv.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="glossdiv.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="glossdiv.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="glossdiv.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="glossdiv.titlepage.before.recto"/>
-      <xsl:call-template name="glossdiv.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="glossdiv.titlepage.before.verso"/>
-      <xsl:call-template name="glossdiv.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="glossdiv.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="glossdiv.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="glossdiv.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="glossdiv.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="glossdiv.titlepage.recto.style" margin-left="{$title.margin.left}" font-size="20.736pt" font-family="{$title.fontset}" font-weight="bold">
-<xsl:call-template name="component.title">
-<xsl:with-param name="node" select="ancestor-or-self::glossdiv[1]"/>
-</xsl:call-template>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="glossdiv.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="glossdiv.titlepage.recto.style" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="glossdiv.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template name="index.titlepage.recto">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="index.titlepage.recto.style" margin-left="0pt" font-size="24.8832pt" font-family="{$title.fontset}" font-weight="bold">
-<xsl:call-template name="component.title">
-<xsl:with-param name="node" select="ancestor-or-self::index[1]"/>
-<xsl:with-param name="pagewide" select="1"/>
-</xsl:call-template></fo:block>
-  <xsl:choose>
-    <xsl:when test="indexinfo/subtitle">
-      <xsl:apply-templates mode="index.titlepage.recto.auto.mode" select="indexinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="docinfo/subtitle">
-      <xsl:apply-templates mode="index.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="index.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="index.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-</xsl:template>
-
-<xsl:template name="index.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="index.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="index.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="index.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="index.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="index.titlepage.before.recto"/>
-      <xsl:call-template name="index.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="index.titlepage.before.verso"/>
-      <xsl:call-template name="index.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="index.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="index.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="index.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="index.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="index.titlepage.recto.style" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="index.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template name="indexdiv.titlepage.recto">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="indexdiv.titlepage.recto.style">
-<xsl:call-template name="indexdiv.title">
-<xsl:with-param name="title" select="title"/>
-</xsl:call-template></fo:block>
-  <xsl:choose>
-    <xsl:when test="indexdivinfo/subtitle">
-      <xsl:apply-templates mode="indexdiv.titlepage.recto.auto.mode" select="indexdivinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="docinfo/subtitle">
-      <xsl:apply-templates mode="indexdiv.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="indexdiv.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="indexdiv.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-</xsl:template>
-
-<xsl:template name="indexdiv.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="indexdiv.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="indexdiv.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="indexdiv.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="indexdiv.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="indexdiv.titlepage.before.recto"/>
-      <xsl:call-template name="indexdiv.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="indexdiv.titlepage.before.verso"/>
-      <xsl:call-template name="indexdiv.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="indexdiv.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="indexdiv.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="indexdiv.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="indexdiv.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="indexdiv.titlepage.recto.style" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="indexdiv.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template name="setindex.titlepage.recto">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="setindex.titlepage.recto.style" margin-left="0pt" font-size="24.8832pt" font-family="{$title.fontset}" font-weight="bold">
-<xsl:call-template name="component.title">
-<xsl:with-param name="node" select="ancestor-or-self::setindex[1]"/>
-<xsl:with-param name="pagewide" select="1"/>
-</xsl:call-template></fo:block>
-  <xsl:choose>
-    <xsl:when test="setindexinfo/subtitle">
-      <xsl:apply-templates mode="setindex.titlepage.recto.auto.mode" select="setindexinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="docinfo/subtitle">
-      <xsl:apply-templates mode="setindex.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="setindex.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="setindex.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-</xsl:template>
-
-<xsl:template name="setindex.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="setindex.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="setindex.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="setindex.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="setindex.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="setindex.titlepage.before.recto"/>
-      <xsl:call-template name="setindex.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="setindex.titlepage.before.verso"/>
-      <xsl:call-template name="setindex.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="setindex.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="setindex.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="setindex.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="setindex.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="setindex.titlepage.recto.style" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="setindex.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template name="colophon.titlepage.recto">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="colophon.titlepage.recto.style" margin-left="{$title.margin.left}" font-size="24.8832pt" font-family="{$title.fontset}" font-weight="bold">
-<xsl:call-template name="component.title">
-<xsl:with-param name="node" select="ancestor-or-self::colophon[1]"/>
-</xsl:call-template></fo:block>
-  <xsl:choose>
-    <xsl:when test="colophoninfo/subtitle">
-      <xsl:apply-templates mode="colophon.titlepage.recto.auto.mode" select="colophoninfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="docinfo/subtitle">
-      <xsl:apply-templates mode="colophon.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="colophon.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="colophon.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-</xsl:template>
-
-<xsl:template name="colophon.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="colophon.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="colophon.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="colophon.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="colophon.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="colophon.titlepage.before.recto"/>
-      <xsl:call-template name="colophon.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="colophon.titlepage.before.verso"/>
-      <xsl:call-template name="colophon.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="colophon.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="colophon.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="colophon.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="colophon.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="colophon.titlepage.recto.style" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="colophon.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template name="sidebar.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="sidebarinfo/title">
-      <xsl:apply-templates mode="sidebar.titlepage.recto.auto.mode" select="sidebarinfo/title"/>
-    </xsl:when>
-    <xsl:when test="docinfo/title">
-      <xsl:apply-templates mode="sidebar.titlepage.recto.auto.mode" select="docinfo/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="sidebar.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="sidebar.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="sidebarinfo/subtitle">
-      <xsl:apply-templates mode="sidebar.titlepage.recto.auto.mode" select="sidebarinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="docinfo/subtitle">
-      <xsl:apply-templates mode="sidebar.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="sidebar.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="sidebar.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-</xsl:template>
-
-<xsl:template name="sidebar.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="sidebar.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="sidebar.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="sidebar.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="sidebar.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="sidebar.titlepage.before.recto"/>
-      <xsl:call-template name="sidebar.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="sidebar.titlepage.before.verso"/>
-      <xsl:call-template name="sidebar.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="sidebar.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="sidebar.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="sidebar.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="sidebar.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sidebar.titlepage.recto.style" font-family="{$title.fontset}" font-weight="bold">
-<xsl:apply-templates select="." mode="sidebar.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="sidebar.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sidebar.titlepage.recto.style" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="sidebar.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template name="qandaset.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="qandasetinfo/title">
-      <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="qandasetinfo/title"/>
-    </xsl:when>
-    <xsl:when test="blockinfo/title">
-      <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="blockinfo/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="qandasetinfo/subtitle">
-      <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="qandasetinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="blockinfo/subtitle">
-      <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="blockinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="qandasetinfo/corpauthor"/>
-  <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="blockinfo/corpauthor"/>
-  <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="info/corpauthor"/>
-  <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="qandasetinfo/authorgroup"/>
-  <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="blockinfo/authorgroup"/>
-  <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="info/authorgroup"/>
-  <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="qandasetinfo/author"/>
-  <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="blockinfo/author"/>
-  <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="info/author"/>
-  <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="qandasetinfo/othercredit"/>
-  <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="blockinfo/othercredit"/>
-  <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="info/othercredit"/>
-  <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="qandasetinfo/releaseinfo"/>
-  <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="blockinfo/releaseinfo"/>
-  <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="info/releaseinfo"/>
-  <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="qandasetinfo/copyright"/>
-  <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="blockinfo/copyright"/>
-  <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="info/copyright"/>
-  <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="qandasetinfo/legalnotice"/>
-  <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="blockinfo/legalnotice"/>
-  <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="info/legalnotice"/>
-  <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="qandasetinfo/pubdate"/>
-  <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="blockinfo/pubdate"/>
-  <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="info/pubdate"/>
-  <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="qandasetinfo/revision"/>
-  <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="blockinfo/revision"/>
-  <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="info/revision"/>
-  <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="qandasetinfo/revhistory"/>
-  <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="blockinfo/revhistory"/>
-  <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="info/revhistory"/>
-  <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="qandasetinfo/abstract"/>
-  <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="blockinfo/abstract"/>
-  <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="info/abstract"/>
-</xsl:template>
-
-<xsl:template name="qandaset.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="qandaset.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="qandaset.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="qandaset.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="qandaset.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="{$title.fontset}">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="qandaset.titlepage.before.recto"/>
-      <xsl:call-template name="qandaset.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block start-indent="0pt" text-align="center"><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="qandaset.titlepage.before.verso"/>
-      <xsl:call-template name="qandaset.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="qandaset.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="qandaset.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="qandaset.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="qandaset.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="qandaset.titlepage.recto.style" keep-with-next.within-column="always" font-size="24.8832pt" font-weight="bold">
-<xsl:call-template name="component.title">
-<xsl:with-param name="node" select="ancestor-or-self::qandaset[1]"/>
-</xsl:call-template>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="qandaset.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="qandaset.titlepage.recto.style">
-<xsl:apply-templates select="." mode="qandaset.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="qandaset.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="qandaset.titlepage.recto.style" space-before="0.5em" font-size="14.4pt">
-<xsl:apply-templates select="." mode="qandaset.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="qandaset.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="qandaset.titlepage.recto.style" space-before="0.5em" font-size="14.4pt">
-<xsl:apply-templates select="." mode="qandaset.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="author" mode="qandaset.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="qandaset.titlepage.recto.style" space-before="0.5em" font-size="14.4pt">
-<xsl:apply-templates select="." mode="qandaset.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="qandaset.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="qandaset.titlepage.recto.style" space-before="0.5em">
-<xsl:apply-templates select="." mode="qandaset.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="qandaset.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="qandaset.titlepage.recto.style" space-before="0.5em">
-<xsl:apply-templates select="." mode="qandaset.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="copyright" mode="qandaset.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="qandaset.titlepage.recto.style" space-before="0.5em">
-<xsl:apply-templates select="." mode="qandaset.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="qandaset.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="qandaset.titlepage.recto.style" text-align="start" margin-left="0.5in" margin-right="0.5in" font-family="{$body.fontset}">
-<xsl:apply-templates select="." mode="qandaset.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="qandaset.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="qandaset.titlepage.recto.style" space-before="0.5em">
-<xsl:apply-templates select="." mode="qandaset.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="revision" mode="qandaset.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="qandaset.titlepage.recto.style" space-before="0.5em">
-<xsl:apply-templates select="." mode="qandaset.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="qandaset.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="qandaset.titlepage.recto.style" space-before="0.5em">
-<xsl:apply-templates select="." mode="qandaset.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="abstract" mode="qandaset.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="qandaset.titlepage.recto.style" space-before="0.5em" text-align="start" margin-left="0.5in" margin-right="0.5in" font-family="{$body.fontset}">
-<xsl:apply-templates select="." mode="qandaset.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template name="table.of.contents.titlepage.recto">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="table.of.contents.titlepage.recto.style" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em" space-after="0.5em" margin-left="{$title.margin.left}" start-indent="0pt" font-size="17.28pt" font-weight="bold" font-family="{$title.fontset}">
-<xsl:call-template name="gentext">
-<xsl:with-param name="key" select="'TableofContents'"/>
-</xsl:call-template></fo:block>
-</xsl:template>
-
-<xsl:template name="table.of.contents.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="table.of.contents.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="table.of.contents.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="table.of.contents.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="table.of.contents.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="table.of.contents.titlepage.before.recto"/>
-      <xsl:call-template name="table.of.contents.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="table.of.contents.titlepage.before.verso"/>
-      <xsl:call-template name="table.of.contents.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="table.of.contents.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="table.of.contents.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="table.of.contents.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template name="list.of.tables.titlepage.recto">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="list.of.tables.titlepage.recto.style" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em" space-after="0.5em" margin-left="{$title.margin.left}" start-indent="0pt" font-size="17.28pt" font-weight="bold" font-family="{$title.fontset}">
-<xsl:call-template name="gentext">
-<xsl:with-param name="key" select="'ListofTables'"/>
-</xsl:call-template></fo:block>
-</xsl:template>
-
-<xsl:template name="list.of.tables.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="list.of.tables.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="list.of.tables.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="list.of.tables.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="list.of.tables.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="list.of.tables.titlepage.before.recto"/>
-      <xsl:call-template name="list.of.tables.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="list.of.tables.titlepage.before.verso"/>
-      <xsl:call-template name="list.of.tables.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="list.of.tables.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="list.of.tables.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="list.of.tables.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template name="list.of.figures.titlepage.recto">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="list.of.figures.titlepage.recto.style" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em" space-after="0.5em" margin-left="{$title.margin.left}" start-indent="0pt" font-size="17.28pt" font-weight="bold" font-family="{$title.fontset}">
-<xsl:call-template name="gentext">
-<xsl:with-param name="key" select="'ListofFigures'"/>
-</xsl:call-template></fo:block>
-</xsl:template>
-
-<xsl:template name="list.of.figures.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="list.of.figures.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="list.of.figures.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="list.of.figures.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="list.of.figures.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="list.of.figures.titlepage.before.recto"/>
-      <xsl:call-template name="list.of.figures.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="list.of.figures.titlepage.before.verso"/>
-      <xsl:call-template name="list.of.figures.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="list.of.figures.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="list.of.figures.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="list.of.figures.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template name="list.of.examples.titlepage.recto">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="list.of.examples.titlepage.recto.style" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em" space-after="0.5em" margin-left="{$title.margin.left}" start-indent="0pt" font-size="17.28pt" font-weight="bold" font-family="{$title.fontset}">
-<xsl:call-template name="gentext">
-<xsl:with-param name="key" select="'ListofExamples'"/>
-</xsl:call-template></fo:block>
-</xsl:template>
-
-<xsl:template name="list.of.examples.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="list.of.examples.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="list.of.examples.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="list.of.examples.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="list.of.examples.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="list.of.examples.titlepage.before.recto"/>
-      <xsl:call-template name="list.of.examples.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="list.of.examples.titlepage.before.verso"/>
-      <xsl:call-template name="list.of.examples.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="list.of.examples.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="list.of.examples.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="list.of.examples.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template name="list.of.equations.titlepage.recto">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="list.of.equations.titlepage.recto.style" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em" space-after="0.5em" margin-left="{$title.margin.left}" start-indent="0pt" font-size="17.28pt" font-weight="bold" font-family="{$title.fontset}">
-<xsl:call-template name="gentext">
-<xsl:with-param name="key" select="'ListofEquations'"/>
-</xsl:call-template></fo:block>
-</xsl:template>
-
-<xsl:template name="list.of.equations.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="list.of.equations.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="list.of.equations.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="list.of.equations.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="list.of.equations.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="list.of.equations.titlepage.before.recto"/>
-      <xsl:call-template name="list.of.equations.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="list.of.equations.titlepage.before.verso"/>
-      <xsl:call-template name="list.of.equations.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="list.of.equations.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="list.of.equations.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="list.of.equations.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template name="list.of.procedures.titlepage.recto">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="list.of.procedures.titlepage.recto.style" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em" space-after="0.5em" margin-left="{$title.margin.left}" start-indent="0pt" font-size="17.28pt" font-weight="bold" font-family="{$title.fontset}">
-<xsl:call-template name="gentext">
-<xsl:with-param name="key" select="'ListofProcedures'"/>
-</xsl:call-template></fo:block>
-</xsl:template>
-
-<xsl:template name="list.of.procedures.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="list.of.procedures.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="list.of.procedures.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="list.of.procedures.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="list.of.procedures.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="list.of.procedures.titlepage.before.recto"/>
-      <xsl:call-template name="list.of.procedures.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="list.of.procedures.titlepage.before.verso"/>
-      <xsl:call-template name="list.of.procedures.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="list.of.procedures.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="list.of.procedures.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="list.of.procedures.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template name="list.of.unknowns.titlepage.recto">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="list.of.unknowns.titlepage.recto.style" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em" space-after="0.5em" margin-left="{$title.margin.left}" start-indent="0pt" font-size="17.28pt" font-weight="bold" font-family="{$title.fontset}">
-<xsl:call-template name="gentext">
-<xsl:with-param name="key" select="'ListofUnknown'"/>
-</xsl:call-template></fo:block>
-</xsl:template>
-
-<xsl:template name="list.of.unknowns.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="list.of.unknowns.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="list.of.unknowns.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="list.of.unknowns.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="list.of.unknowns.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="list.of.unknowns.titlepage.before.recto"/>
-      <xsl:call-template name="list.of.unknowns.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="list.of.unknowns.titlepage.before.verso"/>
-      <xsl:call-template name="list.of.unknowns.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="list.of.unknowns.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="list.of.unknowns.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="list.of.unknowns.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-</xsl:stylesheet>
-
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/titlepage.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/titlepage.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,738 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:attribute-set name="book.titlepage.recto.style">
-  <xsl:attribute name="font-family">
-    <xsl:value-of select="$title.fontset"/>
-  </xsl:attribute>
-  <xsl:attribute name="font-weight">bold</xsl:attribute>
-  <xsl:attribute name="font-size">12pt</xsl:attribute>
-  <xsl:attribute name="text-align">center</xsl:attribute>
-</xsl:attribute-set>
-
-<xsl:attribute-set name="book.titlepage.verso.style">
-  <xsl:attribute name="font-size">10pt</xsl:attribute>
-</xsl:attribute-set>
-
-<xsl:attribute-set name="article.titlepage.recto.style"/>
-<xsl:attribute-set name="article.titlepage.verso.style"/>
-
-<xsl:attribute-set name="set.titlepage.recto.style"/>
-<xsl:attribute-set name="set.titlepage.verso.style"/>
-
-<xsl:attribute-set name="part.titlepage.recto.style">
-  <xsl:attribute name="text-align">center</xsl:attribute>
-</xsl:attribute-set>
-
-<xsl:attribute-set name="part.titlepage.verso.style"/>
-
-<xsl:attribute-set name="partintro.titlepage.recto.style"/>
-<xsl:attribute-set name="partintro.titlepage.verso.style"/>
-
-<xsl:attribute-set name="reference.titlepage.recto.style"/>
-<xsl:attribute-set name="reference.titlepage.verso.style"/>
-
-<xsl:attribute-set name="dedication.titlepage.recto.style"/>
-<xsl:attribute-set name="dedication.titlepage.verso.style"/>
-
-<xsl:attribute-set name="preface.titlepage.recto.style"/>
-<xsl:attribute-set name="preface.titlepage.verso.style"/>
-
-<xsl:attribute-set name="chapter.titlepage.recto.style"/>
-<xsl:attribute-set name="chapter.titlepage.verso.style"/>
-
-<xsl:attribute-set name="appendix.titlepage.recto.style"/>
-<xsl:attribute-set name="appendix.titlepage.verso.style"/>
-
-<xsl:attribute-set name="bibliography.titlepage.recto.style"/>
-<xsl:attribute-set name="bibliography.titlepage.verso.style"/>
-
-<xsl:attribute-set name="bibliodiv.titlepage.recto.style"/>
-<xsl:attribute-set name="bibliodiv.titlepage.verso.style"/>
-
-<xsl:attribute-set name="glossary.titlepage.recto.style"/>
-<xsl:attribute-set name="glossary.titlepage.verso.style"/>
-
-<xsl:attribute-set name="glossdiv.titlepage.recto.style"/>
-<xsl:attribute-set name="glossdiv.titlepage.verso.style"/>
-
-<xsl:attribute-set name="index.titlepage.recto.style"/>
-<xsl:attribute-set name="index.titlepage.verso.style"/>
-
-<xsl:attribute-set name="setindex.titlepage.recto.style"/>
-<xsl:attribute-set name="setindex.titlepage.verso.style"/>
-
-<xsl:attribute-set name="indexdiv.titlepage.recto.style"/>
-<xsl:attribute-set name="indexdiv.titlepage.verso.style"/>
-
-<xsl:attribute-set name="colophon.titlepage.recto.style"/>
-<xsl:attribute-set name="colophon.titlepage.verso.style"/>
-
-<xsl:attribute-set name="sidebar.titlepage.recto.style"/>
-<xsl:attribute-set name="sidebar.titlepage.verso.style"/>
-
-<xsl:attribute-set name="qandaset.titlepage.recto.style"/>
-<xsl:attribute-set name="qandaset.titlepage.verso.style"/>
-
-<xsl:attribute-set name="section.titlepage.recto.style">
-  <xsl:attribute name="keep-together.within-column">always</xsl:attribute>
-</xsl:attribute-set>
-
-<xsl:attribute-set name="section.titlepage.verso.style">
-  <xsl:attribute name="keep-together.within-column">always</xsl:attribute>
-  <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
-</xsl:attribute-set>
-
-<xsl:attribute-set name="sect1.titlepage.recto.style"
-                   use-attribute-sets="section.titlepage.recto.style"/>
-<xsl:attribute-set name="sect1.titlepage.verso.style"
-                   use-attribute-sets="section.titlepage.verso.style"/>
-
-<xsl:attribute-set name="sect2.titlepage.recto.style"
-                   use-attribute-sets="section.titlepage.recto.style"/>
-<xsl:attribute-set name="sect2.titlepage.verso.style"
-                   use-attribute-sets="section.titlepage.verso.style"/>
-
-<xsl:attribute-set name="sect3.titlepage.recto.style"
-                   use-attribute-sets="section.titlepage.recto.style"/>
-<xsl:attribute-set name="sect3.titlepage.verso.style"
-                   use-attribute-sets="section.titlepage.verso.style"/>
-
-<xsl:attribute-set name="sect4.titlepage.recto.style"
-                   use-attribute-sets="section.titlepage.recto.style"/>
-<xsl:attribute-set name="sect4.titlepage.verso.style"
-                   use-attribute-sets="section.titlepage.verso.style"/>
-
-<xsl:attribute-set name="sect5.titlepage.recto.style"
-                   use-attribute-sets="section.titlepage.recto.style"/>
-<xsl:attribute-set name="sect5.titlepage.verso.style"
-                   use-attribute-sets="section.titlepage.verso.style"/>
-
-<xsl:attribute-set name="simplesect.titlepage.recto.style"
-                   use-attribute-sets="section.titlepage.recto.style"/>
-<xsl:attribute-set name="simplesect.titlepage.verso.style"
-                   use-attribute-sets="section.titlepage.verso.style"/>
-
-<xsl:attribute-set name="refnamediv.titlepage.recto.style"
-                   use-attribute-sets="section.titlepage.recto.style"/>
-<xsl:attribute-set name="refnamediv.titlepage.verso.style"
-                   use-attribute-sets="section.titlepage.verso.style"/>
-
-<xsl:attribute-set name="refsynopsisdiv.titlepage.recto.style"
-                   use-attribute-sets="section.titlepage.recto.style"/>
-<xsl:attribute-set name="refsynopsisdiv.titlepage.verso.style"
-                   use-attribute-sets="section.titlepage.verso.style"/>
-
-<xsl:attribute-set name="refsection.titlepage.recto.style"
-                   use-attribute-sets="section.titlepage.recto.style"/>
-<xsl:attribute-set name="refsection.titlepage.verso.style"
-                   use-attribute-sets="section.titlepage.verso.style"/>
-
-<xsl:attribute-set name="refsect1.titlepage.recto.style"
-                   use-attribute-sets="section.titlepage.recto.style"/>
-<xsl:attribute-set name="refsect1.titlepage.verso.style"
-                   use-attribute-sets="section.titlepage.verso.style"/>
-
-<xsl:attribute-set name="refsect2.titlepage.recto.style"
-                   use-attribute-sets="section.titlepage.recto.style"/>
-<xsl:attribute-set name="refsect2.titlepage.verso.style"
-                   use-attribute-sets="section.titlepage.verso.style"/>
-
-<xsl:attribute-set name="refsect3.titlepage.recto.style"
-                   use-attribute-sets="section.titlepage.recto.style"/>
-<xsl:attribute-set name="refsect3.titlepage.verso.style"
-                   use-attribute-sets="section.titlepage.verso.style"/>
-
-<xsl:attribute-set name="table.of.contents.titlepage.recto.style"/>
-<xsl:attribute-set name="table.of.contents.titlepage.verso.style"/>
-
-<xsl:attribute-set name="list.of.tables.titlepage.recto.style"/>
-<xsl:attribute-set name="list.of.tables.contents.titlepage.verso.style"/>
-
-<xsl:attribute-set name="list.of.figures.titlepage.recto.style"/>
-<xsl:attribute-set name="list.of.figures.contents.titlepage.verso.style"/>
-
-<xsl:attribute-set name="list.of.equations.titlepage.recto.style"/>
-<xsl:attribute-set name="list.of.equations.contents.titlepage.verso.style"/>
-
-<xsl:attribute-set name="list.of.examples.titlepage.recto.style"/>
-<xsl:attribute-set name="list.of.examples.contents.titlepage.verso.style"/>
-
-<xsl:attribute-set name="list.of.procedures.titlepage.recto.style"/>
-<xsl:attribute-set name="list.of.procedures.contents.titlepage.verso.style"/>
-
-<xsl:attribute-set name="list.of.unknowns.titlepage.recto.style"/>
-<xsl:attribute-set name="list.of.unknowns.contents.titlepage.verso.style"/>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="*" mode="titlepage.mode">
-  <!-- if an element isn't found in this mode, try the default mode -->
-  <xsl:apply-templates select="."/>
-</xsl:template>
-
-<xsl:template match="abbrev" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="abstract" mode="titlepage.mode">
-  <fo:block>
-    <xsl:call-template name="formal.object.heading">
-      <xsl:with-param name="title">
-        <xsl:apply-templates select="." mode="title.markup"/>
-      </xsl:with-param>
-    </xsl:call-template>
-    <xsl:apply-templates mode="titlepage.mode"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="abstract/title" mode="titlepage.mode"/>
-
-<xsl:template match="abstract/title" mode="titlepage.abstract.title.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="address" mode="titlepage.mode">
-  <!-- use the normal address handling code -->
-  <xsl:apply-templates select="."/>
-</xsl:template>
-
-<xsl:template match="affiliation" mode="titlepage.mode">
-  <fo:block>
-    <xsl:apply-templates mode="titlepage.mode"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="artpagenums" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="author" mode="titlepage.mode">
-  <fo:block>
-    <xsl:call-template name="anchor"/>
-    <xsl:call-template name="person.name"/>
-    <xsl:if test="affiliation/orgname">
-      <xsl:text>, </xsl:text>
-      <xsl:apply-templates select="affiliation/orgname" mode="titlepage.mode"/>
-    </xsl:if>
-    <xsl:if test="email|affiliation/address/email">
-      <xsl:text> </xsl:text>
-      <xsl:apply-templates select="(email|affiliation/address/email)[1]"/>
-    </xsl:if>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="authorblurb" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="titlepage.mode">
-  <fo:wrapper>
-    <xsl:call-template name="anchor"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-  </fo:wrapper>
-</xsl:template>
-
-<xsl:template match="authorinitials" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="bibliomisc" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="bibliomset" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="collab" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="confgroup" mode="titlepage.mode">
-  <fo:block>
-    <xsl:apply-templates mode="titlepage.mode"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="confdates" mode="titlepage.mode">
-  <fo:block>
-    <xsl:apply-templates mode="titlepage.mode"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="conftitle" mode="titlepage.mode">
-  <fo:block>
-    <xsl:apply-templates mode="titlepage.mode"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="confnum" mode="titlepage.mode">
-  <!-- suppress -->
-</xsl:template>
-
-<xsl:template match="contractnum" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="contractsponsor" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="contrib" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="copyright" mode="titlepage.mode">
-  <xsl:call-template name="gentext">
-    <xsl:with-param name="key" select="'Copyright'"/>
-  </xsl:call-template>
-  <xsl:call-template name="gentext.space"/>
-  <xsl:call-template name="dingbat">
-    <xsl:with-param name="dingbat">copyright</xsl:with-param>
-  </xsl:call-template>
-  <xsl:call-template name="gentext.space"/>
-  <xsl:call-template name="copyright.years">
-    <xsl:with-param name="years" select="year"/>
-    <xsl:with-param name="print.ranges" select="$make.year.ranges"/>
-    <xsl:with-param name="single.year.ranges"
-                    select="$make.single.year.ranges"/>
-  </xsl:call-template>
-  <xsl:call-template name="gentext.space"/>
-  <xsl:apply-templates select="holder" mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="year" mode="titlepage.mode">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="holder" mode="titlepage.mode">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="corpcredit" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="corpname" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="date" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="edition" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-  <xsl:call-template name="gentext.space"/>
-  <xsl:call-template name="gentext">
-    <xsl:with-param name="key" select="'Edition'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="editor" mode="titlepage.mode">
-  <!-- The first editor is dealt with in the following template,
-       which in turn displays all editors of the same mode. -->
-</xsl:template>
-
-<xsl:template match="editor[1]" priority="2" mode="titlepage.mode">
-  <xsl:call-template name="gentext.edited.by"/>
-  <xsl:call-template name="gentext.space"/>
-  <xsl:call-template name="person.name.list">
-    <xsl:with-param name="person.list" select="../editor"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="firstname" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="graphic" mode="titlepage.mode">
-  <!-- use the normal graphic handling code -->
-  <xsl:apply-templates select="."/>
-</xsl:template>
-
-<xsl:template match="honorific" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="isbn" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="issn" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="biblioid" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="itermset" mode="titlepage.mode">
-  <!-- discard -->
-</xsl:template>
-
-<xsl:template match="invpartnumber" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="issuenum" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="jobtitle" mode="titlepage.mode">
-  <fo:block>
-    <xsl:apply-templates mode="titlepage.mode"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="keywordset" mode="titlepage.mode">
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="titlepage.mode">
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <fo:block id="{$id}">
-    <xsl:if test="title"> <!-- FIXME: add param for using default title? -->
-      <xsl:call-template name="formal.object.heading"/>
-    </xsl:if>
-    <xsl:apply-templates mode="titlepage.mode"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="legalnotice/title" mode="titlepage.mode">
-</xsl:template>
-
-<xsl:template match="lineage" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="modespec" mode="titlepage.mode">
-  <!-- discard -->
-</xsl:template>
-
-<xsl:template match="orgdiv" mode="titlepage.mode">
-  <xsl:if test="preceding-sibling::*[1][self::orgname]">
-    <xsl:text> </xsl:text>
-  </xsl:if>
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="orgname" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="titlepage.mode">
-  <xsl:variable name="contrib" select="string(contrib)"/>
-  <xsl:choose>
-    <xsl:when test="contrib">
-      <xsl:if test="not(preceding-sibling::othercredit[string(contrib)=$contrib])">
-        <fo:block>
-          <xsl:apply-templates mode="titlepage.mode" select="contrib"/>
-          <xsl:text>: </xsl:text>
-          <xsl:call-template name="person.name"/>
-          <xsl:apply-templates mode="titlepage.mode" select="affiliation"/>
-          <xsl:apply-templates select="following-sibling::othercredit[string(contrib)=$contrib]" mode="titlepage.othercredits"/>
-        </fo:block>
-      </xsl:if>
-    </xsl:when>
-    <xsl:otherwise>
-      <fo:block><xsl:call-template name="person.name"/></fo:block>
-      <xsl:apply-templates mode="titlepage.mode" select="./affiliation"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="titlepage.othercredits">
-  <xsl:text>, </xsl:text>
-  <xsl:call-template name="person.name"/>
-</xsl:template>
-
-<xsl:template match="othername" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="pagenums" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="printhistory" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="productname" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="productnumber" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="publisher" mode="titlepage.mode">
-  <fo:block>
-    <xsl:apply-templates mode="titlepage.mode"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="publishername" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="pubsnumber" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="titlepage.mode">
-
-  <xsl:variable name="explicit.table.width">
-    <xsl:call-template name="pi.dbfo_table-width"/>
-  </xsl:variable>
-
-  <xsl:variable name="table.width">
-    <xsl:choose>
-      <xsl:when test="$explicit.table.width != ''">
-        <xsl:value-of select="$explicit.table.width"/>
-      </xsl:when>
-      <xsl:when test="$default.table.width = ''">
-        <xsl:text>100%</xsl:text>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$default.table.width"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <fo:table table-layout="fixed" width="{$table.width}" xsl:use-attribute-sets="revhistory.table.properties">
-    <fo:table-column column-number="1" column-width="proportional-column-width(1)"/>
-    <fo:table-column column-number="2" column-width="proportional-column-width(1)"/>
-    <fo:table-column column-number="3" column-width="proportional-column-width(1)"/>
-    <fo:table-body start-indent="0pt" end-indent="0pt">
-      <fo:table-row>
-        <fo:table-cell number-columns-spanned="3" xsl:use-attribute-sets="revhistory.table.cell.properties">
-          <fo:block xsl:use-attribute-sets="revhistory.title.properties">
-            <xsl:call-template name="gentext">
-              <xsl:with-param name="key" select="'RevHistory'"/>
-            </xsl:call-template>
-          </fo:block>
-        </fo:table-cell>
-      </fo:table-row>
-      <xsl:apply-templates mode="titlepage.mode"/>
-    </fo:table-body>
-  </fo:table>
-</xsl:template>
-
-<xsl:template match="revhistory/revision" mode="titlepage.mode">
-  <xsl:variable name="revnumber" select="revnumber"/>
-  <xsl:variable name="revdate"   select="date"/>
-  <xsl:variable name="revauthor" select="authorinitials|author"/>
-  <xsl:variable name="revremark" select="revremark|revdescription"/>
-  <fo:table-row>
-    <fo:table-cell xsl:use-attribute-sets="revhistory.table.cell.properties">
-      <fo:block>
-        <xsl:if test="$revnumber">
-          <xsl:call-template name="gentext">
-            <xsl:with-param name="key" select="'Revision'"/>
-          </xsl:call-template>
-          <xsl:call-template name="gentext.space"/>
-          <xsl:apply-templates select="$revnumber[1]" mode="titlepage.mode"/>
-        </xsl:if>
-      </fo:block>
-    </fo:table-cell>
-    <fo:table-cell xsl:use-attribute-sets="revhistory.table.cell.properties">
-      <fo:block>
-        <xsl:apply-templates select="$revdate[1]" mode="titlepage.mode"/>
-      </fo:block>
-    </fo:table-cell>
-    <fo:table-cell xsl:use-attribute-sets="revhistory.table.cell.properties">
-      <fo:block>
-        <xsl:for-each select="$revauthor">
-          <xsl:apply-templates select="." mode="titlepage.mode"/>
-          <xsl:if test="position() != last()">
-            <xsl:text>, </xsl:text>
-          </xsl:if>
-        </xsl:for-each>
-      </fo:block>
-    </fo:table-cell>
-  </fo:table-row>
-  <xsl:if test="$revremark">
-    <fo:table-row>
-      <fo:table-cell number-columns-spanned="3" xsl:use-attribute-sets="revhistory.table.cell.properties">
-        <fo:block>
-          <xsl:apply-templates select="$revremark[1]" mode="titlepage.mode"/>
-        </fo:block>
-      </fo:table-cell>
-    </fo:table-row>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="revision/revnumber" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="revision/date" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="revision/authorinitials" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="revision/author" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="revision/revremark" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="revision/revdescription" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="seriesvolnums" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="shortaffil" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="subjectset" mode="titlepage.mode">
-  <!-- discard -->
-</xsl:template>
-
-<xsl:template match="subtitle" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="surname" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="titleabbrev" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="volumenum" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-<!-- Book templates -->
-
-<!-- Note: these templates cannot use *.titlepage.recto.mode or
-     *.titlepage.verso.mode. If they do then subsequent use of a custom
-     titlepage.templates.xml file will not work correctly. -->
-
-<!-- book recto -->
-
-<xsl:template match="bookinfo/authorgroup|info/authorgroup"
-              mode="titlepage.mode" priority="2">
-  <fo:block>
-    <xsl:call-template name="anchor"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-  </fo:block>
-</xsl:template>
-
-<!-- book verso -->
-
-<xsl:template name="book.verso.title">
-  <fo:block>
-    <xsl:apply-templates mode="titlepage.mode"/>
-
-    <xsl:if test="following-sibling::subtitle
-                  |following-sibling::info/subtitle
-                  |following-sibling::bookinfo/subtitle">
-      <xsl:text>: </xsl:text>
-
-      <xsl:apply-templates select="(following-sibling::subtitle
-                                   |following-sibling::info/subtitle
-                                   |following-sibling::bookinfo/subtitle)[1]"
-                           mode="book.verso.subtitle.mode"/>
-    </xsl:if>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="book.verso.subtitle.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-  <xsl:if test="following-sibling::subtitle">
-    <xsl:text>: </xsl:text>
-    <xsl:apply-templates select="following-sibling::subtitle[1]"
-                         mode="book.verso.subtitle.mode"/>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="verso.authorgroup">
-  <fo:block>
-    <xsl:call-template name="gentext">
-      <xsl:with-param name="key" select="'by'"/>
-    </xsl:call-template>
-    <xsl:text> </xsl:text>
-    <xsl:call-template name="person.name.list">
-      <xsl:with-param name="person.list" select="author|corpauthor|editor"/>
-    </xsl:call-template>
-  </fo:block>
-  <xsl:apply-templates select="othercredit" mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="bookinfo/author|info/author"
-              mode="titlepage.mode" priority="2">
-  <fo:block>
-    <xsl:call-template name="person.name"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="bookinfo/corpauthor|info/corpauthor"
-              mode="titlepage.mode" priority="2">
-  <fo:block>
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="bookinfo/pubdate|info/pubdate"
-              mode="titlepage.mode" priority="2">
-  <fo:block>
-    <xsl:call-template name="gentext">
-      <xsl:with-param name="key" select="'published'"/>
-    </xsl:call-template>
-    <xsl:text> </xsl:text>
-    <xsl:apply-templates mode="titlepage.mode"/>
-  </fo:block>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/toc.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/toc.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,280 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<!-- FIXME: in the contexts where <toc> can occur, I think it's always
-     the case that a page-sequence is required. Is that true? -->
-
-<xsl:template match="toc">
-  <xsl:variable name="master-reference">
-    <xsl:call-template name="select.pagemaster"/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="*">
-      <xsl:if test="$process.source.toc != 0">
-        <!-- if the toc isn't empty, process it -->
-        <fo:page-sequence hyphenate="{$hyphenate}"
-                          master-reference="{$master-reference}">
-          <xsl:attribute name="language">
-            <xsl:call-template name="l10n.language"/>
-          </xsl:attribute>
-          <xsl:attribute name="format">
-            <xsl:call-template name="page.number.format">
-              <xsl:with-param name="element" select="'toc'"/>
-              <xsl:with-param name="master-reference" 
-                              select="$master-reference"/>
-            </xsl:call-template>
-          </xsl:attribute>
-
-          <xsl:attribute name="initial-page-number">
-            <xsl:call-template name="initial.page.number">
-              <xsl:with-param name="element" select="'toc'"/>
-              <xsl:with-param name="master-reference" 
-                              select="$master-reference"/>
-            </xsl:call-template>
-          </xsl:attribute>
-
-          <xsl:attribute name="force-page-count">
-            <xsl:call-template name="force.page.count">
-              <xsl:with-param name="master-reference" 
-	                      select="$master-reference"/>
-            </xsl:call-template>
-          </xsl:attribute>
-
-          <xsl:attribute name="hyphenation-character">
-            <xsl:call-template name="gentext">
-              <xsl:with-param name="key" select="'hyphenation-character'"/>
-            </xsl:call-template>
-          </xsl:attribute>
-          <xsl:attribute name="hyphenation-push-character-count">
-            <xsl:call-template name="gentext">
-              <xsl:with-param name="key" select="'hyphenation-push-character-count'"/>
-            </xsl:call-template>
-          </xsl:attribute>
-          <xsl:attribute name="hyphenation-remain-character-count">
-            <xsl:call-template name="gentext">
-              <xsl:with-param name="key" select="'hyphenation-remain-character-count'"/>
-            </xsl:call-template>
-          </xsl:attribute>
-
-          <xsl:apply-templates select="." mode="running.head.mode">
-            <xsl:with-param name="master-reference" select="$master-reference"/>
-          </xsl:apply-templates>
-          <xsl:apply-templates select="." mode="running.foot.mode">
-            <xsl:with-param name="master-reference" select="$master-reference"/>
-          </xsl:apply-templates>
-
-          <fo:flow flow-name="xsl-region-body">
-            <xsl:call-template name="set.flow.properties">
-              <xsl:with-param name="element" select="local-name(.)"/>
-              <xsl:with-param name="master-reference" 
-                              select="$master-reference"/>
-            </xsl:call-template>
-
-            <fo:block xsl:use-attribute-sets="toc.margin.properties">
-              <xsl:call-template name="table.of.contents.titlepage"/>
-              <xsl:apply-templates/>
-            </fo:block>
-          </fo:flow>
-        </fo:page-sequence>
-      </xsl:if>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:if test="$process.empty.source.toc != 0">
-        <fo:page-sequence hyphenate="{$hyphenate}"
-                          master-reference="{$master-reference}">
-          <xsl:attribute name="language">
-            <xsl:call-template name="l10n.language"/>
-          </xsl:attribute>
-          <xsl:attribute name="format">
-            <xsl:call-template name="page.number.format">
-              <xsl:with-param name="element" select="'toc'"/>
-              <xsl:with-param name="master-reference" 
-                              select="$master-reference"/>
-            </xsl:call-template>
-          </xsl:attribute>
-
-          <xsl:attribute name="initial-page-number">
-            <xsl:call-template name="initial.page.number">
-              <xsl:with-param name="element" select="'toc'"/>
-              <xsl:with-param name="master-reference" 
-                              select="$master-reference"/>
-            </xsl:call-template>
-          </xsl:attribute>
-
-          <xsl:attribute name="hyphenation-character">
-            <xsl:call-template name="gentext">
-              <xsl:with-param name="key" select="'hyphenation-character'"/>
-            </xsl:call-template>
-          </xsl:attribute>
-          <xsl:attribute name="hyphenation-push-character-count">
-            <xsl:call-template name="gentext">
-              <xsl:with-param name="key" select="'hyphenation-push-character-count'"/>
-            </xsl:call-template>
-          </xsl:attribute>
-          <xsl:attribute name="hyphenation-remain-character-count">
-            <xsl:call-template name="gentext">
-              <xsl:with-param name="key" select="'hyphenation-remain-character-count'"/>
-            </xsl:call-template>
-          </xsl:attribute>
-
-          <xsl:apply-templates select="." mode="running.head.mode">
-            <xsl:with-param name="master-reference" select="$master-reference"/>
-          </xsl:apply-templates>
-          <xsl:apply-templates select="." mode="running.foot.mode">
-            <xsl:with-param name="master-reference" select="$master-reference"/>
-          </xsl:apply-templates>
-
-          <fo:flow flow-name="xsl-region-body">
-            <xsl:choose>
-              <xsl:when test="parent::section
-                              or parent::sect1
-                              or parent::sect2
-                              or parent::sect3
-                              or parent::sect4
-                              or parent::sect5">
-                <xsl:apply-templates select="parent::*"
-                                     mode="toc.for.section"/>
-              </xsl:when>
-              <xsl:when test="parent::article">
-                <xsl:apply-templates select="parent::*"
-                                     mode="toc.for.component"/>
-              </xsl:when>
-              <xsl:when test="parent::book
-                              or parent::part">
-                <xsl:apply-templates select="parent::*"
-                                     mode="toc.for.division"/>
-              </xsl:when>
-              <xsl:when test="parent::set">
-                <xsl:apply-templates select="parent::*"
-                                     mode="toc.for.set"/>
-              </xsl:when>
-              <!-- there aren't any other contexts that allow toc -->
-              <xsl:otherwise>
-                <xsl:message>
-                  <xsl:text>I don't know how to make a TOC in this context!</xsl:text>
-                </xsl:message>
-              </xsl:otherwise>
-            </xsl:choose>
-          </fo:flow>
-        </fo:page-sequence>
-      </xsl:if>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="tocpart|tocchap
-                     |toclevel1|toclevel2|toclevel3|toclevel4|toclevel5">
-  <xsl:apply-templates select="tocentry"/>
-  <xsl:if test="tocchap|toclevel1|toclevel2|toclevel3|toclevel4|toclevel5">
-    <fo:block start-indent="{count(ancestor::*)*2}pc">
-      <xsl:apply-templates select="tocchap|toclevel1|toclevel2|toclevel3|toclevel4|toclevel5"/>
-    </fo:block>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="tocentry|tocfront|tocback">
-  <fo:block text-align-last="justify"
-            end-indent="2pc"
-            last-line-end-indent="-2pc">
-    <fo:inline keep-with-next.within-line="always">
-      <xsl:choose>
-        <xsl:when test="@linkend">
-          <fo:basic-link internal-destination="{@linkend}">
-            <xsl:apply-templates/>
-          </fo:basic-link>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </fo:inline>
-
-    <xsl:choose>
-      <xsl:when test="@linkend">
-        <fo:inline keep-together.within-line="always">
-          <xsl:text> </xsl:text>
-          <fo:leader leader-pattern="dots"
-                     keep-with-next.within-line="always"/>
-          <xsl:text> </xsl:text>
-          <fo:basic-link internal-destination="{@linkend}">
-            <xsl:choose>
-              <xsl:when test="@pagenum">
-                <xsl:value-of select="@pagenum"/>
-              </xsl:when>
-              <xsl:otherwise>
-                <fo:page-number-citation ref-id="{@linkend}"/>
-              </xsl:otherwise>
-            </xsl:choose>
-          </fo:basic-link>
-        </fo:inline>
-      </xsl:when>
-      <xsl:when test="@pagenum">
-        <fo:inline keep-together.within-line="always">
-          <xsl:text> </xsl:text>
-          <fo:leader leader-pattern="dots"
-                     keep-with-next.within-line="always"/>
-          <xsl:text> </xsl:text>
-          <xsl:value-of select="@pagenum"/>
-        </fo:inline>
-      </xsl:when>
-      <xsl:otherwise>
-        <!-- just the leaders, what else can I do? -->
-        <fo:inline keep-together.within-line="always">
-          <xsl:text> </xsl:text>
-          <fo:leader leader-pattern="space"
-                     keep-with-next.within-line="always"/>
-        </fo:inline>
-      </xsl:otherwise>
-    </xsl:choose>
-  </fo:block>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="*" mode="toc.for.section">
-<!--
-  <xsl:call-template name="section.toc"/>
--->
-</xsl:template>
-
-<xsl:template match="*" mode="toc.for.component">
-  <xsl:call-template name="component.toc"/>
-</xsl:template>
-
-<xsl:template match="*" mode="toc.for.section">
-<!--
-  <xsl:call-template name="section.toc"/>
--->
-</xsl:template>
-
-<xsl:template match="*" mode="toc.for.division">
-  <xsl:call-template name="division.toc"/>
-</xsl:template>
-
-<xsl:template match="*" mode="toc.for.set">
-<!--
-  <xsl:call-template name="set.toc"/>
--->
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="lot|lotentry">
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/verbatim.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/verbatim.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,417 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                xmlns:sverb="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.Verbatim"
-                xmlns:xverb="com.nwalsh.xalan.Verbatim"
-                xmlns:lxslt="http://xml.apache.org/xslt"
-                xmlns:exsl="http://exslt.org/common"
-                exclude-result-prefixes="sverb xverb lxslt exsl"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<xsl:include href="../highlighting/common.xsl"/>
-<xsl:include href="highlight.xsl"/>
-
-<lxslt:component prefix="xverb"
-                 functions="numberLines"/>
-
-<xsl:template match="programlisting|screen|synopsis">
-  <xsl:param name="suppress-numbers" select="'0'"/>
-  <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
-
-  <xsl:variable name="content">
-    <xsl:choose>
-      <xsl:when test="$suppress-numbers = '0'
-                      and @linenumbering = 'numbered'
-                      and $use.extensions != '0'
-                      and $linenumbering.extension != '0'">
-        <xsl:call-template name="number.rtf.lines">
-          <xsl:with-param name="rtf">
-	    <xsl:call-template name="apply-highlighting"/>
-          </xsl:with-param>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-	<xsl:call-template name="apply-highlighting"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$shade.verbatim != 0">
-      <fo:block id="{$id}"
-                xsl:use-attribute-sets="monospace.verbatim.properties shade.verbatim.style">
-        <xsl:choose>
-          <xsl:when test="$hyphenate.verbatim != 0 and function-available('exsl:node-set')">
-            <xsl:apply-templates select="exsl:node-set($content)" mode="hyphenate.verbatim"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:copy-of select="$content"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </fo:block>
-    </xsl:when>
-    <xsl:otherwise>
-      <fo:block id="{$id}"
-                xsl:use-attribute-sets="monospace.verbatim.properties">
-        <xsl:choose>
-          <xsl:when test="$hyphenate.verbatim != 0 and function-available('exsl:node-set')">
-            <xsl:apply-templates select="exsl:node-set($content)" mode="hyphenate.verbatim"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:copy-of select="$content"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </fo:block>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="literallayout">
-  <xsl:param name="suppress-numbers" select="'0'"/>
-
-  <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
-
-  <xsl:variable name="content">
-    <xsl:choose>
-      <xsl:when test="$suppress-numbers = '0'
-                      and @linenumbering = 'numbered'
-                      and $use.extensions != '0'
-                      and $linenumbering.extension != '0'">
-        <xsl:call-template name="number.rtf.lines">
-          <xsl:with-param name="rtf">
-            <xsl:apply-templates/>
-          </xsl:with-param>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:apply-templates/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="@class='monospaced'">
-      <xsl:choose>
-        <xsl:when test="$shade.verbatim != 0">
-          <fo:block id="{$id}"
-                    xsl:use-attribute-sets="monospace.verbatim.properties shade.verbatim.style">
-
-            <xsl:copy-of select="$content"/>
-          </fo:block>
-        </xsl:when>
-        <xsl:otherwise>
-          <fo:block id="{$id}"
-                    xsl:use-attribute-sets="monospace.verbatim.properties">
-            <xsl:copy-of select="$content"/>
-          </fo:block>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:choose>
-        <xsl:when test="$shade.verbatim != 0">
-          <fo:block id="{$id}"
-                    xsl:use-attribute-sets="verbatim.properties shade.verbatim.style">
-            <xsl:copy-of select="$content"/>
-          </fo:block>
-        </xsl:when>
-        <xsl:otherwise>
-          <fo:block id="{$id}"
-                    xsl:use-attribute-sets="verbatim.properties">
-            <xsl:copy-of select="$content"/>
-          </fo:block>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="address">
-  <xsl:param name="suppress-numbers" select="'0'"/>
-
-  <xsl:variable name="content">
-    <xsl:choose>
-      <xsl:when test="$suppress-numbers = '0'
-                      and @linenumbering = 'numbered'
-                      and $use.extensions != '0'
-                      and $linenumbering.extension != '0'">
-        <xsl:call-template name="number.rtf.lines">
-          <xsl:with-param name="rtf">
-            <xsl:apply-templates/>
-          </xsl:with-param>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:apply-templates/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <fo:block xsl:use-attribute-sets="verbatim.properties">
-    <xsl:copy-of select="$content"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template name="number.rtf.lines">
-  <xsl:param name="rtf" select="''"/>
-  <xsl:param name="pi.context" select="."/>
-
-  <!-- Save the global values -->
-  <xsl:variable name="global.linenumbering.everyNth"
-                select="$linenumbering.everyNth"/>
-
-  <xsl:variable name="global.linenumbering.separator"
-                select="$linenumbering.separator"/>
-
-  <xsl:variable name="global.linenumbering.width"
-                select="$linenumbering.width"/>
-
-  <!-- Extract the <?dbfo linenumbering.*?> PI values -->
-  <xsl:variable name="pi.linenumbering.everyNth">
-    <xsl:call-template name="pi.dbfo_linenumbering.everyNth">
-      <xsl:with-param name="node" select="$pi.context"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="pi.linenumbering.separator">
-    <xsl:call-template name="pi.dbfo_linenumbering.separator">
-      <xsl:with-param name="node" select="$pi.context"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="pi.linenumbering.width">
-    <xsl:call-template name="pi.dbfo_linenumbering.width">
-      <xsl:with-param name="node" select="$pi.context"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <!-- Construct the 'in-context' values -->
-  <xsl:variable name="linenumbering.everyNth">
-    <xsl:choose>
-      <xsl:when test="$pi.linenumbering.everyNth != ''">
-        <xsl:value-of select="$pi.linenumbering.everyNth"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$global.linenumbering.everyNth"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="linenumbering.separator">
-    <xsl:choose>
-      <xsl:when test="$pi.linenumbering.separator != ''">
-        <xsl:value-of select="$pi.linenumbering.separator"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$global.linenumbering.separator"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="linenumbering.width">
-    <xsl:choose>
-      <xsl:when test="$pi.linenumbering.width != ''">
-        <xsl:value-of select="$pi.linenumbering.width"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$global.linenumbering.width"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="linenumbering.startinglinenumber">
-    <xsl:choose>
-      <xsl:when test="$pi.context/@startinglinenumber">
-        <xsl:value-of select="$pi.context/@startinglinenumber"/>
-      </xsl:when>
-      <xsl:when test="$pi.context/@continuation='continues'">
-        <xsl:variable name="lastLine">
-          <xsl:choose>
-            <xsl:when test="$pi.context/self::programlisting">
-              <xsl:call-template name="lastLineNumber">
-                <xsl:with-param name="listings"
-                     select="preceding::programlisting[@linenumbering='numbered']"/>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:when test="$pi.context/self::screen">
-              <xsl:call-template name="lastLineNumber">
-                <xsl:with-param name="listings"
-                     select="preceding::screen[@linenumbering='numbered']"/>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:when test="$pi.context/self::literallayout">
-              <xsl:call-template name="lastLineNumber">
-                <xsl:with-param name="listings"
-                     select="preceding::literallayout[@linenumbering='numbered']"/>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:when test="$pi.context/self::address">
-              <xsl:call-template name="lastLineNumber">
-                <xsl:with-param name="listings"
-                     select="preceding::address[@linenumbering='numbered']"/>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:when test="$pi.context/self::synopsis">
-              <xsl:call-template name="lastLineNumber">
-                <xsl:with-param name="listings"
-                     select="preceding::synopsis[@linenumbering='numbered']"/>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:message>
-                <xsl:text>Unexpected verbatim environment: </xsl:text>
-                <xsl:value-of select="local-name(.)"/>
-              </xsl:message>
-              <xsl:value-of select="0"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:variable>
-
-        <xsl:value-of select="$lastLine + 1"/>
-      </xsl:when>
-      <xsl:otherwise>1</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="function-available('sverb:numberLines')">
-      <xsl:copy-of select="sverb:numberLines($rtf)"/>
-    </xsl:when>
-    <xsl:when test="function-available('xverb:numberLines')">
-      <xsl:copy-of select="xverb:numberLines($rtf)"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:message terminate="yes">
-        <xsl:text>No numberLines function available.</xsl:text>
-      </xsl:message>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ======================================================================== -->
-
-<xsl:template name="lastLineNumber">
-  <xsl:param name="listings"/>
-  <xsl:param name="number" select="0"/>
-
-  <xsl:variable name="lines">
-    <xsl:call-template name="countLines">
-      <xsl:with-param name="listing" select="string($listings[1])"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="not($listings)">
-      <xsl:value-of select="$number"/>
-    </xsl:when>
-    <xsl:when test="$listings[1]/@startinglinenumber">
-      <xsl:value-of select="$number + $listings[1]/@startinglinenumber + $lines - 1"/>
-    </xsl:when>
-    <xsl:when test="$listings[1]/@continuation='continues'">
-      <xsl:call-template name="lastLineNumber">
-        <xsl:with-param name="listings" select="listings[position() &gt; 1]"/>
-        <xsl:with-param name="number" select="$number + $lines"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$lines"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="countLines">
-  <xsl:param name="listing"/>
-  <xsl:param name="count" select="1"/>
-
-  <xsl:choose>
-    <xsl:when test="contains($listing, '&#10;')">
-      <xsl:call-template name="countLines">
-        <xsl:with-param name="listing" select="substring-after($listing, '&#10;')"/>
-        <xsl:with-param name="count" select="$count + 1"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$count"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ======================================================================== -->
-
-<xsl:template match="node()|@*" mode="hyphenate.verbatim">
-  <xsl:copy>
-    <xsl:copy-of select="@*"/>
-    <xsl:apply-templates mode="hyphenate.verbatim"/>
-  </xsl:copy>
-</xsl:template>
-
-<xsl:template match="text()" mode="hyphenate.verbatim" priority="2">
-  <xsl:call-template name="hyphenate.verbatim.block">
-    <xsl:with-param name="content" select="."/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="hyphenate.verbatim.block">
-  <xsl:param name="content" select="''"/>
-  <xsl:param name="count" select="1"/>
-
-  <!-- recurse on lines first to keep recursion depth reasonable -->
-  <xsl:choose>
-    <xsl:when test="contains($content, '&#xA;')">
-      <xsl:variable name="line" select="substring-before($content, '&#xA;')"/>
-      <xsl:variable name="rest" select="substring-after($content, '&#xA;')"/>
-      <xsl:call-template name="hyphenate.verbatim">
-        <xsl:with-param name="content" select="concat($line, '&#xA;')"/>
-      </xsl:call-template>
-      <xsl:call-template name="hyphenate.verbatim.block">
-        <xsl:with-param name="content" select="$rest"/>
-        <xsl:with-param name="count" select="$count + 1"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="hyphenate.verbatim">
-        <xsl:with-param name="content" select="$content"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-  
-</xsl:template>
-
-<xsl:template name="hyphenate.verbatim">
-  <xsl:param name="content"/>
-  <xsl:variable name="head" select="substring($content, 1, 1)"/>
-  <xsl:variable name="tail" select="substring($content, 2)"/>
-  <xsl:choose>
-    <!-- Place soft-hyphen after space or non-breakable space. -->
-    <xsl:when test="$head = ' ' or $head = '&#160;'">
-      <xsl:text>&#160;</xsl:text>
-      <xsl:text>&#x00AD;</xsl:text>
-    </xsl:when>
-    <xsl:when test="$hyphenate.verbatim.characters != '' and
-                    translate($head, $hyphenate.verbatim.characters, '') = '' and not($tail = '')">
-      <xsl:value-of select="$head"/>
-      <xsl:text>&#x00AD;</xsl:text>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$head"/>
-    </xsl:otherwise>
-  </xsl:choose>
-  <xsl:if test="$tail">
-    <xsl:call-template name="hyphenate.verbatim">
-      <xsl:with-param name="content" select="$tail"/>
-    </xsl:call-template>
-  </xsl:if>
-</xsl:template>
-
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/xep.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/xep.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,180 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                xmlns:rx="http://www.renderx.com/XSL/Extensions"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-     (c) Stephane Bline Peregrine Systems 2001
-     Implementation of xep extensions:
-       * Pdf bookmarks (based on the XEP 2.5 implementation)
-       * Document information (XEP 2.5 meta information extensions)
-     ******************************************************************** -->
-
-<!-- FIXME: Norm, I changed things so that the top-level element (book or set)
-     does not appear in the TOC. Is this the right thing? -->
-
-<xsl:template name="xep-document-information">
-  <rx:meta-info>
-    <xsl:variable name="authors" 
-                  select="(//author|//editor|//corpauthor|//authorgroup)[1]"/>
-    <xsl:if test="$authors">
-      <xsl:variable name="author">
-        <xsl:choose>
-          <xsl:when test="$authors[self::authorgroup]">
-            <xsl:call-template name="person.name.list">
-              <xsl:with-param name="person.list" 
-                        select="$authors/*[self::author|self::corpauthor|
-                               self::othercredit|self::editor]"/>
-            </xsl:call-template>
-          </xsl:when>
-          <xsl:when test="$authors[self::corpauthor]">
-            <xsl:value-of select="$authors"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:call-template name="person.name">
-              <xsl:with-param name="node" select="$authors"/>
-            </xsl:call-template>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-      <xsl:element name="rx:meta-field">
-        <xsl:attribute name="name">author</xsl:attribute>
-        <xsl:attribute name="value">
-          <xsl:value-of select="normalize-space($author)"/>
-        </xsl:attribute>
-      </xsl:element>
-    </xsl:if>
-
-    <xsl:variable name="title">
-      <xsl:apply-templates select="/*[1]" mode="label.markup"/>
-      <xsl:apply-templates select="/*[1]" mode="title.markup"/>
-    </xsl:variable>
-
-    <xsl:element name="rx:meta-field">
-      <xsl:attribute name="name">creator</xsl:attribute>
-      <xsl:attribute name="value">
-        <xsl:text>DocBook </xsl:text>
-        <xsl:value-of select="$DistroTitle"/>
-        <xsl:text> V</xsl:text>
-        <xsl:value-of select="$VERSION"/>
-      </xsl:attribute>
-    </xsl:element>
-
-    <xsl:element name="rx:meta-field">
-      <xsl:attribute name="name">title</xsl:attribute>
-      <xsl:attribute name="value">
-        <xsl:value-of select="normalize-space($title)"/>
-      </xsl:attribute>
-    </xsl:element>
-
-    <xsl:if test="//keyword">
-      <xsl:element name="rx:meta-field">
-        <xsl:attribute name="name">keywords</xsl:attribute>
-        <xsl:attribute name="value">
-          <xsl:for-each select="//keyword">
-            <xsl:value-of select="normalize-space(.)"/>
-            <xsl:if test="position() != last()">
-              <xsl:text>, </xsl:text>
-            </xsl:if>
-          </xsl:for-each>
-        </xsl:attribute>
-      </xsl:element>
-    </xsl:if>
-
-    <xsl:if test="//subjectterm">
-      <xsl:element name="rx:meta-field">
-        <xsl:attribute name="name">subject</xsl:attribute>
-        <xsl:attribute name="value">
-          <xsl:for-each select="//subjectterm">
-            <xsl:value-of select="normalize-space(.)"/>
-            <xsl:if test="position() != last()">
-              <xsl:text>, </xsl:text>
-            </xsl:if>
-          </xsl:for-each>
-        </xsl:attribute>
-      </xsl:element>
-    </xsl:if>
-  </rx:meta-info>
-</xsl:template>
-
-<!-- ********************************************************************
-     Pdf bookmarks
-     ******************************************************************** -->
-
-<xsl:template match="*" mode="xep.outline">
-  <xsl:apply-templates select="*" mode="xep.outline"/>
-</xsl:template>
-
-<xsl:template match="set|book|part|reference|preface|chapter|appendix|article
-                     |glossary|bibliography|index|setindex
-                     |refentry|refsynopsisdiv
-                     |refsect1|refsect2|refsect3|refsection
-                     |sect1|sect2|sect3|sect4|sect5|section"
-              mode="xep.outline">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-  <xsl:variable name="bookmark-label">
-    <xsl:apply-templates select="." mode="object.title.markup"/>
-  </xsl:variable>
-
-  <!-- Put the root element bookmark at the same level as its children -->
-  <!-- If the object is a set or book, generate a bookmark for the toc -->
-
-  <xsl:choose>
-    <xsl:when test="parent::*">
-      <rx:bookmark internal-destination="{$id}">
-        <rx:bookmark-label>
-          <xsl:value-of select="normalize-space($bookmark-label)"/>
-        </rx:bookmark-label>
-        <xsl:apply-templates select="*" mode="xep.outline"/>
-      </rx:bookmark>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:if test="$bookmark-label != ''">
-        <rx:bookmark internal-destination="{$id}">
-          <rx:bookmark-label>
-            <xsl:value-of select="normalize-space($bookmark-label)"/>
-          </rx:bookmark-label>
-        </rx:bookmark>
-      </xsl:if>
-
-      <xsl:variable name="toc.params">
-        <xsl:call-template name="find.path.params">
-          <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:if test="contains($toc.params, 'toc')
-                    and set|book|part|reference|section|sect1|refentry
-                        |article|bibliography|glossary|chapter
-                        |appendix">
-        <rx:bookmark internal-destination="toc...{$id}">
-          <rx:bookmark-label>
-            <xsl:call-template name="gentext">
-              <xsl:with-param name="key" select="'TableofContents'"/>
-            </xsl:call-template>
-          </rx:bookmark-label>
-        </rx:bookmark>
-      </xsl:if>
-      <xsl:apply-templates select="*" mode="xep.outline"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="xep-pis">
-  <xsl:if test="$crop.marks != 0">
-    <xsl:processing-instruction name="xep-pdf-crop-mark-width"><xsl:value-of select="$crop.mark.width"/></xsl:processing-instruction>
-    <xsl:processing-instruction name="xep-pdf-crop-offset"><xsl:value-of select="$crop.mark.offset"/></xsl:processing-instruction>
-    <xsl:processing-instruction name="xep-pdf-bleed"><xsl:value-of select="$crop.mark.bleed"/></xsl:processing-instruction>
-  </xsl:if>
-
-  <xsl:call-template name="user-xep-pis"/>
-</xsl:template>
-
-<!-- Placeholder for user defined PIs -->
-<xsl:template name="user-xep-pis"/>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/xref.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/xref.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,1440 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                xmlns:exsl="http://exslt.org/common"
-                xmlns:xlink='http://www.w3.org/1999/xlink'
-                exclude-result-prefixes="exsl"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- Use internal variable for olink xlink role for consistency -->
-<xsl:variable 
-      name="xolink.role">http://docbook.org/xlink/role/olink</xsl:variable>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="anchor">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-  <fo:inline id="{$id}"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="xref" name="xref">
-  <xsl:param name="xhref" select="@xlink:href"/>
-  <!-- is the @xlink:href a local idref link? -->
-  <xsl:param name="xlink.idref">
-    <xsl:if test="starts-with($xhref,'#')
-                  and (not(contains($xhref,'&#40;'))
-                  or starts-with($xhref, '#xpointer&#40;id&#40;'))">
-      <xsl:call-template name="xpointer.idref">
-        <xsl:with-param name="xpointer" select="$xhref"/>
-      </xsl:call-template>
-   </xsl:if>
-  </xsl:param>
-  <xsl:param name="xlink.targets" select="key('id',$xlink.idref)"/>
-  <xsl:param name="linkend.targets" select="key('id',@linkend)"/>
-  <xsl:param name="target" select="($xlink.targets | $linkend.targets)[1]"/>
-  <xsl:param name="refelem" select="local-name($target)"/>
-
-  <xsl:variable name="xrefstyle">
-    <xsl:choose>
-      <xsl:when test="@role and not(@xrefstyle) 
-                      and $use.role.as.xrefstyle != 0">
-        <xsl:value-of select="@role"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="@xrefstyle"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="content">
-    <fo:inline xsl:use-attribute-sets="xref.properties">
-      <xsl:choose>
-        <xsl:when test="@endterm">
-          <xsl:variable name="etargets" select="key('id',@endterm)"/>
-          <xsl:variable name="etarget" select="$etargets[1]"/>
-          <xsl:choose>
-            <xsl:when test="count($etarget) = 0">
-              <xsl:message>
-                <xsl:value-of select="count($etargets)"/>
-                <xsl:text>Endterm points to nonexistent ID: </xsl:text>
-                <xsl:value-of select="@endterm"/>
-              </xsl:message>
-              <xsl:text>???</xsl:text>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:apply-templates select="$etarget" mode="endterm"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:when>
-  
-        <xsl:when test="$target/@xreflabel">
-          <xsl:call-template name="xref.xreflabel">
-            <xsl:with-param name="target" select="$target"/>
-          </xsl:call-template>
-        </xsl:when>
-  
-        <xsl:when test="$target">
-          <xsl:if test="not(parent::citation)">
-            <xsl:apply-templates select="$target" mode="xref-to-prefix"/>
-          </xsl:if>
-  
-          <xsl:apply-templates select="$target" mode="xref-to">
-            <xsl:with-param name="referrer" select="."/>
-            <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-          </xsl:apply-templates>
-  
-          <xsl:if test="not(parent::citation)">
-            <xsl:apply-templates select="$target" mode="xref-to-suffix"/>
-          </xsl:if>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:message>
-            <xsl:text>ERROR: xref linking to </xsl:text>
-            <xsl:value-of select="@linkend|@xlink:href"/>
-            <xsl:text> has no generated link text.</xsl:text>
-          </xsl:message>
-          <xsl:text>???</xsl:text>
-        </xsl:otherwise>
-      </xsl:choose>
-    </fo:inline>
-  </xsl:variable>
-
-  <!-- Convert it into an active link -->
-  <xsl:call-template name="simple.xlink">
-    <xsl:with-param name="content" select="$content"/>
-  </xsl:call-template>
-
-  <!-- Add standard page reference? -->
-  <xsl:choose>
-    <xsl:when test="not($target)">
-      <!-- page numbers only for local targets -->
-    </xsl:when>
-    <xsl:when test="starts-with(normalize-space($xrefstyle), 'select:') 
-                  and contains($xrefstyle, 'nopage')">
-      <!-- negative xrefstyle in instance turns it off -->
-    </xsl:when>
-    <!-- positive xrefstyle already handles it -->
-    <xsl:when test="not(starts-with(normalize-space($xrefstyle), 'select:') 
-                  and (contains($xrefstyle, 'page')
-                       or contains($xrefstyle, 'Page')))
-                  and ( $insert.xref.page.number = 'yes' 
-                     or $insert.xref.page.number = '1')
-                  or local-name($target) = 'para'">
-      <xsl:apply-templates select="$target" mode="page.citation">
-        <xsl:with-param name="id" select="$target/@id|$target/@xml:id"/>
-      </xsl:apply-templates>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<!-- Handled largely like an xref -->
-<!-- To be done: add support for begin, end, and units attributes -->
-<xsl:template match="biblioref" name="biblioref">
-  <xsl:variable name="targets" select="key('id',@linkend)"/>
-  <xsl:variable name="target" select="$targets[1]"/>
-  <xsl:variable name="refelem" select="local-name($target)"/>
-
-  <xsl:call-template name="check.id.unique">
-    <xsl:with-param name="linkend" select="@linkend"/>
-  </xsl:call-template>
-
-  <xsl:choose>
-    <xsl:when test="$refelem=''">
-      <xsl:message>
-        <xsl:text>XRef to nonexistent id: </xsl:text>
-        <xsl:value-of select="@linkend"/>
-      </xsl:message>
-      <xsl:text>???</xsl:text>
-    </xsl:when>
-
-    <xsl:when test="@endterm">
-      <fo:basic-link internal-destination="{@linkend}"
-                     xsl:use-attribute-sets="xref.properties">
-        <xsl:variable name="etargets" select="key('id',@endterm)"/>
-        <xsl:variable name="etarget" select="$etargets[1]"/>
-        <xsl:choose>
-          <xsl:when test="count($etarget) = 0">
-            <xsl:message>
-              <xsl:value-of select="count($etargets)"/>
-              <xsl:text>Endterm points to nonexistent ID: </xsl:text>
-              <xsl:value-of select="@endterm"/>
-            </xsl:message>
-            <xsl:text>???</xsl:text>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:apply-templates select="$etarget" mode="endterm"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </fo:basic-link>
-    </xsl:when>
-
-    <xsl:when test="$target/@xreflabel">
-      <fo:basic-link internal-destination="{@linkend}"
-                     xsl:use-attribute-sets="xref.properties">
-        <xsl:call-template name="xref.xreflabel">
-          <xsl:with-param name="target" select="$target"/>
-        </xsl:call-template>
-      </fo:basic-link>
-    </xsl:when>
-
-    <xsl:otherwise>
-      <xsl:if test="not(parent::citation)">
-        <xsl:apply-templates select="$target" mode="xref-to-prefix"/>
-      </xsl:if>
-
-      <fo:basic-link internal-destination="{@linkend}"
-                     xsl:use-attribute-sets="xref.properties">
-        <xsl:apply-templates select="$target" mode="xref-to">
-          <xsl:with-param name="referrer" select="."/>
-          <xsl:with-param name="xrefstyle">
-            <xsl:choose>
-              <xsl:when test="@role and not(@xrefstyle) and $use.role.as.xrefstyle != 0">
-                <xsl:value-of select="@role"/>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:value-of select="@xrefstyle"/>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:with-param>
-        </xsl:apply-templates>
-      </fo:basic-link>
-
-      <xsl:if test="not(parent::citation)">
-        <xsl:apply-templates select="$target" mode="xref-to-suffix"/>
-      </xsl:if>
-    </xsl:otherwise>
-  </xsl:choose>
-
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="*" mode="endterm">
-  <!-- Process the children of the endterm element -->
-  <xsl:variable name="endterm">
-    <xsl:apply-templates select="child::node()"/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="function-available('exsl:node-set')">
-      <xsl:apply-templates select="exsl:node-set($endterm)" mode="remove-ids"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:copy-of select="$endterm"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="*" mode="remove-ids">
-  <xsl:copy>
-    <xsl:for-each select="@*">
-      <xsl:choose>
-        <xsl:when test="name(.) != 'id'">
-          <xsl:copy/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:message>removing <xsl:value-of select="name(.)"/></xsl:message>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:for-each>
-    <xsl:apply-templates mode="remove-ids"/>
-  </xsl:copy>
-</xsl:template>
-
-<!--- ==================================================================== -->
-
-<xsl:template match="*" mode="xref-to-prefix"/>
-<xsl:template match="*" mode="xref-to-suffix"/>
-
-<xsl:template match="*" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-
-  <xsl:if test="$verbose != 0">
-    <xsl:message>
-      <xsl:text>Don't know what gentext to create for xref to: "</xsl:text>
-      <xsl:value-of select="name(.)"/>
-      <xsl:text>"</xsl:text>
-    </xsl:message>
-    <xsl:text>???</xsl:text>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="title" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <!-- if you xref to a title, xref to the parent... -->
-  <xsl:choose>
-    <!-- FIXME: how reliable is this? -->
-    <xsl:when test="contains(local-name(parent::*), 'info')">
-      <xsl:apply-templates select="parent::*[2]" mode="xref-to">
-        <xsl:with-param name="referrer" select="$referrer"/>
-        <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-        <xsl:with-param name="verbose" select="$verbose"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates select="parent::*" mode="xref-to">
-        <xsl:with-param name="referrer" select="$referrer"/>
-        <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-        <xsl:with-param name="verbose" select="$verbose"/>
-      </xsl:apply-templates>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="abstract|article|authorblurb|bibliodiv|bibliomset
-                     |biblioset|blockquote|calloutlist|caution|colophon
-                     |constraintdef|formalpara|glossdiv|important|indexdiv
-                     |itemizedlist|legalnotice|lot|msg|msgexplan|msgmain
-                     |msgrel|msgset|msgsub|note|orderedlist|partintro
-                     |productionset|qandadiv|refsynopsisdiv|segmentedlist
-                     |set|setindex|sidebar|tip|toc|variablelist|warning"
-              mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <!-- catch-all for things with (possibly optional) titles -->
-  <xsl:apply-templates select="." mode="object.xref.markup">
-    <xsl:with-param name="purpose" select="'xref'"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="author|editor|othercredit|personname" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:call-template name="person.name"/>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:call-template name="person.name.list"/>
-</xsl:template>
-
-<xsl:template match="figure|example|table|equation" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates select="." mode="object.xref.markup">
-    <xsl:with-param name="purpose" select="'xref'"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="procedure" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose"/>
-
-  <xsl:apply-templates select="." mode="object.xref.markup">
-    <xsl:with-param name="purpose" select="'xref'"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="task" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose"/>
-
-  <xsl:apply-templates select="." mode="object.xref.markup">
-    <xsl:with-param name="purpose" select="'xref'"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="cmdsynopsis" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates select="(.//command)[1]" mode="xref"/>
-</xsl:template>
-
-<xsl:template match="funcsynopsis" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates select="(.//function)[1]" mode="xref"/>
-</xsl:template>
-
-<xsl:template match="dedication|preface|chapter|appendix" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates select="." mode="object.xref.markup">
-    <xsl:with-param name="purpose" select="'xref'"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="bibliography" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates select="." mode="object.xref.markup">
-    <xsl:with-param name="purpose" select="'xref'"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="biblioentry|bibliomixed" mode="xref-to-prefix">
-  <xsl:text>[</xsl:text>
-</xsl:template>
-
-<xsl:template match="biblioentry|bibliomixed" mode="xref-to-suffix">
-  <xsl:text>]</xsl:text>
-</xsl:template>
-
-<xsl:template match="biblioentry|bibliomixed" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <!-- handles both biblioentry and bibliomixed -->
-  <xsl:choose>
-    <xsl:when test="string(.) = ''">
-      <xsl:variable name="bib" select="document($bibliography.collection,.)"/>
-      <xsl:variable name="id" select="(@id|@xml:id)[1]"/>
-      <xsl:variable name="entry" select="$bib/bibliography/
-                                         *[@id=$id or @xml:id=$id][1]"/>
-      <xsl:choose>
-        <xsl:when test="$entry">
-          <xsl:choose>
-            <xsl:when test="$bibliography.numbered != 0">
-              <xsl:number from="bibliography" count="biblioentry|bibliomixed"
-                          level="any" format="1"/>
-            </xsl:when>
-            <xsl:when test="local-name($entry/*[1]) = 'abbrev'">
-              <xsl:apply-templates select="$entry/*[1]"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:value-of select="(@id|@xml:id)[1]"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:message>
-            <xsl:text>No bibliography entry: </xsl:text>
-            <xsl:value-of select="$id"/>
-            <xsl:text> found in </xsl:text>
-            <xsl:value-of select="$bibliography.collection"/>
-          </xsl:message>
-          <xsl:value-of select="(@id|@xml:id)[1]"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:choose>
-        <xsl:when test="$bibliography.numbered != 0">
-          <xsl:number from="bibliography" count="biblioentry|bibliomixed"
-                      level="any" format="1"/>
-        </xsl:when>
-        <xsl:when test="local-name(*[1]) = 'abbrev'">
-          <xsl:apply-templates select="*[1]"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="(@id|@xml:id)[1]"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="glossary" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates select="." mode="object.xref.markup">
-    <xsl:with-param name="purpose" select="'xref'"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="glossentry" mode="xref-to">
-  <xsl:choose>
-    <xsl:when test="$glossentry.show.acronym = 'primary'">
-      <xsl:choose>
-        <xsl:when test="acronym|abbrev">
-          <xsl:apply-templates select="(acronym|abbrev)[1]"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates select="glossterm[1]" mode="xref-to"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates select="glossterm[1]" mode="xref-to"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="glossterm" mode="xref-to">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="index" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates select="." mode="object.xref.markup">
-    <xsl:with-param name="purpose" select="'xref'"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="listitem" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates select="." mode="object.xref.markup">
-    <xsl:with-param name="purpose" select="'xref'"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="section|simplesect
-                     |sect1|sect2|sect3|sect4|sect5
-                     |refsect1|refsect2|refsect3|refsection" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates select="." mode="object.xref.markup">
-    <xsl:with-param name="purpose" select="'xref'"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-  <!-- What about "in Chapter X"? -->
-</xsl:template>
-
-<xsl:template match="bridgehead" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates select="." mode="object.xref.markup">
-    <xsl:with-param name="purpose" select="'xref'"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-  <!-- What about "in Chapter X"? -->
-</xsl:template>
-
-<xsl:template match="qandaset" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates select="." mode="object.xref.markup">
-    <xsl:with-param name="purpose" select="'xref'"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="qandadiv" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates select="." mode="object.xref.markup">
-    <xsl:with-param name="purpose" select="'xref'"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="qandaentry" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates select="question[1]" mode="object.xref.markup">
-    <xsl:with-param name="purpose" select="'xref'"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="question|answer" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates select="." mode="object.xref.markup">
-    <xsl:with-param name="purpose" select="'xref'"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="part|reference" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates select="." mode="object.xref.markup">
-    <xsl:with-param name="purpose" select="'xref'"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="refentry" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:choose>
-    <xsl:when test="refmeta/refentrytitle">
-      <xsl:apply-templates select="refmeta/refentrytitle"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates select="refnamediv/refname[1]"/>
-    </xsl:otherwise>
-  </xsl:choose>
-  <xsl:apply-templates select="refmeta/manvolnum"/>
-</xsl:template>
-
-<xsl:template match="refnamediv" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates select="refname[1]" mode="xref-to">
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="refname" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates mode="xref-to">
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="step" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:call-template name="gentext">
-    <xsl:with-param name="key" select="'Step'"/>
-  </xsl:call-template>
-  <xsl:text> </xsl:text>
-  <xsl:apply-templates select="." mode="number"/>
-</xsl:template>
-
-<xsl:template match="varlistentry" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates select="term[1]" mode="xref-to">
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="varlistentry/term" mode="xref-to">
-  <xsl:param name="verbose" select="1"/>
-  <!-- to avoid the comma that will be generated if there are several terms -->
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="co" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates select="." mode="callout-bug"/>
-</xsl:template>
-
-<xsl:template match="area|areaset" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-
-  <xsl:call-template name="callout-bug">
-    <xsl:with-param name="conum">
-      <xsl:apply-templates select="." mode="conumber"/>
-    </xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="book" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates select="." mode="object.xref.markup">
-    <xsl:with-param name="purpose" select="'xref'"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="para" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose"/>
-
-  <xsl:variable name="context" select="(ancestor::simplesect
-                                       |ancestor::section
-                                       |ancestor::sect1
-                                       |ancestor::sect2
-                                       |ancestor::sect3
-                                       |ancestor::sect4
-                                       |ancestor::sect5
-                                       |ancestor::refsection
-                                       |ancestor::refsect1
-                                       |ancestor::refsect2
-                                       |ancestor::refsect3
-                                       |ancestor::chapter
-                                       |ancestor::appendix
-                                       |ancestor::preface
-                                       |ancestor::partintro
-                                       |ancestor::dedication
-                                       |ancestor::colophon
-                                       |ancestor::bibliography
-                                       |ancestor::index
-                                       |ancestor::glossary
-                                       |ancestor::glossentry
-                                       |ancestor::listitem
-                                       |ancestor::varlistentry)[last()]"/>
-
-  <xsl:apply-templates select="$context" mode="xref-to">
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="link" name="link">
-  <xsl:param name="linkend" select="@linkend"/>
-  <xsl:param name="targets" select="key('id',$linkend)"/>
-  <xsl:param name="target" select="$targets[1]"/>
-
-  <xsl:variable name="xrefstyle">
-    <xsl:choose>
-      <xsl:when test="@role and not(@xrefstyle) 
-                      and $use.role.as.xrefstyle != 0">
-        <xsl:value-of select="@role"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="@xrefstyle"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="content">
-    <fo:inline xsl:use-attribute-sets="xref.properties">
-      <xsl:choose>
-        <xsl:when test="count(child::node()) &gt; 0">
-          <!-- If it has content, use it -->
-          <xsl:apply-templates/>
-        </xsl:when>
-        <!-- look for an endterm -->
-        <xsl:when test="@endterm">
-          <xsl:variable name="etargets" select="key('id',@endterm)"/>
-          <xsl:variable name="etarget" select="$etargets[1]"/>
-          <xsl:choose>
-            <xsl:when test="count($etarget) = 0">
-              <xsl:message>
-                <xsl:value-of select="count($etargets)"/>
-                <xsl:text>Endterm points to nonexistent ID: </xsl:text>
-                <xsl:value-of select="@endterm"/>
-              </xsl:message>
-              <xsl:text>???</xsl:text>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:apply-templates select="$etarget" mode="endterm"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:when>
-        <!-- Use the xlink:href if no other text -->
-        <xsl:when test="@xlink:href">
-          <xsl:value-of select="@xlink:href"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:message>
-            <xsl:text>Link element has no content and no Endterm. </xsl:text>
-            <xsl:text>Nothing to show in the link to </xsl:text>
-            <xsl:value-of select="$target"/>
-          </xsl:message>
-          <xsl:text>???</xsl:text>
-        </xsl:otherwise>
-      </xsl:choose>
-    </fo:inline>
-  </xsl:variable>
-
-  <xsl:call-template name="simple.xlink">
-    <xsl:with-param name="node" select="."/>
-    <xsl:with-param name="linkend" select="$linkend"/>
-    <xsl:with-param name="content" select="$content"/>
-  </xsl:call-template>
-
-  <!-- Add standard page reference? -->
-  <xsl:choose>
-    <!-- page numbering on link only enabled for @linkend -->
-    <!-- There is no link element in DB5 with xlink:href -->
-    <xsl:when test="not($linkend)">
-    </xsl:when>
-    <!-- negative xrefstyle in instance turns it off -->
-    <xsl:when test="starts-with(normalize-space($xrefstyle), 'select:') 
-                  and contains($xrefstyle, 'nopage')">
-    </xsl:when>
-    <xsl:when test="(starts-with(normalize-space($xrefstyle), 'select:') 
-                  and $insert.link.page.number = 'maybe'  
-                  and (contains($xrefstyle, 'page')
-                       or contains($xrefstyle, 'Page')))
-                  or ( $insert.link.page.number = 'yes' 
-                     or $insert.link.page.number = '1')
-                  or local-name($target) = 'para'">
-      <xsl:apply-templates select="$target" mode="page.citation">
-        <xsl:with-param name="id" select="$linkend"/>
-      </xsl:apply-templates>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="ulink" name="ulink">
-  <xsl:param name="url" select="@url"/>
-
-  <xsl:variable name ="ulink.url">
-    <xsl:call-template name="fo-external-image">
-      <xsl:with-param name="filename" select="$url"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <fo:basic-link xsl:use-attribute-sets="xref.properties"
-                 external-destination="{$ulink.url}">
-    <xsl:choose>
-      <xsl:when test="count(child::node())=0">
-        <xsl:call-template name="hyphenate-url">
-          <xsl:with-param name="url" select="$url"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:apply-templates/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </fo:basic-link>
-
-  <xsl:if test="count(child::node()) != 0
-                and string(.) != $url
-                and $ulink.show != 0">
-    <!-- yes, show the URI -->
-    <xsl:choose>
-      <xsl:when test="$ulink.footnotes != 0 and not(ancestor::footnote)">
-        <fo:footnote>
-          <xsl:call-template name="ulink.footnote.number"/>
-          <fo:footnote-body xsl:use-attribute-sets="footnote.properties">
-            <fo:block>
-              <xsl:call-template name="ulink.footnote.number"/>
-              <xsl:text> </xsl:text>
-              <fo:basic-link external-destination="{$ulink.url}">
-                <xsl:value-of select="$url"/>
-              </fo:basic-link>
-            </fo:block>
-          </fo:footnote-body>
-        </fo:footnote>
-      </xsl:when>
-      <xsl:otherwise>
-        <fo:inline hyphenate="false">
-          <xsl:text> [</xsl:text>
-          <fo:basic-link external-destination="{$ulink.url}">
-            <xsl:call-template name="hyphenate-url">
-              <xsl:with-param name="url" select="$url"/>
-            </xsl:call-template>
-          </fo:basic-link>
-          <xsl:text>]</xsl:text>
-        </fo:inline>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:if>
-
-</xsl:template>
-
-<xsl:template name="ulink.footnote.number">
-  <fo:inline xsl:use-attribute-sets="footnote.mark.properties">
-    <xsl:choose>
-      <xsl:when test="$fop.extensions != 0">
-        <xsl:attribute name="vertical-align">super</xsl:attribute>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:attribute name="baseline-shift">super</xsl:attribute>
-      </xsl:otherwise>
-    </xsl:choose>
-    <xsl:variable name="fnum">
-      <!-- FIXME: list in @from is probably not complete -->
-      <xsl:number level="any" 
-                  from="chapter|appendix|preface|article|refentry|bibliography[not(parent::article)]" 
-                  count="footnote[not(@label)][not(ancestor::tgroup)]|ulink[node()][@url != .][not(ancestor::footnote)]" 
-                  format="1"/>
-    </xsl:variable>
-    <xsl:choose>
-      <xsl:when test="string-length($footnote.number.symbols) &gt;= $fnum">
-        <xsl:value-of select="substring($footnote.number.symbols, $fnum, 1)"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:number value="$fnum" format="{$footnote.number.format}"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template name="hyphenate-url">
-  <xsl:param name="url" select="''"/>
-  <xsl:choose>
-    <xsl:when test="$ulink.hyphenate = ''">
-      <xsl:value-of select="$url"/>
-    </xsl:when>
-    <xsl:when test="string-length($url) &gt; 1">
-      <xsl:variable name="char" select="substring($url, 1, 1)"/>
-      <xsl:value-of select="$char"/>
-      <xsl:if test="contains($ulink.hyphenate.chars, $char)">
-        <!-- Do not hyphen in-between // -->
-        <xsl:if test="not($char = '/' and substring($url,2,1) = '/')">
-          <xsl:copy-of select="$ulink.hyphenate"/>
-        </xsl:if>
-      </xsl:if>
-      <!-- recurse to the next character -->
-      <xsl:call-template name="hyphenate-url">
-        <xsl:with-param name="url" select="substring($url, 2)"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$url"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="olink" name="olink">
-  <!-- olink content may be passed in from xlink olink -->
-  <xsl:param name="content" select="NOTANELEMENT"/>
-
-  <xsl:call-template name="anchor"/>
-
-  <xsl:variable name="localinfo" select="@localinfo"/>
-
-  <xsl:choose>
-    <!-- olinks resolved by stylesheet and target database -->
-    <xsl:when test="@targetdoc or @targetptr or
-                    (@xlink:role=$xolink.role and
-                     contains(@xlink:href, '#') )" >
-
-      <xsl:variable name="targetdoc.att">
-        <xsl:choose>
-          <xsl:when test="@targetdoc != ''">
-            <xsl:value-of select="@targetdoc"/>
-          </xsl:when>
-          <xsl:when test="@xlink:role=$xolink.role and
-                       contains(@xlink:href, '#')" >
-            <xsl:value-of select="substring-before(@xlink:href, '#')"/>
-          </xsl:when>
-        </xsl:choose>
-      </xsl:variable>
-
-      <xsl:variable name="targetptr.att">
-        <xsl:choose>
-          <xsl:when test="@targetptr != ''">
-            <xsl:value-of select="@targetptr"/>
-          </xsl:when>
-          <xsl:when test="@xlink:role=$xolink.role and
-                       contains(@xlink:href, '#')" >
-            <xsl:value-of select="substring-after(@xlink:href, '#')"/>
-          </xsl:when>
-        </xsl:choose>
-      </xsl:variable>
-
-      <xsl:variable name="olink.lang">
-        <xsl:call-template name="l10n.language">
-          <xsl:with-param name="xref-context" select="true()"/>
-        </xsl:call-template>
-      </xsl:variable>
-    
-      <xsl:variable name="target.database.filename">
-        <xsl:call-template name="select.target.database">
-          <xsl:with-param name="targetdoc.att" select="$targetdoc.att"/>
-          <xsl:with-param name="targetptr.att" select="$targetptr.att"/>
-          <xsl:with-param name="olink.lang" select="$olink.lang"/>
-        </xsl:call-template>
-      </xsl:variable>
-    
-      <xsl:variable name="target.database" 
-          select="document($target.database.filename, /)"/>
-    
-      <xsl:if test="$olink.debug != 0">
-        <xsl:message>
-          <xsl:text>Olink debug: root element of target.database is '</xsl:text>
-          <xsl:value-of select="local-name($target.database/*[1])"/>
-          <xsl:text>'.</xsl:text>
-        </xsl:message>
-      </xsl:if>
-    
-      <xsl:variable name="olink.key">
-        <xsl:call-template name="select.olink.key">
-          <xsl:with-param name="targetdoc.att" select="$targetdoc.att"/>
-          <xsl:with-param name="targetptr.att" select="$targetptr.att"/>
-          <xsl:with-param name="olink.lang" select="$olink.lang"/>
-          <xsl:with-param name="target.database" select="$target.database"/>
-        </xsl:call-template>
-      </xsl:variable>
-    
-      <xsl:if test="string-length($olink.key) = 0">
-        <xsl:message>
-          <xsl:text>Error: unresolved olink: </xsl:text>
-          <xsl:text>targetdoc/targetptr = '</xsl:text>
-          <xsl:value-of select="$targetdoc.att"/>
-          <xsl:text>/</xsl:text>
-          <xsl:value-of select="$targetptr.att"/>
-          <xsl:text>'.</xsl:text>
-        </xsl:message>
-      </xsl:if>
-
-      <xsl:variable name="href">
-        <xsl:call-template name="make.olink.href">
-          <xsl:with-param name="olink.key" select="$olink.key"/>
-          <xsl:with-param name="target.database" select="$target.database"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <!-- Olink that points to internal id can be a link -->
-      <xsl:variable name="linkend">
-        <xsl:call-template name="olink.as.linkend">
-          <xsl:with-param name="olink.key" select="$olink.key"/>
-          <xsl:with-param name="olink.lang" select="$olink.lang"/>
-          <xsl:with-param name="target.database" select="$target.database"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <xsl:variable name="hottext">
-        <xsl:choose>
-          <xsl:when test="$content">
-            <xsl:copy-of select="$content"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:call-template name="olink.hottext">
-              <xsl:with-param name="olink.key" select="$olink.key"/>
-              <xsl:with-param name="olink.lang" select="$olink.lang"/>
-              <xsl:with-param name="target.database" select="$target.database"/>
-            </xsl:call-template>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-
-      <xsl:variable name="olink.docname.citation">
-        <xsl:call-template name="olink.document.citation">
-          <xsl:with-param name="olink.key" select="$olink.key"/>
-          <xsl:with-param name="target.database" select="$target.database"/>
-          <xsl:with-param name="olink.lang" select="$olink.lang"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <xsl:variable name="olink.page.citation">
-        <xsl:call-template name="olink.page.citation">
-          <xsl:with-param name="olink.key" select="$olink.key"/>
-          <xsl:with-param name="target.database" select="$target.database"/>
-          <xsl:with-param name="olink.lang" select="$olink.lang"/>
-          <xsl:with-param name="linkend" select="$linkend"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <xsl:choose>
-        <xsl:when test="$linkend != ''">
-          <fo:basic-link internal-destination="{$linkend}"
-                       xsl:use-attribute-sets="xref.properties">
-            <xsl:copy-of select="$hottext"/>
-            <xsl:copy-of select="$olink.page.citation"/>
-          </fo:basic-link>
-        </xsl:when>
-        <xsl:when test="$href != ''">
-          <xsl:choose>
-            <xsl:when test="$xep.extensions != 0">
-              <fo:basic-link external-destination="url({$href})"
-                             xsl:use-attribute-sets="olink.properties">
-                <xsl:copy-of select="$hottext"/>
-              </fo:basic-link>
-              <xsl:copy-of select="$olink.page.citation"/>
-              <xsl:copy-of select="$olink.docname.citation"/>
-            </xsl:when>
-            <xsl:when test="$axf.extensions != 0">
-              <fo:basic-link external-destination="{$href}"
-                             xsl:use-attribute-sets="olink.properties">
-                <xsl:copy-of select="$hottext"/>
-              </fo:basic-link>
-              <xsl:copy-of select="$olink.page.citation"/>
-              <xsl:copy-of select="$olink.docname.citation"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <fo:basic-link external-destination="{$href}"
-                             xsl:use-attribute-sets="olink.properties">
-                <xsl:copy-of select="$hottext"/>
-              </fo:basic-link>
-              <xsl:copy-of select="$olink.page.citation"/>
-              <xsl:copy-of select="$olink.docname.citation"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:copy-of select="$hottext"/>
-          <xsl:copy-of select="$olink.page.citation"/>
-          <xsl:copy-of select="$olink.docname.citation"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-
-    <!-- olink never implemented in FO for old olink entity syntax -->
-    <xsl:otherwise>
-      <xsl:apply-templates/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="*" mode="insert.olink.docname.markup">
-  <xsl:param name="docname" select="''"/>
-  
-  <fo:inline font-style="italic">
-    <xsl:value-of select="$docname"/>
-  </fo:inline>
-
-</xsl:template>
-
-<!-- This prevents error message when processing olinks with xrefstyle -->
-<xsl:template match="olink" mode="object.xref.template"/>
-
-
-<xsl:template name="olink.as.linkend">
-  <xsl:param name="olink.key" select="''"/>
-  <xsl:param name="olink.lang" select="''"/>
-  <xsl:param name="target.database" select="NotANode"/>
-
-  <xsl:variable name="targetdoc">
-    <xsl:value-of select="substring-before($olink.key, '/')"/>
-  </xsl:variable>
-
-  <xsl:variable name="targetptr">
-    <xsl:value-of 
-       select="substring-before(substring-after($olink.key, '/'), '/')"/>
-  </xsl:variable>
-
-  <xsl:variable name="target.lang">
-    <xsl:variable name="candidate">
-      <xsl:for-each select="$target.database" >
-        <xsl:value-of 
-                  select="key('targetptr-key', $olink.key)/@lang" />
-      </xsl:for-each>
-    </xsl:variable>
-    <xsl:choose>
-      <xsl:when test="$candidate != ''">
-        <xsl:value-of select="$candidate"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$olink.lang"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:if test="$current.docid = $targetdoc and 
-                $olink.lang = $target.lang">
-    <xsl:variable name="targets" select="key('id',$targetptr)"/>
-    <xsl:variable name="target" select="$targets[1]"/>
-    <xsl:if test="$target">
-      <xsl:value-of select="$targetptr"/>
-    </xsl:if>
-  </xsl:if>
-
-</xsl:template>
-
-
-<xsl:template name="olink.outline">
-  <xsl:param name="outline.base.uri"/>
-  <xsl:param name="localinfo"/>
-  <xsl:param name="return" select="href"/>
-
-  <xsl:message terminate="yes">Fatal error: olink.outline template: what is this supposed to do?</xsl:message>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="title.xref">
-  <xsl:param name="target" select="."/>
-  <xsl:choose>
-    <xsl:when test="local-name($target) = 'figure'
-                    or local-name($target) = 'example'
-                    or local-name($target) = 'equation'
-                    or local-name($target) = 'table'
-                    or local-name($target) = 'dedication'
-                    or local-name($target) = 'preface'
-                    or local-name($target) = 'bibliography'
-                    or local-name($target) = 'glossary'
-                    or local-name($target) = 'index'
-                    or local-name($target) = 'setindex'
-                    or local-name($target) = 'colophon'">
-      <xsl:call-template name="gentext.startquote"/>
-      <xsl:apply-templates select="$target" mode="title.markup"/>
-      <xsl:call-template name="gentext.endquote"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <fo:inline font-style="italic">
-        <xsl:apply-templates select="$target" mode="title.markup"/>
-      </fo:inline>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="number.xref">
-  <xsl:param name="target" select="."/>
-  <xsl:apply-templates select="$target" mode="label.markup"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="xref.xreflabel">
-  <!-- called to process an xreflabel...you might use this to make  -->
-  <!-- xreflabels come out in the right font for different targets, -->
-  <!-- for example. -->
-  <xsl:param name="target" select="."/>
-  <xsl:value-of select="$target/@xreflabel"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="title" mode="xref">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="command" mode="xref">
-  <xsl:call-template name="inline.boldseq"/>
-</xsl:template>
-
-<xsl:template match="function" mode="xref">
-  <xsl:call-template name="inline.monoseq"/>
-</xsl:template>
-
-<xsl:template match="*" mode="page.citation">
-  <xsl:param name="id" select="'???'"/>
-
-  <fo:basic-link internal-destination="{$id}"
-                 xsl:use-attribute-sets="xref.properties">
-    <fo:inline keep-together.within-line="always">
-      <xsl:call-template name="substitute-markup">
-        <xsl:with-param name="template">
-          <xsl:call-template name="gentext.template">
-            <xsl:with-param name="name" select="'page.citation'"/>
-            <xsl:with-param name="context" select="'xref'"/>
-          </xsl:call-template>
-        </xsl:with-param>
-      </xsl:call-template>
-    </fo:inline>
-  </fo:basic-link>
-</xsl:template>
-
-<xsl:template match="*" mode="pagenumber.markup">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-  <fo:page-number-citation ref-id="{$id}"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="*" mode="insert.title.markup">
-  <xsl:param name="purpose"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="title"/>
-
-  <xsl:choose>
-    <!-- FIXME: what about the case where titleabbrev is inside the info? -->
-    <xsl:when test="$purpose = 'xref' and titleabbrev">
-      <xsl:apply-templates select="." mode="titleabbrev.markup"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:copy-of select="$title"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="chapter|appendix" mode="insert.title.markup">
-  <xsl:param name="purpose"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="title"/>
-
-  <xsl:choose>
-    <xsl:when test="$purpose = 'xref'">
-      <fo:inline font-style="italic">
-        <xsl:copy-of select="$title"/>
-      </fo:inline>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:copy-of select="$title"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="*" mode="insert.subtitle.markup">
-  <xsl:param name="purpose"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="subtitle"/>
-
-  <xsl:copy-of select="$subtitle"/>
-</xsl:template>
-
-<xsl:template match="*" mode="insert.label.markup">
-  <xsl:param name="purpose"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="label"/>
-
-  <xsl:copy-of select="$label"/>
-</xsl:template>
-
-<xsl:template match="*" mode="insert.pagenumber.markup">
-  <xsl:param name="purpose"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="pagenumber"/>
-
-  <xsl:copy-of select="$pagenumber"/>
-</xsl:template>
-
-<xsl:template match="*" mode="insert.direction.markup">
-  <xsl:param name="purpose"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="direction"/>
-
-  <xsl:copy-of select="$direction"/>
-</xsl:template>
-
-<xsl:template match="olink" mode="pagenumber.markup">
-  <!-- Local olinks can use page-citation -->
-  <xsl:variable name="targetdoc.att" select="@targetdoc"/>
-  <xsl:variable name="targetptr.att" select="@targetptr"/>
-
-  <xsl:variable name="olink.lang">
-    <xsl:call-template name="l10n.language">
-      <xsl:with-param name="xref-context" select="true()"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="target.database.filename">
-    <xsl:call-template name="select.target.database">
-      <xsl:with-param name="targetdoc.att" select="$targetdoc.att"/>
-      <xsl:with-param name="targetptr.att" select="$targetptr.att"/>
-      <xsl:with-param name="olink.lang" select="$olink.lang"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="target.database" 
-      select="document($target.database.filename, /)"/>
-
-  <xsl:if test="$olink.debug != 0">
-    <xsl:message>
-      <xsl:text>Olink debug: root element of target.database is '</xsl:text>
-      <xsl:value-of select="local-name($target.database/*[1])"/>
-      <xsl:text>'.</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <xsl:variable name="olink.key">
-    <xsl:call-template name="select.olink.key">
-      <xsl:with-param name="targetdoc.att" select="$targetdoc.att"/>
-      <xsl:with-param name="targetptr.att" select="$targetptr.att"/>
-      <xsl:with-param name="olink.lang" select="$olink.lang"/>
-      <xsl:with-param name="target.database" select="$target.database"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <!-- Olink that points to internal id can be a link -->
-  <xsl:variable name="linkend">
-    <xsl:call-template name="olink.as.linkend">
-      <xsl:with-param name="olink.key" select="$olink.key"/>
-      <xsl:with-param name="olink.lang" select="$olink.lang"/>
-      <xsl:with-param name="target.database" select="$target.database"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$linkend != ''">
-      <fo:page-number-citation ref-id="{$linkend}"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:message>
-        <xsl:text>Olink error: no page number linkend for local olink '</xsl:text>
-        <xsl:value-of select="$olink.key"/>
-        <xsl:text>'</xsl:text>
-      </xsl:message>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/highlighting/common.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/highlighting/common.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,16 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version='1.0'>
-
-<!-- ********************************************************************
-
-     Fake file to keep happy ../{fo,xhtml}/verbatim.xsl
-
-     ******************************************************************** -->
-
-  <xsl:template name="apply-highlighting">
-    <xsl:apply-templates/>
-  </xsl:template>
-
-</xsl:stylesheet>
-
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/html/chunker.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/html/chunker.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,439 +1,0 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:saxon="http://icl.com/saxon"
-                xmlns:lxslt="http://xml.apache.org/xslt"
-                xmlns:redirect="http://xml.apache.org/xalan/redirect"
-                xmlns:exsl="http://exslt.org/common"
-                xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"
-		version="1.0"
-                exclude-result-prefixes="doc"
-                extension-element-prefixes="saxon redirect lxslt exsl">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<!-- This stylesheet works with XSLT implementations that support -->
-<!-- exsl:document, saxon:output, or Xalan's redirect:write -->
-<!-- Note: Only Saxon 6.4.2 or later is supported. -->
-
-<xsl:param name="chunker.output.method" select="'html'"/>
-<xsl:param name="chunker.output.encoding" select="'ISO-8859-1'"/>
-<xsl:param name="chunker.output.indent" select="'no'"/>
-<xsl:param name="chunker.output.omit-xml-declaration" select="'no'"/>
-<xsl:param name="chunker.output.standalone" select="'no'"/>
-<xsl:param name="chunker.output.doctype-public" select="''"/>
-<xsl:param name="chunker.output.doctype-system" select="''"/>
-<xsl:param name="chunker.output.media-type" select="''"/>
-<xsl:param name="chunker.output.cdata-section-elements" select="''"/>
-<xsl:param name="chunker.output.quiet" select="0"/>
-
-<xsl:param name="saxon.character.representation" select="'entity;decimal'"/>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="make-relative-filename">
-  <xsl:param name="base.dir" select="'./'"/>
-  <xsl:param name="base.name" select="''"/>
-
-  <xsl:choose>
-    <!-- put Saxon first to work around a bug in libxslt -->
-    <xsl:when test="element-available('saxon:output')">
-      <!-- Saxon doesn't make the chunks relative -->
-      <xsl:value-of select="concat($base.dir,$base.name)"/>
-    </xsl:when>
-    <xsl:when test="element-available('exsl:document')">
-      <!-- EXSL document does make the chunks relative, I think -->
-      <xsl:choose>
-        <xsl:when test="count(parent::*) = 0">
-          <xsl:value-of select="concat($base.dir,$base.name)"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="$base.name"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:when test="element-available('redirect:write')">
-      <!-- Xalan doesn't make the chunks relative -->
-      <xsl:value-of select="concat($base.dir,$base.name)"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:message terminate="yes">
-        <xsl:text>Don't know how to chunk with </xsl:text>
-        <xsl:value-of select="system-property('xsl:vendor')"/>
-      </xsl:message>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="write.chunk">
-  <xsl:param name="filename" select="''"/>
-  <xsl:param name="quiet" select="$chunker.output.quiet"/>
-  <xsl:param name="suppress-context-node-name" select="0"/>
-  <xsl:param name="message-prolog"/>
-  <xsl:param name="message-epilog"/>
-
-  <xsl:param name="method" select="$chunker.output.method"/>
-  <xsl:param name="encoding" select="$chunker.output.encoding"/>
-  <xsl:param name="indent" select="$chunker.output.indent"/>
-  <xsl:param name="omit-xml-declaration"
-             select="$chunker.output.omit-xml-declaration"/>
-  <xsl:param name="standalone" select="$chunker.output.standalone"/>
-  <xsl:param name="doctype-public" select="$chunker.output.doctype-public"/>
-  <xsl:param name="doctype-system" select="$chunker.output.doctype-system"/>
-  <xsl:param name="media-type" select="$chunker.output.media-type"/>
-  <xsl:param name="cdata-section-elements"
-             select="$chunker.output.cdata-section-elements"/>
-
-  <xsl:param name="content"/>
-
-  <xsl:if test="$quiet = 0">
-    <xsl:message>
-      <xsl:if test="not($message-prolog = '')">
-        <xsl:value-of select="$message-prolog"/>
-      </xsl:if>
-      <xsl:text>Writing </xsl:text>
-      <xsl:value-of select="$filename"/>
-      <xsl:if test="name(.) != '' and $suppress-context-node-name = 0">
-        <xsl:text> for </xsl:text>
-        <xsl:value-of select="name(.)"/>
-        <xsl:if test="@id or @xml:id">
-          <xsl:text>(</xsl:text>
-          <xsl:value-of select="(@id|@xml:id)[1]"/>
-          <xsl:text>)</xsl:text>
-        </xsl:if>
-      </xsl:if>
-      <xsl:if test="not($message-epilog = '')">
-        <xsl:value-of select="$message-epilog"/>
-      </xsl:if>
-    </xsl:message>
-  </xsl:if>
-
-  <xsl:choose>
-    <xsl:when test="element-available('exsl:document')">
-      <xsl:choose>
-        <!-- Handle the permutations ... -->
-        <xsl:when test="$media-type != ''">
-          <xsl:choose>
-            <xsl:when test="$doctype-public != '' and $doctype-system != ''">
-              <exsl:document href="{$filename}"
-                             method="{$method}"
-                             encoding="{$encoding}"
-                             indent="{$indent}"
-                             omit-xml-declaration="{$omit-xml-declaration}"
-                             cdata-section-elements="{$cdata-section-elements}"
-                             media-type="{$media-type}"
-                             doctype-public="{$doctype-public}"
-                             doctype-system="{$doctype-system}"
-                             standalone="{$standalone}">
-                <xsl:copy-of select="$content"/>
-              </exsl:document>
-            </xsl:when>
-            <xsl:when test="$doctype-public != '' and $doctype-system = ''">
-              <exsl:document href="{$filename}"
-                             method="{$method}"
-                             encoding="{$encoding}"
-                             indent="{$indent}"
-                             omit-xml-declaration="{$omit-xml-declaration}"
-                             cdata-section-elements="{$cdata-section-elements}"
-                             media-type="{$media-type}"
-                             doctype-public="{$doctype-public}"
-                             standalone="{$standalone}">
-                <xsl:copy-of select="$content"/>
-              </exsl:document>
-            </xsl:when>
-            <xsl:when test="$doctype-public = '' and $doctype-system != ''">
-              <exsl:document href="{$filename}"
-                             method="{$method}"
-                             encoding="{$encoding}"
-                             indent="{$indent}"
-                             omit-xml-declaration="{$omit-xml-declaration}"
-                             cdata-section-elements="{$cdata-section-elements}"
-                             media-type="{$media-type}"
-                             doctype-system="{$doctype-system}"
-                             standalone="{$standalone}">
-                <xsl:copy-of select="$content"/>
-              </exsl:document>
-            </xsl:when>
-            <xsl:otherwise><!-- $doctype-public = '' and $doctype-system = ''"> -->
-              <exsl:document href="{$filename}"
-                             method="{$method}"
-                             encoding="{$encoding}"
-                             indent="{$indent}"
-                             omit-xml-declaration="{$omit-xml-declaration}"
-                             cdata-section-elements="{$cdata-section-elements}"
-                             media-type="{$media-type}"
-                             standalone="{$standalone}">
-                <xsl:copy-of select="$content"/>
-              </exsl:document>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:choose>
-            <xsl:when test="$doctype-public != '' and $doctype-system != ''">
-              <exsl:document href="{$filename}"
-                             method="{$method}"
-                             encoding="{$encoding}"
-                             indent="{$indent}"
-                             omit-xml-declaration="{$omit-xml-declaration}"
-                             cdata-section-elements="{$cdata-section-elements}"
-                             doctype-public="{$doctype-public}"
-                             doctype-system="{$doctype-system}"
-                             standalone="{$standalone}">
-                <xsl:copy-of select="$content"/>
-              </exsl:document>
-            </xsl:when>
-            <xsl:when test="$doctype-public != '' and $doctype-system = ''">
-              <exsl:document href="{$filename}"
-                             method="{$method}"
-                             encoding="{$encoding}"
-                             indent="{$indent}"
-                             omit-xml-declaration="{$omit-xml-declaration}"
-                             cdata-section-elements="{$cdata-section-elements}"
-                             doctype-public="{$doctype-public}"
-                             standalone="{$standalone}">
-                <xsl:copy-of select="$content"/>
-              </exsl:document>
-            </xsl:when>
-            <xsl:when test="$doctype-public = '' and $doctype-system != ''">
-              <exsl:document href="{$filename}"
-                             method="{$method}"
-                             encoding="{$encoding}"
-                             indent="{$indent}"
-                             omit-xml-declaration="{$omit-xml-declaration}"
-                             cdata-section-elements="{$cdata-section-elements}"
-                             doctype-system="{$doctype-system}"
-                             standalone="{$standalone}">
-                <xsl:copy-of select="$content"/>
-              </exsl:document>
-            </xsl:when>
-            <xsl:otherwise><!-- $doctype-public = '' and $doctype-system = ''"> -->
-              <exsl:document href="{$filename}"
-                             method="{$method}"
-                             encoding="{$encoding}"
-                             indent="{$indent}"
-                             omit-xml-declaration="{$omit-xml-declaration}"
-                             cdata-section-elements="{$cdata-section-elements}"
-                             standalone="{$standalone}">
-                <xsl:copy-of select="$content"/>
-              </exsl:document>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-
-    <xsl:when test="element-available('saxon:output')">
-      <xsl:choose>
-        <!-- Handle the permutations ... -->
-        <xsl:when test="$media-type != ''">
-          <xsl:choose>
-            <xsl:when test="$doctype-public != '' and $doctype-system != ''">
-              <saxon:output saxon:character-representation="{$saxon.character.representation}"
-                            href="{$filename}"
-                            method="{$method}"
-                            encoding="{$encoding}"
-                            indent="{$indent}"
-                            omit-xml-declaration="{$omit-xml-declaration}"
-                            cdata-section-elements="{$cdata-section-elements}"
-                            media-type="{$media-type}"
-                            doctype-public="{$doctype-public}"
-                            doctype-system="{$doctype-system}"
-                            standalone="{$standalone}">
-                <xsl:copy-of select="$content"/>
-              </saxon:output>
-            </xsl:when>
-            <xsl:when test="$doctype-public != '' and $doctype-system = ''">
-              <saxon:output saxon:character-representation="{$saxon.character.representation}"
-                            href="{$filename}"
-                            method="{$method}"
-                            encoding="{$encoding}"
-                            indent="{$indent}"
-                            omit-xml-declaration="{$omit-xml-declaration}"
-                            cdata-section-elements="{$cdata-section-elements}"
-                            media-type="{$media-type}"
-                            doctype-public="{$doctype-public}"
-                            standalone="{$standalone}">
-                <xsl:copy-of select="$content"/>
-              </saxon:output>
-            </xsl:when>
-            <xsl:when test="$doctype-public = '' and $doctype-system != ''">
-              <saxon:output saxon:character-representation="{$saxon.character.representation}"
-                            href="{$filename}"
-                            method="{$method}"
-                            encoding="{$encoding}"
-                            indent="{$indent}"
-                            omit-xml-declaration="{$omit-xml-declaration}"
-                            cdata-section-elements="{$cdata-section-elements}"
-                            media-type="{$media-type}"
-                            doctype-system="{$doctype-system}"
-                            standalone="{$standalone}">
-                <xsl:copy-of select="$content"/>
-              </saxon:output>
-            </xsl:when>
-            <xsl:otherwise><!-- $doctype-public = '' and $doctype-system = ''"> -->
-              <saxon:output saxon:character-representation="{$saxon.character.representation}"
-                            href="{$filename}"
-                            method="{$method}"
-                            encoding="{$encoding}"
-                            indent="{$indent}"
-                            omit-xml-declaration="{$omit-xml-declaration}"
-                            cdata-section-elements="{$cdata-section-elements}"
-                            media-type="{$media-type}"
-                            standalone="{$standalone}">
-                <xsl:copy-of select="$content"/>
-              </saxon:output>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:choose>
-            <xsl:when test="$doctype-public != '' and $doctype-system != ''">
-              <saxon:output saxon:character-representation="{$saxon.character.representation}"
-                            href="{$filename}"
-                            method="{$method}"
-                            encoding="{$encoding}"
-                            indent="{$indent}"
-                            omit-xml-declaration="{$omit-xml-declaration}"
-                            cdata-section-elements="{$cdata-section-elements}"
-                            doctype-public="{$doctype-public}"
-                            doctype-system="{$doctype-system}"
-                            standalone="{$standalone}">
-                <xsl:copy-of select="$content"/>
-              </saxon:output>
-            </xsl:when>
-            <xsl:when test="$doctype-public != '' and $doctype-system = ''">
-              <saxon:output saxon:character-representation="{$saxon.character.representation}"
-                            href="{$filename}"
-                            method="{$method}"
-                            encoding="{$encoding}"
-                            indent="{$indent}"
-                            omit-xml-declaration="{$omit-xml-declaration}"
-                            cdata-section-elements="{$cdata-section-elements}"
-                            doctype-public="{$doctype-public}"
-                            standalone="{$standalone}">
-                <xsl:copy-of select="$content"/>
-              </saxon:output>
-            </xsl:when>
-            <xsl:when test="$doctype-public = '' and $doctype-system != ''">
-              <saxon:output saxon:character-representation="{$saxon.character.representation}"
-                            href="{$filename}"
-                            method="{$method}"
-                            encoding="{$encoding}"
-                            indent="{$indent}"
-                            omit-xml-declaration="{$omit-xml-declaration}"
-                            cdata-section-elements="{$cdata-section-elements}"
-                            doctype-system="{$doctype-system}"
-                            standalone="{$standalone}">
-                <xsl:copy-of select="$content"/>
-              </saxon:output>
-            </xsl:when>
-            <xsl:otherwise><!-- $doctype-public = '' and $doctype-system = ''"> -->
-              <saxon:output saxon:character-representation="{$saxon.character.representation}"
-                            href="{$filename}"
-                            method="{$method}"
-                            encoding="{$encoding}"
-                            indent="{$indent}"
-                            omit-xml-declaration="{$omit-xml-declaration}"
-                            cdata-section-elements="{$cdata-section-elements}"
-                            standalone="{$standalone}">
-                <xsl:copy-of select="$content"/>
-              </saxon:output>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-
-    <xsl:when test="element-available('redirect:write')">
-      <!-- Xalan uses redirect -->
-      <redirect:write file="{$filename}">
-        <xsl:copy-of select="$content"/>
-      </redirect:write>
-    </xsl:when>
-
-    <xsl:otherwise>
-      <!-- it doesn't matter since we won't be making chunks... -->
-      <xsl:message terminate="yes">
-        <xsl:text>Can't make chunks with </xsl:text>
-        <xsl:value-of select="system-property('xsl:vendor')"/>
-        <xsl:text>'s processor.</xsl:text>
-      </xsl:message>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="write.chunk.with.doctype">
-  <xsl:param name="filename" select="''"/>
-  <xsl:param name="quiet" select="$chunker.output.quiet"/>
-
-  <xsl:param name="method" select="$chunker.output.method"/>
-  <xsl:param name="encoding" select="$chunker.output.encoding"/>
-  <xsl:param name="indent" select="$chunker.output.indent"/>
-  <xsl:param name="omit-xml-declaration"
-             select="$chunker.output.omit-xml-declaration"/>
-  <xsl:param name="standalone" select="$chunker.output.standalone"/>
-  <xsl:param name="doctype-public" select="$chunker.output.doctype-public"/>
-  <xsl:param name="doctype-system" select="$chunker.output.doctype-system"/>
-  <xsl:param name="media-type" select="$chunker.output.media-type"/>
-  <xsl:param name="cdata-section-elements"
-             select="$chunker.output.cdata-section-elements"/>
-
-  <xsl:param name="content"/>
-
-  <xsl:call-template name="write.chunk">
-    <xsl:with-param name="filename" select="$filename"/>
-    <xsl:with-param name="quiet" select="$quiet"/>
-    <xsl:with-param name="method" select="$method"/>
-    <xsl:with-param name="encoding" select="$encoding"/>
-    <xsl:with-param name="indent" select="$indent"/>
-    <xsl:with-param name="omit-xml-declaration" select="$omit-xml-declaration"/>
-    <xsl:with-param name="standalone" select="$standalone"/>
-    <xsl:with-param name="doctype-public" select="$doctype-public"/>
-    <xsl:with-param name="doctype-system" select="$doctype-system"/>
-    <xsl:with-param name="media-type" select="$media-type"/>
-    <xsl:with-param name="cdata-section-elements" select="$cdata-section-elements"/>
-    <xsl:with-param name="content" select="$content"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="write.text.chunk">
-  <xsl:param name="filename" select="''"/>
-  <xsl:param name="quiet" select="$chunker.output.quiet"/>
-  <xsl:param name="suppress-context-node-name" select="0"/>
-  <xsl:param name="message-prolog"/>
-  <xsl:param name="message-epilog"/>
-  <xsl:param name="method" select="'text'"/>
-  <xsl:param name="encoding" select="$chunker.output.encoding"/>
-  <xsl:param name="media-type" select="$chunker.output.media-type"/>
-  <xsl:param name="content"/>
-
-  <xsl:call-template name="write.chunk">
-    <xsl:with-param name="filename" select="$filename"/>
-    <xsl:with-param name="quiet" select="$quiet"/>
-    <xsl:with-param name="suppress-context-node-name" select="$suppress-context-node-name"/>
-    <xsl:with-param name="message-prolog" select="$message-prolog"/>
-    <xsl:with-param name="message-epilog" select="$message-epilog"/>
-    <xsl:with-param name="method" select="$method"/>
-    <xsl:with-param name="encoding" select="$encoding"/>
-    <xsl:with-param name="indent" select="'no'"/>
-    <xsl:with-param name="omit-xml-declaration" select="'no'"/>
-    <xsl:with-param name="standalone" select="'no'"/>
-    <xsl:with-param name="doctype-public"/>
-    <xsl:with-param name="doctype-system"/>
-    <xsl:with-param name="media-type" select="$media-type"/>
-    <xsl:with-param name="cdata-section-elements"/>
-    <xsl:with-param name="content" select="$content"/>
-  </xsl:call-template>
-</xsl:template>
-
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/lib/lib.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/lib/lib.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,480 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     This module implements DTD-independent functions
-
-     ******************************************************************** -->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
-<xsl:template name="dot.count">
-  <!-- Returns the number of "." characters in a string -->
-  <xsl:param name="string"/>
-  <xsl:param name="count" select="0"/>
-  <xsl:choose>
-    <xsl:when test="contains($string, '.')">
-      <xsl:call-template name="dot.count">
-        <xsl:with-param name="string" select="substring-after($string, '.')"/>
-        <xsl:with-param name="count" select="$count+1"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$count"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-<xsl:template name="copy-string">
-  <!-- returns 'count' copies of 'string' -->
-  <xsl:param name="string"/>
-  <xsl:param name="count" select="0"/>
-  <xsl:param name="result"/>
-
-  <xsl:choose>
-    <xsl:when test="$count&gt;0">
-      <xsl:call-template name="copy-string">
-        <xsl:with-param name="string" select="$string"/>
-        <xsl:with-param name="count" select="$count - 1"/>
-        <xsl:with-param name="result">
-          <xsl:value-of select="$result"/>
-          <xsl:value-of select="$string"/>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$result"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-<xsl:template name="string.subst">
-  <xsl:param name="string"/>
-  <xsl:param name="target"/>
-  <xsl:param name="replacement"/>
-
-  <xsl:choose>
-    <xsl:when test="contains($string, $target)">
-      <xsl:variable name="rest">
-        <xsl:call-template name="string.subst">
-          <xsl:with-param name="string" select="substring-after($string, $target)"/>
-          <xsl:with-param name="target" select="$target"/>
-          <xsl:with-param name="replacement" select="$replacement"/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:value-of select="concat(substring-before($string, $target),                                    $replacement,                                    $rest)"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$string"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-<xsl:template name="xpointer.idref">
-  <xsl:param name="xpointer">http://...</xsl:param>
-  <xsl:choose>
-    <xsl:when test="starts-with($xpointer, '#xpointer(id(')">
-      <xsl:variable name="rest" select="substring-after($xpointer, '#xpointer(id(')"/>
-      <xsl:variable name="quote" select="substring($rest, 1, 1)"/>
-      <xsl:value-of select="substring-before(substring-after($xpointer, $quote), $quote)"/>
-    </xsl:when>
-    <xsl:when test="starts-with($xpointer, '#')">
-      <xsl:value-of select="substring-after($xpointer, '#')"/>
-    </xsl:when>
-    <!-- otherwise it's a pointer to some other document -->
-  </xsl:choose>
-</xsl:template>
-<xsl:template name="length-magnitude">
-  <xsl:param name="length" select="'0pt'"/>
-
-  <xsl:choose>
-    <xsl:when test="string-length($length) = 0"/>
-    <xsl:when test="substring($length,1,1) = '0'                     or substring($length,1,1) = '1'                     or substring($length,1,1) = '2'                     or substring($length,1,1) = '3'                     or substring($length,1,1) = '4'                     or substring($length,1,1) = '5'                     or substring($length,1,1) = '6'                     or substring($length,1,1) = '7'                     or substring($length,1,1) = '8'                     or substring($length,1,1) = '9'                     or substring($length,1,1) = '.'">
-      <xsl:value-of select="substring($length,1,1)"/>
-      <xsl:call-template name="length-magnitude">
-        <xsl:with-param name="length" select="substring($length,2)"/>
-      </xsl:call-template>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-<xsl:template name="length-units">
-  <xsl:param name="length" select="'0pt'"/>
-  <xsl:param name="default.units" select="'px'"/>
-  <xsl:variable name="magnitude">
-    <xsl:call-template name="length-magnitude">
-      <xsl:with-param name="length" select="$length"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="units">
-    <xsl:value-of select="substring($length, string-length($magnitude)+1)"/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$units = ''">
-      <xsl:value-of select="$default.units"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$units"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-<xsl:template name="length-spec">
-  <xsl:param name="length" select="'0pt'"/>
-  <xsl:param name="default.units" select="'px'"/>
-
-  <xsl:variable name="magnitude">
-    <xsl:call-template name="length-magnitude">
-      <xsl:with-param name="length" select="$length"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="units">
-    <xsl:value-of select="substring($length, string-length($magnitude)+1)"/>
-  </xsl:variable>
-
-  <xsl:value-of select="$magnitude"/>
-  <xsl:choose>
-    <xsl:when test="$units='cm'                     or $units='mm'                     or $units='in'                     or $units='pt'                     or $units='pc'                     or $units='px'                     or $units='em'">
-      <xsl:value-of select="$units"/>
-    </xsl:when>
-    <xsl:when test="$units = ''">
-      <xsl:value-of select="$default.units"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:message>
-        <xsl:text>Unrecognized unit of measure: </xsl:text>
-        <xsl:value-of select="$units"/>
-        <xsl:text>.</xsl:text>
-      </xsl:message>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-<xsl:template name="length-in-points">
-  <xsl:param name="length" select="'0pt'"/>
-  <xsl:param name="em.size" select="10"/>
-  <xsl:param name="pixels.per.inch" select="90"/>
-
-  <xsl:variable name="magnitude">
-    <xsl:call-template name="length-magnitude">
-      <xsl:with-param name="length" select="$length"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="units">
-    <xsl:value-of select="substring($length, string-length($magnitude)+1)"/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$units = 'pt'">
-      <xsl:value-of select="$magnitude"/>
-    </xsl:when>
-    <xsl:when test="$units = 'cm'">
-      <xsl:value-of select="$magnitude div 2.54 * 72.0"/>
-    </xsl:when>
-    <xsl:when test="$units = 'mm'">
-      <xsl:value-of select="$magnitude div 25.4 * 72.0"/>
-    </xsl:when>
-    <xsl:when test="$units = 'in'">
-      <xsl:value-of select="$magnitude * 72.0"/>
-    </xsl:when>
-    <xsl:when test="$units = 'pc'">
-      <xsl:value-of select="$magnitude * 12.0"/>
-    </xsl:when>
-    <xsl:when test="$units = 'px'">
-      <xsl:value-of select="$magnitude div $pixels.per.inch * 72.0"/>
-    </xsl:when>
-    <xsl:when test="$units = 'em'">
-      <xsl:value-of select="$magnitude * $em.size"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:message>
-        <xsl:text>Unrecognized unit of measure: </xsl:text>
-        <xsl:value-of select="$units"/>
-        <xsl:text>.</xsl:text>
-      </xsl:message>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-<xsl:template name="pi-attribute">
-  <xsl:param name="pis" select="processing-instruction('BOGUS_PI')"/>
-  <xsl:param name="attribute">filename</xsl:param>
-  <xsl:param name="count">1</xsl:param>
-
-  <xsl:choose>
-    <xsl:when test="$count&gt;count($pis)">
-      <!-- not found -->
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:variable name="pi">
-        <xsl:value-of select="$pis[$count]"/>
-      </xsl:variable>
-      <xsl:variable name="pivalue">
-        <xsl:value-of select="concat(' ', normalize-space($pi))"/>
-      </xsl:variable>
-      <xsl:choose>
-        <xsl:when test="contains($pivalue,concat(' ', $attribute, '='))">
-          <xsl:variable name="rest" select="substring-after($pivalue,concat(' ', $attribute,'='))"/>
-          <xsl:variable name="quote" select="substring($rest,1,1)"/>
-          <xsl:value-of select="substring-before(substring($rest,2),$quote)"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="pi-attribute">
-            <xsl:with-param name="pis" select="$pis"/>
-            <xsl:with-param name="attribute" select="$attribute"/>
-            <xsl:with-param name="count" select="$count + 1"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-<xsl:template name="lookup.key">
-  <xsl:param name="key" select="''"/>
-  <xsl:param name="table" select="''"/>
-
-  <xsl:if test="contains($table, ' ')">
-    <xsl:choose>
-      <xsl:when test="substring-before($table, ' ') = $key">
-        <xsl:variable name="rest" select="substring-after($table, ' ')"/>
-        <xsl:choose>
-          <xsl:when test="contains($rest, ' ')">
-            <xsl:value-of select="substring-before($rest, ' ')"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="$rest"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="lookup.key">
-          <xsl:with-param name="key" select="$key"/>
-          <xsl:with-param name="table" select="substring-after(substring-after($table,' '), ' ')"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:if>
-</xsl:template>
-<xsl:template name="xpath.location">
-  <xsl:param name="node" select="."/>
-  <xsl:param name="path" select="''"/>
-
-  <xsl:variable name="next.path">
-    <xsl:value-of select="local-name($node)"/>
-    <xsl:if test="$path != ''">/</xsl:if>
-    <xsl:value-of select="$path"/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$node/parent::*">
-      <xsl:call-template name="xpath.location">
-        <xsl:with-param name="node" select="$node/parent::*"/>
-        <xsl:with-param name="path" select="$next.path"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:text>/</xsl:text>
-      <xsl:value-of select="$next.path"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-<xsl:template name="comment-escape-string">
-  <xsl:param name="string" select="''"/>
-
-  <xsl:if test="starts-with($string, '-')">
-    <xsl:text> </xsl:text>
-  </xsl:if>
-
-  <xsl:call-template name="comment-escape-string.recursive">
-    <xsl:with-param name="string" select="$string"/>
-  </xsl:call-template>
-
-  <xsl:if test="substring($string, string-length($string), 1) = '-'">
-    <xsl:text> </xsl:text>
-  </xsl:if>
-</xsl:template>
-<xsl:template name="comment-escape-string.recursive">
-  <xsl:param name="string" select="''"/>
-  <xsl:choose>
-    <xsl:when test="contains($string, '--')">
-      <xsl:value-of select="substring-before($string, '--')"/>
-      <xsl:value-of select="'- -'"/>
-      <xsl:call-template name="comment-escape-string.recursive">
-        <xsl:with-param name="string" select="substring-after($string, '--')"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$string"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-  <xsl:template name="str.tokenize.keep.delimiters">
-    <xsl:param name="string" select="''"/>
-    <xsl:param name="delimiters" select="' '"/>
-    <xsl:choose>
-      <xsl:when test="not($string)"/>
-      <xsl:when test="not($delimiters)">
-        <xsl:call-template name="str.tokenize.keep.delimiters-characters">
-          <xsl:with-param name="string" select="$string"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="str.tokenize.keep.delimiters-delimiters">
-          <xsl:with-param name="string" select="$string"/>
-          <xsl:with-param name="delimiters" select="$delimiters"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <xsl:template name="str.tokenize.keep.delimiters-characters">
-    <xsl:param name="string"/>
-    <xsl:if test="$string">
-      <ssb:token xmlns:ssb="http://sideshowbarker.net/ns"><xsl:value-of select="substring($string, 1, 1)"/></ssb:token>
-      <xsl:call-template name="str.tokenize.keep.delimiters-characters">
-        <xsl:with-param name="string" select="substring($string, 2)"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:template>
-  <xsl:template name="str.tokenize.keep.delimiters-delimiters">
-    <xsl:param name="string"/>
-    <xsl:param name="delimiters"/>
-    <xsl:variable name="delimiter" select="substring($delimiters, 1, 1)"/>
-    <xsl:choose>
-      <xsl:when test="not($delimiter)">
-        <ssb:token xmlns:ssb="http://sideshowbarker.net/ns"><xsl:value-of select="$string"/></ssb:token>
-      </xsl:when>
-      <xsl:when test="contains($string, $delimiter)">
-        <xsl:if test="not(starts-with($string, $delimiter))">
-          <xsl:call-template name="str.tokenize.keep.delimiters-delimiters">
-            <xsl:with-param name="string" select="substring-before($string, $delimiter)"/>
-            <xsl:with-param name="delimiters" select="substring($delimiters, 2)"/>
-          </xsl:call-template>
-        </xsl:if>
-        <!-- output each delimiter -->
-        <xsl:value-of select="$delimiter"/>
-        <xsl:call-template name="str.tokenize.keep.delimiters-delimiters">
-          <xsl:with-param name="string" select="substring-after($string, $delimiter)"/>
-          <xsl:with-param name="delimiters" select="$delimiters"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="str.tokenize.keep.delimiters-delimiters">
-          <xsl:with-param name="string" select="$string"/>
-          <xsl:with-param name="delimiters" select="substring($delimiters, 2)"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-    <xsl:template name="apply-string-subst-map">
-      <xsl:param name="content"/>
-      <xsl:param name="map.contents"/>
-      <xsl:variable name="replaced_text">
-        <xsl:call-template name="string.subst">
-          <xsl:with-param name="string" select="$content"/>
-          <xsl:with-param name="target" select="$map.contents[1]/@oldstring"/>
-          <xsl:with-param name="replacement" select="$map.contents[1]/@newstring"/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:choose>
-        <xsl:when test="$map.contents[2]">
-          <xsl:call-template name="apply-string-subst-map">
-            <xsl:with-param name="content" select="$replaced_text"/>
-            <xsl:with-param name="map.contents" select="$map.contents[position() &gt; 1]"/>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="$replaced_text"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:template>
-  
-<xsl:template name="count.uri.path.depth">
-  <xsl:param name="filename" select="''"/>
-  <xsl:param name="count" select="0"/>
-
-  <xsl:choose>
-    <xsl:when test="contains($filename, '/')">
-      <xsl:call-template name="count.uri.path.depth">
-        <xsl:with-param name="filename" select="substring-after($filename, '/')"/>
-        <xsl:with-param name="count" select="$count + 1"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$count"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-<xsl:template name="trim.common.uri.paths">
-  <xsl:param name="uriA" select="''"/>
-  <xsl:param name="uriB" select="''"/>
-  <xsl:param name="return" select="'A'"/>
-
-  <xsl:choose>
-    <xsl:when test="contains($uriA, '/') and contains($uriB, '/')                     and substring-before($uriA, '/') = substring-before($uriB, '/')">
-      <xsl:call-template name="trim.common.uri.paths">
-        <xsl:with-param name="uriA" select="substring-after($uriA, '/')"/>
-        <xsl:with-param name="uriB" select="substring-after($uriB, '/')"/>
-        <xsl:with-param name="return" select="$return"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:choose>
-        <xsl:when test="$return = 'A'">
-          <xsl:value-of select="$uriA"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="$uriB"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-  <xsl:template name="trim.text">
-    <xsl:param name="contents" select="."/>
-    <xsl:variable name="contents-left-trimmed">
-      <xsl:call-template name="trim-left">
-        <xsl:with-param name="contents" select="$contents"/>
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="contents-trimmed">
-      <xsl:call-template name="trim-right">
-        <xsl:with-param name="contents" select="$contents-left-trimmed"/>
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:value-of select="$contents-trimmed"/>
-  </xsl:template>
-
-  <xsl:template name="trim-left">
-    <xsl:param name="contents"/>
-    <xsl:choose>
-      <xsl:when test="starts-with($contents,'&#10;') or                       starts-with($contents,'&#13;') or                       starts-with($contents,' ') or                       starts-with($contents,'&#9;')">
-        <xsl:call-template name="trim-left">
-          <xsl:with-param name="contents" select="substring($contents, 2)"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$contents"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template name="trim-right">
-    <xsl:param name="contents"/>
-    <xsl:variable name="last-char">
-      <xsl:value-of select="substring($contents, string-length($contents), 1)"/>
-    </xsl:variable>
-    <xsl:choose>
-      <xsl:when test="($last-char = '&#10;') or                       ($last-char = '&#13;') or                       ($last-char = ' ') or                       ($last-char = '&#9;')">
-        <xsl:call-template name="trim-right">
-          <xsl:with-param name="contents" select="substring($contents, 1, string-length($contents) - 1)"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$contents"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/profiling/profile-mode.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/profiling/profile-mode.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,239 +1,0 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:saxon="http://icl.com/saxon"
-                exclude-result-prefixes="saxon"
-                version="1.0">
-
-<!-- Should be base URI for imagedata and so on fixed? -->
-<xsl:param name="profile.baseuri.fixup" select="true()"/>
-
-<!-- Copy all non-element nodes -->
-<xsl:template match="@*|text()|comment()|processing-instruction()" mode="profile">
-  <xsl:copy/>
-</xsl:template>
-
-<!-- Profile elements based on input parameters -->
-<xsl:template match="*" mode="profile">
-
-  <xsl:variable name="arch.content">
-    <xsl:if test="@arch">
-      <xsl:call-template name="cross.compare">
-        <xsl:with-param name="a" select="$profile.arch"/>
-        <xsl:with-param name="b" select="@arch"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:variable>
-  <xsl:variable name="arch.ok" select="not(@arch) or not($profile.arch) or
-                                       $arch.content != '' or @arch = ''"/>
-
-  <xsl:variable name="audience.content">
-    <xsl:if test="@audience">
-      <xsl:call-template name="cross.compare">
-        <xsl:with-param name="a" select="$profile.audience"/>
-        <xsl:with-param name="b" select="@audience"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:variable>
-  <xsl:variable name="audience.ok" 
-                        select="not(@audience) or not($profile.audience) or
-                                $audience.content != '' or @audience = ''"/>
-
-  <xsl:variable name="condition.content">
-    <xsl:if test="@condition">
-      <xsl:call-template name="cross.compare">
-        <xsl:with-param name="a" select="$profile.condition"/>
-        <xsl:with-param name="b" select="@condition"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:variable>
-  <xsl:variable name="condition.ok" select="not(@condition) or not($profile.condition) or
-                                            $condition.content != '' or @condition = ''"/>
-
-  <xsl:variable name="conformance.content">
-    <xsl:if test="@conformance">
-      <xsl:call-template name="cross.compare">
-        <xsl:with-param name="a" select="$profile.conformance"/>
-        <xsl:with-param name="b" select="@conformance"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:variable>
-  <xsl:variable name="conformance.ok" select="not(@conformance) or not($profile.conformance) or
-                                              $conformance.content != '' or @conformance = ''"/>
-
-  <xsl:variable name="lang.content">
-    <xsl:if test="@lang | @xml:lang">
-      <xsl:call-template name="cross.compare">
-        <xsl:with-param name="a" select="$profile.lang"/>
-        <xsl:with-param name="b" select="(@lang | @xml:lang)[1]"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:variable>
-  <xsl:variable name="lang.ok" select="not(@lang | @xml:lang) or not($profile.lang) or
-                                       $lang.content != '' or @lang = '' or @xml:lang = ''"/>
-
-  <xsl:variable name="os.content">
-    <xsl:if test="@os">
-      <xsl:call-template name="cross.compare">
-        <xsl:with-param name="a" select="$profile.os"/>
-        <xsl:with-param name="b" select="@os"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:variable>
-  <xsl:variable name="os.ok" select="not(@os) or not($profile.os) or
-                                     $os.content != '' or @os = ''"/>
-
-  <xsl:variable name="revision.content">
-    <xsl:if test="@revision">
-      <xsl:call-template name="cross.compare">
-        <xsl:with-param name="a" select="$profile.revision"/>
-        <xsl:with-param name="b" select="@revision"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:variable>
-  <xsl:variable name="revision.ok" select="not(@revision) or not($profile.revision) or
-                                           $revision.content != '' or @revision = ''"/>
-
-  <xsl:variable name="revisionflag.content">
-    <xsl:if test="@revisionflag">
-      <xsl:call-template name="cross.compare">
-        <xsl:with-param name="a" select="$profile.revisionflag"/>
-        <xsl:with-param name="b" select="@revisionflag"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:variable>
-  <xsl:variable name="revisionflag.ok" select="not(@revisionflag) or not($profile.revisionflag) or
-                                               $revisionflag.content != '' or @revisionflag = ''"/>
-
-  <xsl:variable name="role.content">
-    <xsl:if test="@role">
-      <xsl:call-template name="cross.compare">
-        <xsl:with-param name="a" select="$profile.role"/>
-        <xsl:with-param name="b" select="@role"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:variable>
-  <xsl:variable name="role.ok" select="not(@role) or not($profile.role) or
-                                       $role.content != '' or @role = ''"/>
-
-  <xsl:variable name="security.content">
-    <xsl:if test="@security">
-      <xsl:call-template name="cross.compare">
-        <xsl:with-param name="a" select="$profile.security"/>
-        <xsl:with-param name="b" select="@security"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:variable>
-  <xsl:variable name="security.ok" select="not(@security) or not($profile.security) or
-                                           $security.content != '' or @security = ''"/>
-
-  <xsl:variable name="status.content">
-    <xsl:if test="@status">
-      <xsl:call-template name="cross.compare">
-        <xsl:with-param name="a" select="$profile.status"/>
-        <xsl:with-param name="b" select="@status"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:variable>
-  <xsl:variable name="status.ok" select="not(@status) or not($profile.status) or
-                                           $status.content != '' or @status = ''"/>
-
-  <xsl:variable name="userlevel.content">
-    <xsl:if test="@userlevel">
-      <xsl:call-template name="cross.compare">
-        <xsl:with-param name="a" select="$profile.userlevel"/>
-        <xsl:with-param name="b" select="@userlevel"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:variable>
-  <xsl:variable name="userlevel.ok" select="not(@userlevel) or not($profile.userlevel) or
-                                            $userlevel.content != '' or @userlevel = ''"/>
-
-  <xsl:variable name="vendor.content">
-    <xsl:if test="@vendor">
-      <xsl:call-template name="cross.compare">
-        <xsl:with-param name="a" select="$profile.vendor"/>
-        <xsl:with-param name="b" select="@vendor"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:variable>
-  <xsl:variable name="vendor.ok" select="not(@vendor) or not($profile.vendor) or
-                                         $vendor.content != '' or @vendor = ''"/>
-
-  <xsl:variable name="wordsize.content">
-    <xsl:if test="@wordsize">
-      <xsl:call-template name="cross.compare">
-        <xsl:with-param name="a" select="$profile.wordsize"/>
-        <xsl:with-param name="b" select="@wordsize"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:variable>
-  <xsl:variable name="wordsize.ok" 
-                        select="not(@wordsize) or not($profile.wordsize) or
-                                $wordsize.content != '' or @wordsize = ''"/>
-
-  <xsl:variable name="attribute.content">
-    <xsl:if test="@*[local-name()=$profile.attribute]">
-      <xsl:call-template name="cross.compare">
-        <xsl:with-param name="a" select="$profile.value"/>
-        <xsl:with-param name="b" select="@*[local-name()=$profile.attribute]"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:variable>
-  <xsl:variable name="attribute.ok" 
-                select="not(@*[local-name()=$profile.attribute]) or 
-                        not($profile.value) or $attribute.content != '' or 
-                        @*[local-name()=$profile.attribute] = '' or 
-                        not($profile.attribute)"/>
-
-  <xsl:if test="$arch.ok and 
-                $audience.ok and 
-                $condition.ok and 
-                $conformance.ok and 
-                $lang.ok and 
-                $os.ok and 
-                $revision.ok and 
-                $revisionflag.ok and 
-                $role.ok and 
-                $security.ok and 
-                $status.ok and 
-                $userlevel.ok and 
-                $vendor.ok and 
-                $wordsize.ok and 
-                $attribute.ok">
-    <xsl:copy>
-      <xsl:copy-of select="@*"/>
-
-      <!-- Entity references must be replaced with filereferences for temporary tree -->
-      <xsl:if test="@entityref and $profile.baseuri.fixup">
-        <xsl:attribute name="fileref">
-          <xsl:value-of select="unparsed-entity-uri(@entityref)"/>
-        </xsl:attribute>
-      </xsl:if>
-
-      <!-- xml:base is eventually added to the root element -->
-      <xsl:if test="not(../..) and $profile.baseuri.fixup">
-        <xsl:call-template name="add-xml-base"/>
-      </xsl:if>
-
-      <xsl:apply-templates select="node()" mode="profile"/>
-    </xsl:copy>
-  </xsl:if>
-</xsl:template>
-
-<!-- Returns non-empty string if list in $b contains one ore more values from list $a -->
-<xsl:template name="cross.compare">
-  <xsl:param name="a"/>
-  <xsl:param name="b"/>
-  <xsl:param name="sep" select="$profile.separator"/>
-  <xsl:variable name="head" select="substring-before(concat($a, $sep), $sep)"/>
-  <xsl:variable name="tail" select="substring-after($a, $sep)"/>
-  <xsl:if test="contains(concat($sep, $b, $sep), concat($sep, $head, $sep))">1</xsl:if>
-  <xsl:if test="$tail">
-    <xsl:call-template name="cross.compare">
-      <xsl:with-param name="a" select="$tail"/>
-      <xsl:with-param name="b" select="$b"/>
-    </xsl:call-template>
-  </xsl:if>
-</xsl:template>
-
-</xsl:stylesheet>
-
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/profiling/profile.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/profiling/profile.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,49 +1,0 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="1.0">
-
-<!-- Include common profiling stylesheet -->
-<xsl:import href="profile-mode.xsl"/>
-
-<!-- This file must be included, because profile-mode is using templates from it -->
-<xsl:import href="../common/stripns.xsl"/>
-
-<!-- In the two pass processing there is no need for base URI fixup -->
-<xsl:param name="profile.baseuri.fixup" select="false()"/>
-
-<!-- If you need to validate profiled content against DTD, 
-     create customization that will import this stylesheet and
-     will use xsl:output (see example bellow) to output reference 
-     to the desired DTD version. --> 
-<!-- Generate DocBook instance with correct DOCTYPE -->
-<!--
-<xsl:output method="xml" 
-            doctype-public="-//OASIS//DTD DocBook XML V4.5//EN"
-            doctype-system="http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"/>
--->
-
-<!-- Profiling parameters -->
-<xsl:param name="profile.arch" select="''"/>
-<xsl:param name="profile.audience" select="''"/>
-<xsl:param name="profile.condition" select="''"/>
-<xsl:param name="profile.conformance" select="''"/>
-<xsl:param name="profile.lang" select="''"/>
-<xsl:param name="profile.os" select="''"/>
-<xsl:param name="profile.revision" select="''"/>
-<xsl:param name="profile.revisionflag" select="''"/>
-<xsl:param name="profile.role" select="''"/>
-<xsl:param name="profile.security" select="''"/>
-<xsl:param name="profile.status" select="''"/>
-<xsl:param name="profile.userlevel" select="''"/>
-<xsl:param name="profile.vendor" select="''"/>
-<xsl:param name="profile.wordsize" select="''"/>
-<xsl:param name="profile.attribute" select="''"/>
-<xsl:param name="profile.value" select="''"/>
-<xsl:param name="profile.separator" select="';'"/>
-
-<!-- Call common profiling mode -->
-<xsl:template match="/">
-  <xsl:apply-templates select="." mode="profile"/>
-</xsl:template>
-
-</xsl:stylesheet>
-
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/profiling/strip-attributes.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/profiling/strip-attributes.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,27 +1,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="1.0">
-
-<xsl:output method="xml"/>
-
-<xsl:param name="attributes" select="''"/>
-
-<xsl:variable name="strip-attributes"
-              select="concat(' ', normalize-space($attributes), ' ')"/>
-
-<xsl:template match="@*|text()|comment()|processing-instruction()">
-  <xsl:copy/>
-</xsl:template>
-
-<xsl:template match="*">
-  <xsl:copy>
-    <xsl:for-each select="@*">
-      <xsl:if test="not(contains($strip-attributes, concat(' ',name(.),' ')))">
-        <xsl:copy-of select="."/>
-      </xsl:if>
-    </xsl:for-each>
-    <xsl:apply-templates select="node()"/>
-  </xsl:copy>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/profiling/xsl2profile.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/profiling/xsl2profile.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,159 +1,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:xslo="http://www.w3.org/1999/XSL/TransformAlias"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                exclude-result-prefixes="fo"
-                version="1.0">
-
-<xsl:include href="../lib/lib.xsl"/>
-
-<xsl:output method="xml" encoding="US-ASCII"/>
-
-<xsl:namespace-alias stylesheet-prefix="xslo" result-prefix="xsl"/>
-
-<xsl:preserve-space elements="*"/>
-
-<xsl:template match="/">
-  <xsl:comment>This file was created automatically by xsl2profile</xsl:comment>
-  <xsl:comment>from the DocBook XSL stylesheets.</xsl:comment>
-  <xsl:apply-templates/>
-</xsl:template>
-
-<!-- Make sure we override some templates and parameters appropriately for XHTML -->
-<xsl:template match="xsl:stylesheet">
-  <xsl:copy>
-    <xsl:attribute name="exslt:dummy" xmlns:exslt="http://exslt.org/common">dummy</xsl:attribute>
-    <xsl:attribute name="ng:dummy" xmlns:ng="http://docbook.org/docbook-ng">dummy</xsl:attribute>
-    <xsl:attribute name="db:dummy" xmlns:db="http://docbook.org/ns/docbook">dummy</xsl:attribute>
-    <xsl:if test="not(@extension-element-prefixes)">
-      <xsl:attribute name="extension-element-prefixes">exslt</xsl:attribute>
-    </xsl:if>
-    <xsl:if test="not(@exclude-result-prefixes)">
-      <xsl:attribute name="exclude-result-prefixes">exslt</xsl:attribute>
-    </xsl:if>
-    <xsl:for-each select="@*">
-      <xsl:choose>
-        <xsl:when test="local-name(.) = 'extension-element-prefixes' or
-                        local-name(.) = 'exclude-result-prefixes'">
-          <xsl:attribute name="{local-name(.)}"><xsl:value-of select="concat(., ' exslt')"/></xsl:attribute>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:attribute name="{local-name(.)}"><xsl:value-of select="."/></xsl:attribute>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:for-each>
-    <xsl:apply-templates/>
-  </xsl:copy>
-</xsl:template>
-
-<xsl:template match="*">
-  <xsl:copy>
-    <xsl:copy-of select="@*"/>
-    <xsl:apply-templates/>
-  </xsl:copy>
-</xsl:template>
-
-<xsl:template match="comment()|processing-instruction()|text()">
-  <xsl:copy/>
-</xsl:template>
-
-<xsl:template match="xsl:template[@match='/']">
-  <xslo:include href="../profiling/profile-mode.xsl"/>
-  <xslo:variable name="profiled-content">
-    <xslo:choose>
-      <xslo:when test="*/self::ng:* or */self::db:*">
-        <xslo:message>Note: namesp. cut : stripped namespace before processing</xslo:message>
-        <xslo:variable name="stripped-content">
-          <xslo:apply-templates select="/" mode="stripNS"/>
-        </xslo:variable>
-        <xslo:message>Note: namesp. cut : processing stripped document</xslo:message>
-        <xslo:apply-templates select="exslt:node-set($stripped-content)" mode="profile"/>
-      </xslo:when>
-      <xslo:otherwise>
-        <xslo:apply-templates select="/" mode="profile"/>
-      </xslo:otherwise>
-    </xslo:choose>
-  </xslo:variable>
-  <xslo:variable name="profiled-nodes" select="exslt:node-set($profiled-content)"/>
-  <xsl:copy>
-    <xsl:copy-of select="@*"/>
-    <xsl:apply-templates mode="correct"/>
-  </xsl:copy>
-</xsl:template>
-
-<xsl:template match="xsl:template[@name='hhc-main' or @name='hhp-main' or @name='etoc'] | xsl:variable[@name='raw.help.title']">
-  <xsl:copy>
-    <xsl:copy-of select="@*"/>
-    <xsl:apply-templates mode="correct"/>
-  </xsl:copy>
-</xsl:template>
-
-<xsl:template match="*[starts-with(@select, '/')]" mode="correct">
-  <xsl:copy>
-    <xsl:for-each select="@*">
-      <xsl:choose>
-        <xsl:when test="local-name(.) = 'select' and string(.) =  '/'">
-          <xsl:attribute name="{local-name(.)}">$profiled-nodes</xsl:attribute>
-        </xsl:when>
-        <xsl:when test="local-name(.) = 'select' and starts-with(., '/')">
-          <xsl:attribute name="{local-name(.)}">$profiled-nodes<xsl:value-of select="."/></xsl:attribute>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:attribute name="{local-name(.)}"><xsl:value-of select="."/></xsl:attribute>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:for-each>
-    <xsl:apply-templates mode="correct"/>
-  </xsl:copy>
-</xsl:template>
-
-<xsl:template match='*[contains(@*, "key(&apos;id&apos;,$rootid)")]' mode="correct" priority="2">
-  <xsl:copy>
-    <xsl:for-each select="@*">
-      <xsl:choose>
-        <xsl:when test='contains(., "key(&apos;id&apos;,$rootid)")'>
-          <xsl:attribute name="{local-name(.)}">
-            <xsl:call-template name="string.subst">
-              <xsl:with-param name="string" select="."/>
-              <xsl:with-param name="target">key('id',$rootid)</xsl:with-param>
-              <xsl:with-param name="replacement">$profiled-nodes//*[@id=$rootid]</xsl:with-param>
-            </xsl:call-template>
-          </xsl:attribute>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:attribute name="{local-name(.)}"><xsl:value-of select="."/></xsl:attribute>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:for-each>
-    <xsl:apply-templates mode="correct"/>
-  </xsl:copy>
-</xsl:template>
-
-<!-- FO stylesheet has apply-templates without select, we must detect it by context -->
-<xsl:template match="fo:root//xsl:apply-templates" mode="correct">
-  <xsl:copy>
-    <xsl:copy-of select="@*"/>
-    <xsl:attribute name="select">$profiled-nodes/node()</xsl:attribute>
-    <xsl:apply-templates mode="correct"/>
-  </xsl:copy>
-</xsl:template>
-
-<!-- DB5 namespace stripping is already done  -->
-<xsl:template match="xsl:when[contains(@test, 'self::db')]" mode="correct">
-  <xsl:copy>
-    <xsl:attribute name="test">false()</xsl:attribute>
-  </xsl:copy>
-</xsl:template>
-
-<xsl:template match="*" mode="correct">
-  <xsl:copy>
-    <xsl:copy-of select="@*"/>
-    <xsl:apply-templates mode="correct"/>
-  </xsl:copy>
-</xsl:template>
-
-<xsl:template match="comment()|processing-instruction()|text()" mode="correct">
-  <xsl:copy/>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/admon.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/admon.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,133 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<xsl:template match="*" mode="admon.graphic.width">
-  <xsl:param name="node" select="."/>
-  <xsl:text>25</xsl:text>
-</xsl:template>
-
-<xsl:template match="note|important|warning|caution|tip">
-  <xsl:choose>
-    <xsl:when test="$admon.graphics != 0">
-      <xsl:call-template name="graphical.admonition"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="nongraphical.admonition"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="admon.graphic">
-  <xsl:param name="node" select="."/>
-  <xsl:value-of select="$admon.graphics.path"/>
-  <xsl:choose>
-    <xsl:when test="local-name($node)='note'">note</xsl:when>
-    <xsl:when test="local-name($node)='warning'">warning</xsl:when>
-    <xsl:when test="local-name($node)='caution'">caution</xsl:when>
-    <xsl:when test="local-name($node)='tip'">tip</xsl:when>
-    <xsl:when test="local-name($node)='important'">important</xsl:when>
-    <xsl:otherwise>note</xsl:otherwise>
-  </xsl:choose>
-  <xsl:value-of select="$admon.graphics.extension"/>
-</xsl:template>
-
-<xsl:template name="graphical.admonition">
-  <xsl:variable name="admon.type">
-    <xsl:choose>
-      <xsl:when test="local-name(.)='note'">Note</xsl:when>
-      <xsl:when test="local-name(.)='warning'">Warning</xsl:when>
-      <xsl:when test="local-name(.)='caution'">Caution</xsl:when>
-      <xsl:when test="local-name(.)='tip'">Tip</xsl:when>
-      <xsl:when test="local-name(.)='important'">Important</xsl:when>
-      <xsl:otherwise>Note</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="alt">
-    <xsl:call-template name="gentext">
-      <xsl:with-param name="key" select="$admon.type"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:if test="$admon.style != ''">
-      <xsl:attribute name="style">
-        <xsl:value-of select="$admon.style"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <table border="0">
-      <xsl:attribute name="summary">
-        <xsl:value-of select="$admon.type"/>
-        <xsl:if test="title|info/title">
-          <xsl:text>: </xsl:text>
-          <xsl:value-of select="(title|info/title)[1]"/>
-        </xsl:if>
-      </xsl:attribute>
-      <tr>
-        <td rowspan="2" align="center" valign="top">
-          <xsl:attribute name="width">
-            <xsl:apply-templates select="." mode="admon.graphic.width"/>
-          </xsl:attribute>
-          <img alt="[{$alt}]">
-            <xsl:attribute name="src">
-              <xsl:call-template name="admon.graphic"/>
-            </xsl:attribute>
-          </img>
-        </td>
-        <th align="left">
-          <xsl:call-template name="anchor"/>
-          <xsl:if test="$admon.textlabel != 0 or title or info/title">
-            <xsl:apply-templates select="." mode="object.title.markup"/>
-          </xsl:if>
-        </th>
-      </tr>
-      <tr>
-        <td align="left" valign="top">
-          <xsl:apply-templates/>
-        </td>
-      </tr>
-    </table>
-  </div>
-</xsl:template>
-
-<xsl:template name="nongraphical.admonition">
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:if test="$admon.style">
-      <xsl:attribute name="style">
-        <xsl:value-of select="$admon.style"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <xsl:if test="$admon.textlabel != 0 or title or info/title">
-      <h3 class="title">
-        <xsl:call-template name="anchor"/>
-        <xsl:apply-templates select="." mode="object.title.markup"/>
-      </h3>
-    </xsl:if>
-
-    <xsl:apply-templates/>
-  </div>
-</xsl:template>
-
-<xsl:template match="note/title"/>
-<xsl:template match="important/title"/>
-<xsl:template match="warning/title"/>
-<xsl:template match="caution/title"/>
-<xsl:template match="tip/title"/>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/annotations.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/annotations.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,158 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
-
-<xsl:template name="add.annotation.links">
-  <xsl:param name="scripts" select="normalize-space($annotation.js)"/>
-  <xsl:choose>
-    <xsl:when test="contains($scripts, ' ')">
-      <script type="text/javascript" src="{substring-before($scripts, ' ')}"/>
-      <xsl:call-template name="add.annotation.links">
-        <xsl:with-param name="scripts" select="substring-after($scripts, ' ')"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <script type="text/javascript" src="{$scripts}"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="annotation"/>
-
-<xsl:template name="apply-annotations">
-  <xsl:if test="$annotation.support != 0">
-  <!-- do any annotations apply to the context node? -->
-  <xsl:variable name="id" select="(@id|@xml:id)[1]"/>
-
-  <xsl:variable name="aids">
-    <xsl:for-each select="//annotation">
-      <xsl:if test="@annotates=$id                     or starts-with(@annotates, concat($id, ' '))                     or contains(@annotates, concat(' ', $id, ' '))                     or substring(@annotates, string-length(@annotates)-3)                        = concat(' ', $id)">
-        <xsl:value-of select="generate-id()"/>
-        <xsl:text> </xsl:text>
-      </xsl:if>
-    </xsl:for-each>
-    <xsl:if test="normalize-space(@annotations) != ''">
-      <xsl:call-template name="annotations-pointed-to">
-        <xsl:with-param name="annotations" select="normalize-space(@annotations)"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:if test="$aids != ''">
-    <xsl:call-template name="apply-annotations-by-gid">
-      <xsl:with-param name="gids" select="normalize-space($aids)"/>
-    </xsl:call-template>
-  </xsl:if>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="annotations-pointed-to">
-  <xsl:param name="annotations"/>
-  <xsl:choose>
-    <xsl:when test="contains($annotations, ' ')">
-      <xsl:variable name="a" select="key('id', substring-before($annotations, ' '))"/>
-      <xsl:if test="$a">
-        <xsl:value-of select="generate-id($a)"/>
-        <xsl:text> </xsl:text>
-      </xsl:if>
-      <xsl:call-template name="annotations-pointed-to">
-        <xsl:with-param name="annotations" select="substring-after($annotations, ' ')"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:variable name="a" select="key('id', $annotations)"/>
-      <xsl:if test="$a">
-        <xsl:value-of select="generate-id($a)"/>
-        <xsl:text> </xsl:text>
-      </xsl:if>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="apply-annotations-by-gid">
-  <xsl:param name="gids"/>
-
-  <xsl:choose>
-    <xsl:when test="contains($gids, ' ')">
-      <xsl:variable name="gid" select="substring-before($gids, ' ')"/>
-      <xsl:apply-templates select="key('gid', $gid)" mode="annotation-inline"/>
-      <xsl:call-template name="apply-annotations-by-gid">
-        <xsl:with-param name="gids" select="substring-after($gids, ' ')"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates select="key('gid', $gids)" mode="annotation-inline"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="annotation" mode="annotation-inline">
-  <xsl:variable name="title">
-    <xsl:choose>
-      <xsl:when test="title">
-        <xsl:value-of select="title"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:text>[Annotation #</xsl:text>
-        <xsl:number count="annotation" level="any" format="1"/>
-        <xsl:text>]</xsl:text>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <a id="anch-{generate-id(.)}" href="#annot-{generate-id(.)}" title="{$title}">
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:attribute name="onClick">
-      <xsl:text>popup_</xsl:text>
-      <xsl:value-of select="generate-id(.)"/>
-      <xsl:text>.showPopup('anch-</xsl:text>
-      <xsl:value-of select="generate-id(.)"/>
-      <xsl:text>'); return false;</xsl:text>
-    </xsl:attribute>
-    <img src="{$annotation.graphic.open}" border="0" alt="{$title}"/>
-  </a>
-</xsl:template>
-
-<xsl:template match="annotation" mode="annotation-popup">
-  <div class="annotation-nocss">
-    <p>
-      <a id="annot-{generate-id(.)}"/>
-      <xsl:text>Annotation #</xsl:text>
-      <xsl:number count="annotation" level="any" format="1"/>
-      <xsl:text>:</xsl:text>
-    </p>
-  </div>
-
-  <div id="popup-{generate-id(.)}" class="annotation-popup">
-    <xsl:if test="string-length(.) &gt; 300">
-      <xsl:attribute name="style">width:400px</xsl:attribute>
-    </xsl:if>
-
-    <xsl:call-template name="annotation-title"/>
-    <div class="annotation-body">
-      <xsl:apply-templates select="*[local-name(.) != 'title']"/>
-    </div>
-    <div class="annotation-close">
-      <a href="#" onclick="popup_{generate-id(.)}.hidePopup();return false;">
-        <xsl:apply-templates select="." mode="class.attribute"/>
-        <img src="{$annotation.graphic.close}" alt="X" border="0"/>
-      </a>
-    </div>
-  </div>
-</xsl:template>
-
-<xsl:template name="annotation-title">
-  <div class="annotation-title">
-    <xsl:choose>
-      <xsl:when test="title">
-        <xsl:apply-templates select="title/node()"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:text>Annotation</xsl:text>
-      </xsl:otherwise>
-    </xsl:choose>
-  </div>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/autoidx-kimber.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/autoidx-kimber.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,139 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:k="http://www.isogen.com/functions/com.isogen.saxoni18n.Saxoni18nService" xmlns="http://www.w3.org/1999/xhtml" exclude-result-prefixes="k" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-<!-- The "kimber" method contributed by Eliot Kimber of Innodata Isogen.  -->
-<!-- ==================================================================== -->
-<!--   *** THIS MODULE ONLY WORKS WITH SAXON 6 OR SAXON 8 ***             -->
-<!-- ==================================================================== -->
-
-
-<xsl:include href="../common/autoidx-kimber.xsl"/>
-
-<!-- Java sort apparently works only on lang part, not country -->
-<xsl:param name="sort.lang">
-  <xsl:choose>
-    <xsl:when test="contains(concat(/*/@lang, /*/@xml:lang), '-')">
-      <xsl:value-of select="substring-before(concat(/*/@lang, /*/@xml:lang), '-')"/>
-    </xsl:when>
-    <xsl:when test="contains(concat(/*/@lang, /*/@xml:lang), '_')">
-      <xsl:value-of select="substring-before(concat(/*/@lang, /*/@xml:lang), '_')"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="concat(/*/@lang, /*/@xml:lang)"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:param>
-
-<xsl:template name="generate-kimber-index">
-  <xsl:param name="scope" select="NOTANODE"/>
-
-  <xsl:variable name="vendor" select="system-property('xsl:vendor')"/>
-  <xsl:if test="not(contains($vendor, 'SAXON '))">
-    <xsl:message terminate="yes">
-      <xsl:text>ERROR: the 'kimber' index method requires the </xsl:text>
-      <xsl:text>Saxon version 6 or 8 XSLT processor.</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <xsl:if test="not(function-available('k:getIndexGroupKey'))">
-    <xsl:message terminate="yes">
-      <xsl:text>ERROR: the 'kimber' index method requires the </xsl:text>
-      <xsl:text>Innodata Isogen 
-Java extensions for </xsl:text>
-      <xsl:text>internationalized indexes. 
-Install those </xsl:text>
-      <xsl:text>extensions, or use a different index method.
-</xsl:text>
-      <xsl:text>For more information, see:
-</xsl:text>
-      <xsl:text>http://www.innodata-isogen.com/knowledge_center/tools_downloads/i18nsupport</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <xsl:variable name="role">
-    <xsl:if test="$index.on.role != 0">
-      <xsl:value-of select="@role"/>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:variable name="type">
-    <xsl:if test="$index.on.type != 0">
-      <xsl:value-of select="@type"/>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:variable name="terms" select="//indexterm[count(.|key('k-group', k:getIndexGroupKey(concat(/*/@lang, /*/@xml:lang), normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;]))))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1]) = 1 and not(@class = 'endofrange')]"/>
-
-  <xsl:variable name="alphabetical" select="$terms[not(starts-with(                 k:getIndexGroupKey(concat(/*/@lang, /*/@xml:lang), normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;]))),                 '#NUMERIC'                 ))]"/>
-
-  <xsl:variable name="others" select="$terms[starts-with(                 k:getIndexGroupKey(concat(/*/@lang, /*/@xml:lang), normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;]))),                 '#NUMERIC'                 )]"/>
-
-  <div class="index">
-    <xsl:if test="$others">
-      <div class="indexdev">
-        <h3>
-          <xsl:call-template name="gentext">
-            <xsl:with-param name="key" select="'index symbols'"/>
-          </xsl:call-template>
-        </h3>
-        <dl>
-          <xsl:apply-templates select="$others" mode="index-symbol-div">
-            <xsl:with-param name="scope" select="$scope"/>
-            <xsl:with-param name="role" select="$role"/>
-            <xsl:with-param name="type" select="$type"/>
-            <xsl:sort lang="{$sort.lang}" select="k:getIndexGroupSortKey(concat(/*/@lang, /*/@xml:lang),                         k:getIndexGroupKey(concat(/*/@lang, /*/@xml:lang), normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;]))))"/>
-          </xsl:apply-templates>
-        </dl>
-      </div>
-    </xsl:if>
-
-    <xsl:apply-templates select="$alphabetical" mode="index-div-kimber">
-      <xsl:with-param name="scope" select="$scope"/>
-      <xsl:with-param name="role" select="$role"/>
-      <xsl:with-param name="type" select="$type"/>
-      <xsl:sort lang="{$sort.lang}" select="k:getIndexGroupSortKey(concat(/*/@lang, /*/@xml:lang),                      k:getIndexGroupKey(concat(/*/@lang, /*/@xml:lang), normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;]))))"/>
-    </xsl:apply-templates>
-  </div>
-
-</xsl:template>
-
-<xsl:template match="indexterm" mode="index-div-kimber">
-  <xsl:param name="scope" select="."/>
-  <xsl:param name="role" select="''"/>
-  <xsl:param name="type" select="''"/>
-
-  <xsl:variable name="key" select="k:getIndexGroupKey(concat(/*/@lang, /*/@xml:lang), normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])))"/>
-
-  <xsl:variable name="label" select="k:getIndexGroupLabel(concat(/*/@lang, /*/@xml:lang), $key)"/>
-
-  <xsl:if test="key('k-group', $label)[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][count(.|key('primary', normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1]) = 1]">
-    <div class="indexdiv">
-      <h3>
-        <xsl:value-of select="$label"/>
-      </h3>
-      <dl>
-        <xsl:apply-templates select="key('k-group', $key)[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))]                             [count(.|key('primary', normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))]                             [1])=1]" mode="index-primary">
-          <xsl:sort select="normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;]))" lang="{$sort.lang}"/>
-          <xsl:with-param name="scope" select="$scope"/>
-          <xsl:with-param name="role" select="$role"/>
-          <xsl:with-param name="type" select="$type"/>
-        </xsl:apply-templates>
-      </dl>
-    </div>
-  </xsl:if>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/autoidx-kosek.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/autoidx-kosek.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,109 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:i="urn:cz-kosek:functions:index" xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" xmlns:func="http://exslt.org/functions" xmlns:k="http://www.isogen.com/functions/com.isogen.saxoni18n.Saxoni18nService" xmlns:exslt="http://exslt.org/common" xmlns="http://www.w3.org/1999/xhtml" extension-element-prefixes="func exslt" exclude-result-prefixes="func exslt i l k" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-<!-- The "kosek" method contributed by Jirka Kosek. -->
-
-<xsl:include href="../common/autoidx-kosek.xsl"/>
-
-<xsl:template name="generate-kosek-index">
-  <xsl:param name="scope" select="(ancestor::book|/)[last()]"/>
-
-  <xsl:variable name="vendor" select="system-property('xsl:vendor')"/>
-  <xsl:if test="contains($vendor, 'libxslt')">
-    <xsl:message terminate="yes">
-      <xsl:text>ERROR: the 'kosek' index method does not </xsl:text>
-      <xsl:text>work with the xsltproc XSLT processor.</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <xsl:if test="contains($vendor, 'Saxonica')">
-    <xsl:message terminate="yes">
-      <xsl:text>ERROR: the 'kosek' index method does not </xsl:text>
-      <xsl:text>work with the Saxon 8 XSLT processor.</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <xsl:if test="not(function-available('exslt:node-set') or                     function-available('exslt:nodeSet'))">
-    <xsl:message terminate="yes">
-      <xsl:text>ERROR: the 'kosek' index method requires the </xsl:text>
-      <xsl:text>exslt:node-set() function. Use a processor that </xsl:text>
-      <xsl:text>has it, or use a different index method.</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <xsl:if test="not(function-available('i:group-index'))">
-    <xsl:message terminate="yes">
-      <xsl:text>ERROR: the 'kosek' index method requires the
-</xsl:text>
-      <xsl:text>index extension functions be imported:
-</xsl:text>
-      <xsl:text>  xsl:import href="common/autoidx-kosek.xsl"</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <xsl:variable name="role">
-    <xsl:if test="$index.on.role != 0">
-      <xsl:value-of select="@role"/>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:variable name="type">
-    <xsl:if test="$index.on.type != 0">
-      <xsl:value-of select="@type"/>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:variable name="terms" select="//indexterm[count(.|key('group-code', i:group-index(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;]))))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1]) = 1 and not(@class = 'endofrange')]"/>
-
-  <div class="index">
-    <xsl:apply-templates select="$terms" mode="index-div-kosek">
-      <xsl:with-param name="scope" select="$scope"/>
-      <xsl:with-param name="role" select="$role"/>
-      <xsl:with-param name="type" select="$type"/>
-      <xsl:sort select="i:group-index(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])))" data-type="number"/>
-    </xsl:apply-templates>
-  </div>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="index-div-kosek">
-  <xsl:param name="scope" select="."/>
-  <xsl:param name="role" select="''"/>
-  <xsl:param name="type" select="''"/>
-
-  <xsl:variable name="key" select="i:group-index(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])))"/>
-
-  <xsl:variable name="lang">
-    <xsl:call-template name="l10n.language"/>
-  </xsl:variable>
-
-  <xsl:if test="key('group-code', $key)[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][count(.|key('primary', normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1]) = 1]">
-    <div class="indexdiv">
-      <h3>
-        <xsl:value-of select="i:group-letter($key)"/>
-      </h3>
-      <dl>
-        <xsl:apply-templates select="key('group-code', $key)[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][count(.|key('primary', normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1])=1]" mode="index-primary">
-          <xsl:sort select="normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;]))" lang="{$lang}"/>
-          <xsl:with-param name="scope" select="$scope"/>
-          <xsl:with-param name="role" select="$role"/>
-          <xsl:with-param name="type" select="$type"/>
-        </xsl:apply-templates>
-      </dl>
-    </div>
-  </xsl:if>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/autoidx-ng.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/autoidx-ng.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,21 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the DocBook XSL Stylesheet distribution.
-     See ../README or http://docbook.sf.net/ for copyright
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- You should have this directly in your customization file. -->
-<!-- This file is there only to retain backward compatibility. -->
-<xsl:import href="autoidx-kosek.xsl"/>
-<xsl:param name="index.method">kosek</xsl:param>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/autoidx.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/autoidx.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,588 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exslt="http://exslt.org/common" xmlns="http://www.w3.org/1999/xhtml" extension-element-prefixes="exslt" exclude-result-prefixes="exslt" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-<!-- The "basic" method derived from Jeni Tennison's work. -->
-<!-- The "kosek" method contributed by Jirka Kosek. -->
-<!-- The "kimber" method contributed by Eliot Kimber of Innodata Isogen. -->
-
-<xsl:variable name="kimber.imported" select="0"/>
-<xsl:variable name="kosek.imported" select="0"/>
-
-<xsl:key name="letter" match="indexterm" use="translate(substring(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])), 1, 1),'Aa&#192;&#224;&#193;&#225;&#194;&#226;&#195;&#227;&#196;&#228;&#197;&#229;&#256;&#257;&#258;&#259;&#260;&#261;&#461;&#462;&#478;&#479;&#480;&#481;&#506;&#507;&#512;&#513;&#514;&#515;&#550;&#551;&#7680;&#7681;&#7834;&#7840;&#7841;&#7842;&#7843;&#7844;&#7845;&#7846;&#7847;&#7848;&#7849;&#7850;&#7851;&#7852;&#7853;&#7854;&#7855;&#7856;&#7857;&#7858;&#7859;&#7860;&#7861;&#7862;&#7863;Bb&#384;&#385;&#595;&#386;&#387;&#7682;&#7683;&#7684;&#7685;&#7686;&#7687;Cc&#199;&#231;&#262;&#263;&#264;&#265;&#266;&#267;&#268;&#269;&#391;&#392;&#597;&#7688;&#7689;Dd&#270;&#271;&#272;&#273;&#394;&#599;&#395;&#396;&#453;&#498;&#545;&#598;&#7690;&#7691;&#7692;&#7693;&#7694;&#7695;&#7696;&#7697;&#7698;&#7699;Ee&#200;&#232;&#201;&#233;&#202;&#234;&#203;&#235;&#274;&#275;&#276;&#277;&#278;&#279;&#280;&#281;&#282;&#283;&#516;&#517;&#518;&#519;&#552;&#553;&#7700;&#7701;&#7702;&#7703;&#7704;&#7705;&#7706;&#7707;&#7708;&#7709;&#7864;&#7865;&#7866;&#7867;&#7868;&#7869;&#7870;&#7871;&#7872;&#7873;&#7874;&#7875;&#7876;&#7877;&#7878;&#7879;Ff&#401;&#402;&#7710;&#7711;Gg&#284;&#285;&#286;&#287;&#288;&#289;&#290;&#291;&#403;&#608;&#484;&#485;&#486;&#487;&#500;&#501;&#7712;&#7713;Hh&#292;&#293;&#294;&#295;&#542;&#543;&#614;&#7714;&#7715;&#7716;&#7717;&#7718;&#7719;&#7720;&#7721;&#7722;&#7723;&#7830;Ii&#204;&#236;&#205;&#237;&#206;&#238;&#207;&#239;&#296;&#297;&#298;&#299;&#300;&#301;&#302;&#303;&#304;&#407;&#616;&#463;&#464;&#520;&#521;&#522;&#523;&#7724;&#7725;&#7726;&#7727;&#7880;&#7881;&#7882;&#7883;Jj&#308;&#309;&#496;&#669;Kk&#310;&#311;&#408;&#409;&#488;&#489;&#7728;&#7729;&#7730;&#7731;&#7732;&#7733;Ll&#313;&#314;&#315;&#316;&#317;&#318;&#319;&#320;&#321;&#322;&#410;&#456;&#564;&#619;&#620;&#621;&#7734;&#7735;&#7736;&#7737;&#7738;&#7739;&#7740;&#7741;Mm&#625;&#7742;&#7743;&#7744;&#7745;&#7746;&#7747;Nn&#209;&#241;&#323;&#324;&#325;&#326;&#327;&#328;&#413;&#626;&#414;&#544;&#459;&#504;&#505;&#565;&#627;&#7748;&#7749;&#7750;&#7751;&#7752;&#7753;&#7754;&#7755;Oo&#210;&#242;&#211;&#243;&#212;&#244;&#213;&#245;&#214;&#246;&#216;&#248;&#332;&#333;&#334;&#335;&#336;&#337;&#415;&#416;&#417;&#465;&#466;&#490;&#491;&#492;&#493;&#510;&#511;&#524;&#525;&#526;&#527;&#554;&#555;&#556;&#557;&#558;&#559;&#560;&#561;&#7756;&#7757;&#7758;&#7759;&#7760;&#7761;&#7762;&#7763;&#7884;&#7885;&#7886;&#7887;&#7888;&#7889;&#7890;&#7891;&#7892;&#7893;&#7894;&#7895;&#7896;&#7897;&#7898;&#7899;&#7900;&#7901;&#7902;&#7903;&#7904;&#7905;&#7906;&#7907;Pp&#420;&#421;&#7764;&#7765;&#7766;&#7767;Qq&#672;Rr&#340;&#341;&#342;&#343;&#344;&#345;&#528;&#529;&#530;&#531;&#636;&#637;&#638;&#7768;&#7769;&#7770;&#7771;&#7772;&#7773;&#7774;&#7775;Ss&#346;&#347;&#348;&#349;&#350;&#351;&#352;&#353;&#536;&#537;&#642;&#7776;&#7777;&#7778;&#7779;&#7780;&#7781;&#7782;&#7783;&#7784;&#7785;Tt&#354;&#355;&#356;&#357;&#358;&#359;&#427;&#428;&#429;&#430;&#648;&#538;&#539;&#566;&#7786;&#7787;&#7788;&#7789;&#7790;&#7791;&#7792;&#7793;&#7831;Uu&#217;&#249;&#218;&#250;&#219;&#251;&#220;&#252;&#360;&#361;&#362;&#363;&#364;&#365;&#366;&#367;&#368;&#369;&#370;&#371;&#431;&#432;&#467;&#468;&#469;&#470;&#471;&#472;&#473;&#474;&#475;&#476;&#532;&#533;&#534;&#535;&#7794;&#7795;&#7796;&#7797;&#7798;&#7799;&#7800;&#7801;&#7802;&#7803;&#7908;&#7909;&#7910;&#7911;&#7912;&#7913;&#7914;&#7915;&#7916;&#7917;&#7918;&#7919;&#7920;&#7921;Vv&#434;&#651;&#7804;&#7805;&#7806;&#7807;Ww&#372;&#373;&#7808;&#7809;&#7810;&#7811;&#7812;&#7813;&#7814;&#7815;&#7816;&#7817;&#7832;Xx&#7818;&#7819;&#7820;&#7821;Yy&#221;&#253;&#255;&#376;&#374;&#375;&#435;&#436;&#562;&#563;&#7822;&#7823;&#7833;&#7922;&#7923;&#7924;&#7925;&#7926;&#7927;&#7928;&#7929;Zz&#377;&#378;&#379;&#380;&#381;&#382;&#437;&#438;&#548;&#549;&#656;&#657;&#7824;&#7825;&#7826;&#7827;&#7828;&#7829;&#7829;','AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ')"/>
-
-<xsl:key name="primary" match="indexterm" use="normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;]))"/>
-
-<xsl:key name="secondary" match="indexterm" use="concat(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])), &quot; &quot;, normalize-space(concat(secondary/@sortas, secondary[not(@sortas) or @sortas = &quot;&quot;])))"/>
-
-<xsl:key name="tertiary" match="indexterm" use="concat(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])), &quot; &quot;, normalize-space(concat(secondary/@sortas, secondary[not(@sortas) or @sortas = &quot;&quot;])), &quot; &quot;, normalize-space(concat(tertiary/@sortas, tertiary[not(@sortas) or @sortas = &quot;&quot;])))"/>
-
-<xsl:key name="endofrange" match="indexterm[@class='endofrange']" use="@startref"/>
-
-<xsl:key name="primary-section" match="indexterm[not(secondary) and not(see)]" use="concat(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])), &quot; &quot;, generate-id((ancestor-or-self::set|ancestor-or-self::book|ancestor-or-self::part|ancestor-or-self::reference|ancestor-or-self::partintro|ancestor-or-self::chapter|ancestor-or-self::appendix|ancestor-or-self::preface|ancestor-or-self::article|ancestor-or-self::section|ancestor-or-self::sect1|ancestor-or-self::sect2|ancestor-or-self::sect3|ancestor-or-self::sect4|ancestor-or-self::sect5|ancestor-or-self::refentry|ancestor-or-self::refsect1|ancestor-or-self::refsect2|ancestor-or-self::refsect3|ancestor-or-self::simplesect|ancestor-or-self::bibliography|ancestor-or-self::glossary|ancestor-or-self::index|ancestor-or-self::webpage)[last()]))"/>
-
-<xsl:key name="secondary-section" match="indexterm[not(tertiary) and not(see)]" use="concat(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])), &quot; &quot;, normalize-space(concat(secondary/@sortas, secondary[not(@sortas) or @sortas = &quot;&quot;])), &quot; &quot;, generate-id((ancestor-or-self::set|ancestor-or-self::book|ancestor-or-self::part|ancestor-or-self::reference|ancestor-or-self::partintro|ancestor-or-self::chapter|ancestor-or-self::appendix|ancestor-or-self::preface|ancestor-or-self::article|ancestor-or-self::section|ancestor-or-self::sect1|ancestor-or-self::sect2|ancestor-or-self::sect3|ancestor-or-self::sect4|ancestor-or-self::sect5|ancestor-or-self::refentry|ancestor-or-self::refsect1|ancestor-or-self::refsect2|ancestor-or-self::refsect3|ancestor-or-self::simplesect|ancestor-or-self::bibliography|ancestor-or-self::glossary|ancestor-or-self::index|ancestor-or-self::webpage)[last()]))"/>
-
-<xsl:key name="tertiary-section" match="indexterm[not(see)]" use="concat(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])), &quot; &quot;, normalize-space(concat(secondary/@sortas, secondary[not(@sortas) or @sortas = &quot;&quot;])), &quot; &quot;, normalize-space(concat(tertiary/@sortas, tertiary[not(@sortas) or @sortas = &quot;&quot;])), &quot; &quot;, generate-id((ancestor-or-self::set|ancestor-or-self::book|ancestor-or-self::part|ancestor-or-self::reference|ancestor-or-self::partintro|ancestor-or-self::chapter|ancestor-or-self::appendix|ancestor-or-self::preface|ancestor-or-self::article|ancestor-or-self::section|ancestor-or-self::sect1|ancestor-or-self::sect2|ancestor-or-self::sect3|ancestor-or-self::sect4|ancestor-or-self::sect5|ancestor-or-self::refentry|ancestor-or-self::refsect1|ancestor-or-self::refsect2|ancestor-or-self::refsect3|ancestor-or-self::simplesect|ancestor-or-self::bibliography|ancestor-or-self::glossary|ancestor-or-self::index|ancestor-or-self::webpage)[last()]))"/>
-
-<xsl:key name="see-also" match="indexterm[seealso]" use="concat(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])), &quot; &quot;, normalize-space(concat(secondary/@sortas, secondary[not(@sortas) or @sortas = &quot;&quot;])), &quot; &quot;, normalize-space(concat(tertiary/@sortas, tertiary[not(@sortas) or @sortas = &quot;&quot;])), &quot; &quot;, seealso)"/>
-
-<xsl:key name="see" match="indexterm[see]" use="concat(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])), &quot; &quot;, normalize-space(concat(secondary/@sortas, secondary[not(@sortas) or @sortas = &quot;&quot;])), &quot; &quot;, normalize-space(concat(tertiary/@sortas, tertiary[not(@sortas) or @sortas = &quot;&quot;])), &quot; &quot;, see)"/>
-
-<xsl:key name="sections" match="*[@id or @xml:id]" use="@id|@xml:id"/>
-
-
-<xsl:template name="generate-index">
-  <xsl:param name="scope" select="(ancestor::book|/)[last()]"/>
-
-  <xsl:choose>
-    <xsl:when test="$index.method = 'kosek'">
-      <xsl:call-template name="generate-kosek-index">
-        <xsl:with-param name="scope" select="$scope"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="$index.method = 'kimber'">
-      <xsl:call-template name="generate-kimber-index">
-        <xsl:with-param name="scope" select="$scope"/>
-      </xsl:call-template>
-    </xsl:when>
-
-    <xsl:otherwise>
-      <xsl:call-template name="generate-basic-index">
-        <xsl:with-param name="scope" select="$scope"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-      
-<xsl:template name="generate-basic-index">
-  <xsl:param name="scope" select="NOTANODE"/>
-
-  <xsl:variable name="role">
-    <xsl:if test="$index.on.role != 0">
-      <xsl:value-of select="@role"/>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:variable name="type">
-    <xsl:if test="$index.on.type != 0">
-      <xsl:value-of select="@type"/>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:variable name="terms" select="//indexterm                         [count(.|key('letter',                           translate(substring(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])), 1, 1),                              'Aa&#192;&#224;&#193;&#225;&#194;&#226;&#195;&#227;&#196;&#228;&#197;&#229;&#256;&#257;&#258;&#259;&#260;&#261;&#461;&#462;&#478;&#479;&#480;&#481;&#506;&#507;&#512;&#513;&#514;&#515;&#550;&#551;&#7680;&#7681;&#7834;&#7840;&#7841;&#7842;&#7843;&#7844;&#7845;&#7846;&#7847;&#7848;&#7849;&#7850;&#7851;&#7852;&#7853;&#7854;&#7855;&#7856;&#7857;&#7858;&#7859;&#7860;&#7861;&#7862;&#7863;Bb&#384;&#385;&#595;&#386;&#387;&#7682;&#7683;&#7684;&#7685;&#7686;&#7687;Cc&#199;&#231;&#262;&#263;&#264;&#265;&#266;&#267;&#268;&#269;&#391;&#392;&#597;&#7688;&#7689;Dd&#270;&#271;&#272;&#273;&#394;&#599;&#395;&#396;&#453;&#498;&#545;&#598;&#7690;&#7691;&#7692;&#7693;&#7694;&#7695;&#7696;&#7697;&#7698;&#7699;Ee&#200;&#232;&#201;&#233;&#202;&#234;&#203;&#235;&#274;&#275;&#276;&#277;&#278;&#279;&#280;&#281;&#282;&#283;&#516;&#517;&#518;&#519;&#552;&#553;&#7700;&#7701;&#7702;&#7703;&#7704;&#7705;&#7706;&#7707;&#7708;&#7709;&#7864;&#7865;&#7866;&#7867;&#7868;&#7869;&#7870;&#7871;&#7872;&#7873;&#7874;&#7875;&#7876;&#7877;&#7878;&#7879;Ff&#401;&#402;&#7710;&#7711;Gg&#284;&#285;&#286;&#287;&#288;&#289;&#290;&#291;&#403;&#608;&#484;&#485;&#486;&#487;&#500;&#501;&#7712;&#7713;Hh&#292;&#293;&#294;&#295;&#542;&#543;&#614;&#7714;&#7715;&#7716;&#7717;&#7718;&#7719;&#7720;&#7721;&#7722;&#7723;&#7830;Ii&#204;&#236;&#205;&#237;&#206;&#238;&#207;&#239;&#296;&#297;&#298;&#299;&#300;&#301;&#302;&#303;&#304;&#407;&#616;&#463;&#464;&#520;&#521;&#522;&#523;&#7724;&#7725;&#7726;&#7727;&#7880;&#7881;&#7882;&#7883;Jj&#308;&#309;&#496;&#669;Kk&#310;&#311;&#408;&#409;&#488;&#489;&#7728;&#7729;&#7730;&#7731;&#7732;&#7733;Ll&#313;&#314;&#315;&#316;&#317;&#318;&#319;&#320;&#321;&#322;&#410;&#456;&#564;&#619;&#620;&#621;&#7734;&#7735;&#7736;&#7737;&#7738;&#7739;&#7740;&#7741;Mm&#625;&#7742;&#7743;&#7744;&#7745;&#7746;&#7747;Nn&#209;&#241;&#323;&#324;&#325;&#326;&#327;&#328;&#413;&#626;&#414;&#544;&#459;&#504;&#505;&#565;&#627;&#7748;&#7749;&#7750;&#7751;&#7752;&#7753;&#7754;&#7755;Oo&#210;&#242;&#211;&#243;&#212;&#244;&#213;&#245;&#214;&#246;&#216;&#248;&#332;&#333;&#334;&#335;&#336;&#337;&#415;&#416;&#417;&#465;&#466;&#490;&#491;&#492;&#493;&#510;&#511;&#524;&#525;&#526;&#527;&#554;&#555;&#556;&#557;&#558;&#559;&#560;&#561;&#7756;&#7757;&#7758;&#7759;&#7760;&#7761;&#7762;&#7763;&#7884;&#7885;&#7886;&#7887;&#7888;&#7889;&#7890;&#7891;&#7892;&#7893;&#7894;&#7895;&#7896;&#7897;&#7898;&#7899;&#7900;&#7901;&#7902;&#7903;&#7904;&#7905;&#7906;&#7907;Pp&#420;&#421;&#7764;&#7765;&#7766;&#7767;Qq&#672;Rr&#340;&#341;&#342;&#343;&#344;&#345;&#528;&#529;&#530;&#531;&#636;&#637;&#638;&#7768;&#7769;&#7770;&#7771;&#7772;&#7773;&#7774;&#7775;Ss&#346;&#347;&#348;&#349;&#350;&#351;&#352;&#353;&#536;&#537;&#642;&#7776;&#7777;&#7778;&#7779;&#7780;&#7781;&#7782;&#7783;&#7784;&#7785;Tt&#354;&#355;&#356;&#357;&#358;&#359;&#427;&#428;&#429;&#430;&#648;&#538;&#539;&#566;&#7786;&#7787;&#7788;&#7789;&#7790;&#7791;&#7792;&#7793;&#7831;Uu&#217;&#249;&#218;&#250;&#219;&#251;&#220;&#252;&#360;&#361;&#362;&#363;&#364;&#365;&#366;&#367;&#368;&#369;&#370;&#371;&#431;&#432;&#467;&#468;&#469;&#470;&#471;&#472;&#473;&#474;&#475;&#476;&#532;&#533;&#534;&#535;&#7794;&#7795;&#7796;&#7797;&#7798;&#7799;&#7800;&#7801;&#7802;&#7803;&#7908;&#7909;&#7910;&#7911;&#7912;&#7913;&#7914;&#7915;&#7916;&#7917;&#7918;&#7919;&#7920;&#7921;Vv&#434;&#651;&#7804;&#7805;&#7806;&#7807;Ww&#372;&#373;&#7808;&#7809;&#7810;&#7811;&#7812;&#7813;&#7814;&#7815;&#7816;&#7817;&#7832;Xx&#7818;&#7819;&#7820;&#7821;Yy&#221;&#253;&#255;&#376;&#374;&#375;&#435;&#436;&#562;&#563;&#7822;&#7823;&#7833;&#7922;&#7923;&#7924;&#7925;&#7926;&#7927;&#7928;&#7929;Zz&#377;&#378;&#379;&#380;&#381;&#382;&#437;&#438;&#548;&#549;&#656;&#657;&#7824;&#7825;&#7826;&#7827;&#7828;&#7829;&#7829;',                              'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ'))                           [count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1]) = 1                           and not(@class = 'endofrange')]"/>
-
-  <xsl:variable name="alphabetical" select="$terms[contains(concat('Aa&#192;&#224;&#193;&#225;&#194;&#226;&#195;&#227;&#196;&#228;&#197;&#229;&#256;&#257;&#258;&#259;&#260;&#261;&#461;&#462;&#478;&#479;&#480;&#481;&#506;&#507;&#512;&#513;&#514;&#515;&#550;&#551;&#7680;&#7681;&#7834;&#7840;&#7841;&#7842;&#7843;&#7844;&#7845;&#7846;&#7847;&#7848;&#7849;&#7850;&#7851;&#7852;&#7853;&#7854;&#7855;&#7856;&#7857;&#7858;&#7859;&#7860;&#7861;&#7862;&#7863;Bb&#384;&#385;&#595;&#386;&#387;&#7682;&#7683;&#7684;&#7685;&#7686;&#7687;Cc&#199;&#231;&#262;&#263;&#264;&#265;&#266;&#267;&#268;&#269;&#391;&#392;&#597;&#7688;&#7689;Dd&#270;&#271;&#272;&#273;&#394;&#599;&#395;&#396;&#453;&#498;&#545;&#598;&#7690;&#7691;&#7692;&#7693;&#7694;&#7695;&#7696;&#7697;&#7698;&#7699;Ee&#200;&#232;&#201;&#233;&#202;&#234;&#203;&#235;&#274;&#275;&#276;&#277;&#278;&#279;&#280;&#281;&#282;&#283;&#516;&#517;&#518;&#519;&#552;&#553;&#7700;&#7701;&#7702;&#7703;&#7704;&#7705;&#7706;&#7707;&#7708;&#7709;&#7864;&#7865;&#7866;&#7867;&#7868;&#7869;&#7870;&#7871;&#7872;&#7873;&#7874;&#7875;&#7876;&#7877;&#7878;&#7879;Ff&#401;&#402;&#7710;&#7711;Gg&#284;&#285;&#286;&#287;&#288;&#289;&#290;&#291;&#403;&#608;&#484;&#485;&#486;&#487;&#500;&#501;&#7712;&#7713;Hh&#292;&#293;&#294;&#295;&#542;&#543;&#614;&#7714;&#7715;&#7716;&#7717;&#7718;&#7719;&#7720;&#7721;&#7722;&#7723;&#7830;Ii&#204;&#236;&#205;&#237;&#206;&#238;&#207;&#239;&#296;&#297;&#298;&#299;&#300;&#301;&#302;&#303;&#304;&#407;&#616;&#463;&#464;&#520;&#521;&#522;&#523;&#7724;&#7725;&#7726;&#7727;&#7880;&#7881;&#7882;&#7883;Jj&#308;&#309;&#496;&#669;Kk&#310;&#311;&#408;&#409;&#488;&#489;&#7728;&#7729;&#7730;&#7731;&#7732;&#7733;Ll&#313;&#314;&#315;&#316;&#317;&#318;&#319;&#320;&#321;&#322;&#410;&#456;&#564;&#619;&#620;&#621;&#7734;&#7735;&#7736;&#7737;&#7738;&#7739;&#7740;&#7741;Mm&#625;&#7742;&#7743;&#7744;&#7745;&#7746;&#7747;Nn&#209;&#241;&#323;&#324;&#325;&#326;&#327;&#328;&#413;&#626;&#414;&#544;&#459;&#504;&#505;&#565;&#627;&#7748;&#7749;&#7750;&#7751;&#7752;&#7753;&#7754;&#7755;Oo&#210;&#242;&#211;&#243;&#212;&#244;&#213;&#245;&#214;&#246;&#216;&#248;&#332;&#333;&#334;&#335;&#336;&#337;&#415;&#416;&#417;&#465;&#466;&#490;&#491;&#492;&#493;&#510;&#511;&#524;&#525;&#526;&#527;&#554;&#555;&#556;&#557;&#558;&#559;&#560;&#561;&#7756;&#7757;&#7758;&#7759;&#7760;&#7761;&#7762;&#7763;&#7884;&#7885;&#7886;&#7887;&#7888;&#7889;&#7890;&#7891;&#7892;&#7893;&#7894;&#7895;&#7896;&#7897;&#7898;&#7899;&#7900;&#7901;&#7902;&#7903;&#7904;&#7905;&#7906;&#7907;Pp&#420;&#421;&#7764;&#7765;&#7766;&#7767;Qq&#672;Rr&#340;&#341;&#342;&#343;&#344;&#345;&#528;&#529;&#530;&#531;&#636;&#637;&#638;&#7768;&#7769;&#7770;&#7771;&#7772;&#7773;&#7774;&#7775;Ss&#346;&#347;&#348;&#349;&#350;&#351;&#352;&#353;&#536;&#537;&#642;&#7776;&#7777;&#7778;&#7779;&#7780;&#7781;&#7782;&#7783;&#7784;&#7785;Tt&#354;&#355;&#356;&#357;&#358;&#359;&#427;&#428;&#429;&#430;&#648;&#538;&#539;&#566;&#7786;&#7787;&#7788;&#7789;&#7790;&#7791;&#7792;&#7793;&#7831;Uu&#217;&#249;&#218;&#250;&#219;&#251;&#220;&#252;&#360;&#361;&#362;&#363;&#364;&#365;&#366;&#367;&#368;&#369;&#370;&#371;&#431;&#432;&#467;&#468;&#469;&#470;&#471;&#472;&#473;&#474;&#475;&#476;&#532;&#533;&#534;&#535;&#7794;&#7795;&#7796;&#7797;&#7798;&#7799;&#7800;&#7801;&#7802;&#7803;&#7908;&#7909;&#7910;&#7911;&#7912;&#7913;&#7914;&#7915;&#7916;&#7917;&#7918;&#7919;&#7920;&#7921;Vv&#434;&#651;&#7804;&#7805;&#7806;&#7807;Ww&#372;&#373;&#7808;&#7809;&#7810;&#7811;&#7812;&#7813;&#7814;&#7815;&#7816;&#7817;&#7832;Xx&#7818;&#7819;&#7820;&#7821;Yy&#221;&#253;&#255;&#376;&#374;&#375;&#435;&#436;&#562;&#563;&#7822;&#7823;&#7833;&#7922;&#7923;&#7924;&#7925;&#7926;&#7927;&#7928;&#7929;Zz&#377;&#378;&#379;&#380;&#381;&#382;&#437;&#438;&#548;&#549;&#656;&#657;&#7824;&#7825;&#7826;&#7827;&#7828;&#7829;&#7829;', 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ'),                                         substring(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])), 1, 1))]"/>
-
-  <xsl:variable name="others" select="$terms[not(contains(concat('Aa&#192;&#224;&#193;&#225;&#194;&#226;&#195;&#227;&#196;&#228;&#197;&#229;&#256;&#257;&#258;&#259;&#260;&#261;&#461;&#462;&#478;&#479;&#480;&#481;&#506;&#507;&#512;&#513;&#514;&#515;&#550;&#551;&#7680;&#7681;&#7834;&#7840;&#7841;&#7842;&#7843;&#7844;&#7845;&#7846;&#7847;&#7848;&#7849;&#7850;&#7851;&#7852;&#7853;&#7854;&#7855;&#7856;&#7857;&#7858;&#7859;&#7860;&#7861;&#7862;&#7863;Bb&#384;&#385;&#595;&#386;&#387;&#7682;&#7683;&#7684;&#7685;&#7686;&#7687;Cc&#199;&#231;&#262;&#263;&#264;&#265;&#266;&#267;&#268;&#269;&#391;&#392;&#597;&#7688;&#7689;Dd&#270;&#271;&#272;&#273;&#394;&#599;&#395;&#396;&#453;&#498;&#545;&#598;&#7690;&#7691;&#7692;&#7693;&#7694;&#7695;&#7696;&#7697;&#7698;&#7699;Ee&#200;&#232;&#201;&#233;&#202;&#234;&#203;&#235;&#274;&#275;&#276;&#277;&#278;&#279;&#280;&#281;&#282;&#283;&#516;&#517;&#518;&#519;&#552;&#553;&#7700;&#7701;&#7702;&#7703;&#7704;&#7705;&#7706;&#7707;&#7708;&#7709;&#7864;&#7865;&#7866;&#7867;&#7868;&#7869;&#7870;&#7871;&#7872;&#7873;&#7874;&#7875;&#7876;&#7877;&#7878;&#7879;Ff&#401;&#402;&#7710;&#7711;Gg&#284;&#285;&#286;&#287;&#288;&#289;&#290;&#291;&#403;&#608;&#484;&#485;&#486;&#487;&#500;&#501;&#7712;&#7713;Hh&#292;&#293;&#294;&#295;&#542;&#543;&#614;&#7714;&#7715;&#7716;&#7717;&#7718;&#7719;&#7720;&#7721;&#7722;&#7723;&#7830;Ii&#204;&#236;&#205;&#237;&#206;&#238;&#207;&#239;&#296;&#297;&#298;&#299;&#300;&#301;&#302;&#303;&#304;&#407;&#616;&#463;&#464;&#520;&#521;&#522;&#523;&#7724;&#7725;&#7726;&#7727;&#7880;&#7881;&#7882;&#7883;Jj&#308;&#309;&#496;&#669;Kk&#310;&#311;&#408;&#409;&#488;&#489;&#7728;&#7729;&#7730;&#7731;&#7732;&#7733;Ll&#313;&#314;&#315;&#316;&#317;&#318;&#319;&#320;&#321;&#322;&#410;&#456;&#564;&#619;&#620;&#621;&#7734;&#7735;&#7736;&#7737;&#7738;&#7739;&#7740;&#7741;Mm&#625;&#7742;&#7743;&#7744;&#7745;&#7746;&#7747;Nn&#209;&#241;&#323;&#324;&#325;&#326;&#327;&#328;&#413;&#626;&#414;&#544;&#459;&#504;&#505;&#565;&#627;&#7748;&#7749;&#7750;&#7751;&#7752;&#7753;&#7754;&#7755;Oo&#210;&#242;&#211;&#243;&#212;&#244;&#213;&#245;&#214;&#246;&#216;&#248;&#332;&#333;&#334;&#335;&#336;&#337;&#415;&#416;&#417;&#465;&#466;&#490;&#491;&#492;&#493;&#510;&#511;&#524;&#525;&#526;&#527;&#554;&#555;&#556;&#557;&#558;&#559;&#560;&#561;&#7756;&#7757;&#7758;&#7759;&#7760;&#7761;&#7762;&#7763;&#7884;&#7885;&#7886;&#7887;&#7888;&#7889;&#7890;&#7891;&#7892;&#7893;&#7894;&#7895;&#7896;&#7897;&#7898;&#7899;&#7900;&#7901;&#7902;&#7903;&#7904;&#7905;&#7906;&#7907;Pp&#420;&#421;&#7764;&#7765;&#7766;&#7767;Qq&#672;Rr&#340;&#341;&#342;&#343;&#344;&#345;&#528;&#529;&#530;&#531;&#636;&#637;&#638;&#7768;&#7769;&#7770;&#7771;&#7772;&#7773;&#7774;&#7775;Ss&#346;&#347;&#348;&#349;&#350;&#351;&#352;&#353;&#536;&#537;&#642;&#7776;&#7777;&#7778;&#7779;&#7780;&#7781;&#7782;&#7783;&#7784;&#7785;Tt&#354;&#355;&#356;&#357;&#358;&#359;&#427;&#428;&#429;&#430;&#648;&#538;&#539;&#566;&#7786;&#7787;&#7788;&#7789;&#7790;&#7791;&#7792;&#7793;&#7831;Uu&#217;&#249;&#218;&#250;&#219;&#251;&#220;&#252;&#360;&#361;&#362;&#363;&#364;&#365;&#366;&#367;&#368;&#369;&#370;&#371;&#431;&#432;&#467;&#468;&#469;&#470;&#471;&#472;&#473;&#474;&#475;&#476;&#532;&#533;&#534;&#535;&#7794;&#7795;&#7796;&#7797;&#7798;&#7799;&#7800;&#7801;&#7802;&#7803;&#7908;&#7909;&#7910;&#7911;&#7912;&#7913;&#7914;&#7915;&#7916;&#7917;&#7918;&#7919;&#7920;&#7921;Vv&#434;&#651;&#7804;&#7805;&#7806;&#7807;Ww&#372;&#373;&#7808;&#7809;&#7810;&#7811;&#7812;&#7813;&#7814;&#7815;&#7816;&#7817;&#7832;Xx&#7818;&#7819;&#7820;&#7821;Yy&#221;&#253;&#255;&#376;&#374;&#375;&#435;&#436;&#562;&#563;&#7822;&#7823;&#7833;&#7922;&#7923;&#7924;&#7925;&#7926;&#7927;&#7928;&#7929;Zz&#377;&#378;&#379;&#380;&#381;&#382;&#437;&#438;&#548;&#549;&#656;&#657;&#7824;&#7825;&#7826;&#7827;&#7828;&#7829;&#7829;',                                                  'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ'),                                              substring(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])), 1, 1)))]"/>
-  <div class="index">
-    <xsl:if test="$others">
-      <div class="indexdiv">
-        <h3>
-          <xsl:call-template name="gentext">
-            <xsl:with-param name="key" select="'index symbols'"/>
-          </xsl:call-template>
-        </h3>
-        <dl>
-          <xsl:apply-templates select="$others[count(.|key('primary',                                        normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1]) = 1]" mode="index-symbol-div">
-            <xsl:with-param name="position" select="position()"/>                                
-            <xsl:with-param name="scope" select="$scope"/>
-            <xsl:with-param name="role" select="$role"/>
-            <xsl:with-param name="type" select="$type"/>
-            <xsl:sort select="translate(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])), 'Aa&#192;&#224;&#193;&#225;&#194;&#226;&#195;&#227;&#196;&#228;&#197;&#229;&#256;&#257;&#258;&#259;&#260;&#261;&#461;&#462;&#478;&#479;&#480;&#481;&#506;&#507;&#512;&#513;&#514;&#515;&#550;&#551;&#7680;&#7681;&#7834;&#7840;&#7841;&#7842;&#7843;&#7844;&#7845;&#7846;&#7847;&#7848;&#7849;&#7850;&#7851;&#7852;&#7853;&#7854;&#7855;&#7856;&#7857;&#7858;&#7859;&#7860;&#7861;&#7862;&#7863;Bb&#384;&#385;&#595;&#386;&#387;&#7682;&#7683;&#7684;&#7685;&#7686;&#7687;Cc&#199;&#231;&#262;&#263;&#264;&#265;&#266;&#267;&#268;&#269;&#391;&#392;&#597;&#7688;&#7689;Dd&#270;&#271;&#272;&#273;&#394;&#599;&#395;&#396;&#453;&#498;&#545;&#598;&#7690;&#7691;&#7692;&#7693;&#7694;&#7695;&#7696;&#7697;&#7698;&#7699;Ee&#200;&#232;&#201;&#233;&#202;&#234;&#203;&#235;&#274;&#275;&#276;&#277;&#278;&#279;&#280;&#281;&#282;&#283;&#516;&#517;&#518;&#519;&#552;&#553;&#7700;&#7701;&#7702;&#7703;&#7704;&#7705;&#7706;&#7707;&#7708;&#7709;&#7864;&#7865;&#7866;&#7867;&#7868;&#7869;&#7870;&#7871;&#7872;&#7873;&#7874;&#7875;&#7876;&#7877;&#7878;&#7879;Ff&#401;&#402;&#7710;&#7711;Gg&#284;&#285;&#286;&#287;&#288;&#289;&#290;&#291;&#403;&#608;&#484;&#485;&#486;&#487;&#500;&#501;&#7712;&#7713;Hh&#292;&#293;&#294;&#295;&#542;&#543;&#614;&#7714;&#7715;&#7716;&#7717;&#7718;&#7719;&#7720;&#7721;&#7722;&#7723;&#7830;Ii&#204;&#236;&#205;&#237;&#206;&#238;&#207;&#239;&#296;&#297;&#298;&#299;&#300;&#301;&#302;&#303;&#304;&#407;&#616;&#463;&#464;&#520;&#521;&#522;&#523;&#7724;&#7725;&#7726;&#7727;&#7880;&#7881;&#7882;&#7883;Jj&#308;&#309;&#496;&#669;Kk&#310;&#311;&#408;&#409;&#488;&#489;&#7728;&#7729;&#7730;&#7731;&#7732;&#7733;Ll&#313;&#314;&#315;&#316;&#317;&#318;&#319;&#320;&#321;&#322;&#410;&#456;&#564;&#619;&#620;&#621;&#7734;&#7735;&#7736;&#7737;&#7738;&#7739;&#7740;&#7741;Mm&#625;&#7742;&#7743;&#7744;&#7745;&#7746;&#7747;Nn&#209;&#241;&#323;&#324;&#325;&#326;&#327;&#328;&#413;&#626;&#414;&#544;&#459;&#504;&#505;&#565;&#627;&#7748;&#7749;&#7750;&#7751;&#7752;&#7753;&#7754;&#7755;Oo&#210;&#242;&#211;&#243;&#212;&#244;&#213;&#245;&#214;&#246;&#216;&#248;&#332;&#333;&#334;&#335;&#336;&#337;&#415;&#416;&#417;&#465;&#466;&#490;&#491;&#492;&#493;&#510;&#511;&#524;&#525;&#526;&#527;&#554;&#555;&#556;&#557;&#558;&#559;&#560;&#561;&#7756;&#7757;&#7758;&#7759;&#7760;&#7761;&#7762;&#7763;&#7884;&#7885;&#7886;&#7887;&#7888;&#7889;&#7890;&#7891;&#7892;&#7893;&#7894;&#7895;&#7896;&#7897;&#7898;&#7899;&#7900;&#7901;&#7902;&#7903;&#7904;&#7905;&#7906;&#7907;Pp&#420;&#421;&#7764;&#7765;&#7766;&#7767;Qq&#672;Rr&#340;&#341;&#342;&#343;&#344;&#345;&#528;&#529;&#530;&#531;&#636;&#637;&#638;&#7768;&#7769;&#7770;&#7771;&#7772;&#7773;&#7774;&#7775;Ss&#346;&#347;&#348;&#349;&#350;&#351;&#352;&#353;&#536;&#537;&#642;&#7776;&#7777;&#7778;&#7779;&#7780;&#7781;&#7782;&#7783;&#7784;&#7785;Tt&#354;&#355;&#356;&#357;&#358;&#359;&#427;&#428;&#429;&#430;&#648;&#538;&#539;&#566;&#7786;&#7787;&#7788;&#7789;&#7790;&#7791;&#7792;&#7793;&#7831;Uu&#217;&#249;&#218;&#250;&#219;&#251;&#220;&#252;&#360;&#361;&#362;&#363;&#364;&#365;&#366;&#367;&#368;&#369;&#370;&#371;&#431;&#432;&#467;&#468;&#469;&#470;&#471;&#472;&#473;&#474;&#475;&#476;&#532;&#533;&#534;&#535;&#7794;&#7795;&#7796;&#7797;&#7798;&#7799;&#7800;&#7801;&#7802;&#7803;&#7908;&#7909;&#7910;&#7911;&#7912;&#7913;&#7914;&#7915;&#7916;&#7917;&#7918;&#7919;&#7920;&#7921;Vv&#434;&#651;&#7804;&#7805;&#7806;&#7807;Ww&#372;&#373;&#7808;&#7809;&#7810;&#7811;&#7812;&#7813;&#7814;&#7815;&#7816;&#7817;&#7832;Xx&#7818;&#7819;&#7820;&#7821;Yy&#221;&#253;&#255;&#376;&#374;&#375;&#435;&#436;&#562;&#563;&#7822;&#7823;&#7833;&#7922;&#7923;&#7924;&#7925;&#7926;&#7927;&#7928;&#7929;Zz&#377;&#378;&#379;&#380;&#381;&#382;&#437;&#438;&#548;&#549;&#656;&#657;&#7824;&#7825;&#7826;&#7827;&#7828;&#7829;&#7829;', 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ')"/>
-          </xsl:apply-templates>
-        </dl>
-      </div>
-    </xsl:if>
-
-    <xsl:apply-templates select="$alphabetical[count(.|key('letter',                                  translate(substring(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])), 1, 1),                                            'Aa&#192;&#224;&#193;&#225;&#194;&#226;&#195;&#227;&#196;&#228;&#197;&#229;&#256;&#257;&#258;&#259;&#260;&#261;&#461;&#462;&#478;&#479;&#480;&#481;&#506;&#507;&#512;&#513;&#514;&#515;&#550;&#551;&#7680;&#7681;&#7834;&#7840;&#7841;&#7842;&#7843;&#7844;&#7845;&#7846;&#7847;&#7848;&#7849;&#7850;&#7851;&#7852;&#7853;&#7854;&#7855;&#7856;&#7857;&#7858;&#7859;&#7860;&#7861;&#7862;&#7863;Bb&#384;&#385;&#595;&#386;&#387;&#7682;&#7683;&#7684;&#7685;&#7686;&#7687;Cc&#199;&#231;&#262;&#263;&#264;&#265;&#266;&#267;&#268;&#269;&#391;&#392;&#597;&#7688;&#7689;Dd&#270;&#271;&#272;&#273;&#394;&#599;&#395;&#396;&#453;&#498;&#545;&#598;&#7690;&#7691;&#7692;&#7693;&#7694;&#7695;&#7696;&#7697;&#7698;&#7699;Ee&#200;&#232;&#201;&#233;&#202;&#234;&#203;&#235;&#274;&#275;&#276;&#277;&#278;&#279;&#280;&#281;&#282;&#283;&#516;&#517;&#518;&#519;&#552;&#553;&#7700;&#7701;&#7702;&#7703;&#7704;&#7705;&#7706;&#7707;&#7708;&#7709;&#7864;&#7865;&#7866;&#7867;&#7868;&#7869;&#7870;&#7871;&#7872;&#7873;&#7874;&#7875;&#7876;&#7877;&#7878;&#7879;Ff&#401;&#402;&#7710;&#7711;Gg&#284;&#285;&#286;&#287;&#288;&#289;&#290;&#291;&#403;&#608;&#484;&#485;&#486;&#487;&#500;&#501;&#7712;&#7713;Hh&#292;&#293;&#294;&#295;&#542;&#543;&#614;&#7714;&#7715;&#7716;&#7717;&#7718;&#7719;&#7720;&#7721;&#7722;&#7723;&#7830;Ii&#204;&#236;&#205;&#237;&#206;&#238;&#207;&#239;&#296;&#297;&#298;&#299;&#300;&#301;&#302;&#303;&#304;&#407;&#616;&#463;&#464;&#520;&#521;&#522;&#523;&#7724;&#7725;&#7726;&#7727;&#7880;&#7881;&#7882;&#7883;Jj&#308;&#309;&#496;&#669;Kk&#310;&#311;&#408;&#409;&#488;&#489;&#7728;&#7729;&#7730;&#7731;&#7732;&#7733;Ll&#313;&#314;&#315;&#316;&#317;&#318;&#319;&#320;&#321;&#322;&#410;&#456;&#564;&#619;&#620;&#621;&#7734;&#7735;&#7736;&#7737;&#7738;&#7739;&#7740;&#7741;Mm&#625;&#7742;&#7743;&#7744;&#7745;&#7746;&#7747;Nn&#209;&#241;&#323;&#324;&#325;&#326;&#327;&#328;&#413;&#626;&#414;&#544;&#459;&#504;&#505;&#565;&#627;&#7748;&#7749;&#7750;&#7751;&#7752;&#7753;&#7754;&#7755;Oo&#210;&#242;&#211;&#243;&#212;&#244;&#213;&#245;&#214;&#246;&#216;&#248;&#332;&#333;&#334;&#335;&#336;&#337;&#415;&#416;&#417;&#465;&#466;&#490;&#491;&#492;&#493;&#510;&#511;&#524;&#525;&#526;&#527;&#554;&#555;&#556;&#557;&#558;&#559;&#560;&#561;&#7756;&#7757;&#7758;&#7759;&#7760;&#7761;&#7762;&#7763;&#7884;&#7885;&#7886;&#7887;&#7888;&#7889;&#7890;&#7891;&#7892;&#7893;&#7894;&#7895;&#7896;&#7897;&#7898;&#7899;&#7900;&#7901;&#7902;&#7903;&#7904;&#7905;&#7906;&#7907;Pp&#420;&#421;&#7764;&#7765;&#7766;&#7767;Qq&#672;Rr&#340;&#341;&#342;&#343;&#344;&#345;&#528;&#529;&#530;&#531;&#636;&#637;&#638;&#7768;&#7769;&#7770;&#7771;&#7772;&#7773;&#7774;&#7775;Ss&#346;&#347;&#348;&#349;&#350;&#351;&#352;&#353;&#536;&#537;&#642;&#7776;&#7777;&#7778;&#7779;&#7780;&#7781;&#7782;&#7783;&#7784;&#7785;Tt&#354;&#355;&#356;&#357;&#358;&#359;&#427;&#428;&#429;&#430;&#648;&#538;&#539;&#566;&#7786;&#7787;&#7788;&#7789;&#7790;&#7791;&#7792;&#7793;&#7831;Uu&#217;&#249;&#218;&#250;&#219;&#251;&#220;&#252;&#360;&#361;&#362;&#363;&#364;&#365;&#366;&#367;&#368;&#369;&#370;&#371;&#431;&#432;&#467;&#468;&#469;&#470;&#471;&#472;&#473;&#474;&#475;&#476;&#532;&#533;&#534;&#535;&#7794;&#7795;&#7796;&#7797;&#7798;&#7799;&#7800;&#7801;&#7802;&#7803;&#7908;&#7909;&#7910;&#7911;&#7912;&#7913;&#7914;&#7915;&#7916;&#7917;&#7918;&#7919;&#7920;&#7921;Vv&#434;&#651;&#7804;&#7805;&#7806;&#7807;Ww&#372;&#373;&#7808;&#7809;&#7810;&#7811;&#7812;&#7813;&#7814;&#7815;&#7816;&#7817;&#7832;Xx&#7818;&#7819;&#7820;&#7821;Yy&#221;&#253;&#255;&#376;&#374;&#375;&#435;&#436;&#562;&#563;&#7822;&#7823;&#7833;&#7922;&#7923;&#7924;&#7925;&#7926;&#7927;&#7928;&#7929;Zz&#377;&#378;&#379;&#380;&#381;&#382;&#437;&#438;&#548;&#549;&#656;&#657;&#7824;&#7825;&#7826;&#7827;&#7828;&#7829;&#7829;','AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ'))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1]) = 1]" mode="index-div-basic">
-      <xsl:with-param name="position" select="position()"/>
-      <xsl:with-param name="scope" select="$scope"/>
-      <xsl:with-param name="role" select="$role"/>
-      <xsl:with-param name="type" select="$type"/>
-      <xsl:sort select="translate(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])), 'Aa&#192;&#224;&#193;&#225;&#194;&#226;&#195;&#227;&#196;&#228;&#197;&#229;&#256;&#257;&#258;&#259;&#260;&#261;&#461;&#462;&#478;&#479;&#480;&#481;&#506;&#507;&#512;&#513;&#514;&#515;&#550;&#551;&#7680;&#7681;&#7834;&#7840;&#7841;&#7842;&#7843;&#7844;&#7845;&#7846;&#7847;&#7848;&#7849;&#7850;&#7851;&#7852;&#7853;&#7854;&#7855;&#7856;&#7857;&#7858;&#7859;&#7860;&#7861;&#7862;&#7863;Bb&#384;&#385;&#595;&#386;&#387;&#7682;&#7683;&#7684;&#7685;&#7686;&#7687;Cc&#199;&#231;&#262;&#263;&#264;&#265;&#266;&#267;&#268;&#269;&#391;&#392;&#597;&#7688;&#7689;Dd&#270;&#271;&#272;&#273;&#394;&#599;&#395;&#396;&#453;&#498;&#545;&#598;&#7690;&#7691;&#7692;&#7693;&#7694;&#7695;&#7696;&#7697;&#7698;&#7699;Ee&#200;&#232;&#201;&#233;&#202;&#234;&#203;&#235;&#274;&#275;&#276;&#277;&#278;&#279;&#280;&#281;&#282;&#283;&#516;&#517;&#518;&#519;&#552;&#553;&#7700;&#7701;&#7702;&#7703;&#7704;&#7705;&#7706;&#7707;&#7708;&#7709;&#7864;&#7865;&#7866;&#7867;&#7868;&#7869;&#7870;&#7871;&#7872;&#7873;&#7874;&#7875;&#7876;&#7877;&#7878;&#7879;Ff&#401;&#402;&#7710;&#7711;Gg&#284;&#285;&#286;&#287;&#288;&#289;&#290;&#291;&#403;&#608;&#484;&#485;&#486;&#487;&#500;&#501;&#7712;&#7713;Hh&#292;&#293;&#294;&#295;&#542;&#543;&#614;&#7714;&#7715;&#7716;&#7717;&#7718;&#7719;&#7720;&#7721;&#7722;&#7723;&#7830;Ii&#204;&#236;&#205;&#237;&#206;&#238;&#207;&#239;&#296;&#297;&#298;&#299;&#300;&#301;&#302;&#303;&#304;&#407;&#616;&#463;&#464;&#520;&#521;&#522;&#523;&#7724;&#7725;&#7726;&#7727;&#7880;&#7881;&#7882;&#7883;Jj&#308;&#309;&#496;&#669;Kk&#310;&#311;&#408;&#409;&#488;&#489;&#7728;&#7729;&#7730;&#7731;&#7732;&#7733;Ll&#313;&#314;&#315;&#316;&#317;&#318;&#319;&#320;&#321;&#322;&#410;&#456;&#564;&#619;&#620;&#621;&#7734;&#7735;&#7736;&#7737;&#7738;&#7739;&#7740;&#7741;Mm&#625;&#7742;&#7743;&#7744;&#7745;&#7746;&#7747;Nn&#209;&#241;&#323;&#324;&#325;&#326;&#327;&#328;&#413;&#626;&#414;&#544;&#459;&#504;&#505;&#565;&#627;&#7748;&#7749;&#7750;&#7751;&#7752;&#7753;&#7754;&#7755;Oo&#210;&#242;&#211;&#243;&#212;&#244;&#213;&#245;&#214;&#246;&#216;&#248;&#332;&#333;&#334;&#335;&#336;&#337;&#415;&#416;&#417;&#465;&#466;&#490;&#491;&#492;&#493;&#510;&#511;&#524;&#525;&#526;&#527;&#554;&#555;&#556;&#557;&#558;&#559;&#560;&#561;&#7756;&#7757;&#7758;&#7759;&#7760;&#7761;&#7762;&#7763;&#7884;&#7885;&#7886;&#7887;&#7888;&#7889;&#7890;&#7891;&#7892;&#7893;&#7894;&#7895;&#7896;&#7897;&#7898;&#7899;&#7900;&#7901;&#7902;&#7903;&#7904;&#7905;&#7906;&#7907;Pp&#420;&#421;&#7764;&#7765;&#7766;&#7767;Qq&#672;Rr&#340;&#341;&#342;&#343;&#344;&#345;&#528;&#529;&#530;&#531;&#636;&#637;&#638;&#7768;&#7769;&#7770;&#7771;&#7772;&#7773;&#7774;&#7775;Ss&#346;&#347;&#348;&#349;&#350;&#351;&#352;&#353;&#536;&#537;&#642;&#7776;&#7777;&#7778;&#7779;&#7780;&#7781;&#7782;&#7783;&#7784;&#7785;Tt&#354;&#355;&#356;&#357;&#358;&#359;&#427;&#428;&#429;&#430;&#648;&#538;&#539;&#566;&#7786;&#7787;&#7788;&#7789;&#7790;&#7791;&#7792;&#7793;&#7831;Uu&#217;&#249;&#218;&#250;&#219;&#251;&#220;&#252;&#360;&#361;&#362;&#363;&#364;&#365;&#366;&#367;&#368;&#369;&#370;&#371;&#431;&#432;&#467;&#468;&#469;&#470;&#471;&#472;&#473;&#474;&#475;&#476;&#532;&#533;&#534;&#535;&#7794;&#7795;&#7796;&#7797;&#7798;&#7799;&#7800;&#7801;&#7802;&#7803;&#7908;&#7909;&#7910;&#7911;&#7912;&#7913;&#7914;&#7915;&#7916;&#7917;&#7918;&#7919;&#7920;&#7921;Vv&#434;&#651;&#7804;&#7805;&#7806;&#7807;Ww&#372;&#373;&#7808;&#7809;&#7810;&#7811;&#7812;&#7813;&#7814;&#7815;&#7816;&#7817;&#7832;Xx&#7818;&#7819;&#7820;&#7821;Yy&#221;&#253;&#255;&#376;&#374;&#375;&#435;&#436;&#562;&#563;&#7822;&#7823;&#7833;&#7922;&#7923;&#7924;&#7925;&#7926;&#7927;&#7928;&#7929;Zz&#377;&#378;&#379;&#380;&#381;&#382;&#437;&#438;&#548;&#549;&#656;&#657;&#7824;&#7825;&#7826;&#7827;&#7828;&#7829;&#7829;', 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ')"/>
-    </xsl:apply-templates>
-  </div>
-</xsl:template>
-
-<!-- This template not used if html/autoidx-kosek.xsl is imported -->
-<xsl:template name="generate-kosek-index">
-  <xsl:param name="scope" select="NOTANODE"/>
-
-  <xsl:variable name="vendor" select="system-property('xsl:vendor')"/>
-  <xsl:if test="contains($vendor, 'libxslt')">
-    <xsl:message terminate="yes">
-      <xsl:text>ERROR: the 'kosek' index method does not </xsl:text>
-      <xsl:text>work with the xsltproc XSLT processor.</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-
-  <xsl:if test="not(function-available('exslt:node-set') or                     function-available('exslt:nodeSet'))">
-    <xsl:message terminate="yes">
-      <xsl:text>ERROR: the 'kosek' index method requires the </xsl:text>
-      <xsl:text>exslt:node-set() function. Use a processor that </xsl:text>
-      <xsl:text>has it, or use a different index method.</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <xsl:if test="$kosek.imported = 0">
-    <xsl:message terminate="yes">
-      <xsl:text>ERROR: the 'kosek' index method requires the
-</xsl:text>
-      <xsl:text>kosek index extensions be imported:
-</xsl:text>
-      <xsl:text>  xsl:import href="html/autoidx-kosek.xsl"</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-</xsl:template>
-
-<!-- This template not used if html/autoidx-kimber.xsl is imported -->
-<xsl:template name="generate-kimber-index">
-  <xsl:param name="scope" select="NOTANODE"/>
-
-  <xsl:variable name="vendor" select="system-property('xsl:vendor')"/>
-  <xsl:if test="not(contains($vendor, 'SAXON '))">
-    <xsl:message terminate="yes">
-      <xsl:text>ERROR: the 'kimber' index method requires the </xsl:text>
-      <xsl:text>Saxon version 6 or 8 XSLT processor.</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <xsl:if test="$kimber.imported = 0">
-    <xsl:message terminate="yes">
-      <xsl:text>ERROR: the 'kimber' index method requires the
-</xsl:text>
-      <xsl:text>kimber index extensions be imported:
-</xsl:text>
-      <xsl:text>  xsl:import href="html/autoidx-kimber.xsl"</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-</xsl:template>
-
-<xsl:template match="indexterm" mode="index-div-basic">
-  <xsl:param name="scope" select="."/>
-  <xsl:param name="role" select="''"/>
-  <xsl:param name="type" select="''"/>
-
-  <xsl:variable name="key" select="translate(substring(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])), 1, 1),                          'Aa&#192;&#224;&#193;&#225;&#194;&#226;&#195;&#227;&#196;&#228;&#197;&#229;&#256;&#257;&#258;&#259;&#260;&#261;&#461;&#462;&#478;&#479;&#480;&#481;&#506;&#507;&#512;&#513;&#514;&#515;&#550;&#551;&#7680;&#7681;&#7834;&#7840;&#7841;&#7842;&#7843;&#7844;&#7845;&#7846;&#7847;&#7848;&#7849;&#7850;&#7851;&#7852;&#7853;&#7854;&#7855;&#7856;&#7857;&#7858;&#7859;&#7860;&#7861;&#7862;&#7863;Bb&#384;&#385;&#595;&#386;&#387;&#7682;&#7683;&#7684;&#7685;&#7686;&#7687;Cc&#199;&#231;&#262;&#263;&#264;&#265;&#266;&#267;&#268;&#269;&#391;&#392;&#597;&#7688;&#7689;Dd&#270;&#271;&#272;&#273;&#394;&#599;&#395;&#396;&#453;&#498;&#545;&#598;&#7690;&#7691;&#7692;&#7693;&#7694;&#7695;&#7696;&#7697;&#7698;&#7699;Ee&#200;&#232;&#201;&#233;&#202;&#234;&#203;&#235;&#274;&#275;&#276;&#277;&#278;&#279;&#280;&#281;&#282;&#283;&#516;&#517;&#518;&#519;&#552;&#553;&#7700;&#7701;&#7702;&#7703;&#7704;&#7705;&#7706;&#7707;&#7708;&#7709;&#7864;&#7865;&#7866;&#7867;&#7868;&#7869;&#7870;&#7871;&#7872;&#7873;&#7874;&#7875;&#7876;&#7877;&#7878;&#7879;Ff&#401;&#402;&#7710;&#7711;Gg&#284;&#285;&#286;&#287;&#288;&#289;&#290;&#291;&#403;&#608;&#484;&#485;&#486;&#487;&#500;&#501;&#7712;&#7713;Hh&#292;&#293;&#294;&#295;&#542;&#543;&#614;&#7714;&#7715;&#7716;&#7717;&#7718;&#7719;&#7720;&#7721;&#7722;&#7723;&#7830;Ii&#204;&#236;&#205;&#237;&#206;&#238;&#207;&#239;&#296;&#297;&#298;&#299;&#300;&#301;&#302;&#303;&#304;&#407;&#616;&#463;&#464;&#520;&#521;&#522;&#523;&#7724;&#7725;&#7726;&#7727;&#7880;&#7881;&#7882;&#7883;Jj&#308;&#309;&#496;&#669;Kk&#310;&#311;&#408;&#409;&#488;&#489;&#7728;&#7729;&#7730;&#7731;&#7732;&#7733;Ll&#313;&#314;&#315;&#316;&#317;&#318;&#319;&#320;&#321;&#322;&#410;&#456;&#564;&#619;&#620;&#621;&#7734;&#7735;&#7736;&#7737;&#7738;&#7739;&#7740;&#7741;Mm&#625;&#7742;&#7743;&#7744;&#7745;&#7746;&#7747;Nn&#209;&#241;&#323;&#324;&#325;&#326;&#327;&#328;&#413;&#626;&#414;&#544;&#459;&#504;&#505;&#565;&#627;&#7748;&#7749;&#7750;&#7751;&#7752;&#7753;&#7754;&#7755;Oo&#210;&#242;&#211;&#243;&#212;&#244;&#213;&#245;&#214;&#246;&#216;&#248;&#332;&#333;&#334;&#335;&#336;&#337;&#415;&#416;&#417;&#465;&#466;&#490;&#491;&#492;&#493;&#510;&#511;&#524;&#525;&#526;&#527;&#554;&#555;&#556;&#557;&#558;&#559;&#560;&#561;&#7756;&#7757;&#7758;&#7759;&#7760;&#7761;&#7762;&#7763;&#7884;&#7885;&#7886;&#7887;&#7888;&#7889;&#7890;&#7891;&#7892;&#7893;&#7894;&#7895;&#7896;&#7897;&#7898;&#7899;&#7900;&#7901;&#7902;&#7903;&#7904;&#7905;&#7906;&#7907;Pp&#420;&#421;&#7764;&#7765;&#7766;&#7767;Qq&#672;Rr&#340;&#341;&#342;&#343;&#344;&#345;&#528;&#529;&#530;&#531;&#636;&#637;&#638;&#7768;&#7769;&#7770;&#7771;&#7772;&#7773;&#7774;&#7775;Ss&#346;&#347;&#348;&#349;&#350;&#351;&#352;&#353;&#536;&#537;&#642;&#7776;&#7777;&#7778;&#7779;&#7780;&#7781;&#7782;&#7783;&#7784;&#7785;Tt&#354;&#355;&#356;&#357;&#358;&#359;&#427;&#428;&#429;&#430;&#648;&#538;&#539;&#566;&#7786;&#7787;&#7788;&#7789;&#7790;&#7791;&#7792;&#7793;&#7831;Uu&#217;&#249;&#218;&#250;&#219;&#251;&#220;&#252;&#360;&#361;&#362;&#363;&#364;&#365;&#366;&#367;&#368;&#369;&#370;&#371;&#431;&#432;&#467;&#468;&#469;&#470;&#471;&#472;&#473;&#474;&#475;&#476;&#532;&#533;&#534;&#535;&#7794;&#7795;&#7796;&#7797;&#7798;&#7799;&#7800;&#7801;&#7802;&#7803;&#7908;&#7909;&#7910;&#7911;&#7912;&#7913;&#7914;&#7915;&#7916;&#7917;&#7918;&#7919;&#7920;&#7921;Vv&#434;&#651;&#7804;&#7805;&#7806;&#7807;Ww&#372;&#373;&#7808;&#7809;&#7810;&#7811;&#7812;&#7813;&#7814;&#7815;&#7816;&#7817;&#7832;Xx&#7818;&#7819;&#7820;&#7821;Yy&#221;&#253;&#255;&#376;&#374;&#375;&#435;&#436;&#562;&#563;&#7822;&#7823;&#7833;&#7922;&#7923;&#7924;&#7925;&#7926;&#7927;&#7928;&#7929;Zz&#377;&#378;&#379;&#380;&#381;&#382;&#437;&#438;&#548;&#549;&#656;&#657;&#7824;&#7825;&#7826;&#7827;&#7828;&#7829;&#7829;','AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ')"/>
-
-  <xsl:if test="key('letter', $key)[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))]                 [count(.|key('primary', normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1]) = 1]">
-    <div class="indexdiv">
-      <xsl:if test="contains(concat('Aa&#192;&#224;&#193;&#225;&#194;&#226;&#195;&#227;&#196;&#228;&#197;&#229;&#256;&#257;&#258;&#259;&#260;&#261;&#461;&#462;&#478;&#479;&#480;&#481;&#506;&#507;&#512;&#513;&#514;&#515;&#550;&#551;&#7680;&#7681;&#7834;&#7840;&#7841;&#7842;&#7843;&#7844;&#7845;&#7846;&#7847;&#7848;&#7849;&#7850;&#7851;&#7852;&#7853;&#7854;&#7855;&#7856;&#7857;&#7858;&#7859;&#7860;&#7861;&#7862;&#7863;Bb&#384;&#385;&#595;&#386;&#387;&#7682;&#7683;&#7684;&#7685;&#7686;&#7687;Cc&#199;&#231;&#262;&#263;&#264;&#265;&#266;&#267;&#268;&#269;&#391;&#392;&#597;&#7688;&#7689;Dd&#270;&#271;&#272;&#273;&#394;&#599;&#395;&#396;&#453;&#498;&#545;&#598;&#7690;&#7691;&#7692;&#7693;&#7694;&#7695;&#7696;&#7697;&#7698;&#7699;Ee&#200;&#232;&#201;&#233;&#202;&#234;&#203;&#235;&#274;&#275;&#276;&#277;&#278;&#279;&#280;&#281;&#282;&#283;&#516;&#517;&#518;&#519;&#552;&#553;&#7700;&#7701;&#7702;&#7703;&#7704;&#7705;&#7706;&#7707;&#7708;&#7709;&#7864;&#7865;&#7866;&#7867;&#7868;&#7869;&#7870;&#7871;&#7872;&#7873;&#7874;&#7875;&#7876;&#7877;&#7878;&#7879;Ff&#401;&#402;&#7710;&#7711;Gg&#284;&#285;&#286;&#287;&#288;&#289;&#290;&#291;&#403;&#608;&#484;&#485;&#486;&#487;&#500;&#501;&#7712;&#7713;Hh&#292;&#293;&#294;&#295;&#542;&#543;&#614;&#7714;&#7715;&#7716;&#7717;&#7718;&#7719;&#7720;&#7721;&#7722;&#7723;&#7830;Ii&#204;&#236;&#205;&#237;&#206;&#238;&#207;&#239;&#296;&#297;&#298;&#299;&#300;&#301;&#302;&#303;&#304;&#407;&#616;&#463;&#464;&#520;&#521;&#522;&#523;&#7724;&#7725;&#7726;&#7727;&#7880;&#7881;&#7882;&#7883;Jj&#308;&#309;&#496;&#669;Kk&#310;&#311;&#408;&#409;&#488;&#489;&#7728;&#7729;&#7730;&#7731;&#7732;&#7733;Ll&#313;&#314;&#315;&#316;&#317;&#318;&#319;&#320;&#321;&#322;&#410;&#456;&#564;&#619;&#620;&#621;&#7734;&#7735;&#7736;&#7737;&#7738;&#7739;&#7740;&#7741;Mm&#625;&#7742;&#7743;&#7744;&#7745;&#7746;&#7747;Nn&#209;&#241;&#323;&#324;&#325;&#326;&#327;&#328;&#413;&#626;&#414;&#544;&#459;&#504;&#505;&#565;&#627;&#7748;&#7749;&#7750;&#7751;&#7752;&#7753;&#7754;&#7755;Oo&#210;&#242;&#211;&#243;&#212;&#244;&#213;&#245;&#214;&#246;&#216;&#248;&#332;&#333;&#334;&#335;&#336;&#337;&#415;&#416;&#417;&#465;&#466;&#490;&#491;&#492;&#493;&#510;&#511;&#524;&#525;&#526;&#527;&#554;&#555;&#556;&#557;&#558;&#559;&#560;&#561;&#7756;&#7757;&#7758;&#7759;&#7760;&#7761;&#7762;&#7763;&#7884;&#7885;&#7886;&#7887;&#7888;&#7889;&#7890;&#7891;&#7892;&#7893;&#7894;&#7895;&#7896;&#7897;&#7898;&#7899;&#7900;&#7901;&#7902;&#7903;&#7904;&#7905;&#7906;&#7907;Pp&#420;&#421;&#7764;&#7765;&#7766;&#7767;Qq&#672;Rr&#340;&#341;&#342;&#343;&#344;&#345;&#528;&#529;&#530;&#531;&#636;&#637;&#638;&#7768;&#7769;&#7770;&#7771;&#7772;&#7773;&#7774;&#7775;Ss&#346;&#347;&#348;&#349;&#350;&#351;&#352;&#353;&#536;&#537;&#642;&#7776;&#7777;&#7778;&#7779;&#7780;&#7781;&#7782;&#7783;&#7784;&#7785;Tt&#354;&#355;&#356;&#357;&#358;&#359;&#427;&#428;&#429;&#430;&#648;&#538;&#539;&#566;&#7786;&#7787;&#7788;&#7789;&#7790;&#7791;&#7792;&#7793;&#7831;Uu&#217;&#249;&#218;&#250;&#219;&#251;&#220;&#252;&#360;&#361;&#362;&#363;&#364;&#365;&#366;&#367;&#368;&#369;&#370;&#371;&#431;&#432;&#467;&#468;&#469;&#470;&#471;&#472;&#473;&#474;&#475;&#476;&#532;&#533;&#534;&#535;&#7794;&#7795;&#7796;&#7797;&#7798;&#7799;&#7800;&#7801;&#7802;&#7803;&#7908;&#7909;&#7910;&#7911;&#7912;&#7913;&#7914;&#7915;&#7916;&#7917;&#7918;&#7919;&#7920;&#7921;Vv&#434;&#651;&#7804;&#7805;&#7806;&#7807;Ww&#372;&#373;&#7808;&#7809;&#7810;&#7811;&#7812;&#7813;&#7814;&#7815;&#7816;&#7817;&#7832;Xx&#7818;&#7819;&#7820;&#7821;Yy&#221;&#253;&#255;&#376;&#374;&#375;&#435;&#436;&#562;&#563;&#7822;&#7823;&#7833;&#7922;&#7923;&#7924;&#7925;&#7926;&#7927;&#7928;&#7929;Zz&#377;&#378;&#379;&#380;&#381;&#382;&#437;&#438;&#548;&#549;&#656;&#657;&#7824;&#7825;&#7826;&#7827;&#7828;&#7829;&#7829;', 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ'), $key)">
-        <h3>
-          <xsl:value-of select="translate($key, 'Aa&#192;&#224;&#193;&#225;&#194;&#226;&#195;&#227;&#196;&#228;&#197;&#229;&#256;&#257;&#258;&#259;&#260;&#261;&#461;&#462;&#478;&#479;&#480;&#481;&#506;&#507;&#512;&#513;&#514;&#515;&#550;&#551;&#7680;&#7681;&#7834;&#7840;&#7841;&#7842;&#7843;&#7844;&#7845;&#7846;&#7847;&#7848;&#7849;&#7850;&#7851;&#7852;&#7853;&#7854;&#7855;&#7856;&#7857;&#7858;&#7859;&#7860;&#7861;&#7862;&#7863;Bb&#384;&#385;&#595;&#386;&#387;&#7682;&#7683;&#7684;&#7685;&#7686;&#7687;Cc&#199;&#231;&#262;&#263;&#264;&#265;&#266;&#267;&#268;&#269;&#391;&#392;&#597;&#7688;&#7689;Dd&#270;&#271;&#272;&#273;&#394;&#599;&#395;&#396;&#453;&#498;&#545;&#598;&#7690;&#7691;&#7692;&#7693;&#7694;&#7695;&#7696;&#7697;&#7698;&#7699;Ee&#200;&#232;&#201;&#233;&#202;&#234;&#203;&#235;&#274;&#275;&#276;&#277;&#278;&#279;&#280;&#281;&#282;&#283;&#516;&#517;&#518;&#519;&#552;&#553;&#7700;&#7701;&#7702;&#7703;&#7704;&#7705;&#7706;&#7707;&#7708;&#7709;&#7864;&#7865;&#7866;&#7867;&#7868;&#7869;&#7870;&#7871;&#7872;&#7873;&#7874;&#7875;&#7876;&#7877;&#7878;&#7879;Ff&#401;&#402;&#7710;&#7711;Gg&#284;&#285;&#286;&#287;&#288;&#289;&#290;&#291;&#403;&#608;&#484;&#485;&#486;&#487;&#500;&#501;&#7712;&#7713;Hh&#292;&#293;&#294;&#295;&#542;&#543;&#614;&#7714;&#7715;&#7716;&#7717;&#7718;&#7719;&#7720;&#7721;&#7722;&#7723;&#7830;Ii&#204;&#236;&#205;&#237;&#206;&#238;&#207;&#239;&#296;&#297;&#298;&#299;&#300;&#301;&#302;&#303;&#304;&#407;&#616;&#463;&#464;&#520;&#521;&#522;&#523;&#7724;&#7725;&#7726;&#7727;&#7880;&#7881;&#7882;&#7883;Jj&#308;&#309;&#496;&#669;Kk&#310;&#311;&#408;&#409;&#488;&#489;&#7728;&#7729;&#7730;&#7731;&#7732;&#7733;Ll&#313;&#314;&#315;&#316;&#317;&#318;&#319;&#320;&#321;&#322;&#410;&#456;&#564;&#619;&#620;&#621;&#7734;&#7735;&#7736;&#7737;&#7738;&#7739;&#7740;&#7741;Mm&#625;&#7742;&#7743;&#7744;&#7745;&#7746;&#7747;Nn&#209;&#241;&#323;&#324;&#325;&#326;&#327;&#328;&#413;&#626;&#414;&#544;&#459;&#504;&#505;&#565;&#627;&#7748;&#7749;&#7750;&#7751;&#7752;&#7753;&#7754;&#7755;Oo&#210;&#242;&#211;&#243;&#212;&#244;&#213;&#245;&#214;&#246;&#216;&#248;&#332;&#333;&#334;&#335;&#336;&#337;&#415;&#416;&#417;&#465;&#466;&#490;&#491;&#492;&#493;&#510;&#511;&#524;&#525;&#526;&#527;&#554;&#555;&#556;&#557;&#558;&#559;&#560;&#561;&#7756;&#7757;&#7758;&#7759;&#7760;&#7761;&#7762;&#7763;&#7884;&#7885;&#7886;&#7887;&#7888;&#7889;&#7890;&#7891;&#7892;&#7893;&#7894;&#7895;&#7896;&#7897;&#7898;&#7899;&#7900;&#7901;&#7902;&#7903;&#7904;&#7905;&#7906;&#7907;Pp&#420;&#421;&#7764;&#7765;&#7766;&#7767;Qq&#672;Rr&#340;&#341;&#342;&#343;&#344;&#345;&#528;&#529;&#530;&#531;&#636;&#637;&#638;&#7768;&#7769;&#7770;&#7771;&#7772;&#7773;&#7774;&#7775;Ss&#346;&#347;&#348;&#349;&#350;&#351;&#352;&#353;&#536;&#537;&#642;&#7776;&#7777;&#7778;&#7779;&#7780;&#7781;&#7782;&#7783;&#7784;&#7785;Tt&#354;&#355;&#356;&#357;&#358;&#359;&#427;&#428;&#429;&#430;&#648;&#538;&#539;&#566;&#7786;&#7787;&#7788;&#7789;&#7790;&#7791;&#7792;&#7793;&#7831;Uu&#217;&#249;&#218;&#250;&#219;&#251;&#220;&#252;&#360;&#361;&#362;&#363;&#364;&#365;&#366;&#367;&#368;&#369;&#370;&#371;&#431;&#432;&#467;&#468;&#469;&#470;&#471;&#472;&#473;&#474;&#475;&#476;&#532;&#533;&#534;&#535;&#7794;&#7795;&#7796;&#7797;&#7798;&#7799;&#7800;&#7801;&#7802;&#7803;&#7908;&#7909;&#7910;&#7911;&#7912;&#7913;&#7914;&#7915;&#7916;&#7917;&#7918;&#7919;&#7920;&#7921;Vv&#434;&#651;&#7804;&#7805;&#7806;&#7807;Ww&#372;&#373;&#7808;&#7809;&#7810;&#7811;&#7812;&#7813;&#7814;&#7815;&#7816;&#7817;&#7832;Xx&#7818;&#7819;&#7820;&#7821;Yy&#221;&#253;&#255;&#376;&#374;&#375;&#435;&#436;&#562;&#563;&#7822;&#7823;&#7833;&#7922;&#7923;&#7924;&#7925;&#7926;&#7927;&#7928;&#7929;Zz&#377;&#378;&#379;&#380;&#381;&#382;&#437;&#438;&#548;&#549;&#656;&#657;&#7824;&#7825;&#7826;&#7827;&#7828;&#7829;&#7829;', 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ')"/>
-        </h3>
-      </xsl:if>
-      <dl>
-        <xsl:apply-templates select="key('letter', $key)[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))]                                      [count(.|key('primary', normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])))                                      [count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1])=1]" mode="index-primary">
-          <xsl:with-param name="position" select="position()"/>
-          <xsl:with-param name="scope" select="$scope"/>
-          <xsl:with-param name="role" select="$role"/>
-          <xsl:with-param name="type" select="$type"/>
-          <xsl:sort select="translate(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])), 'Aa&#192;&#224;&#193;&#225;&#194;&#226;&#195;&#227;&#196;&#228;&#197;&#229;&#256;&#257;&#258;&#259;&#260;&#261;&#461;&#462;&#478;&#479;&#480;&#481;&#506;&#507;&#512;&#513;&#514;&#515;&#550;&#551;&#7680;&#7681;&#7834;&#7840;&#7841;&#7842;&#7843;&#7844;&#7845;&#7846;&#7847;&#7848;&#7849;&#7850;&#7851;&#7852;&#7853;&#7854;&#7855;&#7856;&#7857;&#7858;&#7859;&#7860;&#7861;&#7862;&#7863;Bb&#384;&#385;&#595;&#386;&#387;&#7682;&#7683;&#7684;&#7685;&#7686;&#7687;Cc&#199;&#231;&#262;&#263;&#264;&#265;&#266;&#267;&#268;&#269;&#391;&#392;&#597;&#7688;&#7689;Dd&#270;&#271;&#272;&#273;&#394;&#599;&#395;&#396;&#453;&#498;&#545;&#598;&#7690;&#7691;&#7692;&#7693;&#7694;&#7695;&#7696;&#7697;&#7698;&#7699;Ee&#200;&#232;&#201;&#233;&#202;&#234;&#203;&#235;&#274;&#275;&#276;&#277;&#278;&#279;&#280;&#281;&#282;&#283;&#516;&#517;&#518;&#519;&#552;&#553;&#7700;&#7701;&#7702;&#7703;&#7704;&#7705;&#7706;&#7707;&#7708;&#7709;&#7864;&#7865;&#7866;&#7867;&#7868;&#7869;&#7870;&#7871;&#7872;&#7873;&#7874;&#7875;&#7876;&#7877;&#7878;&#7879;Ff&#401;&#402;&#7710;&#7711;Gg&#284;&#285;&#286;&#287;&#288;&#289;&#290;&#291;&#403;&#608;&#484;&#485;&#486;&#487;&#500;&#501;&#7712;&#7713;Hh&#292;&#293;&#294;&#295;&#542;&#543;&#614;&#7714;&#7715;&#7716;&#7717;&#7718;&#7719;&#7720;&#7721;&#7722;&#7723;&#7830;Ii&#204;&#236;&#205;&#237;&#206;&#238;&#207;&#239;&#296;&#297;&#298;&#299;&#300;&#301;&#302;&#303;&#304;&#407;&#616;&#463;&#464;&#520;&#521;&#522;&#523;&#7724;&#7725;&#7726;&#7727;&#7880;&#7881;&#7882;&#7883;Jj&#308;&#309;&#496;&#669;Kk&#310;&#311;&#408;&#409;&#488;&#489;&#7728;&#7729;&#7730;&#7731;&#7732;&#7733;Ll&#313;&#314;&#315;&#316;&#317;&#318;&#319;&#320;&#321;&#322;&#410;&#456;&#564;&#619;&#620;&#621;&#7734;&#7735;&#7736;&#7737;&#7738;&#7739;&#7740;&#7741;Mm&#625;&#7742;&#7743;&#7744;&#7745;&#7746;&#7747;Nn&#209;&#241;&#323;&#324;&#325;&#326;&#327;&#328;&#413;&#626;&#414;&#544;&#459;&#504;&#505;&#565;&#627;&#7748;&#7749;&#7750;&#7751;&#7752;&#7753;&#7754;&#7755;Oo&#210;&#242;&#211;&#243;&#212;&#244;&#213;&#245;&#214;&#246;&#216;&#248;&#332;&#333;&#334;&#335;&#336;&#337;&#415;&#416;&#417;&#465;&#466;&#490;&#491;&#492;&#493;&#510;&#511;&#524;&#525;&#526;&#527;&#554;&#555;&#556;&#557;&#558;&#559;&#560;&#561;&#7756;&#7757;&#7758;&#7759;&#7760;&#7761;&#7762;&#7763;&#7884;&#7885;&#7886;&#7887;&#7888;&#7889;&#7890;&#7891;&#7892;&#7893;&#7894;&#7895;&#7896;&#7897;&#7898;&#7899;&#7900;&#7901;&#7902;&#7903;&#7904;&#7905;&#7906;&#7907;Pp&#420;&#421;&#7764;&#7765;&#7766;&#7767;Qq&#672;Rr&#340;&#341;&#342;&#343;&#344;&#345;&#528;&#529;&#530;&#531;&#636;&#637;&#638;&#7768;&#7769;&#7770;&#7771;&#7772;&#7773;&#7774;&#7775;Ss&#346;&#347;&#348;&#349;&#350;&#351;&#352;&#353;&#536;&#537;&#642;&#7776;&#7777;&#7778;&#7779;&#7780;&#7781;&#7782;&#7783;&#7784;&#7785;Tt&#354;&#355;&#356;&#357;&#358;&#359;&#427;&#428;&#429;&#430;&#648;&#538;&#539;&#566;&#7786;&#7787;&#7788;&#7789;&#7790;&#7791;&#7792;&#7793;&#7831;Uu&#217;&#249;&#218;&#250;&#219;&#251;&#220;&#252;&#360;&#361;&#362;&#363;&#364;&#365;&#366;&#367;&#368;&#369;&#370;&#371;&#431;&#432;&#467;&#468;&#469;&#470;&#471;&#472;&#473;&#474;&#475;&#476;&#532;&#533;&#534;&#535;&#7794;&#7795;&#7796;&#7797;&#7798;&#7799;&#7800;&#7801;&#7802;&#7803;&#7908;&#7909;&#7910;&#7911;&#7912;&#7913;&#7914;&#7915;&#7916;&#7917;&#7918;&#7919;&#7920;&#7921;Vv&#434;&#651;&#7804;&#7805;&#7806;&#7807;Ww&#372;&#373;&#7808;&#7809;&#7810;&#7811;&#7812;&#7813;&#7814;&#7815;&#7816;&#7817;&#7832;Xx&#7818;&#7819;&#7820;&#7821;Yy&#221;&#253;&#255;&#376;&#374;&#375;&#435;&#436;&#562;&#563;&#7822;&#7823;&#7833;&#7922;&#7923;&#7924;&#7925;&#7926;&#7927;&#7928;&#7929;Zz&#377;&#378;&#379;&#380;&#381;&#382;&#437;&#438;&#548;&#549;&#656;&#657;&#7824;&#7825;&#7826;&#7827;&#7828;&#7829;&#7829;', 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ')"/>
-        </xsl:apply-templates>
-      </dl>
-    </div>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="index-symbol-div">
-  <xsl:param name="scope" select="/"/>
-  <xsl:param name="role" select="''"/>
-  <xsl:param name="type" select="''"/>
-
-  <xsl:variable name="key" select="translate(substring(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])), 1, 1),                                              'Aa&#192;&#224;&#193;&#225;&#194;&#226;&#195;&#227;&#196;&#228;&#197;&#229;&#256;&#257;&#258;&#259;&#260;&#261;&#461;&#462;&#478;&#479;&#480;&#481;&#506;&#507;&#512;&#513;&#514;&#515;&#550;&#551;&#7680;&#7681;&#7834;&#7840;&#7841;&#7842;&#7843;&#7844;&#7845;&#7846;&#7847;&#7848;&#7849;&#7850;&#7851;&#7852;&#7853;&#7854;&#7855;&#7856;&#7857;&#7858;&#7859;&#7860;&#7861;&#7862;&#7863;Bb&#384;&#385;&#595;&#386;&#387;&#7682;&#7683;&#7684;&#7685;&#7686;&#7687;Cc&#199;&#231;&#262;&#263;&#264;&#265;&#266;&#267;&#268;&#269;&#391;&#392;&#597;&#7688;&#7689;Dd&#270;&#271;&#272;&#273;&#394;&#599;&#395;&#396;&#453;&#498;&#545;&#598;&#7690;&#7691;&#7692;&#7693;&#7694;&#7695;&#7696;&#7697;&#7698;&#7699;Ee&#200;&#232;&#201;&#233;&#202;&#234;&#203;&#235;&#274;&#275;&#276;&#277;&#278;&#279;&#280;&#281;&#282;&#283;&#516;&#517;&#518;&#519;&#552;&#553;&#7700;&#7701;&#7702;&#7703;&#7704;&#7705;&#7706;&#7707;&#7708;&#7709;&#7864;&#7865;&#7866;&#7867;&#7868;&#7869;&#7870;&#7871;&#7872;&#7873;&#7874;&#7875;&#7876;&#7877;&#7878;&#7879;Ff&#401;&#402;&#7710;&#7711;Gg&#284;&#285;&#286;&#287;&#288;&#289;&#290;&#291;&#403;&#608;&#484;&#485;&#486;&#487;&#500;&#501;&#7712;&#7713;Hh&#292;&#293;&#294;&#295;&#542;&#543;&#614;&#7714;&#7715;&#7716;&#7717;&#7718;&#7719;&#7720;&#7721;&#7722;&#7723;&#7830;Ii&#204;&#236;&#205;&#237;&#206;&#238;&#207;&#239;&#296;&#297;&#298;&#299;&#300;&#301;&#302;&#303;&#304;&#407;&#616;&#463;&#464;&#520;&#521;&#522;&#523;&#7724;&#7725;&#7726;&#7727;&#7880;&#7881;&#7882;&#7883;Jj&#308;&#309;&#496;&#669;Kk&#310;&#311;&#408;&#409;&#488;&#489;&#7728;&#7729;&#7730;&#7731;&#7732;&#7733;Ll&#313;&#314;&#315;&#316;&#317;&#318;&#319;&#320;&#321;&#322;&#410;&#456;&#564;&#619;&#620;&#621;&#7734;&#7735;&#7736;&#7737;&#7738;&#7739;&#7740;&#7741;Mm&#625;&#7742;&#7743;&#7744;&#7745;&#7746;&#7747;Nn&#209;&#241;&#323;&#324;&#325;&#326;&#327;&#328;&#413;&#626;&#414;&#544;&#459;&#504;&#505;&#565;&#627;&#7748;&#7749;&#7750;&#7751;&#7752;&#7753;&#7754;&#7755;Oo&#210;&#242;&#211;&#243;&#212;&#244;&#213;&#245;&#214;&#246;&#216;&#248;&#332;&#333;&#334;&#335;&#336;&#337;&#415;&#416;&#417;&#465;&#466;&#490;&#491;&#492;&#493;&#510;&#511;&#524;&#525;&#526;&#527;&#554;&#555;&#556;&#557;&#558;&#559;&#560;&#561;&#7756;&#7757;&#7758;&#7759;&#7760;&#7761;&#7762;&#7763;&#7884;&#7885;&#7886;&#7887;&#7888;&#7889;&#7890;&#7891;&#7892;&#7893;&#7894;&#7895;&#7896;&#7897;&#7898;&#7899;&#7900;&#7901;&#7902;&#7903;&#7904;&#7905;&#7906;&#7907;Pp&#420;&#421;&#7764;&#7765;&#7766;&#7767;Qq&#672;Rr&#340;&#341;&#342;&#343;&#344;&#345;&#528;&#529;&#530;&#531;&#636;&#637;&#638;&#7768;&#7769;&#7770;&#7771;&#7772;&#7773;&#7774;&#7775;Ss&#346;&#347;&#348;&#349;&#350;&#351;&#352;&#353;&#536;&#537;&#642;&#7776;&#7777;&#7778;&#7779;&#7780;&#7781;&#7782;&#7783;&#7784;&#7785;Tt&#354;&#355;&#356;&#357;&#358;&#359;&#427;&#428;&#429;&#430;&#648;&#538;&#539;&#566;&#7786;&#7787;&#7788;&#7789;&#7790;&#7791;&#7792;&#7793;&#7831;Uu&#217;&#249;&#218;&#250;&#219;&#251;&#220;&#252;&#360;&#361;&#362;&#363;&#364;&#365;&#366;&#367;&#368;&#369;&#370;&#371;&#431;&#432;&#467;&#468;&#469;&#470;&#471;&#472;&#473;&#474;&#475;&#476;&#532;&#533;&#534;&#535;&#7794;&#7795;&#7796;&#7797;&#7798;&#7799;&#7800;&#7801;&#7802;&#7803;&#7908;&#7909;&#7910;&#7911;&#7912;&#7913;&#7914;&#7915;&#7916;&#7917;&#7918;&#7919;&#7920;&#7921;Vv&#434;&#651;&#7804;&#7805;&#7806;&#7807;Ww&#372;&#373;&#7808;&#7809;&#7810;&#7811;&#7812;&#7813;&#7814;&#7815;&#7816;&#7817;&#7832;Xx&#7818;&#7819;&#7820;&#7821;Yy&#221;&#253;&#255;&#376;&#374;&#375;&#435;&#436;&#562;&#563;&#7822;&#7823;&#7833;&#7922;&#7923;&#7924;&#7925;&#7926;&#7927;&#7928;&#7929;Zz&#377;&#378;&#379;&#380;&#381;&#382;&#437;&#438;&#548;&#549;&#656;&#657;&#7824;&#7825;&#7826;&#7827;&#7828;&#7829;&#7829;','AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ')"/>
-
-  <xsl:apply-templates select="key('letter', $key)                                [count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][count(.|key('primary', normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])))[1]) = 1]" mode="index-primary">
-    <xsl:with-param name="position" select="position()"/>
-    <xsl:with-param name="scope" select="$scope"/>
-    <xsl:with-param name="role" select="$role"/>
-    <xsl:with-param name="type" select="$type"/>
-    <xsl:sort select="translate(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])), 'Aa&#192;&#224;&#193;&#225;&#194;&#226;&#195;&#227;&#196;&#228;&#197;&#229;&#256;&#257;&#258;&#259;&#260;&#261;&#461;&#462;&#478;&#479;&#480;&#481;&#506;&#507;&#512;&#513;&#514;&#515;&#550;&#551;&#7680;&#7681;&#7834;&#7840;&#7841;&#7842;&#7843;&#7844;&#7845;&#7846;&#7847;&#7848;&#7849;&#7850;&#7851;&#7852;&#7853;&#7854;&#7855;&#7856;&#7857;&#7858;&#7859;&#7860;&#7861;&#7862;&#7863;Bb&#384;&#385;&#595;&#386;&#387;&#7682;&#7683;&#7684;&#7685;&#7686;&#7687;Cc&#199;&#231;&#262;&#263;&#264;&#265;&#266;&#267;&#268;&#269;&#391;&#392;&#597;&#7688;&#7689;Dd&#270;&#271;&#272;&#273;&#394;&#599;&#395;&#396;&#453;&#498;&#545;&#598;&#7690;&#7691;&#7692;&#7693;&#7694;&#7695;&#7696;&#7697;&#7698;&#7699;Ee&#200;&#232;&#201;&#233;&#202;&#234;&#203;&#235;&#274;&#275;&#276;&#277;&#278;&#279;&#280;&#281;&#282;&#283;&#516;&#517;&#518;&#519;&#552;&#553;&#7700;&#7701;&#7702;&#7703;&#7704;&#7705;&#7706;&#7707;&#7708;&#7709;&#7864;&#7865;&#7866;&#7867;&#7868;&#7869;&#7870;&#7871;&#7872;&#7873;&#7874;&#7875;&#7876;&#7877;&#7878;&#7879;Ff&#401;&#402;&#7710;&#7711;Gg&#284;&#285;&#286;&#287;&#288;&#289;&#290;&#291;&#403;&#608;&#484;&#485;&#486;&#487;&#500;&#501;&#7712;&#7713;Hh&#292;&#293;&#294;&#295;&#542;&#543;&#614;&#7714;&#7715;&#7716;&#7717;&#7718;&#7719;&#7720;&#7721;&#7722;&#7723;&#7830;Ii&#204;&#236;&#205;&#237;&#206;&#238;&#207;&#239;&#296;&#297;&#298;&#299;&#300;&#301;&#302;&#303;&#304;&#407;&#616;&#463;&#464;&#520;&#521;&#522;&#523;&#7724;&#7725;&#7726;&#7727;&#7880;&#7881;&#7882;&#7883;Jj&#308;&#309;&#496;&#669;Kk&#310;&#311;&#408;&#409;&#488;&#489;&#7728;&#7729;&#7730;&#7731;&#7732;&#7733;Ll&#313;&#314;&#315;&#316;&#317;&#318;&#319;&#320;&#321;&#322;&#410;&#456;&#564;&#619;&#620;&#621;&#7734;&#7735;&#7736;&#7737;&#7738;&#7739;&#7740;&#7741;Mm&#625;&#7742;&#7743;&#7744;&#7745;&#7746;&#7747;Nn&#209;&#241;&#323;&#324;&#325;&#326;&#327;&#328;&#413;&#626;&#414;&#544;&#459;&#504;&#505;&#565;&#627;&#7748;&#7749;&#7750;&#7751;&#7752;&#7753;&#7754;&#7755;Oo&#210;&#242;&#211;&#243;&#212;&#244;&#213;&#245;&#214;&#246;&#216;&#248;&#332;&#333;&#334;&#335;&#336;&#337;&#415;&#416;&#417;&#465;&#466;&#490;&#491;&#492;&#493;&#510;&#511;&#524;&#525;&#526;&#527;&#554;&#555;&#556;&#557;&#558;&#559;&#560;&#561;&#7756;&#7757;&#7758;&#7759;&#7760;&#7761;&#7762;&#7763;&#7884;&#7885;&#7886;&#7887;&#7888;&#7889;&#7890;&#7891;&#7892;&#7893;&#7894;&#7895;&#7896;&#7897;&#7898;&#7899;&#7900;&#7901;&#7902;&#7903;&#7904;&#7905;&#7906;&#7907;Pp&#420;&#421;&#7764;&#7765;&#7766;&#7767;Qq&#672;Rr&#340;&#341;&#342;&#343;&#344;&#345;&#528;&#529;&#530;&#531;&#636;&#637;&#638;&#7768;&#7769;&#7770;&#7771;&#7772;&#7773;&#7774;&#7775;Ss&#346;&#347;&#348;&#349;&#350;&#351;&#352;&#353;&#536;&#537;&#642;&#7776;&#7777;&#7778;&#7779;&#7780;&#7781;&#7782;&#7783;&#7784;&#7785;Tt&#354;&#355;&#356;&#357;&#358;&#359;&#427;&#428;&#429;&#430;&#648;&#538;&#539;&#566;&#7786;&#7787;&#7788;&#7789;&#7790;&#7791;&#7792;&#7793;&#7831;Uu&#217;&#249;&#218;&#250;&#219;&#251;&#220;&#252;&#360;&#361;&#362;&#363;&#364;&#365;&#366;&#367;&#368;&#369;&#370;&#371;&#431;&#432;&#467;&#468;&#469;&#470;&#471;&#472;&#473;&#474;&#475;&#476;&#532;&#533;&#534;&#535;&#7794;&#7795;&#7796;&#7797;&#7798;&#7799;&#7800;&#7801;&#7802;&#7803;&#7908;&#7909;&#7910;&#7911;&#7912;&#7913;&#7914;&#7915;&#7916;&#7917;&#7918;&#7919;&#7920;&#7921;Vv&#434;&#651;&#7804;&#7805;&#7806;&#7807;Ww&#372;&#373;&#7808;&#7809;&#7810;&#7811;&#7812;&#7813;&#7814;&#7815;&#7816;&#7817;&#7832;Xx&#7818;&#7819;&#7820;&#7821;Yy&#221;&#253;&#255;&#376;&#374;&#375;&#435;&#436;&#562;&#563;&#7822;&#7823;&#7833;&#7922;&#7923;&#7924;&#7925;&#7926;&#7927;&#7928;&#7929;Zz&#377;&#378;&#379;&#380;&#381;&#382;&#437;&#438;&#548;&#549;&#656;&#657;&#7824;&#7825;&#7826;&#7827;&#7828;&#7829;&#7829;', 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ')"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="index-primary">
-  <xsl:param name="scope" select="."/>
-  <xsl:param name="role" select="''"/>
-  <xsl:param name="type" select="''"/>
-
-  <xsl:variable name="key" select="normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;]))"/>
-  <xsl:variable name="refs" select="key('primary', $key)[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))]"/>
-  <dt>
-    <xsl:value-of select="primary"/>
-    <xsl:for-each select="$refs[generate-id() = generate-id(key('primary-section', concat($key, &quot; &quot;, generate-id((ancestor-or-self::set|ancestor-or-self::book|ancestor-or-self::part|ancestor-or-self::reference|ancestor-or-self::partintro|ancestor-or-self::chapter|ancestor-or-self::appendix|ancestor-or-self::preface|ancestor-or-self::article|ancestor-or-self::section|ancestor-or-self::sect1|ancestor-or-self::sect2|ancestor-or-self::sect3|ancestor-or-self::sect4|ancestor-or-self::sect5|ancestor-or-self::refentry|ancestor-or-self::refsect1|ancestor-or-self::refsect2|ancestor-or-self::refsect3|ancestor-or-self::simplesect|ancestor-or-self::bibliography|ancestor-or-self::glossary|ancestor-or-self::index|ancestor-or-self::webpage)[last()])))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1])]">
-      <xsl:apply-templates select="." mode="reference">
-        <xsl:with-param name="position" select="position()"/>
-        <xsl:with-param name="scope" select="$scope"/>
-        <xsl:with-param name="role" select="$role"/>
-        <xsl:with-param name="type" select="$type"/>
-      </xsl:apply-templates>
-    </xsl:for-each>
-
-    <xsl:if test="$refs[not(secondary)]/*[self::see]">
-      <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see', concat(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])), &quot; &quot;, &quot; &quot;, &quot; &quot;, see))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1])]" mode="index-see">
-        <xsl:with-param name="position" select="position()"/>
-        <xsl:with-param name="scope" select="$scope"/>
-        <xsl:with-param name="role" select="$role"/>
-        <xsl:with-param name="type" select="$type"/>
-        <xsl:sort select="translate(see, 'Aa&#192;&#224;&#193;&#225;&#194;&#226;&#195;&#227;&#196;&#228;&#197;&#229;&#256;&#257;&#258;&#259;&#260;&#261;&#461;&#462;&#478;&#479;&#480;&#481;&#506;&#507;&#512;&#513;&#514;&#515;&#550;&#551;&#7680;&#7681;&#7834;&#7840;&#7841;&#7842;&#7843;&#7844;&#7845;&#7846;&#7847;&#7848;&#7849;&#7850;&#7851;&#7852;&#7853;&#7854;&#7855;&#7856;&#7857;&#7858;&#7859;&#7860;&#7861;&#7862;&#7863;Bb&#384;&#385;&#595;&#386;&#387;&#7682;&#7683;&#7684;&#7685;&#7686;&#7687;Cc&#199;&#231;&#262;&#263;&#264;&#265;&#266;&#267;&#268;&#269;&#391;&#392;&#597;&#7688;&#7689;Dd&#270;&#271;&#272;&#273;&#394;&#599;&#395;&#396;&#453;&#498;&#545;&#598;&#7690;&#7691;&#7692;&#7693;&#7694;&#7695;&#7696;&#7697;&#7698;&#7699;Ee&#200;&#232;&#201;&#233;&#202;&#234;&#203;&#235;&#274;&#275;&#276;&#277;&#278;&#279;&#280;&#281;&#282;&#283;&#516;&#517;&#518;&#519;&#552;&#553;&#7700;&#7701;&#7702;&#7703;&#7704;&#7705;&#7706;&#7707;&#7708;&#7709;&#7864;&#7865;&#7866;&#7867;&#7868;&#7869;&#7870;&#7871;&#7872;&#7873;&#7874;&#7875;&#7876;&#7877;&#7878;&#7879;Ff&#401;&#402;&#7710;&#7711;Gg&#284;&#285;&#286;&#287;&#288;&#289;&#290;&#291;&#403;&#608;&#484;&#485;&#486;&#487;&#500;&#501;&#7712;&#7713;Hh&#292;&#293;&#294;&#295;&#542;&#543;&#614;&#7714;&#7715;&#7716;&#7717;&#7718;&#7719;&#7720;&#7721;&#7722;&#7723;&#7830;Ii&#204;&#236;&#205;&#237;&#206;&#238;&#207;&#239;&#296;&#297;&#298;&#299;&#300;&#301;&#302;&#303;&#304;&#407;&#616;&#463;&#464;&#520;&#521;&#522;&#523;&#7724;&#7725;&#7726;&#7727;&#7880;&#7881;&#7882;&#7883;Jj&#308;&#309;&#496;&#669;Kk&#310;&#311;&#408;&#409;&#488;&#489;&#7728;&#7729;&#7730;&#7731;&#7732;&#7733;Ll&#313;&#314;&#315;&#316;&#317;&#318;&#319;&#320;&#321;&#322;&#410;&#456;&#564;&#619;&#620;&#621;&#7734;&#7735;&#7736;&#7737;&#7738;&#7739;&#7740;&#7741;Mm&#625;&#7742;&#7743;&#7744;&#7745;&#7746;&#7747;Nn&#209;&#241;&#323;&#324;&#325;&#326;&#327;&#328;&#413;&#626;&#414;&#544;&#459;&#504;&#505;&#565;&#627;&#7748;&#7749;&#7750;&#7751;&#7752;&#7753;&#7754;&#7755;Oo&#210;&#242;&#211;&#243;&#212;&#244;&#213;&#245;&#214;&#246;&#216;&#248;&#332;&#333;&#334;&#335;&#336;&#337;&#415;&#416;&#417;&#465;&#466;&#490;&#491;&#492;&#493;&#510;&#511;&#524;&#525;&#526;&#527;&#554;&#555;&#556;&#557;&#558;&#559;&#560;&#561;&#7756;&#7757;&#7758;&#7759;&#7760;&#7761;&#7762;&#7763;&#7884;&#7885;&#7886;&#7887;&#7888;&#7889;&#7890;&#7891;&#7892;&#7893;&#7894;&#7895;&#7896;&#7897;&#7898;&#7899;&#7900;&#7901;&#7902;&#7903;&#7904;&#7905;&#7906;&#7907;Pp&#420;&#421;&#7764;&#7765;&#7766;&#7767;Qq&#672;Rr&#340;&#341;&#342;&#343;&#344;&#345;&#528;&#529;&#530;&#531;&#636;&#637;&#638;&#7768;&#7769;&#7770;&#7771;&#7772;&#7773;&#7774;&#7775;Ss&#346;&#347;&#348;&#349;&#350;&#351;&#352;&#353;&#536;&#537;&#642;&#7776;&#7777;&#7778;&#7779;&#7780;&#7781;&#7782;&#7783;&#7784;&#7785;Tt&#354;&#355;&#356;&#357;&#358;&#359;&#427;&#428;&#429;&#430;&#648;&#538;&#539;&#566;&#7786;&#7787;&#7788;&#7789;&#7790;&#7791;&#7792;&#7793;&#7831;Uu&#217;&#249;&#218;&#250;&#219;&#251;&#220;&#252;&#360;&#361;&#362;&#363;&#364;&#365;&#366;&#367;&#368;&#369;&#370;&#371;&#431;&#432;&#467;&#468;&#469;&#470;&#471;&#472;&#473;&#474;&#475;&#476;&#532;&#533;&#534;&#535;&#7794;&#7795;&#7796;&#7797;&#7798;&#7799;&#7800;&#7801;&#7802;&#7803;&#7908;&#7909;&#7910;&#7911;&#7912;&#7913;&#7914;&#7915;&#7916;&#7917;&#7918;&#7919;&#7920;&#7921;Vv&#434;&#651;&#7804;&#7805;&#7806;&#7807;Ww&#372;&#373;&#7808;&#7809;&#7810;&#7811;&#7812;&#7813;&#7814;&#7815;&#7816;&#7817;&#7832;Xx&#7818;&#7819;&#7820;&#7821;Yy&#221;&#253;&#255;&#376;&#374;&#375;&#435;&#436;&#562;&#563;&#7822;&#7823;&#7833;&#7922;&#7923;&#7924;&#7925;&#7926;&#7927;&#7928;&#7929;Zz&#377;&#378;&#379;&#380;&#381;&#382;&#437;&#438;&#548;&#549;&#656;&#657;&#7824;&#7825;&#7826;&#7827;&#7828;&#7829;&#7829;', 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ')"/>
-      </xsl:apply-templates>
-    </xsl:if>
-  </dt>
-  <xsl:if test="$refs/secondary or $refs[not(secondary)]/*[self::seealso]">
-    <dd>
-      <dl>
-        <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see-also', concat(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])), &quot; &quot;, &quot; &quot;, &quot; &quot;, seealso))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1])]" mode="index-seealso">
-          <xsl:with-param name="position" select="position()"/>
-          <xsl:with-param name="scope" select="$scope"/>
-          <xsl:with-param name="role" select="$role"/>
-          <xsl:with-param name="type" select="$type"/>
-          <xsl:sort select="translate(seealso, 'Aa&#192;&#224;&#193;&#225;&#194;&#226;&#195;&#227;&#196;&#228;&#197;&#229;&#256;&#257;&#258;&#259;&#260;&#261;&#461;&#462;&#478;&#479;&#480;&#481;&#506;&#507;&#512;&#513;&#514;&#515;&#550;&#551;&#7680;&#7681;&#7834;&#7840;&#7841;&#7842;&#7843;&#7844;&#7845;&#7846;&#7847;&#7848;&#7849;&#7850;&#7851;&#7852;&#7853;&#7854;&#7855;&#7856;&#7857;&#7858;&#7859;&#7860;&#7861;&#7862;&#7863;Bb&#384;&#385;&#595;&#386;&#387;&#7682;&#7683;&#7684;&#7685;&#7686;&#7687;Cc&#199;&#231;&#262;&#263;&#264;&#265;&#266;&#267;&#268;&#269;&#391;&#392;&#597;&#7688;&#7689;Dd&#270;&#271;&#272;&#273;&#394;&#599;&#395;&#396;&#453;&#498;&#545;&#598;&#7690;&#7691;&#7692;&#7693;&#7694;&#7695;&#7696;&#7697;&#7698;&#7699;Ee&#200;&#232;&#201;&#233;&#202;&#234;&#203;&#235;&#274;&#275;&#276;&#277;&#278;&#279;&#280;&#281;&#282;&#283;&#516;&#517;&#518;&#519;&#552;&#553;&#7700;&#7701;&#7702;&#7703;&#7704;&#7705;&#7706;&#7707;&#7708;&#7709;&#7864;&#7865;&#7866;&#7867;&#7868;&#7869;&#7870;&#7871;&#7872;&#7873;&#7874;&#7875;&#7876;&#7877;&#7878;&#7879;Ff&#401;&#402;&#7710;&#7711;Gg&#284;&#285;&#286;&#287;&#288;&#289;&#290;&#291;&#403;&#608;&#484;&#485;&#486;&#487;&#500;&#501;&#7712;&#7713;Hh&#292;&#293;&#294;&#295;&#542;&#543;&#614;&#7714;&#7715;&#7716;&#7717;&#7718;&#7719;&#7720;&#7721;&#7722;&#7723;&#7830;Ii&#204;&#236;&#205;&#237;&#206;&#238;&#207;&#239;&#296;&#297;&#298;&#299;&#300;&#301;&#302;&#303;&#304;&#407;&#616;&#463;&#464;&#520;&#521;&#522;&#523;&#7724;&#7725;&#7726;&#7727;&#7880;&#7881;&#7882;&#7883;Jj&#308;&#309;&#496;&#669;Kk&#310;&#311;&#408;&#409;&#488;&#489;&#7728;&#7729;&#7730;&#7731;&#7732;&#7733;Ll&#313;&#314;&#315;&#316;&#317;&#318;&#319;&#320;&#321;&#322;&#410;&#456;&#564;&#619;&#620;&#621;&#7734;&#7735;&#7736;&#7737;&#7738;&#7739;&#7740;&#7741;Mm&#625;&#7742;&#7743;&#7744;&#7745;&#7746;&#7747;Nn&#209;&#241;&#323;&#324;&#325;&#326;&#327;&#328;&#413;&#626;&#414;&#544;&#459;&#504;&#505;&#565;&#627;&#7748;&#7749;&#7750;&#7751;&#7752;&#7753;&#7754;&#7755;Oo&#210;&#242;&#211;&#243;&#212;&#244;&#213;&#245;&#214;&#246;&#216;&#248;&#332;&#333;&#334;&#335;&#336;&#337;&#415;&#416;&#417;&#465;&#466;&#490;&#491;&#492;&#493;&#510;&#511;&#524;&#525;&#526;&#527;&#554;&#555;&#556;&#557;&#558;&#559;&#560;&#561;&#7756;&#7757;&#7758;&#7759;&#7760;&#7761;&#7762;&#7763;&#7884;&#7885;&#7886;&#7887;&#7888;&#7889;&#7890;&#7891;&#7892;&#7893;&#7894;&#7895;&#7896;&#7897;&#7898;&#7899;&#7900;&#7901;&#7902;&#7903;&#7904;&#7905;&#7906;&#7907;Pp&#420;&#421;&#7764;&#7765;&#7766;&#7767;Qq&#672;Rr&#340;&#341;&#342;&#343;&#344;&#345;&#528;&#529;&#530;&#531;&#636;&#637;&#638;&#7768;&#7769;&#7770;&#7771;&#7772;&#7773;&#7774;&#7775;Ss&#346;&#347;&#348;&#349;&#350;&#351;&#352;&#353;&#536;&#537;&#642;&#7776;&#7777;&#7778;&#7779;&#7780;&#7781;&#7782;&#7783;&#7784;&#7785;Tt&#354;&#355;&#356;&#357;&#358;&#359;&#427;&#428;&#429;&#430;&#648;&#538;&#539;&#566;&#7786;&#7787;&#7788;&#7789;&#7790;&#7791;&#7792;&#7793;&#7831;Uu&#217;&#249;&#218;&#250;&#219;&#251;&#220;&#252;&#360;&#361;&#362;&#363;&#364;&#365;&#366;&#367;&#368;&#369;&#370;&#371;&#431;&#432;&#467;&#468;&#469;&#470;&#471;&#472;&#473;&#474;&#475;&#476;&#532;&#533;&#534;&#535;&#7794;&#7795;&#7796;&#7797;&#7798;&#7799;&#7800;&#7801;&#7802;&#7803;&#7908;&#7909;&#7910;&#7911;&#7912;&#7913;&#7914;&#7915;&#7916;&#7917;&#7918;&#7919;&#7920;&#7921;Vv&#434;&#651;&#7804;&#7805;&#7806;&#7807;Ww&#372;&#373;&#7808;&#7809;&#7810;&#7811;&#7812;&#7813;&#7814;&#7815;&#7816;&#7817;&#7832;Xx&#7818;&#7819;&#7820;&#7821;Yy&#221;&#253;&#255;&#376;&#374;&#375;&#435;&#436;&#562;&#563;&#7822;&#7823;&#7833;&#7922;&#7923;&#7924;&#7925;&#7926;&#7927;&#7928;&#7929;Zz&#377;&#378;&#379;&#380;&#381;&#382;&#437;&#438;&#548;&#549;&#656;&#657;&#7824;&#7825;&#7826;&#7827;&#7828;&#7829;&#7829;', 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ')"/>
-        </xsl:apply-templates>
-        <xsl:apply-templates select="$refs[secondary and count(.|key('secondary', concat($key, &quot; &quot;, normalize-space(concat(secondary/@sortas, secondary[not(@sortas) or @sortas = &quot;&quot;]))))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1]) = 1]" mode="index-secondary">
-          <xsl:with-param name="position" select="position()"/>
-          <xsl:with-param name="scope" select="$scope"/>
-          <xsl:with-param name="role" select="$role"/>
-          <xsl:with-param name="type" select="$type"/>
-          <xsl:sort select="translate(normalize-space(concat(secondary/@sortas, secondary[not(@sortas) or @sortas = &quot;&quot;])), 'Aa&#192;&#224;&#193;&#225;&#194;&#226;&#195;&#227;&#196;&#228;&#197;&#229;&#256;&#257;&#258;&#259;&#260;&#261;&#461;&#462;&#478;&#479;&#480;&#481;&#506;&#507;&#512;&#513;&#514;&#515;&#550;&#551;&#7680;&#7681;&#7834;&#7840;&#7841;&#7842;&#7843;&#7844;&#7845;&#7846;&#7847;&#7848;&#7849;&#7850;&#7851;&#7852;&#7853;&#7854;&#7855;&#7856;&#7857;&#7858;&#7859;&#7860;&#7861;&#7862;&#7863;Bb&#384;&#385;&#595;&#386;&#387;&#7682;&#7683;&#7684;&#7685;&#7686;&#7687;Cc&#199;&#231;&#262;&#263;&#264;&#265;&#266;&#267;&#268;&#269;&#391;&#392;&#597;&#7688;&#7689;Dd&#270;&#271;&#272;&#273;&#394;&#599;&#395;&#396;&#453;&#498;&#545;&#598;&#7690;&#7691;&#7692;&#7693;&#7694;&#7695;&#7696;&#7697;&#7698;&#7699;Ee&#200;&#232;&#201;&#233;&#202;&#234;&#203;&#235;&#274;&#275;&#276;&#277;&#278;&#279;&#280;&#281;&#282;&#283;&#516;&#517;&#518;&#519;&#552;&#553;&#7700;&#7701;&#7702;&#7703;&#7704;&#7705;&#7706;&#7707;&#7708;&#7709;&#7864;&#7865;&#7866;&#7867;&#7868;&#7869;&#7870;&#7871;&#7872;&#7873;&#7874;&#7875;&#7876;&#7877;&#7878;&#7879;Ff&#401;&#402;&#7710;&#7711;Gg&#284;&#285;&#286;&#287;&#288;&#289;&#290;&#291;&#403;&#608;&#484;&#485;&#486;&#487;&#500;&#501;&#7712;&#7713;Hh&#292;&#293;&#294;&#295;&#542;&#543;&#614;&#7714;&#7715;&#7716;&#7717;&#7718;&#7719;&#7720;&#7721;&#7722;&#7723;&#7830;Ii&#204;&#236;&#205;&#237;&#206;&#238;&#207;&#239;&#296;&#297;&#298;&#299;&#300;&#301;&#302;&#303;&#304;&#407;&#616;&#463;&#464;&#520;&#521;&#522;&#523;&#7724;&#7725;&#7726;&#7727;&#7880;&#7881;&#7882;&#7883;Jj&#308;&#309;&#496;&#669;Kk&#310;&#311;&#408;&#409;&#488;&#489;&#7728;&#7729;&#7730;&#7731;&#7732;&#7733;Ll&#313;&#314;&#315;&#316;&#317;&#318;&#319;&#320;&#321;&#322;&#410;&#456;&#564;&#619;&#620;&#621;&#7734;&#7735;&#7736;&#7737;&#7738;&#7739;&#7740;&#7741;Mm&#625;&#7742;&#7743;&#7744;&#7745;&#7746;&#7747;Nn&#209;&#241;&#323;&#324;&#325;&#326;&#327;&#328;&#413;&#626;&#414;&#544;&#459;&#504;&#505;&#565;&#627;&#7748;&#7749;&#7750;&#7751;&#7752;&#7753;&#7754;&#7755;Oo&#210;&#242;&#211;&#243;&#212;&#244;&#213;&#245;&#214;&#246;&#216;&#248;&#332;&#333;&#334;&#335;&#336;&#337;&#415;&#416;&#417;&#465;&#466;&#490;&#491;&#492;&#493;&#510;&#511;&#524;&#525;&#526;&#527;&#554;&#555;&#556;&#557;&#558;&#559;&#560;&#561;&#7756;&#7757;&#7758;&#7759;&#7760;&#7761;&#7762;&#7763;&#7884;&#7885;&#7886;&#7887;&#7888;&#7889;&#7890;&#7891;&#7892;&#7893;&#7894;&#7895;&#7896;&#7897;&#7898;&#7899;&#7900;&#7901;&#7902;&#7903;&#7904;&#7905;&#7906;&#7907;Pp&#420;&#421;&#7764;&#7765;&#7766;&#7767;Qq&#672;Rr&#340;&#341;&#342;&#343;&#344;&#345;&#528;&#529;&#530;&#531;&#636;&#637;&#638;&#7768;&#7769;&#7770;&#7771;&#7772;&#7773;&#7774;&#7775;Ss&#346;&#347;&#348;&#349;&#350;&#351;&#352;&#353;&#536;&#537;&#642;&#7776;&#7777;&#7778;&#7779;&#7780;&#7781;&#7782;&#7783;&#7784;&#7785;Tt&#354;&#355;&#356;&#357;&#358;&#359;&#427;&#428;&#429;&#430;&#648;&#538;&#539;&#566;&#7786;&#7787;&#7788;&#7789;&#7790;&#7791;&#7792;&#7793;&#7831;Uu&#217;&#249;&#218;&#250;&#219;&#251;&#220;&#252;&#360;&#361;&#362;&#363;&#364;&#365;&#366;&#367;&#368;&#369;&#370;&#371;&#431;&#432;&#467;&#468;&#469;&#470;&#471;&#472;&#473;&#474;&#475;&#476;&#532;&#533;&#534;&#535;&#7794;&#7795;&#7796;&#7797;&#7798;&#7799;&#7800;&#7801;&#7802;&#7803;&#7908;&#7909;&#7910;&#7911;&#7912;&#7913;&#7914;&#7915;&#7916;&#7917;&#7918;&#7919;&#7920;&#7921;Vv&#434;&#651;&#7804;&#7805;&#7806;&#7807;Ww&#372;&#373;&#7808;&#7809;&#7810;&#7811;&#7812;&#7813;&#7814;&#7815;&#7816;&#7817;&#7832;Xx&#7818;&#7819;&#7820;&#7821;Yy&#221;&#253;&#255;&#376;&#374;&#375;&#435;&#436;&#562;&#563;&#7822;&#7823;&#7833;&#7922;&#7923;&#7924;&#7925;&#7926;&#7927;&#7928;&#7929;Zz&#377;&#378;&#379;&#380;&#381;&#382;&#437;&#438;&#548;&#549;&#656;&#657;&#7824;&#7825;&#7826;&#7827;&#7828;&#7829;&#7829;', 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ')"/>
-        </xsl:apply-templates>
-      </dl>
-    </dd>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="index-secondary">
-  <xsl:param name="scope" select="."/>
-  <xsl:param name="role" select="''"/>
-  <xsl:param name="type" select="''"/>
-
-  <xsl:variable name="key" select="concat(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])), &quot; &quot;, normalize-space(concat(secondary/@sortas, secondary[not(@sortas) or @sortas = &quot;&quot;])))"/>
-  <xsl:variable name="refs" select="key('secondary', $key)[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))]"/>
-  <dt>
-    <xsl:value-of select="secondary"/>
-    <xsl:for-each select="$refs[generate-id() = generate-id(key('secondary-section', concat($key, &quot; &quot;, generate-id((ancestor-or-self::set|ancestor-or-self::book|ancestor-or-self::part|ancestor-or-self::reference|ancestor-or-self::partintro|ancestor-or-self::chapter|ancestor-or-self::appendix|ancestor-or-self::preface|ancestor-or-self::article|ancestor-or-self::section|ancestor-or-self::sect1|ancestor-or-self::sect2|ancestor-or-self::sect3|ancestor-or-self::sect4|ancestor-or-self::sect5|ancestor-or-self::refentry|ancestor-or-self::refsect1|ancestor-or-self::refsect2|ancestor-or-self::refsect3|ancestor-or-self::simplesect|ancestor-or-self::bibliography|ancestor-or-self::glossary|ancestor-or-self::index|ancestor-or-self::webpage)[last()])))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1])]">
-      <xsl:apply-templates select="." mode="reference">
-        <xsl:with-param name="position" select="position()"/>
-        <xsl:with-param name="scope" select="$scope"/>
-        <xsl:with-param name="role" select="$role"/>
-        <xsl:with-param name="type" select="$type"/>
-      </xsl:apply-templates>
-    </xsl:for-each>
-
-    <xsl:if test="$refs[not(tertiary)]/*[self::see]">
-      <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see', concat(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])), &quot; &quot;, normalize-space(concat(secondary/@sortas, secondary[not(@sortas) or @sortas = &quot;&quot;])), &quot; &quot;, &quot; &quot;, see))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1])]" mode="index-see">
-        <xsl:with-param name="position" select="position()"/>
-        <xsl:with-param name="scope" select="$scope"/>
-        <xsl:with-param name="role" select="$role"/>
-        <xsl:with-param name="type" select="$type"/>
-        <xsl:sort select="translate(see, 'Aa&#192;&#224;&#193;&#225;&#194;&#226;&#195;&#227;&#196;&#228;&#197;&#229;&#256;&#257;&#258;&#259;&#260;&#261;&#461;&#462;&#478;&#479;&#480;&#481;&#506;&#507;&#512;&#513;&#514;&#515;&#550;&#551;&#7680;&#7681;&#7834;&#7840;&#7841;&#7842;&#7843;&#7844;&#7845;&#7846;&#7847;&#7848;&#7849;&#7850;&#7851;&#7852;&#7853;&#7854;&#7855;&#7856;&#7857;&#7858;&#7859;&#7860;&#7861;&#7862;&#7863;Bb&#384;&#385;&#595;&#386;&#387;&#7682;&#7683;&#7684;&#7685;&#7686;&#7687;Cc&#199;&#231;&#262;&#263;&#264;&#265;&#266;&#267;&#268;&#269;&#391;&#392;&#597;&#7688;&#7689;Dd&#270;&#271;&#272;&#273;&#394;&#599;&#395;&#396;&#453;&#498;&#545;&#598;&#7690;&#7691;&#7692;&#7693;&#7694;&#7695;&#7696;&#7697;&#7698;&#7699;Ee&#200;&#232;&#201;&#233;&#202;&#234;&#203;&#235;&#274;&#275;&#276;&#277;&#278;&#279;&#280;&#281;&#282;&#283;&#516;&#517;&#518;&#519;&#552;&#553;&#7700;&#7701;&#7702;&#7703;&#7704;&#7705;&#7706;&#7707;&#7708;&#7709;&#7864;&#7865;&#7866;&#7867;&#7868;&#7869;&#7870;&#7871;&#7872;&#7873;&#7874;&#7875;&#7876;&#7877;&#7878;&#7879;Ff&#401;&#402;&#7710;&#7711;Gg&#284;&#285;&#286;&#287;&#288;&#289;&#290;&#291;&#403;&#608;&#484;&#485;&#486;&#487;&#500;&#501;&#7712;&#7713;Hh&#292;&#293;&#294;&#295;&#542;&#543;&#614;&#7714;&#7715;&#7716;&#7717;&#7718;&#7719;&#7720;&#7721;&#7722;&#7723;&#7830;Ii&#204;&#236;&#205;&#237;&#206;&#238;&#207;&#239;&#296;&#297;&#298;&#299;&#300;&#301;&#302;&#303;&#304;&#407;&#616;&#463;&#464;&#520;&#521;&#522;&#523;&#7724;&#7725;&#7726;&#7727;&#7880;&#7881;&#7882;&#7883;Jj&#308;&#309;&#496;&#669;Kk&#310;&#311;&#408;&#409;&#488;&#489;&#7728;&#7729;&#7730;&#7731;&#7732;&#7733;Ll&#313;&#314;&#315;&#316;&#317;&#318;&#319;&#320;&#321;&#322;&#410;&#456;&#564;&#619;&#620;&#621;&#7734;&#7735;&#7736;&#7737;&#7738;&#7739;&#7740;&#7741;Mm&#625;&#7742;&#7743;&#7744;&#7745;&#7746;&#7747;Nn&#209;&#241;&#323;&#324;&#325;&#326;&#327;&#328;&#413;&#626;&#414;&#544;&#459;&#504;&#505;&#565;&#627;&#7748;&#7749;&#7750;&#7751;&#7752;&#7753;&#7754;&#7755;Oo&#210;&#242;&#211;&#243;&#212;&#244;&#213;&#245;&#214;&#246;&#216;&#248;&#332;&#333;&#334;&#335;&#336;&#337;&#415;&#416;&#417;&#465;&#466;&#490;&#491;&#492;&#493;&#510;&#511;&#524;&#525;&#526;&#527;&#554;&#555;&#556;&#557;&#558;&#559;&#560;&#561;&#7756;&#7757;&#7758;&#7759;&#7760;&#7761;&#7762;&#7763;&#7884;&#7885;&#7886;&#7887;&#7888;&#7889;&#7890;&#7891;&#7892;&#7893;&#7894;&#7895;&#7896;&#7897;&#7898;&#7899;&#7900;&#7901;&#7902;&#7903;&#7904;&#7905;&#7906;&#7907;Pp&#420;&#421;&#7764;&#7765;&#7766;&#7767;Qq&#672;Rr&#340;&#341;&#342;&#343;&#344;&#345;&#528;&#529;&#530;&#531;&#636;&#637;&#638;&#7768;&#7769;&#7770;&#7771;&#7772;&#7773;&#7774;&#7775;Ss&#346;&#347;&#348;&#349;&#350;&#351;&#352;&#353;&#536;&#537;&#642;&#7776;&#7777;&#7778;&#7779;&#7780;&#7781;&#7782;&#7783;&#7784;&#7785;Tt&#354;&#355;&#356;&#357;&#358;&#359;&#427;&#428;&#429;&#430;&#648;&#538;&#539;&#566;&#7786;&#7787;&#7788;&#7789;&#7790;&#7791;&#7792;&#7793;&#7831;Uu&#217;&#249;&#218;&#250;&#219;&#251;&#220;&#252;&#360;&#361;&#362;&#363;&#364;&#365;&#366;&#367;&#368;&#369;&#370;&#371;&#431;&#432;&#467;&#468;&#469;&#470;&#471;&#472;&#473;&#474;&#475;&#476;&#532;&#533;&#534;&#535;&#7794;&#7795;&#7796;&#7797;&#7798;&#7799;&#7800;&#7801;&#7802;&#7803;&#7908;&#7909;&#7910;&#7911;&#7912;&#7913;&#7914;&#7915;&#7916;&#7917;&#7918;&#7919;&#7920;&#7921;Vv&#434;&#651;&#7804;&#7805;&#7806;&#7807;Ww&#372;&#373;&#7808;&#7809;&#7810;&#7811;&#7812;&#7813;&#7814;&#7815;&#7816;&#7817;&#7832;Xx&#7818;&#7819;&#7820;&#7821;Yy&#221;&#253;&#255;&#376;&#374;&#375;&#435;&#436;&#562;&#563;&#7822;&#7823;&#7833;&#7922;&#7923;&#7924;&#7925;&#7926;&#7927;&#7928;&#7929;Zz&#377;&#378;&#379;&#380;&#381;&#382;&#437;&#438;&#548;&#549;&#656;&#657;&#7824;&#7825;&#7826;&#7827;&#7828;&#7829;&#7829;', 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ')"/>
-      </xsl:apply-templates>
-    </xsl:if>
-  </dt>
-  <xsl:if test="$refs/tertiary or $refs[not(tertiary)]/*[self::seealso]">
-    <dd>
-      <dl>
-        <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see-also', concat(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])), &quot; &quot;, normalize-space(concat(secondary/@sortas, secondary[not(@sortas) or @sortas = &quot;&quot;])), &quot; &quot;, &quot; &quot;, seealso))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1])]" mode="index-seealso">
-          <xsl:with-param name="position" select="position()"/>
-          <xsl:with-param name="scope" select="$scope"/>
-          <xsl:with-param name="role" select="$role"/>
-          <xsl:with-param name="type" select="$type"/>
-          <xsl:sort select="translate(seealso, 'Aa&#192;&#224;&#193;&#225;&#194;&#226;&#195;&#227;&#196;&#228;&#197;&#229;&#256;&#257;&#258;&#259;&#260;&#261;&#461;&#462;&#478;&#479;&#480;&#481;&#506;&#507;&#512;&#513;&#514;&#515;&#550;&#551;&#7680;&#7681;&#7834;&#7840;&#7841;&#7842;&#7843;&#7844;&#7845;&#7846;&#7847;&#7848;&#7849;&#7850;&#7851;&#7852;&#7853;&#7854;&#7855;&#7856;&#7857;&#7858;&#7859;&#7860;&#7861;&#7862;&#7863;Bb&#384;&#385;&#595;&#386;&#387;&#7682;&#7683;&#7684;&#7685;&#7686;&#7687;Cc&#199;&#231;&#262;&#263;&#264;&#265;&#266;&#267;&#268;&#269;&#391;&#392;&#597;&#7688;&#7689;Dd&#270;&#271;&#272;&#273;&#394;&#599;&#395;&#396;&#453;&#498;&#545;&#598;&#7690;&#7691;&#7692;&#7693;&#7694;&#7695;&#7696;&#7697;&#7698;&#7699;Ee&#200;&#232;&#201;&#233;&#202;&#234;&#203;&#235;&#274;&#275;&#276;&#277;&#278;&#279;&#280;&#281;&#282;&#283;&#516;&#517;&#518;&#519;&#552;&#553;&#7700;&#7701;&#7702;&#7703;&#7704;&#7705;&#7706;&#7707;&#7708;&#7709;&#7864;&#7865;&#7866;&#7867;&#7868;&#7869;&#7870;&#7871;&#7872;&#7873;&#7874;&#7875;&#7876;&#7877;&#7878;&#7879;Ff&#401;&#402;&#7710;&#7711;Gg&#284;&#285;&#286;&#287;&#288;&#289;&#290;&#291;&#403;&#608;&#484;&#485;&#486;&#487;&#500;&#501;&#7712;&#7713;Hh&#292;&#293;&#294;&#295;&#542;&#543;&#614;&#7714;&#7715;&#7716;&#7717;&#7718;&#7719;&#7720;&#7721;&#7722;&#7723;&#7830;Ii&#204;&#236;&#205;&#237;&#206;&#238;&#207;&#239;&#296;&#297;&#298;&#299;&#300;&#301;&#302;&#303;&#304;&#407;&#616;&#463;&#464;&#520;&#521;&#522;&#523;&#7724;&#7725;&#7726;&#7727;&#7880;&#7881;&#7882;&#7883;Jj&#308;&#309;&#496;&#669;Kk&#310;&#311;&#408;&#409;&#488;&#489;&#7728;&#7729;&#7730;&#7731;&#7732;&#7733;Ll&#313;&#314;&#315;&#316;&#317;&#318;&#319;&#320;&#321;&#322;&#410;&#456;&#564;&#619;&#620;&#621;&#7734;&#7735;&#7736;&#7737;&#7738;&#7739;&#7740;&#7741;Mm&#625;&#7742;&#7743;&#7744;&#7745;&#7746;&#7747;Nn&#209;&#241;&#323;&#324;&#325;&#326;&#327;&#328;&#413;&#626;&#414;&#544;&#459;&#504;&#505;&#565;&#627;&#7748;&#7749;&#7750;&#7751;&#7752;&#7753;&#7754;&#7755;Oo&#210;&#242;&#211;&#243;&#212;&#244;&#213;&#245;&#214;&#246;&#216;&#248;&#332;&#333;&#334;&#335;&#336;&#337;&#415;&#416;&#417;&#465;&#466;&#490;&#491;&#492;&#493;&#510;&#511;&#524;&#525;&#526;&#527;&#554;&#555;&#556;&#557;&#558;&#559;&#560;&#561;&#7756;&#7757;&#7758;&#7759;&#7760;&#7761;&#7762;&#7763;&#7884;&#7885;&#7886;&#7887;&#7888;&#7889;&#7890;&#7891;&#7892;&#7893;&#7894;&#7895;&#7896;&#7897;&#7898;&#7899;&#7900;&#7901;&#7902;&#7903;&#7904;&#7905;&#7906;&#7907;Pp&#420;&#421;&#7764;&#7765;&#7766;&#7767;Qq&#672;Rr&#340;&#341;&#342;&#343;&#344;&#345;&#528;&#529;&#530;&#531;&#636;&#637;&#638;&#7768;&#7769;&#7770;&#7771;&#7772;&#7773;&#7774;&#7775;Ss&#346;&#347;&#348;&#349;&#350;&#351;&#352;&#353;&#536;&#537;&#642;&#7776;&#7777;&#7778;&#7779;&#7780;&#7781;&#7782;&#7783;&#7784;&#7785;Tt&#354;&#355;&#356;&#357;&#358;&#359;&#427;&#428;&#429;&#430;&#648;&#538;&#539;&#566;&#7786;&#7787;&#7788;&#7789;&#7790;&#7791;&#7792;&#7793;&#7831;Uu&#217;&#249;&#218;&#250;&#219;&#251;&#220;&#252;&#360;&#361;&#362;&#363;&#364;&#365;&#366;&#367;&#368;&#369;&#370;&#371;&#431;&#432;&#467;&#468;&#469;&#470;&#471;&#472;&#473;&#474;&#475;&#476;&#532;&#533;&#534;&#535;&#7794;&#7795;&#7796;&#7797;&#7798;&#7799;&#7800;&#7801;&#7802;&#7803;&#7908;&#7909;&#7910;&#7911;&#7912;&#7913;&#7914;&#7915;&#7916;&#7917;&#7918;&#7919;&#7920;&#7921;Vv&#434;&#651;&#7804;&#7805;&#7806;&#7807;Ww&#372;&#373;&#7808;&#7809;&#7810;&#7811;&#7812;&#7813;&#7814;&#7815;&#7816;&#7817;&#7832;Xx&#7818;&#7819;&#7820;&#7821;Yy&#221;&#253;&#255;&#376;&#374;&#375;&#435;&#436;&#562;&#563;&#7822;&#7823;&#7833;&#7922;&#7923;&#7924;&#7925;&#7926;&#7927;&#7928;&#7929;Zz&#377;&#378;&#379;&#380;&#381;&#382;&#437;&#438;&#548;&#549;&#656;&#657;&#7824;&#7825;&#7826;&#7827;&#7828;&#7829;&#7829;', 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ')"/>
-        </xsl:apply-templates>
-        <xsl:apply-templates select="$refs[tertiary and count(.|key('tertiary', concat($key, &quot; &quot;, normalize-space(concat(tertiary/@sortas, tertiary[not(@sortas) or @sortas = &quot;&quot;]))))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1]) = 1]" mode="index-tertiary">
-          <xsl:with-param name="position" select="position()"/>
-          <xsl:with-param name="scope" select="$scope"/>
-          <xsl:with-param name="role" select="$role"/>
-          <xsl:with-param name="type" select="$type"/>
-          <xsl:sort select="translate(normalize-space(concat(tertiary/@sortas, tertiary[not(@sortas) or @sortas = &quot;&quot;])), 'Aa&#192;&#224;&#193;&#225;&#194;&#226;&#195;&#227;&#196;&#228;&#197;&#229;&#256;&#257;&#258;&#259;&#260;&#261;&#461;&#462;&#478;&#479;&#480;&#481;&#506;&#507;&#512;&#513;&#514;&#515;&#550;&#551;&#7680;&#7681;&#7834;&#7840;&#7841;&#7842;&#7843;&#7844;&#7845;&#7846;&#7847;&#7848;&#7849;&#7850;&#7851;&#7852;&#7853;&#7854;&#7855;&#7856;&#7857;&#7858;&#7859;&#7860;&#7861;&#7862;&#7863;Bb&#384;&#385;&#595;&#386;&#387;&#7682;&#7683;&#7684;&#7685;&#7686;&#7687;Cc&#199;&#231;&#262;&#263;&#264;&#265;&#266;&#267;&#268;&#269;&#391;&#392;&#597;&#7688;&#7689;Dd&#270;&#271;&#272;&#273;&#394;&#599;&#395;&#396;&#453;&#498;&#545;&#598;&#7690;&#7691;&#7692;&#7693;&#7694;&#7695;&#7696;&#7697;&#7698;&#7699;Ee&#200;&#232;&#201;&#233;&#202;&#234;&#203;&#235;&#274;&#275;&#276;&#277;&#278;&#279;&#280;&#281;&#282;&#283;&#516;&#517;&#518;&#519;&#552;&#553;&#7700;&#7701;&#7702;&#7703;&#7704;&#7705;&#7706;&#7707;&#7708;&#7709;&#7864;&#7865;&#7866;&#7867;&#7868;&#7869;&#7870;&#7871;&#7872;&#7873;&#7874;&#7875;&#7876;&#7877;&#7878;&#7879;Ff&#401;&#402;&#7710;&#7711;Gg&#284;&#285;&#286;&#287;&#288;&#289;&#290;&#291;&#403;&#608;&#484;&#485;&#486;&#487;&#500;&#501;&#7712;&#7713;Hh&#292;&#293;&#294;&#295;&#542;&#543;&#614;&#7714;&#7715;&#7716;&#7717;&#7718;&#7719;&#7720;&#7721;&#7722;&#7723;&#7830;Ii&#204;&#236;&#205;&#237;&#206;&#238;&#207;&#239;&#296;&#297;&#298;&#299;&#300;&#301;&#302;&#303;&#304;&#407;&#616;&#463;&#464;&#520;&#521;&#522;&#523;&#7724;&#7725;&#7726;&#7727;&#7880;&#7881;&#7882;&#7883;Jj&#308;&#309;&#496;&#669;Kk&#310;&#311;&#408;&#409;&#488;&#489;&#7728;&#7729;&#7730;&#7731;&#7732;&#7733;Ll&#313;&#314;&#315;&#316;&#317;&#318;&#319;&#320;&#321;&#322;&#410;&#456;&#564;&#619;&#620;&#621;&#7734;&#7735;&#7736;&#7737;&#7738;&#7739;&#7740;&#7741;Mm&#625;&#7742;&#7743;&#7744;&#7745;&#7746;&#7747;Nn&#209;&#241;&#323;&#324;&#325;&#326;&#327;&#328;&#413;&#626;&#414;&#544;&#459;&#504;&#505;&#565;&#627;&#7748;&#7749;&#7750;&#7751;&#7752;&#7753;&#7754;&#7755;Oo&#210;&#242;&#211;&#243;&#212;&#244;&#213;&#245;&#214;&#246;&#216;&#248;&#332;&#333;&#334;&#335;&#336;&#337;&#415;&#416;&#417;&#465;&#466;&#490;&#491;&#492;&#493;&#510;&#511;&#524;&#525;&#526;&#527;&#554;&#555;&#556;&#557;&#558;&#559;&#560;&#561;&#7756;&#7757;&#7758;&#7759;&#7760;&#7761;&#7762;&#7763;&#7884;&#7885;&#7886;&#7887;&#7888;&#7889;&#7890;&#7891;&#7892;&#7893;&#7894;&#7895;&#7896;&#7897;&#7898;&#7899;&#7900;&#7901;&#7902;&#7903;&#7904;&#7905;&#7906;&#7907;Pp&#420;&#421;&#7764;&#7765;&#7766;&#7767;Qq&#672;Rr&#340;&#341;&#342;&#343;&#344;&#345;&#528;&#529;&#530;&#531;&#636;&#637;&#638;&#7768;&#7769;&#7770;&#7771;&#7772;&#7773;&#7774;&#7775;Ss&#346;&#347;&#348;&#349;&#350;&#351;&#352;&#353;&#536;&#537;&#642;&#7776;&#7777;&#7778;&#7779;&#7780;&#7781;&#7782;&#7783;&#7784;&#7785;Tt&#354;&#355;&#356;&#357;&#358;&#359;&#427;&#428;&#429;&#430;&#648;&#538;&#539;&#566;&#7786;&#7787;&#7788;&#7789;&#7790;&#7791;&#7792;&#7793;&#7831;Uu&#217;&#249;&#218;&#250;&#219;&#251;&#220;&#252;&#360;&#361;&#362;&#363;&#364;&#365;&#366;&#367;&#368;&#369;&#370;&#371;&#431;&#432;&#467;&#468;&#469;&#470;&#471;&#472;&#473;&#474;&#475;&#476;&#532;&#533;&#534;&#535;&#7794;&#7795;&#7796;&#7797;&#7798;&#7799;&#7800;&#7801;&#7802;&#7803;&#7908;&#7909;&#7910;&#7911;&#7912;&#7913;&#7914;&#7915;&#7916;&#7917;&#7918;&#7919;&#7920;&#7921;Vv&#434;&#651;&#7804;&#7805;&#7806;&#7807;Ww&#372;&#373;&#7808;&#7809;&#7810;&#7811;&#7812;&#7813;&#7814;&#7815;&#7816;&#7817;&#7832;Xx&#7818;&#7819;&#7820;&#7821;Yy&#221;&#253;&#255;&#376;&#374;&#375;&#435;&#436;&#562;&#563;&#7822;&#7823;&#7833;&#7922;&#7923;&#7924;&#7925;&#7926;&#7927;&#7928;&#7929;Zz&#377;&#378;&#379;&#380;&#381;&#382;&#437;&#438;&#548;&#549;&#656;&#657;&#7824;&#7825;&#7826;&#7827;&#7828;&#7829;&#7829;', 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ')"/>
-        </xsl:apply-templates>
-      </dl>
-    </dd>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="index-tertiary">
-  <xsl:param name="scope" select="."/>
-  <xsl:param name="role" select="''"/>
-  <xsl:param name="type" select="''"/>
-
-  <xsl:variable name="key" select="concat(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])), &quot; &quot;, normalize-space(concat(secondary/@sortas, secondary[not(@sortas) or @sortas = &quot;&quot;])), &quot; &quot;, normalize-space(concat(tertiary/@sortas, tertiary[not(@sortas) or @sortas = &quot;&quot;])))"/>
-  <xsl:variable name="refs" select="key('tertiary', $key)[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))]"/>
-  <dt>
-    <xsl:value-of select="tertiary"/>
-    <xsl:for-each select="$refs[generate-id() = generate-id(key('tertiary-section', concat($key, &quot; &quot;, generate-id((ancestor-or-self::set|ancestor-or-self::book|ancestor-or-self::part|ancestor-or-self::reference|ancestor-or-self::partintro|ancestor-or-self::chapter|ancestor-or-self::appendix|ancestor-or-self::preface|ancestor-or-self::article|ancestor-or-self::section|ancestor-or-self::sect1|ancestor-or-self::sect2|ancestor-or-self::sect3|ancestor-or-self::sect4|ancestor-or-self::sect5|ancestor-or-self::refentry|ancestor-or-self::refsect1|ancestor-or-self::refsect2|ancestor-or-self::refsect3|ancestor-or-self::simplesect|ancestor-or-self::bibliography|ancestor-or-self::glossary|ancestor-or-self::index|ancestor-or-self::webpage)[last()])))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1])]">
-      <xsl:apply-templates select="." mode="reference">
-        <xsl:with-param name="position" select="position()"/>
-        <xsl:with-param name="scope" select="$scope"/>
-        <xsl:with-param name="role" select="$role"/>
-        <xsl:with-param name="type" select="$type"/>
-      </xsl:apply-templates>
-    </xsl:for-each>
-
-    <xsl:if test="$refs/see">
-      <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see', concat(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])), &quot; &quot;, normalize-space(concat(secondary/@sortas, secondary[not(@sortas) or @sortas = &quot;&quot;])), &quot; &quot;, normalize-space(concat(tertiary/@sortas, tertiary[not(@sortas) or @sortas = &quot;&quot;])), &quot; &quot;, see))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1])]" mode="index-see">
-        <xsl:with-param name="position" select="position()"/>
-        <xsl:with-param name="scope" select="$scope"/>
-        <xsl:with-param name="role" select="$role"/>
-        <xsl:with-param name="type" select="$type"/>
-        <xsl:sort select="translate(see, 'Aa&#192;&#224;&#193;&#225;&#194;&#226;&#195;&#227;&#196;&#228;&#197;&#229;&#256;&#257;&#258;&#259;&#260;&#261;&#461;&#462;&#478;&#479;&#480;&#481;&#506;&#507;&#512;&#513;&#514;&#515;&#550;&#551;&#7680;&#7681;&#7834;&#7840;&#7841;&#7842;&#7843;&#7844;&#7845;&#7846;&#7847;&#7848;&#7849;&#7850;&#7851;&#7852;&#7853;&#7854;&#7855;&#7856;&#7857;&#7858;&#7859;&#7860;&#7861;&#7862;&#7863;Bb&#384;&#385;&#595;&#386;&#387;&#7682;&#7683;&#7684;&#7685;&#7686;&#7687;Cc&#199;&#231;&#262;&#263;&#264;&#265;&#266;&#267;&#268;&#269;&#391;&#392;&#597;&#7688;&#7689;Dd&#270;&#271;&#272;&#273;&#394;&#599;&#395;&#396;&#453;&#498;&#545;&#598;&#7690;&#7691;&#7692;&#7693;&#7694;&#7695;&#7696;&#7697;&#7698;&#7699;Ee&#200;&#232;&#201;&#233;&#202;&#234;&#203;&#235;&#274;&#275;&#276;&#277;&#278;&#279;&#280;&#281;&#282;&#283;&#516;&#517;&#518;&#519;&#552;&#553;&#7700;&#7701;&#7702;&#7703;&#7704;&#7705;&#7706;&#7707;&#7708;&#7709;&#7864;&#7865;&#7866;&#7867;&#7868;&#7869;&#7870;&#7871;&#7872;&#7873;&#7874;&#7875;&#7876;&#7877;&#7878;&#7879;Ff&#401;&#402;&#7710;&#7711;Gg&#284;&#285;&#286;&#287;&#288;&#289;&#290;&#291;&#403;&#608;&#484;&#485;&#486;&#487;&#500;&#501;&#7712;&#7713;Hh&#292;&#293;&#294;&#295;&#542;&#543;&#614;&#7714;&#7715;&#7716;&#7717;&#7718;&#7719;&#7720;&#7721;&#7722;&#7723;&#7830;Ii&#204;&#236;&#205;&#237;&#206;&#238;&#207;&#239;&#296;&#297;&#298;&#299;&#300;&#301;&#302;&#303;&#304;&#407;&#616;&#463;&#464;&#520;&#521;&#522;&#523;&#7724;&#7725;&#7726;&#7727;&#7880;&#7881;&#7882;&#7883;Jj&#308;&#309;&#496;&#669;Kk&#310;&#311;&#408;&#409;&#488;&#489;&#7728;&#7729;&#7730;&#7731;&#7732;&#7733;Ll&#313;&#314;&#315;&#316;&#317;&#318;&#319;&#320;&#321;&#322;&#410;&#456;&#564;&#619;&#620;&#621;&#7734;&#7735;&#7736;&#7737;&#7738;&#7739;&#7740;&#7741;Mm&#625;&#7742;&#7743;&#7744;&#7745;&#7746;&#7747;Nn&#209;&#241;&#323;&#324;&#325;&#326;&#327;&#328;&#413;&#626;&#414;&#544;&#459;&#504;&#505;&#565;&#627;&#7748;&#7749;&#7750;&#7751;&#7752;&#7753;&#7754;&#7755;Oo&#210;&#242;&#211;&#243;&#212;&#244;&#213;&#245;&#214;&#246;&#216;&#248;&#332;&#333;&#334;&#335;&#336;&#337;&#415;&#416;&#417;&#465;&#466;&#490;&#491;&#492;&#493;&#510;&#511;&#524;&#525;&#526;&#527;&#554;&#555;&#556;&#557;&#558;&#559;&#560;&#561;&#7756;&#7757;&#7758;&#7759;&#7760;&#7761;&#7762;&#7763;&#7884;&#7885;&#7886;&#7887;&#7888;&#7889;&#7890;&#7891;&#7892;&#7893;&#7894;&#7895;&#7896;&#7897;&#7898;&#7899;&#7900;&#7901;&#7902;&#7903;&#7904;&#7905;&#7906;&#7907;Pp&#420;&#421;&#7764;&#7765;&#7766;&#7767;Qq&#672;Rr&#340;&#341;&#342;&#343;&#344;&#345;&#528;&#529;&#530;&#531;&#636;&#637;&#638;&#7768;&#7769;&#7770;&#7771;&#7772;&#7773;&#7774;&#7775;Ss&#346;&#347;&#348;&#349;&#350;&#351;&#352;&#353;&#536;&#537;&#642;&#7776;&#7777;&#7778;&#7779;&#7780;&#7781;&#7782;&#7783;&#7784;&#7785;Tt&#354;&#355;&#356;&#357;&#358;&#359;&#427;&#428;&#429;&#430;&#648;&#538;&#539;&#566;&#7786;&#7787;&#7788;&#7789;&#7790;&#7791;&#7792;&#7793;&#7831;Uu&#217;&#249;&#218;&#250;&#219;&#251;&#220;&#252;&#360;&#361;&#362;&#363;&#364;&#365;&#366;&#367;&#368;&#369;&#370;&#371;&#431;&#432;&#467;&#468;&#469;&#470;&#471;&#472;&#473;&#474;&#475;&#476;&#532;&#533;&#534;&#535;&#7794;&#7795;&#7796;&#7797;&#7798;&#7799;&#7800;&#7801;&#7802;&#7803;&#7908;&#7909;&#7910;&#7911;&#7912;&#7913;&#7914;&#7915;&#7916;&#7917;&#7918;&#7919;&#7920;&#7921;Vv&#434;&#651;&#7804;&#7805;&#7806;&#7807;Ww&#372;&#373;&#7808;&#7809;&#7810;&#7811;&#7812;&#7813;&#7814;&#7815;&#7816;&#7817;&#7832;Xx&#7818;&#7819;&#7820;&#7821;Yy&#221;&#253;&#255;&#376;&#374;&#375;&#435;&#436;&#562;&#563;&#7822;&#7823;&#7833;&#7922;&#7923;&#7924;&#7925;&#7926;&#7927;&#7928;&#7929;Zz&#377;&#378;&#379;&#380;&#381;&#382;&#437;&#438;&#548;&#549;&#656;&#657;&#7824;&#7825;&#7826;&#7827;&#7828;&#7829;&#7829;', 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ')"/>
-      </xsl:apply-templates>
-    </xsl:if>
-  </dt>
-  <xsl:if test="$refs/seealso">
-    <dd>
-      <dl>
-        <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see-also', concat(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])), &quot; &quot;, normalize-space(concat(secondary/@sortas, secondary[not(@sortas) or @sortas = &quot;&quot;])), &quot; &quot;, normalize-space(concat(tertiary/@sortas, tertiary[not(@sortas) or @sortas = &quot;&quot;])), &quot; &quot;, seealso))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1])]" mode="index-seealso">
-          <xsl:with-param name="position" select="position()"/>
-          <xsl:with-param name="scope" select="$scope"/>
-          <xsl:with-param name="role" select="$role"/>
-          <xsl:with-param name="type" select="$type"/>
-          <xsl:sort select="translate(seealso, 'Aa&#192;&#224;&#193;&#225;&#194;&#226;&#195;&#227;&#196;&#228;&#197;&#229;&#256;&#257;&#258;&#259;&#260;&#261;&#461;&#462;&#478;&#479;&#480;&#481;&#506;&#507;&#512;&#513;&#514;&#515;&#550;&#551;&#7680;&#7681;&#7834;&#7840;&#7841;&#7842;&#7843;&#7844;&#7845;&#7846;&#7847;&#7848;&#7849;&#7850;&#7851;&#7852;&#7853;&#7854;&#7855;&#7856;&#7857;&#7858;&#7859;&#7860;&#7861;&#7862;&#7863;Bb&#384;&#385;&#595;&#386;&#387;&#7682;&#7683;&#7684;&#7685;&#7686;&#7687;Cc&#199;&#231;&#262;&#263;&#264;&#265;&#266;&#267;&#268;&#269;&#391;&#392;&#597;&#7688;&#7689;Dd&#270;&#271;&#272;&#273;&#394;&#599;&#395;&#396;&#453;&#498;&#545;&#598;&#7690;&#7691;&#7692;&#7693;&#7694;&#7695;&#7696;&#7697;&#7698;&#7699;Ee&#200;&#232;&#201;&#233;&#202;&#234;&#203;&#235;&#274;&#275;&#276;&#277;&#278;&#279;&#280;&#281;&#282;&#283;&#516;&#517;&#518;&#519;&#552;&#553;&#7700;&#7701;&#7702;&#7703;&#7704;&#7705;&#7706;&#7707;&#7708;&#7709;&#7864;&#7865;&#7866;&#7867;&#7868;&#7869;&#7870;&#7871;&#7872;&#7873;&#7874;&#7875;&#7876;&#7877;&#7878;&#7879;Ff&#401;&#402;&#7710;&#7711;Gg&#284;&#285;&#286;&#287;&#288;&#289;&#290;&#291;&#403;&#608;&#484;&#485;&#486;&#487;&#500;&#501;&#7712;&#7713;Hh&#292;&#293;&#294;&#295;&#542;&#543;&#614;&#7714;&#7715;&#7716;&#7717;&#7718;&#7719;&#7720;&#7721;&#7722;&#7723;&#7830;Ii&#204;&#236;&#205;&#237;&#206;&#238;&#207;&#239;&#296;&#297;&#298;&#299;&#300;&#301;&#302;&#303;&#304;&#407;&#616;&#463;&#464;&#520;&#521;&#522;&#523;&#7724;&#7725;&#7726;&#7727;&#7880;&#7881;&#7882;&#7883;Jj&#308;&#309;&#496;&#669;Kk&#310;&#311;&#408;&#409;&#488;&#489;&#7728;&#7729;&#7730;&#7731;&#7732;&#7733;Ll&#313;&#314;&#315;&#316;&#317;&#318;&#319;&#320;&#321;&#322;&#410;&#456;&#564;&#619;&#620;&#621;&#7734;&#7735;&#7736;&#7737;&#7738;&#7739;&#7740;&#7741;Mm&#625;&#7742;&#7743;&#7744;&#7745;&#7746;&#7747;Nn&#209;&#241;&#323;&#324;&#325;&#326;&#327;&#328;&#413;&#626;&#414;&#544;&#459;&#504;&#505;&#565;&#627;&#7748;&#7749;&#7750;&#7751;&#7752;&#7753;&#7754;&#7755;Oo&#210;&#242;&#211;&#243;&#212;&#244;&#213;&#245;&#214;&#246;&#216;&#248;&#332;&#333;&#334;&#335;&#336;&#337;&#415;&#416;&#417;&#465;&#466;&#490;&#491;&#492;&#493;&#510;&#511;&#524;&#525;&#526;&#527;&#554;&#555;&#556;&#557;&#558;&#559;&#560;&#561;&#7756;&#7757;&#7758;&#7759;&#7760;&#7761;&#7762;&#7763;&#7884;&#7885;&#7886;&#7887;&#7888;&#7889;&#7890;&#7891;&#7892;&#7893;&#7894;&#7895;&#7896;&#7897;&#7898;&#7899;&#7900;&#7901;&#7902;&#7903;&#7904;&#7905;&#7906;&#7907;Pp&#420;&#421;&#7764;&#7765;&#7766;&#7767;Qq&#672;Rr&#340;&#341;&#342;&#343;&#344;&#345;&#528;&#529;&#530;&#531;&#636;&#637;&#638;&#7768;&#7769;&#7770;&#7771;&#7772;&#7773;&#7774;&#7775;Ss&#346;&#347;&#348;&#349;&#350;&#351;&#352;&#353;&#536;&#537;&#642;&#7776;&#7777;&#7778;&#7779;&#7780;&#7781;&#7782;&#7783;&#7784;&#7785;Tt&#354;&#355;&#356;&#357;&#358;&#359;&#427;&#428;&#429;&#430;&#648;&#538;&#539;&#566;&#7786;&#7787;&#7788;&#7789;&#7790;&#7791;&#7792;&#7793;&#7831;Uu&#217;&#249;&#218;&#250;&#219;&#251;&#220;&#252;&#360;&#361;&#362;&#363;&#364;&#365;&#366;&#367;&#368;&#369;&#370;&#371;&#431;&#432;&#467;&#468;&#469;&#470;&#471;&#472;&#473;&#474;&#475;&#476;&#532;&#533;&#534;&#535;&#7794;&#7795;&#7796;&#7797;&#7798;&#7799;&#7800;&#7801;&#7802;&#7803;&#7908;&#7909;&#7910;&#7911;&#7912;&#7913;&#7914;&#7915;&#7916;&#7917;&#7918;&#7919;&#7920;&#7921;Vv&#434;&#651;&#7804;&#7805;&#7806;&#7807;Ww&#372;&#373;&#7808;&#7809;&#7810;&#7811;&#7812;&#7813;&#7814;&#7815;&#7816;&#7817;&#7832;Xx&#7818;&#7819;&#7820;&#7821;Yy&#221;&#253;&#255;&#376;&#374;&#375;&#435;&#436;&#562;&#563;&#7822;&#7823;&#7833;&#7922;&#7923;&#7924;&#7925;&#7926;&#7927;&#7928;&#7929;Zz&#377;&#378;&#379;&#380;&#381;&#382;&#437;&#438;&#548;&#549;&#656;&#657;&#7824;&#7825;&#7826;&#7827;&#7828;&#7829;&#7829;', 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ')"/>
-        </xsl:apply-templates>
-      </dl>
-    </dd>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="reference">
-  <xsl:param name="scope" select="."/>
-  <xsl:param name="role" select="''"/>
-  <xsl:param name="type" select="''"/>
-  <xsl:param name="position"/>
-  
-  <xsl:variable name="term.separator">
-    <xsl:call-template name="index.separator">
-      <xsl:with-param name="key" select="'index.term.separator'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="number.separator">
-    <xsl:call-template name="index.separator">
-      <xsl:with-param name="key" select="'index.number.separator'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="range.separator">
-    <xsl:call-template name="index.separator">
-      <xsl:with-param name="key" select="'index.range.separator'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$position = 1">
-      <xsl:value-of select="$term.separator"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$number.separator"/>
-    </xsl:otherwise>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="@zone and string(@zone)">
-      <xsl:call-template name="reference">
-        <xsl:with-param name="zones" select="normalize-space(@zone)"/>
-        <xsl:with-param name="position" select="position()"/>
-        <xsl:with-param name="scope" select="$scope"/>
-        <xsl:with-param name="role" select="$role"/>
-        <xsl:with-param name="type" select="$type"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <a>
-        <xsl:apply-templates select="." mode="class.attribute"/>
-        <xsl:variable name="title">
-          <xsl:choose>
-            <xsl:when test="(ancestor-or-self::set|ancestor-or-self::book|ancestor-or-self::part|ancestor-or-self::reference|ancestor-or-self::partintro|ancestor-or-self::chapter|ancestor-or-self::appendix|ancestor-or-self::preface|ancestor-or-self::article|ancestor-or-self::section|ancestor-or-self::sect1|ancestor-or-self::sect2|ancestor-or-self::sect3|ancestor-or-self::sect4|ancestor-or-self::sect5|ancestor-or-self::refentry|ancestor-or-self::refsect1|ancestor-or-self::refsect2|ancestor-or-self::refsect3|ancestor-or-self::simplesect|ancestor-or-self::bibliography|ancestor-or-self::glossary|ancestor-or-self::index|ancestor-or-self::webpage)[last()]/titleabbrev and $index.prefer.titleabbrev != 0">
-              <xsl:apply-templates select="(ancestor-or-self::set|ancestor-or-self::book|ancestor-or-self::part|ancestor-or-self::reference|ancestor-or-self::partintro|ancestor-or-self::chapter|ancestor-or-self::appendix|ancestor-or-self::preface|ancestor-or-self::article|ancestor-or-self::section|ancestor-or-self::sect1|ancestor-or-self::sect2|ancestor-or-self::sect3|ancestor-or-self::sect4|ancestor-or-self::sect5|ancestor-or-self::refentry|ancestor-or-self::refsect1|ancestor-or-self::refsect2|ancestor-or-self::refsect3|ancestor-or-self::simplesect|ancestor-or-self::bibliography|ancestor-or-self::glossary|ancestor-or-self::index|ancestor-or-self::webpage)[last()]" mode="titleabbrev.markup"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:apply-templates select="(ancestor-or-self::set|ancestor-or-self::book|ancestor-or-self::part|ancestor-or-self::reference|ancestor-or-self::partintro|ancestor-or-self::chapter|ancestor-or-self::appendix|ancestor-or-self::preface|ancestor-or-self::article|ancestor-or-self::section|ancestor-or-self::sect1|ancestor-or-self::sect2|ancestor-or-self::sect3|ancestor-or-self::sect4|ancestor-or-self::sect5|ancestor-or-self::refentry|ancestor-or-self::refsect1|ancestor-or-self::refsect2|ancestor-or-self::refsect3|ancestor-or-self::simplesect|ancestor-or-self::bibliography|ancestor-or-self::glossary|ancestor-or-self::index|ancestor-or-self::webpage)[last()]" mode="title.markup"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:variable>
-
-        <xsl:attribute name="href">
-          <xsl:call-template name="href.target">
-            <xsl:with-param name="object" select="(ancestor-or-self::set|ancestor-or-self::book|ancestor-or-self::part|ancestor-or-self::reference|ancestor-or-self::partintro|ancestor-or-self::chapter|ancestor-or-self::appendix|ancestor-or-self::preface|ancestor-or-self::article|ancestor-or-self::section|ancestor-or-self::sect1|ancestor-or-self::sect2|ancestor-or-self::sect3|ancestor-or-self::sect4|ancestor-or-self::sect5|ancestor-or-self::refentry|ancestor-or-self::refsect1|ancestor-or-self::refsect2|ancestor-or-self::refsect3|ancestor-or-self::simplesect|ancestor-or-self::bibliography|ancestor-or-self::glossary|ancestor-or-self::index|ancestor-or-self::webpage)[last()]"/>
-            <xsl:with-param name="context" select="//index[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1]"/>
-          </xsl:call-template>
-        </xsl:attribute>
-
-        <xsl:value-of select="$title"/> <!-- text only -->
-      </a>
-
-      <xsl:variable name="id" select="(@id|@xml:id)[1]"/>
-      <xsl:if test="key('endofrange', $id)[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))]">
-        <xsl:apply-templates select="key('endofrange', $id)[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][last()]" mode="reference">
-          <xsl:with-param name="position" select="position()"/>
-          <xsl:with-param name="scope" select="$scope"/>
-          <xsl:with-param name="role" select="$role"/>
-          <xsl:with-param name="type" select="$type"/>
-          <xsl:with-param name="separator" select="$range.separator"/>
-        </xsl:apply-templates>
-      </xsl:if>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="reference">
-  <xsl:param name="scope" select="."/>
-  <xsl:param name="role" select="''"/>
-  <xsl:param name="type" select="''"/>
-  <xsl:param name="zones"/>
-
-  <xsl:choose>
-    <xsl:when test="contains($zones, ' ')">
-      <xsl:variable name="zone" select="substring-before($zones, ' ')"/>
-      <xsl:variable name="target" select="key('sections', $zone)[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))]"/>
-
-      <a>
-        <xsl:apply-templates select="." mode="class.attribute"/>
-        <xsl:attribute name="href">
-          <xsl:call-template name="href.target">
-            <xsl:with-param name="object" select="$target[1]"/>
-            <xsl:with-param name="context" select="//index[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1]"/>
-          </xsl:call-template>
-        </xsl:attribute>
-        <xsl:apply-templates select="$target[1]" mode="index-title-content"/>
-      </a>
-      <xsl:text>, </xsl:text>
-      <xsl:call-template name="reference">
-        <xsl:with-param name="zones" select="substring-after($zones, ' ')"/>
-        <xsl:with-param name="position" select="position()"/>
-        <xsl:with-param name="scope" select="$scope"/>
-        <xsl:with-param name="role" select="$role"/>
-        <xsl:with-param name="type" select="$type"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:variable name="zone" select="$zones"/>
-      <xsl:variable name="target" select="key('sections', $zone)[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))]"/>
-
-      <a>
-        <xsl:apply-templates select="." mode="class.attribute"/>
-        <xsl:attribute name="href">
-          <xsl:call-template name="href.target">
-            <xsl:with-param name="object" select="$target[1]"/>
-            <xsl:with-param name="context" select="//index[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1]"/>
-          </xsl:call-template>
-        </xsl:attribute>
-        <xsl:apply-templates select="$target[1]" mode="index-title-content"/>
-      </a>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="index-see">
-  <xsl:param name="scope" select="."/>
-  <xsl:param name="role" select="''"/>
-  <xsl:param name="type" select="''"/>
-
-  <xsl:text> (</xsl:text>
-  <xsl:call-template name="gentext">
-    <xsl:with-param name="key" select="'see'"/>
-  </xsl:call-template>
-  <xsl:text> </xsl:text>
-  <xsl:value-of select="see"/>
-  <xsl:text>)</xsl:text>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="index-seealso">
-  <xsl:param name="scope" select="."/>
-  <xsl:param name="role" select="''"/>
-  <xsl:param name="type" select="''"/>
-
-  <xsl:for-each select="seealso">
-    <xsl:sort select="translate(., 'Aa&#192;&#224;&#193;&#225;&#194;&#226;&#195;&#227;&#196;&#228;&#197;&#229;&#256;&#257;&#258;&#259;&#260;&#261;&#461;&#462;&#478;&#479;&#480;&#481;&#506;&#507;&#512;&#513;&#514;&#515;&#550;&#551;&#7680;&#7681;&#7834;&#7840;&#7841;&#7842;&#7843;&#7844;&#7845;&#7846;&#7847;&#7848;&#7849;&#7850;&#7851;&#7852;&#7853;&#7854;&#7855;&#7856;&#7857;&#7858;&#7859;&#7860;&#7861;&#7862;&#7863;Bb&#384;&#385;&#595;&#386;&#387;&#7682;&#7683;&#7684;&#7685;&#7686;&#7687;Cc&#199;&#231;&#262;&#263;&#264;&#265;&#266;&#267;&#268;&#269;&#391;&#392;&#597;&#7688;&#7689;Dd&#270;&#271;&#272;&#273;&#394;&#599;&#395;&#396;&#453;&#498;&#545;&#598;&#7690;&#7691;&#7692;&#7693;&#7694;&#7695;&#7696;&#7697;&#7698;&#7699;Ee&#200;&#232;&#201;&#233;&#202;&#234;&#203;&#235;&#274;&#275;&#276;&#277;&#278;&#279;&#280;&#281;&#282;&#283;&#516;&#517;&#518;&#519;&#552;&#553;&#7700;&#7701;&#7702;&#7703;&#7704;&#7705;&#7706;&#7707;&#7708;&#7709;&#7864;&#7865;&#7866;&#7867;&#7868;&#7869;&#7870;&#7871;&#7872;&#7873;&#7874;&#7875;&#7876;&#7877;&#7878;&#7879;Ff&#401;&#402;&#7710;&#7711;Gg&#284;&#285;&#286;&#287;&#288;&#289;&#290;&#291;&#403;&#608;&#484;&#485;&#486;&#487;&#500;&#501;&#7712;&#7713;Hh&#292;&#293;&#294;&#295;&#542;&#543;&#614;&#7714;&#7715;&#7716;&#7717;&#7718;&#7719;&#7720;&#7721;&#7722;&#7723;&#7830;Ii&#204;&#236;&#205;&#237;&#206;&#238;&#207;&#239;&#296;&#297;&#298;&#299;&#300;&#301;&#302;&#303;&#304;&#407;&#616;&#463;&#464;&#520;&#521;&#522;&#523;&#7724;&#7725;&#7726;&#7727;&#7880;&#7881;&#7882;&#7883;Jj&#308;&#309;&#496;&#669;Kk&#310;&#311;&#408;&#409;&#488;&#489;&#7728;&#7729;&#7730;&#7731;&#7732;&#7733;Ll&#313;&#314;&#315;&#316;&#317;&#318;&#319;&#320;&#321;&#322;&#410;&#456;&#564;&#619;&#620;&#621;&#7734;&#7735;&#7736;&#7737;&#7738;&#7739;&#7740;&#7741;Mm&#625;&#7742;&#7743;&#7744;&#7745;&#7746;&#7747;Nn&#209;&#241;&#323;&#324;&#325;&#326;&#327;&#328;&#413;&#626;&#414;&#544;&#459;&#504;&#505;&#565;&#627;&#7748;&#7749;&#7750;&#7751;&#7752;&#7753;&#7754;&#7755;Oo&#210;&#242;&#211;&#243;&#212;&#244;&#213;&#245;&#214;&#246;&#216;&#248;&#332;&#333;&#334;&#335;&#336;&#337;&#415;&#416;&#417;&#465;&#466;&#490;&#491;&#492;&#493;&#510;&#511;&#524;&#525;&#526;&#527;&#554;&#555;&#556;&#557;&#558;&#559;&#560;&#561;&#7756;&#7757;&#7758;&#7759;&#7760;&#7761;&#7762;&#7763;&#7884;&#7885;&#7886;&#7887;&#7888;&#7889;&#7890;&#7891;&#7892;&#7893;&#7894;&#7895;&#7896;&#7897;&#7898;&#7899;&#7900;&#7901;&#7902;&#7903;&#7904;&#7905;&#7906;&#7907;Pp&#420;&#421;&#7764;&#7765;&#7766;&#7767;Qq&#672;Rr&#340;&#341;&#342;&#343;&#344;&#345;&#528;&#529;&#530;&#531;&#636;&#637;&#638;&#7768;&#7769;&#7770;&#7771;&#7772;&#7773;&#7774;&#7775;Ss&#346;&#347;&#348;&#349;&#350;&#351;&#352;&#353;&#536;&#537;&#642;&#7776;&#7777;&#7778;&#7779;&#7780;&#7781;&#7782;&#7783;&#7784;&#7785;Tt&#354;&#355;&#356;&#357;&#358;&#359;&#427;&#428;&#429;&#430;&#648;&#538;&#539;&#566;&#7786;&#7787;&#7788;&#7789;&#7790;&#7791;&#7792;&#7793;&#7831;Uu&#217;&#249;&#218;&#250;&#219;&#251;&#220;&#252;&#360;&#361;&#362;&#363;&#364;&#365;&#366;&#367;&#368;&#369;&#370;&#371;&#431;&#432;&#467;&#468;&#469;&#470;&#471;&#472;&#473;&#474;&#475;&#476;&#532;&#533;&#534;&#535;&#7794;&#7795;&#7796;&#7797;&#7798;&#7799;&#7800;&#7801;&#7802;&#7803;&#7908;&#7909;&#7910;&#7911;&#7912;&#7913;&#7914;&#7915;&#7916;&#7917;&#7918;&#7919;&#7920;&#7921;Vv&#434;&#651;&#7804;&#7805;&#7806;&#7807;Ww&#372;&#373;&#7808;&#7809;&#7810;&#7811;&#7812;&#7813;&#7814;&#7815;&#7816;&#7817;&#7832;Xx&#7818;&#7819;&#7820;&#7821;Yy&#221;&#253;&#255;&#376;&#374;&#375;&#435;&#436;&#562;&#563;&#7822;&#7823;&#7833;&#7922;&#7923;&#7924;&#7925;&#7926;&#7927;&#7928;&#7929;Zz&#377;&#378;&#379;&#380;&#381;&#382;&#437;&#438;&#548;&#549;&#656;&#657;&#7824;&#7825;&#7826;&#7827;&#7828;&#7829;&#7829;', 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ')"/>
-    <dt>
-    <xsl:text>(</xsl:text>
-    <xsl:call-template name="gentext">
-      <xsl:with-param name="key" select="'seealso'"/>
-    </xsl:call-template>
-    <xsl:text> </xsl:text>
-    <xsl:value-of select="."/>
-    <xsl:text>)</xsl:text>
-    </dt>
-  </xsl:for-each>
-</xsl:template>
-
-<xsl:template match="*" mode="index-title-content">
-  <xsl:variable name="title">
-    <xsl:apply-templates select="(ancestor-or-self::set|ancestor-or-self::book|ancestor-or-self::part|ancestor-or-self::reference|ancestor-or-self::partintro|ancestor-or-self::chapter|ancestor-or-self::appendix|ancestor-or-self::preface|ancestor-or-self::article|ancestor-or-self::section|ancestor-or-self::sect1|ancestor-or-self::sect2|ancestor-or-self::sect3|ancestor-or-self::sect4|ancestor-or-self::sect5|ancestor-or-self::refentry|ancestor-or-self::refsect1|ancestor-or-self::refsect2|ancestor-or-self::refsect3|ancestor-or-self::simplesect|ancestor-or-self::bibliography|ancestor-or-self::glossary|ancestor-or-self::index|ancestor-or-self::webpage)[last()]" mode="title.markup"/>
-  </xsl:variable>
-
-  <xsl:value-of select="$title"/>
-</xsl:template>
-
-<xsl:template name="index.separator">
-  <xsl:param name="key" select="''"/>
-  <xsl:param name="lang">
-    <xsl:call-template name="l10n.language"/>
-  </xsl:param>
-
-  <xsl:choose>
-    <xsl:when test="$key = 'index.term.separator'">
-      <xsl:choose>
-        <!-- Use the override if not blank -->
-        <xsl:when test="$index.term.separator != ''">
-          <xsl:copy-of select="$index.term.separator"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="gentext.template">
-            <xsl:with-param name="lang" select="$lang"/>
-            <xsl:with-param name="context">index</xsl:with-param>
-            <xsl:with-param name="name">term-separator</xsl:with-param>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:when test="$key = 'index.number.separator'">
-      <xsl:choose>
-        <!-- Use the override if not blank -->
-        <xsl:when test="$index.number.separator != ''">
-          <xsl:copy-of select="$index.number.separator"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="gentext.template">
-            <xsl:with-param name="lang" select="$lang"/>
-            <xsl:with-param name="context">index</xsl:with-param>
-            <xsl:with-param name="name">number-separator</xsl:with-param>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:when test="$key = 'index.range.separator'">
-      <xsl:choose>
-        <!-- Use the override if not blank -->
-        <xsl:when test="$index.range.separator != ''">
-          <xsl:copy-of select="$index.range.separator"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="gentext.template">
-            <xsl:with-param name="lang" select="$lang"/>
-            <xsl:with-param name="context">index</xsl:with-param>
-            <xsl:with-param name="name">range-separator</xsl:with-param>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/autotoc.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/autotoc.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,632 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<xsl:variable name="toc.listitem.type">
-  <xsl:choose>
-    <xsl:when test="$toc.list.type = 'dl'">dt</xsl:when>
-    <xsl:otherwise>li</xsl:otherwise>
-  </xsl:choose>
-</xsl:variable>
-
-<!-- this is just hack because dl and ul aren't completely isomorphic -->
-<xsl:variable name="toc.dd.type">
-  <xsl:choose>
-    <xsl:when test="$toc.list.type = 'dl'">dd</xsl:when>
-    <xsl:otherwise/>
-  </xsl:choose>
-</xsl:variable>
-
-<xsl:template name="make.toc">
-  <xsl:param name="toc-context" select="."/>
-  <xsl:param name="toc.title.p" select="true()"/>
-  <xsl:param name="nodes" select="/NOT-AN-ELEMENT"/>
-
-  <xsl:variable name="nodes.plus" select="$nodes | qandaset"/>
-
-  <xsl:variable name="toc.title">
-    <xsl:if test="$toc.title.p">
-      <p>
-        <b>
-          <xsl:call-template name="gentext">
-            <xsl:with-param name="key">TableofContents</xsl:with-param>
-          </xsl:call-template>
-        </b>
-      </p>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$manual.toc != ''">
-      <xsl:variable name="id">
-        <xsl:call-template name="object.id"/>
-      </xsl:variable>
-      <xsl:variable name="toc" select="document($manual.toc, .)"/>
-      <xsl:variable name="tocentry" select="$toc//tocentry[@linkend=$id]"/>
-      <xsl:if test="$tocentry and $tocentry/*">
-        <div class="toc">
-          <xsl:copy-of select="$toc.title"/>
-          <xsl:element name="{$toc.list.type}" namespace="http://www.w3.org/1999/xhtml">
-            <xsl:call-template name="manual-toc">
-              <xsl:with-param name="tocentry" select="$tocentry/*[1]"/>
-            </xsl:call-template>
-          </xsl:element>
-        </div>
-      </xsl:if>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:choose>
-        <xsl:when test="$qanda.in.toc != 0">
-          <xsl:if test="$nodes.plus">
-            <div class="toc">
-              <xsl:copy-of select="$toc.title"/>
-              <xsl:element name="{$toc.list.type}" namespace="http://www.w3.org/1999/xhtml">
-                <xsl:apply-templates select="$nodes.plus" mode="toc">
-                  <xsl:with-param name="toc-context" select="$toc-context"/>
-                </xsl:apply-templates>
-              </xsl:element>
-            </div>
-          </xsl:if>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:if test="$nodes">
-            <div class="toc">
-              <xsl:copy-of select="$toc.title"/>
-              <xsl:element name="{$toc.list.type}" namespace="http://www.w3.org/1999/xhtml">
-                <xsl:apply-templates select="$nodes" mode="toc">
-                  <xsl:with-param name="toc-context" select="$toc-context"/>
-                </xsl:apply-templates>
-              </xsl:element>
-            </div>
-          </xsl:if>
-        </xsl:otherwise>
-      </xsl:choose>
-
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="make.lots">
-  <xsl:param name="toc.params" select="''"/>
-  <xsl:param name="toc"/>
-
-  <xsl:if test="contains($toc.params, 'toc')">
-    <xsl:copy-of select="$toc"/>
-  </xsl:if>
-
-  <xsl:if test="contains($toc.params, 'figure')">
-    <xsl:call-template name="list.of.titles">
-      <xsl:with-param name="titles" select="'figure'"/>
-      <xsl:with-param name="nodes" select=".//figure"/>
-    </xsl:call-template>
-  </xsl:if>
-
-  <xsl:if test="contains($toc.params, 'table')">
-    <xsl:call-template name="list.of.titles">
-      <xsl:with-param name="titles" select="'table'"/>
-      <xsl:with-param name="nodes" select=".//table"/>
-    </xsl:call-template>
-  </xsl:if>
-
-  <xsl:if test="contains($toc.params, 'example')">
-    <xsl:call-template name="list.of.titles">
-      <xsl:with-param name="titles" select="'example'"/>
-      <xsl:with-param name="nodes" select=".//example"/>
-    </xsl:call-template>
-  </xsl:if>
-
-  <xsl:if test="contains($toc.params, 'equation')">
-    <xsl:call-template name="list.of.titles">
-      <xsl:with-param name="titles" select="'equation'"/>
-      <xsl:with-param name="nodes" select=".//equation[title or info/title]"/>
-    </xsl:call-template>
-  </xsl:if>
-
-  <xsl:if test="contains($toc.params, 'procedure')">
-    <xsl:call-template name="list.of.titles">
-      <xsl:with-param name="titles" select="'procedure'"/>
-      <xsl:with-param name="nodes" select=".//procedure[title]"/>
-    </xsl:call-template>
-  </xsl:if>
-</xsl:template>
-
-<!-- ====================================================================== -->
-
-<xsl:template name="set.toc">
-  <xsl:param name="toc-context" select="."/>
-  <xsl:param name="toc.title.p" select="true()"/>
-
-  <xsl:call-template name="make.toc">
-    <xsl:with-param name="toc-context" select="$toc-context"/>
-    <xsl:with-param name="toc.title.p" select="$toc.title.p"/>
-    <xsl:with-param name="nodes" select="book|setindex"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="division.toc">
-  <xsl:param name="toc-context" select="."/>
-  <xsl:param name="toc.title.p" select="true()"/>
-
-  <xsl:call-template name="make.toc">
-    <xsl:with-param name="toc-context" select="$toc-context"/>
-    <xsl:with-param name="toc.title.p" select="$toc.title.p"/>
-    <xsl:with-param name="nodes" select="part|reference                                          |preface|chapter|appendix                                          |article                                          |bibliography|glossary|index                                          |refentry                                          |bridgehead[$bridgehead.in.toc != 0]"/>
-
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="component.toc">
-  <xsl:param name="toc-context" select="."/>
-  <xsl:param name="toc.title.p" select="true()"/>
-
-  <xsl:call-template name="make.toc">
-    <xsl:with-param name="toc-context" select="$toc-context"/>
-    <xsl:with-param name="toc.title.p" select="$toc.title.p"/>
-    <xsl:with-param name="nodes" select="section|sect1                                          |simplesect[$simplesect.in.toc != 0]                                          |refentry                                          |article|bibliography|glossary                                          |appendix|index                                          |bridgehead[not(@renderas)                                                      and $bridgehead.in.toc != 0]                                          |.//bridgehead[@renderas='sect1'                                                         and $bridgehead.in.toc != 0]"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="component.toc.separator">
-  <!-- Customize to output something between
-       component.toc and first output -->
-</xsl:template>
-
-<xsl:template name="section.toc">
-  <xsl:param name="toc-context" select="."/>
-  <xsl:param name="toc.title.p" select="true()"/>
-
-  <xsl:call-template name="make.toc">
-    <xsl:with-param name="toc-context" select="$toc-context"/>
-    <xsl:with-param name="toc.title.p" select="$toc.title.p"/>
-    <xsl:with-param name="nodes" select="section|sect1|sect2|sect3|sect4|sect5|refentry                            |bridgehead[$bridgehead.in.toc != 0]"/>
-
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="section.toc.separator">
-  <!-- Customize to output something between
-       section.toc and first output -->
-</xsl:template>
-<!-- ==================================================================== -->
-
-<xsl:template name="subtoc">
-  <xsl:param name="toc-context" select="."/>
-  <xsl:param name="nodes" select="NOT-AN-ELEMENT"/>
-
-  <xsl:variable name="nodes.plus" select="$nodes | qandaset"/>
-
-  <xsl:variable name="subtoc">
-    <xsl:element name="{$toc.list.type}" namespace="http://www.w3.org/1999/xhtml">
-      <xsl:choose>
-        <xsl:when test="$qanda.in.toc != 0">
-          <xsl:apply-templates mode="toc" select="$nodes.plus">
-            <xsl:with-param name="toc-context" select="$toc-context"/>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates mode="toc" select="$nodes">
-            <xsl:with-param name="toc-context" select="$toc-context"/>
-          </xsl:apply-templates>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:element>
-  </xsl:variable>
-
-  <xsl:variable name="depth">
-    <xsl:choose>
-      <xsl:when test="local-name(.) = 'section'">
-        <xsl:value-of select="count(ancestor::section) + 1"/>
-      </xsl:when>
-      <xsl:when test="local-name(.) = 'sect1'">1</xsl:when>
-      <xsl:when test="local-name(.) = 'sect2'">2</xsl:when>
-      <xsl:when test="local-name(.) = 'sect3'">3</xsl:when>
-      <xsl:when test="local-name(.) = 'sect4'">4</xsl:when>
-      <xsl:when test="local-name(.) = 'sect5'">5</xsl:when>
-      <xsl:when test="local-name(.) = 'refsect1'">1</xsl:when>
-      <xsl:when test="local-name(.) = 'refsect2'">2</xsl:when>
-      <xsl:when test="local-name(.) = 'refsect3'">3</xsl:when>
-      <xsl:when test="local-name(.) = 'simplesect'">
-        <!-- sigh... -->
-        <xsl:choose>
-          <xsl:when test="local-name(..) = 'section'">
-            <xsl:value-of select="count(ancestor::section)"/>
-          </xsl:when>
-          <xsl:when test="local-name(..) = 'sect1'">2</xsl:when>
-          <xsl:when test="local-name(..) = 'sect2'">3</xsl:when>
-          <xsl:when test="local-name(..) = 'sect3'">4</xsl:when>
-          <xsl:when test="local-name(..) = 'sect4'">5</xsl:when>
-          <xsl:when test="local-name(..) = 'sect5'">6</xsl:when>
-          <xsl:when test="local-name(..) = 'refsect1'">2</xsl:when>
-          <xsl:when test="local-name(..) = 'refsect2'">3</xsl:when>
-          <xsl:when test="local-name(..) = 'refsect3'">4</xsl:when>
-          <xsl:otherwise>1</xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-      <xsl:otherwise>0</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="depth.from.context" select="count(ancestor::*)-count($toc-context/ancestor::*)"/>
-
-  <xsl:variable name="subtoc.list">
-    <xsl:choose>
-      <xsl:when test="$toc.dd.type = ''">
-        <xsl:copy-of select="$subtoc"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:element name="{$toc.dd.type}" namespace="http://www.w3.org/1999/xhtml">
-          <xsl:copy-of select="$subtoc"/>
-        </xsl:element>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:element name="{$toc.listitem.type}" namespace="http://www.w3.org/1999/xhtml">
-    <xsl:call-template name="toc.line">
-      <xsl:with-param name="toc-context" select="$toc-context"/>
-    </xsl:call-template>
-    <xsl:if test="$toc.listitem.type = 'li'                   and $toc.section.depth &gt; $depth and                    ( ($qanda.in.toc = 0 and count($nodes)&gt;0) or                     ($qanda.in.toc != 0 and count($nodes.plus)&gt;0) )                   and $toc.max.depth &gt; $depth.from.context">
-      <xsl:copy-of select="$subtoc.list"/>
-    </xsl:if>
-  </xsl:element>
-  <xsl:if test="$toc.listitem.type != 'li'                 and $toc.section.depth &gt; $depth and                  ( ($qanda.in.toc = 0 and count($nodes)&gt;0) or                   ($qanda.in.toc != 0 and count($nodes.plus)&gt;0) )                 and $toc.max.depth &gt; $depth.from.context">
-    <xsl:copy-of select="$subtoc.list"/>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="toc.line">
-  <xsl:param name="toc-context" select="."/>
-  <xsl:param name="depth" select="1"/>
-  <xsl:param name="depth.from.context" select="8"/>
-
- <span>
-  <xsl:attribute name="class"><xsl:value-of select="local-name(.)"/></xsl:attribute>
-
-  <!-- * if $autotoc.label.in.hyperlink is zero, then output the label -->
-  <!-- * before the hyperlinked title (as the DSSSL stylesheet does) -->
-  <xsl:if test="$autotoc.label.in.hyperlink = 0">
-    <xsl:variable name="label">
-      <xsl:apply-templates select="." mode="label.markup"/>
-    </xsl:variable>
-    <xsl:copy-of select="$label"/>
-    <xsl:if test="$label != ''">
-      <xsl:value-of select="$autotoc.label.separator"/>
-    </xsl:if>
-  </xsl:if>
-
-  <a>
-    <xsl:attribute name="href">
-      <xsl:call-template name="href.target">
-        <xsl:with-param name="context" select="$toc-context"/>
-        <xsl:with-param name="toc-context" select="$toc-context"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    
-  <!-- * if $autotoc.label.in.hyperlink is non-zero, then output the label -->
-  <!-- * as part of the hyperlinked title -->
-  <xsl:if test="not($autotoc.label.in.hyperlink = 0)">
-    <xsl:variable name="label">
-      <xsl:apply-templates select="." mode="label.markup"/>
-    </xsl:variable>
-    <xsl:copy-of select="$label"/>
-    <xsl:if test="$label != ''">
-      <xsl:value-of select="$autotoc.label.separator"/>
-    </xsl:if>
-  </xsl:if>
-
-    <xsl:apply-templates select="." mode="titleabbrev.markup"/>
-  </a>
-  </span>
-</xsl:template>
-
-<xsl:template match="book" mode="toc">
-  <xsl:param name="toc-context" select="."/>
-
-  <xsl:call-template name="subtoc">
-    <xsl:with-param name="toc-context" select="$toc-context"/>
-    <xsl:with-param name="nodes" select="part|reference                                          |preface|chapter|appendix                                          |article                                          |bibliography|glossary|index                                          |refentry                                          |bridgehead[$bridgehead.in.toc != 0]"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="setindex" mode="toc">
-  <xsl:param name="toc-context" select="."/>
-
-  <!-- If the setindex tag is not empty, it should be it in the TOC -->
-  <xsl:if test="* or $generate.index != 0">
-    <xsl:call-template name="subtoc">
-      <xsl:with-param name="toc-context" select="$toc-context"/>
-    </xsl:call-template>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="part|reference" mode="toc">
-  <xsl:param name="toc-context" select="."/>
-
-  <xsl:call-template name="subtoc">
-    <xsl:with-param name="toc-context" select="$toc-context"/>
-    <xsl:with-param name="nodes" select="appendix|chapter|article                                          |index|glossary|bibliography                                          |preface|reference|refentry                                          |bridgehead[$bridgehead.in.toc != 0]"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="preface|chapter|appendix|article" mode="toc">
-  <xsl:param name="toc-context" select="."/>
-
-  <xsl:call-template name="subtoc">
-    <xsl:with-param name="toc-context" select="$toc-context"/>
-    <xsl:with-param name="nodes" select="section|sect1                                          |simplesect[$simplesect.in.toc != 0]                                          |refentry                                          |glossary|bibliography|index                                          |bridgehead[$bridgehead.in.toc != 0]"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="sect1" mode="toc">
-  <xsl:param name="toc-context" select="."/>
-  <xsl:call-template name="subtoc">
-    <xsl:with-param name="toc-context" select="$toc-context"/>
-    <xsl:with-param name="nodes" select="sect2                                          |bridgehead[$bridgehead.in.toc != 0]"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="sect2" mode="toc">
-  <xsl:param name="toc-context" select="."/>
-
-  <xsl:call-template name="subtoc">
-    <xsl:with-param name="toc-context" select="$toc-context"/>
-    <xsl:with-param name="nodes" select="sect3                                          |bridgehead[$bridgehead.in.toc != 0]"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="sect3" mode="toc">
-  <xsl:param name="toc-context" select="."/>
-
-  <xsl:call-template name="subtoc">
-    <xsl:with-param name="toc-context" select="$toc-context"/>
-    <xsl:with-param name="nodes" select="sect4                                          |bridgehead[$bridgehead.in.toc != 0]"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="sect4" mode="toc">
-  <xsl:param name="toc-context" select="."/>
-
-  <xsl:call-template name="subtoc">
-    <xsl:with-param name="toc-context" select="$toc-context"/>
-    <xsl:with-param name="nodes" select="sect5                                          |bridgehead[$bridgehead.in.toc != 0]"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="sect5" mode="toc">
-  <xsl:param name="toc-context" select="."/>
-
-  <xsl:call-template name="subtoc">
-    <xsl:with-param name="toc-context" select="$toc-context"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="simplesect" mode="toc">
-  <xsl:param name="toc-context" select="."/>
-
-  <xsl:call-template name="subtoc">
-    <xsl:with-param name="toc-context" select="$toc-context"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="section" mode="toc">
-  <xsl:param name="toc-context" select="."/>
-
-  <xsl:call-template name="subtoc">
-    <xsl:with-param name="toc-context" select="$toc-context"/>
-    <xsl:with-param name="nodes" select="section                                          |bridgehead[$bridgehead.in.toc != 0]"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="bridgehead" mode="toc">
-  <xsl:param name="toc-context" select="."/>
-
-  <xsl:if test="$bridgehead.in.toc != 0">
-    <xsl:call-template name="subtoc">
-      <xsl:with-param name="toc-context" select="$toc-context"/>
-    </xsl:call-template>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="bibliography|glossary" mode="toc">
-  <xsl:param name="toc-context" select="."/>
-
-  <xsl:call-template name="subtoc">
-    <xsl:with-param name="toc-context" select="$toc-context"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="index" mode="toc">
-  <xsl:param name="toc-context" select="."/>
-
-  <!-- If the index tag is not empty, it should be it in the TOC -->
-  <xsl:if test="* or $generate.index != 0">
-    <xsl:call-template name="subtoc">
-      <xsl:with-param name="toc-context" select="$toc-context"/>
-    </xsl:call-template>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="refentry" mode="toc">
-  <xsl:param name="toc-context" select="."/>
-
-  <xsl:variable name="refmeta" select=".//refmeta"/>
-  <xsl:variable name="refentrytitle" select="$refmeta//refentrytitle"/>
-  <xsl:variable name="refnamediv" select=".//refnamediv"/>
-  <xsl:variable name="refname" select="$refnamediv//refname"/>
-  <xsl:variable name="refdesc" select="$refnamediv//refdescriptor"/>
-  <xsl:variable name="title">
-    <xsl:choose>
-      <xsl:when test="$refentrytitle">
-        <xsl:apply-templates select="$refentrytitle[1]" mode="titleabbrev.markup"/>
-      </xsl:when>
-      <xsl:when test="$refdesc">
-        <xsl:apply-templates select="$refdesc" mode="titleabbrev.markup"/>
-      </xsl:when>
-      <xsl:when test="$refname">
-        <xsl:apply-templates select="$refname[1]" mode="titleabbrev.markup"/>
-      </xsl:when>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:element name="{$toc.listitem.type}" namespace="http://www.w3.org/1999/xhtml">
-    <span class="refentrytitle">
-      <a>
-        <xsl:attribute name="href">
-          <xsl:call-template name="href.target">
-            <xsl:with-param name="toc-context" select="$toc-context"/>
-          </xsl:call-template>
-        </xsl:attribute>
-        <xsl:copy-of select="$title"/>
-      </a>
-    </span>
-    <span class="refpurpose">
-      <xsl:if test="$annotate.toc != 0">
-        <!-- * DocBook 5 says inlinemediaobject (among other things) -->
-        <!-- * is allowed in refpurpose; so we need to run -->
-        <!-- * apply-templates on refpurpose here, instead of value-of  -->
-        <xsl:apply-templates select="refnamediv/refpurpose"/>
-      </xsl:if>
-    </span>
-  </xsl:element>
-</xsl:template>
-
-<xsl:template match="title" mode="toc">
-  <xsl:param name="toc-context" select="."/>
-
-  <a>
-    <xsl:attribute name="href">
-      <xsl:call-template name="href.target">
-        <xsl:with-param name="object" select=".."/>
-        <xsl:with-param name="toc-context" select="$toc-context"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:apply-templates/>
-  </a>
-</xsl:template>
-
-<xsl:template name="manual-toc">
-  <xsl:param name="toc-context" select="."/>
-  <xsl:param name="tocentry"/>
-
-  <!-- be careful, we don't want to change the current document to the other tree! -->
-
-  <xsl:if test="$tocentry">
-    <xsl:variable name="node" select="key('id', $tocentry/@linkend)"/>
-
-    <xsl:element name="{$toc.listitem.type}" namespace="http://www.w3.org/1999/xhtml">
-      <xsl:variable name="label">
-        <xsl:apply-templates select="$node" mode="label.markup"/>
-      </xsl:variable>
-      <xsl:copy-of select="$label"/>
-      <xsl:if test="$label != ''">
-        <xsl:value-of select="$autotoc.label.separator"/>
-      </xsl:if>
-      <a>
-        <xsl:attribute name="href">
-          <xsl:call-template name="href.target">
-            <xsl:with-param name="object" select="$node"/>
-            <xsl:with-param name="toc-context" select="$toc-context"/>
-          </xsl:call-template>
-        </xsl:attribute>
-        <xsl:apply-templates select="$node" mode="titleabbrev.markup"/>
-      </a>
-    </xsl:element>
-
-    <xsl:if test="$tocentry/*">
-      <xsl:element name="{$toc.list.type}" namespace="http://www.w3.org/1999/xhtml">
-        <xsl:call-template name="manual-toc">
-          <xsl:with-param name="tocentry" select="$tocentry/*[1]"/>
-        </xsl:call-template>
-      </xsl:element>
-    </xsl:if>
-
-    <xsl:if test="$tocentry/following-sibling::*">
-      <xsl:call-template name="manual-toc">
-        <xsl:with-param name="tocentry" select="$tocentry/following-sibling::*[1]"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:if>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="list.of.titles">
-  <xsl:param name="toc-context" select="."/>
-  <xsl:param name="titles" select="'table'"/>
-  <xsl:param name="nodes" select=".//table"/>
-
-  <xsl:if test="$nodes">
-    <div class="list-of-{$titles}s">
-      <p>
-        <b>
-          <xsl:call-template name="gentext">
-            <xsl:with-param name="key">
-              <xsl:choose>
-                <xsl:when test="$titles='table'">ListofTables</xsl:when>
-                <xsl:when test="$titles='figure'">ListofFigures</xsl:when>
-                <xsl:when test="$titles='equation'">ListofEquations</xsl:when>
-                <xsl:when test="$titles='example'">ListofExamples</xsl:when>
-                <xsl:when test="$titles='procedure'">ListofProcedures</xsl:when>
-                <xsl:otherwise>ListofUnknown</xsl:otherwise>
-              </xsl:choose>
-            </xsl:with-param>
-          </xsl:call-template>
-        </b>
-      </p>
-
-      <xsl:element name="{$toc.list.type}" namespace="http://www.w3.org/1999/xhtml">
-        <xsl:apply-templates select="$nodes" mode="toc">
-          <xsl:with-param name="toc-context" select="$toc-context"/>
-        </xsl:apply-templates>
-      </xsl:element>
-    </div>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="figure|table|example|equation|procedure" mode="toc">
-  <xsl:param name="toc-context" select="."/>
-
-  <xsl:element name="{$toc.listitem.type}" namespace="http://www.w3.org/1999/xhtml">
-    <xsl:variable name="label">
-      <xsl:apply-templates select="." mode="label.markup"/>
-    </xsl:variable>
-    <xsl:copy-of select="$label"/>
-    <xsl:if test="$label != ''">
-      <xsl:value-of select="$autotoc.label.separator"/>
-    </xsl:if>
-    <a>
-      <xsl:attribute name="href">
-        <xsl:call-template name="href.target">
-          <xsl:with-param name="toc-context" select="$toc-context"/>
-        </xsl:call-template>
-      </xsl:attribute>
-      <xsl:apply-templates select="." mode="titleabbrev.markup"/>
-    </a>
-  </xsl:element>
-</xsl:template>
-
-<!-- Used only if qanda.in.toc parameter is non-zero -->
-<xsl:template match="qandaset" mode="toc">
-  <xsl:param name="toc-context" select="."/>
-  <xsl:call-template name="subtoc">
-    <xsl:with-param name="toc-context" select="$toc-context"/>
-    <xsl:with-param name="nodes" select="qandadiv | qandaentry"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="qandadiv|qandaentry" mode="toc">
-  <xsl:apply-templates select="." mode="qandatoc.mode"/>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/biblio-iso690.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/biblio-iso690.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,1300 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
-
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     The original code for processing bibliography in ISO690 style
-     was provided by Jana Dvorakova <jana4u@seznam.cz>
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<!-- if biblioentry.alt.primary.seps is set to nonzero value then use alternative separators for primary responsibility - $alt.person.two.sep, $alt.person.last.sep, $alt.person.more.sep  -->
-<xsl:param name="biblioentry.alt.primary.seps" select="0"/>
-
-<!-- how many authors will be printed if there is more than three authors - set to number 1 (default value), 2 or 3 -->
-<xsl:param name="biblioentry.primary.count" select="1"/>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="iso690.makecitation">
-<!-- Types of resources -->
-  <xsl:choose>
-
-    <!-- SYSTEMS OF ELECTRONIC COMMUNICATION : ENTIRE MESSAGE SYSTEM -->
-    <!-- same as Monographs -->
-    <xsl:when test="./@role='messagesystem'">
-      <xsl:call-template name="iso690.monogr"/>
-    </xsl:when>
-
-    <!-- SYSTEMS OF ELECTRONIC COMMUNICATION : ELECTRONIC MESSAGES -->
-    <!-- same as Contributions to Monographs -->
-    <xsl:when test="./@role='message'">
-      <xsl:call-template name="iso690.paper.mon"/>
-    </xsl:when>
-
-    <!-- SERIALS -->
-    <xsl:when test="./@role='serial' or ./biblioid/@class='issn' or ./issn">
-      <xsl:call-template name="iso690.serial"/>
-    </xsl:when>
-
-    <!-- PARTS OF MONOGRAPHS -->
-    <xsl:when test="./@role='part' or (./bibliomisc[@role='secnum']|./bibliomisc[@role='sectitle'])">
-      <xsl:call-template name="iso690.monogr.part"/>
-    </xsl:when>
-
-    <!-- CONTRIBUTIONS TO MONOGRAPHS -->
-    <xsl:when test="./@role='contribution' or (./biblioset/@relation='part' and ./biblioset/@relation='book')">
-      <xsl:call-template name="iso690.paper.mon"/>
-    </xsl:when>
-
-    <!-- ARTICLES, ETC., IN SERIALS -->
-    <xsl:when test="./@role='article' or (./biblioset/@relation='journal' and ./biblioset/@relation='article')">
-      <xsl:call-template name="iso690.article"/>
-    </xsl:when>
-
-    <!-- PATENT DOCUMENTS -->
-    <xsl:when test="./@role='patent' or (./bibliomisc[@role='patenttype'] and ./bibliomisc[@role='patentnum'])">
-      <xsl:call-template name="iso690.patent"/>
-    </xsl:when>
-
-    <!-- MONOGRAPHS -->
-    <xsl:otherwise>
-      <xsl:call-template name="iso690.monogr"/>
-    </xsl:otherwise>
-
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<!-- MONOGRAPHS -->
-<xsl:template name="iso690.monogr">
-  <!-- Primary responsibility -->
-  <xsl:call-template name="iso690.primary"/>
-  <!-- Title and Type of medium -->
-  <xsl:call-template name="iso690.title"/>
-  <!-- Subordinate responsibility -->
-  <xsl:call-template name="iso690.secondary"/>
-  <!-- Edition -->
-  <xsl:call-template name="iso690.edition"/>
-  <!-- Place of publication, Publisher, Year/Date of publication, Date of update/revision, Date of citation -->
-  <xsl:call-template name="iso690.pub"/>
-  <!-- Extent -->
-  <xsl:call-template name="iso690.extent"/>
-  <!-- Series -->
-  <xsl:call-template name="iso690.serie"/>
-  <!-- Notes -->
-  <xsl:call-template name="iso690.notice"/>
-  <!-- Avaibility and access -->
-  <xsl:call-template name="iso690.access"/>
-  <!-- Standard number -->
-  <xsl:call-template name="iso690.isbn"/>
-</xsl:template>
-
-<!-- SERIALS -->
-<xsl:template name="iso690.serial">
-  <!-- Title and Type of medium -->
-  <xsl:call-template name="iso690.title"/>
-  <!-- Responsibility [nonEL] -->
-  <xsl:if test="not(./bibliomisc[@role='medium'])">
-    <xsl:call-template name="iso690.secondary"/>
-  </xsl:if>
-  <!-- Edition -->
-  <xsl:call-template name="iso690.edition">
-    <xsl:with-param name="after" select="./bibliomisc[@role='issuing']"/>
-  </xsl:call-template>
-  <!-- Issue designation (date and/or num) [nonEL] -->
-  <xsl:if test="not(./bibliomisc[@role='medium'])">
-    <xsl:call-template name="iso690.issuing"/>
-  </xsl:if>
-  <!-- Place of publication, Publisher, Year/Date of publication, Date of update/revision, Date of citation -->
-  <xsl:call-template name="iso690.pub"/>
-  <!-- Series -->
-  <xsl:call-template name="iso690.serie"/>
-  <!-- Notes -->
-  <xsl:call-template name="iso690.notice"/>
-  <!-- Avaibility and access -->
-  <xsl:call-template name="iso690.access"/>
-  <!-- Standard number -->
-  <xsl:call-template name="iso690.issn"/>
-</xsl:template>
-
-<!-- PARTS OF MONOGRAPHS -->
-<xsl:template name="iso690.monogr.part">
-  <!-- Primary responsibility of host document -->
-  <xsl:call-template name="iso690.primary"/>
-  <!-- Title and Type of medium of host document -->
-  <xsl:call-template name="iso690.title"/>
-  <!-- Subordinate responsibility of host document [EL] -->
-  <xsl:if test="./bibliomisc[@role='medium']">
-    <xsl:call-template name="iso690.secondary"/>
-  </xsl:if>
-  <!-- Edition -->
-  <xsl:call-template name="iso690.edition">
-    <xsl:with-param name="after" select="./volumenum"/>
-  </xsl:call-template>
-  <!-- Numeration of the part [nonEL]-->
-  <xsl:if test="not(./bibliomisc[@role='medium'])">
-    <xsl:call-template name="iso690.partnr"/>
-  <!-- Subordinate responsibility [nonEL] -->
-    <xsl:call-template name="iso690.secondary"/>
-  </xsl:if>
-  <!-- Place of publication, Publisher, Year/Date of publication, Date of update/revision, Date of citation -->
-  <xsl:call-template name="iso690.pub"/>
-  <!-- Location within host -->
-  <xsl:call-template name="iso690.part.location"/>
-  <xsl:if test="./bibliomisc[@role='medium']">
-  <!-- Numeration within host document [EL] -->
-  <!-- Notes [EL] -->
-    <xsl:call-template name="iso690.notice"/>
-  <!-- Avaibility and access [EL] -->
-    <xsl:call-template name="iso690.access"/>
-  <!-- Standard number [EL] -->
-    <xsl:call-template name="iso690.isbn"/>
-  </xsl:if>
-</xsl:template>
-
-<!-- CONTRIBUTIONS TO MONOGRAPHS -->
-<xsl:template name="iso690.paper.mon">
-<!-- Contribution -->
-  <xsl:apply-templates mode="iso690.paper.part" select="./biblioset[@relation='part']"/>
-<!-- In -->
-  <xsl:text>In </xsl:text>
-<!-- Host -->
-  <xsl:apply-templates mode="iso690.paper.book" select="./biblioset[@relation='book']"/>
-</xsl:template>
-
-<xsl:template match="biblioset" mode="iso690.paper.part">
-<!-- Contribution -->
-  <!-- Primary responsibility -->
-  <xsl:call-template name="iso690.primary"/>
-  <!-- Title -->
-  <xsl:call-template name="iso690.title">
-    <xsl:with-param name="italic" select="0"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="biblioset" mode="iso690.paper.book">
-<!-- Host -->
-  <!-- Primary responsibility -->
-  <xsl:call-template name="iso690.primary"/>
-  <!-- Title and Type of medium -->
-  <xsl:call-template name="iso690.title"/>
-  <!-- Subordinate responsibility [EL] -->
-  <xsl:if test="./bibliomisc[@role='medium']">
-    <xsl:call-template name="iso690.secondary"/>
-  </xsl:if>
-  <!-- Edition -->
-  <xsl:call-template name="iso690.edition"/>
-  <!-- Place of publication, Publisher, Year/Date of publication, Date of update/revision, Date of citation -->
-  <xsl:call-template name="iso690.paper.pub"/>
-  <!-- Numeration within host document [EL] -->
-  <!-- Location within host -->
-  <xsl:call-template name="iso690.location"/>
-  <xsl:if test="./bibliomisc[@role='medium']">
-  <!-- Notes [EL] -->
-    <xsl:call-template name="iso690.notice"/>
-  <!-- Avaibility and access [EL] -->
-    <xsl:call-template name="iso690.access"/>
-  <!-- Standard number [EL] -->
-    <xsl:call-template name="iso690.isbn"/>
-  </xsl:if>
-</xsl:template>
-
-<!-- ARTICLES, ETC., IN SERIALS -->
-<xsl:template name="iso690.article">
-<!-- Article -->
-  <xsl:apply-templates mode="iso690.article.art" select="./biblioset[@relation='article']"/>
-<!-- Serial -->
-  <xsl:apply-templates mode="iso690.article.jour" select="./biblioset[@relation='journal']"/>
-</xsl:template>
-
-<xsl:template match="biblioset" mode="iso690.article.art">
-<!-- Article -->
-  <!-- Primary responsibility -->
-  <xsl:call-template name="iso690.primary"/>
-  <!-- Title -->
-  <xsl:call-template name="iso690.title">
-    <xsl:with-param name="italic" select="0"/>
-  </xsl:call-template>
-  <!-- Subordinate responsibility [nonEL] -->
-  <xsl:if test="not(../*/bibliomisc[@role='medium'])">
-    <xsl:call-template name="iso690.secondary"/>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="biblioset" mode="iso690.article.jour">
-<!-- Serial -->
-  <!-- Title and Type of medium -->
-  <xsl:call-template name="iso690.title"/>
-  <!-- Edition -->
-  <xsl:call-template name="iso690.edition">
-    <xsl:with-param name="after" select="./pubdate[not(@role='issuing')]|./volumenum|./issuenum|./pagenums"/>
-  </xsl:call-template>
-  <!-- Number designation [EL] -->
-  <!-- Location within host -->
-  <xsl:call-template name="iso690.article.location"/>
-  <xsl:if test="./bibliomisc[@role='medium']">
-  <!-- Notes [EL] -->
-    <xsl:call-template name="iso690.notice"/>
-  <!-- Avaibility and access [EL] -->
-    <xsl:call-template name="iso690.access"/>
-  <!-- Standard number [EL] -->
-    <xsl:call-template name="iso690.issn"/>
-  </xsl:if>
-</xsl:template>
-
-<!-- PATENT DOCUMENTS -->
-<xsl:template name="iso690.patent">
-  <!-- Primary responsibility (applicant) -->
-  <xsl:call-template name="iso690.primary"/>
-  <!-- Title of the invention -->
-  <xsl:call-template name="iso690.title"/>
-  <!-- Subordinate responsibility -->
-  <xsl:call-template name="iso690.secondary"/>
-  <!-- Notes -->
-  <xsl:call-template name="iso690.notice"/>
-  <!-- Identification -->
-  <xsl:call-template name="iso690.pat.ident"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-<!-- Elements -->
-
-<!-- Primary responsibility -->
-<xsl:template name="iso690.primary">
-  <xsl:param name="primary.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'primary.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:choose>
-    <xsl:when test="./authorgroup/author|./author">
-      <xsl:call-template name="iso690.author.list">
-        <xsl:with-param name="person.list" select=".//authorgroup/author|.//author"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="./authorgroup/editor|./editor">
-      <xsl:call-template name="iso690.author.list">
-        <xsl:with-param name="person.list" select=".//authorgroup/editor|.//editor"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="./authorgroup/corpauthor|./corpauthor">
-      <xsl:call-template name="iso690.author.list">
-        <xsl:with-param name="person.list" select=".//authorgroup/corpauthor|.//corpauthor"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:if test="(./firstname)and(./surname)">
-        <xsl:call-template name="iso690.author"/>
-        <xsl:call-template name="iso690.endsep">
-          <xsl:with-param name="text" select="string(./firstname[1])"/>
-          <xsl:with-param name="sep" select="$primary.sep"/>
-        </xsl:call-template>
-      </xsl:if>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="iso690.author.list">
-  <xsl:param name="person.list" select="author|corpauthor|editor"/>
-  <xsl:param name="person.count" select="count($person.list)"/>
-  <xsl:param name="count" select="1"/>
-  <xsl:param name="group" select="./authorgroup[@role='many']"/>
-  <xsl:param name="many" select="0"/>
-
-  <xsl:param name="primary.many">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'primary.many'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="primary.editor">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'primary.editor'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="primary.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'primary.sep'"/></xsl:call-template>
-  </xsl:param>
-
-  <xsl:choose>
-    <xsl:when test="$count &gt; $person.count"/>
-    <xsl:otherwise>
-      <xsl:choose>
-        <xsl:when test="$person.count &lt; 4 and not($group)">
-          <xsl:call-template name="iso690.author">
-            <xsl:with-param name="node" select="$person.list[position()=$count]"/>
-          </xsl:call-template>
-          <xsl:choose>
-            <xsl:when test="$person.count = 2 and $count = 1 and $biblioentry.alt.primary.seps != 0">
-              <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'alt.person.two.sep'"/></xsl:call-template>
-            </xsl:when>
-            <xsl:when test="$person.count = 2 and $count = 1">
-              <xsl:call-template name="gentext.template">
-                <xsl:with-param name="context" select="'authorgroup'"/>
-                <xsl:with-param name="name" select="'sep2'"/>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:when test="$person.count &gt; 2 and $count+1 = $person.count and $biblioentry.alt.primary.seps != 0">
-              <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'alt.person.last.sep'"/></xsl:call-template>
-            </xsl:when>
-            <xsl:when test="$person.count &gt; 2 and $count+1 = $person.count">
-              <xsl:call-template name="gentext.template">
-                <xsl:with-param name="context" select="'authorgroup'"/>
-                <xsl:with-param name="name" select="'seplast'"/>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:when test="$count &lt; $person.count and $biblioentry.alt.primary.seps != 0">
-              <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'alt.person.more.sep'"/></xsl:call-template>
-            </xsl:when>
-            <xsl:when test="$count &lt; $person.count">
-              <xsl:call-template name="gentext.template">
-                <xsl:with-param name="context" select="'authorgroup'"/>
-                <xsl:with-param name="name" select="'sep'"/>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:when test="($count = $person.count)">
-              <xsl:choose>
-                <xsl:when test="$many!=0">
-                  <xsl:if test="name($person.list[position()=$count])='editor'">
-                    <xsl:value-of select="$primary.editor"/>
-                  </xsl:if>
-                  <xsl:value-of select="$primary.many"/>
-                  <xsl:call-template name="iso690.endsep">
-                    <xsl:with-param name="text" select="$primary.many"/>
-                    <xsl:with-param name="sep" select="$primary.sep"/>
-                  </xsl:call-template>
-                </xsl:when>
-                <xsl:when test="name($person.list[position()=$count])='editor'">
-                  <xsl:value-of select="$primary.editor"/>
-                  <xsl:value-of select="$primary.sep"/>
-                </xsl:when>
-                <xsl:when test="name($person.list[position()=$count])='corpauthor'">
-                  <xsl:call-template name="iso690.endsep">
-                    <xsl:with-param name="text" select="string($person.list[position()=$count])"/>
-                    <xsl:with-param name="sep" select="$primary.sep"/>
-                  </xsl:call-template>
-                </xsl:when>
-                <xsl:otherwise>
-                  <xsl:call-template name="iso690.endsep">
-                    <xsl:with-param name="text" select="string($person.list[position()=$count]//firstname[1])"/>
-                    <xsl:with-param name="sep" select="$primary.sep"/>
-                  </xsl:call-template>
-                </xsl:otherwise>
-              </xsl:choose>
-            </xsl:when>
-          </xsl:choose>
-
-          <xsl:call-template name="iso690.author.list">
-            <xsl:with-param name="person.list" select="$person.list"/>
-            <xsl:with-param name="person.count" select="$person.count"/>
-            <xsl:with-param name="count" select="$count+1"/>
-            <xsl:with-param name="many" select="$many"/>
-            <xsl:with-param name="group"/>
-          </xsl:call-template>
-        </xsl:when>
-
-        <xsl:otherwise>
-          <xsl:choose>
-            <xsl:when test="($biblioentry.primary.count&gt;=3) and ($person.count&gt;=3)">
-              <xsl:call-template name="iso690.author.list">
-                <xsl:with-param name="person.list" select="$person.list[1]|$person.list[2]|$person.list[3]"/>
-                <xsl:with-param name="person.count" select="3"/>
-                <xsl:with-param name="count" select="1"/>
-                <xsl:with-param name="many" select="1"/>
-                <xsl:with-param name="group"/>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:when test="($biblioentry.primary.count&gt;1) and  ($person.count&gt;1)">
-              <xsl:call-template name="iso690.author.list">
-                <xsl:with-param name="person.list" select="$person.list[1]|$person.list[2]"/>
-                <xsl:with-param name="person.count" select="2"/>
-                <xsl:with-param name="count" select="1"/>
-                <xsl:with-param name="many" select="1"/>
-                <xsl:with-param name="group"/>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:call-template name="iso690.author.list">
-                <xsl:with-param name="person.list" select="$person.list[1]"/>
-                <xsl:with-param name="person.count" select="1"/>
-                <xsl:with-param name="count" select="1"/>
-                <xsl:with-param name="many" select="1"/>
-                <xsl:with-param name="group"/>
-              </xsl:call-template>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="iso690.author">
-  <xsl:param name="node" select="."/>
-  <xsl:param name="lastfirst.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'lastfirst.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:choose>
-    <xsl:when test="name($node)!='corpauthor'">
-      <span style="text-transform:uppercase">
-        <xsl:apply-templates mode="iso690.mode" select="$node//surname[1]"/>
-      </span>
-      <xsl:if test="$node//surname and $node//firstname">
-        <xsl:value-of select="$lastfirst.sep"/>
-      </xsl:if>
-      <xsl:apply-templates mode="iso690.mode" select="$node//firstname[1]"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <span style="text-transform:uppercase">
-        <xsl:apply-templates mode="iso690.mode" select="$node"/>
-      </span>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="corpauthor|firstname|surname" mode="iso690.mode">
-  <xsl:apply-templates mode="iso690.mode"/>
-</xsl:template>
-
-<!-- Title and Type of medium -->
-<xsl:template name="iso690.title">
-  <xsl:param name="medium" select="./bibliomisc[@role='medium']"/>
-  <xsl:param name="italic" select="1"/>
-  <xsl:param name="sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'title.sep'"/></xsl:call-template>
-  </xsl:param>
-
-  <xsl:apply-templates mode="iso690.mode" select="./title">
-    <xsl:with-param name="medium" select="$medium"/>
-    <xsl:with-param name="italic" select="$italic"/>
-    <xsl:with-param name="sep" select="$sep"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="title" mode="iso690.mode">
-  <xsl:param name="medium"/>
-  <xsl:param name="italic" select="1"/>
-  <xsl:param name="sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'title.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="medium1">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'medium1'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="medium2">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'medium2'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:choose>
-    <xsl:when test="$italic=1">
-      <xsl:call-template name="iso690.italic.title"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="iso690.make.title"/>
-    </xsl:otherwise>
-  </xsl:choose>
-  <xsl:if test="$medium">
-    <xsl:value-of select="$medium1"/>
-    <xsl:apply-templates mode="iso690.mode" select="$medium"/>
-    <xsl:value-of select="$medium2"/>
-  </xsl:if>
-  <xsl:call-template name="iso690.endsep">
-    <xsl:with-param name="text" select="concat(string(.),string(../subtitle))"/>
-    <xsl:with-param name="sep" select="$sep"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="iso690.italic.title">
-  <i>
-    <xsl:call-template name="iso690.make.title"/>
-  </i>
-</xsl:template>
-
-<xsl:template name="iso690.make.title">
-  <xsl:param name="submaintitle.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'submaintitle.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:apply-templates mode="iso690.mode"/>
-  <xsl:if test="../subtitle">
-    <xsl:value-of select="$submaintitle.sep"/>
-    <xsl:apply-templates mode="iso690.mode" select="../subtitle"/>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="iso690.mode">
-  <xsl:apply-templates mode="iso690.mode"/>
-</xsl:template>
-
-<xsl:template match="bibliomisc[@role='medium']" mode="iso690.mode">
-  <xsl:apply-templates mode="iso690.mode"/>
-</xsl:template>
-
-<!-- Subordinate responsibility -->
-<xsl:template name="iso690.secondary">
-  <xsl:param name="secondary.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'secondary.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="secondary.person.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'secondary.person.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:for-each select="./bibliomisc[@role='secondary']">
-    <xsl:apply-templates mode="iso690.mode" select="."/>
-    <xsl:choose>
-      <xsl:when test="position()=count(../bibliomisc[@role='secondary'])">
-        <xsl:call-template name="iso690.endsep">
-          <xsl:with-param name="text" select="string(.)"/>
-          <xsl:with-param name="sep" select="$secondary.sep"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$secondary.person.sep"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:for-each>
-</xsl:template>
-
-<xsl:template match="bibliomisc[@role='secondary']" mode="iso690.mode">
-  <xsl:apply-templates mode="iso690.mode"/>
-</xsl:template>
-
-<!-- Edition -->
-<xsl:template name="iso690.edition">
-  <xsl:param name="after"/>
-  <xsl:param name="edition.serial.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'edition.serial.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:choose>
-    <xsl:when test="string($after)!=''">
-      <xsl:apply-templates mode="iso690.mode" select="./edition">
-        <xsl:with-param name="sep" select="$edition.serial.sep"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates mode="iso690.mode" select="./edition"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="edition" mode="iso690.mode">
-  <xsl:param name="sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'edition.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:apply-templates mode="iso690.mode"/>
-  <xsl:call-template name="iso690.endsep">
-    <xsl:with-param name="text" select="string(.)"/>
-    <xsl:with-param name="sep" select="$sep"/>
-  </xsl:call-template>
-</xsl:template>
-
-<!-- Issue designation (date and/or num) -->
-<xsl:template name="iso690.issuing">
-  <xsl:param name="issuing.div">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'issuing.div'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="issuing.range">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'issuing.range'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="issuing.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'issuing.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:choose>
-    <xsl:when test="./pubdate[@role='issuing'] and ./volumenum[2] and ./issuenum[2]">
-      <xsl:call-template name="iso690.issuedate"/>
-      <xsl:apply-templates mode="iso690.mode" select="./volumenum[1]">
-        <xsl:with-param name="sep" select="$issuing.div"/>
-      </xsl:apply-templates>
-      <xsl:apply-templates mode="iso690.mode" select="./issuenum[1]">
-        <xsl:with-param name="sep" select="$issuing.range"/>
-      </xsl:apply-templates>
-      <xsl:apply-templates mode="iso690.mode" select="./volumenum[2]">
-        <xsl:with-param name="sep" select="$issuing.div"/>
-      </xsl:apply-templates>
-      <xsl:apply-templates mode="iso690.mode" select="./issuenum[2]">
-        <xsl:with-param name="sep" select="$issuing.sep"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:when test="./pubdate[@role='issuing'] and ./volumenum[2]">
-      <xsl:call-template name="iso690.issuedate"/>
-      <xsl:apply-templates mode="iso690.mode" select="./volumenum[1]">
-        <xsl:with-param name="sep" select="$issuing.range"/>
-      </xsl:apply-templates>
-      <xsl:apply-templates mode="iso690.mode" select="./volumenum[2]">
-        <xsl:with-param name="sep" select="$issuing.sep"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:when test="./pubdate[@role='issuing'] and ./volumenum and ./issuenum">
-      <xsl:apply-templates mode="iso690.mode" select="./pubdate[@role='issuing']">
-        <xsl:with-param name="sep" select="$issuing.div"/>
-      </xsl:apply-templates>
-      <xsl:apply-templates mode="iso690.mode" select="./volumenum">
-        <xsl:with-param name="sep" select="$issuing.div"/>
-      </xsl:apply-templates>
-      <xsl:apply-templates mode="iso690.mode" select="./issuenum">
-        <xsl:with-param name="sep" select="$issuing.sep"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:when test="./pubdate[@role='issuing']">
-      <xsl:apply-templates mode="iso690.mode" select="./pubdate[@role='issuing']">
-        <xsl:with-param name="sep" select="$issuing.sep"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:when test="./volumenum">
-      <xsl:apply-templates mode="iso690.mode" select="./volumenum">
-        <xsl:with-param name="sep" select="$issuing.sep"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:when test="./issuenum">
-      <xsl:apply-templates mode="iso690.mode" select="./issuenum">
-        <xsl:with-param name="sep" select="$issuing.sep"/>
-      </xsl:apply-templates>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="iso690.issuedate">
-  <xsl:param name="issuing.div">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'issuing.div'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="issuing.range">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'issuing.range'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="issuing.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'issuing.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:choose>
-    <xsl:when test="./pubdate[@role='issuing'][2]">
-      <xsl:apply-templates mode="iso690.mode" select="./pubdate[@role='issuing'][1]">
-        <xsl:with-param name="sep" select="$issuing.range"/>
-      </xsl:apply-templates>
-      <xsl:apply-templates mode="iso690.mode" select="./pubdate[@role='issuing'][2]">
-        <xsl:with-param name="sep" select="$issuing.div"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates mode="iso690.mode" select="./pubdate[@role='issuing']">
-        <xsl:with-param name="sep" select="$issuing.div"/>
-      </xsl:apply-templates>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="pubdate[@role='issuing']" mode="iso690.mode">
-  <xsl:param name="sep"/>
-  <xsl:variable name="substr" select="substring(string(.),string-length(string(.)))"/>
-  <xsl:apply-templates mode="iso690.mode"/>
-  <xsl:call-template name="iso690.space">
-    <xsl:with-param name="text" select="$substr"/>
-  </xsl:call-template>
-  <xsl:choose>
-    <xsl:when test="$substr='-'">
-      <xsl:call-template name="iso690.endsep">
-        <xsl:with-param name="text" select="' '"/>
-        <xsl:with-param name="sep" select="$sep"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="iso690.endsep">
-        <xsl:with-param name="text" select="string(.)"/>
-        <xsl:with-param name="sep" select="$sep"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- Numeration of the part -->
-<xsl:template name="iso690.partnr">
-  <xsl:param name="partnr.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'partnr.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:apply-templates mode="iso690.mode" select="./volumenum">
-    <xsl:with-param name="sep" select="$partnr.sep"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<!-- Place of publication, Publisher, Year/Date of publication, Date of update/revision, Date of citation -->
-<xsl:template name="iso690.pub">
-  <xsl:param name="onlydate" select="0"/>
-  <xsl:param name="placesep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'placepubl.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="pubsep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'publyear.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="endsep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'pubinfo.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:choose>
-    <xsl:when test="(./publisher/publishername|./publishername|./publisher/address/city)and($onlydate=0)and(./pubdate[not(@role='issuing')]|./copyright/year|./date[@role='upd']|./date[@role='upd'])">
-      <xsl:apply-templates mode="iso690.mode" select="./publisher/address/city">
-        <xsl:with-param name="sep" select="$placesep"/>
-      </xsl:apply-templates>
-      <xsl:apply-templates mode="iso690.mode" select="./publisher/publishername|./publishername">
-        <xsl:with-param name="sep" select="$pubsep"/>
-      </xsl:apply-templates>
-      <xsl:apply-templates mode="iso690.mode" select="./pubdate[not(@role='issuing')]|./copyright/year">
-        <xsl:with-param name="sep" select="$endsep"/>
-      </xsl:apply-templates>
-      <xsl:if test="not(./pubdate[not(@role='issuing')]|./copyright/year)">
-        <xsl:call-template name="iso690.data">
-          <xsl:with-param name="sep" select="$endsep"/>
-        </xsl:call-template>
-      </xsl:if>
-    </xsl:when>
-    <xsl:when test="(./publisher/publishername|./publishername)and(./publisher/address/city)and($onlydate=0)">
-      <xsl:apply-templates mode="iso690.mode" select="./publisher/address/city">
-        <xsl:with-param name="sep" select="$placesep"/>
-      </xsl:apply-templates>
-      <xsl:apply-templates mode="iso690.mode" select="./publisher/publishername|./publishername">
-        <xsl:with-param name="sep" select="$endsep"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:when test="($onlydate=1)or(./pubdate[not(@role='issuing')]|./copyright/year)">
-      <xsl:apply-templates mode="iso690.mode" select="./pubdate[not(@role='issuing')]|./copyright/year">
-        <xsl:with-param name="sep" select="$endsep"/>
-      </xsl:apply-templates>
-      <xsl:if test="$onlydate=1">
-        <xsl:call-template name="iso690.location">
-          <xsl:with-param name="onlypages" select="1"/>
-        </xsl:call-template>
-      </xsl:if>
-    </xsl:when>
-    <xsl:when test="not(./pubdate[not(@role='issuing')]|./copyright/year)">
-      <xsl:call-template name="iso690.data">
-        <xsl:with-param name="sep" select="$endsep"/>
-      </xsl:call-template>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="iso690.paper.pub">
-  <xsl:param name="spec.pubinfo.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'spec.pubinfo.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:choose>
-    <xsl:when test="./volumnum|./issuenum|./pagenums">
-      <xsl:call-template name="iso690.pub">
-        <xsl:with-param name="endsep" select="$spec.pubinfo.sep"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="iso690.pub"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="iso690.data">
-  <xsl:param name="sep"/>
-  <xsl:param name="datecit2">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'datecit2'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:apply-templates mode="iso690.mode" select="./date[@role='upd']">
-    <xsl:with-param name="sep"/>
-  </xsl:apply-templates>
-  <xsl:apply-templates mode="iso690.mode" select="./date[@role='cit']"/>
-  <xsl:choose>
-    <xsl:when test="./date[@role='cit']">
-      <xsl:call-template name="iso690.endsep">
-        <xsl:with-param name="text" select="$datecit2"/>
-        <xsl:with-param name="sep" select="$sep"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="./date[@role='upd']">
-      <xsl:call-template name="iso690.endsep">
-        <xsl:with-param name="text" select="string(./date[@role='upd'])"/>
-        <xsl:with-param name="sep" select="$sep"/>
-      </xsl:call-template>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="publisher/address/city|publishername" mode="iso690.mode">
-  <xsl:param name="sep"/>
-  <xsl:param name="upd" select="0"/>
-  <xsl:apply-templates mode="iso690.mode"/>
-  <xsl:call-template name="iso690.endsep">
-    <xsl:with-param name="text" select="string(.)"/>
-    <xsl:with-param name="sep" select="$sep"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="pubdate|copyright/year" mode="iso690.mode">
-  <xsl:param name="sep"/>
-  <xsl:param name="upd" select="1"/>
-  <xsl:param name="datecit2">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'datecit2'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:variable name="substr" select="substring(string(.),string-length(string(.)))"/>
-  <xsl:if test="name(.)!='pubdate'">
-    <xsl:value-of select="'&#169;'"/><!-- copyright -->
-  </xsl:if>
-  <xsl:apply-templates mode="iso690.mode"/>
-  <xsl:call-template name="iso690.space">
-    <xsl:with-param name="text" select="$substr"/>
-  </xsl:call-template>
-  <xsl:if test="$upd!=0">
-    <xsl:choose>
-      <xsl:when test="name(.)='pubdate'">
-        <xsl:apply-templates mode="iso690.mode" select="../date[@role='upd']"/>
-        <xsl:apply-templates mode="iso690.mode" select="../date[@role='cit']"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:apply-templates mode="iso690.mode" select="../../date[@role='upd']"/>
-        <xsl:apply-templates mode="iso690.mode" select="../../date[@role='cit']"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:if>
-  <xsl:choose>
-    <xsl:when test="../date[@role='cit']|../../date[@role='cit'] and $upd!=0">
-      <xsl:call-template name="iso690.endsep">
-        <xsl:with-param name="text" select="$datecit2"/>
-        <xsl:with-param name="sep" select="$sep"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="../date[@role='upd']|../../date[@role='upd'] and $upd!=0">
-      <xsl:call-template name="iso690.endsep">
-        <xsl:with-param name="text" select="string(../date[@role='upd'])"/>
-        <xsl:with-param name="sep" select="$sep"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="$substr='-'">
-      <xsl:call-template name="iso690.endsep">
-        <xsl:with-param name="text" select="' '"/>
-        <xsl:with-param name="sep" select="$sep"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="iso690.endsep">
-        <xsl:with-param name="text" select="string(.)"/>
-        <xsl:with-param name="sep" select="$sep"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="iso690.space">
-  <xsl:param name="text" select="substring(string(.),string-length(string(.)))"/>
-  <xsl:if test="$text='-'">
-    <xsl:value-of select="' '"/>
-  </xsl:if>
-</xsl:template>
-
-<!-- Date of update/revision -->
-<xsl:template match="date[@role='upd']" mode="iso690.mode">
-  <xsl:param name="sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'upd.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:value-of select="$sep"/>
-  <xsl:apply-templates mode="iso690.mode"/>
-</xsl:template>
-
-<!-- Date of citation -->
-<xsl:template match="date[@role='cit']" mode="iso690.mode">
-  <xsl:param name="datecit1">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'datecit1'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="datecit2">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'datecit2'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:value-of select="$datecit1"/>
-  <xsl:apply-templates mode="iso690.mode"/>
-  <xsl:value-of select="$datecit2"/>
-</xsl:template>
-
-<!-- Extent -->
-<xsl:template name="iso690.extent">
-  <xsl:param name="extent.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'extent.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:apply-templates mode="iso690.mode" select="./pagenums">
-    <xsl:with-param name="sep" select="$extent.sep"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<!-- Location within host -->
-<xsl:template name="iso690.part.location">
-  <xsl:param name="location.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'location.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:choose>
-    <xsl:when test="./pagenums">
-      <xsl:apply-templates mode="iso690.mode" select="./bibliomisc[@role='secnum']"/>
-      <xsl:apply-templates mode="iso690.mode" select="./bibliomisc[@role='sectitle']"/>
-      <xsl:apply-templates mode="iso690.mode" select="./pagenums"/>
-    </xsl:when>
-    <xsl:when test="./bibliomisc[@role='sectitle']">
-      <xsl:apply-templates mode="iso690.mode" select="./bibliomisc[@role='secnum']"/>
-      <xsl:apply-templates mode="iso690.mode" select="./bibliomisc[@role='sectitle']">
-        <xsl:with-param name="sep" select="$location.sep"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates mode="iso690.mode" select="./bibliomisc[@role='secnum']">
-        <xsl:with-param name="sep" select="$location.sep"/>
-      </xsl:apply-templates>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="iso690.article.location">
-  <xsl:param name="location.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'location.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="locs.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'locs.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:choose>
-    <xsl:when test="not(./date[@role='upd']|./date[@role='cit'])">
-      <xsl:choose>
-        <xsl:when test="./volumenum|./issuenum|./pagenums">
-          <xsl:apply-templates mode="iso690.mode" select="./pubdate[not(@role='issuing')]">
-            <xsl:with-param name="upd" select="0"/>
-            <xsl:with-param name="sep" select="$locs.sep"/>
-          </xsl:apply-templates>
-          <xsl:call-template name="iso690.location"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates mode="iso690.mode" select="./pubdate[not(@role='issuing')]">
-            <xsl:with-param name="sep" select="$location.sep"/>
-          </xsl:apply-templates>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:choose>
-        <xsl:when test="./volumenum|./issuenum|./pagenums">
-          <xsl:apply-templates mode="iso690.mode" select="./pubdate[not(@role='issuing')]">
-            <xsl:with-param name="upd" select="0"/>
-            <xsl:with-param name="sep" select="$locs.sep"/>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates mode="iso690.mode" select="./pubdate[not(@role='issuing')]">
-            <xsl:with-param name="upd" select="0"/>
-            <xsl:with-param name="sep" select="$location.sep"/>
-          </xsl:apply-templates>
-        </xsl:otherwise>
-      </xsl:choose>
-      <xsl:choose>
-        <xsl:when test="./issuenum">
-          <xsl:apply-templates mode="iso690.mode" select="./volumenum"/>
-          <xsl:apply-templates mode="iso690.mode" select="./issuenum">
-            <xsl:with-param name="sep"/>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates mode="iso690.mode" select="./volumenum">
-            <xsl:with-param name="sep"/>
-          </xsl:apply-templates>
-        </xsl:otherwise>
-      </xsl:choose>
-      <xsl:choose>
-        <xsl:when test="./pagenums">
-          <xsl:call-template name="iso690.data">
-            <xsl:with-param name="sep" select="$locs.sep"/>
-          </xsl:call-template>
-          <xsl:apply-templates mode="iso690.mode" select="./pagenums"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="iso690.data">
-            <xsl:with-param name="sep" select="$location.sep"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="iso690.location">
-  <xsl:param name="location.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'location.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:choose>
-    <xsl:when test="./volumenum and not(./issuenum) and not(./pagenums)">
-      <xsl:apply-templates mode="iso690.mode" select="./volumenum">
-        <xsl:with-param name="sep" select="$location.sep"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:when test="./issuenum and not(./pagenums)">
-      <xsl:apply-templates mode="iso690.mode" select="./volumenum"/>
-      <xsl:apply-templates mode="iso690.mode" select="./issuenum">
-        <xsl:with-param name="sep" select="$location.sep"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:when test="./pagenums">
-      <xsl:apply-templates mode="iso690.mode" select="./volumenum"/>
-      <xsl:apply-templates mode="iso690.mode" select="./issuenum"/>
-      <xsl:apply-templates mode="iso690.mode" select="./pagenums"/>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="bibliomisc[@role='secnum']|bibliomisc[@role='sectitle']" mode="iso690.mode">
-  <xsl:param name="sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'locs.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:apply-templates mode="iso690.mode"/>
-  <xsl:call-template name="iso690.endsep">
-    <xsl:with-param name="text" select="string(.)"/>
-    <xsl:with-param name="sep" select="$sep"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="volumenum|issuenum" mode="iso690.mode">
-  <xsl:param name="sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'locs.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:apply-templates mode="iso690.mode"/>
-  <xsl:call-template name="iso690.endsep">
-    <xsl:with-param name="text" select="string(.)"/>
-    <xsl:with-param name="sep" select="$sep"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="pagenums" mode="iso690.mode">
-  <xsl:param name="sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'location.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:apply-templates mode="iso690.mode"/>
-  <xsl:call-template name="iso690.endsep">
-    <xsl:with-param name="text" select="string(.)"/>
-    <xsl:with-param name="sep" select="$sep"/>
-  </xsl:call-template>
-</xsl:template>
-
-<!-- Series -->
-<xsl:template name="iso690.serie">
-  <xsl:apply-templates mode="iso690.mode" select=".//bibliomisc[@role='serie']"/>
-</xsl:template>
-
-<!-- Notes -->
-<xsl:template name="iso690.notice">
-  <xsl:apply-templates mode="iso690.mode" select=".//bibliomisc[not(@role)]"/>
-</xsl:template>
-
-<xsl:template match="bibliomisc[not(@role)]|bibliomisc[@role='serie']" mode="iso690.mode">
-  <xsl:param name="notice.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'notice.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:apply-templates mode="iso690.mode"/>
-  <xsl:call-template name="iso690.endsep">
-    <xsl:with-param name="text" select="string(.)"/>
-    <xsl:with-param name="sep" select="$notice.sep"/>
-  </xsl:call-template>
-</xsl:template>
-
-<!-- Avaibility and access -->
-<xsl:template name="iso690.access">
-  <xsl:for-each select="./biblioid[@class='uri']|./bibliomisc[@role='access']">
-    <xsl:choose>
-      <xsl:when test="position()=1">
-        <xsl:apply-templates mode="iso690.mode" select="."/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:apply-templates mode="iso690.mode" select=".">
-          <xsl:with-param name="firstacc" select="0"/>
-        </xsl:apply-templates>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:for-each>
-</xsl:template>
-
-<xsl:template match="biblioid[@class='uri']/ulink|bibliomisc[@role='access']/ulink" mode="iso690.mode">
-  <xsl:param name="link1">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'link1'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="link2">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'link2'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:value-of select="$link1"/>
-  <xsl:call-template name="ulink"/>
-  <xsl:value-of select="$link2"/>
-</xsl:template>
-
-<xsl:template match="biblioid[@class='uri']|bibliomisc[@role='access']" mode="iso690.mode">
-  <xsl:param name="firstacc" select="1"/>
-  <xsl:param name="access">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'access'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="acctoo">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'acctoo'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="onwww">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'onwww'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="oninet">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'oninet'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="access.end">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'access.end'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="access.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'access.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:choose>
-    <xsl:when test="$firstacc=1">
-      <xsl:value-of select="$access"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$acctoo"/>
-    </xsl:otherwise>
-  </xsl:choose>
-  <xsl:choose>
-    <xsl:when test="(./ulink)and(string(./ulink)=string(.))">
-      <xsl:choose>
-        <xsl:when test="(starts-with(./ulink/@url,'http://')or(starts-with(./ulink/@url,'https://')))">
-          <xsl:value-of select="$onwww"/>
-          <xsl:value-of select="$access.end"/>
-          <xsl:apply-templates mode="iso690.mode" select="./ulink"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="$oninet"/>
-          <xsl:value-of select="$access.end"/>
-          <xsl:apply-templates mode="iso690.mode" select="./ulink"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:when test="(./ulink)and(string(./ulink)!=string(.))">
-      <xsl:value-of select="text()[1]"/>
-      <xsl:call-template name="iso690.endsep">
-        <xsl:with-param name="text" select="text()[1]"/>
-        <xsl:with-param name="sep" select="$access.end"/>
-      </xsl:call-template>
-      <xsl:apply-templates mode="iso690.mode" select="./ulink"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates mode="iso690.mode"/>
-    </xsl:otherwise>
-  </xsl:choose>
-  <xsl:value-of select="$access.sep"/>
-</xsl:template>
-
-<!-- Standard number - ISBN -->
-<xsl:template name="iso690.isbn">
-  <xsl:choose>
-    <xsl:when test="./biblioid/@class='isbn'">
-      <xsl:apply-templates mode="iso690.mode" select="./biblioid[@class='isbn']"/>
-    </xsl:when>
-    <xsl:when test="./isbn">
-      <xsl:apply-templates mode="iso690.mode" select="./isbn"/>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="isbn|biblioid[@class='isbn']" mode="iso690.mode">
-  <xsl:param name="isbn">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'isbn'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="stdnum.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'stdnum.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:value-of select="$isbn"/>
-  <xsl:apply-templates mode="iso690.mode"/>
-  <xsl:value-of select="$stdnum.sep"/>
-</xsl:template>
-
-<!-- Standard number - ISSN -->
-<xsl:template name="iso690.issn">
-  <xsl:choose>
-    <xsl:when test="./biblioid/@class='issn'">
-      <xsl:apply-templates mode="iso690.mode" select="./biblioid[@class='issn']"/>
-    </xsl:when>
-    <xsl:when test="./issn">
-      <xsl:apply-templates mode="iso690.mode" select="./issn"/>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="issn|biblioid[@class='issn']" mode="iso690.mode">
-  <xsl:param name="issn">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'issn'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="stdnum.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'stdnum.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:value-of select="$issn"/>
-  <xsl:apply-templates mode="iso690.mode"/>
-  <xsl:value-of select="$stdnum.sep"/>
-</xsl:template>
-
-<!-- Identification of patent document -->
-<xsl:template name="iso690.pat.ident">
-  <xsl:param name="patdate.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'patdate.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:apply-templates mode="iso690.mode" select="./address/country"/>
-  <xsl:apply-templates mode="iso690.mode" select="./bibliomisc[@role='patenttype']"/>
-  <xsl:choose>
-    <xsl:when test="./biblioid[@class='other' and @otherclass='patentnum']">
-      <xsl:apply-templates mode="iso690.mode" select="./biblioid[@class='other' and @otherclass='patentnum']"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates mode="iso690.mode" select="./bibliomisc[@role='patentnum']"/>
-    </xsl:otherwise>
-  </xsl:choose>
-  <xsl:apply-templates mode="iso690.mode" select="./pubdate[not(@role='issuing')]">
-    <xsl:with-param name="sep" select="$patdate.sep"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<!-- Country or issuing office -->
-<xsl:template match="address/country" mode="iso690.mode">
-  <xsl:param name="patcountry.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'patcountry.sep'"/></xsl:call-template>
-  </xsl:param>
-  <i>
-    <xsl:apply-templates mode="iso690.mode"/>
-  </i>
-  <xsl:value-of select="$patcountry.sep"/>
-</xsl:template>
-
-<!-- Kind of patent document -->
-<xsl:template match="bibliomisc[@role='patenttype']" mode="iso690.mode">
-  <xsl:param name="pattype.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'pattype.sep'"/></xsl:call-template>
-  </xsl:param>
-  <i>
-    <xsl:apply-templates mode="iso690.mode"/>
-  </i>
-  <xsl:value-of select="$pattype.sep"/>
-</xsl:template>
-
-<!-- Number -->
-<xsl:template match="biblioid[@class='other' and @otherclass='patentnum']|bibliomisc[@role='patentnum']" mode="iso690.mode">
-  <xsl:param name="patnum.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'patnum.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:apply-templates mode="iso690.mode"/>
-  <xsl:value-of select="$patnum.sep"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-<!-- Supplementary templates -->
-
-<xsl:template name="iso690.endsep">
-  <xsl:param name="text"/>
-  <xsl:param name="sep" select=". "/>
-  <xsl:choose>
-    <xsl:when test="substring($text,string-length($text))!=substring($sep,1,1)">
-      <xsl:value-of select="$sep"/>
-    </xsl:when>
-    <xsl:when test="substring($text,string-length($text))=' '">
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="' '"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="*" mode="iso690.mode">
-  <xsl:apply-templates select="."/><!-- try the default mode -->
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/biblio.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/biblio.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,1217 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:template match="bibliography">
-  <xsl:call-template name="id.warning"/>
-
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:if test="$generate.id.attributes != 0">
-      <xsl:attribute name="id">
-        <xsl:call-template name="object.id"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <xsl:call-template name="bibliography.titlepage"/>
-
-    <xsl:apply-templates/>
-
-    <xsl:if test="not(parent::article)">
-      <xsl:call-template name="process.footnotes"/>
-    </xsl:if>
-  </div>
-</xsl:template>
-
-<xsl:template match="bibliography/bibliographyinfo"/>
-<xsl:template match="bibliography/info"/>
-<xsl:template match="bibliography/title"/>
-<xsl:template match="bibliography/subtitle"/>
-<xsl:template match="bibliography/titleabbrev"/>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="bibliodiv">
-  <xsl:call-template name="id.warning"/>
-
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates/>
-  </div>
-</xsl:template>
-
-<xsl:template match="bibliodiv/title">
-  <h3>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="anchor">
-      <xsl:with-param name="node" select=".."/>
-    </xsl:call-template>
-    <xsl:apply-templates/>
-  </h3>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="bibliolist">
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="anchor"/>
-    <xsl:if test="blockinfo/title|info/title|title">
-      <xsl:call-template name="formal.object.heading"/>
-    </xsl:if>
-    <xsl:apply-templates select="*[not(self::blockinfo)                                    and not(self::info)                                    and not(self::title)                                    and not(self::titleabbrev)                                    and not(self::biblioentry)                                    and not(self::bibliomixed)]"/>
-    <xsl:apply-templates select="biblioentry|bibliomixed"/>
-  </div>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="biblioentry">
-  <xsl:param name="label">
-    <xsl:call-template name="biblioentry.label"/>
-  </xsl:param>
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="string(.) = ''">
-      <xsl:variable name="bib" select="document($bibliography.collection,.)"/>
-      <xsl:variable name="entry" select="$bib/bibliography/                                          *[@id=$id or @xml:id=$id][1]"/>
-      <xsl:choose>
-        <xsl:when test="$entry">
-          <xsl:choose>
-            <xsl:when test="$bibliography.numbered != 0">
-              <xsl:apply-templates select="$entry">
-                <xsl:with-param name="label" select="$label"/>
-              </xsl:apply-templates>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:apply-templates select="$entry"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:message>
-            <xsl:text>No bibliography entry: </xsl:text>
-            <xsl:value-of select="$id"/>
-            <xsl:text> found in </xsl:text>
-            <xsl:value-of select="$bibliography.collection"/>
-          </xsl:message>
-          <div>
-            <xsl:apply-templates select="." mode="class.attribute"/>
-            <xsl:call-template name="anchor"/>
-            <p>
-              <xsl:copy-of select="$label"/>
-              <xsl:text>Error: no bibliography entry: </xsl:text>
-              <xsl:value-of select="$id"/>
-              <xsl:text> found in </xsl:text>
-              <xsl:value-of select="$bibliography.collection"/>
-            </p>
-          </div>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <div>
-        <xsl:apply-templates select="." mode="class.attribute"/>
-        <xsl:call-template name="anchor">
-          <xsl:with-param name="conditional" select="0"/>
-        </xsl:call-template>
-        <p>
-          <xsl:copy-of select="$label"/>
-	  <xsl:choose>
-	    <xsl:when test="$bibliography.style = 'iso690'">
-	      <xsl:call-template name="iso690.makecitation"/>
-	    </xsl:when>
-	    <xsl:otherwise>
-	      <xsl:apply-templates mode="bibliography.mode"/>
-	    </xsl:otherwise>
-	  </xsl:choose>
-        </p>
-      </div>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="bibliomixed">
-  <xsl:param name="label">
-    <xsl:call-template name="biblioentry.label"/>
-  </xsl:param>
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="string(.) = ''">
-      <xsl:variable name="bib" select="document($bibliography.collection,.)"/>
-      <xsl:variable name="entry" select="$bib/bibliography/                                          *[@id=$id or @xml:id=$id][1]"/>
-      <xsl:choose>
-        <xsl:when test="$entry">
-          <xsl:choose>
-            <xsl:when test="$bibliography.numbered != 0">
-              <xsl:apply-templates select="$entry">
-                <xsl:with-param name="label" select="$label"/>
-              </xsl:apply-templates>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:apply-templates select="$entry"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:message>
-            <xsl:text>No bibliography entry: </xsl:text>
-            <xsl:value-of select="$id"/>
-            <xsl:text> found in </xsl:text>
-            <xsl:value-of select="$bibliography.collection"/>
-          </xsl:message>
-          <div>
-            <xsl:apply-templates select="." mode="class.attribute"/>
-            <xsl:call-template name="anchor"/>
-            <p>
-              <xsl:copy-of select="$label"/>
-              <xsl:text>Error: no bibliography entry: </xsl:text>
-              <xsl:value-of select="$id"/>
-              <xsl:text> found in </xsl:text>
-              <xsl:value-of select="$bibliography.collection"/>
-            </p>
-          </div>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <div>
-        <xsl:apply-templates select="." mode="class.attribute"/>
-        <xsl:call-template name="anchor">
-          <xsl:with-param name="conditional" select="0"/>
-        </xsl:call-template>
-        <p>
-          <xsl:apply-templates select="." mode="class.attribute"/>
-          <xsl:copy-of select="$label"/>
-          <xsl:apply-templates mode="bibliomixed.mode"/>
-        </p>
-      </div>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="biblioentry.label">
-  <xsl:param name="node" select="."/>
-
-  <xsl:choose>
-    <xsl:when test="$bibliography.numbered != 0">
-      <xsl:text>[</xsl:text>
-      <xsl:number from="bibliography" count="biblioentry|bibliomixed" level="any" format="1"/>
-      <xsl:text>] </xsl:text>
-    </xsl:when>
-    <xsl:when test="local-name($node/child::*[1]) = 'abbrev'">
-      <xsl:text>[</xsl:text>
-      <xsl:apply-templates select="$node/abbrev[1]"/>
-      <xsl:text>] </xsl:text>
-    </xsl:when>
-    <xsl:when test="$node/@xreflabel">
-      <xsl:text>[</xsl:text>
-      <xsl:value-of select="$node/@xreflabel"/>
-      <xsl:text>] </xsl:text>
-    </xsl:when>
-    <xsl:when test="$node/@id">
-      <xsl:text>[</xsl:text>
-      <xsl:value-of select="$node/@id"/>
-      <xsl:text>] </xsl:text>
-    </xsl:when>
-    <xsl:when test="$node/@xml:id">
-      <xsl:text>[</xsl:text>
-      <xsl:value-of select="$node/@xml:id"/>
-      <xsl:text>] </xsl:text>
-    </xsl:when>
-    <xsl:otherwise><!-- nop --></xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="*" mode="bibliography.mode">
-  <xsl:apply-templates select="."/><!-- try the default mode -->
-</xsl:template>
-
-<xsl:template match="abbrev" mode="bibliography.mode">
-  <xsl:if test="preceding-sibling::*">
-    <xsl:apply-templates mode="bibliography.mode"/>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="abstract" mode="bibliography.mode">
-  <!-- suppressed -->
-</xsl:template>
-
-<xsl:template match="address" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="affiliation" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="shortaffil" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="jobtitle" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="artheader|articleinfo|info" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="artpagenums" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="author" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="person.name"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="authorblurb|personblurb" mode="bibliography.mode">
-  <!-- suppressed -->
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="person.name.list"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="authorinitials" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="bibliomisc" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="bibliomset" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<!-- ================================================== -->
-
-<xsl:template match="biblioset" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="biblioset/title|biblioset/citetitle" mode="bibliography.mode">
-  <xsl:variable name="relation" select="../@relation"/>
-  <xsl:choose>
-    <xsl:when test="$relation='article' or @pubwork='article'">
-      <xsl:call-template name="gentext.startquote"/>
-      <xsl:apply-templates/>
-      <xsl:call-template name="gentext.endquote"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <i><xsl:apply-templates/></i>
-    </xsl:otherwise>
-  </xsl:choose>
-  <xsl:copy-of select="$biblioentry.item.separator"/>
-</xsl:template>
-
-<!-- ================================================== -->
-
-<xsl:template match="bookbiblio" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="citetitle" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:choose>
-      <xsl:when test="@pubwork = 'article'">
-        <xsl:call-template name="gentext.startquote"/>
-        <xsl:call-template name="inline.charseq"/>
-        <xsl:call-template name="gentext.endquote"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="inline.italicseq"/>
-      </xsl:otherwise>
-    </xsl:choose>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="collab" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="collabname" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="confgroup" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="confdates" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="conftitle" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="confnum" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="confsponsor" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="contractnum" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="contractsponsor" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="contrib" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<!-- ================================================== -->
-
-<xsl:template match="copyright" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="gentext">
-      <xsl:with-param name="key" select="'Copyright'"/>
-    </xsl:call-template>
-    <xsl:call-template name="gentext.space"/>
-    <xsl:call-template name="dingbat">
-      <xsl:with-param name="dingbat">copyright</xsl:with-param>
-    </xsl:call-template>
-    <xsl:call-template name="gentext.space"/>
-    <xsl:apply-templates select="year" mode="bibliography.mode"/>
-    <xsl:if test="holder">
-      <xsl:call-template name="gentext.space"/>
-      <xsl:apply-templates select="holder" mode="bibliography.mode"/>
-    </xsl:if>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="year" mode="bibliography.mode">
-  <xsl:apply-templates/><xsl:text>, </xsl:text>
-</xsl:template>
-
-<xsl:template match="year[position()=last()]" mode="bibliography.mode">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="holder" mode="bibliography.mode">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<!-- ================================================== -->
-
-<xsl:template match="corpauthor" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="corpcredit" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="corpname" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="date" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="edition" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="editor" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="person.name"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="firstname" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="honorific" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="invpartnumber" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="isbn" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="issn" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="issuenum" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="lineage" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="orgname" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="orgdiv" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="othername" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="pagenums" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="printhistory" mode="bibliography.mode">
-  <!-- suppressed -->
-</xsl:template>
-
-<xsl:template match="productname" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="productnumber" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="publisher" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="publishername" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="pubsnumber" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="bibliography.mode">
-  <!-- suppressed; how could this be represented? -->
-</xsl:template>
-
-<xsl:template match="seriesinfo" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="seriesvolnums" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="surname" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="title" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <i><xsl:apply-templates mode="bibliography.mode"/></i>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="titleabbrev" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="volumenum" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="bibliocoverage|biblioid|bibliorelation|bibliosource" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="*" mode="bibliomixed.mode">
-  <xsl:apply-templates select="."/><!-- try the default mode -->
-</xsl:template>
-
-<xsl:template match="abbrev" mode="bibliomixed.mode">
-  <xsl:if test="preceding-sibling::*">
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="abstract" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="address" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="affiliation" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="shortaffil" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="jobtitle" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="artpagenums" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="author" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="authorblurb|personblurb" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="authorinitials" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="bibliomisc" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<!-- ================================================== -->
-
-<xsl:template match="bibliomset" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="bibliomset/title|bibliomset/citetitle" mode="bibliomixed.mode">
-  <xsl:variable name="relation" select="../@relation"/>
-  <xsl:choose>
-    <xsl:when test="$relation='article' or @pubwork='article'">
-      <xsl:call-template name="gentext.startquote"/>
-      <xsl:apply-templates/>
-      <xsl:call-template name="gentext.endquote"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <i><xsl:apply-templates/></i>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ================================================== -->
-
-<xsl:template match="biblioset" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="citetitle" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:choose>
-      <xsl:when test="@pubwork = 'article'">
-        <xsl:call-template name="gentext.startquote"/>
-        <xsl:call-template name="inline.charseq"/>
-        <xsl:call-template name="gentext.endquote"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="inline.italicseq"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </span>
-</xsl:template>
-
-
-<xsl:template match="collab" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="confgroup" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="contractnum" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="contractsponsor" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="contrib" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="copyright" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="corpcredit" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="corpname" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="date" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="edition" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="editor" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="firstname" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="honorific" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="invpartnumber" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="isbn" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="issn" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="issuenum" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="lineage" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="orgname" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="othername" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="pagenums" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="printhistory" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="productname" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="productnumber" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="publisher" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="publishername" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="pubsnumber" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="bibliomixed.mode">
-  <!-- suppressed; how could this be represented? -->
-</xsl:template>
-
-<xsl:template match="seriesvolnums" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="surname" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="title" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="titleabbrev" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="volumenum" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="bibliocoverage|biblioid|bibliorelation|bibliosource" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/block.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/block.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,432 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-<!-- What should we do about styling blockinfo? -->
-
-<xsl:template match="blockinfo|info">
-  <!-- suppress -->
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="block.object">
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="anchor"/>
-    <xsl:apply-templates/>
-  </div>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="para">
-  <xsl:call-template name="paragraph">
-    <xsl:with-param name="class">
-      <xsl:if test="@role and $para.propagates.style != 0">
-        <xsl:value-of select="@role"/>
-      </xsl:if>
-    </xsl:with-param>
-    <xsl:with-param name="content">
-      <xsl:if test="position() = 1 and parent::listitem">
-        <xsl:call-template name="anchor">
-          <xsl:with-param name="node" select="parent::listitem"/>
-        </xsl:call-template>
-      </xsl:if>
-
-      <xsl:call-template name="anchor"/>
-      <xsl:apply-templates/>
-    </xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="paragraph">
-  <xsl:param name="class" select="''"/>
-  <xsl:param name="content"/>
-
-  <xsl:variable name="p">
-    <p>
-      <xsl:call-template name="dir"/>
-      <xsl:if test="$class != ''">
-        <xsl:apply-templates select="." mode="class.attribute">
-          <xsl:with-param name="class" select="$class"/>
-        </xsl:apply-templates>
-      </xsl:if>
-      <xsl:copy-of select="$content"/>
-    </p>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$html.cleanup != 0">
-      <xsl:call-template name="unwrap.p">
-        <xsl:with-param name="p" select="$p"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:copy-of select="$p"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="simpara">
-  <!-- see also listitem/simpara in lists.xsl -->
-  <p>
-    <xsl:if test="@role and $para.propagates.style != 0">
-      <xsl:apply-templates select="." mode="class.attribute">
-        <xsl:with-param name="class" select="@role"/>
-      </xsl:apply-templates>
-    </xsl:if>
-
-    <xsl:call-template name="anchor"/>
-    <xsl:apply-templates/>
-  </p>
-</xsl:template>
-
-<xsl:template match="formalpara">
-  <xsl:call-template name="paragraph">
-    <xsl:with-param name="class">
-      <xsl:if test="@role and $para.propagates.style != 0">
-        <xsl:value-of select="@role"/>
-      </xsl:if>
-    </xsl:with-param>
-    <xsl:with-param name="content">
-      <xsl:call-template name="anchor"/>
-      <xsl:apply-templates/>
-    </xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<!-- Only use title from info -->
-<xsl:template match="formalpara/info">
-  <xsl:apply-templates select="title"/>
-</xsl:template>
-
-<xsl:template match="formalpara/title|formalpara/info/title">
-  <xsl:variable name="titleStr">
-      <xsl:apply-templates/>
-  </xsl:variable>
-  <xsl:variable name="lastChar">
-    <xsl:if test="$titleStr != ''">
-      <xsl:value-of select="substring($titleStr,string-length($titleStr),1)"/>
-    </xsl:if>
-  </xsl:variable>
-
-  <b>
-    <xsl:copy-of select="$titleStr"/>
-    <xsl:if test="$lastChar != ''                   and not(contains($runinhead.title.end.punct, $lastChar))">
-      <xsl:value-of select="$runinhead.default.title.end.punct"/>
-    </xsl:if>
-    <xsl:text>&#160;</xsl:text>
-  </b>
-</xsl:template>
-
-<xsl:template match="formalpara/para">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="blockquote">
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:if test="@lang or @xml:lang">
-      <xsl:call-template name="language.attribute"/>
-    </xsl:if>
-    <xsl:call-template name="anchor"/>
-
-    <xsl:choose>
-      <xsl:when test="attribution">
-        <table border="0" width="100%" cellspacing="0" cellpadding="0" class="blockquote" summary="Block quote">
-          <tr>
-            <td width="10%" valign="top">&#160;</td>
-            <td width="80%" valign="top">
-              <xsl:apply-templates select="child::*[local-name(.)!='attribution']"/>
-            </td>
-            <td width="10%" valign="top">&#160;</td>
-          </tr>
-          <tr>
-            <td width="10%" valign="top">&#160;</td>
-            <td colspan="2" align="right" valign="top">
-              <xsl:text>--</xsl:text>
-              <xsl:apply-templates select="attribution"/>
-            </td>
-          </tr>
-        </table>
-      </xsl:when>
-      <xsl:otherwise>
-        <blockquote>
-          <xsl:apply-templates select="." mode="class.attribute"/>
-          <xsl:apply-templates/>
-        </blockquote>
-      </xsl:otherwise>
-    </xsl:choose>
-  </div>
-</xsl:template>
-
-<xsl:template match="blockquote/title|blockquote/info/title">
-  <div class="blockquote-title">
-    <p>
-      <b>
-        <xsl:apply-templates/>
-      </b>
-    </p>
-  </div>
-</xsl:template>
-
-<xsl:template match="epigraph">
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-      <xsl:apply-templates select="para|simpara|formalpara|literallayout"/>
-      <xsl:if test="attribution">
-        <div class="attribution">
-          <span>--<xsl:apply-templates select="attribution"/></span>
-        </div>
-      </xsl:if>
-  </div>
-</xsl:template>
-
-<xsl:template match="attribution">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates/>
-  </span>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="abstract|sidebar">
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="anchor"/>
-    <xsl:call-template name="formal.object.heading">
-      <xsl:with-param name="title">
-        <xsl:apply-templates select="." mode="title.markup">
-          <xsl:with-param name="allow-anchors" select="'1'"/>
-        </xsl:apply-templates>
-      </xsl:with-param>
-    </xsl:call-template>
-    <xsl:apply-templates/>
-  </div>
-</xsl:template>
-
-<xsl:template match="abstract/title|sidebar/title">
-</xsl:template>
-
-<xsl:template match="sidebar/sidebarinfo|sidebar/info"/>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="msgset">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="msgentry">
-  <xsl:call-template name="block.object"/>
-</xsl:template>
-
-<xsl:template match="simplemsgentry">
-  <xsl:call-template name="block.object"/>
-</xsl:template>
-
-<xsl:template match="msg">
-  <xsl:call-template name="block.object"/>
-</xsl:template>
-
-<xsl:template match="msgmain">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="msgmain/title">
-  <b><xsl:apply-templates/></b>
-</xsl:template>
-
-<xsl:template match="msgsub">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="msgsub/title">
-  <b><xsl:apply-templates/></b>
-</xsl:template>
-
-<xsl:template match="msgrel">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="msgrel/title">
-  <b><xsl:apply-templates/></b>
-</xsl:template>
-
-<xsl:template match="msgtext">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="msginfo">
-  <xsl:call-template name="block.object"/>
-</xsl:template>
-
-<xsl:template match="msglevel">
-  <p>
-    <b>
-      <xsl:call-template name="gentext.template">
-        <xsl:with-param name="context" select="'msgset'"/>
-        <xsl:with-param name="name" select="'MsgLevel'"/>
-      </xsl:call-template>
-    </b>
-    <xsl:apply-templates/>
-  </p>
-</xsl:template>
-
-<xsl:template match="msgorig">
-  <p>
-    <b>
-      <xsl:call-template name="gentext.template">
-        <xsl:with-param name="context" select="'msgset'"/>
-        <xsl:with-param name="name" select="'MsgOrig'"/>
-      </xsl:call-template>
-    </b>
-    <xsl:apply-templates/>
-  </p>
-</xsl:template>
-
-<xsl:template match="msgaud">
-  <p>
-    <b>
-      <xsl:call-template name="gentext.template">
-        <xsl:with-param name="context" select="'msgset'"/>
-        <xsl:with-param name="name" select="'MsgAud'"/>
-      </xsl:call-template>
-    </b>
-    <xsl:apply-templates/>
-  </p>
-</xsl:template>
-
-<xsl:template match="msgexplan">
-  <xsl:call-template name="block.object"/>
-</xsl:template>
-
-<xsl:template match="msgexplan/title">
-  <p><b><xsl:apply-templates/></b></p>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="revhistory">
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <table border="0" width="100%" summary="Revision history">
-      <tr>
-        <th align="left" valign="top" colspan="3">
-          <b>
-            <xsl:call-template name="gentext">
-              <xsl:with-param name="key" select="'RevHistory'"/>
-            </xsl:call-template>
-          </b>
-        </th>
-      </tr>
-      <xsl:apply-templates/>
-    </table>
-  </div>
-</xsl:template>
-
-<xsl:template match="revhistory/revision">
-  <xsl:variable name="revnumber" select="revnumber"/>
-  <xsl:variable name="revdate" select="date"/>
-  <xsl:variable name="revauthor" select="authorinitials|author"/>
-  <xsl:variable name="revremark" select="revremark|revdescription"/>
-  <tr>
-    <td align="left">
-      <xsl:if test="$revnumber">
-        <xsl:call-template name="gentext">
-          <xsl:with-param name="key" select="'Revision'"/>
-        </xsl:call-template>
-        <xsl:call-template name="gentext.space"/>
-        <xsl:apply-templates select="$revnumber"/>
-      </xsl:if>
-    </td>
-    <td align="left">
-      <xsl:apply-templates select="$revdate"/>
-    </td>
-    <xsl:choose>
-      <xsl:when test="count($revauthor)=0">
-        <td align="left">
-          <xsl:call-template name="dingbat">
-            <xsl:with-param name="dingbat">nbsp</xsl:with-param>
-          </xsl:call-template>
-        </td>
-      </xsl:when>
-      <xsl:otherwise>
-        <td align="left">
-          <xsl:for-each select="$revauthor">
-            <xsl:apply-templates select="."/>
-            <xsl:if test="position() != last()">
-              <xsl:text>, </xsl:text>
-            </xsl:if>
-          </xsl:for-each>
-        </td>
-      </xsl:otherwise>
-    </xsl:choose>
-  </tr>
-  <xsl:if test="$revremark">
-    <tr>
-      <td align="left" colspan="3">
-        <xsl:apply-templates select="$revremark"/>
-      </td>
-    </tr>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="revision/revnumber">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="revision/date">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="revision/authorinitials">
-  <xsl:text>, </xsl:text>
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="revision/authorinitials[1]" priority="2">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="revision/revremark">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="revision/revdescription">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="ackno">
-  <p>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates/>
-  </p>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="highlights">
-  <xsl:call-template name="block.object"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/callout.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/callout.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,188 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:sverb="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.Verbatim" xmlns:xverb="xalan://com.nwalsh.xalan.Verbatim" xmlns:lxslt="http://xml.apache.org/xslt" xmlns="http://www.w3.org/1999/xhtml" exclude-result-prefixes="sverb xverb lxslt" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<lxslt:component prefix="xverb" functions="insertCallouts"/>
-
-<xsl:template match="programlistingco|screenco">
-  <xsl:variable name="verbatim" select="programlisting|screen"/>
-
-  <xsl:choose>
-    <xsl:when test="$use.extensions != '0'                     and $callouts.extension != '0'">
-      <xsl:variable name="rtf">
-        <xsl:apply-templates select="$verbatim">
-          <xsl:with-param name="suppress-numbers" select="'1'"/>
-        </xsl:apply-templates>
-      </xsl:variable>
-
-      <xsl:variable name="rtf-with-callouts">
-        <xsl:choose>
-          <xsl:when test="function-available('sverb:insertCallouts')">
-            <xsl:copy-of select="sverb:insertCallouts(areaspec,$rtf)"/>
-          </xsl:when>
-          <xsl:when test="function-available('xverb:insertCallouts')">
-            <xsl:copy-of select="xverb:insertCallouts(areaspec,$rtf)"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:message terminate="yes">
-              <xsl:text>No insertCallouts function is available.</xsl:text>
-            </xsl:message>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-
-      <xsl:choose>
-        <xsl:when test="$verbatim/@linenumbering = 'numbered'                         and $linenumbering.extension != '0'">
-          <div>
-            <xsl:apply-templates select="." mode="class.attribute"/>
-            <xsl:call-template name="number.rtf.lines">
-              <xsl:with-param name="rtf" select="$rtf-with-callouts"/>
-              <xsl:with-param name="pi.context" select="programlisting|screen"/>
-            </xsl:call-template>
-            <xsl:apply-templates select="calloutlist"/>
-          </div>
-        </xsl:when>
-        <xsl:otherwise>
-          <div>
-            <xsl:apply-templates select="." mode="class.attribute"/>
-            <xsl:copy-of select="$rtf-with-callouts"/>
-            <xsl:apply-templates select="calloutlist"/>
-          </div>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <div>
-        <xsl:apply-templates select="." mode="class.attribute"/>
-        <xsl:apply-templates/>
-      </div>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="areaspec|areaset|area">
-</xsl:template>
-
-<xsl:template match="areaset" mode="conumber">
-  <xsl:number count="area|areaset" format="1"/>
-</xsl:template>
-
-<xsl:template match="area" mode="conumber">
-  <xsl:number count="area|areaset" format="1"/>
-</xsl:template>
-
-<xsl:template match="co" name="co">
-  <!-- Support a single linkend in HTML -->
-  <xsl:variable name="targets" select="key('id', @linkends)"/>
-  <xsl:variable name="target" select="$targets[1]"/>
-  <xsl:choose>
-    <xsl:when test="$target">
-      <a>
-        <xsl:apply-templates select="." mode="class.attribute"/>
-        <xsl:if test="@id or @xml:id">
-          <xsl:attribute name="id">
-            <xsl:value-of select="(@id|@xml:id)[1]"/>
-          </xsl:attribute>
-        </xsl:if>
-        <xsl:attribute name="href">
-          <xsl:call-template name="href.target">
-            <xsl:with-param name="object" select="$target"/>
-          </xsl:call-template>
-        </xsl:attribute>
-        <xsl:apply-templates select="." mode="callout-bug"/>
-      </a>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="anchor"/>
-      <xsl:apply-templates select="." mode="callout-bug"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="coref">
-  <!-- tricky; this relies on the fact that we can process the "co" that's -->
-  <!-- "over there" as if it were "right here" -->
-
-  <xsl:variable name="co" select="key('id', @linkend)"/>
-  <xsl:choose>
-    <xsl:when test="not($co)">
-      <xsl:message>
-        <xsl:text>Error: coref link is broken: </xsl:text>
-        <xsl:value-of select="@linkend"/>
-      </xsl:message>
-    </xsl:when>
-    <xsl:when test="local-name($co) != 'co'">
-      <xsl:message>
-        <xsl:text>Error: coref doesn't point to a co: </xsl:text>
-        <xsl:value-of select="@linkend"/>
-      </xsl:message>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates select="$co"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="co" mode="callout-bug">
-  <xsl:call-template name="callout-bug">
-    <xsl:with-param name="conum">
-      <xsl:number count="co" level="any" from="programlisting|screen|literallayout|synopsis" format="1"/>
-    </xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="callout-bug">
-  <xsl:param name="conum" select="1"/>
-
-  <xsl:choose>
-    <xsl:when test="$callout.graphics != 0                     and $conum &lt;= $callout.graphics.number.limit">
-      <img src="{$callout.graphics.path}{$conum}{$callout.graphics.extension}" alt="{$conum}" border="0"/>
-    </xsl:when>
-    <xsl:when test="$callout.unicode != 0                     and $conum &lt;= $callout.unicode.number.limit">
-      <xsl:choose>
-        <xsl:when test="$callout.unicode.start.character = 10102">
-          <xsl:choose>
-            <xsl:when test="$conum = 1">&#10102;</xsl:when>
-            <xsl:when test="$conum = 2">&#10103;</xsl:when>
-            <xsl:when test="$conum = 3">&#10104;</xsl:when>
-            <xsl:when test="$conum = 4">&#10105;</xsl:when>
-            <xsl:when test="$conum = 5">&#10106;</xsl:when>
-            <xsl:when test="$conum = 6">&#10107;</xsl:when>
-            <xsl:when test="$conum = 7">&#10108;</xsl:when>
-            <xsl:when test="$conum = 8">&#10109;</xsl:when>
-            <xsl:when test="$conum = 9">&#10110;</xsl:when>
-            <xsl:when test="$conum = 10">&#10111;</xsl:when>
-          </xsl:choose>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:message>
-            <xsl:text>Don't know how to generate Unicode callouts </xsl:text>
-            <xsl:text>when $callout.unicode.start.character is </xsl:text>
-            <xsl:value-of select="$callout.unicode.start.character"/>
-          </xsl:message>
-          <xsl:text>(</xsl:text>
-          <xsl:value-of select="$conum"/>
-          <xsl:text>)</xsl:text>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:text>(</xsl:text>
-      <xsl:value-of select="$conum"/>
-      <xsl:text>)</xsl:text>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/changebars.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/changebars.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,72 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-<xsl:import href="docbook.xsl"/>
-
-<xsl:param name="show.revisionflag" select="'1'"/>
-
-<xsl:template name="system.head.content">
-<xsl:param name="node" select="."/>
-
-<style type="text/css">
-<xsl:text>
-div.added    { background-color: #ffff99; 
-               text-decoration: underline; }
-div.deleted  { text-decoration: line-through;
-               background-color: #FF7F7F; }
-div.changed  { background-color: #99ff99; }
-div.off      {  }
-
-span.added   { background-color: #ffff99; 
-               text-decoration: underline; }
-span.deleted { text-decoration: line-through;
-               background-color: #FF7F7F; }
-span.changed { background-color: #99ff99; }
-span.off     {  }
-</xsl:text>
-</style>
-</xsl:template>
-
-<xsl:template match="*[@revisionflag]">
-  <xsl:choose>
-    <xsl:when test="local-name(.) = 'para'                     or local-name(.) = 'simpara'                     or local-name(.) = 'formalpara'                     or local-name(.) = 'section'                     or local-name(.) = 'sect1'                     or local-name(.) = 'sect2'                     or local-name(.) = 'sect3'                     or local-name(.) = 'sect4'                     or local-name(.) = 'sect5'                     or local-name(.) = 'chapter'                     or local-name(.) = 'preface'                     or local-name(.) = 'itemizedlist'                     or local-name(.) = 'varlistentry'                     or local-name(.) = 'glossary'                     or local-name(.) = 'bibliography'                     or local-name(.) = 'index'                     or local-name(.) = 'appendix'">
-      <div class="{@revisionflag}">
-	<xsl:apply-imports/>
-      </div>
-    </xsl:when>
-    <xsl:when test="local-name(.) = 'phrase'                     or local-name(.) = 'ulink'                     or local-name(.) = 'link'                     or local-name(.) = 'filename'                     or local-name(.) = 'literal'                     or local-name(.) = 'member'                     or local-name(.) = 'glossterm'                     or local-name(.) = 'sgmltag'                     or local-name(.) = 'quote'                     or local-name(.) = 'emphasis'                     or local-name(.) = 'command'                     or local-name(.) = 'xref'">
-      <span class="{@revisionflag}">
-	<xsl:apply-imports/>
-      </span>
-    </xsl:when>
-    <xsl:when test="local-name(.) = 'listitem'                     or local-name(.) = 'entry'                     or local-name(.) = 'title'">
-      <!-- nop; these are handled directly in the stylesheet -->
-      <xsl:apply-imports/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:message>
-	<xsl:text>Revisionflag on unexpected element: </xsl:text>
-	<xsl:value-of select="local-name(.)"/>
-	<xsl:text> (Assuming block)</xsl:text>
-      </xsl:message>
-      <div class="{@revisionflag}">
-	<xsl:apply-imports/>
-      </div>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunk-code.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunk-code.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,639 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exsl="http://exslt.org/common" xmlns:cf="http://docbook.sourceforge.net/xmlns/chunkfast/1.0" xmlns:ng="http://docbook.org/docbook-ng" xmlns:db="http://docbook.org/ns/docbook" xmlns="http://www.w3.org/1999/xhtml" exclude-result-prefixes="exsl cf ng db" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-
-<xsl:template match="*" mode="chunk-filename">
-  <!-- returns the filename of a chunk -->
-  <xsl:variable name="ischunk">
-    <xsl:call-template name="chunk"/>
-  </xsl:variable>
-
-  <xsl:variable name="fn">
-    <xsl:apply-templates select="." mode="recursive-chunk-filename"/>
-  </xsl:variable>
-
-  <!--
-  <xsl:message>
-    <xsl:value-of select="$ischunk"/>
-    <xsl:text> (</xsl:text>
-    <xsl:value-of select="local-name(.)"/>
-    <xsl:text>) </xsl:text>
-    <xsl:value-of select="$fn"/>
-    <xsl:text>, </xsl:text>
-    <xsl:call-template name="dbhtml-dir"/>
-  </xsl:message>
-  -->
-
-  <!-- 2003-11-25 by ndw:
-       The following test used to read test="$ischunk != 0 and $fn != ''"
-       I've removed the ischunk part of the test so that href.to.uri and
-       href.from.uri will be fully qualified even if the source or target
-       isn't a chunk. I *think* that if $fn != '' then it's appropriate
-       to put the directory on the front, even if the element isn't a
-       chunk. I could be wrong. -->
-
-  <xsl:if test="$fn != ''">
-    <xsl:call-template name="dbhtml-dir"/>
-  </xsl:if>
-
-  <xsl:value-of select="$fn"/>
-  <!-- You can't add the html.ext here because dbhtml filename= may already -->
-  <!-- have added it. It really does have to be handled in the recursive template -->
-</xsl:template>
-
-<xsl:template match="*" mode="recursive-chunk-filename">
-  <xsl:param name="recursive" select="false()"/>
-
-  <!-- returns the filename of a chunk -->
-  <xsl:variable name="ischunk">
-    <xsl:call-template name="chunk"/>
-  </xsl:variable>
-
-  <xsl:variable name="dbhtml-filename">
-    <xsl:call-template name="pi.dbhtml_filename"/>
-  </xsl:variable>
-
-  <xsl:variable name="filename">
-    <xsl:choose>
-      <xsl:when test="$dbhtml-filename != ''">
-        <xsl:value-of select="$dbhtml-filename"/>
-      </xsl:when>
-      <!-- if this is the root element, use the root.filename -->
-      <xsl:when test="not(parent::*) and $root.filename != ''">
-        <xsl:value-of select="$root.filename"/>
-        <xsl:value-of select="$html.ext"/>
-      </xsl:when>
-      <!-- Special case -->
-      <xsl:when test="self::legalnotice and not($generate.legalnotice.link = 0)">
-        <xsl:choose>
-          <xsl:when test="(@id or @xml:id) and not($use.id.as.filename = 0)">
-            <!-- * if this legalnotice has an ID, then go ahead and use -->
-            <!-- * just the value of that ID as the basename for the file -->
-            <!-- * (that is, without prepending an "ln-" too it) -->
-            <xsl:value-of select="(@id|@xml:id)[1]"/>
-            <xsl:value-of select="$html.ext"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <!-- * otherwise, if this legalnotice does not have an ID, -->
-            <!-- * then we generate an ID... -->
-            <xsl:variable name="id">
-              <xsl:call-template name="object.id"/>
-            </xsl:variable>
-            <!-- * ...and then we take that generated ID, prepend an -->
-            <!-- * "ln-" to it, and use that as the basename for the file -->
-            <xsl:value-of select="concat('ln-',$id,$html.ext)"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-      <!-- if there's no dbhtml filename, and if we're to use IDs as -->
-      <!-- filenames, then use the ID to generate the filename. -->
-      <xsl:when test="(@id or @xml:id) and $use.id.as.filename != 0">
-        <xsl:value-of select="(@id|@xml:id)[1]"/>
-        <xsl:value-of select="$html.ext"/>
-      </xsl:when>
-      <xsl:otherwise/>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$ischunk='0'">
-      <!-- if called on something that isn't a chunk, walk up... -->
-      <xsl:choose>
-        <xsl:when test="count(parent::*)&gt;0">
-          <xsl:apply-templates mode="recursive-chunk-filename" select="parent::*">
-            <xsl:with-param name="recursive" select="$recursive"/>
-          </xsl:apply-templates>
-        </xsl:when>
-        <!-- unless there is no up, in which case return "" -->
-        <xsl:otherwise/>
-      </xsl:choose>
-    </xsl:when>
-
-    <xsl:when test="not($recursive) and $filename != ''">
-      <!-- if this chunk has an explicit name, use it -->
-      <xsl:value-of select="$filename"/>
-    </xsl:when>
-
-    <xsl:when test="self::set">
-      <xsl:value-of select="$root.filename"/>
-      <xsl:if test="not($recursive)">
-        <xsl:value-of select="$html.ext"/>
-      </xsl:if>
-    </xsl:when>
-
-    <xsl:when test="self::book">
-      <xsl:text>bk</xsl:text>
-      <xsl:number level="any" format="01"/>
-      <xsl:if test="not($recursive)">
-        <xsl:value-of select="$html.ext"/>
-      </xsl:if>
-    </xsl:when>
-
-    <xsl:when test="self::article">
-      <xsl:if test="/set">
-        <!-- in a set, make sure we inherit the right book info... -->
-        <xsl:apply-templates mode="recursive-chunk-filename" select="parent::*">
-          <xsl:with-param name="recursive" select="true()"/>
-        </xsl:apply-templates>
-      </xsl:if>
-
-      <xsl:text>ar</xsl:text>
-      <xsl:number level="any" format="01" from="book"/>
-      <xsl:if test="not($recursive)">
-        <xsl:value-of select="$html.ext"/>
-      </xsl:if>
-    </xsl:when>
-
-    <xsl:when test="self::preface">
-      <xsl:if test="/set">
-        <!-- in a set, make sure we inherit the right book info... -->
-        <xsl:apply-templates mode="recursive-chunk-filename" select="parent::*">
-          <xsl:with-param name="recursive" select="true()"/>
-        </xsl:apply-templates>
-      </xsl:if>
-
-      <xsl:text>pr</xsl:text>
-      <xsl:number level="any" format="01" from="book"/>
-      <xsl:if test="not($recursive)">
-        <xsl:value-of select="$html.ext"/>
-      </xsl:if>
-    </xsl:when>
-
-    <xsl:when test="self::chapter">
-      <xsl:if test="/set">
-        <!-- in a set, make sure we inherit the right book info... -->
-        <xsl:apply-templates mode="recursive-chunk-filename" select="parent::*">
-          <xsl:with-param name="recursive" select="true()"/>
-        </xsl:apply-templates>
-      </xsl:if>
-
-      <xsl:text>ch</xsl:text>
-      <xsl:number level="any" format="01" from="book"/>
-      <xsl:if test="not($recursive)">
-        <xsl:value-of select="$html.ext"/>
-      </xsl:if>
-    </xsl:when>
-
-    <xsl:when test="self::appendix">
-      <xsl:if test="/set">
-        <!-- in a set, make sure we inherit the right book info... -->
-        <xsl:apply-templates mode="recursive-chunk-filename" select="parent::*">
-          <xsl:with-param name="recursive" select="true()"/>
-        </xsl:apply-templates>
-      </xsl:if>
-
-      <xsl:text>ap</xsl:text>
-      <xsl:number level="any" format="a" from="book"/>
-      <xsl:if test="not($recursive)">
-        <xsl:value-of select="$html.ext"/>
-      </xsl:if>
-    </xsl:when>
-
-    <xsl:when test="self::part">
-      <xsl:choose>
-        <xsl:when test="/set">
-          <!-- in a set, make sure we inherit the right book info... -->
-          <xsl:apply-templates mode="recursive-chunk-filename" select="parent::*">
-            <xsl:with-param name="recursive" select="true()"/>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-        </xsl:otherwise>
-      </xsl:choose>
-
-      <xsl:text>pt</xsl:text>
-      <xsl:number level="any" format="01" from="book"/>
-      <xsl:if test="not($recursive)">
-        <xsl:value-of select="$html.ext"/>
-      </xsl:if>
-    </xsl:when>
-
-    <xsl:when test="self::reference">
-      <xsl:choose>
-        <xsl:when test="/set">
-          <!-- in a set, make sure we inherit the right book info... -->
-          <xsl:apply-templates mode="recursive-chunk-filename" select="parent::*">
-            <xsl:with-param name="recursive" select="true()"/>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-        </xsl:otherwise>
-      </xsl:choose>
-
-      <xsl:text>rn</xsl:text>
-      <xsl:number level="any" format="01" from="book"/>
-      <xsl:if test="not($recursive)">
-        <xsl:value-of select="$html.ext"/>
-      </xsl:if>
-    </xsl:when>
-
-    <xsl:when test="self::refentry">
-      <xsl:choose>
-        <xsl:when test="parent::reference">
-          <xsl:apply-templates mode="recursive-chunk-filename" select="parent::*">
-            <xsl:with-param name="recursive" select="true()"/>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-        </xsl:otherwise>
-      </xsl:choose>
-
-      <xsl:text>re</xsl:text>
-      <xsl:number level="any" format="01" from="book"/>
-      <xsl:if test="not($recursive)">
-        <xsl:value-of select="$html.ext"/>
-      </xsl:if>
-    </xsl:when>
-
-    <xsl:when test="self::colophon">
-      <xsl:choose>
-        <xsl:when test="/set">
-          <!-- in a set, make sure we inherit the right book info... -->
-          <xsl:apply-templates mode="recursive-chunk-filename" select="parent::*">
-            <xsl:with-param name="recursive" select="true()"/>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-        </xsl:otherwise>
-      </xsl:choose>
-
-      <xsl:text>co</xsl:text>
-      <xsl:number level="any" format="01" from="book"/>
-      <xsl:if test="not($recursive)">
-        <xsl:value-of select="$html.ext"/>
-      </xsl:if>
-    </xsl:when>
-
-    <xsl:when test="self::sect1                     or self::sect2                     or self::sect3                     or self::sect4                     or self::sect5                     or self::section">
-      <xsl:apply-templates mode="recursive-chunk-filename" select="parent::*">
-        <xsl:with-param name="recursive" select="true()"/>
-      </xsl:apply-templates>
-      <xsl:text>s</xsl:text>
-      <xsl:number format="01"/>
-      <xsl:if test="not($recursive)">
-        <xsl:value-of select="$html.ext"/>
-      </xsl:if>
-    </xsl:when>
-
-    <xsl:when test="self::bibliography">
-      <xsl:choose>
-        <xsl:when test="/set">
-          <!-- in a set, make sure we inherit the right book info... -->
-          <xsl:apply-templates mode="recursive-chunk-filename" select="parent::*">
-            <xsl:with-param name="recursive" select="true()"/>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-        </xsl:otherwise>
-      </xsl:choose>
-
-      <xsl:text>bi</xsl:text>
-      <xsl:number level="any" format="01" from="book"/>
-      <xsl:if test="not($recursive)">
-        <xsl:value-of select="$html.ext"/>
-      </xsl:if>
-    </xsl:when>
-
-    <xsl:when test="self::glossary">
-      <xsl:choose>
-        <xsl:when test="/set">
-          <!-- in a set, make sure we inherit the right book info... -->
-          <xsl:apply-templates mode="recursive-chunk-filename" select="parent::*">
-            <xsl:with-param name="recursive" select="true()"/>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-        </xsl:otherwise>
-      </xsl:choose>
-
-      <xsl:text>go</xsl:text>
-      <xsl:number level="any" format="01" from="book"/>
-      <xsl:if test="not($recursive)">
-        <xsl:value-of select="$html.ext"/>
-      </xsl:if>
-    </xsl:when>
-
-    <xsl:when test="self::index">
-      <xsl:choose>
-        <xsl:when test="/set">
-          <!-- in a set, make sure we inherit the right book info... -->
-          <xsl:apply-templates mode="recursive-chunk-filename" select="parent::*">
-            <xsl:with-param name="recursive" select="true()"/>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-        </xsl:otherwise>
-      </xsl:choose>
-
-      <xsl:text>ix</xsl:text>
-      <xsl:number level="any" format="01" from="book"/>
-      <xsl:if test="not($recursive)">
-        <xsl:value-of select="$html.ext"/>
-      </xsl:if>
-    </xsl:when>
-
-    <xsl:when test="self::setindex">
-      <xsl:text>si</xsl:text>
-      <xsl:number level="any" format="01" from="set"/>
-      <xsl:if test="not($recursive)">
-        <xsl:value-of select="$html.ext"/>
-      </xsl:if>
-    </xsl:when>
-
-    <xsl:otherwise>
-      <xsl:text>chunk-filename-error-</xsl:text>
-      <xsl:value-of select="name(.)"/>
-      <xsl:number level="any" format="01" from="set"/>
-      <xsl:if test="not($recursive)">
-        <xsl:value-of select="$html.ext"/>
-      </xsl:if>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-
-
-<xsl:template match="processing-instruction('dbhtml')">
-  <!-- nop -->
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-
-<xsl:template match="*" mode="find.chunks">
-  <xsl:variable name="chunk">
-    <xsl:call-template name="chunk"/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$chunk != 0">
-      <cf:div id="{generate-id()}">
-        <xsl:apply-templates select="." mode="class.attribute"/>
-        <xsl:apply-templates select="*" mode="find.chunks"/>
-      </cf:div>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates select="*" mode="find.chunks"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="/">
-  <!-- * Get a title for current doc so that we let the user -->
-  <!-- * know what document we are processing at this point. -->
-  <xsl:variable name="doc.title">
-    <xsl:call-template name="get.doc.title"/>
-  </xsl:variable>
-  <xsl:choose>
-    <!-- Hack! If someone hands us a DocBook V5.x or DocBook NG document,
-         toss the namespace and continue.  Use the docbook5 namespaced
-	 stylesheets for DocBook5 if you don't want to use this feature.-->
-    <!-- include extra test for Xalan quirk -->
-    <xsl:when test="(function-available('exsl:node-set') or                      contains(system-property('xsl:vendor'),                        'Apache Software Foundation'))                     and (*/self::ng:* or */self::db:*)">
-      <xsl:call-template name="log.message">
-        <xsl:with-param name="level">Note</xsl:with-param>
-        <xsl:with-param name="source" select="$doc.title"/>
-        <xsl:with-param name="context-desc">
-          <xsl:text>namesp. cut</xsl:text>
-        </xsl:with-param>
-        <xsl:with-param name="message">
-          <xsl:text>stripped namespace before processing</xsl:text>
-        </xsl:with-param>
-      </xsl:call-template>
-      <xsl:variable name="nons">
-        <xsl:apply-templates mode="stripNS"/>
-      </xsl:variable>
-      <xsl:call-template name="log.message">
-        <xsl:with-param name="level">Note</xsl:with-param>
-        <xsl:with-param name="source" select="$doc.title"/>
-        <xsl:with-param name="context-desc">
-          <xsl:text>namesp. cut</xsl:text>
-        </xsl:with-param>
-        <xsl:with-param name="message">
-          <xsl:text>processing stripped document</xsl:text>
-        </xsl:with-param>
-      </xsl:call-template>
-      <xsl:apply-templates select="exsl:node-set($nons)"/>
-    </xsl:when>
-    <!-- Can't process unless namespace removed -->
-    <xsl:when test="*/self::ng:* or */self::db:*">
-      <xsl:message terminate="yes">
-        <xsl:text>Unable to strip the namespace from DB5 document,</xsl:text>
-        <xsl:text> cannot proceed.</xsl:text>
-      </xsl:message>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:choose>
-        <xsl:when test="$rootid != ''">
-          <xsl:choose>
-            <xsl:when test="count(key('id',$rootid)) = 0">
-              <xsl:message terminate="yes">
-                <xsl:text>ID '</xsl:text>
-                <xsl:value-of select="$rootid"/>
-                <xsl:text>' not found in document.</xsl:text>
-              </xsl:message>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:if test="$collect.xref.targets = 'yes' or                             $collect.xref.targets = 'only'">
-                <xsl:apply-templates select="key('id', $rootid)" mode="collect.targets"/>
-              </xsl:if>
-              <xsl:if test="$collect.xref.targets != 'only'">
-                <xsl:apply-templates select="key('id',$rootid)" mode="process.root"/>
-                <xsl:if test="$tex.math.in.alt != ''">
-                  <xsl:apply-templates select="key('id',$rootid)" mode="collect.tex.math"/>
-                </xsl:if>
-                <xsl:if test="$generate.manifest != 0">
-                  <xsl:call-template name="generate.manifest">
-                    <xsl:with-param name="node" select="key('id',$rootid)"/>
-                  </xsl:call-template>
-                </xsl:if>
-              </xsl:if>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:if test="$collect.xref.targets = 'yes' or                         $collect.xref.targets = 'only'">
-            <xsl:apply-templates select="/" mode="collect.targets"/>
-          </xsl:if>
-          <xsl:if test="$collect.xref.targets != 'only'">
-            <xsl:apply-templates select="/" mode="process.root"/>
-            <xsl:if test="$tex.math.in.alt != ''">
-              <xsl:apply-templates select="/" mode="collect.tex.math"/>
-            </xsl:if>
-            <xsl:if test="$generate.manifest != 0">
-              <xsl:call-template name="generate.manifest">
-                <xsl:with-param name="node" select="/"/>
-              </xsl:call-template>
-            </xsl:if>
-          </xsl:if>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="*" mode="process.root">
-  <xsl:apply-templates select="."/>
-</xsl:template>
-
-<!-- ====================================================================== -->
-
-<xsl:template match="set|book|part|preface|chapter|appendix                      |article                      |reference|refentry                      |book/glossary|article/glossary|part/glossary                      |book/bibliography|article/bibliography|part/bibliography                      |colophon">
-  <xsl:choose>
-    <xsl:when test="$onechunk != 0 and parent::*">
-      <xsl:apply-imports/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="process-chunk-element"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="sect1|sect2|sect3|sect4|sect5|section">
-  <xsl:variable name="ischunk">
-    <xsl:call-template name="chunk"/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="not(parent::*)">
-      <xsl:call-template name="process-chunk-element"/>
-    </xsl:when>
-    <xsl:when test="$ischunk = 0">
-      <xsl:apply-imports/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="process-chunk-element"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="setindex                      |book/index                      |article/index                      |part/index">
-  <!-- some implementations use completely empty index tags to indicate -->
-  <!-- where an automatically generated index should be inserted. so -->
-  <!-- if the index is completely empty, skip it. -->
-  <xsl:if test="count(*)&gt;0 or $generate.index != '0'">
-    <xsl:call-template name="process-chunk-element"/>
-  </xsl:if>
-</xsl:template>
-
-<!-- Resolve xml:base attributes -->
-<xsl:template match="@fileref">
-  <!-- need a check for absolute urls -->
-  <xsl:choose>
-    <xsl:when test="contains(., ':')">
-      <!-- it has a uri scheme so it is an absolute uri -->
-      <xsl:value-of select="."/>
-    </xsl:when>
-    <xsl:when test="$keep.relative.image.uris != 0">
-      <!-- leave it alone -->
-      <xsl:value-of select="."/>
-    </xsl:when>
-    <xsl:otherwise>
-      <!-- its a relative uri -->
-      <xsl:call-template name="relative-uri">
-        <xsl:with-param name="destdir">
-          <xsl:call-template name="dbhtml-dir">
-            <xsl:with-param name="context" select=".."/>
-          </xsl:call-template>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-<xsl:template match="set|book|part|preface|chapter|appendix                      |article                      |reference|refentry                      |sect1|sect2|sect3|sect4|sect5                      |section                      |book/glossary|article/glossary|part/glossary                      |book/bibliography|article/bibliography|part/bibliography                      |colophon" mode="enumerate-files">
-  <xsl:variable name="ischunk"><xsl:call-template name="chunk"/></xsl:variable>
-  <xsl:if test="$ischunk='1'">
-    <xsl:call-template name="make-relative-filename">
-      <xsl:with-param name="base.dir">
-        <xsl:if test="$manifest.in.base.dir = 0">
-          <xsl:value-of select="$base.dir"/>
-        </xsl:if>
-      </xsl:with-param>
-      <xsl:with-param name="base.name">
-        <xsl:apply-templates mode="chunk-filename" select="."/>
-      </xsl:with-param>
-    </xsl:call-template>
-    <xsl:text>
-</xsl:text>
-  </xsl:if>
-  <xsl:apply-templates select="*" mode="enumerate-files"/>
-</xsl:template>
-
-<xsl:template match="book/index|article/index|part/index" mode="enumerate-files">
-  <xsl:if test="$htmlhelp.output != 1">
-    <xsl:variable name="ischunk"><xsl:call-template name="chunk"/></xsl:variable>
-    <xsl:if test="$ischunk='1'">
-      <xsl:call-template name="make-relative-filename">
-        <xsl:with-param name="base.dir">
-          <xsl:if test="$manifest.in.base.dir = 0">
-            <xsl:value-of select="$base.dir"/>
-          </xsl:if>
-        </xsl:with-param>
-        <xsl:with-param name="base.name">
-          <xsl:apply-templates mode="chunk-filename" select="."/>
-        </xsl:with-param>
-      </xsl:call-template>
-      <xsl:text>
-</xsl:text>
-    </xsl:if>
-    <xsl:apply-templates select="*" mode="enumerate-files"/>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="enumerate-files">
-  <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
-  <xsl:if test="$generate.legalnotice.link != 0">
-    <xsl:call-template name="make-relative-filename">
-      <xsl:with-param name="base.dir">
-        <xsl:if test="$manifest.in.base.dir = 0">
-          <xsl:value-of select="$base.dir"/>
-        </xsl:if>
-      </xsl:with-param>
-      <xsl:with-param name="base.name">
-        <xsl:apply-templates mode="chunk-filename" select="."/>
-      </xsl:with-param>
-    </xsl:call-template>
-    <xsl:text>
-</xsl:text>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="mediaobject[imageobject] | inlinemediaobject[imageobject]" mode="enumerate-files">
-  <xsl:variable name="longdesc.uri">
-    <xsl:call-template name="longdesc.uri">
-      <xsl:with-param name="mediaobject" select="."/>
-    </xsl:call-template>
-  </xsl:variable>
-  <xsl:variable name="mediaobject" select="."/>
-
-  <xsl:if test="$html.longdesc != 0 and $mediaobject/textobject[not(phrase)]">
-    <xsl:call-template name="longdesc.uri">
-      <xsl:with-param name="mediaobject" select="$mediaobject"/>
-    </xsl:call-template>
-    <xsl:text>
-</xsl:text>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="text()" mode="enumerate-files">
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunk-common.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunk-common.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,1545 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exsl="http://exslt.org/common" xmlns:cf="http://docbook.sourceforge.net/xmlns/chunkfast/1.0" xmlns:ng="http://docbook.org/docbook-ng" xmlns:db="http://docbook.org/ns/docbook" xmlns="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl cf ng db">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:param name="onechunk" select="0"/>
-<xsl:param name="refentry.separator" select="0"/>
-<xsl:param name="chunk.fast" select="0"/>
-
-<xsl:key name="genid" match="*" use="generate-id()"/>
-
-<!-- ==================================================================== -->
-
-<xsl:variable name="chunk.hierarchy">
-  <xsl:if test="$chunk.fast != 0">
-    <xsl:choose>
-      <xsl:when test="function-available('exsl:node-set')">
-        <xsl:message>Computing chunks...</xsl:message>
-        <xsl:apply-templates select="/*" mode="find.chunks"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:message>
-          <xsl:text>Fast chunking requires exsl:node-set(). </xsl:text>
-          <xsl:text>Using "slow" chunking.</xsl:text>
-        </xsl:message>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:if>
-</xsl:variable>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="process-chunk-element">
-  <xsl:param name="content">
-    <xsl:apply-imports/>
-  </xsl:param>
-
-  <xsl:choose>
-    <xsl:when test="$chunk.fast != 0 and function-available('exsl:node-set')">
-      <xsl:variable name="chunks" select="exsl:node-set($chunk.hierarchy)//cf:div"/>
-      <xsl:variable name="genid" select="generate-id()"/>
-
-      <xsl:variable name="div" select="$chunks[@id=$genid or @xml:id=$genid]"/>
-
-      <xsl:variable name="prevdiv" select="($div/preceding-sibling::cf:div|$div/preceding::cf:div|$div/parent::cf:div)[last()]"/>
-      <xsl:variable name="prev" select="key('genid', ($prevdiv/@id|$prevdiv/@xml:id)[1])"/>
-
-      <xsl:variable name="nextdiv" select="($div/following-sibling::cf:div|$div/following::cf:div|$div/cf:div)[1]"/>
-      <xsl:variable name="next" select="key('genid', ($nextdiv/@id|$nextdiv/@xml:id)[1])"/>
-
-      <xsl:choose>
-        <xsl:when test="$onechunk != 0 and parent::*">
-          <xsl:copy-of select="$content"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="process-chunk">
-            <xsl:with-param name="prev" select="$prev"/>
-            <xsl:with-param name="next" select="$next"/>
-            <xsl:with-param name="content" select="$content"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:choose>
-        <xsl:when test="$onechunk != 0 and not(parent::*)">
-          <xsl:call-template name="chunk-all-sections">
-            <xsl:with-param name="content" select="$content"/>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:when test="$onechunk != 0">
-          <xsl:copy-of select="$content"/>
-        </xsl:when>
-        <xsl:when test="$chunk.first.sections = 0">
-          <xsl:call-template name="chunk-first-section-with-parent">
-            <xsl:with-param name="content" select="$content"/>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="chunk-all-sections">
-            <xsl:with-param name="content" select="$content"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="process-chunk">
-  <xsl:param name="prev" select="."/>
-  <xsl:param name="next" select="."/>
-  <xsl:param name="content">
-    <xsl:apply-imports/>
-  </xsl:param>
-
-  <xsl:variable name="ischunk">
-    <xsl:call-template name="chunk"/>
-  </xsl:variable>
-
-  <xsl:variable name="chunkfn">
-    <xsl:if test="$ischunk='1'">
-      <xsl:apply-templates mode="chunk-filename" select="."/>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:if test="$ischunk='0'">
-    <xsl:message>
-      <xsl:text>Error </xsl:text>
-      <xsl:value-of select="name(.)"/>
-      <xsl:text> is not a chunk!</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <xsl:variable name="filename">
-    <xsl:call-template name="make-relative-filename">
-      <xsl:with-param name="base.dir" select="$base.dir"/>
-      <xsl:with-param name="base.name" select="$chunkfn"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:call-template name="write.chunk">
-    <xsl:with-param name="filename" select="$filename"/>
-    <xsl:with-param name="content">
-      <xsl:call-template name="chunk-element-content">
-        <xsl:with-param name="prev" select="$prev"/>
-        <xsl:with-param name="next" select="$next"/>
-        <xsl:with-param name="content" select="$content"/>
-      </xsl:call-template>
-    </xsl:with-param>
-    <xsl:with-param name="quiet" select="$chunk.quietly"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="chunk-first-section-with-parent">
-  <xsl:param name="content">
-    <xsl:apply-imports/>
-  </xsl:param>
-
-  <!-- These xpath expressions are really hairy. The trick is to pick sections -->
-  <!-- that are not first children and are not the children of first children -->
-
-  <!-- Break these variables into pieces to work around
-       http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6063 -->
-
-  <xsl:variable name="prev-v1" select="(ancestor::sect1[$chunk.section.depth &gt; 0                                and preceding-sibling::sect1][1]               |ancestor::sect2[$chunk.section.depth &gt; 1                                and preceding-sibling::sect2                                and parent::sect1[preceding-sibling::sect1]][1]               |ancestor::sect3[$chunk.section.depth &gt; 2                                and preceding-sibling::sect3                                and parent::sect2[preceding-sibling::sect2]                                and ancestor::sect1[preceding-sibling::sect1]][1]               |ancestor::sect4[$chunk.section.depth &gt; 3                                and preceding-sibling::sect4                                and parent::sect3[preceding-sibling::sect3]                                and ancestor::sect2[preceding-sibling::sect2]                                and ancestor::sect1[preceding-sibling::sect1]][1]               |ancestor::sect5[$chunk.section.depth &gt; 4                                and preceding-sibling::sect5                                and parent::sect4[preceding-sibling::sect4]                                and ancestor::sect3[preceding-sibling::sect3]                                and ancestor::sect2[preceding-sibling::sect2]                                and ancestor::sect1[preceding-sibling::sect1]][1]               |ancestor::section[$chunk.section.depth &gt; count(ancestor::section)                                 and not(ancestor::section[not(preceding-sibling::section)])][1])[last()]"/>
-
-  <xsl:variable name="prev-v2" select="(preceding::sect1[$chunk.section.depth &gt; 0                                and preceding-sibling::sect1][1]               |preceding::sect2[$chunk.section.depth &gt; 1                                and preceding-sibling::sect2                                and parent::sect1[preceding-sibling::sect1]][1]               |preceding::sect3[$chunk.section.depth &gt; 2                                and preceding-sibling::sect3                                and parent::sect2[preceding-sibling::sect2]                                and ancestor::sect1[preceding-sibling::sect1]][1]               |preceding::sect4[$chunk.section.depth &gt; 3                                and preceding-sibling::sect4                                and parent::sect3[preceding-sibling::sect3]                                and ancestor::sect2[preceding-sibling::sect2]                                and ancestor::sect1[preceding-sibling::sect1]][1]               |preceding::sect5[$chunk.section.depth &gt; 4                                and preceding-sibling::sect5                                and parent::sect4[preceding-sibling::sect4]                                and ancestor::sect3[preceding-sibling::sect3]                                and ancestor::sect2[preceding-sibling::sect2]                                and ancestor::sect1[preceding-sibling::sect1]][1]               |preceding::section[$chunk.section.depth &gt; count(ancestor::section)                                  and preceding-sibling::section                                  and not(ancestor::section[not(preceding-sibling::section)])][1])[last()]"/>
-
-  <xsl:variable name="prev" select="(preceding::book[1]              |preceding::preface[1]              |preceding::chapter[1]              |preceding::appendix[1]              |preceding::part[1]              |preceding::reference[1]              |preceding::refentry[1]              |preceding::colophon[1]              |preceding::article[1]              |preceding::bibliography[parent::article or parent::book or parent::part][1]              |preceding::glossary[parent::article or parent::book or parent::part][1]              |preceding::index[$generate.index != 0]                                [parent::article or parent::book or parent::part][1]              |preceding::setindex[$generate.index != 0][1]              |ancestor::set              |ancestor::book[1]              |ancestor::preface[1]              |ancestor::chapter[1]              |ancestor::appendix[1]              |ancestor::part[1]              |ancestor::reference[1]              |ancestor::article[1]              |$prev-v1              |$prev-v2)[last()]"/>
-
-  <xsl:variable name="next-v1" select="(following::sect1[$chunk.section.depth &gt; 0                                and preceding-sibling::sect1][1]               |following::sect2[$chunk.section.depth &gt; 1                                and preceding-sibling::sect2                                and parent::sect1[preceding-sibling::sect1]][1]               |following::sect3[$chunk.section.depth &gt; 2                                and preceding-sibling::sect3                                and parent::sect2[preceding-sibling::sect2]                                and ancestor::sect1[preceding-sibling::sect1]][1]               |following::sect4[$chunk.section.depth &gt; 3                                and preceding-sibling::sect4                                and parent::sect3[preceding-sibling::sect3]                                and ancestor::sect2[preceding-sibling::sect2]                                and ancestor::sect1[preceding-sibling::sect1]][1]               |following::sect5[$chunk.section.depth &gt; 4                                and preceding-sibling::sect5                                and parent::sect4[preceding-sibling::sect4]                                and ancestor::sect3[preceding-sibling::sect3]                                and ancestor::sect2[preceding-sibling::sect2]                                and ancestor::sect1[preceding-sibling::sect1]][1]               |following::section[$chunk.section.depth &gt; count(ancestor::section)                                  and preceding-sibling::section                                  and not(ancestor::section[not(preceding-sibling::section)])][1])[1]"/>
-
-  <xsl:variable name="next-v2" select="(descendant::sect1[$chunk.section.depth &gt; 0                                and preceding-sibling::sect1][1]               |descendant::sect2[$chunk.section.depth &gt; 1                                and preceding-sibling::sect2                                and parent::sect1[preceding-sibling::sect1]][1]               |descendant::sect3[$chunk.section.depth &gt; 2                                and preceding-sibling::sect3                                and parent::sect2[preceding-sibling::sect2]                                and ancestor::sect1[preceding-sibling::sect1]][1]               |descendant::sect4[$chunk.section.depth &gt; 3                                and preceding-sibling::sect4                                and parent::sect3[preceding-sibling::sect3]                                and ancestor::sect2[preceding-sibling::sect2]                                and ancestor::sect1[preceding-sibling::sect1]][1]               |descendant::sect5[$chunk.section.depth &gt; 4                                and preceding-sibling::sect5                                and parent::sect4[preceding-sibling::sect4]                                and ancestor::sect3[preceding-sibling::sect3]                                and ancestor::sect2[preceding-sibling::sect2]                                and ancestor::sect1[preceding-sibling::sect1]][1]               |descendant::section[$chunk.section.depth &gt; count(ancestor::section)                                  and preceding-sibling::section                                  and not(ancestor::section[not(preceding-sibling::section)])])[1]"/>
-
-  <xsl:variable name="next" select="(following::book[1]              |following::preface[1]              |following::chapter[1]              |following::appendix[1]              |following::part[1]              |following::reference[1]              |following::refentry[1]              |following::colophon[1]              |following::bibliography[parent::article or parent::book or parent::part][1]              |following::glossary[parent::article or parent::book or parent::part][1]              |following::index[$generate.index != 0]                                [parent::article or parent::book or parent::part][1]              |following::article[1]              |following::setindex[$generate.index != 0][1]              |descendant::book[1]              |descendant::preface[1]              |descendant::chapter[1]              |descendant::appendix[1]              |descendant::article[1]              |descendant::bibliography[parent::article or parent::book or parent::part][1]              |descendant::glossary[parent::article or parent::book or parent::part][1]              |descendant::index[$generate.index != 0]                                [parent::article or parent::book or parent::part][1]              |descendant::colophon[1]              |descendant::setindex[$generate.index != 0][1]              |descendant::part[1]              |descendant::reference[1]              |descendant::refentry[1]              |$next-v1              |$next-v2)[1]"/>
-
-  <xsl:call-template name="process-chunk">
-    <xsl:with-param name="prev" select="$prev"/>
-    <xsl:with-param name="next" select="$next"/>
-    <xsl:with-param name="content" select="$content"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="chunk-all-sections">
-  <xsl:param name="content">
-    <xsl:apply-imports/>
-  </xsl:param>
-
-  <xsl:variable name="prev-v1" select="(preceding::sect1[$chunk.section.depth &gt; 0][1]              |preceding::sect2[$chunk.section.depth &gt; 1][1]              |preceding::sect3[$chunk.section.depth &gt; 2][1]              |preceding::sect4[$chunk.section.depth &gt; 3][1]              |preceding::sect5[$chunk.section.depth &gt; 4][1]              |preceding::section[$chunk.section.depth &gt; count(ancestor::section)][1])[last()]"/>
-
-  <xsl:variable name="prev-v2" select="(ancestor::sect1[$chunk.section.depth &gt; 0][1]              |ancestor::sect2[$chunk.section.depth &gt; 1][1]              |ancestor::sect3[$chunk.section.depth &gt; 2][1]              |ancestor::sect4[$chunk.section.depth &gt; 3][1]              |ancestor::sect5[$chunk.section.depth &gt; 4][1]              |ancestor::section[$chunk.section.depth &gt; count(ancestor::section)][1])[last()]"/>
-
-  <xsl:variable name="prev" select="(preceding::book[1]              |preceding::preface[1]              |preceding::chapter[1]              |preceding::appendix[1]              |preceding::part[1]              |preceding::reference[1]              |preceding::refentry[1]              |preceding::colophon[1]              |preceding::article[1]              |preceding::bibliography[parent::article or parent::book or parent::part][1]              |preceding::glossary[parent::article or parent::book or parent::part][1]              |preceding::index[$generate.index != 0]                                [parent::article or parent::book or parent::part][1]              |preceding::setindex[$generate.index != 0][1]              |ancestor::set              |ancestor::book[1]              |ancestor::preface[1]              |ancestor::chapter[1]              |ancestor::appendix[1]              |ancestor::part[1]              |ancestor::reference[1]              |ancestor::article[1]              |$prev-v1              |$prev-v2)[last()]"/>
-
-  <xsl:variable name="next-v1" select="(following::sect1[$chunk.section.depth &gt; 0][1]              |following::sect2[$chunk.section.depth &gt; 1][1]              |following::sect3[$chunk.section.depth &gt; 2][1]              |following::sect4[$chunk.section.depth &gt; 3][1]              |following::sect5[$chunk.section.depth &gt; 4][1]              |following::section[$chunk.section.depth &gt; count(ancestor::section)][1])[1]"/>
-
-  <xsl:variable name="next-v2" select="(descendant::sect1[$chunk.section.depth &gt; 0][1]              |descendant::sect2[$chunk.section.depth &gt; 1][1]              |descendant::sect3[$chunk.section.depth &gt; 2][1]              |descendant::sect4[$chunk.section.depth &gt; 3][1]              |descendant::sect5[$chunk.section.depth &gt; 4][1]              |descendant::section[$chunk.section.depth                                    &gt; count(ancestor::section)][1])[1]"/>
-
-  <xsl:variable name="next" select="(following::book[1]              |following::preface[1]              |following::chapter[1]              |following::appendix[1]              |following::part[1]              |following::reference[1]              |following::refentry[1]              |following::colophon[1]              |following::bibliography[parent::article or parent::book or parent::part][1]              |following::glossary[parent::article or parent::book or parent::part][1]              |following::index[$generate.index != 0]                                [parent::article or parent::book][1]              |following::article[1]              |following::setindex[$generate.index != 0][1]              |descendant::book[1]              |descendant::preface[1]              |descendant::chapter[1]              |descendant::appendix[1]              |descendant::article[1]              |descendant::bibliography[parent::article or parent::book][1]              |descendant::glossary[parent::article or parent::book or parent::part][1]              |descendant::index[$generate.index != 0]                                [parent::article or parent::book][1]              |descendant::colophon[1]              |descendant::setindex[$generate.index != 0][1]              |descendant::part[1]              |descendant::reference[1]              |descendant::refentry[1]              |$next-v1              |$next-v2)[1]"/>
-
-  <xsl:call-template name="process-chunk">
-    <xsl:with-param name="prev" select="$prev"/>
-    <xsl:with-param name="next" select="$next"/>
-    <xsl:with-param name="content" select="$content"/>
-  </xsl:call-template>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<!-- ==================================================================== -->
-
-<xsl:template name="make.lots">
-  <xsl:param name="toc.params" select="''"/>
-  <xsl:param name="toc"/>
-
-  <xsl:variable name="lots">
-    <xsl:if test="contains($toc.params, 'toc')">
-      <xsl:copy-of select="$toc"/>
-    </xsl:if>
-
-    <xsl:if test="contains($toc.params, 'figure')">
-      <xsl:choose>
-        <xsl:when test="$chunk.separate.lots != '0'">
-          <xsl:call-template name="make.lot.chunk">
-            <xsl:with-param name="type" select="'figure'"/>
-            <xsl:with-param name="lot">
-              <xsl:call-template name="list.of.titles">
-                <xsl:with-param name="titles" select="'figure'"/>
-                <xsl:with-param name="nodes" select=".//figure"/>
-              </xsl:call-template>
-            </xsl:with-param>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="list.of.titles">
-            <xsl:with-param name="titles" select="'figure'"/>
-            <xsl:with-param name="nodes" select=".//figure"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:if>
-
-    <xsl:if test="contains($toc.params, 'table')">
-      <xsl:choose>
-        <xsl:when test="$chunk.separate.lots != '0'">
-          <xsl:call-template name="make.lot.chunk">
-            <xsl:with-param name="type" select="'table'"/>
-            <xsl:with-param name="lot">
-              <xsl:call-template name="list.of.titles">
-                <xsl:with-param name="titles" select="'table'"/>
-                <xsl:with-param name="nodes" select=".//table"/>
-              </xsl:call-template>
-            </xsl:with-param>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="list.of.titles">
-            <xsl:with-param name="titles" select="'table'"/>
-            <xsl:with-param name="nodes" select=".//table"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:if>
-
-    <xsl:if test="contains($toc.params, 'example')">
-      <xsl:choose>
-        <xsl:when test="$chunk.separate.lots != '0'">
-          <xsl:call-template name="make.lot.chunk">
-            <xsl:with-param name="type" select="'example'"/>
-            <xsl:with-param name="lot">
-              <xsl:call-template name="list.of.titles">
-                <xsl:with-param name="titles" select="'example'"/>
-                <xsl:with-param name="nodes" select=".//example"/>
-              </xsl:call-template>
-            </xsl:with-param>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="list.of.titles">
-            <xsl:with-param name="titles" select="'example'"/>
-            <xsl:with-param name="nodes" select=".//example"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:if>
-
-    <xsl:if test="contains($toc.params, 'equation')">
-      <xsl:choose>
-        <xsl:when test="$chunk.separate.lots != '0'">
-          <xsl:call-template name="make.lot.chunk">
-            <xsl:with-param name="type" select="'equation'"/>
-            <xsl:with-param name="lot">
-              <xsl:call-template name="list.of.titles">
-                <xsl:with-param name="titles" select="'equation'"/>
-                <xsl:with-param name="nodes" select=".//equation"/>
-              </xsl:call-template>
-            </xsl:with-param>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="list.of.titles">
-            <xsl:with-param name="titles" select="'equation'"/>
-            <xsl:with-param name="nodes" select=".//equation"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:if>
-
-    <xsl:if test="contains($toc.params, 'procedure')">
-      <xsl:choose>
-        <xsl:when test="$chunk.separate.lots != '0'">
-          <xsl:call-template name="make.lot.chunk">
-            <xsl:with-param name="type" select="'procedure'"/>
-            <xsl:with-param name="lot">
-              <xsl:call-template name="list.of.titles">
-                <xsl:with-param name="titles" select="'procedure'"/>
-                <xsl:with-param name="nodes" select=".//procedure[title]"/>
-              </xsl:call-template>
-            </xsl:with-param>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="list.of.titles">
-            <xsl:with-param name="titles" select="'procedure'"/>
-            <xsl:with-param name="nodes" select=".//procedure[title]"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:if test="string($lots) != ''">
-    <xsl:choose>
-      <xsl:when test="$chunk.tocs.and.lots != 0 and not(parent::*)">
-        <xsl:call-template name="write.chunk">
-          <xsl:with-param name="filename">
-            <xsl:call-template name="make-relative-filename">
-              <xsl:with-param name="base.dir" select="$base.dir"/>
-              <xsl:with-param name="base.name">
-                <xsl:call-template name="dbhtml-dir"/>
-                <xsl:apply-templates select="." mode="recursive-chunk-filename">
-                  <xsl:with-param name="recursive" select="true()"/>
-                </xsl:apply-templates>
-                <xsl:text>-toc</xsl:text>
-                <xsl:value-of select="$html.ext"/>
-              </xsl:with-param>
-            </xsl:call-template>
-          </xsl:with-param>
-          <xsl:with-param name="content">
-            <xsl:call-template name="chunk-element-content">
-              <xsl:with-param name="prev" select="/foo"/>
-              <xsl:with-param name="next" select="/foo"/>
-              <xsl:with-param name="nav.context" select="'toc'"/>
-              <xsl:with-param name="content">
-                <xsl:if test="$chunk.tocs.and.lots.has.title != 0">
-                  <h1>
-                    <xsl:apply-templates select="." mode="object.title.markup"/>
-                  </h1>
-                </xsl:if>
-                <xsl:copy-of select="$lots"/>
-              </xsl:with-param>
-            </xsl:call-template>
-          </xsl:with-param>
-          <xsl:with-param name="quiet" select="$chunk.quietly"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:copy-of select="$lots"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="make.lot.chunk">
-  <xsl:param name="type" select="''"/>
-  <xsl:param name="lot"/>
-
-  <xsl:if test="string($lot) != ''">
-    <xsl:variable name="filename">
-      <xsl:call-template name="make-relative-filename">
-        <xsl:with-param name="base.dir" select="$base.dir"/>
-        <xsl:with-param name="base.name">
-          <xsl:call-template name="dbhtml-dir"/>
-          <xsl:value-of select="$type"/>
-          <xsl:text>-toc</xsl:text>
-          <xsl:value-of select="$html.ext"/>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <xsl:variable name="href">
-      <xsl:call-template name="make-relative-filename">
-        <xsl:with-param name="base.name">
-          <xsl:call-template name="dbhtml-dir"/>
-          <xsl:value-of select="$type"/>
-          <xsl:text>-toc</xsl:text>
-          <xsl:value-of select="$html.ext"/>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <xsl:call-template name="write.chunk">
-      <xsl:with-param name="filename" select="$filename"/>
-      <xsl:with-param name="content">
-        <xsl:call-template name="chunk-element-content">
-          <xsl:with-param name="prev" select="/foo"/>
-          <xsl:with-param name="next" select="/foo"/>
-          <xsl:with-param name="nav.context" select="'toc'"/>
-          <xsl:with-param name="content">
-            <xsl:copy-of select="$lot"/>
-          </xsl:with-param>
-        </xsl:call-template>
-      </xsl:with-param>
-      <xsl:with-param name="quiet" select="$chunk.quietly"/>
-    </xsl:call-template>
-    <!-- And output a link to this file -->
-    <div>
-      <xsl:attribute name="class">
-        <xsl:text>ListofTitles</xsl:text>
-      </xsl:attribute>
-      <a href="{$href}">
-        <xsl:call-template name="gentext">
-          <xsl:with-param name="key">
-            <xsl:choose>
-              <xsl:when test="$type='table'">ListofTables</xsl:when>
-              <xsl:when test="$type='figure'">ListofFigures</xsl:when>
-              <xsl:when test="$type='equation'">ListofEquations</xsl:when>
-              <xsl:when test="$type='example'">ListofExamples</xsl:when>
-              <xsl:when test="$type='procedure'">ListofProcedures</xsl:when>
-              <xsl:otherwise>ListofUnknown</xsl:otherwise>
-            </xsl:choose>
-          </xsl:with-param>
-        </xsl:call-template>
-      </a>
-    </div>
-  </xsl:if>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="in.other.chunk">
-  <xsl:param name="chunk" select="."/>
-  <xsl:param name="node" select="."/>
-
-  <xsl:variable name="is.chunk">
-    <xsl:call-template name="chunk">
-      <xsl:with-param name="node" select="$node"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-<!--
-  <xsl:message>
-    <xsl:text>in.other.chunk: </xsl:text>
-    <xsl:value-of select="name($chunk)"/>
-    <xsl:text> </xsl:text>
-    <xsl:value-of select="name($node)"/>
-    <xsl:text> </xsl:text>
-    <xsl:value-of select="$chunk = $node"/>
-    <xsl:text> </xsl:text>
-    <xsl:value-of select="$is.chunk"/>
-  </xsl:message>
--->
-
-  <xsl:choose>
-    <xsl:when test="$chunk = $node">0</xsl:when>
-    <xsl:when test="$is.chunk = 1">1</xsl:when>
-    <xsl:when test="count($node) = 0">0</xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="in.other.chunk">
-        <xsl:with-param name="chunk" select="$chunk"/>
-        <xsl:with-param name="node" select="$node/parent::*"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="count.footnotes.in.this.chunk">
-  <xsl:param name="node" select="."/>
-  <xsl:param name="footnotes" select="$node//footnote"/>
-  <xsl:param name="count" select="0"/>
-
-<!--
-  <xsl:message>
-    <xsl:text>count.footnotes.in.this.chunk: </xsl:text>
-    <xsl:value-of select="name($node)"/>
-  </xsl:message>
--->
-
-  <xsl:variable name="in.other.chunk">
-    <xsl:call-template name="in.other.chunk">
-      <xsl:with-param name="chunk" select="$node"/>
-      <xsl:with-param name="node" select="$footnotes[1]"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="count($footnotes) = 0">
-      <xsl:value-of select="$count"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:choose>
-        <xsl:when test="$in.other.chunk != 0">
-          <xsl:call-template name="count.footnotes.in.this.chunk">
-            <xsl:with-param name="node" select="$node"/>
-            <xsl:with-param name="footnotes" select="$footnotes[position() &gt; 1]"/>
-            <xsl:with-param name="count" select="$count"/>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:when test="$footnotes[1]/ancestor::table                         |$footnotes[1]/ancestor::informaltable">
-          <xsl:call-template name="count.footnotes.in.this.chunk">
-            <xsl:with-param name="node" select="$node"/>
-            <xsl:with-param name="footnotes" select="$footnotes[position() &gt; 1]"/>
-            <xsl:with-param name="count" select="$count"/>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="count.footnotes.in.this.chunk">
-            <xsl:with-param name="node" select="$node"/>
-            <xsl:with-param name="footnotes" select="$footnotes[position() &gt; 1]"/>
-            <xsl:with-param name="count" select="$count + 1"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="process.footnotes.in.this.chunk">
-  <xsl:param name="node" select="."/>
-  <xsl:param name="footnotes" select="$node//footnote"/>
-
-<!--
-  <xsl:message>process.footnotes.in.this.chunk</xsl:message>
--->
-
-  <xsl:variable name="in.other.chunk">
-    <xsl:call-template name="in.other.chunk">
-      <xsl:with-param name="chunk" select="$node"/>
-      <xsl:with-param name="node" select="$footnotes[1]"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="count($footnotes) = 0">
-      <!-- nop -->
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:choose>
-        <xsl:when test="$in.other.chunk != 0">
-          <xsl:call-template name="process.footnotes.in.this.chunk">
-            <xsl:with-param name="node" select="$node"/>
-            <xsl:with-param name="footnotes" select="$footnotes[position() &gt; 1]"/>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:when test="$footnotes[1]/ancestor::table                         |$footnotes[1]/ancestor::informaltable">
-          <xsl:call-template name="process.footnotes.in.this.chunk">
-            <xsl:with-param name="node" select="$node"/>
-            <xsl:with-param name="footnotes" select="$footnotes[position() &gt; 1]"/>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates select="$footnotes[1]" mode="process.footnote.mode"/>
-          <xsl:call-template name="process.footnotes.in.this.chunk">
-            <xsl:with-param name="node" select="$node"/>
-            <xsl:with-param name="footnotes" select="$footnotes[position() &gt; 1]"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="process.footnotes">
-  <xsl:variable name="footnotes" select=".//footnote"/>
-  <xsl:variable name="fcount">
-    <xsl:call-template name="count.footnotes.in.this.chunk">
-      <xsl:with-param name="node" select="."/>
-      <xsl:with-param name="footnotes" select="$footnotes"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-<!--
-  <xsl:message>
-    <xsl:value-of select="name(.)"/>
-    <xsl:text> fcount: </xsl:text>
-    <xsl:value-of select="$fcount"/>
-  </xsl:message>
--->
-
-  <!-- Only bother to do this if there's at least one non-table footnote -->
-  <xsl:if test="$fcount &gt; 0">
-    <div class="footnotes">
-      <br/>
-      <hr width="100" align="left"/>
-      <xsl:call-template name="process.footnotes.in.this.chunk">
-        <xsl:with-param name="node" select="."/>
-        <xsl:with-param name="footnotes" select="$footnotes"/>
-      </xsl:call-template>
-    </div>
-  </xsl:if>
-
-  <!-- FIXME: When chunking, only the annotations actually used
-              in this chunk should be referenced. I don't think it
-              does any harm to reference them all, but it adds
-              unnecessary bloat to each chunk. -->
-  <xsl:if test="$annotation.support != 0 and //annotation">
-    <div class="annotation-list">
-      <div class="annotation-nocss">
-        <p>The following annotations are from this essay. You are seeing
-        them here because your browser doesn&#8217;t support the user-interface
-        techniques used to make them appear as &#8216;popups&#8217; on modern browsers.</p>
-      </div>
-
-      <xsl:apply-templates select="//annotation" mode="annotation-popup"/>
-    </div>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="process.chunk.footnotes">
-  <xsl:variable name="is.chunk">
-    <xsl:call-template name="chunk"/>
-  </xsl:variable>
-  <xsl:if test="$is.chunk = 1">
-    <xsl:call-template name="process.footnotes"/>
-  </xsl:if>
-</xsl:template>
-
-<!-- ====================================================================== -->
-
-<xsl:template name="chunk">
-  <xsl:param name="node" select="."/>
-  <!-- returns 1 if $node is a chunk -->
-
-  <!-- ==================================================================== -->
-  <!-- What's a chunk?
-
-       The root element
-       appendix
-       article
-       bibliography  in article or part or book
-       book
-       chapter
-       colophon
-       glossary      in article or part or book
-       index         in article or part or book
-       part
-       preface
-       refentry
-       reference
-       sect{1,2,3,4,5}  if position()>1 && depth < chunk.section.depth
-       section          if position()>1 && depth < chunk.section.depth
-       set
-       setindex
-                                                                            -->
-  <!-- ==================================================================== -->
-
-<!--
-  <xsl:message>
-    <xsl:text>chunk: </xsl:text>
-    <xsl:value-of select="name($node)"/>
-    <xsl:text>(</xsl:text>
-    <xsl:value-of select="$node/@id"/>
-    <xsl:text>)</xsl:text>
-    <xsl:text> csd: </xsl:text>
-    <xsl:value-of select="$chunk.section.depth"/>
-    <xsl:text> cfs: </xsl:text>
-    <xsl:value-of select="$chunk.first.sections"/>
-    <xsl:text> ps: </xsl:text>
-    <xsl:value-of select="count($node/parent::section)"/>
-    <xsl:text> prs: </xsl:text>
-    <xsl:value-of select="count($node/preceding-sibling::section)"/>
-  </xsl:message>
--->
-
-  <xsl:choose>
-    <xsl:when test="not($node/parent::*)">1</xsl:when>
-
-    <xsl:when test="local-name($node) = 'sect1'                     and $chunk.section.depth &gt;= 1                     and ($chunk.first.sections != 0                          or count($node/preceding-sibling::sect1) &gt; 0)">
-      <xsl:text>1</xsl:text>
-    </xsl:when>
-    <xsl:when test="local-name($node) = 'sect2'                     and $chunk.section.depth &gt;= 2                     and ($chunk.first.sections != 0                          or count($node/preceding-sibling::sect2) &gt; 0)">
-      <xsl:call-template name="chunk">
-        <xsl:with-param name="node" select="$node/parent::*"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="local-name($node) = 'sect3'                     and $chunk.section.depth &gt;= 3                     and ($chunk.first.sections != 0                          or count($node/preceding-sibling::sect3) &gt; 0)">
-      <xsl:call-template name="chunk">
-        <xsl:with-param name="node" select="$node/parent::*"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="local-name($node) = 'sect4'                     and $chunk.section.depth &gt;= 4                     and ($chunk.first.sections != 0                          or count($node/preceding-sibling::sect4) &gt; 0)">
-      <xsl:call-template name="chunk">
-        <xsl:with-param name="node" select="$node/parent::*"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="local-name($node) = 'sect5'                     and $chunk.section.depth &gt;= 5                     and ($chunk.first.sections != 0                          or count($node/preceding-sibling::sect5) &gt; 0)">
-      <xsl:call-template name="chunk">
-        <xsl:with-param name="node" select="$node/parent::*"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="local-name($node) = 'section'                     and $chunk.section.depth &gt;= count($node/ancestor::section)+1                     and ($chunk.first.sections != 0                          or count($node/preceding-sibling::section) &gt; 0)">
-      <xsl:call-template name="chunk">
-        <xsl:with-param name="node" select="$node/parent::*"/>
-      </xsl:call-template>
-    </xsl:when>
-
-    <xsl:when test="local-name($node)='preface'">1</xsl:when>
-    <xsl:when test="local-name($node)='chapter'">1</xsl:when>
-    <xsl:when test="local-name($node)='appendix'">1</xsl:when>
-    <xsl:when test="local-name($node)='article'">1</xsl:when>
-    <xsl:when test="local-name($node)='part'">1</xsl:when>
-    <xsl:when test="local-name($node)='reference'">1</xsl:when>
-    <xsl:when test="local-name($node)='refentry'">1</xsl:when>
-    <xsl:when test="local-name($node)='index' and ($generate.index != 0 or count($node/*) &gt; 0)                     and (local-name($node/parent::*) = 'article'                     or local-name($node/parent::*) = 'book'                     or local-name($node/parent::*) = 'part'                     )">1</xsl:when>
-    <xsl:when test="local-name($node)='bibliography'                     and (local-name($node/parent::*) = 'article'                     or local-name($node/parent::*) = 'book'                     or local-name($node/parent::*) = 'part'                     )">1</xsl:when>
-    <xsl:when test="local-name($node)='glossary'                     and (local-name($node/parent::*) = 'article'                     or local-name($node/parent::*) = 'book'                     or local-name($node/parent::*) = 'part'                     )">1</xsl:when>
-    <xsl:when test="local-name($node)='colophon'">1</xsl:when>
-    <xsl:when test="local-name($node)='book'">1</xsl:when>
-    <xsl:when test="local-name($node)='set'">1</xsl:when>
-    <xsl:when test="local-name($node)='setindex'">1</xsl:when>
-    <xsl:when test="local-name($node)='legalnotice'                     and $generate.legalnotice.link != 0">1</xsl:when>
-    <xsl:otherwise>0</xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-<xsl:template name="href.target.uri">
-  <xsl:param name="object" select="."/>
-  <xsl:variable name="ischunk">
-    <xsl:call-template name="chunk">
-      <xsl:with-param name="node" select="$object"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:apply-templates mode="chunk-filename" select="$object"/>
-
-  <xsl:if test="$ischunk='0'">
-    <xsl:text>#</xsl:text>
-    <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="$object"/>
-    </xsl:call-template>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="href.target">
-  <xsl:param name="context" select="."/>
-  <xsl:param name="object" select="."/>
-  <xsl:param name="toc-context" select="."/>
-  <!-- * If $toc-context contains some node other than the current node, -->
-  <!-- * it means we're processing a link in a TOC. In that case, to -->
-  <!-- * ensure the link will work correctly, we need to take a look at -->
-  <!-- * where the file containing the TOC will get written, and where -->
-  <!-- * the file that's being linked to will get written. -->
-  <xsl:variable name="toc-output-dir">
-    <xsl:if test="not($toc-context = .)">
-      <!-- * Get the $toc-context node and all its ancestors, look down -->
-      <!-- * through them to find the last/closest node to the -->
-      <!-- * toc-context node that has a "dbhtml dir" PI, and get the -->
-      <!-- * directory name from that. That's the name of the directory -->
-      <!-- * to which the current toc output file will get written. -->
-      <xsl:call-template name="dbhtml-dir">
-        <xsl:with-param name="context" select="$toc-context/ancestor-or-self::*[processing-instruction('dbhtml')[contains(.,'dir')]][last()]"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:variable>
-  <xsl:variable name="linked-file-output-dir">
-    <xsl:if test="not($toc-context = .)">
-      <!-- * Get the current node and all its ancestors, look down -->
-      <!-- * through them to find the last/closest node to the current -->
-      <!-- * node that has a "dbhtml dir" PI, and get the directory name -->
-      <!-- * from that.  That's the name of the directory to which the -->
-      <!-- * file that's being linked to will get written. -->
-      <xsl:call-template name="dbhtml-dir">
-        <xsl:with-param name="context" select="ancestor-or-self::*[processing-instruction('dbhtml')[contains(.,'dir')]][last()]"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:variable>
-  <xsl:variable name="href.to.uri">
-    <xsl:call-template name="href.target.uri">
-      <xsl:with-param name="object" select="$object"/>
-    </xsl:call-template>
-  </xsl:variable>
-  <xsl:variable name="href.from.uri">
-    <xsl:call-template name="href.target.uri">
-      <xsl:with-param name="object" select="$context"/>
-    </xsl:call-template>
-  </xsl:variable>
-  <!-- * <xsl:message>toc-context: <xsl:value-of select="local-name($toc-context)"/></xsl:message> -->
-  <!-- * <xsl:message>node: <xsl:value-of select="local-name(.)"/></xsl:message> -->
-  <!-- * <xsl:message>context: <xsl:value-of select="local-name($context)"/></xsl:message> -->
-  <!-- * <xsl:message>object: <xsl:value-of select="local-name($object)"/></xsl:message> -->
-  <!-- * <xsl:message>toc-output-dir: <xsl:value-of select="$toc-output-dir"/></xsl:message> -->
-  <!-- * <xsl:message>linked-file-output-dir: <xsl:value-of select="$linked-file-output-dir"/></xsl:message> -->
-  <!-- * <xsl:message>href.to.uri: <xsl:value-of select="$href.to.uri"/></xsl:message> -->
-  <!-- * <xsl:message>href.from.uri: <xsl:value-of select="$href.from.uri"/></xsl:message> -->
-  <xsl:variable name="href.to">
-    <xsl:choose>
-      <!-- * 2007-07-19, MikeSmith: Added the following conditional to -->
-      <!-- * deal with a problem case for links in TOCs. It checks to see -->
-      <!-- * if the output dir that a TOC will get written to is -->
-      <!-- * different from the output dir of the file being linked to. -->
-      <!-- * If it is different, we do not call trim.common.uri.paths. -->
-      <!-- *  -->
-      <!-- * Reason why I added that conditional is: I ran into a bug for -->
-      <!-- * this case: -->
-      <!-- *  -->
-      <!-- * 1. we are chunking into separate dirs -->
-      <!-- *  -->
-      <!-- * 2. output for the TOC is written to current dir, but the file -->
-      <!-- *    being linked to is written to some subdir "foo". -->
-      <!-- *  -->
-      <!-- * For that case, links to that file in that TOC did not show -->
-      <!-- * the correct path - they omitted the "foo". -->
-      <!-- *  -->
-      <!-- * The cause of that problem was that the trim.common.uri.paths -->
-      <!-- * template[1] was being called under all conditions. But it's -->
-      <!-- * apparent that we don't want to call trim.common.uri.paths in -->
-      <!-- * the case where a linked file is being written to a different -->
-      <!-- * directory than the TOC that contains the link, because doing -->
-      <!-- * so will cause a necessary (not redundant) directory-name -->
-      <!-- * part of the link to get inadvertently trimmed, resulting in -->
-      <!-- * a broken link to that file. Thus, added the conditional. -->
-      <!-- *  -->
-      <!-- * [1] The purpose of the trim.common.uri.paths template is to -->
-      <!-- * prevent cases where, if we didn't call it, we end up with -->
-      <!-- * unnecessary, redundant directory names getting output; for -->
-      <!-- * example, "foo/foo/refname.html". -->
-      <xsl:when test="not($toc-output-dir = $linked-file-output-dir)">
-        <xsl:value-of select="$href.to.uri"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="trim.common.uri.paths">
-          <xsl:with-param name="uriA" select="$href.to.uri"/>
-          <xsl:with-param name="uriB" select="$href.from.uri"/>
-          <xsl:with-param name="return" select="'A'"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-  <xsl:variable name="href.from">
-    <xsl:call-template name="trim.common.uri.paths">
-      <xsl:with-param name="uriA" select="$href.to.uri"/>
-      <xsl:with-param name="uriB" select="$href.from.uri"/>
-      <xsl:with-param name="return" select="'B'"/>
-    </xsl:call-template>
-  </xsl:variable>
-  <xsl:variable name="depth">
-    <xsl:call-template name="count.uri.path.depth">
-      <xsl:with-param name="filename" select="$href.from"/>
-    </xsl:call-template>
-  </xsl:variable>
-  <xsl:variable name="href">
-    <xsl:call-template name="copy-string">
-      <xsl:with-param name="string" select="'../'"/>
-      <xsl:with-param name="count" select="$depth"/>
-    </xsl:call-template>
-    <xsl:value-of select="$href.to"/>
-  </xsl:variable>
-  <!--
-  <xsl:message>
-    <xsl:text>In </xsl:text>
-    <xsl:value-of select="name(.)"/>
-    <xsl:text> (</xsl:text>
-    <xsl:value-of select="$href.from"/>
-    <xsl:text>,</xsl:text>
-    <xsl:value-of select="$depth"/>
-    <xsl:text>) </xsl:text>
-    <xsl:value-of select="name($object)"/>
-    <xsl:text> href=</xsl:text>
-    <xsl:value-of select="$href"/>
-  </xsl:message>
-  -->
-  <xsl:value-of select="$href"/>
-</xsl:template>
-
-<!-- Returns the complete olink href value if found -->
-<!-- Must take into account any dbhtml dir of the chunk containing the olink -->
-<xsl:template name="make.olink.href">
-  <xsl:param name="olink.key" select="''"/>
-  <xsl:param name="target.database"/>
-
-  <xsl:if test="$olink.key != ''">
-    <xsl:variable name="target.href">
-      <xsl:for-each select="$target.database">
-        <xsl:value-of select="key('targetptr-key', $olink.key)/@href"/>
-      </xsl:for-each>
-    </xsl:variable>
-  
-    <!-- an olink starting point may be in a subdirectory, so need
-         the "from" reference point to compute a relative path -->
-
-    <xsl:variable name="from.href">
-      <xsl:call-template name="olink.from.uri">
-        <xsl:with-param name="target.database" select="$target.database"/>
-        <xsl:with-param name="object" select="."/>
-        <xsl:with-param name="object.targetdoc" select="$current.docid"/>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <!-- If the from.href has directory path, then must "../" upward
-         to document level -->
-    <xsl:variable name="upward.from.path">
-      <xsl:call-template name="upward.path">
-        <xsl:with-param name="path" select="$from.href"/>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <xsl:variable name="targetdoc">
-      <xsl:value-of select="substring-before($olink.key, '/')"/>
-    </xsl:variable>
-  
-    <!-- Does the target database use a sitemap? -->
-    <xsl:variable name="use.sitemap">
-      <xsl:choose>
-        <xsl:when test="$target.database//sitemap">1</xsl:when>
-        <xsl:otherwise>0</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-  
-  
-    <!-- Get the baseuri for this targetptr -->
-    <xsl:variable name="baseuri">
-      <xsl:choose>
-        <!-- Does the database use a sitemap? -->
-        <xsl:when test="$use.sitemap != 0">
-          <xsl:choose>
-            <!-- Was current.docid parameter set? -->
-            <xsl:when test="$current.docid != ''">
-              <!-- Was it found in the database? -->
-              <xsl:variable name="currentdoc.key">
-                <xsl:for-each select="$target.database">
-                  <xsl:value-of select="key('targetdoc-key',                                         $current.docid)/@targetdoc"/>
-                </xsl:for-each>
-              </xsl:variable>
-              <xsl:choose>
-                <xsl:when test="$currentdoc.key != ''">
-                  <xsl:for-each select="$target.database">
-                    <xsl:call-template name="targetpath">
-                      <xsl:with-param name="dirnode" select="key('targetdoc-key', $current.docid)/parent::dir"/>
-                      <xsl:with-param name="targetdoc" select="$targetdoc"/>
-                    </xsl:call-template>
-                  </xsl:for-each>
-                </xsl:when>
-                <xsl:otherwise>
-                  <xsl:message>
-                    <xsl:text>Olink error: cannot compute relative </xsl:text>
-                    <xsl:text>sitemap path because $current.docid '</xsl:text>
-                    <xsl:value-of select="$current.docid"/>
-                    <xsl:text>' not found in target database.</xsl:text>
-                  </xsl:message>
-                </xsl:otherwise>
-              </xsl:choose>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:message>
-                <xsl:text>Olink warning: cannot compute relative </xsl:text>
-                <xsl:text>sitemap path without $current.docid parameter</xsl:text>
-              </xsl:message>
-            </xsl:otherwise>
-          </xsl:choose> 
-          <!-- In either case, add baseuri from its document entry-->
-          <xsl:variable name="docbaseuri">
-            <xsl:for-each select="$target.database">
-              <xsl:value-of select="key('targetdoc-key', $targetdoc)/@baseuri"/>
-            </xsl:for-each>
-          </xsl:variable>
-          <xsl:if test="$docbaseuri != ''">
-            <xsl:value-of select="$docbaseuri"/>
-          </xsl:if>
-        </xsl:when>
-        <!-- No database sitemap in use -->
-        <xsl:otherwise>
-          <!-- Just use any baseuri from its document entry -->
-          <xsl:variable name="docbaseuri">
-            <xsl:for-each select="$target.database">
-              <xsl:value-of select="key('targetdoc-key', $targetdoc)/@baseuri"/>
-            </xsl:for-each>
-          </xsl:variable>
-          <xsl:if test="$docbaseuri != ''">
-            <xsl:value-of select="$docbaseuri"/>
-          </xsl:if>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-  
-    <!-- Form the href information -->
-    <xsl:if test="not(contains($baseuri, ':'))">
-      <!-- if not an absolute uri, add upward path from olink chunk -->
-      <xsl:value-of select="$upward.from.path"/>
-    </xsl:if>
-
-    <xsl:if test="$baseuri != ''">
-      <xsl:value-of select="$baseuri"/>
-      <xsl:if test="substring($target.href,1,1) != '#'">
-        <!--xsl:text>/</xsl:text-->
-      </xsl:if>
-    </xsl:if>
-    <!-- optionally turn off frag for PDF references -->
-    <xsl:if test="not($insert.olink.pdf.frag = 0 and           translate(substring($baseuri, string-length($baseuri) - 3),                     'PDF', 'pdf') = '.pdf'           and starts-with($target.href, '#') )">
-      <xsl:value-of select="$target.href"/>
-    </xsl:if>
-  </xsl:if>
-</xsl:template>
-
-<!-- Computes "../" to reach top -->
-<xsl:template name="upward.path">
-  <xsl:param name="path" select="''"/>
-  <xsl:choose> 
-    <!-- Don't bother with absolute uris -->
-    <xsl:when test="contains($path, ':')"/>
-    <xsl:when test="starts-with($path, '/')"/>
-    <xsl:when test="contains($path, '/')">
-      <xsl:text>../</xsl:text>
-      <xsl:call-template name="upward.path">
-        <xsl:with-param name="path" select="substring-after($path, '/')"/>
-      </xsl:call-template>
-    </xsl:when>
-  </xsl:choose>
-
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="html.head">
-  <xsl:param name="prev" select="/foo"/>
-  <xsl:param name="next" select="/foo"/>
-  <xsl:variable name="this" select="."/>
-  <xsl:variable name="home" select="/*[1]"/>
-  <xsl:variable name="up" select="parent::*"/>
-
-  <head>
-    <xsl:call-template name="system.head.content"/>
-    <xsl:call-template name="head.content"/>
-
-    <xsl:if test="$home">
-      <link rel="start">
-        <xsl:attribute name="href">
-          <xsl:call-template name="href.target">
-            <xsl:with-param name="object" select="$home"/>
-          </xsl:call-template>
-        </xsl:attribute>
-        <xsl:attribute name="title">
-          <xsl:apply-templates select="$home" mode="object.title.markup.textonly"/>
-        </xsl:attribute>
-      </link>
-    </xsl:if>
-
-    <xsl:if test="$up">
-      <link rel="up">
-        <xsl:attribute name="href">
-          <xsl:call-template name="href.target">
-            <xsl:with-param name="object" select="$up"/>
-          </xsl:call-template>
-        </xsl:attribute>
-        <xsl:attribute name="title">
-          <xsl:apply-templates select="$up" mode="object.title.markup.textonly"/>
-        </xsl:attribute>
-      </link>
-    </xsl:if>
-
-    <xsl:if test="$prev">
-      <link rel="prev">
-        <xsl:attribute name="href">
-          <xsl:call-template name="href.target">
-            <xsl:with-param name="object" select="$prev"/>
-          </xsl:call-template>
-        </xsl:attribute>
-        <xsl:attribute name="title">
-          <xsl:apply-templates select="$prev" mode="object.title.markup.textonly"/>
-        </xsl:attribute>
-      </link>
-    </xsl:if>
-
-    <xsl:if test="$next">
-      <link rel="next">
-        <xsl:attribute name="href">
-          <xsl:call-template name="href.target">
-            <xsl:with-param name="object" select="$next"/>
-          </xsl:call-template>
-        </xsl:attribute>
-        <xsl:attribute name="title">
-          <xsl:apply-templates select="$next" mode="object.title.markup.textonly"/>
-        </xsl:attribute>
-      </link>
-    </xsl:if>
-
-    <xsl:if test="$html.extra.head.links != 0">
-      <xsl:for-each select="//part                             |//reference                             |//preface                             |//chapter                             |//article                             |//refentry                             |//appendix[not(parent::article)]|appendix                             |//glossary[not(parent::article)]|glossary                             |//index[not(parent::article)]|index">
-        <link rel="{local-name(.)}">
-          <xsl:attribute name="href">
-            <xsl:call-template name="href.target">
-              <xsl:with-param name="context" select="$this"/>
-              <xsl:with-param name="object" select="."/>
-            </xsl:call-template>
-          </xsl:attribute>
-          <xsl:attribute name="title">
-            <xsl:apply-templates select="." mode="object.title.markup.textonly"/>
-          </xsl:attribute>
-        </link>
-      </xsl:for-each>
-
-      <xsl:for-each select="section|sect1|refsection|refsect1">
-        <link>
-          <xsl:attribute name="rel">
-            <xsl:choose>
-              <xsl:when test="local-name($this) = 'section'                               or local-name($this) = 'refsection'">
-                <xsl:value-of select="'subsection'"/>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:value-of select="'section'"/>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:attribute>
-          <xsl:attribute name="href">
-            <xsl:call-template name="href.target">
-              <xsl:with-param name="context" select="$this"/>
-              <xsl:with-param name="object" select="."/>
-            </xsl:call-template>
-          </xsl:attribute>
-          <xsl:attribute name="title">
-            <xsl:apply-templates select="." mode="object.title.markup.textonly"/>
-          </xsl:attribute>
-        </link>
-      </xsl:for-each>
-
-      <xsl:for-each select="sect2|sect3|sect4|sect5|refsect2|refsect3">
-        <link rel="subsection">
-          <xsl:attribute name="href">
-            <xsl:call-template name="href.target">
-              <xsl:with-param name="context" select="$this"/>
-              <xsl:with-param name="object" select="."/>
-            </xsl:call-template>
-          </xsl:attribute>
-          <xsl:attribute name="title">
-            <xsl:apply-templates select="." mode="object.title.markup.textonly"/>
-          </xsl:attribute>
-        </link>
-      </xsl:for-each>
-    </xsl:if>
-
-    <!-- * if we have a legalnotice and user wants it output as a -->
-    <!-- * separate page and $html.head.legalnotice.link.types is -->
-    <!-- * non-empty, we generate a link or links for each value in -->
-    <!-- * $html.head.legalnotice.link.types -->
-    <xsl:if test="//legalnotice                   and not($generate.legalnotice.link = 0)                   and not($html.head.legalnotice.link.types = '')">
-      <xsl:call-template name="make.legalnotice.head.links"/>
-    </xsl:if>
-
-    <xsl:call-template name="user.head.content"/>
-  </head>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="header.navigation">
-  <xsl:param name="prev" select="/foo"/>
-  <xsl:param name="next" select="/foo"/>
-  <xsl:param name="nav.context"/>
-
-  <xsl:variable name="home" select="/*[1]"/>
-  <xsl:variable name="up" select="parent::*"/>
-
-  <xsl:variable name="row1" select="$navig.showtitles != 0"/>
-  <xsl:variable name="row2" select="count($prev) &gt; 0                                     or (count($up) &gt; 0                                          and generate-id($up) != generate-id($home)                                         and $navig.showtitles != 0)                                     or count($next) &gt; 0"/>
-
-  <xsl:if test="$suppress.navigation = '0' and $suppress.header.navigation = '0'">
-    <div class="navheader">
-      <xsl:if test="$row1 or $row2">
-        <table width="100%" summary="Navigation header">
-          <xsl:if test="$row1">
-            <tr>
-              <th colspan="3" align="center">
-                <xsl:apply-templates select="." mode="object.title.markup"/>
-              </th>
-            </tr>
-          </xsl:if>
-
-          <xsl:if test="$row2">
-            <tr>
-              <td width="20%" align="left">
-                <xsl:if test="count($prev)&gt;0">
-                  <a accesskey="p">
-                    <xsl:attribute name="href">
-                      <xsl:call-template name="href.target">
-                        <xsl:with-param name="object" select="$prev"/>
-                      </xsl:call-template>
-                    </xsl:attribute>
-                    <xsl:call-template name="navig.content">
-                      <xsl:with-param name="direction" select="'prev'"/>
-                    </xsl:call-template>
-                  </a>
-                </xsl:if>
-                <xsl:text>&#160;</xsl:text>
-              </td>
-              <th width="60%" align="center">
-                <xsl:choose>
-                  <xsl:when test="count($up) &gt; 0                                   and generate-id($up) != generate-id($home)                                   and $navig.showtitles != 0">
-                    <xsl:apply-templates select="$up" mode="object.title.markup"/>
-                  </xsl:when>
-                  <xsl:otherwise>&#160;</xsl:otherwise>
-                </xsl:choose>
-              </th>
-              <td width="20%" align="right">
-                <xsl:text>&#160;</xsl:text>
-                <xsl:if test="count($next)&gt;0">
-                  <a accesskey="n">
-                    <xsl:attribute name="href">
-                      <xsl:call-template name="href.target">
-                        <xsl:with-param name="object" select="$next"/>
-                      </xsl:call-template>
-                    </xsl:attribute>
-                    <xsl:call-template name="navig.content">
-                      <xsl:with-param name="direction" select="'next'"/>
-                    </xsl:call-template>
-                  </a>
-                </xsl:if>
-              </td>
-            </tr>
-          </xsl:if>
-        </table>
-      </xsl:if>
-      <xsl:if test="$header.rule != 0">
-        <hr/>
-      </xsl:if>
-    </div>
-  </xsl:if>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="footer.navigation">
-  <xsl:param name="prev" select="/foo"/>
-  <xsl:param name="next" select="/foo"/>
-  <xsl:param name="nav.context"/>
-
-  <xsl:variable name="home" select="/*[1]"/>
-  <xsl:variable name="up" select="parent::*"/>
-
-  <xsl:variable name="row1" select="count($prev) &gt; 0                                     or count($up) &gt; 0                                     or count($next) &gt; 0"/>
-
-  <xsl:variable name="row2" select="($prev and $navig.showtitles != 0)                                     or (generate-id($home) != generate-id(.)                                         or $nav.context = 'toc')                                     or ($chunk.tocs.and.lots != 0                                         and $nav.context != 'toc')                                     or ($next and $navig.showtitles != 0)"/>
-
-  <xsl:if test="$suppress.navigation = '0' and $suppress.footer.navigation = '0'">
-    <div class="navfooter">
-      <xsl:if test="$footer.rule != 0">
-        <hr/>
-      </xsl:if>
-
-      <xsl:if test="$row1 or $row2">
-        <table width="100%" summary="Navigation footer">
-          <xsl:if test="$row1">
-            <tr>
-              <td width="40%" align="left">
-                <xsl:if test="count($prev)&gt;0">
-                  <a accesskey="p">
-                    <xsl:attribute name="href">
-                      <xsl:call-template name="href.target">
-                        <xsl:with-param name="object" select="$prev"/>
-                      </xsl:call-template>
-                    </xsl:attribute>
-                    <xsl:call-template name="navig.content">
-                      <xsl:with-param name="direction" select="'prev'"/>
-                    </xsl:call-template>
-                  </a>
-                </xsl:if>
-                <xsl:text>&#160;</xsl:text>
-              </td>
-              <td width="20%" align="center">
-                <xsl:choose>
-                  <xsl:when test="count($up)&gt;0                                   and generate-id($up) != generate-id($home)">
-                    <a accesskey="u">
-                      <xsl:attribute name="href">
-                        <xsl:call-template name="href.target">
-                          <xsl:with-param name="object" select="$up"/>
-                        </xsl:call-template>
-                      </xsl:attribute>
-                      <xsl:call-template name="navig.content">
-                        <xsl:with-param name="direction" select="'up'"/>
-                      </xsl:call-template>
-                    </a>
-                  </xsl:when>
-                  <xsl:otherwise>&#160;</xsl:otherwise>
-                </xsl:choose>
-              </td>
-              <td width="40%" align="right">
-                <xsl:text>&#160;</xsl:text>
-                <xsl:if test="count($next)&gt;0">
-                  <a accesskey="n">
-                    <xsl:attribute name="href">
-                      <xsl:call-template name="href.target">
-                        <xsl:with-param name="object" select="$next"/>
-                      </xsl:call-template>
-                    </xsl:attribute>
-                    <xsl:call-template name="navig.content">
-                      <xsl:with-param name="direction" select="'next'"/>
-                    </xsl:call-template>
-                  </a>
-                </xsl:if>
-              </td>
-            </tr>
-          </xsl:if>
-
-          <xsl:if test="$row2">
-            <tr>
-              <td width="40%" align="left" valign="top">
-                <xsl:if test="$navig.showtitles != 0">
-                  <xsl:apply-templates select="$prev" mode="object.title.markup"/>
-                </xsl:if>
-                <xsl:text>&#160;</xsl:text>
-              </td>
-              <td width="20%" align="center">
-                <xsl:choose>
-                  <xsl:when test="$home != . or $nav.context = 'toc'">
-                    <a accesskey="h">
-                      <xsl:attribute name="href">
-                        <xsl:call-template name="href.target">
-                          <xsl:with-param name="object" select="$home"/>
-                        </xsl:call-template>
-                      </xsl:attribute>
-                      <xsl:call-template name="navig.content">
-                        <xsl:with-param name="direction" select="'home'"/>
-                      </xsl:call-template>
-                    </a>
-                    <xsl:if test="$chunk.tocs.and.lots != 0 and $nav.context != 'toc'">
-                      <xsl:text>&#160;|&#160;</xsl:text>
-                    </xsl:if>
-                  </xsl:when>
-                  <xsl:otherwise>&#160;</xsl:otherwise>
-                </xsl:choose>
-
-                <xsl:if test="$chunk.tocs.and.lots != 0 and $nav.context != 'toc'">
-                  <a accesskey="t">
-                    <xsl:attribute name="href">
-                      <xsl:apply-templates select="/*[1]" mode="recursive-chunk-filename">
-                        <xsl:with-param name="recursive" select="true()"/>
-                      </xsl:apply-templates>
-                      <xsl:text>-toc</xsl:text>
-                      <xsl:value-of select="$html.ext"/>
-                    </xsl:attribute>
-                    <xsl:call-template name="gentext">
-                      <xsl:with-param name="key" select="'nav-toc'"/>
-                    </xsl:call-template>
-                  </a>
-                </xsl:if>
-              </td>
-              <td width="40%" align="right" valign="top">
-                <xsl:text>&#160;</xsl:text>
-                <xsl:if test="$navig.showtitles != 0">
-                  <xsl:apply-templates select="$next" mode="object.title.markup"/>
-                </xsl:if>
-              </td>
-            </tr>
-          </xsl:if>
-        </table>
-      </xsl:if>
-    </div>
-  </xsl:if>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="navig.content">
-    <xsl:param name="direction" select="next"/>
-    <xsl:variable name="navtext">
-        <xsl:choose>
-            <xsl:when test="$direction = 'prev'">
-                <xsl:call-template name="gentext.nav.prev"/>
-            </xsl:when>
-            <xsl:when test="$direction = 'next'">
-                <xsl:call-template name="gentext.nav.next"/>
-            </xsl:when>
-            <xsl:when test="$direction = 'up'">
-                <xsl:call-template name="gentext.nav.up"/>
-            </xsl:when>
-            <xsl:when test="$direction = 'home'">
-                <xsl:call-template name="gentext.nav.home"/>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:text>xxx</xsl:text>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:variable>
-
-    <xsl:choose>
-        <xsl:when test="$navig.graphics != 0">
-            <img>
-                <xsl:attribute name="src">
-                    <xsl:value-of select="$navig.graphics.path"/>
-                    <xsl:value-of select="$direction"/>
-                    <xsl:value-of select="$navig.graphics.extension"/>
-                </xsl:attribute>
-                <xsl:attribute name="alt">
-                    <xsl:value-of select="$navtext"/>
-                </xsl:attribute>
-            </img>
-        </xsl:when>
-        <xsl:otherwise>
-            <xsl:value-of select="$navtext"/>
-        </xsl:otherwise>
-    </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<!-- * The following template assumes that the first legalnotice -->
-<!-- * instance found in a document applies to the contents of the -->
-<!-- * entire document. It generates an HTML link in each chunk, back -->
-<!-- * to the file containing the contents of the first legalnotice. -->
-<!-- * -->
-<!-- * Actually, it may generate multiple link instances in each chunk, -->
-<!-- * because it walks through the space-separated list of link -->
-<!-- * types specified in the $html.head.legalnotice.link.types param, -->
-<!-- * popping off link types and generating links for them until it -->
-<!-- * depletes the list. -->
-  
-<xsl:template name="make.legalnotice.head.links">
-  <!-- * the following ID is used as part of the legalnotice filename; -->
-  <!-- * we need it in order to construct the filename for use in the -->
-  <!-- * value of the href attribute on the link -->
-  <xsl:param name="id">
-    <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="(//legalnotice)[1]"/>
-    </xsl:call-template>
-  </xsl:param>
-  <xsl:param name="linktype">
-    <xsl:choose>
-      <xsl:when test="contains($html.head.legalnotice.link.types, ' ')">
-        <xsl:value-of select="normalize-space(                     substring-before($html.head.legalnotice.link.types, ' '))"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$html.head.legalnotice.link.types"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:param>
-  <xsl:param name="remaining.linktypes" select="concat(               normalize-space(               substring-after($html.head.legalnotice.link.types, ' ')),' ')"/>
-  <xsl:if test="not($linktype = '')">
-    <link rel="{$linktype}">
-      <xsl:attribute name="href">
-        <xsl:value-of select="concat('ln-',$id,$html.ext)"/>
-      </xsl:attribute>
-      <xsl:attribute name="title">
-        <xsl:apply-templates select="(//legalnotice)[1]" mode="object.title.markup.textonly"/>
-      </xsl:attribute>
-    </link>
-    <xsl:call-template name="make.legalnotice.head.links">
-      <!-- * pop the next value off the list of link types -->
-      <xsl:with-param name="linktype" select="substring-before($remaining.linktypes, ' ')"/>
-      <!-- * remove the link type from the list of remaining link types -->
-      <xsl:with-param name="remaining.linktypes" select="substring-after($remaining.linktypes, ' ')"/>
-    </xsl:call-template>
-  </xsl:if>
-</xsl:template>
-
-<!-- ==================================================================== -->
-<xsl:template name="chunk-element-content">
-  <xsl:param name="prev"/>
-  <xsl:param name="next"/>
-  <xsl:param name="nav.context"/>
-  <xsl:param name="content">
-    <xsl:apply-imports/>
-  </xsl:param>
-
-  <xsl:call-template name="user.preroot"/>
-
-  <html>
-    <xsl:call-template name="html.head">
-      <xsl:with-param name="prev" select="$prev"/>
-      <xsl:with-param name="next" select="$next"/>
-    </xsl:call-template>
-
-    <body>
-      <xsl:call-template name="body.attributes"/>
-      <xsl:call-template name="user.header.navigation"/>
-
-      <xsl:call-template name="header.navigation">
-        <xsl:with-param name="prev" select="$prev"/>
-        <xsl:with-param name="next" select="$next"/>
-        <xsl:with-param name="nav.context" select="$nav.context"/>
-      </xsl:call-template>
-
-      <xsl:call-template name="user.header.content"/>
-
-      <xsl:copy-of select="$content"/>
-
-      <xsl:call-template name="user.footer.content"/>
-
-      <xsl:call-template name="footer.navigation">
-        <xsl:with-param name="prev" select="$prev"/>
-        <xsl:with-param name="next" select="$next"/>
-        <xsl:with-param name="nav.context" select="$nav.context"/>
-      </xsl:call-template>
-
-      <xsl:call-template name="user.footer.navigation"/>
-    </body>
-  </html>
-  <xsl:value-of select="$chunk.append"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-<xsl:template name="generate.manifest">
-  <xsl:param name="node" select="/"/>
-  <xsl:call-template name="write.text.chunk">
-    <xsl:with-param name="filename">
-      <xsl:if test="$manifest.in.base.dir != 0">
-        <xsl:value-of select="$base.dir"/>
-      </xsl:if>
-      <xsl:value-of select="$manifest"/>
-    </xsl:with-param>
-    <xsl:with-param name="method" select="'text'"/>
-    <xsl:with-param name="content">
-      <xsl:apply-templates select="$node" mode="enumerate-files"/>
-    </xsl:with-param>
-    <xsl:with-param name="encoding" select="$chunker.output.encoding"/>
-  </xsl:call-template>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="dbhtml-dir">
-  <xsl:param name="context" select="."/>
-  <!-- directories are now inherited from previous levels -->
-  <xsl:variable name="ppath">
-    <xsl:if test="$context/parent::*">
-      <xsl:call-template name="dbhtml-dir">
-        <xsl:with-param name="context" select="$context/parent::*"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:variable>
-  <xsl:variable name="path">
-    <xsl:call-template name="pi.dbhtml_dir">
-      <xsl:with-param name="node" select="$context"/>
-    </xsl:call-template>
-  </xsl:variable>
-  <xsl:choose>
-    <xsl:when test="$path = ''">
-      <xsl:if test="$ppath != ''">
-        <xsl:value-of select="$ppath"/>
-      </xsl:if>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:if test="$ppath != ''">
-        <xsl:value-of select="$ppath"/>
-        <xsl:if test="substring($ppath, string-length($ppath), 1) != '/'">
-          <xsl:text>/</xsl:text>
-        </xsl:if>
-      </xsl:if>
-      <xsl:value-of select="$path"/>
-      <xsl:text>/</xsl:text>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunk.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunk.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,52 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exsl="http://exslt.org/common" xmlns="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<!-- First import the non-chunking templates that format elements
-     within each chunk file. In a customization, you should
-     create a separate non-chunking customization layer such
-     as mydocbook.xsl that imports the original docbook.xsl and
-     customizes any presentation templates. Then your chunking
-     customization should import mydocbook.xsl instead of
-     docbook.xsl.  -->
-<xsl:import href="docbook.xsl"/>
-
-<!-- chunk-common.xsl contains all the named templates for chunking.
-     In a customization file, you import chunk-common.xsl, then
-     add any customized chunking templates of the same name. 
-     They will have import precedence over the original 
-     chunking templates in chunk-common.xsl. -->
-<xsl:import href="chunk-common.xsl"/>
-
-<!-- The manifest.xsl module is no longer imported because its
-     templates were moved into chunk-common and chunk-code -->
-
-<!-- chunk-code.xsl contains all the chunking templates that use
-     a match attribute.  In a customization it should be referenced
-     using <xsl:include> instead of <xsl:import>, and then add
-     any customized chunking templates with match attributes. But be sure
-     to add a priority="1" to such customized templates to resolve
-     its conflict with the original, since they have the
-     same import precedence.
-     
-     Using xsl:include prevents adding another layer
-     of import precedence, which would cause any
-     customizations that use xsl:apply-imports to wrongly
-     apply the chunking version instead of the original
-     non-chunking version to format an element.  -->
-<xsl:include href="chunk-code.xsl"/>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunker.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunker.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,302 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:saxon="http://icl.com/saxon" xmlns:lxslt="http://xml.apache.org/xslt" xmlns:redirect="http://xml.apache.org/xalan/redirect" xmlns:exsl="http://exslt.org/common" xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" xmlns="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="doc" extension-element-prefixes="saxon redirect lxslt exsl">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<!-- This stylesheet works with XSLT implementations that support -->
-<!-- exsl:document, saxon:output, or Xalan's redirect:write -->
-<!-- Note: Only Saxon 6.4.2 or later is supported. -->
-
-<xsl:param name="chunker.output.method" select="'xml'"/>
-<xsl:param name="chunker.output.encoding" select="'UTF-8'"/>
-<xsl:param name="chunker.output.indent" select="'no'"/>
-<xsl:param name="chunker.output.omit-xml-declaration" select="'no'"/>
-<xsl:param name="chunker.output.standalone" select="'no'"/>
-<xsl:param name="chunker.output.doctype-public" select="'-//W3C//DTD XHTML 1.0 Transitional//EN'"/>
-<xsl:param name="chunker.output.doctype-system" select="'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'"/>
-<xsl:param name="chunker.output.media-type" select="''"/>
-<xsl:param name="chunker.output.cdata-section-elements" select="''"/>
-<xsl:param name="chunker.output.quiet" select="0"/>
-
-<xsl:param name="saxon.character.representation" select="'entity;decimal'"/>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="make-relative-filename">
-  <xsl:param name="base.dir" select="'./'"/>
-  <xsl:param name="base.name" select="''"/>
-
-  <xsl:choose>
-    <!-- put Saxon first to work around a bug in libxslt -->
-    <xsl:when test="element-available('saxon:output')">
-      <!-- Saxon doesn't make the chunks relative -->
-      <xsl:value-of select="concat($base.dir,$base.name)"/>
-    </xsl:when>
-    <xsl:when test="element-available('exsl:document')">
-      <!-- EXSL document does make the chunks relative, I think -->
-      <xsl:choose>
-        <xsl:when test="count(parent::*) = 0">
-          <xsl:value-of select="concat($base.dir,$base.name)"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="$base.name"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:when test="element-available('redirect:write')">
-      <!-- Xalan doesn't make the chunks relative -->
-      <xsl:value-of select="concat($base.dir,$base.name)"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:message terminate="yes">
-        <xsl:text>Don't know how to chunk with </xsl:text>
-        <xsl:value-of select="system-property('xsl:vendor')"/>
-      </xsl:message>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="write.chunk">
-  <xsl:param name="filename" select="''"/>
-  <xsl:param name="quiet" select="$chunker.output.quiet"/>
-  <xsl:param name="suppress-context-node-name" select="0"/>
-  <xsl:param name="message-prolog"/>
-  <xsl:param name="message-epilog"/>
-
-  <xsl:param name="method" select="$chunker.output.method"/>
-  <xsl:param name="encoding" select="$chunker.output.encoding"/>
-  <xsl:param name="indent" select="$chunker.output.indent"/>
-  <xsl:param name="omit-xml-declaration" select="$chunker.output.omit-xml-declaration"/>
-  <xsl:param name="standalone" select="$chunker.output.standalone"/>
-  <xsl:param name="doctype-public" select="$chunker.output.doctype-public"/>
-  <xsl:param name="doctype-system" select="$chunker.output.doctype-system"/>
-  <xsl:param name="media-type" select="$chunker.output.media-type"/>
-  <xsl:param name="cdata-section-elements" select="$chunker.output.cdata-section-elements"/>
-
-  <xsl:param name="content"/>
-
-  <xsl:if test="$quiet = 0">
-    <xsl:message>
-      <xsl:if test="not($message-prolog = '')">
-        <xsl:value-of select="$message-prolog"/>
-      </xsl:if>
-      <xsl:text>Writing </xsl:text>
-      <xsl:value-of select="$filename"/>
-      <xsl:if test="name(.) != '' and $suppress-context-node-name = 0">
-        <xsl:text> for </xsl:text>
-        <xsl:value-of select="name(.)"/>
-        <xsl:if test="@id or @xml:id">
-          <xsl:text>(</xsl:text>
-          <xsl:value-of select="(@id|@xml:id)[1]"/>
-          <xsl:text>)</xsl:text>
-        </xsl:if>
-      </xsl:if>
-      <xsl:if test="not($message-epilog = '')">
-        <xsl:value-of select="$message-epilog"/>
-      </xsl:if>
-    </xsl:message>
-  </xsl:if>
-
-  <xsl:choose>
-    <xsl:when test="element-available('exsl:document')">
-      <xsl:choose>
-        <!-- Handle the permutations ... -->
-        <xsl:when test="$media-type != ''">
-          <xsl:choose>
-            <xsl:when test="$doctype-public != '' and $doctype-system != ''">
-              <exsl:document href="{$filename}" method="{$method}" encoding="{$encoding}" indent="{$indent}" omit-xml-declaration="{$omit-xml-declaration}" cdata-section-elements="{$cdata-section-elements}" media-type="{$media-type}" doctype-public="{$doctype-public}" doctype-system="{$doctype-system}" standalone="{$standalone}">
-                <xsl:copy-of select="$content"/>
-              </exsl:document>
-            </xsl:when>
-            <xsl:when test="$doctype-public != '' and $doctype-system = ''">
-              <exsl:document href="{$filename}" method="{$method}" encoding="{$encoding}" indent="{$indent}" omit-xml-declaration="{$omit-xml-declaration}" cdata-section-elements="{$cdata-section-elements}" media-type="{$media-type}" doctype-public="{$doctype-public}" standalone="{$standalone}">
-                <xsl:copy-of select="$content"/>
-              </exsl:document>
-            </xsl:when>
-            <xsl:when test="$doctype-public = '' and $doctype-system != ''">
-              <exsl:document href="{$filename}" method="{$method}" encoding="{$encoding}" indent="{$indent}" omit-xml-declaration="{$omit-xml-declaration}" cdata-section-elements="{$cdata-section-elements}" media-type="{$media-type}" doctype-system="{$doctype-system}" standalone="{$standalone}">
-                <xsl:copy-of select="$content"/>
-              </exsl:document>
-            </xsl:when>
-            <xsl:otherwise><!-- $doctype-public = '' and $doctype-system = ''"> -->
-              <exsl:document href="{$filename}" method="{$method}" encoding="{$encoding}" indent="{$indent}" omit-xml-declaration="{$omit-xml-declaration}" cdata-section-elements="{$cdata-section-elements}" media-type="{$media-type}" standalone="{$standalone}">
-                <xsl:copy-of select="$content"/>
-              </exsl:document>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:choose>
-            <xsl:when test="$doctype-public != '' and $doctype-system != ''">
-              <exsl:document href="{$filename}" method="{$method}" encoding="{$encoding}" indent="{$indent}" omit-xml-declaration="{$omit-xml-declaration}" cdata-section-elements="{$cdata-section-elements}" doctype-public="{$doctype-public}" doctype-system="{$doctype-system}" standalone="{$standalone}">
-                <xsl:copy-of select="$content"/>
-              </exsl:document>
-            </xsl:when>
-            <xsl:when test="$doctype-public != '' and $doctype-system = ''">
-              <exsl:document href="{$filename}" method="{$method}" encoding="{$encoding}" indent="{$indent}" omit-xml-declaration="{$omit-xml-declaration}" cdata-section-elements="{$cdata-section-elements}" doctype-public="{$doctype-public}" standalone="{$standalone}">
-                <xsl:copy-of select="$content"/>
-              </exsl:document>
-            </xsl:when>
-            <xsl:when test="$doctype-public = '' and $doctype-system != ''">
-              <exsl:document href="{$filename}" method="{$method}" encoding="{$encoding}" indent="{$indent}" omit-xml-declaration="{$omit-xml-declaration}" cdata-section-elements="{$cdata-section-elements}" doctype-system="{$doctype-system}" standalone="{$standalone}">
-                <xsl:copy-of select="$content"/>
-              </exsl:document>
-            </xsl:when>
-            <xsl:otherwise><!-- $doctype-public = '' and $doctype-system = ''"> -->
-              <exsl:document href="{$filename}" method="{$method}" encoding="{$encoding}" indent="{$indent}" omit-xml-declaration="{$omit-xml-declaration}" cdata-section-elements="{$cdata-section-elements}" standalone="{$standalone}">
-                <xsl:copy-of select="$content"/>
-              </exsl:document>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-
-    <xsl:when test="element-available('saxon:output')">
-      <xsl:choose>
-        <!-- Handle the permutations ... -->
-        <xsl:when test="$media-type != ''">
-          <xsl:choose>
-            <xsl:when test="$doctype-public != '' and $doctype-system != ''">
-              <saxon:output saxon:character-representation="{$saxon.character.representation}" href="{$filename}" method="{$method}" encoding="{$encoding}" indent="{$indent}" omit-xml-declaration="{$omit-xml-declaration}" cdata-section-elements="{$cdata-section-elements}" media-type="{$media-type}" doctype-public="{$doctype-public}" doctype-system="{$doctype-system}" standalone="{$standalone}">
-                <xsl:copy-of select="$content"/>
-              </saxon:output>
-            </xsl:when>
-            <xsl:when test="$doctype-public != '' and $doctype-system = ''">
-              <saxon:output saxon:character-representation="{$saxon.character.representation}" href="{$filename}" method="{$method}" encoding="{$encoding}" indent="{$indent}" omit-xml-declaration="{$omit-xml-declaration}" cdata-section-elements="{$cdata-section-elements}" media-type="{$media-type}" doctype-public="{$doctype-public}" standalone="{$standalone}">
-                <xsl:copy-of select="$content"/>
-              </saxon:output>
-            </xsl:when>
-            <xsl:when test="$doctype-public = '' and $doctype-system != ''">
-              <saxon:output saxon:character-representation="{$saxon.character.representation}" href="{$filename}" method="{$method}" encoding="{$encoding}" indent="{$indent}" omit-xml-declaration="{$omit-xml-declaration}" cdata-section-elements="{$cdata-section-elements}" media-type="{$media-type}" doctype-system="{$doctype-system}" standalone="{$standalone}">
-                <xsl:copy-of select="$content"/>
-              </saxon:output>
-            </xsl:when>
-            <xsl:otherwise><!-- $doctype-public = '' and $doctype-system = ''"> -->
-              <saxon:output saxon:character-representation="{$saxon.character.representation}" href="{$filename}" method="{$method}" encoding="{$encoding}" indent="{$indent}" omit-xml-declaration="{$omit-xml-declaration}" cdata-section-elements="{$cdata-section-elements}" media-type="{$media-type}" standalone="{$standalone}">
-                <xsl:copy-of select="$content"/>
-              </saxon:output>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:choose>
-            <xsl:when test="$doctype-public != '' and $doctype-system != ''">
-              <saxon:output saxon:character-representation="{$saxon.character.representation}" href="{$filename}" method="{$method}" encoding="{$encoding}" indent="{$indent}" omit-xml-declaration="{$omit-xml-declaration}" cdata-section-elements="{$cdata-section-elements}" doctype-public="{$doctype-public}" doctype-system="{$doctype-system}" standalone="{$standalone}">
-                <xsl:copy-of select="$content"/>
-              </saxon:output>
-            </xsl:when>
-            <xsl:when test="$doctype-public != '' and $doctype-system = ''">
-              <saxon:output saxon:character-representation="{$saxon.character.representation}" href="{$filename}" method="{$method}" encoding="{$encoding}" indent="{$indent}" omit-xml-declaration="{$omit-xml-declaration}" cdata-section-elements="{$cdata-section-elements}" doctype-public="{$doctype-public}" standalone="{$standalone}">
-                <xsl:copy-of select="$content"/>
-              </saxon:output>
-            </xsl:when>
-            <xsl:when test="$doctype-public = '' and $doctype-system != ''">
-              <saxon:output saxon:character-representation="{$saxon.character.representation}" href="{$filename}" method="{$method}" encoding="{$encoding}" indent="{$indent}" omit-xml-declaration="{$omit-xml-declaration}" cdata-section-elements="{$cdata-section-elements}" doctype-system="{$doctype-system}" standalone="{$standalone}">
-                <xsl:copy-of select="$content"/>
-              </saxon:output>
-            </xsl:when>
-            <xsl:otherwise><!-- $doctype-public = '' and $doctype-system = ''"> -->
-              <saxon:output saxon:character-representation="{$saxon.character.representation}" href="{$filename}" method="{$method}" encoding="{$encoding}" indent="{$indent}" omit-xml-declaration="{$omit-xml-declaration}" cdata-section-elements="{$cdata-section-elements}" standalone="{$standalone}">
-                <xsl:copy-of select="$content"/>
-              </saxon:output>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-
-    <xsl:when test="element-available('redirect:write')">
-      <!-- Xalan uses redirect -->
-      <redirect:write file="{$filename}">
-        <xsl:copy-of select="$content"/>
-      </redirect:write>
-    </xsl:when>
-
-    <xsl:otherwise>
-      <!-- it doesn't matter since we won't be making chunks... -->
-      <xsl:message terminate="yes">
-        <xsl:text>Can't make chunks with </xsl:text>
-        <xsl:value-of select="system-property('xsl:vendor')"/>
-        <xsl:text>'s processor.</xsl:text>
-      </xsl:message>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="write.chunk.with.doctype">
-  <xsl:param name="filename" select="''"/>
-  <xsl:param name="quiet" select="$chunker.output.quiet"/>
-
-  <xsl:param name="method" select="$chunker.output.method"/>
-  <xsl:param name="encoding" select="$chunker.output.encoding"/>
-  <xsl:param name="indent" select="$chunker.output.indent"/>
-  <xsl:param name="omit-xml-declaration" select="$chunker.output.omit-xml-declaration"/>
-  <xsl:param name="standalone" select="$chunker.output.standalone"/>
-  <xsl:param name="doctype-public" select="$chunker.output.doctype-public"/>
-  <xsl:param name="doctype-system" select="$chunker.output.doctype-system"/>
-  <xsl:param name="media-type" select="$chunker.output.media-type"/>
-  <xsl:param name="cdata-section-elements" select="$chunker.output.cdata-section-elements"/>
-
-  <xsl:param name="content"/>
-
-  <xsl:call-template name="write.chunk">
-    <xsl:with-param name="filename" select="$filename"/>
-    <xsl:with-param name="quiet" select="$quiet"/>
-    <xsl:with-param name="method" select="$method"/>
-    <xsl:with-param name="encoding" select="$encoding"/>
-    <xsl:with-param name="indent" select="$indent"/>
-    <xsl:with-param name="omit-xml-declaration" select="$omit-xml-declaration"/>
-    <xsl:with-param name="standalone" select="$standalone"/>
-    <xsl:with-param name="doctype-public" select="$doctype-public"/>
-    <xsl:with-param name="doctype-system" select="$doctype-system"/>
-    <xsl:with-param name="media-type" select="$media-type"/>
-    <xsl:with-param name="cdata-section-elements" select="$cdata-section-elements"/>
-    <xsl:with-param name="content" select="$content"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="write.text.chunk">
-  <xsl:param name="filename" select="''"/>
-  <xsl:param name="quiet" select="$chunker.output.quiet"/>
-  <xsl:param name="suppress-context-node-name" select="0"/>
-  <xsl:param name="message-prolog"/>
-  <xsl:param name="message-epilog"/>
-  <xsl:param name="method" select="'text'"/>
-  <xsl:param name="encoding" select="$chunker.output.encoding"/>
-  <xsl:param name="media-type" select="$chunker.output.media-type"/>
-  <xsl:param name="content"/>
-
-  <xsl:call-template name="write.chunk">
-    <xsl:with-param name="filename" select="$filename"/>
-    <xsl:with-param name="quiet" select="$quiet"/>
-    <xsl:with-param name="suppress-context-node-name" select="$suppress-context-node-name"/>
-    <xsl:with-param name="message-prolog" select="$message-prolog"/>
-    <xsl:with-param name="message-epilog" select="$message-epilog"/>
-    <xsl:with-param name="method" select="$method"/>
-    <xsl:with-param name="encoding" select="$encoding"/>
-    <xsl:with-param name="indent" select="'no'"/>
-    <xsl:with-param name="omit-xml-declaration" select="'no'"/>
-    <xsl:with-param name="standalone" select="'no'"/>
-    <xsl:with-param name="doctype-public"/>
-    <xsl:with-param name="doctype-system"/>
-    <xsl:with-param name="media-type" select="$media-type"/>
-    <xsl:with-param name="cdata-section-elements"/>
-    <xsl:with-param name="content" select="$content"/>
-  </xsl:call-template>
-</xsl:template>
-
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunkfast.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunkfast.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,69 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exsl="http://exslt.org/common" xmlns:cf="http://docbook.sourceforge.net/xmlns/chunkfast/1.0" xmlns="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="cf exsl">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:import href="chunk.xsl"/>
-<xsl:param name="chunk.fast" select="1"/>
-
-<xsl:variable name="chunks" select="exsl:node-set($chunk.hierarchy)//cf:div"/>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="process-chunk-element">
-  <xsl:choose>
-    <xsl:when test="$chunk.fast != 0 and function-available('exsl:node-set')">
-      <xsl:variable name="genid" select="generate-id()"/>
-
-      <xsl:variable name="div" select="$chunks[@id=$genid or @xml:id=$genid]"/>
-
-      <xsl:variable name="prevdiv" select="($div/preceding-sibling::cf:div|$div/preceding::cf:div|$div/parent::cf:div)[last()]"/>
-      <xsl:variable name="prev" select="key('genid', ($prevdiv/@id|$prevdiv/@xml:id)[1])"/>
-
-      <xsl:variable name="nextdiv" select="($div/following-sibling::cf:div|$div/following::cf:div|$div/cf:div)[1]"/>
-      <xsl:variable name="next" select="key('genid', ($nextdiv/@id|$nextdiv/@xml:id)[1])"/>
-
-      <xsl:choose>
-        <xsl:when test="$onechunk != 0 and parent::*">
-          <xsl:apply-imports/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="process-chunk">
-            <xsl:with-param name="prev" select="$prev"/>
-            <xsl:with-param name="next" select="$next"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:choose>
-        <xsl:when test="$onechunk != 0 and not(parent::*)">
-          <xsl:call-template name="chunk-all-sections"/>
-        </xsl:when>
-        <xsl:when test="$onechunk != 0">
-          <xsl:apply-imports/>
-        </xsl:when>
-        <xsl:when test="$chunk.first.sections = 0">
-          <xsl:call-template name="chunk-first-section-with-parent"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="chunk-all-sections"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunktoc.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunktoc.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,462 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" xmlns="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="doc">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:import href="docbook.xsl"/>
-<xsl:import href="chunk-common.xsl"/>
-
-<xsl:template name="chunk">
-  <xsl:param name="node" select="."/>
-  <!-- returns 1 if $node is a chunk -->
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="$node"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="chunks" select="document($chunk.toc,/)"/>
-
-  <xsl:choose>
-    <xsl:when test="$chunks//tocentry[@linkend=$id]">1</xsl:when>
-    <xsl:otherwise>0</xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="*" mode="chunk-filename">
-  <!-- returns the filename of a chunk -->
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="chunks" select="document($chunk.toc,/)"/>
-
-  <xsl:variable name="chunk" select="$chunks//tocentry[@linkend=$id]"/>
-  <xsl:variable name="filename">
-    <xsl:call-template name="pi.dbhtml_filename">
-      <xsl:with-param name="node" select="$chunk"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$chunk">
-      <xsl:value-of select="$filename"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates select="parent::*" mode="chunk-filename"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="process-chunk">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="chunks" select="document($chunk.toc,/)"/>
-
-  <xsl:variable name="chunk" select="$chunks//tocentry[@linkend=$id]"/>
-  <xsl:variable name="prev-id" select="($chunk/preceding::tocentry                          |$chunk/ancestor::tocentry)[last()]/@linkend"/>
-  <xsl:variable name="next-id" select="($chunk/following::tocentry                          |$chunk/child::tocentry)[1]/@linkend"/>
-
-  <xsl:variable name="prev" select="key('id',$prev-id)"/>
-  <xsl:variable name="next" select="key('id',$next-id)"/>
-
-  <xsl:variable name="ischunk">
-    <xsl:call-template name="chunk"/>
-  </xsl:variable>
-
-  <xsl:variable name="chunkfn">
-    <xsl:if test="$ischunk='1'">
-      <xsl:apply-templates mode="chunk-filename" select="."/>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:variable name="filename">
-    <xsl:call-template name="make-relative-filename">
-      <xsl:with-param name="base.dir" select="$base.dir"/>
-      <xsl:with-param name="base.name" select="$chunkfn"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$ischunk = 0">
-      <xsl:apply-imports/>
-    </xsl:when>
-
-    <xsl:otherwise>
-      <xsl:call-template name="write.chunk">
-        <xsl:with-param name="filename" select="$filename"/>
-        <xsl:with-param name="content">
-          <xsl:call-template name="chunk-element-content">
-            <xsl:with-param name="prev" select="$prev"/>
-            <xsl:with-param name="next" select="$next"/>
-          </xsl:call-template>
-        </xsl:with-param>
-        <xsl:with-param name="quiet" select="$chunk.quietly"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="set">
-  <xsl:call-template name="process-chunk"/>
-</xsl:template>
-
-<xsl:template match="book">
-  <xsl:call-template name="process-chunk"/>
-</xsl:template>
-
-<xsl:template match="book/appendix">
-  <xsl:call-template name="process-chunk"/>
-</xsl:template>
-
-<xsl:template match="book/glossary">
-  <xsl:call-template name="process-chunk"/>
-</xsl:template>
-
-<xsl:template match="book/bibliography">
-  <xsl:call-template name="process-chunk"/>
-</xsl:template>
-
-<xsl:template match="dedication" mode="dedication">
-  <xsl:call-template name="process-chunk"/>
-</xsl:template>
-
-<xsl:template match="preface|chapter">
-  <xsl:call-template name="process-chunk"/>
-</xsl:template>
-
-<xsl:template match="part|reference">
-  <xsl:call-template name="process-chunk"/>
-</xsl:template>
-
-<xsl:template match="refentry">
-  <xsl:call-template name="process-chunk"/>
-</xsl:template>
-
-<xsl:template match="colophon">
-  <xsl:call-template name="process-chunk"/>
-</xsl:template>
-
-<xsl:template match="article">
-  <xsl:call-template name="process-chunk"/>
-</xsl:template>
-
-<xsl:template match="article/appendix">
-  <xsl:call-template name="process-chunk"/>
-</xsl:template>
-
-<xsl:template match="article/glossary">
-  <xsl:call-template name="process-chunk"/>
-</xsl:template>
-
-<xsl:template match="article/bibliography">
-  <xsl:call-template name="process-chunk"/>
-</xsl:template>
-
-<xsl:template match="sect1|sect2|sect3|sect4|sect5|section">
-  <xsl:variable name="ischunk">
-    <xsl:call-template name="chunk"/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$ischunk != 0">
-      <xsl:call-template name="process-chunk"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-imports/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="setindex                      |book/index                      |article/index">
-  <!-- some implementations use completely empty index tags to indicate -->
-  <!-- where an automatically generated index should be inserted. so -->
-  <!-- if the index is completely empty, skip it. -->
-  <xsl:if test="count(*)&gt;0 or $generate.index != '0'">
-    <xsl:call-template name="process-chunk"/>
-  </xsl:if>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="/">
-  <xsl:choose>
-    <xsl:when test="$chunk.toc = ''">
-      <xsl:message terminate="yes">
-        <xsl:text>The chunk.toc file is not set.</xsl:text>
-      </xsl:message>
-    </xsl:when>
-
-    <xsl:when test="$rootid != ''">
-      <xsl:choose>
-        <xsl:when test="count(key('id',$rootid)) = 0">
-          <xsl:message terminate="yes">
-            <xsl:text>ID '</xsl:text>
-            <xsl:value-of select="$rootid"/>
-            <xsl:text>' not found in document.</xsl:text>
-          </xsl:message>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates select="key('id',$rootid)"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-
-    <xsl:otherwise>
-      <xsl:apply-templates select="/" mode="process.root"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="*" mode="process.root">
-  <xsl:apply-templates select="."/>
-</xsl:template>
-
-<xsl:template name="make.lots">
-  <xsl:param name="toc.params" select="''"/>
-  <xsl:param name="toc"/>
-
-  <xsl:variable name="lots">
-    <xsl:if test="contains($toc.params, 'toc')">
-      <xsl:copy-of select="$toc"/>
-    </xsl:if>
-
-    <xsl:if test="contains($toc.params, 'figure')">
-      <xsl:choose>
-        <xsl:when test="$chunk.separate.lots != '0'">
-          <xsl:call-template name="make.lot.chunk">
-            <xsl:with-param name="type" select="'figure'"/>
-            <xsl:with-param name="lot">
-              <xsl:call-template name="list.of.titles">
-                <xsl:with-param name="titles" select="'figure'"/>
-                <xsl:with-param name="nodes" select=".//figure"/>
-              </xsl:call-template>
-            </xsl:with-param>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="list.of.titles">
-            <xsl:with-param name="titles" select="'figure'"/>
-            <xsl:with-param name="nodes" select=".//figure"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:if>
-
-    <xsl:if test="contains($toc.params, 'table')">
-      <xsl:choose>
-        <xsl:when test="$chunk.separate.lots != '0'">
-          <xsl:call-template name="make.lot.chunk">
-            <xsl:with-param name="type" select="'table'"/>
-            <xsl:with-param name="lot">
-              <xsl:call-template name="list.of.titles">
-                <xsl:with-param name="titles" select="'table'"/>
-                <xsl:with-param name="nodes" select=".//table"/>
-              </xsl:call-template>
-            </xsl:with-param>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="list.of.titles">
-            <xsl:with-param name="titles" select="'table'"/>
-            <xsl:with-param name="nodes" select=".//table"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:if>
-
-    <xsl:if test="contains($toc.params, 'example')">
-      <xsl:choose>
-        <xsl:when test="$chunk.separate.lots != '0'">
-          <xsl:call-template name="make.lot.chunk">
-            <xsl:with-param name="type" select="'example'"/>
-            <xsl:with-param name="lot">
-              <xsl:call-template name="list.of.titles">
-                <xsl:with-param name="titles" select="'example'"/>
-                <xsl:with-param name="nodes" select=".//example"/>
-              </xsl:call-template>
-            </xsl:with-param>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="list.of.titles">
-            <xsl:with-param name="titles" select="'example'"/>
-            <xsl:with-param name="nodes" select=".//example"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:if>
-
-    <xsl:if test="contains($toc.params, 'equation')">
-      <xsl:choose>
-        <xsl:when test="$chunk.separate.lots != '0'">
-          <xsl:call-template name="make.lot.chunk">
-            <xsl:with-param name="type" select="'equation'"/>
-            <xsl:with-param name="lot">
-              <xsl:call-template name="list.of.titles">
-                <xsl:with-param name="titles" select="'equation'"/>
-                <xsl:with-param name="nodes" select=".//equation"/>
-              </xsl:call-template>
-            </xsl:with-param>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="list.of.titles">
-            <xsl:with-param name="titles" select="'equation'"/>
-            <xsl:with-param name="nodes" select=".//equation"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:if>
-
-    <xsl:if test="contains($toc.params, 'procedure')">
-      <xsl:choose>
-        <xsl:when test="$chunk.separate.lots != '0'">
-          <xsl:call-template name="make.lot.chunk">
-            <xsl:with-param name="type" select="'procedure'"/>
-            <xsl:with-param name="lot">
-              <xsl:call-template name="list.of.titles">
-                <xsl:with-param name="titles" select="'procedure'"/>
-                <xsl:with-param name="nodes" select=".//procedure[title]"/>
-              </xsl:call-template>
-            </xsl:with-param>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="list.of.titles">
-            <xsl:with-param name="titles" select="'procedure'"/>
-            <xsl:with-param name="nodes" select=".//procedure[title]"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:if test="string($lots) != ''">
-    <xsl:choose>
-      <xsl:when test="$chunk.tocs.and.lots != 0 and not(parent::*)">
-        <xsl:call-template name="write.chunk">
-          <xsl:with-param name="filename">
-            <xsl:call-template name="make-relative-filename">
-              <xsl:with-param name="base.dir" select="$base.dir"/>
-              <xsl:with-param name="base.name">
-                <xsl:call-template name="dbhtml-dir"/>
-                <xsl:apply-templates select="." mode="recursive-chunk-filename">
-                  <xsl:with-param name="recursive" select="true()"/>
-                </xsl:apply-templates>
-                <xsl:text>-toc</xsl:text>
-                <xsl:value-of select="$html.ext"/>
-              </xsl:with-param>
-            </xsl:call-template>
-          </xsl:with-param>
-          <xsl:with-param name="content">
-            <xsl:call-template name="chunk-element-content">
-              <xsl:with-param name="prev" select="/foo"/>
-              <xsl:with-param name="next" select="/foo"/>
-              <xsl:with-param name="nav.context" select="'toc'"/>
-              <xsl:with-param name="content">
-                <h1>
-                  <xsl:apply-templates select="." mode="object.title.markup"/>
-                </h1>
-                <xsl:copy-of select="$lots"/>
-              </xsl:with-param>
-            </xsl:call-template>
-          </xsl:with-param>
-          <xsl:with-param name="quiet" select="$chunk.quietly"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:copy-of select="$lots"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="make.lot.chunk">
-  <xsl:param name="type" select="''"/>
-  <xsl:param name="lot"/>
-
-  <xsl:if test="string($lot) != ''">
-    <xsl:variable name="filename">
-      <xsl:call-template name="make-relative-filename">
-        <xsl:with-param name="base.dir" select="$base.dir"/>
-        <xsl:with-param name="base.name">
-          <xsl:call-template name="dbhtml-dir"/>
-          <xsl:value-of select="$type"/>
-          <xsl:text>-toc</xsl:text>
-          <xsl:value-of select="$html.ext"/>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <xsl:variable name="href">
-      <xsl:call-template name="make-relative-filename">
-        <xsl:with-param name="base.name">
-          <xsl:call-template name="dbhtml-dir"/>
-          <xsl:value-of select="$type"/>
-          <xsl:text>-toc</xsl:text>
-          <xsl:value-of select="$html.ext"/>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <xsl:call-template name="write.chunk">
-      <xsl:with-param name="filename" select="$filename"/>
-      <xsl:with-param name="content">
-        <xsl:call-template name="chunk-element-content">
-          <xsl:with-param name="prev" select="/foo"/>
-          <xsl:with-param name="next" select="/foo"/>
-          <xsl:with-param name="nav.context" select="'toc'"/>
-          <xsl:with-param name="content">
-            <xsl:copy-of select="$lot"/>
-          </xsl:with-param>
-        </xsl:call-template>
-      </xsl:with-param>
-      <xsl:with-param name="quiet" select="$chunk.quietly"/>
-    </xsl:call-template>
-    <!-- And output a link to this file -->
-    <div>
-      <xsl:attribute name="class">
-        <xsl:text>ListofTitles</xsl:text>
-      </xsl:attribute>
-      <a href="{$href}">
-        <xsl:call-template name="gentext">
-          <xsl:with-param name="key">
-            <xsl:choose>
-              <xsl:when test="$type='table'">ListofTables</xsl:when>
-              <xsl:when test="$type='figure'">ListofFigures</xsl:when>
-              <xsl:when test="$type='equation'">ListofEquations</xsl:when>
-              <xsl:when test="$type='example'">ListofExamples</xsl:when>
-              <xsl:when test="$type='procedure'">ListofProcedures</xsl:when>
-              <xsl:otherwise>ListofUnknown</xsl:otherwise>
-            </xsl:choose>
-          </xsl:with-param>
-        </xsl:call-template>
-      </a>
-    </div>
-  </xsl:if>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/component.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/component.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,375 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:template name="component.title">
-  <xsl:param name="node" select="."/>
-
-  <xsl:variable name="level">
-    <xsl:choose>
-      <xsl:when test="ancestor::section">
-        <xsl:value-of select="count(ancestor::section)+1"/>
-      </xsl:when>
-      <xsl:when test="ancestor::sect5">6</xsl:when>
-      <xsl:when test="ancestor::sect4">5</xsl:when>
-      <xsl:when test="ancestor::sect3">4</xsl:when>
-      <xsl:when test="ancestor::sect2">3</xsl:when>
-      <xsl:when test="ancestor::sect1">2</xsl:when>
-      <xsl:otherwise>1</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <!-- Let's handle the case where a component (bibliography, for example)
-       occurs inside a section; will we need parameters for this? -->
-
-  <xsl:element name="h{$level+1}" namespace="http://www.w3.org/1999/xhtml">
-    <xsl:attribute name="class">title</xsl:attribute>
-    <xsl:if test="$generate.id.attributes = 0">
-      <xsl:call-template name="anchor">
-	<xsl:with-param name="node" select="$node"/>
-	<xsl:with-param name="conditional" select="0"/>
-      </xsl:call-template>
-    </xsl:if>
-      <xsl:apply-templates select="$node" mode="object.title.markup">
-      <xsl:with-param name="allow-anchors" select="1"/>
-    </xsl:apply-templates>
-  </xsl:element>
-</xsl:template>
-
-<xsl:template name="component.subtitle">
-  <xsl:param name="node" select="."/>
-  <xsl:variable name="subtitle" select="($node/docinfo/subtitle                         |$node/info/subtitle                         |$node/prefaceinfo/subtitle                         |$node/chapterinfo/subtitle                         |$node/appendixinfo/subtitle                         |$node/articleinfo/subtitle                         |$node/artheader/subtitle                         |$node/subtitle)[1]"/>
-
-  <xsl:if test="$subtitle">
-    <h3 class="subtitle">
-      <i>
-        <xsl:apply-templates select="$node" mode="object.subtitle.markup"/>
-      </i>
-    </h3>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="component.separator">
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="dedication" mode="dedication">
-  <xsl:call-template name="id.warning"/>
-
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="dir">
-      <xsl:with-param name="inherit" select="1"/>
-    </xsl:call-template>
-    <xsl:call-template name="language.attribute"/>
-    <xsl:call-template name="dedication.titlepage"/>
-    <xsl:apply-templates/>
-    <xsl:call-template name="process.footnotes"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="dedication/title|dedication/info/title" mode="titlepage.mode" priority="2">
-  <xsl:call-template name="component.title">
-    <xsl:with-param name="node" select="ancestor::dedication[1]"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="dedication/subtitle|dedication/info/subtitle" mode="titlepage.mode" priority="2">
-  <xsl:call-template name="component.subtitle">
-    <xsl:with-param name="node" select="ancestor::dedication[1]"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="dedication"/> <!-- see mode="dedication" -->
-<xsl:template match="dedication/title"/>
-<xsl:template match="dedication/subtitle"/>
-<xsl:template match="dedication/titleabbrev"/>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="colophon">
-  <xsl:call-template name="id.warning"/>
-
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="dir">
-      <xsl:with-param name="inherit" select="1"/>
-    </xsl:call-template>
-    <xsl:call-template name="language.attribute"/>
-    <xsl:if test="$generate.id.attributes != 0">
-      <xsl:attribute name="id">
-        <xsl:call-template name="object.id"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <xsl:call-template name="component.separator"/>
-    <xsl:call-template name="component.title"/>
-    <xsl:call-template name="component.subtitle"/>
-
-    <xsl:apply-templates/>
-    <xsl:call-template name="process.footnotes"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="colophon/title"/>
-<xsl:template match="colophon/subtitle"/>
-<xsl:template match="colophon/titleabbrev"/>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="preface">
-  <xsl:call-template name="id.warning"/>
-
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="dir">
-      <xsl:with-param name="inherit" select="1"/>
-    </xsl:call-template>
-    <xsl:call-template name="language.attribute"/>
-    <xsl:if test="$generate.id.attributes != 0">
-      <xsl:attribute name="id">
-        <xsl:call-template name="object.id"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <xsl:call-template name="component.separator"/>
-    <xsl:call-template name="preface.titlepage"/>
-
-    <xsl:variable name="toc.params">
-      <xsl:call-template name="find.path.params">
-        <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <xsl:if test="contains($toc.params, 'toc')">
-      <xsl:call-template name="component.toc">
-        <xsl:with-param name="toc.title.p" select="contains($toc.params, 'title')"/>
-      </xsl:call-template>
-      <xsl:call-template name="component.toc.separator"/>
-    </xsl:if>
-    <xsl:apply-templates/>
-    <xsl:call-template name="process.footnotes"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="preface/title" mode="titlepage.mode" priority="2">
-  <xsl:call-template name="component.title">
-    <xsl:with-param name="node" select="ancestor::preface[1]"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="preface/subtitle                      |preface/prefaceinfo/subtitle                      |preface/info/subtitle                      |preface/docinfo/subtitle" mode="titlepage.mode" priority="2">
-  <xsl:call-template name="component.subtitle">
-    <xsl:with-param name="node" select="ancestor::preface[1]"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="preface/docinfo|prefaceinfo"/>
-<xsl:template match="preface/info"/>
-<xsl:template match="preface/title"/>
-<xsl:template match="preface/titleabbrev"/>
-<xsl:template match="preface/subtitle"/>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="chapter">
-  <xsl:call-template name="id.warning"/>
-
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="dir">
-      <xsl:with-param name="inherit" select="1"/>
-    </xsl:call-template>
-    <xsl:call-template name="language.attribute"/>
-    <xsl:if test="$generate.id.attributes != 0">
-      <xsl:attribute name="id">
-        <xsl:call-template name="object.id"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <xsl:call-template name="component.separator"/>
-    <xsl:call-template name="chapter.titlepage"/>
-
-    <xsl:variable name="toc.params">
-      <xsl:call-template name="find.path.params">
-        <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:if test="contains($toc.params, 'toc')">
-      <xsl:call-template name="component.toc">
-        <xsl:with-param name="toc.title.p" select="contains($toc.params, 'title')"/>
-      </xsl:call-template>
-      <xsl:call-template name="component.toc.separator"/>
-    </xsl:if>
-    <xsl:apply-templates/>
-    <xsl:call-template name="process.footnotes"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="chapter/title" mode="titlepage.mode" priority="2">
-  <xsl:call-template name="component.title">
-    <xsl:with-param name="node" select="ancestor::chapter[1]"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="chapter/subtitle                      |chapter/chapterinfo/subtitle                      |chapter/info/subtitle                      |chapter/docinfo/subtitle" mode="titlepage.mode" priority="2">
-  <xsl:call-template name="component.subtitle">
-    <xsl:with-param name="node" select="ancestor::chapter[1]"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="chapter/docinfo|chapterinfo"/>
-<xsl:template match="chapter/info"/>
-<xsl:template match="chapter/title"/>
-<xsl:template match="chapter/titleabbrev"/>
-<xsl:template match="chapter/subtitle"/>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="appendix">
-  <xsl:variable name="ischunk">
-    <xsl:call-template name="chunk"/>
-  </xsl:variable>
-
-  <xsl:call-template name="id.warning"/>
-
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="dir">
-      <xsl:with-param name="inherit" select="1"/>
-    </xsl:call-template>
-    <xsl:call-template name="language.attribute"/>
-    <xsl:if test="$generate.id.attributes != 0">
-      <xsl:attribute name="id">
-        <xsl:call-template name="object.id"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <xsl:choose>
-      <xsl:when test="parent::article and $ischunk = 0">
-        <xsl:call-template name="section.heading">
-          <xsl:with-param name="level" select="1"/>
-          <xsl:with-param name="title">
-            <xsl:apply-templates select="." mode="object.title.markup"/>
-          </xsl:with-param>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="component.separator"/>
-        <xsl:call-template name="appendix.titlepage"/>
-      </xsl:otherwise>
-    </xsl:choose>
-
-    <xsl:variable name="toc.params">
-      <xsl:call-template name="find.path.params">
-        <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <xsl:if test="contains($toc.params, 'toc')">
-      <xsl:call-template name="component.toc">
-        <xsl:with-param name="toc.title.p" select="contains($toc.params, 'title')"/>
-      </xsl:call-template>
-      <xsl:call-template name="component.toc.separator"/>
-    </xsl:if>
-
-    <xsl:apply-templates/>
-
-    <xsl:if test="not(parent::article) or $ischunk != 0">
-      <xsl:call-template name="process.footnotes"/>
-    </xsl:if>
-  </div>
-</xsl:template>
-
-<xsl:template match="appendix/title" mode="titlepage.mode" priority="2">
-  <xsl:call-template name="component.title">
-    <xsl:with-param name="node" select="ancestor::appendix[1]"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="appendix/subtitle                      |appendix/appendixinfo/subtitle                      |appendix/info/subtitle                      |appendix/docinfo/subtitle" mode="titlepage.mode" priority="2">
-  <xsl:call-template name="component.subtitle">
-    <xsl:with-param name="node" select="ancestor::appendix[1]"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="appendix/docinfo|appendixinfo"/>
-<xsl:template match="appendix/info"/>
-<xsl:template match="appendix/title"/>
-<xsl:template match="appendix/titleabbrev"/>
-<xsl:template match="appendix/subtitle"/>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="article">
-  <xsl:call-template name="id.warning"/>
-
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="dir">
-      <xsl:with-param name="inherit" select="1"/>
-    </xsl:call-template>
-    <xsl:call-template name="language.attribute"/>
-    <xsl:if test="$generate.id.attributes != 0">
-      <xsl:attribute name="id">
-        <xsl:call-template name="object.id"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <xsl:call-template name="article.titlepage"/>
-
-    <xsl:variable name="toc.params">
-      <xsl:call-template name="find.path.params">
-        <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <xsl:call-template name="make.lots">
-      <xsl:with-param name="toc.params" select="$toc.params"/>
-      <xsl:with-param name="toc">
-        <xsl:call-template name="component.toc">
-          <xsl:with-param name="toc.title.p" select="contains($toc.params, 'title')"/>
-        </xsl:call-template>
-      </xsl:with-param>
-    </xsl:call-template>
-
-    <xsl:apply-templates/>
-    <xsl:call-template name="process.footnotes"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="article/title|article/articleinfo/title" mode="titlepage.mode" priority="2">
-  <xsl:call-template name="component.title">
-    <xsl:with-param name="node" select="ancestor::article[1]"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="article/subtitle                      |article/articleinfo/subtitle                      |article/info/subtitle                      |article/artheader/subtitle" mode="titlepage.mode" priority="2">
-  <xsl:call-template name="component.subtitle">
-    <xsl:with-param name="node" select="ancestor::article[1]"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="article/artheader|article/articleinfo"/>
-<xsl:template match="article/info"/>
-<xsl:template match="article/title"/>
-<xsl:template match="article/titleabbrev"/>
-<xsl:template match="article/subtitle"/>
-
-<!-- ==================================================================== -->
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/division.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/division.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,228 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:template match="set">
-  <xsl:call-template name="id.warning"/>
-
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="dir">
-      <xsl:with-param name="inherit" select="1"/>
-    </xsl:call-template>
-    <xsl:call-template name="language.attribute"/>
-    <xsl:if test="$generate.id.attributes != 0">
-      <xsl:attribute name="id">
-        <xsl:call-template name="object.id"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <xsl:call-template name="set.titlepage"/>
-
-    <xsl:variable name="toc.params">
-      <xsl:call-template name="find.path.params">
-        <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <xsl:call-template name="make.lots">
-      <xsl:with-param name="toc.params" select="$toc.params"/>
-      <xsl:with-param name="toc">
-        <xsl:call-template name="set.toc">
-          <xsl:with-param name="toc.title.p" select="contains($toc.params, 'title')"/>
-        </xsl:call-template>
-      </xsl:with-param>
-    </xsl:call-template>
-
-    <xsl:apply-templates/>
-  </div>
-</xsl:template>
-
-<xsl:template match="set/setinfo"/>
-<xsl:template match="set/title"/>
-<xsl:template match="set/titleabbrev"/>
-<xsl:template match="set/subtitle"/>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="book">
-  <xsl:call-template name="id.warning"/>
-
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="dir">
-      <xsl:with-param name="inherit" select="1"/>
-    </xsl:call-template>
-    <xsl:call-template name="language.attribute"/>
-    <xsl:if test="$generate.id.attributes != 0">
-      <xsl:attribute name="id">
-        <xsl:call-template name="object.id"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <xsl:call-template name="book.titlepage"/>
-
-    <xsl:apply-templates select="dedication" mode="dedication"/>
-
-    <xsl:variable name="toc.params">
-      <xsl:call-template name="find.path.params">
-        <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <xsl:call-template name="make.lots">
-      <xsl:with-param name="toc.params" select="$toc.params"/>
-      <xsl:with-param name="toc">
-        <xsl:call-template name="division.toc">
-          <xsl:with-param name="toc.title.p" select="contains($toc.params, 'title')"/>
-        </xsl:call-template>
-      </xsl:with-param>
-    </xsl:call-template>
-
-    <xsl:apply-templates/>
-  </div>
-</xsl:template>
-
-<xsl:template match="book/bookinfo"/>
-<xsl:template match="book/info"/>
-<xsl:template match="book/title"/>
-<xsl:template match="book/titleabbrev"/>
-<xsl:template match="book/subtitle"/>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="part">
-  <xsl:call-template name="id.warning"/>
-
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="dir">
-      <xsl:with-param name="inherit" select="1"/>
-    </xsl:call-template>
-    <xsl:call-template name="language.attribute"/>
-    <xsl:if test="$generate.id.attributes != 0">
-      <xsl:attribute name="id">
-        <xsl:call-template name="object.id"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <xsl:call-template name="part.titlepage"/>
-
-    <xsl:variable name="toc.params">
-      <xsl:call-template name="find.path.params">
-        <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:if test="not(partintro) and contains($toc.params, 'toc')">
-      <xsl:call-template name="division.toc"/>
-    </xsl:if>
-    <xsl:apply-templates/>
-  </div>
-</xsl:template>
-
-<xsl:template match="part" mode="make.part.toc">
-  <xsl:call-template name="division.toc"/>
-</xsl:template>
-
-<xsl:template match="reference" mode="make.part.toc">
-  <xsl:call-template name="division.toc"/>
-</xsl:template>
-
-<xsl:template match="part/docinfo"/>
-<xsl:template match="part/partinfo"/>
-<xsl:template match="part/info"/>
-<xsl:template match="part/title"/>
-<xsl:template match="part/titleabbrev"/>
-<xsl:template match="part/subtitle"/>
-
-<xsl:template match="partintro">
-  <xsl:call-template name="id.warning"/>
-
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="dir">
-      <xsl:with-param name="inherit" select="1"/>
-    </xsl:call-template>
-    <xsl:call-template name="language.attribute"/>
-    <xsl:if test="$generate.id.attributes != 0">
-      <xsl:attribute name="id">
-        <xsl:call-template name="object.id"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <xsl:call-template name="partintro.titlepage"/>
-    <xsl:apply-templates/>
-
-    <xsl:variable name="toc.params">
-      <xsl:call-template name="find.path.params">
-        <xsl:with-param name="node" select="parent::*"/>
-        <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:if test="contains($toc.params, 'toc')">
-      <!-- not ancestor::part because partintro appears in reference -->
-      <xsl:apply-templates select="parent::*" mode="make.part.toc"/>
-    </xsl:if>
-    <xsl:call-template name="process.footnotes"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="partintro/title"/>
-<xsl:template match="partintro/titleabbrev"/>
-<xsl:template match="partintro/subtitle"/>
-
-<xsl:template match="partintro/title" mode="partintro.title.mode">
-  <h2>
-    <xsl:apply-templates/>
-  </h2>
-</xsl:template>
-
-<xsl:template match="partintro/subtitle" mode="partintro.title.mode">
-  <h3>
-    <i><xsl:apply-templates/></i>
-  </h3>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="book" mode="division.number">
-  <xsl:number from="set" count="book" format="1."/>
-</xsl:template>
-
-<xsl:template match="part" mode="division.number">
-  <xsl:number from="book" count="part" format="I."/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="division.title">
-  <xsl:param name="node" select="."/>
-
-  <h1>
-    <xsl:attribute name="class">title</xsl:attribute>
-    <xsl:if test="$generate.id.attributes = 0">
-      <xsl:call-template name="anchor">
-	<xsl:with-param name="node" select="$node"/>
-	<xsl:with-param name="conditional" select="0"/>
-      </xsl:call-template>
-    </xsl:if>
-      <xsl:apply-templates select="$node" mode="object.title.markup">
-      <xsl:with-param name="allow-anchors" select="1"/>
-    </xsl:apply-templates>
-  </h1>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/docbook.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/docbook.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,447 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:ng="http://docbook.org/docbook-ng" xmlns:db="http://docbook.org/ns/docbook" xmlns:exsl="http://exslt.org/common" xmlns="http://www.w3.org/1999/xhtml" exclude-result-prefixes="db ng exsl" version="1.0">
-
-<xsl:output method="xml" encoding="UTF-8" indent="no" doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:include href="../VERSION"/>
-<xsl:include href="param.xsl"/>
-<xsl:include href="../lib/lib.xsl"/>
-<xsl:include href="../common/l10n.xsl"/>
-<xsl:include href="../common/common.xsl"/>
-<xsl:include href="../common/utility.xsl"/>
-<xsl:include href="../common/labels.xsl"/>
-<xsl:include href="../common/titles.xsl"/>
-<xsl:include href="../common/subtitles.xsl"/>
-<xsl:include href="../common/gentext.xsl"/>
-<xsl:include href="../common/targets.xsl"/>
-<xsl:include href="../common/olink.xsl"/>
-<xsl:include href="../common/pi.xsl"/>
-<xsl:include href="autotoc.xsl"/>
-<xsl:include href="autoidx.xsl"/>
-<xsl:include href="lists.xsl"/>
-<xsl:include href="callout.xsl"/>
-<xsl:include href="verbatim.xsl"/>
-<xsl:include href="graphics.xsl"/>
-<xsl:include href="xref.xsl"/>
-<xsl:include href="formal.xsl"/>
-<xsl:include href="table.xsl"/>
-<xsl:include href="htmltbl.xsl"/>
-<xsl:include href="sections.xsl"/>
-<xsl:include href="inline.xsl"/>
-<xsl:include href="footnote.xsl"/>
-<xsl:include href="html.xsl"/>
-<xsl:include href="info.xsl"/>
-<xsl:include href="keywords.xsl"/>
-<xsl:include href="division.xsl"/>
-<xsl:include href="toc.xsl"/>
-<xsl:include href="index.xsl"/>
-<xsl:include href="refentry.xsl"/>
-<xsl:include href="math.xsl"/>
-<xsl:include href="admon.xsl"/>
-<xsl:include href="component.xsl"/>
-<xsl:include href="biblio.xsl"/>
-<xsl:include href="biblio-iso690.xsl"/>
-<xsl:include href="glossary.xsl"/>
-<xsl:include href="block.xsl"/>
-<xsl:include href="task.xsl"/>
-<xsl:include href="qandaset.xsl"/>
-<xsl:include href="synop.xsl"/>
-<xsl:include href="titlepage.xsl"/>
-<xsl:include href="titlepage.templates.xsl"/>
-<xsl:include href="pi.xsl"/>
-<xsl:include href="ebnf.xsl"/>
-<xsl:include href="chunker.xsl"/>
-<xsl:include href="html-rtf.xsl"/>
-<xsl:include href="annotations.xsl"/>
-<xsl:include href="../common/stripns.xsl"/>
-
-<xsl:param name="stylesheet.result.type" select="'xhtml'"/>
-<xsl:param name="htmlhelp.output" select="0"/>
-
-<!-- ==================================================================== -->
-
-<xsl:key name="id" match="*" use="@id|@xml:id"/>
-<xsl:key name="gid" match="*" use="generate-id()"/>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="*">
-  <xsl:message>
-    <xsl:text>Element </xsl:text>
-    <xsl:value-of select="local-name(.)"/>
-    <xsl:text> in namespace '</xsl:text>
-    <xsl:value-of select="namespace-uri(.)"/>
-    <xsl:text>' encountered</xsl:text>
-    <xsl:if test="parent::*">
-      <xsl:text> in </xsl:text>
-      <xsl:value-of select="name(parent::*)"/>
-    </xsl:if>
-    <xsl:text>, but no template matches.</xsl:text>
-  </xsl:message>
-
-  <span style="color: red">
-    <xsl:text>&lt;</xsl:text>
-    <xsl:value-of select="name(.)"/>
-    <xsl:text>&gt;</xsl:text>
-    <xsl:apply-templates/>
-    <xsl:text>&lt;/</xsl:text>
-    <xsl:value-of select="name(.)"/>
-    <xsl:text>&gt;</xsl:text>
-  </span>
-</xsl:template>
-
-<xsl:template match="text()">
-  <xsl:value-of select="."/>
-</xsl:template>
-
-<xsl:template name="body.attributes">
-<!-- no apply-templates; make it empty -->
-</xsl:template>
-
-<xsl:template name="head.content">
-  <xsl:param name="node" select="."/>
-  <xsl:param name="title">
-    <xsl:apply-templates select="$node" mode="object.title.markup.textonly"/>
-  </xsl:param>
-
-  <title>
-    <xsl:copy-of select="$title"/>
-  </title>
-
-  <xsl:if test="$html.stylesheet != ''">
-    <xsl:call-template name="output.html.stylesheets">
-      <xsl:with-param name="stylesheets" select="normalize-space($html.stylesheet)"/>
-    </xsl:call-template>
-  </xsl:if>
-
-  <xsl:if test="$link.mailto.url != ''">
-    <link rev="made" href="{$link.mailto.url}"/>
-  </xsl:if>
-
-  <xsl:if test="$html.base != ''">
-    <base href="{$html.base}"/>
-  </xsl:if>
-
-  <meta name="generator" content="DocBook {$DistroTitle} V{$VERSION}"/>
-
-  <xsl:if test="$generate.meta.abstract != 0">
-    <xsl:variable name="info" select="(articleinfo                                       |bookinfo                                       |prefaceinfo                                       |chapterinfo                                       |appendixinfo                                       |sectioninfo                                       |sect1info                                       |sect2info                                       |sect3info                                       |sect4info                                       |sect5info                                       |referenceinfo                                       |refentryinfo                                       |partinfo                                       |info                                       |docinfo)[1]"/>
-    <xsl:if test="$info and $info/abstract">
-      <meta name="description">
-        <xsl:attribute name="content">
-          <xsl:for-each select="$info/abstract[1]/*">
-            <xsl:value-of select="normalize-space(.)"/>
-            <xsl:if test="position() &lt; last()">
-              <xsl:text> </xsl:text>
-            </xsl:if>
-          </xsl:for-each>
-        </xsl:attribute>
-      </meta>
-    </xsl:if>
-  </xsl:if>
-
-  <xsl:if test="($draft.mode = 'yes' or                 ($draft.mode = 'maybe' and                 ancestor-or-self::*[@status][1]/@status = 'draft'))                 and $draft.watermark.image != ''">
-    <style type="text/css"><xsl:text>
-body { background-image: url('</xsl:text>
-<xsl:value-of select="$draft.watermark.image"/><xsl:text>');
-       background-repeat: no-repeat;
-       background-position: top left;
-       /* The following properties make the watermark "fixed" on the page. */
-       /* I think that's just a bit too distracting for the reader... */
-       /* background-attachment: fixed; */
-       /* background-position: center center; */
-     }</xsl:text>
-    </style>
-  </xsl:if>
-  <xsl:apply-templates select="." mode="head.keywords.content"/>
-</xsl:template>
-
-<xsl:template name="output.html.stylesheets">
-  <xsl:param name="stylesheets" select="''"/>
-
-  <xsl:choose>
-    <xsl:when test="contains($stylesheets, ' ')">
-      <link rel="stylesheet" href="{substring-before($stylesheets, ' ')}">
-        <xsl:if test="$html.stylesheet.type != ''">
-          <xsl:attribute name="type">
-            <xsl:value-of select="$html.stylesheet.type"/>
-          </xsl:attribute>
-        </xsl:if>
-      </link>
-      <xsl:call-template name="output.html.stylesheets">
-        <xsl:with-param name="stylesheets" select="substring-after($stylesheets, ' ')"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="$stylesheets != ''">
-      <link rel="stylesheet" href="{$stylesheets}">
-        <xsl:if test="$html.stylesheet.type != ''">
-          <xsl:attribute name="type">
-            <xsl:value-of select="$html.stylesheet.type"/>
-          </xsl:attribute>
-        </xsl:if>
-      </link>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ============================================================ -->
-
-<xsl:template match="*" mode="head.keywords.content">
-  <xsl:apply-templates select="chapterinfo/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="appendixinfo/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="prefaceinfo/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="bookinfo/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="setinfo/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="articleinfo/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="artheader/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="sect1info/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="sect2info/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="sect3info/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="sect4info/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="sect5info/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="sectioninfo/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="refsect1info/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="refsect2info/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="refsect3info/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="bibliographyinfo/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="glossaryinfo/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="indexinfo/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="refentryinfo/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="partinfo/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="referenceinfo/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="docinfo/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="info/keywordset" mode="html.header"/>
-
-  <xsl:if test="$inherit.keywords != 0                 and parent::*">
-    <xsl:apply-templates select="parent::*" mode="head.keywords.content"/>
-  </xsl:if>
-</xsl:template>
-
-<!-- ============================================================ -->
-
-<xsl:template name="system.head.content">
-  <xsl:param name="node" select="."/>
-
-  <!-- FIXME: When chunking, only the annotations actually used
-              in this chunk should be referenced. I don't think it
-              does any harm to reference them all, but it adds
-              unnecessary bloat to each chunk. -->
-  <xsl:if test="$annotation.support != 0 and //annotation">
-    <xsl:call-template name="add.annotation.links"/>
-    <script type="text/javascript">
-      <xsl:text>
-// Create PopupWindow objects</xsl:text>
-      <xsl:for-each select="//annotation">
-        <xsl:text>
-var popup_</xsl:text>
-        <xsl:value-of select="generate-id(.)"/>
-        <xsl:text> = new PopupWindow("popup-</xsl:text>
-        <xsl:value-of select="generate-id(.)"/>
-        <xsl:text>");
-</xsl:text>
-        <xsl:text>popup_</xsl:text>
-        <xsl:value-of select="generate-id(.)"/>
-        <xsl:text>.offsetY = 15;
-</xsl:text>
-        <xsl:text>popup_</xsl:text>
-        <xsl:value-of select="generate-id(.)"/>
-        <xsl:text>.autoHide();
-</xsl:text>
-      </xsl:for-each>
-    </script>
-
-    <style type="text/css">
-      <xsl:value-of select="$annotation.css"/>
-    </style>
-  </xsl:if>
-
-  <!-- system.head.content is like user.head.content, except that
-       it is called before head.content. This is important because it
-       means, for example, that <style> elements output by system.head.content
-       have a lower CSS precedence than the users stylesheet. -->
-</xsl:template>
-
-<!-- ============================================================ -->
-
-<xsl:template name="user.preroot">
-  <!-- Pre-root output, can be used to output comments and PIs. -->
-  <!-- This must not output any element content! -->
-</xsl:template>
-
-<xsl:template name="user.head.content">
-  <xsl:param name="node" select="."/>
-</xsl:template>
-
-<xsl:template name="user.header.navigation">
-  <xsl:param name="node" select="."/>
-</xsl:template>
-
-<xsl:template name="user.header.content">
-  <xsl:param name="node" select="."/>
-</xsl:template>
-
-<xsl:template name="user.footer.content">
-  <xsl:param name="node" select="."/>
-</xsl:template>
-
-<xsl:template name="user.footer.navigation">
-  <xsl:param name="node" select="."/>
-</xsl:template>
-
-<xsl:template match="/">
-  <!-- * Get a title for current doc so that we let the user -->
-  <!-- * know what document we are processing at this point. -->
-  <xsl:variable name="doc.title">
-    <xsl:call-template name="get.doc.title"/>
-  </xsl:variable>
-  <xsl:choose>
-    <!-- Hack! If someone hands us a DocBook V5.x or DocBook NG document,
-         toss the namespace and continue.  Use the docbook5 namespaced
-         stylesheets for DocBook5 if you don't want to use this feature.-->
-    <!-- include extra test for Xalan quirk -->
-    <xsl:when test="(function-available('exsl:node-set') or                      contains(system-property('xsl:vendor'),                        'Apache Software Foundation'))                     and (*/self::ng:* or */self::db:*)">
-      <xsl:call-template name="log.message">
-        <xsl:with-param name="level">Note</xsl:with-param>
-        <xsl:with-param name="source" select="$doc.title"/>
-        <xsl:with-param name="context-desc">
-          <xsl:text>namesp. cut</xsl:text>
-        </xsl:with-param>
-        <xsl:with-param name="message">
-          <xsl:text>stripped namespace before processing</xsl:text>
-        </xsl:with-param>
-      </xsl:call-template>
-      <xsl:variable name="nons">
-        <xsl:apply-templates mode="stripNS"/>
-      </xsl:variable>
-      <!--
-      <xsl:message>Saving stripped document.</xsl:message>
-      <xsl:call-template name="write.chunk">
-        <xsl:with-param name="filename" select="'/tmp/stripped.xml'"/>
-        <xsl:with-param name="method" select="'xml'"/>
-        <xsl:with-param name="content">
-          <xsl:copy-of select="exsl:node-set($nons)"/>
-        </xsl:with-param>
-      </xsl:call-template>
-      -->
-      <xsl:call-template name="log.message">
-        <xsl:with-param name="level">Note</xsl:with-param>
-        <xsl:with-param name="source" select="$doc.title"/>
-        <xsl:with-param name="context-desc">
-          <xsl:text>namesp. cut</xsl:text>
-        </xsl:with-param>
-        <xsl:with-param name="message">
-          <xsl:text>processing stripped document</xsl:text>
-        </xsl:with-param>
-      </xsl:call-template>
-      <xsl:apply-templates select="exsl:node-set($nons)"/>
-    </xsl:when>
-    <!-- Can't process unless namespace removed -->
-    <xsl:when test="*/self::ng:* or */self::db:*">
-      <xsl:message terminate="yes">
-        <xsl:text>Unable to strip the namespace from DB5 document,</xsl:text>
-        <xsl:text> cannot proceed.</xsl:text>
-      </xsl:message>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:choose>
-        <xsl:when test="$rootid != ''">
-          <xsl:choose>
-            <xsl:when test="count(key('id',$rootid)) = 0">
-              <xsl:message terminate="yes">
-                <xsl:text>ID '</xsl:text>
-                <xsl:value-of select="$rootid"/>
-                <xsl:text>' not found in document.</xsl:text>
-              </xsl:message>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:if test="$collect.xref.targets = 'yes' or                             $collect.xref.targets = 'only'">
-                <xsl:apply-templates select="key('id', $rootid)" mode="collect.targets"/>
-              </xsl:if>
-              <xsl:if test="$collect.xref.targets != 'only'">
-                <xsl:apply-templates select="key('id',$rootid)" mode="process.root"/>
-                <xsl:if test="$tex.math.in.alt != ''">
-                  <xsl:apply-templates select="key('id',$rootid)" mode="collect.tex.math"/>
-                </xsl:if>
-              </xsl:if>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:if test="$collect.xref.targets = 'yes' or                         $collect.xref.targets = 'only'">
-            <xsl:apply-templates select="/" mode="collect.targets"/>
-          </xsl:if>
-          <xsl:if test="$collect.xref.targets != 'only'">
-            <xsl:apply-templates select="/" mode="process.root"/>
-            <xsl:if test="$tex.math.in.alt != ''">
-              <xsl:apply-templates select="/" mode="collect.tex.math"/>
-            </xsl:if>
-          </xsl:if>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="*" mode="process.root">
-  <xsl:variable name="doc" select="self::*"/>
-
-  <xsl:call-template name="user.preroot"/>
-  <xsl:call-template name="root.messages"/>
-
-  <html>
-    <head>
-      <xsl:call-template name="system.head.content">
-        <xsl:with-param name="node" select="$doc"/>
-      </xsl:call-template>
-      <xsl:call-template name="head.content">
-        <xsl:with-param name="node" select="$doc"/>
-      </xsl:call-template>
-      <xsl:call-template name="user.head.content">
-        <xsl:with-param name="node" select="$doc"/>
-      </xsl:call-template>
-    </head>
-    <body>
-      <xsl:call-template name="body.attributes"/>
-      <xsl:call-template name="user.header.content">
-        <xsl:with-param name="node" select="$doc"/>
-      </xsl:call-template>
-      <xsl:apply-templates select="."/>
-      <xsl:call-template name="user.footer.content">
-        <xsl:with-param name="node" select="$doc"/>
-      </xsl:call-template>
-    </body>
-  </html>
-  <xsl:value-of select="$html.append"/>
-</xsl:template>
-
-<xsl:template name="root.messages">
-  <!-- redefine this any way you'd like to output messages -->
-  <!-- DO NOT OUTPUT ANYTHING FROM THIS TEMPLATE -->
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="chunk">
-  <xsl:param name="node" select="."/>
-
-  <!-- The default is that we are not chunking... -->
-  <xsl:text>0</xsl:text>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/ebnf.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/ebnf.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,328 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" xmlns="http://www.w3.org/1999/xhtml" exclude-result-prefixes="doc" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<doc:reference xmlns="">
-<referenceinfo xmlns="http://www.w3.org/1999/xhtml">
-<releaseinfo role="meta">
-$Id$
-</releaseinfo>
-<author><surname>Walsh</surname>
-<firstname>Norman</firstname></author>
-<copyright><year>1999</year><year>2000</year>
-<holder>Norman Walsh</holder>
-</copyright>
-</referenceinfo>
-<title xmlns="http://www.w3.org/1999/xhtml">HTML EBNF Reference</title>
-
-<partintro xmlns="http://www.w3.org/1999/xhtml">
-<section><title>Introduction</title>
-
-<para>This is technical reference documentation for the DocBook XSL
-Stylesheets; it documents (some of) the parameters, templates, and
-other elements of the stylesheets.</para>
-
-<para>This reference describes the templates and parameters relevant
-to formatting EBNF markup.</para>
-
-<para>This is not intended to be <quote>user</quote> documentation.
-It is provided for developers writing customization layers for the
-stylesheets, and for anyone who's interested in <quote>how it
-works</quote>.</para>
-
-<para>Although I am trying to be thorough, this documentation is known
-to be incomplete. Don't forget to read the source, too :-)</para>
-</section>
-</partintro>
-</doc:reference>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="productionset">
-  <table width="100%" cellpadding="5">
-    <xsl:if test="$ebnf.table.bgcolor != ''">
-      <xsl:attribute name="bgcolor">
-        <xsl:value-of select="$ebnf.table.bgcolor"/>
-      </xsl:attribute>
-    </xsl:if>
-    <xsl:if test="$ebnf.table.border != 0">
-      <xsl:attribute name="border">1</xsl:attribute>
-    </xsl:if>
-    <xsl:attribute name="class">
-      <xsl:value-of select="local-name(.)"/>
-    </xsl:attribute>
-    <xsl:attribute name="summary">
-      <xsl:text>EBNF</xsl:text>
-      <xsl:if test="title">
-        <xsl:text> for </xsl:text>
-        <xsl:value-of select="title"/>
-      </xsl:if>
-    </xsl:attribute>
-
-    <xsl:if test="title">
-      <tr>
-        <th align="left" valign="top">
-          <xsl:apply-templates select="." mode="class.attribute"/>
-          <xsl:apply-templates select="title"/>
-        </th>
-      </tr>
-    </xsl:if>
-    <tr>
-      <td>
-        <table border="0" width="99%" cellpadding="0">
-          <xsl:if test="$ebnf.table.bgcolor != ''">
-            <xsl:attribute name="bgcolor">
-              <xsl:value-of select="$ebnf.table.bgcolor"/>
-            </xsl:attribute>
-          </xsl:if>
-          <xsl:attribute name="class">
-            <xsl:value-of select="local-name(.)"/>
-          </xsl:attribute>
-          <xsl:attribute name="summary">EBNF productions</xsl:attribute>
-          <xsl:apply-templates select="production|productionrecap"/>
-        </table>
-      </td>
-    </tr>
-  </table>
-</xsl:template>
-
-<xsl:template match="productionset/title">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="production">
-  <xsl:param name="recap" select="false()"/>
-  <tr>
-    <td align="left" valign="top" width="3%">
-      <xsl:text>[</xsl:text>
-      <xsl:number count="production" level="any"/>
-      <xsl:text>]</xsl:text>
-    </td>
-    <td align="right" valign="top" width="10%">
-      <xsl:choose>
-        <xsl:when test="$recap">
-          <a>
-            <xsl:attribute name="href">
-              <xsl:call-template name="href.target">
-                <xsl:with-param name="object" select="."/>
-              </xsl:call-template>
-            </xsl:attribute>
-            <xsl:apply-templates select="lhs"/>
-          </a>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="anchor"/>
-          <xsl:apply-templates select="lhs"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </td>
-    <td valign="top" width="5%" align="center">
-      <xsl:copy-of select="$ebnf.assignment"/>
-    </td>
-    <td valign="top" width="52%">
-      <xsl:apply-templates select="rhs"/>
-      <xsl:copy-of select="$ebnf.statement.terminator"/>
-    </td>
-    <td align="left" valign="top" width="30%">
-      <xsl:choose>
-        <xsl:when test="rhs/lineannotation|constraint">
-          <xsl:apply-templates select="rhs/lineannotation" mode="rhslo"/>
-          <xsl:apply-templates select="constraint"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:text>&#160;</xsl:text>
-        </xsl:otherwise>
-      </xsl:choose>
-    </td>
-  </tr>
-</xsl:template>
-
-<xsl:template match="productionrecap">
-  <xsl:variable name="targets" select="key('id',@linkend)"/>
-  <xsl:variable name="target" select="$targets[1]"/>
-
-  <xsl:if test="count($targets)=0">
-    <xsl:message>
-      <xsl:text>Error: no ID for productionrecap linkend: </xsl:text>
-      <xsl:value-of select="@linkend"/>
-      <xsl:text>.</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <xsl:if test="count($targets)&gt;1">
-    <xsl:message>
-      <xsl:text>Warning: multiple "IDs" for productionrecap linkend: </xsl:text>
-      <xsl:value-of select="@linkend"/>
-      <xsl:text>.</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <xsl:apply-templates select="$target">
-    <xsl:with-param name="recap" select="true()"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="lhs">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="rhs">
-  <xsl:apply-templates/>
-  <xsl:if test="following-sibling::rhs">
-    <xsl:text> |</xsl:text>
-    <br/>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="nonterminal">
-  <xsl:variable name="linkend">
-    <xsl:call-template name="xpointer.idref">
-      <xsl:with-param name="xpointer" select="@def"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:call-template name="check.id.unique">
-    <xsl:with-param name="linkend" select="$linkend"/>
-  </xsl:call-template>
-
-  <xsl:call-template name="check.idref.targets">
-    <xsl:with-param name="linkend" select="$linkend"/>
-    <xsl:with-param name="element-list">production</xsl:with-param>
-  </xsl:call-template>
-
-  <!-- If you don't provide content, you can't point outside this doc. -->
-  <xsl:choose>
-    <xsl:when test="*|text()"><!--nop--></xsl:when>
-    <xsl:otherwise>
-      <xsl:if test="$linkend = ''">
-        <xsl:message>
-          <xsl:text>Non-terminals with no content must point to </xsl:text>
-          <xsl:text>production elements in the current document.</xsl:text>
-        </xsl:message>
-        <xsl:message>
-          <xsl:text>Invalid xpointer for empty nt: </xsl:text>
-          <xsl:value-of select="@def"/>
-        </xsl:message>
-      </xsl:if>
-    </xsl:otherwise>
-  </xsl:choose>
-
-  <xsl:variable name="href">
-    <xsl:choose>
-      <xsl:when test="$linkend != ''">
-        <xsl:variable name="targets" select="key('id',$linkend)"/>
-        <xsl:variable name="target" select="$targets[1]"/>
-        <xsl:call-template name="href.target">
-          <xsl:with-param name="object" select="$target"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="@def"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <a href="{$href}">
-    <xsl:choose>
-      <xsl:when test="*|text()">
-        <xsl:apply-templates/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:choose>
-          <xsl:when test="$linkend != ''">
-            <xsl:variable name="targets" select="key('id',$linkend)"/>
-            <xsl:variable name="target" select="$targets[1]"/>
-            <xsl:apply-templates select="$target/lhs"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:text>???</xsl:text>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:otherwise>
-    </xsl:choose>
-  </a>
-</xsl:template>
-
-<xsl:template match="rhs/lineannotation">
-  <!--nop-->
-</xsl:template>
-
-<xsl:template match="rhs/lineannotation" mode="rhslo">
-  <xsl:text>/*&#160;</xsl:text>
-  <xsl:apply-templates/>
-  <xsl:text>&#160;*/</xsl:text>
-  <br/>
-</xsl:template>
-
-<xsl:template match="constraint">
-  <xsl:call-template name="check.id.unique">
-    <xsl:with-param name="linkend" select="@linkend"/>
-  </xsl:call-template>
-
-  <xsl:call-template name="check.idref.targets">
-    <xsl:with-param name="linkend" select="@linkend"/>
-    <xsl:with-param name="element-list">constraintdef</xsl:with-param>
-  </xsl:call-template>
-
-  <xsl:variable name="href">
-    <xsl:variable name="targets" select="key('id',@linkend)"/>
-    <xsl:variable name="target" select="$targets[1]"/>
-    <xsl:call-template name="href.target">
-      <xsl:with-param name="object" select="$target"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:text>[&#160;</xsl:text>
-
-  <xsl:choose>
-    <xsl:when test="@role">
-      <xsl:value-of select="@role"/>
-      <xsl:text>: </xsl:text>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:variable name="targets" select="key('id',@linkend)"/>
-      <xsl:variable name="target" select="$targets[1]"/>
-      <xsl:if test="$target/@role">
-        <xsl:value-of select="$target/@role"/>
-        <xsl:text>: </xsl:text>
-      </xsl:if>
-    </xsl:otherwise>
-  </xsl:choose>
-
-  <a href="{$href}">
-    <xsl:variable name="targets" select="key('id',@linkend)"/>
-    <xsl:variable name="target" select="$targets[1]"/>
-    <xsl:apply-templates select="$target" mode="title.markup"/>
-  </a>
-  <xsl:text>&#160;]</xsl:text>
-  <xsl:if test="following-sibling::constraint">
-    <br/>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="constraintdef">
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="anchor"/>
-    <xsl:apply-templates/>
-  </div>
-</xsl:template>
-
-<xsl:template match="constraintdef/title">
-  <p><b><xsl:apply-templates/></b></p>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/footnote.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/footnote.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,292 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exsl="http://exslt.org/common" xmlns="http://www.w3.org/1999/xhtml" exclude-result-prefixes="exsl" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<xsl:template match="footnote">
-  <xsl:variable name="name">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-  <xsl:variable name="href">
-    <xsl:text>#ftn.</xsl:text>
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="ancestor::tgroup">
-      <sup>
-        <xsl:text>[</xsl:text>
-        <a id="{$name}" href="{$href}">
-          <xsl:apply-templates select="." mode="class.attribute"/>
-          <xsl:apply-templates select="." mode="footnote.number"/>
-        </a>
-        <xsl:text>]</xsl:text>
-      </sup>
-    </xsl:when>
-    <xsl:otherwise>
-      <sup>
-        <xsl:text>[</xsl:text>
-        <a id="{$name}" href="{$href}">
-          <xsl:apply-templates select="." mode="class.attribute"/>
-          <xsl:apply-templates select="." mode="footnote.number"/>
-        </a>
-        <xsl:text>]</xsl:text>
-      </sup>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="footnoteref">
-  <xsl:variable name="targets" select="key('id',@linkend)"/>
-  <xsl:variable name="footnote" select="$targets[1]"/>
-
-  <xsl:variable name="target.href">
-    <xsl:call-template name="href.target">
-      <xsl:with-param name="object" select="$footnote"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="href">
-    <xsl:value-of select="substring-before($target.href, '#')"/>
-    <xsl:text>#ftn.</xsl:text>
-    <xsl:value-of select="substring-after($target.href, '#')"/>
-  </xsl:variable>
-
-  <sup>
-    <xsl:text>[</xsl:text>
-    <a href="{$href}">
-      <xsl:apply-templates select="." mode="class.attribute"/>
-      <xsl:apply-templates select="$footnote" mode="footnote.number"/>
-    </a>
-    <xsl:text>]</xsl:text>
-  </sup>
-</xsl:template>
-
-<xsl:template match="footnote" mode="footnote.number">
-  <xsl:choose>
-    <xsl:when test="string-length(@label) != 0">
-      <xsl:value-of select="@label"/>
-    </xsl:when>
-    <xsl:when test="ancestor::tgroup">
-      <xsl:variable name="tfnum">
-        <xsl:number level="any" from="table|informaltable" format="1"/>
-      </xsl:variable>
-
-      <xsl:choose>
-        <xsl:when test="string-length($table.footnote.number.symbols) &gt;= $tfnum">
-          <xsl:value-of select="substring($table.footnote.number.symbols, $tfnum, 1)"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:number level="any" from="tgroup" format="{$table.footnote.number.format}"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:variable name="pfoot" select="preceding::footnote[not(@label)]"/>
-      <xsl:variable name="ptfoot" select="preceding::tgroup//footnote"/>
-      <xsl:variable name="fnum" select="count($pfoot) - count($ptfoot) + 1"/>
-
-      <xsl:choose>
-        <xsl:when test="string-length($footnote.number.symbols) &gt;= $fnum">
-          <xsl:value-of select="substring($footnote.number.symbols, $fnum, 1)"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:number value="$fnum" format="{$footnote.number.format}"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="footnote/para[1]|footnote/simpara[1]" priority="2">
-  <!-- this only works if the first thing in a footnote is a para, -->
-  <!-- which is ok, because it usually is. -->
-  <xsl:variable name="name">
-    <xsl:text>ftn.</xsl:text>
-    <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="ancestor::footnote"/>
-    </xsl:call-template>
-  </xsl:variable>
-  <xsl:variable name="href">
-    <xsl:text>#</xsl:text>
-    <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="ancestor::footnote"/>
-    </xsl:call-template>
-  </xsl:variable>
-  <p>
-    <xsl:if test="@role and $para.propagates.style != 0">
-      <xsl:apply-templates select="." mode="class.attribute">
-        <xsl:with-param name="class" select="@role"/>
-      </xsl:apply-templates>
-    </xsl:if>
-    <sup>
-      <xsl:text>[</xsl:text>
-      <a id="{$name}" href="{$href}">
-        <xsl:apply-templates select="." mode="class.attribute"/>
-        <xsl:apply-templates select="ancestor::footnote" mode="footnote.number"/>
-      </a>
-      <xsl:text>] </xsl:text>
-    </sup>
-    <xsl:apply-templates/>
-  </p>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="*" mode="footnote.body.number">
-  <xsl:variable name="name">
-    <xsl:text>ftn.</xsl:text>
-    <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="ancestor::footnote"/>
-    </xsl:call-template>
-  </xsl:variable>
-  <xsl:variable name="href">
-    <xsl:text>#</xsl:text>
-    <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="ancestor::footnote"/>
-    </xsl:call-template>
-  </xsl:variable>
-  <xsl:variable name="footnote.mark">
-    <sup>
-      <xsl:text>[</xsl:text>
-      <a id="{$name}" href="{$href}">
-        <xsl:apply-templates select="." mode="class.attribute"/>
-        <xsl:apply-templates select="ancestor::footnote" mode="footnote.number"/>
-      </a>
-      <xsl:text>] </xsl:text>
-    </sup>
-  </xsl:variable>
-
-  <xsl:variable name="html">
-    <xsl:apply-templates select="."/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="function-available('exsl:node-set')">
-      <xsl:variable name="html-nodes" select="exsl:node-set($html)"/>
-      <xsl:choose>
-        <xsl:when test="$html-nodes//p">
-          <xsl:apply-templates select="$html-nodes" mode="insert.html.p">
-            <xsl:with-param name="mark" select="$footnote.mark"/>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates select="$html-nodes" mode="insert.html.text">
-            <xsl:with-param name="mark" select="$footnote.mark"/>
-          </xsl:apply-templates>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:copy-of select="$html"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<!--
-<xsl:template name="count-element-from">
-  <xsl:param name="from" select=".."/>
-  <xsl:param name="to" select="."/>
-  <xsl:param name="count" select="0"/>
-  <xsl:param name="list" select="$from/following::*[local-name(.)=local-name($to)]
-                                 |$from/descendant-or-self::*[local-name(.)=local-name($to)]"/>
-
-  <xsl:choose>
-    <xsl:when test="not($list)">
-      <xsl:text>-1</xsl:text>
-    </xsl:when>
-    <xsl:when test="$list[1] = $to">
-      <xsl:value-of select="$count + 1"/>
-    </xsl:when>
-    <xsl:otherwise>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
--->
-
-<!-- ==================================================================== -->
-
-<xsl:template name="process.footnotes">
-  <xsl:variable name="footnotes" select=".//footnote"/>
-  <xsl:variable name="table.footnotes" select=".//tgroup//footnote"/>
-
-  <!-- Only bother to do this if there's at least one non-table footnote -->
-  <xsl:if test="count($footnotes)&gt;count($table.footnotes)">
-    <div class="footnotes">
-      <br/>
-      <hr width="100" align="left"/>
-      <xsl:apply-templates select="$footnotes" mode="process.footnote.mode"/>
-    </div>
-  </xsl:if>
-
-  <xsl:if test="$annotation.support != 0 and //annotation">
-    <div class="annotation-list">
-      <div class="annotation-nocss">
-	<p>The following annotations are from this essay. You are seeing
-	them here because your browser doesn&#8217;t support the user-interface
-	techniques used to make them appear as &#8216;popups&#8217; on modern browsers.</p>
-      </div>
-
-      <xsl:apply-templates select="//annotation" mode="annotation-popup"/>
-    </div>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="process.chunk.footnotes">
-  <!-- nop -->
-</xsl:template>
-
-<xsl:template match="footnote" name="process.footnote" mode="process.footnote.mode">
-  <xsl:choose>
-    <xsl:when test="local-name(*[1]) = 'para' or local-name(*[1]) = 'simpara'">
-      <div>
-        <xsl:apply-templates select="." mode="class.attribute"/>
-        <xsl:apply-templates/>
-      </div>
-    </xsl:when>
-
-    <xsl:when test="$html.cleanup != 0 and function-available('exsl:node-set')">
-      <div>
-        <xsl:apply-templates select="." mode="class.attribute"/>
-        <xsl:apply-templates select="*[1]" mode="footnote.body.number"/>
-        <xsl:apply-templates select="*[position() &gt; 1]"/>
-      </div>
-    </xsl:when>
-
-    <xsl:otherwise>
-      <xsl:message>
-        <xsl:text>Warning: footnote number may not be generated </xsl:text>
-        <xsl:text>correctly; </xsl:text>
-        <xsl:value-of select="local-name(*[1])"/>
-        <xsl:text> unexpected as first child of footnote.</xsl:text>
-      </xsl:message>
-      <div>
-        <xsl:apply-templates select="." mode="class.attribute"/>
-        <xsl:apply-templates/>
-      </div>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="tgroup//footnote" mode="process.footnote.mode">
-</xsl:template>
-
-<xsl:template match="footnote" mode="table.footnote.mode">
-  <xsl:call-template name="process.footnote"/>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/formal.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/formal.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,386 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<xsl:param name="formal.object.break.after">1</xsl:param>
-
-<xsl:template name="formal.object">
-  <xsl:param name="placement" select="'before'"/>
-  <xsl:param name="class">
-    <xsl:apply-templates select="." mode="class.value"/>
-  </xsl:param>
-
-  <xsl:call-template name="id.warning"/>
-
-  <xsl:variable name="content">
-    <div class="{$class}">
-      <xsl:call-template name="anchor">
-        <xsl:with-param name="conditional" select="0"/>
-      </xsl:call-template>
-    
-      <xsl:choose>
-        <xsl:when test="$placement = 'before'">
-          <xsl:call-template name="formal.object.heading"/>
-          <div class="{$class}-contents">
-            <xsl:apply-templates/>
-          </div>
-          <!-- HACK: This doesn't belong inside formal.object; it 
-               should be done by the table template, but I want 
-               the link to be inside the DIV, so... -->
-          <xsl:if test="local-name(.) = 'table'">
-            <xsl:call-template name="table.longdesc"/>
-          </xsl:if>
-    
-          <xsl:if test="$spacing.paras != 0"><p/></xsl:if>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:if test="$spacing.paras != 0"><p/></xsl:if>
-          <div class="{$class}-contents"><xsl:apply-templates/></div>
-          <!-- HACK: This doesn't belong inside formal.object; it 
-               should be done by the table template, but I want 
-               the link to be inside the DIV, so... -->
-          <xsl:if test="local-name(.) = 'table'">
-            <xsl:call-template name="table.longdesc"/>
-          </xsl:if>
-    
-          <xsl:call-template name="formal.object.heading"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </div>
-    <xsl:if test="not($formal.object.break.after = '0')">
-      <br class="{$class}-break"/>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:variable name="floatstyle">
-    <xsl:call-template name="floatstyle"/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$floatstyle != ''">
-      <xsl:call-template name="floater">
-        <xsl:with-param name="class"><xsl:value-of select="$class"/>-float</xsl:with-param>
-        <xsl:with-param name="floatstyle" select="$floatstyle"/>
-        <xsl:with-param name="content" select="$content"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:copy-of select="$content"/>
-    </xsl:otherwise>
-  </xsl:choose>
-
-</xsl:template>
-
-<xsl:template name="formal.object.heading">
-  <xsl:param name="object" select="."/>
-  <xsl:param name="title">
-    <xsl:apply-templates select="$object" mode="object.title.markup">
-      <xsl:with-param name="allow-anchors" select="1"/>
-    </xsl:apply-templates>
-  </xsl:param>
-
-  <p class="title">
-    <b>
-      <xsl:copy-of select="$title"/>
-    </b>
-  </p>
-</xsl:template>
-
-<xsl:template name="informal.object">
-  <xsl:param name="class" select="local-name(.)"/>
-
-  <xsl:variable name="content">
-    <div class="{$class}">
-      <xsl:if test="$spacing.paras != 0"><p/></xsl:if>
-      <xsl:call-template name="anchor"/>
-      <xsl:apply-templates/>
-  
-      <!-- HACK: This doesn't belong inside formal.object; it 
-           should be done by the table template, but I want 
-           the link to be inside the DIV, so... -->
-      <xsl:if test="local-name(.) = 'informaltable'">
-        <xsl:call-template name="table.longdesc"/>
-      </xsl:if>
-  
-      <xsl:if test="$spacing.paras != 0"><p/></xsl:if>
-    </div>
-  </xsl:variable>
-
-  <xsl:variable name="floatstyle">
-    <xsl:call-template name="floatstyle"/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$floatstyle != ''">
-      <xsl:call-template name="floater">
-        <xsl:with-param name="class"><xsl:value-of select="$class"/>-float</xsl:with-param>
-        <xsl:with-param name="floatstyle" select="$floatstyle"/>
-        <xsl:with-param name="content" select="$content"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:copy-of select="$content"/>
-    </xsl:otherwise>
-  </xsl:choose>
-
-</xsl:template>
-
-<xsl:template name="semiformal.object">
-  <xsl:param name="placement" select="'before'"/>
-  <xsl:param name="class" select="local-name(.)"/>
-
-  <xsl:choose>
-    <xsl:when test="title">
-      <xsl:call-template name="formal.object">
-        <xsl:with-param name="placement" select="$placement"/>
-        <xsl:with-param name="class" select="$class"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="informal.object">
-        <xsl:with-param name="class" select="$class"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="figure">
-  <xsl:variable name="param.placement" select="substring-after(normalize-space($formal.title.placement),                                         concat(local-name(.), ' '))"/>
-
-  <xsl:variable name="placement">
-    <xsl:choose>
-      <xsl:when test="contains($param.placement, ' ')">
-        <xsl:value-of select="substring-before($param.placement, ' ')"/>
-      </xsl:when>
-      <xsl:when test="$param.placement = ''">before</xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$param.placement"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:call-template name="formal.object">
-    <xsl:with-param name="placement" select="$placement"/>
-  </xsl:call-template>
-
-</xsl:template>
-
-<xsl:template match="table">
-  <xsl:choose>
-    <xsl:when test="tgroup|mediaobject|graphic">
-      <xsl:call-template name="calsTable"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:copy>
-        <xsl:copy-of select="@*[not(local-name()='id')]"/>
-        <xsl:attribute name="id">
-          <xsl:call-template name="object.id"/>
-        </xsl:attribute>
-        <xsl:call-template name="htmlTable"/>
-      </xsl:copy>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="calsTable">
-  <xsl:if test="tgroup/tbody/tr                 |tgroup/thead/tr                 |tgroup/tfoot/tr">
-    <xsl:message terminate="yes">Broken table: tr descendent of CALS Table.</xsl:message>
-  </xsl:if>
-
-  <xsl:variable name="param.placement" select="substring-after(normalize-space($formal.title.placement),                                         concat(local-name(.), ' '))"/>
-
-  <xsl:variable name="placement">
-    <xsl:choose>
-      <xsl:when test="contains($param.placement, ' ')">
-        <xsl:value-of select="substring-before($param.placement, ' ')"/>
-      </xsl:when>
-      <xsl:when test="$param.placement = ''">before</xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$param.placement"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:call-template name="formal.object">
-    <xsl:with-param name="placement" select="$placement"/>
-    <xsl:with-param name="class">
-      <xsl:choose>
-        <xsl:when test="@tabstyle">
-          <!-- hack, this will only ever occur on table, not example -->
-          <xsl:value-of select="@tabstyle"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="local-name(.)"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="htmlTable">
-  <xsl:if test="tgroup/tbody/row                 |tgroup/thead/row                 |tgroup/tfoot/row">
-    <xsl:message terminate="yes">Broken table: row descendent of HTML table.</xsl:message>
-  </xsl:if>
-
-  <xsl:apply-templates mode="htmlTable"/>
-</xsl:template>
-
-<xsl:template match="example">
-  <xsl:variable name="param.placement" select="substring-after(normalize-space($formal.title.placement),                      concat(local-name(.), ' '))"/>
-
-  <xsl:variable name="placement">
-    <xsl:choose>
-      <xsl:when test="contains($param.placement, ' ')">
-        <xsl:value-of select="substring-before($param.placement, ' ')"/>
-      </xsl:when>
-      <xsl:when test="$param.placement = ''">before</xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$param.placement"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:call-template name="formal.object">
-    <xsl:with-param name="placement" select="$placement"/>
-  </xsl:call-template>
-
-</xsl:template>
-
-<xsl:template match="equation">
-  <xsl:variable name="param.placement" select="substring-after(normalize-space($formal.title.placement),                                       concat(local-name(.), ' '))"/>
-
-  <xsl:variable name="placement">
-    <xsl:choose>
-      <xsl:when test="contains($param.placement, ' ')">
-        <xsl:value-of select="substring-before($param.placement, ' ')"/>
-      </xsl:when>
-      <xsl:when test="$param.placement = ''">before</xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$param.placement"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:call-template name="formal.object">
-    <xsl:with-param name="placement" select="$placement"/>
-  </xsl:call-template>
-
-</xsl:template>
-
-<xsl:template match="figure/title"/>
-<xsl:template match="figure/titleabbrev"/>
-<xsl:template match="table/title"/>
-<xsl:template match="table/titleabbrev"/>
-<xsl:template match="table/textobject"/>
-<xsl:template match="example/title"/>
-<xsl:template match="example/titleabbrev"/>
-<xsl:template match="equation/title"/>
-<xsl:template match="equation/titleabbrev"/>
-
-<xsl:template match="informalfigure">
-  <xsl:call-template name="informal.object"/>
-</xsl:template>
-
-<xsl:template match="informalexample">
-  <xsl:call-template name="informal.object"/>
-</xsl:template>
-
-<xsl:template match="informaltable">
-  <xsl:choose>
-    <xsl:when test="tgroup|mediaobject|graphic">
-      <xsl:call-template name="informal.object">
-        <xsl:with-param name="class">
-          <xsl:choose>
-            <xsl:when test="@tabstyle">
-              <xsl:value-of select="@tabstyle"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:value-of select="local-name(.)"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <table>
-        <xsl:copy-of select="@*"/>
-        <xsl:call-template name="htmlTable"/>
-      </table>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="informaltable/textobject"/>
-
-<xsl:template name="table.longdesc">
-  <!-- HACK: This doesn't belong inside formal.objectt; it should be done by -->
-  <!-- the table template, but I want the link to be inside the DIV, so... -->
-  <xsl:variable name="longdesc.uri">
-    <xsl:call-template name="longdesc.uri">
-      <xsl:with-param name="mediaobject" select="."/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="irrelevant">
-    <!-- write.longdesc returns the filename ... -->
-    <xsl:call-template name="write.longdesc">
-      <xsl:with-param name="mediaobject" select="."/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:if test="$html.longdesc != 0 and $html.longdesc.link != 0                 and textobject[not(phrase)]">
-    <xsl:call-template name="longdesc.link">
-      <xsl:with-param name="longdesc.uri" select="$longdesc.uri"/>
-    </xsl:call-template>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="informalequation">
-  <xsl:call-template name="informal.object"/>
-</xsl:template>
-
-<xsl:template name="floatstyle">
-  <xsl:if test="(@float and @float != '0') or @floatstyle != ''">
-    <xsl:choose>
-      <xsl:when test="@floatstyle != ''">
-        <xsl:value-of select="@floatstyle"/>
-      </xsl:when>
-      <xsl:when test="@float = '1'">
-        <xsl:value-of select="$default.float.class"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="@float"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="floater">
-  <xsl:param name="content"/>
-  <xsl:param name="class" select="'float'"/>
-  <xsl:param name="floatstyle" select="'left'"/>
-
-  <div class="{$class}">
-    <xsl:if test="$floatstyle = 'left' or $floatstyle = 'right'">
-      <xsl:attribute name="style">
-        <xsl:text>float: </xsl:text>
-        <xsl:value-of select="$floatstyle"/>
-        <xsl:text>;</xsl:text>
-      </xsl:attribute>
-    </xsl:if>
-    <xsl:copy-of select="$content"/>
-  </div>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/glossary.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/glossary.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,548 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:template match="glossary">
-  
-<xsl:variable name="language">
-  <xsl:call-template name="l10n.language"/>
-</xsl:variable>
-
-<xsl:variable name="lowercase">
-  <xsl:call-template name="gentext">
-    <xsl:with-param name="key">normalize.sort.input</xsl:with-param>
-  </xsl:call-template>
-</xsl:variable>
-
-<xsl:variable name="uppercase">
-  <xsl:call-template name="gentext">
-    <xsl:with-param name="key">normalize.sort.output</xsl:with-param>
-  </xsl:call-template>
-</xsl:variable>
-
-  <xsl:call-template name="id.warning"/>
-
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:if test="$generate.id.attributes != 0">
-      <xsl:attribute name="id">
-        <xsl:call-template name="object.id"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <xsl:call-template name="glossary.titlepage"/>
-
-    <xsl:choose>
-      <xsl:when test="glossdiv">
-        <xsl:apply-templates select="(glossdiv[1]/preceding-sibling::*)"/>
-      </xsl:when>
-      <xsl:when test="glossentry">
-        <xsl:apply-templates select="(glossentry[1]/preceding-sibling::*)"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:apply-templates/>
-      </xsl:otherwise>
-    </xsl:choose>
-
-    <xsl:choose>
-      <xsl:when test="glossdiv">
-        <xsl:apply-templates select="glossdiv"/>
-      </xsl:when>
-      <xsl:when test="glossentry">
-        <dl>
-          <xsl:choose>
-            <xsl:when test="$glossary.sort != 0">
-              <xsl:apply-templates select="glossentry">
-                <xsl:sort lang="{$language}" select="translate(glossterm, $lowercase,                                              $uppercase)"/>
-              </xsl:apply-templates>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:apply-templates select="glossentry"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </dl>
-      </xsl:when>
-      <xsl:otherwise>
-        <!-- empty glossary -->
-      </xsl:otherwise>
-    </xsl:choose>
-
-    <xsl:if test="not(parent::article)">
-      <xsl:call-template name="process.footnotes"/>
-    </xsl:if>
-  </div>
-</xsl:template>
-
-<xsl:template match="glossary/glossaryinfo"/>
-<xsl:template match="glossary/info"/>
-<xsl:template match="glossary/title"/>
-<xsl:template match="glossary/subtitle"/>
-<xsl:template match="glossary/titleabbrev"/>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="glosslist">
-  
-<xsl:variable name="language">
-  <xsl:call-template name="l10n.language"/>
-</xsl:variable>
-
-<xsl:variable name="lowercase">
-  <xsl:call-template name="gentext">
-    <xsl:with-param name="key">normalize.sort.input</xsl:with-param>
-  </xsl:call-template>
-</xsl:variable>
-
-<xsl:variable name="uppercase">
-  <xsl:call-template name="gentext">
-    <xsl:with-param name="key">normalize.sort.output</xsl:with-param>
-  </xsl:call-template>
-</xsl:variable>
-
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="anchor"/>
-    <xsl:if test="blockinfo/title|info/title|title">
-      <xsl:call-template name="formal.object.heading"/>
-    </xsl:if>
-    <dl>
-      <xsl:choose>
-        <xsl:when test="$glossary.sort != 0">
-          <xsl:apply-templates select="glossentry">
-            <xsl:sort lang="{$language}" select="translate(glossterm, $lowercase,                                          $uppercase)"/>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates select="glossentry"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </dl>
-  </div>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="glossdiv">
-  
-<xsl:variable name="language">
-  <xsl:call-template name="l10n.language"/>
-</xsl:variable>
-
-<xsl:variable name="lowercase">
-  <xsl:call-template name="gentext">
-    <xsl:with-param name="key">normalize.sort.input</xsl:with-param>
-  </xsl:call-template>
-</xsl:variable>
-
-<xsl:variable name="uppercase">
-  <xsl:call-template name="gentext">
-    <xsl:with-param name="key">normalize.sort.output</xsl:with-param>
-  </xsl:call-template>
-</xsl:variable>
-
-  <xsl:call-template name="id.warning"/>
-
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates select="(glossentry[1]/preceding-sibling::*)"/>
-
-    <dl>
-      <xsl:choose>
-        <xsl:when test="$glossary.sort != 0">
-          <xsl:apply-templates select="glossentry">
-            <xsl:sort lang="{$language}" select="translate(glossterm, $lowercase,                                          $uppercase)"/>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates select="glossentry"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </dl>
-  </div>
-</xsl:template>
-
-<xsl:template match="glossdiv/title">
-  <h3>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates/>
-  </h3>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<!--
-GlossEntry ::=
-  GlossTerm, Acronym?, Abbrev?,
-  (IndexTerm)*,
-  RevHistory?,
-  (GlossSee | GlossDef+)
--->
-
-<xsl:template match="glossentry">
-  <xsl:choose>
-    <xsl:when test="$glossentry.show.acronym = 'primary'">
-      <dt>
-        <xsl:call-template name="anchor">
-          <xsl:with-param name="conditional">
-            <xsl:choose>
-              <xsl:when test="$glossterm.auto.link != 0">0</xsl:when>
-              <xsl:otherwise>1</xsl:otherwise>
-            </xsl:choose>
-          </xsl:with-param>
-        </xsl:call-template>
-
-        <xsl:choose>
-          <xsl:when test="acronym|abbrev">
-            <xsl:apply-templates select="acronym|abbrev"/>
-            <xsl:text> (</xsl:text>
-            <xsl:apply-templates select="glossterm"/>
-            <xsl:text>)</xsl:text>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:apply-templates select="glossterm"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </dt>
-    </xsl:when>
-    <xsl:when test="$glossentry.show.acronym = 'yes'">
-      <dt>
-        <xsl:call-template name="anchor">
-          <xsl:with-param name="conditional">
-            <xsl:choose>
-              <xsl:when test="$glossterm.auto.link != 0">0</xsl:when>
-              <xsl:otherwise>1</xsl:otherwise>
-            </xsl:choose>
-          </xsl:with-param>
-        </xsl:call-template>
-
-        <xsl:apply-templates select="glossterm"/>
-
-        <xsl:if test="acronym|abbrev">
-          <xsl:text> (</xsl:text>
-          <xsl:apply-templates select="acronym|abbrev"/>
-          <xsl:text>)</xsl:text>
-        </xsl:if>
-      </dt>
-    </xsl:when>
-    <xsl:otherwise>
-      <dt>
-        <xsl:call-template name="anchor">
-          <xsl:with-param name="conditional">
-            <xsl:choose>
-              <xsl:when test="$glossterm.auto.link != 0">0</xsl:when>
-              <xsl:otherwise>1</xsl:otherwise>
-            </xsl:choose>
-          </xsl:with-param>
-        </xsl:call-template>
-
-        <xsl:apply-templates select="glossterm"/>
-      </dt>
-    </xsl:otherwise>
-  </xsl:choose>
-
-  <xsl:apply-templates select="indexterm|revhistory|glosssee|glossdef"/>
-</xsl:template>
-
-<xsl:template match="glossentry/glossterm">
-  <xsl:apply-templates/>
-  <xsl:if test="following-sibling::glossterm">, </xsl:if>
-</xsl:template>
-
-<xsl:template match="glossentry/acronym">
-  <xsl:apply-templates/>
-  <xsl:if test="following-sibling::acronym|following-sibling::abbrev">, </xsl:if>
-</xsl:template>
-
-<xsl:template match="glossentry/abbrev">
-  <xsl:apply-templates/>
-  <xsl:if test="following-sibling::acronym|following-sibling::abbrev">, </xsl:if>
-</xsl:template>
-
-<xsl:template match="glossentry/revhistory">
-</xsl:template>
-
-<xsl:template match="glossentry/glosssee">
-  <xsl:variable name="otherterm" select="@otherterm"/>
-  <xsl:variable name="targets" select="key('id', $otherterm)"/>
-  <xsl:variable name="target" select="$targets[1]"/>
-
-  <dd>
-    <p>
-      <xsl:variable name="template">
-        <xsl:call-template name="gentext.template">
-          <xsl:with-param name="context" select="'glossary'"/>
-          <xsl:with-param name="name" select="'see'"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <xsl:variable name="title">
-        <xsl:choose>
-          <xsl:when test="$target">
-            <a>
-              <xsl:apply-templates select="." mode="class.attribute"/>
-              <xsl:attribute name="href">
-                <xsl:call-template name="href.target">
-                  <xsl:with-param name="object" select="$target"/>
-                </xsl:call-template>
-              </xsl:attribute>
-              <xsl:apply-templates select="$target" mode="xref-to"/>
-            </a>
-          </xsl:when>
-          <xsl:when test="$otherterm != '' and not($target)">
-            <xsl:message>
-              <xsl:text>Warning: glosssee @otherterm reference not found: </xsl:text>
-              <xsl:value-of select="$otherterm"/>
-            </xsl:message>
-            <xsl:apply-templates/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:apply-templates/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-
-      <xsl:call-template name="substitute-markup">
-        <xsl:with-param name="template" select="$template"/>
-        <xsl:with-param name="title" select="$title"/>
-      </xsl:call-template>
-      <xsl:text>.</xsl:text>
-    </p>
-  </dd>
-</xsl:template>
-
-<xsl:template match="glossentry/glossdef">
-  <dd>
-    <xsl:apply-templates select="*[local-name(.) != 'glossseealso']"/>
-    <xsl:if test="glossseealso">
-      <p>
-        <xsl:variable name="template">
-          <xsl:call-template name="gentext.template">
-            <xsl:with-param name="context" select="'glossary'"/>
-            <xsl:with-param name="name" select="'seealso'"/>
-          </xsl:call-template>
-        </xsl:variable>
-        <xsl:variable name="title">
-          <xsl:apply-templates select="glossseealso"/>
-        </xsl:variable>
-        <xsl:call-template name="substitute-markup">
-          <xsl:with-param name="template" select="$template"/>
-          <xsl:with-param name="title" select="$title"/>
-        </xsl:call-template>
-      </p>
-    </xsl:if>
-  </dd>
-</xsl:template>
-
-<xsl:template match="glossseealso">
-  <xsl:variable name="otherterm" select="@otherterm"/>
-  <xsl:variable name="targets" select="key('id', $otherterm)"/>
-  <xsl:variable name="target" select="$targets[1]"/>
-
-  <xsl:choose>
-    <xsl:when test="$target">
-      <a>
-        <xsl:apply-templates select="." mode="class.attribute"/>
-        <xsl:attribute name="href">
-          <xsl:call-template name="href.target">
-            <xsl:with-param name="object" select="$target"/>
-          </xsl:call-template>
-        </xsl:attribute>
-        <xsl:apply-templates select="$target" mode="xref-to"/>
-      </a>
-    </xsl:when>
-    <xsl:when test="$otherterm != '' and not($target)">
-      <xsl:message>
-        <xsl:text>Warning: glossseealso @otherterm reference not found: </xsl:text>
-        <xsl:value-of select="$otherterm"/>
-      </xsl:message>
-      <xsl:apply-templates/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates/>
-    </xsl:otherwise>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="position() = last()">
-      <xsl:text>.</xsl:text>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:text>, </xsl:text>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<!-- Glossary collection -->
-
-<xsl:template match="glossary[@role='auto']" priority="2">
-  
-<xsl:variable name="language">
-  <xsl:call-template name="l10n.language"/>
-</xsl:variable>
-
-<xsl:variable name="lowercase">
-  <xsl:call-template name="gentext">
-    <xsl:with-param name="key">normalize.sort.input</xsl:with-param>
-  </xsl:call-template>
-</xsl:variable>
-
-<xsl:variable name="uppercase">
-  <xsl:call-template name="gentext">
-    <xsl:with-param name="key">normalize.sort.output</xsl:with-param>
-  </xsl:call-template>
-</xsl:variable>
-
-  <xsl:variable name="terms" select="//glossterm[not(parent::glossdef)]|//firstterm"/>
-  <xsl:variable name="collection" select="document($glossary.collection, .)"/>
-
-  <xsl:call-template name="id.warning"/>
-
-  <xsl:if test="$glossary.collection = ''">
-    <xsl:message>
-      <xsl:text>Warning: processing automatic glossary </xsl:text>
-      <xsl:text>without a glossary.collection file.</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <xsl:if test="not($collection) and $glossary.collection != ''">
-    <xsl:message>
-      <xsl:text>Warning: processing automatic glossary but unable to </xsl:text>
-      <xsl:text>open glossary.collection file '</xsl:text>
-      <xsl:value-of select="$glossary.collection"/>
-      <xsl:text>'</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:if test="$generate.id.attributes != 0">
-      <xsl:attribute name="id">
-        <xsl:call-template name="object.id"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <xsl:call-template name="glossary.titlepage"/>
-
-    <xsl:choose>
-      <xsl:when test="glossdiv and $collection//glossdiv">
-        <xsl:for-each select="$collection//glossdiv">
-          <!-- first see if there are any in this div -->
-          <xsl:variable name="exist.test">
-            <xsl:for-each select="glossentry">
-              <xsl:variable name="cterm" select="glossterm"/>
-              <xsl:if test="$terms[@baseform = $cterm or . = $cterm]">
-                <xsl:value-of select="glossterm"/>
-              </xsl:if>
-            </xsl:for-each>
-          </xsl:variable>
-
-          <xsl:if test="$exist.test != ''">
-            <xsl:apply-templates select="." mode="auto-glossary">
-              <xsl:with-param name="terms" select="$terms"/>
-            </xsl:apply-templates>
-          </xsl:if>
-        </xsl:for-each>
-      </xsl:when>
-      <xsl:otherwise>
-        <dl>
-          <xsl:choose>
-            <xsl:when test="$glossary.sort != 0">
-              <xsl:for-each select="$collection//glossentry">
-                <xsl:sort lang="{$language}" select="translate(glossterm, $lowercase,                                              $uppercase)"/>
-                <xsl:variable name="cterm" select="glossterm"/>
-                <xsl:if test="$terms[@baseform = $cterm or . = $cterm]">
-                  <xsl:apply-templates select="." mode="auto-glossary"/>
-                </xsl:if>
-              </xsl:for-each>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:for-each select="$collection//glossentry">
-                <xsl:variable name="cterm" select="glossterm"/>
-                <xsl:if test="$terms[@baseform = $cterm or . = $cterm]">
-                  <xsl:apply-templates select="." mode="auto-glossary"/>
-                </xsl:if>
-              </xsl:for-each>
-            </xsl:otherwise>
-          </xsl:choose>
-        </dl>
-      </xsl:otherwise>
-    </xsl:choose>
-
-    <xsl:if test="not(parent::article)">
-      <xsl:call-template name="process.footnotes"/>
-    </xsl:if>
-  </div>
-</xsl:template>
-
-<xsl:template match="*" mode="auto-glossary">
-  <!-- pop back out to the default mode for most elements -->
-  <xsl:apply-templates select="."/>
-</xsl:template>
-
-<xsl:template match="glossdiv" mode="auto-glossary">
-  <xsl:param name="terms" select="."/>
-
-  
-<xsl:variable name="language">
-  <xsl:call-template name="l10n.language"/>
-</xsl:variable>
-
-<xsl:variable name="lowercase">
-  <xsl:call-template name="gentext">
-    <xsl:with-param name="key">normalize.sort.input</xsl:with-param>
-  </xsl:call-template>
-</xsl:variable>
-
-<xsl:variable name="uppercase">
-  <xsl:call-template name="gentext">
-    <xsl:with-param name="key">normalize.sort.output</xsl:with-param>
-  </xsl:call-template>
-</xsl:variable>
-
-
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates select="(glossentry[1]/preceding-sibling::*)"/>
-
-    <dl>
-      <xsl:choose>
-        <xsl:when test="$glossary.sort != 0">
-          <xsl:for-each select="glossentry">
-            <xsl:sort lang="{$language}" select="translate(glossterm, $lowercase,                                          $uppercase)"/>
-            <xsl:variable name="cterm" select="glossterm"/>
-            <xsl:if test="$terms[@baseform = $cterm or . = $cterm]">
-              <xsl:apply-templates select="." mode="auto-glossary"/>
-            </xsl:if>
-          </xsl:for-each>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:for-each select="glossentry">
-            <xsl:variable name="cterm" select="glossterm"/>
-            <xsl:if test="$terms[@baseform = $cterm or . = $cterm]">
-              <xsl:apply-templates select="." mode="auto-glossary"/>
-            </xsl:if>
-          </xsl:for-each>
-        </xsl:otherwise>
-      </xsl:choose>
-    </dl>
-  </div>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/graphics.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/graphics.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,1414 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:stext="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.TextFactory" xmlns:simg="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.ImageIntrinsics" xmlns:ximg="xalan://com.nwalsh.xalan.ImageIntrinsics" xmlns:xtext="xalan://com.nwalsh.xalan.Text" xmlns:lxslt="http://xml.apache.org/xslt" xmlns="http://www.w3.org/1999/xhtml" exclude-result-prefixes="xlink stext xtext lxslt simg ximg" extension-element-prefixes="stext xtext" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     Contributors:
-     Colin Paul Adams, <colin@colina.demon.co.uk>
-
-     ******************************************************************** -->
-
-<lxslt:component prefix="xtext" elements="insertfile"/>
-<lxslt:component prefix="ximg" functions="new getWidth getDepth"/>
-
-<!-- ==================================================================== -->
-<!-- Graphic format tests for the HTML backend -->
-
-<xsl:template name="is.graphic.format">
-  <xsl:param name="format"/>
-  <xsl:if test="$format = 'SVG'                 or $format = 'PNG'                 or $format = 'JPG'                 or $format = 'JPEG'                 or $format = 'linespecific'                 or $format = 'GIF'                 or $format = 'GIF87a'                 or $format = 'GIF89a'                 or $format = 'BMP'">1</xsl:if>
-</xsl:template>
-
-<xsl:template name="is.graphic.extension">
-  <xsl:param name="ext"/>
-  <xsl:variable name="lcext" select="translate($ext,                                        'ABCDEFGHIJKLMNOPQRSTUVWXYZ',                                        'abcdefghijklmnopqrstuvwxyz')"/>
-  <xsl:if test="$lcext = 'svg'              or $lcext = 'png'              or $lcext = 'jpeg'              or $lcext = 'jpg'              or $lcext = 'avi'              or $lcext = 'mpg'              or $lcext = 'mpeg'              or $lcext = 'qt'              or $lcext = 'gif'              or $lcext = 'bmp'">1</xsl:if>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="screenshot">
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates/>
-  </div>
-</xsl:template>
-
-<xsl:template match="screeninfo">
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="process.image">
-  <!-- When this template is called, the current node should be  -->
-  <!-- a graphic, inlinegraphic, imagedata, or videodata. All    -->
-  <!-- those elements have the same set of attributes, so we can -->
-  <!-- handle them all in one place.                             -->
-  <xsl:param name="tag" select="'img'"/>
-  <xsl:param name="alt"/>
-  <xsl:param name="longdesc"/>
-
-  <!-- The HTML img element only supports the notion of content-area
-       scaling; it doesn't support the distinction between a
-       content-area and a viewport-area, so we have to make some
-       compromises.
-
-       1. If only the content-area is specified, everything is fine.
-          (If you ask for a three inch image, that's what you'll get.)
-
-       2. If only the viewport-area is provided:
-          - If scalefit=1, treat it as both the content-area and
-            the viewport-area. (If you ask for an image in a five inch
-            area, we'll make the image five inches to fill that area.)
-          - If scalefit=0, ignore the viewport-area specification.
-
-          Note: this is not quite the right semantic and has the additional
-          problem that it can result in anamorphic scaling, which scalefit
-          should never cause.
-
-       3. If both the content-area and the viewport-area is specified
-          on a graphic element, ignore the viewport-area.
-          (If you ask for a three inch image in a five inch area, we'll assume
-           it's better to give you a three inch image in an unspecified area
-           than a five inch image in a five inch area.
-
-       Relative units also cause problems. As a general rule, the stylesheets
-       are operating too early and too loosely coupled with the rendering engine
-       to know things like the current font size or the actual dimensions of
-       an image. Therefore:
-
-       1. We use a fixed size for pixels, $pixels.per.inch
-
-       2. We use a fixed size for "em"s, $points.per.em
-
-       Percentages are problematic. In the following discussion, we speak
-       of width and contentwidth, but the same issues apply to depth and
-       contentdepth
-
-       1. A width of 50% means "half of the available space for the image."
-          That's fine. But note that in HTML, this is a dynamic property and
-          the image size will vary if the browser window is resized.
-
-       2. A contentwidth of 50% means "half of the actual image width". But
-          the stylesheets have no way to assess the image's actual size. Treating
-          this as a width of 50% is one possibility, but it produces behavior
-          (dynamic scaling) that seems entirely out of character with the
-          meaning.
-
-          Instead, the stylesheets define a $nominal.image.width
-          and convert percentages to actual values based on that nominal size.
-
-       Scale can be problematic. Scale applies to the contentwidth, so
-       a scale of 50 when a contentwidth is not specified is analagous to a
-       width of 50%. (If a contentwidth is specified, the scaling factor can
-       be applied to that value and no problem exists.)
-
-       If scale is specified but contentwidth is not supplied, the
-       nominal.image.width is used to calculate a base size
-       for scaling.
-
-       Warning: as a consequence of these decisions, unless the aspect ratio
-       of your image happens to be exactly the same as (nominal width / nominal height),
-       specifying contentwidth="50%" and contentdepth="50%" is NOT going to
-       scale the way you expect (or really, the way it should).
-
-       Don't do that. In fact, a percentage value is not recommended for content
-       size at all. Use scale instead.
-
-       Finally, align and valign are troublesome. Horizontal alignment is now
-       supported by wrapping the image in a <div align="{@align}"> (in block
-       contexts!). I can't think of anything (practical) to do about vertical
-       alignment.
-  -->
-
-  <xsl:variable name="width-units">
-    <xsl:choose>
-      <xsl:when test="$ignore.image.scaling != 0"/>
-      <xsl:when test="@width">
-        <xsl:call-template name="length-units">
-          <xsl:with-param name="length" select="@width"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:when test="not(@depth) and $default.image.width != ''">
-        <xsl:call-template name="length-units">
-          <xsl:with-param name="length" select="$default.image.width"/>
-        </xsl:call-template>
-      </xsl:when>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="width">
-    <xsl:choose>
-      <xsl:when test="$ignore.image.scaling != 0"/>
-      <xsl:when test="@width">
-        <xsl:choose>
-          <xsl:when test="$width-units = '%'">
-            <xsl:value-of select="@width"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:call-template name="length-spec">
-              <xsl:with-param name="length" select="@width"/>
-            </xsl:call-template>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-      <xsl:when test="not(@depth) and $default.image.width != ''">
-        <xsl:value-of select="$default.image.width"/>
-      </xsl:when>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="scalefit">
-    <xsl:choose>
-      <xsl:when test="$ignore.image.scaling != 0">0</xsl:when>
-      <xsl:when test="@contentwidth or @contentdepth">0</xsl:when>
-      <xsl:when test="@scale">0</xsl:when>
-      <xsl:when test="@scalefit"><xsl:value-of select="@scalefit"/></xsl:when>
-      <xsl:when test="$width != '' or @depth">1</xsl:when>
-      <xsl:otherwise>0</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="scale">
-    <xsl:choose>
-      <xsl:when test="$ignore.image.scaling != 0">1.0</xsl:when>
-      <xsl:when test="@contentwidth or @contentdepth">1.0</xsl:when>
-      <xsl:when test="@scale">
-        <xsl:value-of select="@scale div 100.0"/>
-      </xsl:when>
-      <xsl:otherwise>1.0</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="filename">
-    <xsl:choose>
-      <xsl:when test="local-name(.) = 'graphic'                       or local-name(.) = 'inlinegraphic'">
-        <!-- handle legacy graphic and inlinegraphic by new template --> 
-        <xsl:call-template name="mediaobject.filename">
-          <xsl:with-param name="object" select="."/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <!-- imagedata, videodata, audiodata -->
-        <xsl:call-template name="mediaobject.filename">
-          <xsl:with-param name="object" select=".."/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="output_filename">
-    <xsl:choose>
-      <xsl:when test="@entityref">
-        <xsl:value-of select="$filename"/>
-      </xsl:when>
-      <!--
-        Moved test for $keep.relative.image.uris to template below:
-            <xsl:template match="@fileref">
-      -->
-      <xsl:otherwise>
-        <xsl:value-of select="$filename"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="img.src.path.pi">
-    <xsl:call-template name="pi.dbhtml_img.src.path">
-      <xsl:with-param name="node" select=".."/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="filename.for.graphicsize">
-    <xsl:choose>
-      <xsl:when test="$img.src.path.pi != ''">
-        <xsl:value-of select="concat($img.src.path.pi, $filename)"/>
-      </xsl:when>
-      <xsl:when test="$img.src.path != '' and                       $graphicsize.use.img.src.path != 0 and                       $tag = 'img' and                       not(starts-with($filename, '/')) and                       not(contains($filename, '://'))">
-        <xsl:value-of select="concat($img.src.path, $filename)"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$filename"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="realintrinsicwidth">
-    <!-- This funny compound test works around a bug in XSLTC -->
-    <xsl:choose>
-      <xsl:when test="$use.extensions != 0 and $graphicsize.extension != 0">
-        <xsl:choose>
-          <xsl:when test="function-available('simg:getWidth')">
-            <xsl:value-of select="simg:getWidth(simg:new($filename.for.graphicsize),                                                 $nominal.image.width)"/>
-          </xsl:when>
-          <xsl:when test="function-available('ximg:getWidth')">
-            <xsl:value-of select="ximg:getWidth(ximg:new($filename.for.graphicsize),                                                 $nominal.image.width)"/>
-          </xsl:when>
-          <xsl:otherwise>
-           <xsl:value-of select="0"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="0"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="intrinsicwidth">
-    <xsl:choose>
-      <xsl:when test="$realintrinsicwidth = 0">
-       <xsl:value-of select="$nominal.image.width"/>
-      </xsl:when>
-      <xsl:otherwise>
-       <xsl:value-of select="$realintrinsicwidth"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="intrinsicdepth">
-    <!-- This funny compound test works around a bug in XSLTC -->
-    <xsl:choose>
-      <xsl:when test="$use.extensions != 0 and $graphicsize.extension != 0">
-        <xsl:choose>
-          <xsl:when test="function-available('simg:getDepth')">
-            <xsl:value-of select="simg:getDepth(simg:new($filename.for.graphicsize),                                                 $nominal.image.depth)"/>
-          </xsl:when>
-          <xsl:when test="function-available('ximg:getDepth')">
-            <xsl:value-of select="ximg:getDepth(ximg:new($filename.for.graphicsize),                                                 $nominal.image.depth)"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="$nominal.image.depth"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$nominal.image.depth"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="contentwidth">
-    <xsl:choose>
-      <xsl:when test="$ignore.image.scaling != 0"/>
-      <xsl:when test="@contentwidth">
-        <xsl:variable name="units">
-          <xsl:call-template name="length-units">
-            <xsl:with-param name="length" select="@contentwidth"/>
-          </xsl:call-template>
-        </xsl:variable>
-
-        <xsl:choose>
-          <xsl:when test="$units = '%'">
-            <xsl:variable name="cmagnitude">
-              <xsl:call-template name="length-magnitude">
-                <xsl:with-param name="length" select="@contentwidth"/>
-              </xsl:call-template>
-            </xsl:variable>
-            <xsl:value-of select="$intrinsicwidth * $cmagnitude div 100.0"/>
-            <xsl:text>px</xsl:text>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:call-template name="length-spec">
-              <xsl:with-param name="length" select="@contentwidth"/>
-            </xsl:call-template>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$intrinsicwidth"/>
-        <xsl:text>px</xsl:text>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="scaled.contentwidth">
-    <xsl:if test="$contentwidth != ''">
-      <xsl:variable name="cwidth.in.points">
-        <xsl:call-template name="length-in-points">
-          <xsl:with-param name="length" select="$contentwidth"/>
-          <xsl:with-param name="pixels.per.inch" select="$pixels.per.inch"/>
-          <xsl:with-param name="em.size" select="$points.per.em"/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:value-of select="$cwidth.in.points div 72.0 * $pixels.per.inch * $scale"/>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:variable name="html.width">
-    <xsl:choose>
-      <xsl:when test="$ignore.image.scaling != 0"/>
-      <xsl:when test="$width-units = '%'">
-        <xsl:value-of select="$width"/>
-      </xsl:when>
-      <xsl:when test="$width != ''">
-        <xsl:variable name="width.in.points">
-          <xsl:call-template name="length-in-points">
-            <xsl:with-param name="length" select="$width"/>
-            <xsl:with-param name="pixels.per.inch" select="$pixels.per.inch"/>
-            <xsl:with-param name="em.size" select="$points.per.em"/>
-          </xsl:call-template>
-        </xsl:variable>
-        <xsl:value-of select="round($width.in.points div 72.0 * $pixels.per.inch)"/>
-      </xsl:when>
-      <xsl:otherwise/>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="contentdepth">
-    <xsl:choose>
-      <xsl:when test="$ignore.image.scaling != 0"/>
-      <xsl:when test="@contentdepth">
-        <xsl:variable name="units">
-          <xsl:call-template name="length-units">
-            <xsl:with-param name="length" select="@contentdepth"/>
-          </xsl:call-template>
-        </xsl:variable>
-
-        <xsl:choose>
-          <xsl:when test="$units = '%'">
-            <xsl:variable name="cmagnitude">
-              <xsl:call-template name="length-magnitude">
-                <xsl:with-param name="length" select="@contentdepth"/>
-              </xsl:call-template>
-            </xsl:variable>
-            <xsl:value-of select="$intrinsicdepth * $cmagnitude div 100.0"/>
-            <xsl:text>px</xsl:text>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:call-template name="length-spec">
-              <xsl:with-param name="length" select="@contentdepth"/>
-            </xsl:call-template>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$intrinsicdepth"/>
-        <xsl:text>px</xsl:text>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="scaled.contentdepth">
-    <xsl:if test="$contentdepth != ''">
-      <xsl:variable name="cdepth.in.points">
-        <xsl:call-template name="length-in-points">
-          <xsl:with-param name="length" select="$contentdepth"/>
-          <xsl:with-param name="pixels.per.inch" select="$pixels.per.inch"/>
-          <xsl:with-param name="em.size" select="$points.per.em"/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:value-of select="$cdepth.in.points div 72.0 * $pixels.per.inch * $scale"/>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:variable name="depth-units">
-    <xsl:if test="@depth">
-      <xsl:call-template name="length-units">
-        <xsl:with-param name="length" select="@depth"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:variable name="depth">
-    <xsl:if test="@depth">
-      <xsl:choose>
-        <xsl:when test="$depth-units = '%'">
-          <xsl:value-of select="@depth"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="length-spec">
-            <xsl:with-param name="length" select="@depth"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:variable name="html.depth">
-    <xsl:choose>
-      <xsl:when test="$ignore.image.scaling != 0"/>
-      <xsl:when test="$depth-units = '%'">
-        <xsl:value-of select="$depth"/>
-      </xsl:when>
-      <xsl:when test="@depth and @depth != ''">
-        <xsl:variable name="depth.in.points">
-          <xsl:call-template name="length-in-points">
-            <xsl:with-param name="length" select="$depth"/>
-            <xsl:with-param name="pixels.per.inch" select="$pixels.per.inch"/>
-            <xsl:with-param name="em.size" select="$points.per.em"/>
-          </xsl:call-template>
-        </xsl:variable>
-        <xsl:value-of select="round($depth.in.points div 72.0 * $pixels.per.inch)"/>
-      </xsl:when>
-      <xsl:otherwise/>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="viewport">
-    <xsl:choose>
-      <xsl:when test="$ignore.image.scaling != 0">0</xsl:when>
-      <xsl:when test="local-name(.) = 'inlinegraphic'                       or ancestor::inlinemediaobject                       or ancestor::inlineequation">0</xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$make.graphic.viewport"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-<!--
-  <xsl:message>=====================================
-scale: <xsl:value-of select="$scale"/>, <xsl:value-of select="$scalefit"/>
-@contentwidth <xsl:value-of select="@contentwidth"/>
-$contentwidth <xsl:value-of select="$contentwidth"/>
-scaled.contentwidth: <xsl:value-of select="$scaled.contentwidth"/>
-@width: <xsl:value-of select="@width"/>
-width: <xsl:value-of select="$width"/>
-html.width: <xsl:value-of select="$html.width"/>
-@contentdepth <xsl:value-of select="@contentdepth"/>
-$contentdepth <xsl:value-of select="$contentdepth"/>
-scaled.contentdepth: <xsl:value-of select="$scaled.contentdepth"/>
-@depth: <xsl:value-of select="@depth"/>
-depth: <xsl:value-of select="$depth"/>
-html.depth: <xsl:value-of select="$html.depth"/>
-align: <xsl:value-of select="@align"/>
-valign: <xsl:value-of select="@valign"/></xsl:message>
--->
-
-  <xsl:variable name="scaled" select="@width|@depth|@contentwidth|@contentdepth                         |@scale|@scalefit"/>
-
-  <xsl:variable name="img">
-    <xsl:choose>
-      <xsl:when test="@format = 'SVG'">
-        <object data="{$output_filename}" type="image/svg+xml">
-          <xsl:call-template name="process.image.attributes">
-            <!--xsl:with-param name="alt" select="$alt"/ there's no alt here-->
-            <xsl:with-param name="html.depth" select="$html.depth"/>
-            <xsl:with-param name="html.width" select="$html.width"/>
-            <xsl:with-param name="longdesc" select="$longdesc"/>
-            <xsl:with-param name="scale" select="$scale"/>
-            <xsl:with-param name="scalefit" select="$scalefit"/>
-            <xsl:with-param name="scaled.contentdepth" select="$scaled.contentdepth"/>
-            <xsl:with-param name="scaled.contentwidth" select="$scaled.contentwidth"/>
-            <xsl:with-param name="viewport" select="$viewport"/>
-          </xsl:call-template>
-          <xsl:if test="@align">
-            <xsl:attribute name="align">
-                <xsl:choose>
-                  <xsl:when test="@align = 'center'">middle</xsl:when>
-                  <xsl:otherwise>
-                    <xsl:value-of select="@align"/>
-                  </xsl:otherwise>
-                </xsl:choose>
-            </xsl:attribute>
-          </xsl:if>
-          <xsl:if test="$use.embed.for.svg != 0">
-            <embed src="{$output_filename}" type="image/svg+xml">
-              <xsl:call-template name="process.image.attributes">
-                <!--xsl:with-param name="alt" select="$alt"/ there's no alt here -->
-                <xsl:with-param name="html.depth" select="$html.depth"/>
-                <xsl:with-param name="html.width" select="$html.width"/>
-                <xsl:with-param name="longdesc" select="$longdesc"/>
-                <xsl:with-param name="scale" select="$scale"/>
-                <xsl:with-param name="scalefit" select="$scalefit"/>
-                <xsl:with-param name="scaled.contentdepth" select="$scaled.contentdepth"/>
-                <xsl:with-param name="scaled.contentwidth" select="$scaled.contentwidth"/>
-                <xsl:with-param name="viewport" select="$viewport"/>
-              </xsl:call-template>
-            </embed>
-          </xsl:if>
-        </object>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:element name="{$tag}" namespace="http://www.w3.org/1999/xhtml">
-         <xsl:if test="$tag = 'img' and ../../self::imageobjectco">
-           <xsl:variable name="mapname">
-             <xsl:call-template name="object.id">
-               <xsl:with-param name="object" select="../../areaspec"/>
-             </xsl:call-template>
-           </xsl:variable>
-           <xsl:choose>
-             <xsl:when test="$scaled">
-              <!-- It might be possible to handle some scaling; needs -->
-              <!-- more investigation -->
-              <xsl:message>
-                <xsl:text>Warning: imagemaps not supported </xsl:text>
-                <xsl:text>on scaled images</xsl:text>
-              </xsl:message>
-             </xsl:when>
-             <xsl:otherwise>
-              <xsl:attribute name="border">0</xsl:attribute>
-              <xsl:attribute name="usemap">
-                <xsl:value-of select="concat('#', $mapname)"/>
-              </xsl:attribute>
-             </xsl:otherwise>
-           </xsl:choose>
-         </xsl:if>
-
-          <xsl:attribute name="src">
-           <xsl:choose>
-             <xsl:when test="$img.src.path != '' and                            $tag = 'img' and                              not(starts-with($output_filename, '/')) and                            not(contains($output_filename, '://'))">
-               <xsl:value-of select="$img.src.path"/>
-             </xsl:when>
-           </xsl:choose>
-            <xsl:value-of select="$output_filename"/>
-          </xsl:attribute>
-
-          <xsl:if test="@align">
-            <xsl:attribute name="align">
-              <xsl:choose>
-                <xsl:when test="@align = 'center'">middle</xsl:when>
-                <xsl:otherwise>
-                  <xsl:value-of select="@align"/>
-                </xsl:otherwise>
-              </xsl:choose>
-            </xsl:attribute>
-          </xsl:if>
-
-          <xsl:call-template name="process.image.attributes">
-            <xsl:with-param name="alt">
-              <xsl:choose>
-                <xsl:when test="$alt != ''">
-                  <xsl:copy-of select="$alt"/>
-                </xsl:when>
-                <xsl:when test="ancestor::figure">
-                  <xsl:value-of select="normalize-space(ancestor::figure/title)"/>
-                </xsl:when>
-              </xsl:choose>
-            </xsl:with-param>
-            <xsl:with-param name="html.depth" select="$html.depth"/>
-            <xsl:with-param name="html.width" select="$html.width"/>
-            <xsl:with-param name="longdesc" select="$longdesc"/>
-            <xsl:with-param name="scale" select="$scale"/>
-            <xsl:with-param name="scalefit" select="$scalefit"/>
-            <xsl:with-param name="scaled.contentdepth" select="$scaled.contentdepth"/>
-            <xsl:with-param name="scaled.contentwidth" select="$scaled.contentwidth"/>
-            <xsl:with-param name="viewport" select="$viewport"/>
-          </xsl:call-template>
-        </xsl:element>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="bgcolor">
-    <xsl:call-template name="pi.dbhtml_background-color">
-      <xsl:with-param name="node" select=".."/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="use.viewport" select="$viewport != 0                         and ($html.width != ''                              or ($html.depth != '' and $depth-units != '%')                              or $bgcolor != ''                              or @valign)"/>
-
-  <xsl:choose>
-    <xsl:when test="$use.viewport">
-      <table border="0" summary="manufactured viewport for HTML img" cellspacing="0" cellpadding="0">
-        <xsl:if test="$html.width != ''">
-          <xsl:attribute name="width">
-            <xsl:value-of select="$html.width"/>
-          </xsl:attribute>
-        </xsl:if>
-        <tr>
-          <xsl:if test="$html.depth != '' and $depth-units != '%'">
-            <!-- don't do this for percentages because browsers get confused -->
-            <xsl:choose>
-              <xsl:when test="$css.decoration != 0">
-                <xsl:attribute name="style">
-                  <xsl:text>height: </xsl:text>
-                  <xsl:value-of select="$html.depth"/>
-                  <xsl:text>px</xsl:text>
-                </xsl:attribute>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:attribute name="height">
-                  <xsl:value-of select="$html.depth"/>
-                </xsl:attribute>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:if>
-          <td>
-            <xsl:if test="$bgcolor != ''">
-              <xsl:choose>
-                <xsl:when test="$css.decoration != 0">
-                  <xsl:attribute name="style">
-                    <xsl:text>background-color: </xsl:text>
-                    <xsl:value-of select="$bgcolor"/>
-                  </xsl:attribute>
-                </xsl:when>
-                <xsl:otherwise>
-                  <xsl:attribute name="bgcolor">
-                    <xsl:value-of select="$bgcolor"/>
-                  </xsl:attribute>
-                </xsl:otherwise>
-              </xsl:choose>
-            </xsl:if>
-            <xsl:if test="@align">
-              <xsl:attribute name="align">
-                <xsl:value-of select="@align"/>
-              </xsl:attribute>
-            </xsl:if>
-            <xsl:if test="@valign">
-              <xsl:attribute name="valign">
-                <xsl:value-of select="@valign"/>
-              </xsl:attribute>
-            </xsl:if>
-            <xsl:copy-of select="$img"/>
-          </td>
-        </tr>
-      </table>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:copy-of select="$img"/>
-    </xsl:otherwise>
-  </xsl:choose>
-
-  <xsl:if test="$tag = 'img' and ../../self::imageobjectco and not($scaled)">
-    <xsl:variable name="mapname">
-      <xsl:call-template name="object.id">
-        <xsl:with-param name="object" select="../../areaspec"/>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <map name="{$mapname}">
-      <xsl:for-each select="../../areaspec//area">
-        <xsl:variable name="units">
-          <xsl:choose>
-            <xsl:when test="@units = 'other' and @otherunits">
-              <xsl:value-of select="@otherunits"/>
-            </xsl:when>
-            <xsl:when test="@units">
-              <xsl:value-of select="@units"/>
-            </xsl:when>
-            <!-- areaspec|areaset/area -->
-            <xsl:when test="../@units = 'other' and ../@otherunits">
-              <xsl:value-of select="../@otherunits"/>
-            </xsl:when>
-            <xsl:when test="../@units">
-              <xsl:value-of select="../@units"/>
-            </xsl:when>
-            <!-- areaspec/areaset/area -->
-            <xsl:when test="../../@units = 'other' and ../../@otherunits">
-              <xsl:value-of select="../@otherunits"/>
-            </xsl:when>
-            <xsl:when test="../../@units">
-              <xsl:value-of select="../../@units"/>
-            </xsl:when>
-            <xsl:otherwise>calspair</xsl:otherwise>
-          </xsl:choose>
-        </xsl:variable>
- 
-        <xsl:choose>
-          <xsl:when test="$units = 'calspair' or                           $units = 'imagemap'">
-            <xsl:variable name="coords" select="normalize-space(@coords)"/>
-
-            <area shape="rect">
-              <xsl:variable name="linkends">
-                <xsl:choose>
-                  <xsl:when test="@linkends">
-                    <xsl:value-of select="normalize-space(@linkends)"/>
-                  </xsl:when>
-                  <xsl:otherwise>
-                    <xsl:value-of select="normalize-space(../@linkends)"/>
-                  </xsl:otherwise>
-                </xsl:choose>
-              </xsl:variable>
- 
-              <xsl:variable name="href">
-                <xsl:choose>
-                  <xsl:when test="@xlink:href">
-                    <xsl:value-of select="@xlink:href"/>
-                  </xsl:when>
-                  <xsl:otherwise>
-                    <xsl:value-of select="../@xlink:href"/>
-                  </xsl:otherwise>
-                </xsl:choose>
-              </xsl:variable>
- 
-              <xsl:choose>
-                <xsl:when test="$linkends != ''">
-                  <xsl:variable name="linkend">
-                    <xsl:choose>
-                      <xsl:when test="contains($linkends, ' ')">
-                        <xsl:value-of select="substring-before($linkends, ' ')"/>
-                      </xsl:when>
-                      <xsl:otherwise>
-                        <xsl:value-of select="$linkends"/>
-                      </xsl:otherwise>
-                    </xsl:choose>
-                  </xsl:variable>
-                  
-                  <xsl:variable name="target" select="key('id', $linkend)[1]"/>
-                 
-                  <xsl:if test="$target">
-                    <xsl:attribute name="href">
-                      <xsl:call-template name="href.target">
-                        <xsl:with-param name="object" select="$target"/>
-                      </xsl:call-template>
-                    </xsl:attribute>
-                  </xsl:if>
-                </xsl:when>
-                <xsl:when test="$href != ''">
-                  <xsl:attribute name="href">
-                    <xsl:value-of select="$href"/>
-                  </xsl:attribute>
-                </xsl:when>
-              </xsl:choose>
- 
-              <xsl:if test="alt">
-                <xsl:attribute name="alt">
-                  <xsl:value-of select="alt[1]"/>
-                </xsl:attribute>
-              </xsl:if>
- 
-              <xsl:attribute name="coords">
-                <xsl:choose>
-                  <xsl:when test="$units = 'calspair'">
-
-                    <xsl:variable name="p1" select="substring-before($coords, ' ')"/>
-                    <xsl:variable name="p2" select="substring-after($coords, ' ')"/>
-         
-                    <xsl:variable name="x1" select="substring-before($p1,',')"/>
-                    <xsl:variable name="y1" select="substring-after($p1,',')"/>
-                    <xsl:variable name="x2" select="substring-before($p2,',')"/>
-                    <xsl:variable name="y2" select="substring-after($p2,',')"/>
-         
-                    <xsl:variable name="x1p" select="$x1 div 100.0"/>
-                    <xsl:variable name="y1p" select="$y1 div 100.0"/>
-                    <xsl:variable name="x2p" select="$x2 div 100.0"/>
-                    <xsl:variable name="y2p" select="$y2 div 100.0"/>
-         
-         <!--
-                    <xsl:message>
-                      <xsl:text>units: </xsl:text>
-                      <xsl:value-of select="$units"/>
-                      <xsl:text> </xsl:text>
-                      <xsl:value-of select="$x1p"/><xsl:text>, </xsl:text>
-                      <xsl:value-of select="$y1p"/><xsl:text>, </xsl:text>
-                      <xsl:value-of select="$x2p"/><xsl:text>, </xsl:text>
-                      <xsl:value-of select="$y2p"/><xsl:text>, </xsl:text>
-                    </xsl:message>
-         
-                    <xsl:message>
-                      <xsl:text>      </xsl:text>
-                      <xsl:value-of select="$intrinsicwidth"/>
-                      <xsl:text>, </xsl:text>
-                      <xsl:value-of select="$intrinsicdepth"/>
-                    </xsl:message>
-         
-                    <xsl:message>
-                      <xsl:text>      </xsl:text>
-                      <xsl:value-of select="$units"/>
-                      <xsl:text> </xsl:text>
-                      <xsl:value-of 
-                            select="round($x1p * $intrinsicwidth div 100.0)"/>
-                      <xsl:text>,</xsl:text>
-                      <xsl:value-of select="round($intrinsicdepth
-                                       - ($y2p * $intrinsicdepth div 100.0))"/>
-                      <xsl:text>,</xsl:text>
-                      <xsl:value-of select="round($x2p * 
-                                            $intrinsicwidth div 100.0)"/>
-                      <xsl:text>,</xsl:text>
-                      <xsl:value-of select="round($intrinsicdepth
-                                       - ($y1p * $intrinsicdepth div 100.0))"/>
-                    </xsl:message>
-         -->
-                    <xsl:value-of select="round($x1p * $intrinsicwidth div 100.0)"/>
-                    <xsl:text>,</xsl:text>
-                    <xsl:value-of select="round($intrinsicdepth                                         - ($y2p * $intrinsicdepth div 100.0))"/>
-                    <xsl:text>,</xsl:text>
-                    <xsl:value-of select="round($x2p * $intrinsicwidth div 100.0)"/>
-                    <xsl:text>,</xsl:text>
-                    <xsl:value-of select="round($intrinsicdepth                                       - ($y1p * $intrinsicdepth div 100.0))"/>
-                  </xsl:when>
-                  <xsl:otherwise>
-                    <xsl:copy-of select="$coords"/>
-                  </xsl:otherwise>
-                </xsl:choose>
-              </xsl:attribute>
-            </area>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:message>
-              <xsl:text>Warning: only calspair or </xsl:text>
-              <xsl:text>otherunits='imagemap' supported </xsl:text>
-              <xsl:text>in imageobjectco</xsl:text>
-            </xsl:message>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:for-each>
-    </map>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="process.image.attributes">
-  <xsl:param name="alt"/>
-  <xsl:param name="html.width"/>
-  <xsl:param name="html.depth"/>
-  <xsl:param name="longdesc"/>
-  <xsl:param name="scale"/>
-  <xsl:param name="scalefit"/>
-  <xsl:param name="scaled.contentdepth"/>
-  <xsl:param name="scaled.contentwidth"/>
-  <xsl:param name="viewport"/>
-
-  <xsl:choose>
-    <xsl:when test="@contentwidth or @contentdepth">
-      <!-- ignore @width/@depth, @scale, and @scalefit if specified -->
-      <xsl:if test="@contentwidth and $scaled.contentwidth != ''">
-        <xsl:attribute name="width">
-          <xsl:value-of select="$scaled.contentwidth"/>
-        </xsl:attribute>
-      </xsl:if>
-      <xsl:if test="@contentdepth and $scaled.contentdepth != ''">
-        <xsl:attribute name="height">
-          <xsl:value-of select="$scaled.contentdepth"/>
-        </xsl:attribute>
-      </xsl:if>
-    </xsl:when>
-
-    <xsl:when test="number($scale) != 1.0">
-      <!-- scaling is always uniform, so we only have to specify one dimension -->
-      <!-- ignore @scalefit if specified -->
-      <xsl:attribute name="width">
-        <xsl:value-of select="$scaled.contentwidth"/>
-      </xsl:attribute>
-    </xsl:when>
-
-    <xsl:when test="$scalefit != 0">
-      <xsl:choose>
-        <xsl:when test="contains($html.width, '%')">
-          <xsl:choose>
-            <xsl:when test="$viewport != 0">
-              <!-- The *viewport* will be scaled, so use 100% here! -->
-              <xsl:attribute name="width">
-                <xsl:value-of select="'100%'"/>
-              </xsl:attribute>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:attribute name="width">
-                <xsl:value-of select="$html.width"/>
-              </xsl:attribute>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:when>
-
-        <xsl:when test="contains($html.depth, '%')">
-          <!-- HTML doesn't deal with this case very well...do nothing -->
-        </xsl:when>
-
-        <xsl:when test="$scaled.contentwidth != '' and $html.width != ''                         and $scaled.contentdepth != '' and $html.depth != ''">
-          <!-- scalefit should not be anamorphic; figure out which direction -->
-          <!-- has the limiting scale factor and scale in that direction -->
-          <xsl:choose>
-            <xsl:when test="$html.width div $scaled.contentwidth &gt;                             $html.depth div $scaled.contentdepth">
-              <xsl:attribute name="height">
-                <xsl:value-of select="$html.depth"/>
-              </xsl:attribute>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:attribute name="width">
-                <xsl:value-of select="$html.width"/>
-              </xsl:attribute>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:when>
-
-        <xsl:when test="$scaled.contentwidth != '' and $html.width != ''">
-          <xsl:attribute name="width">
-            <xsl:value-of select="$html.width"/>
-          </xsl:attribute>
-        </xsl:when>
-
-        <xsl:when test="$scaled.contentdepth != '' and $html.depth != ''">
-          <xsl:attribute name="height">
-            <xsl:value-of select="$html.depth"/>
-          </xsl:attribute>
-        </xsl:when>
-      </xsl:choose>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:if test="$alt != ''">
-    <xsl:attribute name="alt">
-      <xsl:value-of select="normalize-space($alt)"/>
-    </xsl:attribute>
-  </xsl:if>
-
-  <xsl:if test="$longdesc != ''">
-    <xsl:attribute name="longdesc">
-      <xsl:value-of select="$longdesc"/>
-    </xsl:attribute>
-  </xsl:if>
-
-  <xsl:if test="@align and $viewport = 0">
-    <xsl:attribute name="align">
-      <xsl:choose>
-        <xsl:when test="@align = 'center'">middle</xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="@align"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:attribute>
-  </xsl:if>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="graphic">
-  <xsl:choose>
-    <xsl:when test="parent::inlineequation">
-      <xsl:call-template name="anchor"/>
-      <xsl:call-template name="process.image"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <div>
-        <xsl:if test="@align">
-          <xsl:attribute name="align">
-            <xsl:value-of select="@align"/>
-          </xsl:attribute>
-        </xsl:if>
-        <xsl:call-template name="anchor"/>
-        <xsl:call-template name="process.image"/>
-      </div>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="inlinegraphic">
-  <xsl:variable name="filename">
-    <xsl:choose>
-      <xsl:when test="@entityref">
-        <xsl:value-of select="unparsed-entity-uri(@entityref)"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:apply-templates select="@fileref"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:call-template name="anchor"/>
-
-  <xsl:choose>
-    <xsl:when test="@format='linespecific'">
-      <xsl:choose>
-        <xsl:when test="$use.extensions != '0'                         and $textinsert.extension != '0'">
-          <xsl:choose>
-            <xsl:when test="element-available('stext:insertfile')">
-              <stext:insertfile href="{$filename}" encoding="{$textdata.default.encoding}"/>
-            </xsl:when>
-            <xsl:when test="element-available('xtext:insertfile')">
-              <xtext:insertfile href="{$filename}"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:message terminate="yes">
-                <xsl:text>No insertfile extension available.</xsl:text>
-              </xsl:message>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:when>
-        <xsl:otherwise>
-          <a xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad" href="{$filename}"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="process.image"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="mediaobject|mediaobjectco">
-
-  <xsl:variable name="olist" select="imageobject|imageobjectco                      |videoobject|audioobject                      |textobject"/>
-
-  <xsl:variable name="object.index">
-    <xsl:call-template name="select.mediaobject.index">
-      <xsl:with-param name="olist" select="$olist"/>
-      <xsl:with-param name="count" select="1"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="object" select="$olist[position() = $object.index]"/>
-
-  <xsl:variable name="align">
-    <xsl:value-of select="$object/descendant::imagedata[@align][1]/@align"/>
-  </xsl:variable>
-
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:if test="$align != '' ">
-      <xsl:attribute name="align">
-        <xsl:value-of select="$align"/>
-      </xsl:attribute>
-    </xsl:if>
-    <xsl:call-template name="anchor"/>
-
-    <xsl:apply-templates select="$object"/>
-    <xsl:apply-templates select="caption"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="inlinemediaobject">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="anchor"/>
-    <xsl:call-template name="select.mediaobject"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="programlisting/inlinemediaobject                      |screen/inlinemediaobject" priority="2">
-  <!-- the additional span causes problems in some cases -->
-  <xsl:call-template name="select.mediaobject"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="imageobjectco">
-  <xsl:call-template name="anchor"/>
-  <xsl:apply-templates select="imageobject"/>
-  <xsl:apply-templates select="calloutlist"/>
-</xsl:template>
-
-<xsl:template match="imageobject">
-  <xsl:apply-templates select="imagedata"/>
-</xsl:template>
-
-<xsl:template match="imagedata">
-  <xsl:variable name="filename">
-    <xsl:call-template name="mediaobject.filename">
-      <xsl:with-param name="object" select=".."/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:choose>
-    <!-- Handle MathML and SVG markup in imagedata -->
-    <xsl:when xmlns:mml="http://www.w3.org/1998/Math/MathML" test="mml:*">
-      <xsl:apply-templates/>
-    </xsl:when>
-    
-    <xsl:when xmlns:svg="http://www.w3.org/2000/svg" test="svg:*">
-      <xsl:apply-templates/>
-    </xsl:when>
-
-    <xsl:when test="@format='linespecific'">
-      <xsl:choose>
-        <xsl:when test="$use.extensions != '0'                         and $textinsert.extension != '0'">
-          <xsl:choose>
-            <xsl:when test="element-available('stext:insertfile')">
-              <stext:insertfile href="{$filename}" encoding="{$textdata.default.encoding}"/>
-            </xsl:when>
-            <xsl:when test="element-available('xtext:insertfile')">
-              <xtext:insertfile href="{$filename}"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:message terminate="yes">
-                <xsl:text>No insertfile extension available.</xsl:text>
-              </xsl:message>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:when>
-        <xsl:otherwise>
-          <a xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad" href="{$filename}"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:variable name="longdesc.uri">
-        <xsl:call-template name="longdesc.uri">
-          <xsl:with-param name="mediaobject" select="ancestor::imageobject/parent::*"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <xsl:variable name="phrases" select="ancestor::mediaobject/textobject[phrase]                             |ancestor::inlinemediaobject/textobject[phrase]                             |ancestor::mediaobjectco/textobject[phrase]"/>
-
-      <xsl:call-template name="process.image">
-        <xsl:with-param name="alt">
-          <xsl:apply-templates select="$phrases[not(@role) or @role!='tex'][1]"/>
-        </xsl:with-param>
-        <xsl:with-param name="longdesc">
-          <xsl:call-template name="write.longdesc">
-            <xsl:with-param name="mediaobject" select="ancestor::imageobject/parent::*"/>
-          </xsl:call-template>
-        </xsl:with-param>
-      </xsl:call-template>
-
-      <xsl:if test="$html.longdesc != 0 and $html.longdesc.link != 0                     and ancestor::imageobject/parent::*/textobject[not(phrase)]">
-        <xsl:call-template name="longdesc.link">
-          <xsl:with-param name="longdesc.uri" select="$longdesc.uri"/>
-        </xsl:call-template>
-      </xsl:if>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="longdesc.uri">
-  <xsl:param name="mediaobject" select="."/>
-  <xsl:if test="$html.longdesc">
-    <xsl:if test="$mediaobject/textobject[not(phrase)]">
-      <xsl:variable name="dbhtml.dir">
-        <xsl:call-template name="dbhtml-dir"/>
-      </xsl:variable>
-      <xsl:variable name="filename">
-        <xsl:call-template name="make-relative-filename">
-          <xsl:with-param name="base.dir">
-            <xsl:choose>
-              <xsl:when test="$dbhtml.dir != ''">
-                <xsl:value-of select="$dbhtml.dir"/>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:value-of select="$base.dir"/>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:with-param>
-          <xsl:with-param name="base.name">
-            <xsl:choose>
-              <xsl:when test="                 $mediaobject/@*[local-name() = 'id']                 and not($use.id.as.filename = 0)">
-                <!-- * if this mediaobject has an ID, then we use the -->
-                <!-- * value of that ID as basename for the "longdesc" -->
-                <!-- * file (that is, without prepending an "ld-" too it) -->
-                <xsl:value-of select="$mediaobject/@*[local-name() = 'id']"/>
-                <xsl:value-of select="$html.ext"/>
-              </xsl:when>
-              <xsl:otherwise>
-                <!-- * otherwise, if this mediaobject does not have an -->
-                <!-- * ID, then we generate an ID... -->
-                <xsl:variable name="image-id">
-                  <xsl:call-template name="object.id">
-                    <xsl:with-param name="object" select="$mediaobject"/>
-                  </xsl:call-template>
-                </xsl:variable>
-                <!-- * ...and then we take that generated ID, prepend an -->
-                <!-- * "ld-" to it, and use that as the basename for the file -->
-                <xsl:value-of select="concat('ld-',$image-id,$html.ext)"/>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:with-param>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <xsl:value-of select="$filename"/>
-    </xsl:if>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="write.longdesc">
-  <xsl:param name="mediaobject" select="."/>
-  <xsl:if test="$html.longdesc != 0 and $mediaobject/textobject[not(phrase)]">
-    <xsl:variable name="filename">
-      <xsl:call-template name="longdesc.uri">
-        <xsl:with-param name="mediaobject" select="$mediaobject"/>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <xsl:value-of select="$filename"/>
-
-    <xsl:call-template name="write.chunk">
-      <xsl:with-param name="filename" select="$filename"/>
-      <xsl:with-param name="quiet" select="$chunk.quietly"/>
-      <xsl:with-param name="content">
-      <xsl:call-template name="user.preroot"/>
-        <html>
-          <head>
-            <xsl:call-template name="system.head.content"/>
-            <xsl:call-template name="head.content">
-              <xsl:with-param name="title" select="'Long Description'"/>
-            </xsl:call-template>
-            <xsl:call-template name="user.head.content"/>
-          </head>
-          <body>
-            <xsl:call-template name="body.attributes"/>
-            <xsl:for-each select="$mediaobject/textobject[not(phrase)]">
-              <xsl:apply-templates select="./*"/>
-            </xsl:for-each>
-          </body>
-        </html>
-        <xsl:value-of select="$chunk.append"/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="longdesc.link">
-  <xsl:param name="longdesc.uri" select="''"/>
-
-  <xsl:variable name="this.uri">
-    <xsl:call-template name="make-relative-filename">
-      <xsl:with-param name="base.dir" select="$base.dir"/>
-      <xsl:with-param name="base.name">
-        <xsl:call-template name="href.target.uri"/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="href.to">
-    <xsl:call-template name="trim.common.uri.paths">
-      <xsl:with-param name="uriA" select="$longdesc.uri"/>
-      <xsl:with-param name="uriB" select="$this.uri"/>
-      <xsl:with-param name="return" select="'A'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <div class="longdesc-link" align="right">
-    <br clear="all"/>
-    <span class="longdesc-link">
-      <xsl:text>[</xsl:text>
-      <a href="{$href.to}" target="longdesc">D</a>
-      <xsl:text>]</xsl:text>
-    </span>
-  </div>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="videoobject">
-  <xsl:apply-templates select="videodata"/>
-</xsl:template>
-
-<xsl:template match="videodata">
-  <xsl:call-template name="process.image">
-    <xsl:with-param name="tag" select="'embed'"/>
-    <xsl:with-param name="alt">
-      <xsl:apply-templates select="(../../textobject/phrase)[1]"/>
-    </xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="audioobject">
-  <xsl:apply-templates select="audiodata"/>
-</xsl:template>
-
-<xsl:template match="audiodata">
-  <xsl:call-template name="process.image">
-    <xsl:with-param name="tag" select="'embed'"/>
-    <xsl:with-param name="alt">
-      <xsl:apply-templates select="(../../textobject/phrase)[1]"/>
-    </xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="textobject">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="textdata">
-  <xsl:variable name="filename">
-    <xsl:choose>
-      <xsl:when test="@entityref">
-        <xsl:value-of select="unparsed-entity-uri(@entityref)"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:apply-templates select="@fileref"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="encoding">
-    <xsl:choose>
-      <xsl:when test="@encoding">
-        <xsl:value-of select="@encoding"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$textdata.default.encoding"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$use.extensions != '0'                     and $textinsert.extension != '0'">
-      <xsl:choose>
-        <xsl:when test="element-available('stext:insertfile')">
-          <stext:insertfile href="{$filename}" encoding="{$encoding}"/>
-        </xsl:when>
-        <xsl:when test="element-available('xtext:insertfile')">
-          <xtext:insertfile href="{$filename}"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:message terminate="yes">
-            <xsl:text>No insertfile extension available.</xsl:text>
-          </xsl:message>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <a xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad" href="{$filename}"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="caption">
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:if test="@align = 'right' or @align = 'left' or @align='center'">
-      <xsl:attribute name="align"><xsl:value-of select="@align"/></xsl:attribute>
-    </xsl:if>
-    <xsl:apply-templates/>
-  </div>
-</xsl:template>
-
-<!-- ==================================================================== -->
-<!-- "Support" for SVG -->
-
-<xsl:template xmlns:svg="http://www.w3.org/2000/svg" match="svg:*">
-  <xsl:copy>
-    <xsl:copy-of select="@*"/>
-    <xsl:apply-templates/>
-  </xsl:copy>
-</xsl:template>
-
-
-<!-- The following works sometimes, but needs to take into account
-             1. When there is no /*/@xml:base
-             2. When the chunks are going somewhere else
-<xsl:variable name="relpath">
-  <xsl:call-template name="relative-uri">
-    <xsl:with-param name="filename" select="@fileref"/>
-  </xsl:call-template>
-</xsl:variable>
-
-<xsl:choose>
-  <xsl:when test="/*/@xml:base
-                  and starts-with($relpath,/*/@xml:base)">
-    <xsl:value-of select="substring-after($relpath,/*/@xml:base)"/>
-  </xsl:when>
-  <xsl:otherwise>
-    <xsl:value-of select="@fileref"/>
-  </xsl:otherwise>
-</xsl:choose>
-<xsl:value-of select="@fileref"/>
-      </xsl:when>
--->
-<!-- Resolve xml:base attributes -->
-<xsl:template match="@fileref">
-  <!-- need a check for absolute urls -->
-  <xsl:choose>
-    <xsl:when test="contains(., ':')">
-      <!-- it has a uri scheme so it is an absolute uri -->
-      <xsl:value-of select="."/>
-    </xsl:when>
-    <xsl:when test="$keep.relative.image.uris != 0">
-      <!-- leave it alone -->
-      <xsl:value-of select="."/>
-    </xsl:when>
-    <xsl:otherwise>
-      <!-- its a relative uri that needs xml:base processing -->
-      <xsl:call-template name="relative-uri">
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/highlight.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/highlight.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,52 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xslthl="http://xslthl.sf.net" xmlns="http://www.w3.org/1999/xhtml" exclude-result-prefixes="xslthl" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     and other information.
-
-     ******************************************************************** -->
-
-<xsl:template match="xslthl:keyword">
-  <b class="hl-keyword"><xsl:apply-templates/></b>
-</xsl:template>
-
-<xsl:template match="xslthl:string">
-  <b class="hl-string"><i style="color:red"><xsl:apply-templates/></i></b>
-</xsl:template>
-
-<xsl:template match="xslthl:comment">
-  <i class="hl-comment" style="color: silver"><xsl:apply-templates/></i>
-</xsl:template>
-
-<xsl:template match="xslthl:tag">
-  <b class="hl-tag" style="color: blue"><xsl:apply-templates/></b>
-</xsl:template>
-
-<xsl:template match="xslthl:attribute">
-  <span class="hl-attribute" style="color: blue"><xsl:apply-templates/></span>
-</xsl:template>
-
-<xsl:template match="xslthl:value">
-  <span class="hl-value" style="color: blue"><xsl:apply-templates/></span>
-</xsl:template>
-
-<xsl:template match="xslthl:html">
-  <b><i style="color: red"><xsl:apply-templates/></i></b>
-</xsl:template>
-
-<xsl:template match="xslthl:xslt">
-  <b style="color: blue"><xsl:apply-templates/></b>
-</xsl:template>
-
-<xsl:template match="xslthl:section">
-  <b><xsl:apply-templates/></b>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/html-rtf.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/html-rtf.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,321 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exsl="http://exslt.org/common" xmlns:set="http://exslt.org/sets" xmlns="http://www.w3.org/1999/xhtml" exclude-result-prefixes="exsl set" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<!-- This module contains templates that match against HTML nodes. It is used
-     to post-process result tree fragments for some sorts of cleanup.
-     These templates can only ever be fired by a processor that supports
-     exslt:node-set(). -->
-
-<!-- ==================================================================== -->
-
-<!-- insert.html.p mode templates insert a particular RTF at the beginning
-     of the first paragraph in the primary RTF. -->
-
-<xsl:template match="/" mode="insert.html.p">
-  <xsl:param name="mark" select="'?'"/>
-  <xsl:apply-templates mode="insert.html.p">
-    <xsl:with-param name="mark" select="$mark"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="*" mode="insert.html.p">
-  <xsl:param name="mark" select="'?'"/>
-  <xsl:copy>
-    <xsl:copy-of select="@*"/>
-    <xsl:apply-templates mode="insert.html.p">
-      <xsl:with-param name="mark" select="$mark"/>
-    </xsl:apply-templates>
-  </xsl:copy>
-</xsl:template>
-
-<xsl:template xmlns:html="http://www.w3.org/1999/xhtml" match="html:p|p" mode="insert.html.p">
-  <xsl:param name="mark" select="'?'"/>
-  <xsl:copy>
-    <xsl:copy-of select="@*"/>
-    <xsl:if test="not(preceding::p|preceding::html:p)">
-      <xsl:copy-of select="$mark"/>
-    </xsl:if>
-    <xsl:apply-templates mode="insert.html.p">
-      <xsl:with-param name="mark" select="$mark"/>
-    </xsl:apply-templates>
-  </xsl:copy>
-</xsl:template>
-
-<xsl:template match="text()|processing-instruction()|comment()" mode="insert.html.p">
-  <xsl:param name="mark" select="'?'"/>
-  <xsl:copy/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<!-- insert.html.text mode templates insert a particular RTF at the beginning
-     of the first text-node in the primary RTF. -->
-
-<xsl:template match="/" mode="insert.html.text">
-  <xsl:param name="mark" select="'?'"/>
-  <xsl:apply-templates mode="insert.html.text">
-    <xsl:with-param name="mark" select="$mark"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="*" mode="insert.html.text">
-  <xsl:param name="mark" select="'?'"/>
-  <xsl:copy>
-    <xsl:copy-of select="@*"/>
-    <xsl:apply-templates mode="insert.html.text">
-      <xsl:with-param name="mark" select="$mark"/>
-    </xsl:apply-templates>
-  </xsl:copy>
-</xsl:template>
-
-<xsl:template match="text()|processing-instruction()|comment()" mode="insert.html.text">
-  <xsl:param name="mark" select="'?'"/>
-
-  <xsl:if test="not(preceding::text())">
-    <xsl:copy-of select="$mark"/>
-  </xsl:if>
-
-  <xsl:copy/>
-</xsl:template>
-
-<xsl:template match="processing-instruction()|comment()" mode="insert.html.text">
-  <xsl:param name="mark" select="'?'"/>
-  <xsl:copy/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<!-- unwrap.p mode templates remove blocks from HTML p elements (and
-     other places where blocks aren't allowed) -->
-
-<xsl:template name="unwrap.p">
-  <xsl:param name="p"/>
-  <xsl:choose>
-    <xsl:when test="function-available('exsl:node-set')                     and function-available('set:leading')                     and function-available('set:trailing')">
-      <xsl:apply-templates select="exsl:node-set($p)" mode="unwrap.p"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:copy-of select="$p"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template xmlns:html="http://www.w3.org/1999/xhtml" match="html:p|p" mode="unwrap.p">
-  <!-- xmlns:html is necessary for the xhtml stylesheet case -->
-  <xsl:variable name="blocks" select="address|blockquote|div|hr|h1|h2|h3|h4|h5|h6                         |layer|p|pre|table|dl|menu|ol|ul|form                         |html:address|html:blockquote|html:div|html:hr                         |html:h1|html:h2|html:h3|html:h4|html:h5|html:h6                         |html:layer|html:p|html:pre|html:table|html:dl                         |html:menu|html:ol|html:ul|html:form"/>
-  <xsl:choose>
-    <xsl:when test="$blocks">
-      <xsl:call-template name="unwrap.p.nodes">
-        <xsl:with-param name="wrap" select="."/>
-        <xsl:with-param name="first" select="1"/>
-        <xsl:with-param name="nodes" select="node()"/>
-        <xsl:with-param name="blocks" select="$blocks"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:copy>
-        <xsl:copy-of select="@*"/>
-        <xsl:apply-templates mode="unwrap.p"/>
-      </xsl:copy>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="*" mode="unwrap.p">
-  <xsl:copy>
-    <xsl:copy-of select="@*"/>
-    <xsl:apply-templates mode="unwrap.p"/>
-  </xsl:copy>
-</xsl:template>
-
-<xsl:template match="text()|processing-instruction()|comment()" mode="unwrap.p">
-  <xsl:copy/>
-</xsl:template>
-
-<xsl:template name="unwrap.p.nodes">
-  <xsl:param name="wrap" select="."/>
-  <xsl:param name="first" select="0"/>
-  <xsl:param name="nodes"/>
-  <xsl:param name="blocks"/>
-  <xsl:variable name="block" select="$blocks[1]"/>
-
-  <!-- This template should never get called if these functions aren't available -->
-  <!-- but this test is still necessary so that processors don't choke on the -->
-  <!-- function calls if they don't support the set: functions -->
-  <xsl:if test="function-available('set:leading')                 and function-available('set:trailing')">
-    <xsl:choose>
-      <xsl:when test="$blocks">
-        <xsl:variable name="leading" select="set:leading($nodes,$block)"/>
-        <xsl:variable name="trailing" select="set:trailing($nodes,$block)"/>
-
-        <xsl:if test="(($wrap/@id or $wrap/@xml:id)                          and $first = 1) or $leading">
-          <xsl:element name="{local-name($wrap)}" namespace="http://www.w3.org/1999/xhtml">
-            <xsl:for-each select="$wrap/@*">
-              <xsl:if test="$first != 0 or local-name(.) != 'id'">
-                <xsl:copy/>
-              </xsl:if>
-            </xsl:for-each>
-            <xsl:apply-templates select="$leading" mode="unwrap.p"/>
-          </xsl:element>
-        </xsl:if>
-
-        <xsl:apply-templates select="$block" mode="unwrap.p"/>
-
-        <xsl:if test="$trailing">
-          <xsl:call-template name="unwrap.p.nodes">
-            <xsl:with-param name="wrap" select="$wrap"/>
-            <xsl:with-param name="nodes" select="$trailing"/>
-            <xsl:with-param name="blocks" select="$blocks[position() &gt; 1]"/>
-          </xsl:call-template>
-        </xsl:if>
-      </xsl:when>
-
-      <xsl:otherwise>
-        <xsl:if test="(($wrap/@id or $wrap/@xml:id) and $first = 1) or $nodes">
-          <xsl:element name="{local-name($wrap)}" namespace="http://www.w3.org/1999/xhtml">
-            <xsl:for-each select="$wrap/@*">
-              <xsl:if test="$first != 0 or local-name(.) != 'id'">
-                <xsl:copy/>
-              </xsl:if>
-            </xsl:for-each>
-            <xsl:apply-templates select="$nodes" mode="unwrap.p"/>
-          </xsl:element>
-        </xsl:if>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:if>
-</xsl:template>
-
-<!-- ==================================================================== -->
-<!-- make.verbatim.mode replaces spaces and newlines -->
-
-<xsl:template match="/" mode="make.verbatim.mode">
-  <xsl:apply-templates mode="make.verbatim.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="make.verbatim.mode">
-  <xsl:copy>
-    <xsl:copy-of select="@*"/>
-    <xsl:apply-templates mode="make.verbatim.mode"/>
-  </xsl:copy>
-</xsl:template>
-
-<xsl:template match="processing-instruction()|comment()" mode="make.verbatim.mode">
-  <xsl:copy/>
-</xsl:template>
-
-<xsl:template match="text()" mode="make.verbatim.mode">
-  <xsl:variable name="text" select="translate(., ' ', '&#160;')"/>
-
-  <xsl:choose>
-    <xsl:when test="not(contains($text, '&#10;'))">
-      <xsl:value-of select="$text"/>
-    </xsl:when>
-
-    <xsl:otherwise>
-      <xsl:variable name="len" select="string-length($text)"/>
-
-      <xsl:choose>
-        <xsl:when test="$len = 1">
-          <br/><xsl:text>
-</xsl:text>
-        </xsl:when>
-
-        <xsl:otherwise>
-          <xsl:variable name="half" select="$len div 2"/>
-          <xsl:call-template name="make-verbatim-recursive">
-            <xsl:with-param name="text" select="substring($text, 1, $half)"/>
-          </xsl:call-template>
-          <xsl:call-template name="make-verbatim-recursive">
-            <xsl:with-param name="text" select="substring($text, ($half + 1), $len)"/>
-          </xsl:call-template>
-    	</xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="make-verbatim-recursive">
-  <xsl:param name="text" select="''"/>
-
-  <xsl:choose>
-    <xsl:when test="not(contains($text, '&#10;'))">
-      <xsl:value-of select="$text"/>
-    </xsl:when>
-
-    <xsl:otherwise>
-      <xsl:variable name="len" select="string-length($text)"/>
-
-      <xsl:choose>
-        <xsl:when test="$len = 1">
-          <br/><xsl:text>
-</xsl:text>
-        </xsl:when>
-
-        <xsl:otherwise>
-    	  <xsl:variable name="half" select="$len div 2"/>
-          <xsl:call-template name="make-verbatim-recursive">
-    	    <xsl:with-param name="text" select="substring($text, 1, $half)"/>
-    	  </xsl:call-template>
-    	  <xsl:call-template name="make-verbatim-recursive">
-    	    <xsl:with-param name="text" select="substring($text, ($half + 1), $len)"/>
-    	  </xsl:call-template>
-    	</xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<!-- remove.empty.div mode templates remove empty blocks -->
-
-<xsl:template name="remove.empty.div">
-  <xsl:param name="div"/>
-  <xsl:choose>
-    <xsl:when test="function-available('exsl:node-set')">
-      <xsl:apply-templates select="exsl:node-set($div)" mode="remove.empty.div"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:copy-of select="$div"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template xmlns:html="http://www.w3.org/1999/xhtml" match="html:p|p|html:div|div" mode="remove.empty.div">
-  <xsl:if test="node()">
-    <xsl:copy>
-      <xsl:copy-of select="@*"/>
-      <xsl:apply-templates mode="remove.empty.div"/>
-    </xsl:copy>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="*" mode="remove.empty.div">
-  <xsl:copy>
-    <xsl:copy-of select="@*"/>
-    <xsl:apply-templates mode="remove.empty.div"/>
-  </xsl:copy>
-</xsl:template>
-
-<xsl:template match="text()|processing-instruction()|comment()" mode="remove.empty.div">
-  <xsl:copy/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/html.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/html.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,236 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- The generate.html.title template is currently used for generating HTML -->
-<!-- "title" attributes for some inline elements only, but not for any -->
-<!-- block elements. It is called in eleven places in the inline.xsl -->
-<!-- file. But it's called by all the inline.* templates (e.g., -->
-<!-- inline.boldseq), which in turn are called by other (element) -->
-<!-- templates, so it results, currently, in supporting generation of the -->
-<!-- HTML "title" attribute for a total of about 92 elements. -->
-<!-- You can use mode="html.title.attribute" to get a title for -->
-<!-- an element specified by a param, including targets of cross references. -->
-<xsl:template name="generate.html.title">
-  <xsl:apply-templates select="." mode="html.title.attribute"/>
-</xsl:template>
-
-<!-- Generate a title attribute for the context node -->
-<xsl:template match="*" mode="html.title.attribute">
-  <xsl:variable name="is.title">
-    <xsl:call-template name="gentext.template.exists">
-      <xsl:with-param name="context" select="'title'"/>
-      <xsl:with-param name="name" select="local-name(.)"/>
-      <xsl:with-param name="lang">
-        <xsl:call-template name="l10n.language"/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="is.title-numbered">
-    <xsl:call-template name="gentext.template.exists">
-      <xsl:with-param name="context" select="'title-numbered'"/>
-      <xsl:with-param name="name" select="local-name(.)"/>
-      <xsl:with-param name="lang">
-        <xsl:call-template name="l10n.language"/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="is.title-unnumbered">
-    <xsl:call-template name="gentext.template.exists">
-      <xsl:with-param name="context" select="'title-unnumbered'"/>
-      <xsl:with-param name="name" select="local-name(.)"/>
-      <xsl:with-param name="lang">
-        <xsl:call-template name="l10n.language"/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="gentext.title">
-    <xsl:if test="$is.title != 0 or                   $is.title-numbered != 0 or                   $is.title-unnumbered != 0">
-      <xsl:apply-templates select="." mode="object.title.markup.textonly"/>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="string-length($gentext.title) != 0">
-      <xsl:attribute name="title">
-        <xsl:value-of select="$gentext.title"/>
-      </xsl:attribute>
-    </xsl:when>
-    <!-- Fall back to alt if available -->
-    <xsl:when test="alt">
-      <xsl:attribute name="title">
-        <xsl:value-of select="normalize-space(alt)"/>
-      </xsl:attribute>
-    </xsl:when>
-  </xsl:choose>
-
-</xsl:template>
-
-<xsl:template name="dir">
-  <xsl:param name="inherit" select="0"/>
-
-  <xsl:variable name="dir">
-    <xsl:choose>
-      <xsl:when test="@dir">
-        <xsl:value-of select="@dir"/>
-      </xsl:when>
-      <xsl:when test="$inherit != 0">
-        <xsl:value-of select="ancestor::*/@dir[1]"/>
-      </xsl:when>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:if test="$dir != ''">
-    <xsl:attribute name="dir">
-      <xsl:value-of select="$dir"/>
-    </xsl:attribute>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="anchor">
-  <xsl:param name="node" select="."/>
-  <xsl:param name="conditional" select="1"/>
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="$node"/>
-    </xsl:call-template>
-  </xsl:variable>
-  <xsl:if test="$conditional = 0 or $node/@id or $node/@xml:id">
-    <a id="{$id}"/>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="href.target.uri">
-  <xsl:param name="context" select="."/>
-  <xsl:param name="object" select="."/>
-  <xsl:text>#</xsl:text>
-  <xsl:call-template name="object.id">
-    <xsl:with-param name="object" select="$object"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="href.target">
-  <xsl:param name="context" select="."/>
-  <xsl:param name="object" select="."/>
-  <xsl:text>#</xsl:text>
-  <xsl:call-template name="object.id">
-    <xsl:with-param name="object" select="$object"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="href.target.with.base.dir">
-  <xsl:param name="context" select="."/>
-  <xsl:param name="object" select="."/>
-  <xsl:if test="$manifest.in.base.dir = 0">
-    <xsl:value-of select="$base.dir"/>
-  </xsl:if>
-  <xsl:call-template name="href.target">
-    <xsl:with-param name="context" select="$context"/>
-    <xsl:with-param name="object" select="$object"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="dingbat">
-  <xsl:param name="dingbat">bullet</xsl:param>
-  <xsl:call-template name="dingbat.characters">
-    <xsl:with-param name="dingbat" select="$dingbat"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="dingbat.characters">
-  <!-- now that I'm using the real serializer, all that dingbat malarky -->
-  <!-- isn't necessary anymore... -->
-  <xsl:param name="dingbat">bullet</xsl:param>
-  <xsl:choose>
-    <xsl:when test="$dingbat='bullet'">&#8226;</xsl:when>
-    <xsl:when test="$dingbat='copyright'">&#169;</xsl:when>
-    <xsl:when test="$dingbat='trademark'">&#8482;</xsl:when>
-    <xsl:when test="$dingbat='trade'">&#8482;</xsl:when>
-    <xsl:when test="$dingbat='registered'">&#174;</xsl:when>
-    <xsl:when test="$dingbat='service'">(SM)</xsl:when>
-    <xsl:when test="$dingbat='nbsp'">&#160;</xsl:when>
-    <xsl:when test="$dingbat='ldquo'">&#8220;</xsl:when>
-    <xsl:when test="$dingbat='rdquo'">&#8221;</xsl:when>
-    <xsl:when test="$dingbat='lsquo'">&#8216;</xsl:when>
-    <xsl:when test="$dingbat='rsquo'">&#8217;</xsl:when>
-    <xsl:when test="$dingbat='em-dash'">&#8212;</xsl:when>
-    <xsl:when test="$dingbat='mdash'">&#8212;</xsl:when>
-    <xsl:when test="$dingbat='en-dash'">&#8211;</xsl:when>
-    <xsl:when test="$dingbat='ndash'">&#8211;</xsl:when>
-    <xsl:otherwise>
-      <xsl:text>&#8226;</xsl:text>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="id.warning">
-  <xsl:if test="$id.warnings != 0 and not(@id) and not(@xml:id) and parent::*">
-    <xsl:variable name="title">
-      <xsl:choose>
-        <xsl:when test="title">
-          <xsl:value-of select="title[1]"/>
-        </xsl:when>
-        <xsl:when test="substring(local-name(*[1]),                                   string-length(local-name(*[1])-3) = 'info')                         and *[1]/title">
-          <xsl:value-of select="*[1]/title[1]"/>
-        </xsl:when>
-        <xsl:when test="refmeta/refentrytitle">
-          <xsl:value-of select="refmeta/refentrytitle"/>
-        </xsl:when>
-        <xsl:when test="refnamediv/refname">
-          <xsl:value-of select="refnamediv/refname[1]"/>
-        </xsl:when>
-      </xsl:choose>
-    </xsl:variable>
-
-    <xsl:message>
-      <xsl:text>ID recommended on </xsl:text>
-      <xsl:value-of select="local-name(.)"/>
-      <xsl:if test="$title != ''">
-        <xsl:text>: </xsl:text>
-        <xsl:choose>
-          <xsl:when test="string-length($title) &gt; 40">
-            <xsl:value-of select="substring($title,1,40)"/>
-            <xsl:text>...</xsl:text>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="$title"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:if>
-    </xsl:message>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="*" mode="class.attribute">
-  <xsl:param name="class" select="local-name(.)"/>
-  <!-- permit customization of class attributes -->
-  <!-- Use element name by default -->
-  <xsl:attribute name="class">
-    <xsl:apply-templates select="." mode="class.value">
-      <xsl:with-param name="class" select="$class"/>
-    </xsl:apply-templates>
-  </xsl:attribute>
-</xsl:template>
-
-<xsl:template match="*" mode="class.value">
-  <xsl:param name="class" select="local-name(.)"/>
-  <!-- permit customization of class value only -->
-  <!-- Use element name by default -->
-  <xsl:value-of select="$class"/>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/htmltbl.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/htmltbl.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,56 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:template match="colgroup" mode="htmlTable">
-  <xsl:copy>
-    <xsl:copy-of select="@*"/>
-    <xsl:apply-templates mode="htmlTable"/>
-  </xsl:copy>
-</xsl:template>
-
-<xsl:template match="col" mode="htmlTable">
-  <xsl:copy>
-    <xsl:copy-of select="@*"/>
-  </xsl:copy>
-</xsl:template>
-
-<xsl:template match="caption" mode="htmlTable">
-  <xsl:copy>
-    <xsl:copy-of select="@*"/>
-
-    <xsl:apply-templates select=".." mode="object.title.markup">
-      <xsl:with-param name="allow-anchors" select="1"/>
-    </xsl:apply-templates>
-
-  </xsl:copy>
-</xsl:template>
-
-<xsl:template match="thead|tbody|tgroup|tr" mode="htmlTable">
-  <xsl:copy>
-    <xsl:copy-of select="@*"/>
-    <xsl:apply-templates mode="htmlTable"/>
-  </xsl:copy>
-</xsl:template>
-
-<xsl:template match="th|td" mode="htmlTable">
-  <xsl:copy>
-    <xsl:copy-of select="@*"/>
-    <xsl:apply-templates/> <!-- *not* mode=htmlTable -->
-  </xsl:copy>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/index.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/index.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,224 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:template match="index">
-  <!-- some implementations use completely empty index tags to indicate -->
-  <!-- where an automatically generated index should be inserted. so -->
-  <!-- if the index is completely empty, skip it. Unless generate.index -->
-  <!-- is non-zero, in which case, this is where the automatically -->
-  <!-- generated index should go. -->
-
-  <xsl:call-template name="id.warning"/>
-
-  <xsl:if test="count(*)&gt;0 or $generate.index != '0'">
-    <div>
-      <xsl:apply-templates select="." mode="class.attribute"/>
-      <xsl:if test="$generate.id.attributes != 0">
-        <xsl:attribute name="id">
-          <xsl:call-template name="object.id"/>
-        </xsl:attribute>
-      </xsl:if>
-
-      <xsl:call-template name="index.titlepage"/>
-      <xsl:choose>
-	<xsl:when test="indexdiv">
-	  <xsl:apply-templates/>
-	</xsl:when>
-	<xsl:otherwise>
-	  <xsl:apply-templates select="*[not(self::indexentry)]"/>
-	  <!-- Because it's actually valid for Index to have neither any -->
-	  <!-- Indexdivs nor any Indexentries, we need to check and make -->
-	  <!-- sure that at least one Indexentry exists, and generate a -->
-	  <!-- wrapper dl if there is at least one; otherwise, do nothing. -->
-	  <xsl:if test="indexentry">
-	    <!-- The indexentry template assumes a parent dl wrapper has -->
-	    <!-- been generated; for Indexes that have Indexdivs, the dl -->
-	    <!-- wrapper is generated by the indexdiv template; however, -->
-	    <!-- for Indexes that lack Indexdivs, if we don't generate a -->
-	    <!-- dl here, HTML output will not be valid. -->
-	    <dl>
-	      <xsl:apply-templates select="indexentry"/>
-	    </dl>
-	  </xsl:if>
-	</xsl:otherwise>
-      </xsl:choose>
-
-      <xsl:if test="count(indexentry) = 0 and count(indexdiv) = 0">
-        <xsl:call-template name="generate-index">
-          <xsl:with-param name="scope" select="(ancestor::book|/)[last()]"/>
-        </xsl:call-template>
-      </xsl:if>
-
-      <xsl:if test="not(parent::article)">
-        <xsl:call-template name="process.footnotes"/>
-      </xsl:if>
-    </div>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="setindex">
-  <!-- some implementations use completely empty index tags to indicate -->
-  <!-- where an automatically generated index should be inserted. so -->
-  <!-- if the index is completely empty, skip it. Unless generate.index -->
-  <!-- is non-zero, in which case, this is where the automatically -->
-  <!-- generated index should go. -->
-
-  <xsl:call-template name="id.warning"/>
-
-  <xsl:if test="count(*)&gt;0 or $generate.index != '0'">
-    <div>
-      <xsl:apply-templates select="." mode="class.attribute"/>
-      <xsl:if test="$generate.id.attributes != 0">
-        <xsl:attribute name="id">
-          <xsl:call-template name="object.id"/>
-        </xsl:attribute>
-      </xsl:if>
-
-      <xsl:call-template name="setindex.titlepage"/>
-      <xsl:apply-templates/>
-
-      <xsl:if test="count(indexentry) = 0 and count(indexdiv) = 0">
-        <xsl:call-template name="generate-index">
-          <xsl:with-param name="scope" select="/"/>
-        </xsl:call-template>
-      </xsl:if>
-
-      <xsl:if test="not(parent::article)">
-        <xsl:call-template name="process.footnotes"/>
-      </xsl:if>
-    </div>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="index/indexinfo"/>
-<xsl:template match="index/info"/>
-<xsl:template match="index/title"/>
-<xsl:template match="index/subtitle"/>
-<xsl:template match="index/titleabbrev"/>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="indexdiv">
-  <xsl:call-template name="id.warning"/>
-
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:if test="$generate.id.attributes != 0">
-      <xsl:attribute name="id">
-        <xsl:call-template name="object.id"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <xsl:call-template name="anchor"/>
-    <xsl:apply-templates select="*[not(self::indexentry)]"/>
-    <dl>
-      <xsl:apply-templates select="indexentry"/>
-    </dl>
-  </div>
-</xsl:template>
-
-<xsl:template match="indexdiv/title">
-  <h3>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates/>
-  </h3>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="indexterm">
-  <!-- this one must have a name, even if it doesn't have an ID -->
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <a id="{$id}" class="indexterm"/>
-</xsl:template>
-
-<xsl:template match="primary|secondary|tertiary|see|seealso">
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="indexentry">
-  <xsl:apply-templates select="primaryie"/>
-</xsl:template>
-
-<xsl:template match="primaryie">
-  <dt>
-    <xsl:apply-templates/>
-  </dt>
-  <xsl:choose>
-    <xsl:when test="following-sibling::secondaryie">
-      <dd>
-        <dl>
-          <xsl:apply-templates select="following-sibling::secondaryie"/>
-        </dl>
-      </dd>
-    </xsl:when>
-    <xsl:when test="following-sibling::seeie                     |following-sibling::seealsoie">
-      <dd>
-        <dl>
-          <xsl:apply-templates select="following-sibling::seeie                                        |following-sibling::seealsoie"/>
-        </dl>
-      </dd>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="secondaryie">
-  <dt>
-    <xsl:apply-templates/>
-  </dt>
-  <xsl:choose>
-    <xsl:when test="following-sibling::tertiaryie">
-      <dd>
-        <dl>
-          <xsl:apply-templates select="following-sibling::tertiaryie"/>
-        </dl>
-      </dd>
-    </xsl:when>
-    <xsl:when test="following-sibling::seeie                     |following-sibling::seealsoie">
-      <dd>
-        <dl>
-          <xsl:apply-templates select="following-sibling::seeie                                        |following-sibling::seealsoie"/>
-        </dl>
-      </dd>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="tertiaryie">
-  <dt>
-    <xsl:apply-templates/>
-  </dt>
-  <xsl:if test="following-sibling::seeie                 |following-sibling::seealsoie">
-    <dd>
-      <dl>
-        <xsl:apply-templates select="following-sibling::seeie                                      |following-sibling::seealsoie"/>
-      </dl>
-    </dd>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="seeie|seealsoie">
-  <dt>
-    <xsl:apply-templates/>
-  </dt>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/info.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/info.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,44 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- These templates define the "default behavior" for info
-     elements.  Even if you don't process the *info wrappers,
-     some of these elements are needed because the elements are
-     processed from named templates that are called with modes.
-     Since modes aren't sticky, these rules apply. 
-     (TODO: clarify this comment) -->
-
-<!-- ==================================================================== -->
-<!-- called from named templates in a given mode -->
-
-<xsl:template match="corpauthor">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates/>
-  </span>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="jobtitle">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates/>
-  </span>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/inline.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/inline.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,1404 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:suwl="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.UnwrapLinks" xmlns="http://www.w3.org/1999/xhtml" exclude-result-prefixes="xlink suwl" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-<xsl:template name="simple.xlink">
-  <xsl:param name="node" select="."/>
-  <xsl:param name="content">
-    <xsl:apply-templates/>
-  </xsl:param>
-  <xsl:param name="a.target"/>
-  <xsl:param name="linkend" select="$node/@linkend"/>
-  <xsl:param name="xhref" select="$node/@xlink:href"/>
-
-  <xsl:variable name="link">
-    <xsl:choose>
-      <xsl:when test="$xhref and                        (not($node/@xlink:type) or                             $node/@xlink:type='simple')">
-
-        <!-- Is it a local idref or a uri? -->
-        <xsl:variable name="is.idref">
-          <xsl:choose>
-            <!-- if the href starts with # and does not contain an "(" -->
-            <!-- or if the href starts with #xpointer(id(, it's just an ID -->
-            <xsl:when test="starts-with($xhref,'#')                             and (not(contains($xhref,'('))                             or starts-with($xhref,                                        '#xpointer(id('))">1</xsl:when>
-            <xsl:otherwise>0</xsl:otherwise>
-          </xsl:choose>
-        </xsl:variable>
-
-        <!-- Is it an olink ? -->
-        <xsl:variable name="is.olink">
-          <xsl:choose>
-	    <!-- If xlink:role="http://docbook.org/xlink/role/olink" -->
-            <!-- and if the href contains # -->
-            <xsl:when test="contains($xhref,'#') and           @xlink:role = $xolink.role">1</xsl:when>
-            <xsl:otherwise>0</xsl:otherwise>
-          </xsl:choose>
-        </xsl:variable>
-
-        <xsl:choose>
-          <xsl:when test="$is.idref = 1">
-
-            <xsl:variable name="idref">
-              <xsl:call-template name="xpointer.idref">
-                <xsl:with-param name="xpointer" select="$xhref"/>
-              </xsl:call-template>
-            </xsl:variable>
-
-            <xsl:variable name="targets" select="key('id',$idref)"/>
-            <xsl:variable name="target" select="$targets[1]"/>
-
-            <xsl:call-template name="check.id.unique">
-              <xsl:with-param name="linkend" select="$idref"/>
-            </xsl:call-template>
-
-            <xsl:choose>
-              <xsl:when test="count($target) = 0">
-                <xsl:message>
-                  <xsl:text>XLink to nonexistent id: </xsl:text>
-                  <xsl:value-of select="$idref"/>
-                </xsl:message>
-                <xsl:copy-of select="$content"/>
-              </xsl:when>
-
-              <xsl:otherwise>
-                <a>
-                  <xsl:apply-templates select="." mode="class.attribute"/>
-
-                  <xsl:attribute name="href">
-                    <xsl:call-template name="href.target">
-                      <xsl:with-param name="object" select="$target"/>
-                    </xsl:call-template>
-                  </xsl:attribute>
-
-                  <xsl:choose>
-                    <xsl:when test="$node/@xlink:title">
-                      <xsl:attribute name="title">
-                        <xsl:value-of select="$node/@xlink:title"/>
-                      </xsl:attribute>
-                    </xsl:when>
-                    <xsl:otherwise>
-                      <xsl:apply-templates select="$target" mode="html.title.attribute"/>
-                    </xsl:otherwise>
-                  </xsl:choose>
-
-                  <xsl:if test="$a.target">
-                    <xsl:attribute name="target">
-                      <xsl:value-of select="$a.target"/>
-                    </xsl:attribute>
-                  </xsl:if>
-
-                  <xsl:copy-of select="$content"/>
-
-                </a>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:when>
-
-          <xsl:when test="$is.olink = 1">
-	    <xsl:call-template name="olink">
-	      <xsl:with-param name="content" select="$content"/>
-	    </xsl:call-template>
-          </xsl:when>
-
-          <!-- otherwise it's a URI -->
-          <xsl:otherwise>
-            <a>
-              <xsl:apply-templates select="." mode="class.attribute"/>
-              <xsl:attribute name="href">
-                <xsl:value-of select="$xhref"/>
-              </xsl:attribute>
-              <xsl:if test="$node/@xlink:title">
-                <xsl:attribute name="title">
-                  <xsl:value-of select="$node/@xlink:title"/>
-                </xsl:attribute>
-              </xsl:if>
-              <xsl:copy-of select="$content"/>
-            </a>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-
-      <xsl:when test="$linkend">
-        <xsl:variable name="targets" select="key('id',$linkend)"/>
-        <xsl:variable name="target" select="$targets[1]"/>
-
-        <xsl:call-template name="check.id.unique">
-          <xsl:with-param name="linkend" select="$linkend"/>
-        </xsl:call-template>
-
-        <a>
-          <xsl:apply-templates select="." mode="class.attribute"/>
-          <xsl:attribute name="href">
-            <xsl:call-template name="href.target">
-              <xsl:with-param name="object" select="$target"/>
-            </xsl:call-template>
-          </xsl:attribute>
-
-          <xsl:apply-templates select="$target" mode="html.title.attribute"/>
-
-          <xsl:copy-of select="$content"/>
-          
-        </a>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:copy-of select="$content"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="function-available('suwl:unwrapLinks')">
-      <xsl:copy-of select="suwl:unwrapLinks($link)"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:copy-of select="$link"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="inline.charseq">
-  <xsl:param name="content">
-    <xsl:call-template name="anchor"/>
-    <xsl:call-template name="simple.xlink">
-      <xsl:with-param name="content">
-        <xsl:apply-templates/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:param>
-  <!-- * if you want output from the inline.charseq template wrapped in -->
-  <!-- * something other than a Span, call the template with some value -->
-  <!-- * for the 'wrapper-name' param -->
-  <xsl:param name="wrapper-name">span</xsl:param>
-  <xsl:element name="{$wrapper-name}" namespace="http://www.w3.org/1999/xhtml">
-    <xsl:attribute name="class">
-      <xsl:value-of select="local-name(.)"/>
-    </xsl:attribute>
-    <xsl:call-template name="dir"/>
-    <xsl:call-template name="generate.html.title"/>
-    <xsl:copy-of select="$content"/>
-    <xsl:call-template name="apply-annotations"/>
-  </xsl:element>
-</xsl:template>
-
-<xsl:template name="inline.monoseq">
-  <xsl:param name="content">
-    <xsl:call-template name="anchor"/>
-    <xsl:call-template name="simple.xlink">
-      <xsl:with-param name="content">
-        <xsl:apply-templates/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:param>
-  <code>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="dir"/>
-    <xsl:call-template name="generate.html.title"/>
-    <xsl:copy-of select="$content"/>
-    <xsl:call-template name="apply-annotations"/>
-  </code>
-</xsl:template>
-
-<xsl:template name="inline.boldseq">
-  <xsl:param name="content">
-    <xsl:call-template name="anchor"/>
-    <xsl:call-template name="simple.xlink">
-      <xsl:with-param name="content">
-        <xsl:apply-templates/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:param>
-
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="generate.html.title"/>
-    <xsl:call-template name="dir"/>
-
-    <!-- don't put <strong> inside figure, example, or table titles -->
-    <xsl:choose>
-      <xsl:when test="local-name(..) = 'title'                       and (local-name(../..) = 'figure'                       or local-name(../..) = 'example'                       or local-name(../..) = 'table')">
-        <xsl:copy-of select="$content"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <strong>
-          <xsl:copy-of select="$content"/>
-        </strong>
-      </xsl:otherwise>
-    </xsl:choose>
-    <xsl:call-template name="apply-annotations"/>
-  </span>
-</xsl:template>
-
-<xsl:template name="inline.italicseq">
-  <xsl:param name="content">
-    <xsl:call-template name="anchor"/>
-    <xsl:call-template name="simple.xlink">
-      <xsl:with-param name="content">
-        <xsl:apply-templates/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:param>
-  <em>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="generate.html.title"/>
-    <xsl:call-template name="dir"/>
-    <xsl:copy-of select="$content"/>
-    <xsl:call-template name="apply-annotations"/>
-  </em>
-</xsl:template>
-
-<xsl:template name="inline.boldmonoseq">
-  <xsl:param name="content">
-    <xsl:call-template name="anchor"/>
-    <xsl:call-template name="simple.xlink">
-      <xsl:with-param name="content">
-        <xsl:apply-templates/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:param>
-  <!-- don't put <strong> inside figure, example, or table titles -->
-  <!-- or other titles that may already be represented with <strong>'s. -->
-  <xsl:choose>
-    <xsl:when test="local-name(..) = 'title'                     and (local-name(../..) = 'figure'                          or local-name(../..) = 'example'                          or local-name(../..) = 'table'                          or local-name(../..) = 'formalpara')">
-      <code>
-        <xsl:apply-templates select="." mode="class.attribute"/>
-        <xsl:call-template name="generate.html.title"/>
-        <xsl:call-template name="dir"/>
-        <xsl:copy-of select="$content"/>
-        <xsl:call-template name="apply-annotations"/>
-      </code>
-    </xsl:when>
-    <xsl:otherwise>
-      <strong>
-        <xsl:apply-templates select="." mode="class.attribute"/>
-        <code>
-          <xsl:call-template name="generate.html.title"/>
-          <xsl:call-template name="dir"/>
-          <xsl:copy-of select="$content"/>
-        </code>
-        <xsl:call-template name="apply-annotations"/>
-      </strong>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="inline.italicmonoseq">
-  <xsl:param name="content">
-    <xsl:call-template name="anchor"/>
-    <xsl:call-template name="simple.xlink">
-      <xsl:with-param name="content">
-        <xsl:apply-templates/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:param>
-  <em>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <code>
-      <xsl:call-template name="generate.html.title"/>
-      <xsl:call-template name="dir"/>
-      <xsl:copy-of select="$content"/>
-      <xsl:call-template name="apply-annotations"/>
-    </code>
-  </em>
-</xsl:template>
-
-<xsl:template name="inline.superscriptseq">
-  <xsl:param name="content">
-    <xsl:call-template name="anchor"/>
-    <xsl:call-template name="simple.xlink">
-      <xsl:with-param name="content">
-        <xsl:apply-templates/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:param>
-  <sup>
-    <xsl:call-template name="generate.html.title"/>
-    <xsl:call-template name="dir"/>
-    <xsl:copy-of select="$content"/>
-    <xsl:call-template name="apply-annotations"/>
-  </sup>
-</xsl:template>
-
-<xsl:template name="inline.subscriptseq">
-  <xsl:param name="content">
-    <xsl:call-template name="anchor"/>
-    <xsl:call-template name="simple.xlink">
-      <xsl:with-param name="content">
-        <xsl:apply-templates/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:param>
-  <sub>
-    <xsl:call-template name="generate.html.title"/>
-    <xsl:call-template name="dir"/>
-    <xsl:copy-of select="$content"/>
-    <xsl:call-template name="apply-annotations"/>
-  </sub>
-</xsl:template>
-
-<!-- ==================================================================== -->
-<!-- some special cases -->
-
-<xsl:template match="author">
-  <xsl:param name="content">
-    <xsl:call-template name="anchor"/>
-    <xsl:call-template name="simple.xlink">
-      <xsl:with-param name="content">
-        <xsl:call-template name="person.name"/>
-      </xsl:with-param>
-    </xsl:call-template>
-    <xsl:call-template name="apply-annotations"/>
-  </xsl:param>
-
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:copy-of select="$content"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="editor">
-  <xsl:param name="content">
-    <xsl:call-template name="anchor"/>
-    <xsl:call-template name="simple.xlink">
-      <xsl:with-param name="content">
-        <xsl:call-template name="person.name"/>
-      </xsl:with-param>
-    </xsl:call-template>
-    <xsl:call-template name="apply-annotations"/>
-  </xsl:param>
-
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:copy-of select="$content"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="othercredit">
-  <xsl:param name="content">
-    <xsl:call-template name="anchor"/>
-    <xsl:call-template name="simple.xlink">
-      <xsl:with-param name="content">
-        <xsl:call-template name="person.name"/>
-      </xsl:with-param>
-    </xsl:call-template>
-    <xsl:call-template name="apply-annotations"/>
-  </xsl:param>
-
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:copy-of select="$content"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="authorinitials">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="accel">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="action">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="application">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="classname">
-  <xsl:call-template name="inline.monoseq"/>
-</xsl:template>
-
-<xsl:template match="exceptionname">
-  <xsl:call-template name="inline.monoseq"/>
-</xsl:template>
-
-<xsl:template match="interfacename">
-  <xsl:call-template name="inline.monoseq"/>
-</xsl:template>
-
-<xsl:template match="methodname">
-  <xsl:call-template name="inline.monoseq"/>
-</xsl:template>
-
-<xsl:template match="command">
-  <xsl:call-template name="inline.boldseq"/>
-</xsl:template>
-
-<xsl:template match="computeroutput">
-  <xsl:call-template name="inline.monoseq"/>
-</xsl:template>
-
-<xsl:template match="constant">
-  <xsl:call-template name="inline.monoseq"/>
-</xsl:template>
-
-<xsl:template match="database">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="date">
-  <!-- should this support locale-specific formatting? how? -->
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="errorcode">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="errorname">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="errortype">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="errortext">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="envar">
-  <xsl:call-template name="inline.monoseq"/>
-</xsl:template>
-
-<xsl:template match="filename">
-  <xsl:call-template name="inline.monoseq"/>
-</xsl:template>
-
-<xsl:template match="function">
-  <xsl:choose>
-    <xsl:when test="$function.parens != '0'                     and (parameter or function or replaceable)">
-      <xsl:variable name="nodes" select="text()|*"/>
-      <xsl:call-template name="inline.monoseq">
-        <xsl:with-param name="content">
-          <xsl:call-template name="simple.xlink">
-            <xsl:with-param name="content">
-              <xsl:apply-templates select="$nodes[1]"/>
-            </xsl:with-param>
-          </xsl:call-template>
-        </xsl:with-param>
-      </xsl:call-template>
-      <xsl:text>(</xsl:text>
-      <xsl:apply-templates select="$nodes[position()&gt;1]"/>
-      <xsl:text>)</xsl:text>
-    </xsl:when>
-    <xsl:otherwise>
-     <xsl:call-template name="inline.monoseq"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="function/parameter" priority="2">
-  <xsl:call-template name="inline.italicmonoseq"/>
-  <xsl:if test="following-sibling::*">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="function/replaceable" priority="2">
-  <xsl:call-template name="inline.italicmonoseq"/>
-  <xsl:if test="following-sibling::*">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="guibutton">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="guiicon">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="guilabel">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="guimenu">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="guimenuitem">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="guisubmenu">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="hardware">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="interface">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="interfacedefinition">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="keycap">
-  <xsl:call-template name="inline.boldseq"/>
-</xsl:template>
-
-<xsl:template match="keycode">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="keysym">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="literal">
-  <xsl:call-template name="inline.monoseq"/>
-</xsl:template>
-
-<xsl:template match="code">
-  <xsl:call-template name="inline.monoseq"/>
-</xsl:template>
-
-<xsl:template match="medialabel">
-  <xsl:call-template name="inline.italicseq"/>
-</xsl:template>
-
-<xsl:template match="shortcut">
-  <xsl:call-template name="inline.boldseq"/>
-</xsl:template>
-
-<xsl:template match="mousebutton">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="option">
-  <xsl:call-template name="inline.monoseq"/>
-</xsl:template>
-
-<xsl:template match="package">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="parameter">
-  <xsl:call-template name="inline.italicmonoseq"/>
-</xsl:template>
-
-<xsl:template match="property">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="prompt">
-  <xsl:call-template name="inline.monoseq"/>
-</xsl:template>
-
-<xsl:template match="replaceable" priority="1">
-  <xsl:call-template name="inline.italicmonoseq"/>
-</xsl:template>
-
-<xsl:template match="returnvalue">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="structfield">
-  <xsl:call-template name="inline.italicmonoseq"/>
-</xsl:template>
-
-<xsl:template match="structname">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="symbol">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="systemitem">
-  <xsl:call-template name="inline.monoseq"/>
-</xsl:template>
-
-<xsl:template match="token">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="type">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="userinput">
-  <xsl:call-template name="inline.boldmonoseq"/>
-</xsl:template>
-
-<xsl:template match="abbrev">
-  <xsl:call-template name="inline.charseq">
-    <xsl:with-param name="wrapper-name">abbr</xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="acronym">
-  <xsl:call-template name="inline.charseq">
-    <xsl:with-param name="wrapper-name">acronym</xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="citerefentry">
-  <xsl:choose>
-    <xsl:when test="$citerefentry.link != '0'">
-      <a>
-        <xsl:apply-templates select="." mode="class.attribute"/>
-        <xsl:attribute name="href">
-          <xsl:call-template name="generate.citerefentry.link"/>
-        </xsl:attribute>
-        <xsl:call-template name="inline.charseq"/>
-      </a>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="inline.charseq"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="generate.citerefentry.link">
-  <!-- nop -->
-</xsl:template>
-
-<xsl:template name="x.generate.citerefentry.link">
-  <xsl:text>http://example.com/cgi-bin/man.cgi?</xsl:text>
-  <xsl:value-of select="refentrytitle"/>
-  <xsl:text>(</xsl:text>
-  <xsl:value-of select="manvolnum"/>
-  <xsl:text>)</xsl:text>
-</xsl:template>
-
-<xsl:template match="citetitle">
-  <xsl:choose>
-    <xsl:when test="@pubwork = 'article'">
-      <xsl:call-template name="gentext.startquote"/>
-      <xsl:call-template name="inline.charseq"/>
-      <xsl:call-template name="gentext.endquote"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="inline.italicseq"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="emphasis">
-  <span>
-    <xsl:choose>
-      <xsl:when test="@role and $emphasis.propagates.style != 0">
-        <xsl:apply-templates select="." mode="class.attribute">
-          <xsl:with-param name="class" select="@role"/>
-        </xsl:apply-templates>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:apply-templates select="." mode="class.attribute"/>
-      </xsl:otherwise>
-    </xsl:choose>
-    <xsl:call-template name="anchor"/>
-
-    <xsl:call-template name="simple.xlink">
-      <xsl:with-param name="content">
-        <xsl:choose>
-          <xsl:when test="@role = 'bold' or @role='strong'">
-            <!-- backwards compatibility: make bold into b elements, but -->
-            <!-- don't put bold inside figure, example, or table titles -->
-            <xsl:choose>
-              <xsl:when test="local-name(..) = 'title'                               and (local-name(../..) = 'figure'                               or local-name(../..) = 'example'                               or local-name(../..) = 'table')">
-                <xsl:apply-templates/>
-              </xsl:when>
-              <xsl:otherwise>
-                <strong><xsl:apply-templates/></strong>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:when>
-          <xsl:when test="@role and $emphasis.propagates.style != 0">
-            <xsl:apply-templates/>
-          </xsl:when>
-          <xsl:otherwise>
-            <em><xsl:apply-templates/></em>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:with-param>
-    </xsl:call-template>
-  </span>
-</xsl:template>
-
-<xsl:template match="foreignphrase">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:if test="@lang or @xml:lang">
-      <xsl:call-template name="language.attribute"/>
-    </xsl:if>
-    <xsl:call-template name="inline.italicseq"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="markup">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="phrase">
-  <span>
-    <xsl:call-template name="generate.html.title"/>
-    <xsl:if test="@lang or @xml:lang">
-      <xsl:call-template name="language.attribute"/>
-    </xsl:if>
-    <xsl:if test="@role and $phrase.propagates.style != 0">
-      <xsl:apply-templates select="." mode="class.attribute">
-        <xsl:with-param name="class" select="@role"/>
-      </xsl:apply-templates>
-    </xsl:if>
-    <xsl:call-template name="dir"/>
-    <xsl:call-template name="anchor"/>
-    <xsl:call-template name="simple.xlink">
-      <xsl:with-param name="content">
-        <xsl:apply-templates/>
-      </xsl:with-param>
-    </xsl:call-template>
-    <xsl:call-template name="apply-annotations"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="quote">
-  <xsl:variable name="depth">
-    <xsl:call-template name="dot.count">
-      <xsl:with-param name="string">
-        <xsl:number level="multiple"/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:variable>
-  <xsl:choose>
-    <xsl:when test="$depth mod 2 = 0">
-      <xsl:call-template name="gentext.startquote"/>
-      <xsl:call-template name="inline.charseq"/>
-      <xsl:call-template name="gentext.endquote"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="gentext.nestedstartquote"/>
-      <xsl:call-template name="inline.charseq"/>
-      <xsl:call-template name="gentext.nestedendquote"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="varname">
-  <xsl:call-template name="inline.monoseq"/>
-</xsl:template>
-
-<xsl:template match="wordasword">
-  <xsl:call-template name="inline.italicseq"/>
-</xsl:template>
-
-<xsl:template match="lineannotation">
-  <em>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="inline.charseq"/>
-  </em>
-</xsl:template>
-
-<xsl:template match="superscript">
-  <xsl:call-template name="inline.superscriptseq"/>
-</xsl:template>
-
-<xsl:template match="subscript">
-  <xsl:call-template name="inline.subscriptseq"/>
-</xsl:template>
-
-<xsl:template match="trademark">
-  <xsl:call-template name="inline.charseq"/>
-  <xsl:choose>
-    <xsl:when test="@class = 'copyright'                     or @class = 'registered'">
-      <xsl:call-template name="dingbat">
-        <xsl:with-param name="dingbat" select="@class"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="@class = 'service'">
-      <sup>SM</sup>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="dingbat">
-        <xsl:with-param name="dingbat" select="'trademark'"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="firstterm">
-  <xsl:call-template name="glossterm">
-    <xsl:with-param name="firstterm" select="1"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="glossterm" name="glossterm">
-  <xsl:param name="firstterm" select="0"/>
-
-  <!-- To avoid extra <a name=""> anchor from inline.italicseq -->
-  <xsl:variable name="content">
-    <xsl:apply-templates/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="($firstterm.only.link = 0 or $firstterm = 1) and @linkend">
-      <xsl:variable name="targets" select="key('id',@linkend)"/>
-      <xsl:variable name="target" select="$targets[1]"/>
-
-      <xsl:call-template name="check.id.unique">
-        <xsl:with-param name="linkend" select="@linkend"/>
-      </xsl:call-template>
-
-      <xsl:choose>
-        <xsl:when test="$target">
-          <a>
-            <xsl:apply-templates select="." mode="class.attribute"/>
-            <xsl:if test="@id or @xml:id">
-              <xsl:attribute name="id">
-                <xsl:value-of select="(@id|@xml:id)[1]"/>
-              </xsl:attribute>
-            </xsl:if>
-
-            <xsl:attribute name="href">
-              <xsl:call-template name="href.target">
-                <xsl:with-param name="object" select="$target"/>
-              </xsl:call-template>
-            </xsl:attribute>
-
-            <xsl:call-template name="inline.italicseq">
-              <xsl:with-param name="content" select="$content"/>
-            </xsl:call-template>
-          </a>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="inline.italicseq">
-            <xsl:with-param name="content" select="$content"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-
-    <xsl:when test="not(@linkend)                     and ($firstterm.only.link = 0 or $firstterm = 1)                     and ($glossterm.auto.link != 0)                     and $glossary.collection != ''">
-      <xsl:variable name="term">
-        <xsl:choose>
-          <xsl:when test="@baseform"><xsl:value-of select="@baseform"/></xsl:when>
-          <xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-
-      <xsl:variable name="cterm" select="(document($glossary.collection,.)//glossentry[glossterm=$term])[1]"/>
-
-      <!-- HACK HACK HACK! But it works... -->
-      <!-- You'd need to do more work if you wanted to chunk on glossdiv, though -->
-
-      <xsl:variable name="glossary" select="//glossary[@role='auto']"/>
-
-      <xsl:if test="count($glossary) != 1">
-        <xsl:message>
-          <xsl:text>Warning: glossary.collection specified, but there are </xsl:text>
-          <xsl:value-of select="count($glossary)"/>
-          <xsl:text> automatic glossaries</xsl:text>
-        </xsl:message>
-      </xsl:if>
-
-      <xsl:variable name="glosschunk">
-        <xsl:call-template name="href.target">
-          <xsl:with-param name="object" select="$glossary"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <xsl:variable name="chunkbase">
-        <xsl:choose>
-          <xsl:when test="contains($glosschunk, '#')">
-            <xsl:value-of select="substring-before($glosschunk, '#')"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="$glosschunk"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-
-      <xsl:choose>
-        <xsl:when test="not($cterm)">
-          <xsl:message>
-            <xsl:text>There's no entry for </xsl:text>
-            <xsl:value-of select="$term"/>
-            <xsl:text> in </xsl:text>
-            <xsl:value-of select="$glossary.collection"/>
-          </xsl:message>
-          <xsl:call-template name="inline.italicseq"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:variable name="id">
-            <xsl:call-template name="object.id">
-              <xsl:with-param name="object" select="$cterm"/>
-            </xsl:call-template>
-          </xsl:variable>
-          <a href="{$chunkbase}#{$id}">
-            <xsl:apply-templates select="." mode="class.attribute"/>
-            <xsl:call-template name="inline.italicseq">
-              <xsl:with-param name="content" select="$content"/>
-            </xsl:call-template>
-          </a>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-
-    <xsl:when test="not(@linkend)                     and ($firstterm.only.link = 0 or $firstterm = 1)                     and $glossterm.auto.link != 0">
-      <xsl:variable name="term">
-        <xsl:choose>
-          <xsl:when test="@baseform">
-            <xsl:value-of select="normalize-space(@baseform)"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="normalize-space(.)"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-      <xsl:variable name="targets" select="//glossentry[normalize-space(glossterm)=$term                               or normalize-space(glossterm/@baseform)=$term]"/>
-      <xsl:variable name="target" select="$targets[1]"/>
-
-      <xsl:choose>
-        <xsl:when test="count($targets)=0">
-          <xsl:message>
-            <xsl:text>Error: no glossentry for glossterm: </xsl:text>
-            <xsl:value-of select="."/>
-            <xsl:text>.</xsl:text>
-          </xsl:message>
-          <xsl:call-template name="inline.italicseq"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <a>
-            <xsl:apply-templates select="." mode="class.attribute"/>
-            <xsl:if test="@id or @xml:id">
-              <xsl:attribute name="id">
-                <xsl:value-of select="(@id|@xml:id)[1]"/>
-              </xsl:attribute>
-            </xsl:if>
-
-            <xsl:attribute name="href">
-              <xsl:call-template name="href.target">
-                <xsl:with-param name="object" select="$target"/>
-              </xsl:call-template>
-            </xsl:attribute>
-
-            <xsl:call-template name="inline.italicseq">
-              <xsl:with-param name="content" select="$content"/>
-            </xsl:call-template>
-          </a>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-
-    <xsl:otherwise>
-      <xsl:call-template name="inline.italicseq"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="termdef">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="generate.html.title"/>
-    <xsl:call-template name="gentext.template">
-      <xsl:with-param name="context" select="'termdef'"/>
-      <xsl:with-param name="name" select="'prefix'"/>
-    </xsl:call-template>
-    <xsl:apply-templates/>
-    <xsl:call-template name="gentext.template">
-      <xsl:with-param name="context" select="'termdef'"/>
-      <xsl:with-param name="name" select="'suffix'"/>
-    </xsl:call-template>
-  </span>
-</xsl:template>
-
-<xsl:template match="sgmltag|tag">
-  <xsl:call-template name="format.sgmltag"/>
-</xsl:template>
-
-<xsl:template name="format.sgmltag">
-  <xsl:param name="class">
-    <xsl:choose>
-      <xsl:when test="@class">
-        <xsl:value-of select="@class"/>
-      </xsl:when>
-      <xsl:otherwise>element</xsl:otherwise>
-    </xsl:choose>
-  </xsl:param>
-
-  <xsl:variable name="content">
-    <xsl:choose>
-      <xsl:when test="$class='attribute'">
-        <xsl:apply-templates/>
-      </xsl:when>
-      <xsl:when test="$class='attvalue'">
-        <xsl:apply-templates/>
-      </xsl:when>
-      <xsl:when test="$class='element'">
-        <xsl:apply-templates/>
-      </xsl:when>
-      <xsl:when test="$class='endtag'">
-        <xsl:text>&lt;/</xsl:text>
-        <xsl:apply-templates/>
-        <xsl:text>&gt;</xsl:text>
-      </xsl:when>
-      <xsl:when test="$class='genentity'">
-        <xsl:text>&amp;</xsl:text>
-        <xsl:apply-templates/>
-        <xsl:text>;</xsl:text>
-      </xsl:when>
-      <xsl:when test="$class='numcharref'">
-        <xsl:text>&amp;#</xsl:text>
-        <xsl:apply-templates/>
-        <xsl:text>;</xsl:text>
-      </xsl:when>
-      <xsl:when test="$class='paramentity'">
-        <xsl:text>%</xsl:text>
-        <xsl:apply-templates/>
-        <xsl:text>;</xsl:text>
-      </xsl:when>
-      <xsl:when test="$class='pi'">
-        <xsl:text>&lt;?</xsl:text>
-        <xsl:apply-templates/>
-        <xsl:text>&gt;</xsl:text>
-      </xsl:when>
-      <xsl:when test="$class='xmlpi'">
-        <xsl:text>&lt;?</xsl:text>
-        <xsl:apply-templates/>
-        <xsl:text>?&gt;</xsl:text>
-      </xsl:when>
-      <xsl:when test="$class='starttag'">
-        <xsl:text>&lt;</xsl:text>
-        <xsl:apply-templates/>
-        <xsl:text>&gt;</xsl:text>
-      </xsl:when>
-      <xsl:when test="$class='emptytag'">
-        <xsl:text>&lt;</xsl:text>
-        <xsl:apply-templates/>
-        <xsl:text>/&gt;</xsl:text>
-      </xsl:when>
-      <xsl:when test="$class='sgmlcomment' or $class='comment'">
-        <xsl:text>&lt;!--</xsl:text>
-        <xsl:apply-templates/>
-        <xsl:text>--&gt;</xsl:text>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:apply-templates/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <code>
-    <xsl:apply-templates select="." mode="class.attribute">
-      <xsl:with-param name="class" select="concat('sgmltag-', $class)"/>
-    </xsl:apply-templates>
-    <xsl:call-template name="generate.html.title"/>
-    <xsl:call-template name="simple.xlink">
-      <xsl:with-param name="content" select="$content"/>
-    </xsl:call-template>
-  </code>
-</xsl:template>
-
-<xsl:template match="email">
-  <xsl:call-template name="inline.monoseq">
-    <xsl:with-param name="content">
-      <xsl:if test="not($email.delimiters.enabled = 0)">
-        <xsl:text>&lt;</xsl:text>
-      </xsl:if>
-      <a>
-        <xsl:apply-templates select="." mode="class.attribute"/>
-        <xsl:attribute name="href">
-          <xsl:text>mailto:</xsl:text>
-          <xsl:value-of select="."/>
-        </xsl:attribute>
-        <xsl:apply-templates/>
-      </a>
-      <xsl:if test="not($email.delimiters.enabled = 0)">
-        <xsl:text>&gt;</xsl:text>
-      </xsl:if>
-    </xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="keycombo">
-  <xsl:variable name="action" select="@action"/>
-  <xsl:variable name="joinchar">
-    <xsl:choose>
-      <xsl:when test="$action='seq'"><xsl:text> </xsl:text></xsl:when>
-      <xsl:when test="$action='simul'">+</xsl:when>
-      <xsl:when test="$action='press'">-</xsl:when>
-      <xsl:when test="$action='click'">-</xsl:when>
-      <xsl:when test="$action='double-click'">-</xsl:when>
-      <xsl:when test="$action='other'"/>
-      <xsl:otherwise>+</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-  <xsl:for-each select="*">
-    <xsl:if test="position()&gt;1"><xsl:value-of select="$joinchar"/></xsl:if>
-    <xsl:apply-templates select="."/>
-  </xsl:for-each>
-</xsl:template>
-
-<xsl:template match="uri">
-  <xsl:call-template name="inline.monoseq"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="menuchoice">
-  <xsl:variable name="shortcut" select="./shortcut"/>
-  <xsl:call-template name="process.menuchoice"/>
-  <xsl:if test="$shortcut">
-    <xsl:text> (</xsl:text>
-    <xsl:apply-templates select="$shortcut"/>
-    <xsl:text>)</xsl:text>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="process.menuchoice">
-  <xsl:param name="nodelist" select="guibutton|guiicon|guilabel|guimenu|guimenuitem|guisubmenu|interface"/><!-- not(shortcut) -->
-  <xsl:param name="count" select="1"/>
-
-  <xsl:choose>
-    <xsl:when test="$count&gt;count($nodelist)"/>
-    <xsl:when test="$count=1">
-      <xsl:apply-templates select="$nodelist[$count=position()]"/>
-      <xsl:call-template name="process.menuchoice">
-        <xsl:with-param name="nodelist" select="$nodelist"/>
-        <xsl:with-param name="count" select="$count+1"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:variable name="node" select="$nodelist[$count=position()]"/>
-      <xsl:choose>
-        <xsl:when test="local-name($node)='guimenuitem'                         or local-name($node)='guisubmenu'">
-          <xsl:value-of select="$menuchoice.menu.separator"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="$menuchoice.separator"/>
-        </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="$node"/>
-      <xsl:call-template name="process.menuchoice">
-        <xsl:with-param name="nodelist" select="$nodelist"/>
-        <xsl:with-param name="count" select="$count+1"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="optional">
-  <xsl:value-of select="$arg.choice.opt.open.str"/>
-  <xsl:call-template name="inline.charseq"/>
-  <xsl:value-of select="$arg.choice.opt.close.str"/>
-</xsl:template>
-
-<xsl:template match="citation">
-  <!-- todo: integrate with bibliography collection -->
-  <xsl:variable name="targets" select="(//biblioentry | //bibliomixed)[abbrev = string(current())]"/>
-  <xsl:variable name="target" select="$targets[1]"/>
-
-  <xsl:choose>
-    <!-- try automatic linking based on match to abbrev -->
-    <xsl:when test="$target and not(xref) and not(link)">
-
-      <xsl:text>[</xsl:text>
-      <a>
-        <xsl:apply-templates select="." mode="class.attribute"/>
-        <xsl:attribute name="href">
-          <xsl:call-template name="href.target">
-            <xsl:with-param name="object" select="$target"/>
-          </xsl:call-template>
-        </xsl:attribute>
-
-	<xsl:choose>
-	  <xsl:when test="$bibliography.numbered != 0">
-	    <xsl:apply-templates select="$target" mode="citation"/>
-	  </xsl:when>
-	  <xsl:otherwise>
-	    <xsl:call-template name="inline.charseq"/>
-	  </xsl:otherwise>
-	</xsl:choose>
-
-      </a>
-      <xsl:text>]</xsl:text>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:text>[</xsl:text>
-      <xsl:call-template name="inline.charseq"/>
-      <xsl:text>]</xsl:text>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="biblioentry|bibliomixed" mode="citation">
-  <xsl:number from="bibliography" count="biblioentry|bibliomixed" level="any" format="1"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="comment[parent::answer|parent::appendix|parent::article|parent::bibliodiv|parent::bibliography|parent::blockquote|parent::caution|parent::chapter|parent::glossary|parent::glossdiv|parent::important|parent::index|parent::indexdiv|parent::listitem|parent::note|parent::orderedlist|parent::partintro|parent::preface|parent::procedure|parent::qandadiv|parent::qandaset|parent::question|parent::refentry|parent::refnamediv|parent::refsect1|parent::refsect2|parent::refsect3|parent::refsection|parent::refsynopsisdiv|parent::sect1|parent::sect2|parent::sect3|parent::sect4|parent::sect5|parent::section|parent::setindex|parent::sidebar|parent::simplesect|parent::taskprerequisites|parent::taskrelated|parent::tasksummary|parent::warning]|remark[parent::answer|parent::appendix|parent::article|parent::bibliodiv|parent::bibliography|parent::blockquote|parent::caution|parent::chapter|parent::glossary|parent::glossdiv|parent::important|parent::index|parent::indexdiv|parent::listitem|parent::note|parent::orderedlist|parent::partintro|parent::preface|parent::procedure|parent::qandadiv|parent::qandaset|parent::question|parent::refentry|parent::refnamediv|parent::refsect1|parent::refsect2|parent::refsect3|parent::refsection|parent::refsynopsisdiv|parent::sect1|parent::sect2|parent::sect3|parent::sect4|parent::sect5|parent::section|parent::setindex|parent::sidebar|parent::simplesect|parent::taskprerequisites|parent::taskrelated|parent::tasksummary|parent::warning]">
-  <xsl:if test="$show.comments != 0">
-    <p class="remark"><i><xsl:call-template name="inline.charseq"/></i></p>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="comment|remark">
-  <xsl:if test="$show.comments != 0">
-    <em><xsl:call-template name="inline.charseq"/></em>
-  </xsl:if>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="productname">
-  <xsl:call-template name="inline.charseq"/>
-  <xsl:if test="@class">
-    <xsl:call-template name="dingbat">
-      <xsl:with-param name="dingbat" select="@class"/>
-    </xsl:call-template>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="productnumber">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="pob|street|city|state|postcode|country|otheraddr">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="phone|fax">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<!-- in Addresses, for example -->
-<xsl:template match="honorific|firstname|surname|lineage|othername">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="person">
-  <xsl:param name="content">
-    <xsl:call-template name="anchor"/>
-    <xsl:call-template name="simple.xlink">
-      <xsl:with-param name="content">
-        <xsl:apply-templates select="personname"/>
-      </xsl:with-param>
-    </xsl:call-template>
-    <xsl:call-template name="apply-annotations"/>
-  </xsl:param>
-
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:copy-of select="$content"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="personname">
-  <xsl:param name="content">
-    <xsl:call-template name="anchor"/>
-    <xsl:call-template name="simple.xlink">
-      <xsl:with-param name="content">
-        <xsl:call-template name="person.name"/>
-      </xsl:with-param>
-    </xsl:call-template>
-    <xsl:call-template name="apply-annotations"/>
-  </xsl:param>
-
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:copy-of select="$content"/>
-  </span>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="org">
-  <xsl:param name="content">
-    <xsl:call-template name="anchor"/>
-    <xsl:call-template name="simple.xlink">
-      <xsl:with-param name="content">
-        <xsl:apply-templates/>
-      </xsl:with-param>
-    </xsl:call-template>
-    <xsl:call-template name="apply-annotations"/>
-  </xsl:param>
-
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:copy-of select="$content"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="orgname">
-  <xsl:param name="content">
-    <xsl:call-template name="anchor"/>
-    <xsl:call-template name="simple.xlink">
-      <xsl:with-param name="content">
-        <xsl:apply-templates/>
-      </xsl:with-param>
-    </xsl:call-template>
-    <xsl:call-template name="apply-annotations"/>
-  </xsl:param>
-
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:copy-of select="$content"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="orgdiv">
-  <xsl:param name="content">
-    <xsl:call-template name="anchor"/>
-    <xsl:call-template name="simple.xlink">
-      <xsl:with-param name="content">
-        <xsl:apply-templates/>
-      </xsl:with-param>
-    </xsl:call-template>
-    <xsl:call-template name="apply-annotations"/>
-  </xsl:param>
-
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:copy-of select="$content"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="affiliation">
-  <xsl:param name="content">
-    <xsl:call-template name="anchor"/>
-    <xsl:call-template name="simple.xlink">
-      <xsl:with-param name="content">
-        <xsl:call-template name="person.name"/>
-      </xsl:with-param>
-    </xsl:call-template>
-    <xsl:call-template name="apply-annotations"/>
-  </xsl:param>
-
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:copy-of select="$content"/>
-  </span>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="beginpage">
-  <!-- does nothing; this *is not* markup to force a page break. -->
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/keywords.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/keywords.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,36 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<xsl:template match="keywordset"/>
-<xsl:template match="subjectset"/>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="keywordset" mode="html.header">
-  <meta name="keywords">
-    <xsl:attribute name="content">
-      <xsl:apply-templates select="keyword" mode="html.header"/>
-    </xsl:attribute>
-  </meta>
-</xsl:template>
-
-<xsl:template match="keyword" mode="html.header">
-  <xsl:apply-templates/>
-  <xsl:if test="following-sibling::keyword">, </xsl:if>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/lists.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/lists.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,1045 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:template match="itemizedlist">
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="anchor"/>
-    <xsl:if test="title">
-      <xsl:call-template name="formal.object.heading"/>
-    </xsl:if>
-
-    <!-- Preserve order of PIs and comments -->
-    <xsl:apply-templates select="*[not(self::listitem                   or self::title                   or self::titleabbrev)]                 |comment()[not(preceding-sibling::listitem)]                 |processing-instruction()[not(preceding-sibling::listitem)]"/>
-
-    <ul>
-      <xsl:if test="$css.decoration != 0">
-        <xsl:attribute name="type">
-          <xsl:call-template name="list.itemsymbol"/>
-        </xsl:attribute>
-      </xsl:if>
-
-      <xsl:if test="@spacing='compact'">
-        <xsl:attribute name="compact">
-          <xsl:value-of select="@spacing"/>
-        </xsl:attribute>
-      </xsl:if>
-      <xsl:apply-templates select="listitem                     |comment()[preceding-sibling::listitem]                     |processing-instruction()[preceding-sibling::listitem]"/>
-    </ul>
-  </div>
-</xsl:template>
-
-<xsl:template match="itemizedlist/title">
-  <!-- nop -->
-</xsl:template>
-
-<xsl:template match="itemizedlist/listitem">
-  <xsl:variable name="mark" select="../@mark"/>
-  <xsl:variable name="override" select="@override"/>
-
-  <xsl:variable name="usemark">
-    <xsl:choose>
-      <xsl:when test="$override != ''">
-        <xsl:value-of select="$override"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$mark"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="cssmark">
-    <xsl:choose>
-      <xsl:when test="$usemark = 'opencircle'">circle</xsl:when>
-      <xsl:when test="$usemark = 'bullet'">disc</xsl:when>
-      <xsl:when test="$usemark = 'box'">square</xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$usemark"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <li>
-    <xsl:if test="$css.decoration = '1' and $cssmark != ''">
-      <xsl:attribute name="style">
-        <xsl:text>list-style-type: </xsl:text>
-        <xsl:value-of select="$cssmark"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <!-- we can't just drop the anchor in since some browsers (Opera)
-         get confused about line breaks if we do. So if the first child
-         is a para, assume the para will put in the anchor. Otherwise,
-         put the anchor in anyway. -->
-    <xsl:if test="local-name(child::*[1]) != 'para'">
-      <xsl:call-template name="anchor"/>
-    </xsl:if>
-
-    <xsl:choose>
-      <xsl:when test="$show.revisionflag != 0 and @revisionflag">
-        <div class="{@revisionflag}">
-          <xsl:apply-templates/>
-        </div>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:apply-templates/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </li>
-</xsl:template>
-
-<xsl:template match="orderedlist">
-  <xsl:variable name="start">
-    <xsl:call-template name="orderedlist-starting-number"/>
-  </xsl:variable>
-
-  <xsl:variable name="numeration">
-    <xsl:call-template name="list.numeration"/>
-  </xsl:variable>
-
-  <xsl:variable name="type">
-    <xsl:choose>
-      <xsl:when test="$numeration='arabic'">1</xsl:when>
-      <xsl:when test="$numeration='loweralpha'">a</xsl:when>
-      <xsl:when test="$numeration='lowerroman'">i</xsl:when>
-      <xsl:when test="$numeration='upperalpha'">A</xsl:when>
-      <xsl:when test="$numeration='upperroman'">I</xsl:when>
-      <!-- What!? This should never happen -->
-      <xsl:otherwise>
-        <xsl:message>
-          <xsl:text>Unexpected numeration: </xsl:text>
-          <xsl:value-of select="$numeration"/>
-        </xsl:message>
-        <xsl:value-of select="1"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="anchor"/>
-
-    <xsl:if test="title">
-      <xsl:call-template name="formal.object.heading"/>
-    </xsl:if>
-
-    <!-- Preserve order of PIs and comments -->
-    <xsl:apply-templates select="*[not(self::listitem                   or self::title                   or self::titleabbrev)]                 |comment()[not(preceding-sibling::listitem)]                 |processing-instruction()[not(preceding-sibling::listitem)]"/>
-
-    <ol>
-      <xsl:if test="$start != '1'">
-        <xsl:attribute name="start">
-          <xsl:value-of select="$start"/>
-        </xsl:attribute>
-      </xsl:if>
-      <xsl:if test="$numeration != ''">
-        <xsl:attribute name="type">
-          <xsl:value-of select="$type"/>
-        </xsl:attribute>
-      </xsl:if>
-      <xsl:if test="@spacing='compact'">
-        <xsl:attribute name="compact">
-          <xsl:value-of select="@spacing"/>
-        </xsl:attribute>
-      </xsl:if>
-      <xsl:apply-templates select="listitem                     |comment()[preceding-sibling::listitem]                     |processing-instruction()[preceding-sibling::listitem]"/>
-    </ol>
-  </div>
-</xsl:template>
-
-<xsl:template match="orderedlist/title">
-  <!-- nop -->
-</xsl:template>
-
-<xsl:template match="orderedlist/listitem">
-  <li>
-    <xsl:if test="@override">
-      <xsl:attribute name="value">
-        <xsl:value-of select="@override"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <!-- we can't just drop the anchor in since some browsers (Opera)
-         get confused about line breaks if we do. So if the first child
-         is a para, assume the para will put in the anchor. Otherwise,
-         put the anchor in anyway. -->
-    <xsl:if test="local-name(child::*[1]) != 'para'">
-      <xsl:call-template name="anchor"/>
-    </xsl:if>
-
-    <xsl:choose>
-      <xsl:when test="$show.revisionflag != 0 and @revisionflag">
-        <div class="{@revisionflag}">
-          <xsl:apply-templates/>
-        </div>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:apply-templates/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </li>
-</xsl:template>
-
-<xsl:template match="variablelist">
-  <xsl:variable name="pi-presentation">
-    <xsl:call-template name="pi.dbhtml_list-presentation"/>
-  </xsl:variable>
-
-  <xsl:variable name="presentation">
-    <xsl:choose>
-      <xsl:when test="$pi-presentation != ''">
-        <xsl:value-of select="$pi-presentation"/>
-      </xsl:when>
-      <xsl:when test="$variablelist.as.table != 0">
-        <xsl:value-of select="'table'"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="'list'"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="list-width">
-    <xsl:call-template name="pi.dbhtml_list-width"/>
-  </xsl:variable>
-
-  <xsl:variable name="term-width">
-    <xsl:call-template name="pi.dbhtml_term-width"/>
-  </xsl:variable>
-
-  <xsl:variable name="table-summary">
-    <xsl:call-template name="pi.dbhtml_table-summary"/>
-  </xsl:variable>
-
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="anchor"/>
-    <xsl:if test="title">
-      <xsl:call-template name="formal.object.heading"/>
-    </xsl:if>
-
-    <xsl:choose>
-      <xsl:when test="$presentation = 'table'">
-        <!-- Preserve order of PIs and comments -->
-        <xsl:apply-templates select="*[not(self::varlistentry                     or self::title                     or self::titleabbrev)]                   |comment()[not(preceding-sibling::varlistentry)]                   |processing-instruction()[not(preceding-sibling::varlistentry)]"/>
-        <table border="0">
-          <xsl:if test="$list-width != ''">
-            <xsl:attribute name="width">
-              <xsl:value-of select="$list-width"/>
-            </xsl:attribute>
-          </xsl:if>
-          <xsl:if test="$table-summary != ''">
-            <xsl:attribute name="summary">
-              <xsl:value-of select="$table-summary"/>
-            </xsl:attribute>
-          </xsl:if>
-          <col align="left" valign="top">
-            <xsl:if test="$term-width != ''">
-              <xsl:attribute name="width">
-                <xsl:value-of select="$term-width"/>
-              </xsl:attribute>
-            </xsl:if>
-          </col>
-          <tbody>
-            <xsl:apply-templates mode="varlist-table" select="varlistentry                       |comment()[preceding-sibling::varlistentry]                       |processing-instruction()[preceding-sibling::varlistentry]"/>
-          </tbody>
-        </table>
-      </xsl:when>
-      <xsl:otherwise>
-        <!-- Preserve order of PIs and comments -->
-        <xsl:apply-templates select="*[not(self::varlistentry                     or self::title                     or self::titleabbrev)]                   |comment()[not(preceding-sibling::varlistentry)]                   |processing-instruction()[not(preceding-sibling::varlistentry)]"/>
-        <dl>
-          <xsl:apply-templates select="varlistentry                       |comment()[preceding-sibling::varlistentry]                       |processing-instruction()[preceding-sibling::varlistentry]"/>
-        </dl>
-      </xsl:otherwise>
-    </xsl:choose>
-  </div>
-</xsl:template>
-
-<xsl:template match="variablelist/title">
-  <!-- nop -->
-</xsl:template>
-
-<xsl:template match="itemizedlist/titleabbrev|orderedlist/titleabbrev">
-  <!--nop-->
-</xsl:template>
-
-<xsl:template match="variablelist/titleabbrev">
-  <!--nop-->
-</xsl:template>
-
-<xsl:template match="listitem" mode="xref">
-  <xsl:number format="1"/>
-</xsl:template>
-
-<xsl:template match="listitem/simpara" priority="2">
-  <!-- If a listitem contains only a single simpara, don't output
-       the <p> wrapper; this has the effect of creating an li
-       with simple text content. -->
-  <xsl:choose>
-    <xsl:when test="not(preceding-sibling::*)                     and not (following-sibling::*)">
-      <xsl:call-template name="anchor"/>
-      <xsl:apply-templates/>
-    </xsl:when>
-    <xsl:otherwise>
-      <p>
-        <xsl:if test="@role and $para.propagates.style != 0">
-           <xsl:apply-templates select="." mode="class.attribute">
-             <xsl:with-param name="class" select="@role"/>
-           </xsl:apply-templates>
-        </xsl:if>
-
-        <xsl:call-template name="anchor"/>
-        <xsl:apply-templates/>
-      </p>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="varlistentry">
-  <dt>
-    <xsl:call-template name="anchor"/>
-    <xsl:apply-templates select="term"/>
-  </dt>
-  <dd>
-    <xsl:apply-templates select="listitem"/>
-  </dd>
-</xsl:template>
-
-<xsl:template match="varlistentry" mode="varlist-table">
-  <xsl:variable name="presentation">
-    <xsl:call-template name="pi.dbhtml_term-presentation">
-      <xsl:with-param name="node" select=".."/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="separator">
-    <xsl:call-template name="pi.dbhtml_term-separator">
-      <xsl:with-param name="node" select=".."/>
-    </xsl:call-template>
-  </xsl:variable>
-  <tr>
-    <xsl:call-template name="tr.attributes">
-      <xsl:with-param name="rownum">
-        <xsl:number from="variablelist" count="varlistentry"/>
-      </xsl:with-param>
-    </xsl:call-template>
-
-    <td>
-      <p>
-      <xsl:call-template name="anchor"/>
-      <xsl:choose>
-        <xsl:when test="$presentation = 'bold'">
-          <b>
-            <xsl:apply-templates select="term"/>
-            <xsl:value-of select="$separator"/>
-          </b>
-        </xsl:when>
-        <xsl:when test="$presentation = 'italic'">
-          <i>
-            <xsl:apply-templates select="term"/>
-            <xsl:value-of select="$separator"/>
-          </i>
-        </xsl:when>
-        <xsl:when test="$presentation = 'bold-italic'">
-          <b>
-            <i>
-              <xsl:apply-templates select="term"/>
-              <xsl:value-of select="$separator"/>
-            </i>
-          </b>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates select="term"/>
-          <xsl:value-of select="$separator"/>
-        </xsl:otherwise>
-      </xsl:choose>
-      </p>
-    </td>
-    <td>
-      <xsl:apply-templates select="listitem"/>
-    </td>
-  </tr>
-</xsl:template>
-
-<xsl:template match="varlistentry/term">
-  <span class="term">
-    <xsl:call-template name="anchor"/>
-    <xsl:call-template name="simple.xlink">
-      <xsl:with-param name="content">
-        <xsl:apply-templates/>
-      </xsl:with-param>
-    </xsl:call-template>
-    <xsl:choose>
-      <xsl:when test="position() = last()"/> <!-- do nothing -->
-      <xsl:otherwise>
-        <!-- * if we have multiple terms in the same varlistentry, generate -->
-        <!-- * a separator (", " by default) and/or an additional line -->
-        <!-- * break after each one except the last -->
-        <xsl:value-of select="$variablelist.term.separator"/>
-        <xsl:if test="not($variablelist.term.break.after = '0')">
-          <br/>
-        </xsl:if>
-      </xsl:otherwise>
-    </xsl:choose>
-  </span>
-</xsl:template>
-
-<xsl:template match="varlistentry/listitem">
-  <!-- we can't just drop the anchor in since some browsers (Opera)
-       get confused about line breaks if we do. So if the first child
-       is a para, assume the para will put in the anchor. Otherwise,
-       put the anchor in anyway. -->
-  <xsl:if test="local-name(child::*[1]) != 'para'">
-    <xsl:call-template name="anchor"/>
-  </xsl:if>
-
-  <xsl:choose>
-    <xsl:when test="$show.revisionflag != 0 and @revisionflag">
-      <div class="{@revisionflag}">
-        <xsl:apply-templates/>
-      </div>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="simplelist">
-  <!-- with no type specified, the default is 'vert' -->
-  <xsl:call-template name="anchor"/>
-  <table class="simplelist" border="0" summary="Simple list">
-    <xsl:call-template name="simplelist.vert">
-      <xsl:with-param name="cols">
-        <xsl:choose>
-          <xsl:when test="@columns">
-            <xsl:value-of select="@columns"/>
-          </xsl:when>
-          <xsl:otherwise>1</xsl:otherwise>
-        </xsl:choose>
-      </xsl:with-param>
-    </xsl:call-template>
-  </table>
-</xsl:template>
-
-<xsl:template match="simplelist[@type='inline']">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-  <!-- if dbchoice PI exists, use that to determine the choice separator -->
-  <!-- (that is, equivalent of "and" or "or" in current locale), or literal -->
-  <!-- value of "choice" otherwise -->
-  <xsl:variable name="localized-choice-separator">
-    <xsl:choose>
-      <xsl:when test="processing-instruction('dbchoice')">
-        <xsl:call-template name="select.choice.separator"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <!-- empty -->
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:for-each select="member">
-    <xsl:call-template name="simple.xlink">
-      <xsl:with-param name="content">
-        <xsl:apply-templates/>
-      </xsl:with-param>
-    </xsl:call-template>
-    <xsl:choose>
-      <xsl:when test="position() = last()"/> <!-- do nothing -->
-      <xsl:otherwise>
-	<xsl:text>, </xsl:text>
-	<xsl:if test="position() = last() - 1">
-	  <xsl:if test="$localized-choice-separator != ''">
-	    <xsl:value-of select="$localized-choice-separator"/>
-	    <xsl:text> </xsl:text>
-	  </xsl:if>
-	</xsl:if>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:for-each>
-  </span>
-</xsl:template>
-
-<xsl:template match="simplelist[@type='horiz']">
-  <xsl:call-template name="anchor"/>
-  <table class="simplelist" border="0" summary="Simple list">
-    <xsl:call-template name="simplelist.horiz">
-      <xsl:with-param name="cols">
-        <xsl:choose>
-          <xsl:when test="@columns">
-            <xsl:value-of select="@columns"/>
-          </xsl:when>
-          <xsl:otherwise>1</xsl:otherwise>
-        </xsl:choose>
-      </xsl:with-param>
-    </xsl:call-template>
-  </table>
-</xsl:template>
-
-<xsl:template match="simplelist[@type='vert']">
-  <xsl:call-template name="anchor"/>
-  <table class="simplelist" border="0" summary="Simple list">
-    <xsl:call-template name="simplelist.vert">
-      <xsl:with-param name="cols">
-        <xsl:choose>
-          <xsl:when test="@columns">
-            <xsl:value-of select="@columns"/>
-          </xsl:when>
-          <xsl:otherwise>1</xsl:otherwise>
-        </xsl:choose>
-      </xsl:with-param>
-    </xsl:call-template>
-  </table>
-</xsl:template>
-
-<xsl:template name="simplelist.horiz">
-  <xsl:param name="cols">1</xsl:param>
-  <xsl:param name="cell">1</xsl:param>
-  <xsl:param name="members" select="./member"/>
-
-  <xsl:if test="$cell &lt;= count($members)">
-    <tr>
-      <xsl:call-template name="tr.attributes">
-        <xsl:with-param name="row" select="$members[1]"/>
-        <xsl:with-param name="rownum" select="(($cell - 1) div $cols) + 1"/>
-      </xsl:call-template>
-
-      <xsl:call-template name="simplelist.horiz.row">
-        <xsl:with-param name="cols" select="$cols"/>
-        <xsl:with-param name="cell" select="$cell"/>
-        <xsl:with-param name="members" select="$members"/>
-      </xsl:call-template>
-   </tr>
-    <xsl:call-template name="simplelist.horiz">
-      <xsl:with-param name="cols" select="$cols"/>
-      <xsl:with-param name="cell" select="$cell + $cols"/>
-      <xsl:with-param name="members" select="$members"/>
-    </xsl:call-template>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="simplelist.horiz.row">
-  <xsl:param name="cols">1</xsl:param>
-  <xsl:param name="cell">1</xsl:param>
-  <xsl:param name="members" select="./member"/>
-  <xsl:param name="curcol">1</xsl:param>
-
-  <xsl:if test="$curcol &lt;= $cols">
-    <td>
-      <xsl:choose>
-        <xsl:when test="$members[position()=$cell]">
-          <xsl:apply-templates select="$members[position()=$cell]"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:text>&#160;</xsl:text>
-        </xsl:otherwise>
-      </xsl:choose>
-    </td>
-    <xsl:call-template name="simplelist.horiz.row">
-      <xsl:with-param name="cols" select="$cols"/>
-      <xsl:with-param name="cell" select="$cell+1"/>
-      <xsl:with-param name="members" select="$members"/>
-      <xsl:with-param name="curcol" select="$curcol+1"/>
-    </xsl:call-template>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="simplelist.vert">
-  <xsl:param name="cols">1</xsl:param>
-  <xsl:param name="cell">1</xsl:param>
-  <xsl:param name="members" select="./member"/>
-  <xsl:param name="rows" select="floor((count($members)+$cols - 1) div $cols)"/>
-
-  <xsl:if test="$cell &lt;= $rows">
-    <tr>
-      <xsl:call-template name="tr.attributes">
-        <xsl:with-param name="row" select="$members[1]"/>
-        <xsl:with-param name="rownum" select="$cell"/>
-      </xsl:call-template>
-
-      <xsl:call-template name="simplelist.vert.row">
-        <xsl:with-param name="cols" select="$cols"/>
-        <xsl:with-param name="rows" select="$rows"/>
-        <xsl:with-param name="cell" select="$cell"/>
-        <xsl:with-param name="members" select="$members"/>
-      </xsl:call-template>
-    </tr>
-    <xsl:call-template name="simplelist.vert">
-      <xsl:with-param name="cols" select="$cols"/>
-      <xsl:with-param name="cell" select="$cell+1"/>
-      <xsl:with-param name="members" select="$members"/>
-      <xsl:with-param name="rows" select="$rows"/>
-    </xsl:call-template>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="simplelist.vert.row">
-  <xsl:param name="cols">1</xsl:param>
-  <xsl:param name="rows">1</xsl:param>
-  <xsl:param name="cell">1</xsl:param>
-  <xsl:param name="members" select="./member"/>
-  <xsl:param name="curcol">1</xsl:param>
-
-  <xsl:if test="$curcol &lt;= $cols">
-    <td>
-      <xsl:choose>
-        <xsl:when test="$members[position()=$cell]">
-          <xsl:apply-templates select="$members[position()=$cell]"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:text>&#160;</xsl:text>
-        </xsl:otherwise>
-      </xsl:choose>
-    </td>
-    <xsl:call-template name="simplelist.vert.row">
-      <xsl:with-param name="cols" select="$cols"/>
-      <xsl:with-param name="rows" select="$rows"/>
-      <xsl:with-param name="cell" select="$cell+$rows"/>
-      <xsl:with-param name="members" select="$members"/>
-      <xsl:with-param name="curcol" select="$curcol+1"/>
-    </xsl:call-template>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="member">
-  <xsl:call-template name="anchor"/>
-  <xsl:call-template name="simple.xlink">
-    <xsl:with-param name="content">
-      <xsl:apply-templates/>
-    </xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="procedure">
-  <xsl:variable name="param.placement" select="substring-after(normalize-space($formal.title.placement),                                         concat(local-name(.), ' '))"/>
-
-  <xsl:variable name="placement">
-    <xsl:choose>
-      <xsl:when test="contains($param.placement, ' ')">
-        <xsl:value-of select="substring-before($param.placement, ' ')"/>
-      </xsl:when>
-      <xsl:when test="$param.placement = ''">before</xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$param.placement"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <!-- Preserve order of PIs and comments -->
-  <xsl:variable name="preamble" select="*[not(self::step                   or self::title                   or self::titleabbrev)]                 |comment()[not(preceding-sibling::step)]                 |processing-instruction()[not(preceding-sibling::step)]"/>
-
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="anchor">
-      <xsl:with-param name="conditional">
-        <xsl:choose>
-	  <xsl:when test="title">0</xsl:when>
-	  <xsl:otherwise>1</xsl:otherwise>
-	</xsl:choose>
-      </xsl:with-param>
-    </xsl:call-template>
-
-    <xsl:if test="title and $placement = 'before'">
-      <xsl:call-template name="formal.object.heading"/>
-    </xsl:if>
-
-    <xsl:apply-templates select="$preamble"/>
-
-    <xsl:choose>
-      <xsl:when test="count(step) = 1">
-        <ul>
-          <xsl:apply-templates select="step                     |comment()[preceding-sibling::step]                     |processing-instruction()[preceding-sibling::step]"/>
-        </ul>
-      </xsl:when>
-      <xsl:otherwise>
-        <ol>
-          <xsl:attribute name="type">
-            <xsl:value-of select="substring($procedure.step.numeration.formats,1,1)"/>
-          </xsl:attribute>
-          <xsl:apply-templates select="step                     |comment()[preceding-sibling::step]                     |processing-instruction()[preceding-sibling::step]"/>
-        </ol>
-      </xsl:otherwise>
-    </xsl:choose>
-
-    <xsl:if test="title and $placement != 'before'">
-      <xsl:call-template name="formal.object.heading"/>
-    </xsl:if>
-  </div>
-</xsl:template>
-
-<xsl:template match="procedure/title">
-  <!-- nop -->
-</xsl:template>
-
-<xsl:template match="substeps">
-  <xsl:variable name="numeration">
-    <xsl:call-template name="procedure.step.numeration"/>
-  </xsl:variable>
-
-  <xsl:call-template name="anchor"/>
-
-  <ol type="{$numeration}">
-    <xsl:apply-templates/>
-  </ol>
-</xsl:template>
-
-<xsl:template match="step">
-  <li>
-    <xsl:call-template name="anchor"/>
-    <xsl:apply-templates/>
-  </li>
-</xsl:template>
-
-<xsl:template match="stepalternatives">
-  <xsl:call-template name="anchor"/>
-  <ul>
-    <xsl:apply-templates/>
-  </ul>
-</xsl:template>
-
-<xsl:template match="step/title">
-  <p class="title">
-    <b>
-      <xsl:apply-templates/>
-    </b>
-  </p>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="segmentedlist">
-  <xsl:variable name="presentation">
-    <xsl:call-template name="pi.dbhtml_list-presentation"/>
-  </xsl:variable>
-
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="anchor"/>
-
-    <xsl:choose>
-      <xsl:when test="$presentation = 'table'">
-        <xsl:apply-templates select="." mode="seglist-table"/>
-      </xsl:when>
-      <xsl:when test="$presentation = 'list'">
-        <xsl:apply-templates/>
-      </xsl:when>
-      <xsl:when test="$segmentedlist.as.table != 0">
-        <xsl:apply-templates select="." mode="seglist-table"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:apply-templates/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </div>
-</xsl:template>
-
-<xsl:template match="segmentedlist/title">
-  <div class="title">
-    <strong><span class="title"><xsl:apply-templates/></span></strong>
-  </div>
-</xsl:template>
-
-<xsl:template match="segtitle">
-</xsl:template>
-
-<xsl:template match="segtitle" mode="segtitle-in-seg">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="seglistitem">
-  <div class="seglistitem">
-    <xsl:call-template name="anchor"/>
-    <xsl:apply-templates/>
-  </div>
-</xsl:template>
-
-<xsl:template match="seg">
-  <xsl:variable name="segnum" select="count(preceding-sibling::seg)+1"/>
-  <xsl:variable name="seglist" select="ancestor::segmentedlist"/>
-  <xsl:variable name="segtitles" select="$seglist/segtitle"/>
-
-  <!--
-     Note: segtitle is only going to be the right thing in a well formed
-     SegmentedList.  If there are too many Segs or too few SegTitles,
-     you'll get something odd...maybe an error
-  -->
-
-  <div class="seg">
-    <strong>
-      <span class="segtitle">
-        <xsl:apply-templates select="$segtitles[$segnum=position()]" mode="segtitle-in-seg"/>
-        <xsl:text>: </xsl:text>
-      </span>
-    </strong>
-    <xsl:apply-templates/>
-  </div>
-</xsl:template>
-
-<xsl:template match="segmentedlist" mode="seglist-table">
-  <xsl:variable name="table-summary">
-    <xsl:call-template name="pi.dbhtml_table-summary"/>
-  </xsl:variable>
-
-  <xsl:variable name="list-width">
-    <xsl:call-template name="pi.dbhtml_list-width"/>
-  </xsl:variable>
-
-  <xsl:apply-templates select="title"/>
-
-  <table border="0">
-    <xsl:if test="$list-width != ''">
-      <xsl:attribute name="width">
-        <xsl:value-of select="$list-width"/>
-      </xsl:attribute>
-    </xsl:if>
-    <xsl:if test="$table-summary != ''">
-      <xsl:attribute name="summary">
-        <xsl:value-of select="$table-summary"/>
-      </xsl:attribute>
-    </xsl:if>
-    <thead>
-      <tr class="segtitle">
-        <xsl:call-template name="tr.attributes">
-          <xsl:with-param name="row" select="segtitle[1]"/>
-          <xsl:with-param name="rownum" select="1"/>
-        </xsl:call-template>
-        <xsl:apply-templates select="segtitle" mode="seglist-table"/>
-      </tr>
-    </thead>
-    <tbody>
-      <xsl:apply-templates select="seglistitem" mode="seglist-table"/>
-    </tbody>
-  </table>
-</xsl:template>
-
-<xsl:template match="segtitle" mode="seglist-table">
-  <th><xsl:apply-templates/></th>
-</xsl:template>
-
-<xsl:template match="seglistitem" mode="seglist-table">
-  <xsl:variable name="seglinum">
-    <xsl:number from="segmentedlist" count="seglistitem"/>
-  </xsl:variable>
-
-  <tr class="seglistitem">
-    <xsl:call-template name="tr.attributes">
-      <xsl:with-param name="rownum" select="$seglinum + 1"/>
-    </xsl:call-template>
-    <xsl:apply-templates mode="seglist-table"/>
-  </tr>
-</xsl:template>
-
-<xsl:template match="seg" mode="seglist-table">
-  <td class="seg"><xsl:apply-templates/></td>
-</xsl:template>
-
-<xsl:template match="seg[1]" mode="seglist-table">
-  <td class="seg">
-    <xsl:call-template name="anchor">
-      <xsl:with-param name="node" select="ancestor::seglistitem"/>
-    </xsl:call-template>
-    <xsl:apply-templates/>
-  </td>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="calloutlist">
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="anchor"/>
-    <xsl:if test="title|info/title">
-      <xsl:call-template name="formal.object.heading"/>
-    </xsl:if>
-
-    <!-- Preserve order of PIs and comments -->
-    <xsl:apply-templates select="*[not(self::callout or self::title or self::titleabbrev)]                    |comment()[not(preceding-sibling::callout)]      |processing-instruction()[not(preceding-sibling::callout)]"/>
-
-    <xsl:choose>
-      <xsl:when test="$callout.list.table != 0">
-        <table border="0" summary="Callout list">
-	  <xsl:apply-templates select="callout            |comment()[preceding-sibling::callout]     |processing-instruction()[preceding-sibling::callout]"/>
-	</table>
-      </xsl:when>
-      <xsl:otherwise>
-	<dl compact="compact">
-	  <xsl:apply-templates select="callout            |comment()[preceding-sibling::callout]     |processing-instruction()[preceding-sibling::callout]"/>
-	</dl>
-      </xsl:otherwise>
-    </xsl:choose>
-  </div>
-</xsl:template>
-
-<xsl:template match="calloutlist/title">
-</xsl:template>
-
-<xsl:template match="callout">
-  <xsl:choose>
-    <xsl:when test="$callout.list.table != 0">
-      <tr>
-        <xsl:call-template name="tr.attributes">
-          <xsl:with-param name="rownum">
-            <xsl:number from="calloutlist" count="callout"/>
-          </xsl:with-param>
-        </xsl:call-template>
-
-        <td width="5%" valign="top" align="left">
-          <p>
-            <xsl:call-template name="anchor"/>
-            <xsl:call-template name="callout.arearefs">
-              <xsl:with-param name="arearefs" select="@arearefs"/>
-            </xsl:call-template>
-          </p>
-        </td>
-        <td valign="top" align="left">
-          <xsl:apply-templates/>
-        </td>
-      </tr>
-    </xsl:when>
-    <xsl:otherwise>
-      <dt>
-        <xsl:call-template name="anchor"/>
-        <xsl:call-template name="callout.arearefs">
-          <xsl:with-param name="arearefs" select="@arearefs"/>
-        </xsl:call-template>
-      </dt>
-      <dd><xsl:apply-templates/></dd>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="callout/simpara" priority="2">
-  <!-- If a callout contains only a single simpara, don't output
-       the <p> wrapper; this has the effect of creating an li
-       with simple text content. -->
-  <xsl:choose>
-    <xsl:when test="not(preceding-sibling::*)                     and not (following-sibling::*)">
-      <xsl:call-template name="anchor"/>
-      <xsl:apply-templates/>
-    </xsl:when>
-    <xsl:otherwise>
-      <p>
-        <xsl:if test="@role and $para.propagates.style != 0">
-          <xsl:apply-templates select="." mode="class.attribute">
-            <xsl:with-param name="class" select="@role"/>
-          </xsl:apply-templates>
-        </xsl:if>
-
-        <xsl:call-template name="anchor"/>
-        <xsl:apply-templates/>
-      </p>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="callout.arearefs">
-  <xsl:param name="arearefs"/>
-  <xsl:if test="$arearefs!=''">
-    <xsl:choose>
-      <xsl:when test="substring-before($arearefs,' ')=''">
-        <xsl:call-template name="callout.arearef">
-          <xsl:with-param name="arearef" select="$arearefs"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="callout.arearef">
-          <xsl:with-param name="arearef" select="substring-before($arearefs,' ')"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-    <xsl:call-template name="callout.arearefs">
-      <xsl:with-param name="arearefs" select="substring-after($arearefs,' ')"/>
-    </xsl:call-template>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="callout.arearef">
-  <xsl:param name="arearef"/>
-  <xsl:variable name="targets" select="key('id',$arearef)"/>
-  <xsl:variable name="target" select="$targets[1]"/>
-
-  <xsl:call-template name="check.id.unique">
-    <xsl:with-param name="linkend" select="$arearef"/>
-  </xsl:call-template>
-
-  <xsl:choose>
-    <xsl:when test="count($target)=0">
-      <xsl:text>???</xsl:text>
-    </xsl:when>
-    <xsl:when test="local-name($target)='co'">
-      <a>
-        <xsl:attribute name="href">
-          <xsl:text>#</xsl:text>
-          <xsl:value-of select="$arearef"/>
-        </xsl:attribute>
-        <xsl:apply-templates select="$target" mode="callout-bug"/>
-      </a>
-      <xsl:text> </xsl:text>
-    </xsl:when>
-    <xsl:when test="local-name($target)='areaset'">
-      <xsl:call-template name="callout-bug">
-        <xsl:with-param name="conum">
-          <xsl:apply-templates select="$target" mode="conumber"/>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="local-name($target)='area'">
-      <xsl:choose>
-        <xsl:when test="$target/parent::areaset">
-          <xsl:call-template name="callout-bug">
-            <xsl:with-param name="conum">
-              <xsl:apply-templates select="$target/parent::areaset" mode="conumber"/>
-            </xsl:with-param>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="callout-bug">
-            <xsl:with-param name="conum">
-              <xsl:apply-templates select="$target" mode="conumber"/>
-            </xsl:with-param>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:text>???</xsl:text>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="orderedlist-starting-number">
-  <xsl:param name="list" select="."/>
-  <xsl:variable name="pi-start">
-    <xsl:call-template name="pi.dbhtml_start">
-      <xsl:with-param name="node" select="$list"/>
-    </xsl:call-template>
-  </xsl:variable>
-  <xsl:call-template name="output-orderedlist-starting-number">
-    <xsl:with-param name="list" select="$list"/>
-    <xsl:with-param name="pi-start" select="$pi-start"/>
-  </xsl:call-template>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/maketoc.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/maketoc.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,91 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" xmlns="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="doc">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:import href="docbook.xsl"/>
-<xsl:import href="chunk.xsl"/>
-
-<xsl:output method="xml" indent="no" encoding="UTF-8" doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
-
-<xsl:param name="toc.list.type" select="'tocentry'"/>
-
-<!-- refentry in autotoc.xsl does not use subtoc, so must
-     handle it explicitly here. -->
-<xsl:template match="refentry" mode="toc">
-  <xsl:param name="toc-context" select="."/>
-
-  <xsl:call-template name="subtoc">
-    <xsl:with-param name="toc-context" select="$toc-context"/>
-  </xsl:call-template>
-</xsl:template>
-
-
-<xsl:template name="subtoc">
-  <xsl:param name="nodes" select="NOT-AN-ELEMENT"/>
-  <xsl:variable name="filename">
-    <xsl:apply-templates select="." mode="chunk-filename"/>
-  </xsl:variable>
-
-  <xsl:variable name="chunk">
-    <xsl:call-template name="chunk"/>
-  </xsl:variable>
-
-  <xsl:if test="$chunk != 0">
-    <xsl:call-template name="indent-spaces"/>
-    <xsl:variable name="id">
-      <xsl:call-template name="object.id"/>
-    </xsl:variable>
-    <tocentry linkend="{$id}">
-      <xsl:processing-instruction name="dbhtml">
-        <xsl:text>filename="</xsl:text>
-        <xsl:value-of select="$filename"/>
-        <xsl:text>"</xsl:text>
-      </xsl:processing-instruction>
-      <xsl:text>
-</xsl:text>
-      <xsl:apply-templates mode="toc" select="$nodes"/>
-      <xsl:call-template name="indent-spaces"/>
-    </tocentry>
-    <xsl:text>
-</xsl:text>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="indent-spaces">
-  <xsl:param name="node" select="."/>
-  <xsl:text>  </xsl:text>
-  <xsl:if test="$node/parent::*">
-    <xsl:call-template name="indent-spaces">
-      <xsl:with-param name="node" select="$node/parent::*"/>
-    </xsl:call-template>
-  </xsl:if>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="/" priority="-1">
-  <xsl:text>
-</xsl:text>
-  <toc role="chunk-toc">
-    <xsl:text>
-</xsl:text>
-    <xsl:apply-templates select="/" mode="toc"/>
-  </toc>
-  <xsl:text>
-</xsl:text>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/manifest.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/manifest.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,22 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" xmlns="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="doc">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-<!-- OBSOLETE. The templates from this file were moved to                 -->
-<!-- chunk-common.xsl and chunk-code.xsl.                                 -->
-<!-- ==================================================================== -->
-
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/math.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/math.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,284 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns="http://www.w3.org/1999/xhtml" exclude-result-prefixes="mml" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<xsl:template match="inlineequation">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="alt">
-</xsl:template>
-
-<xsl:template match="mathphrase">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates/>
-  </span>
-</xsl:template>
-
-<!-- "Support" for MathML -->
-
-<xsl:template match="mml:*">
-  <xsl:copy>
-    <xsl:copy-of select="@*"/>
-    <xsl:apply-templates/>
-  </xsl:copy>
-</xsl:template>
-
-<!-- Support for TeX math in alt -->
-
-<xsl:template match="*" mode="collect.tex.math">
-  <xsl:call-template name="write.text.chunk">
-    <xsl:with-param name="filename" select="$tex.math.file"/>
-    <xsl:with-param name="method" select="'text'"/>
-    <xsl:with-param name="content">
-      <xsl:choose>
-        <xsl:when test="$tex.math.in.alt = 'plain'">
-          <xsl:call-template name="tex.math.plain.head"/>
-          <xsl:apply-templates select="." mode="collect.tex.math.plain"/>
-          <xsl:call-template name="tex.math.plain.tail"/>
-        </xsl:when>
-        <xsl:when test="$tex.math.in.alt = 'latex'">
-          <xsl:call-template name="tex.math.latex.head"/>
-          <xsl:apply-templates select="." mode="collect.tex.math.latex"/>
-          <xsl:call-template name="tex.math.latex.tail"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:message>
-            Unsupported TeX math notation: 
-            <xsl:value-of select="$tex.math.in.alt"/>
-          </xsl:message>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:with-param>
-    <xsl:with-param name="encoding" select="$chunker.output.encoding"/>
-  </xsl:call-template>
-</xsl:template>
-
-<!-- PlainTeX -->
-
-<xsl:template name="tex.math.plain.head">
-  <xsl:text>\nopagenumbers 
-</xsl:text>
-</xsl:template>
-
-<xsl:template name="tex.math.plain.tail">
-  <xsl:text>\bye 
-</xsl:text>
-</xsl:template>
-
-<xsl:template match="inlineequation" mode="collect.tex.math.plain">
-  <xsl:variable name="filename">
-    <xsl:choose>
-      <xsl:when test="graphic">
-        <xsl:call-template name="mediaobject.filename">
-          <xsl:with-param name="object" select="graphic"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="select.mediaobject.filename">
-          <xsl:with-param name="olist" select="inlinemediaobject/*"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-  <xsl:variable name="output.delims">
-    <xsl:call-template name="tex.math.output.delims"/>
-  </xsl:variable>
-  <xsl:variable name="tex" select="alt[@role='tex'] | inlinemediaobject/textobject[@role='tex']"/>
-  <xsl:if test="$tex">
-    <xsl:text>\special{dvi2bitmap outputfile </xsl:text>
-    <xsl:value-of select="$filename"/>
-    <xsl:text>} 
-</xsl:text>
-    <xsl:if test="$output.delims != 0">
-      <xsl:text>$</xsl:text>
-    </xsl:if>
-    <xsl:value-of select="$tex"/>
-    <xsl:if test="$output.delims != 0">
-      <xsl:text>$ 
-</xsl:text>
-    </xsl:if>
-    <xsl:text>\vfill\eject 
-</xsl:text>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="equation|informalequation" mode="collect.tex.math.plain">
-  <xsl:variable name="filename">
-    <xsl:choose>
-      <xsl:when test="graphic">
-        <xsl:call-template name="mediaobject.filename">
-          <xsl:with-param name="object" select="graphic"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="select.mediaobject.filename">
-          <xsl:with-param name="olist" select="mediaobject/*"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-  <xsl:variable name="output.delims">
-    <xsl:call-template name="tex.math.output.delims"/>
-  </xsl:variable>
-  <xsl:variable name="tex" select="alt[@role='tex'] | mediaobject/textobject[@role='tex']"/>
-  <xsl:if test="$tex">
-    <xsl:text>\special{dvi2bitmap outputfile </xsl:text>
-    <xsl:value-of select="$filename"/>
-    <xsl:text>} 
-</xsl:text>
-    <xsl:if test="$output.delims != 0">
-      <xsl:text>$$</xsl:text>
-    </xsl:if>
-    <xsl:value-of select="$tex"/>
-    <xsl:if test="$output.delims != 0">
-      <xsl:text>$$ 
-</xsl:text>
-    </xsl:if>
-    <xsl:text>\vfill\eject 
-</xsl:text>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="text()" mode="collect.tex.math.plain"/>
-
-<!-- LaTeX -->
-
-<xsl:template name="tex.math.latex.head">
-  <xsl:text>\documentclass{article} 
-</xsl:text>
-  <xsl:text>\pagestyle{empty} 
-</xsl:text>
-  <xsl:text>\begin{document} 
-</xsl:text>
-</xsl:template>
-
-<xsl:template name="tex.math.latex.tail">
-  <xsl:text>\end{document} 
-</xsl:text>
-</xsl:template>
-
-<xsl:template match="inlineequation" mode="collect.tex.math.latex">
-  <xsl:variable name="filename">
-    <xsl:choose>
-      <xsl:when test="graphic">
-        <xsl:call-template name="mediaobject.filename">
-          <xsl:with-param name="object" select="graphic"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="select.mediaobject.filename">
-          <xsl:with-param name="olist" select="inlinemediaobject/*"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-  <xsl:variable name="output.delims">
-    <xsl:call-template name="tex.math.output.delims"/>
-  </xsl:variable>
-  <xsl:variable name="tex" select="alt[@role='tex'] | inlinemediaobject/textobject[@role='tex']"/>
-  <xsl:if test="$tex">
-    <xsl:text>\special{dvi2bitmap outputfile </xsl:text>
-    <xsl:value-of select="$filename"/>
-    <xsl:text>} 
-</xsl:text>
-    <xsl:if test="$output.delims != 0">  
-      <xsl:text>$</xsl:text>
-    </xsl:if>
-    <xsl:value-of select="$tex"/>
-    <xsl:if test="$output.delims != 0">  
-      <xsl:text>$ 
-</xsl:text>
-    </xsl:if>
-    <xsl:text>\newpage 
-</xsl:text>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="equation|informalequation" mode="collect.tex.math.latex">
-  <xsl:variable name="filename">
-    <xsl:choose>
-      <xsl:when test="graphic">
-        <xsl:call-template name="mediaobject.filename">
-          <xsl:with-param name="object" select="graphic"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="select.mediaobject.filename">
-          <xsl:with-param name="olist" select="mediaobject/*"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-  <xsl:variable name="output.delims">
-    <xsl:call-template name="tex.math.output.delims"/>
-  </xsl:variable>
-  <xsl:variable name="tex" select="alt[@role='tex'] | mediaobject/textobject[@role='tex']"/>
-  <xsl:if test="$tex">
-    <xsl:text>\special{dvi2bitmap outputfile </xsl:text>
-    <xsl:value-of select="$filename"/>
-    <xsl:text>} 
-</xsl:text>
-    <xsl:if test="$output.delims != 0">
-      <xsl:text>$$</xsl:text>
-    </xsl:if>
-    <xsl:value-of select="$tex"/>
-    <xsl:if test="$output.delims != 0">
-      <xsl:text>$$ 
-</xsl:text>
-    </xsl:if>
-    <xsl:text>\newpage 
-</xsl:text>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="text()" mode="collect.tex.math.latex"/>
-
-<!-- Extracting image filename from mediaobject and graphic elements -->
-
-<xsl:template name="select.mediaobject.filename">
-  <xsl:param name="olist" select="imageobject|imageobjectco                      |videoobject|audioobject|textobject"/>
-
-  <xsl:variable name="mediaobject.index">
-    <xsl:call-template name="select.mediaobject.index">
-      <xsl:with-param name="olist" select="$olist"/>
-      <xsl:with-param name="count" select="1"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:if test="$mediaobject.index != ''">
-    <xsl:call-template name="mediaobject.filename">
-      <xsl:with-param name="object" select="$olist[position() = $mediaobject.index]"/>
-    </xsl:call-template>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="tex.math.output.delims">
-  <xsl:variable name="pi.delims">
-    <xsl:call-template name="pi.dbtex_delims">
-      <xsl:with-param name="node" select="descendant-or-self::*"/>
-    </xsl:call-template>
-  </xsl:variable>
-  <xsl:variable name="result">
-    <xsl:choose>
-      <xsl:when test="$pi.delims = 'no'">0</xsl:when>
-      <xsl:when test="$pi.delims = '' and $tex.math.delims = 0">0</xsl:when>
-      <xsl:otherwise>1</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-  <xsl:value-of select="$result"/>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/oldchunker.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/oldchunker.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,176 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:saxon="http://icl.com/saxon" xmlns:lxslt="http://xml.apache.org/xslt" xmlns:redirect="http://xml.apache.org/xalan/redirect" xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" xmlns="http://www.w3.org/1999/xhtml" version="1.1" exclude-result-prefixes="doc" extension-element-prefixes="saxon redirect lxslt">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<!-- This stylesheet works with Saxon and Xalan; for XT use xtchunker.xsl -->
-
-<!-- ==================================================================== -->
-
-<xsl:param name="default.encoding" select="'ISO-8859-1'" doc:type="string"/>
-
-<doc:param xmlns="" name="default.encoding">
-<refpurpose xmlns="http://www.w3.org/1999/xhtml">Encoding used in generated HTML pages</refpurpose>
-<refdescription xmlns="http://www.w3.org/1999/xhtml">
-<para>This encoding is used in files generated by chunking stylesheet. Currently
-only Saxon is able to change output encoding.
-</para>
-</refdescription>
-</doc:param>
-
-<!-- ==================================================================== -->
-
-<xsl:param name="saxon.character.representation" select="'entity;decimal'" doc:type="string"/>
-
-<doc:param xmlns="" name="saxon.character.representation">
-<refpurpose xmlns="http://www.w3.org/1999/xhtml">Saxon character representation used in generated HTML pages</refpurpose>
-<refdescription xmlns="http://www.w3.org/1999/xhtml">
-<para>This character representation is used in files generated by chunking stylesheet. If
-you want to suppress entity references for characters with direct representation 
-in default.encoding, set this parameter to value <literal>native</literal>. 
-</para>
-</refdescription>
-</doc:param>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="make-relative-filename">
-  <xsl:param name="base.dir" select="'./'"/>
-  <xsl:param name="base.name" select="''"/>
-
-  <xsl:variable name="vendor" select="system-property('xsl:vendor')"/>
-
-  <xsl:choose>
-    <xsl:when test="contains($vendor, 'SAXON')">
-      <!-- Saxon doesn't make the chunks relative -->
-      <xsl:value-of select="concat($base.dir,$base.name)"/>
-    </xsl:when>
-    <xsl:when test="contains($vendor, 'Apache')">
-      <!-- Xalan doesn't make the chunks relative -->
-      <xsl:value-of select="concat($base.dir,$base.name)"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:message terminate="yes">
-        <xsl:text>Chunking isn't supported with </xsl:text>
-        <xsl:value-of select="$vendor"/>
-      </xsl:message>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="write.chunk">
-  <xsl:param name="filename" select="''"/>
-  <xsl:param name="method" select="'html'"/>
-  <xsl:param name="encoding" select="$default.encoding"/>
-  <xsl:param name="indent" select="'no'"/>
-  <xsl:param name="content" select="''"/>
-
-  <xsl:message>
-    <xsl:text>Writing </xsl:text>
-    <xsl:value-of select="$filename"/>
-    <xsl:if test="name(.) != ''">
-      <xsl:text> for </xsl:text>
-      <xsl:value-of select="name(.)"/>
-      <xsl:if test="@id">
-        <xsl:text>(</xsl:text>
-        <xsl:value-of select="@id"/>
-        <xsl:text>)</xsl:text>
-      </xsl:if>
-    </xsl:if>
-  </xsl:message>
-
-  <xsl:variable name="vendor" select="system-property('xsl:vendor')"/>
-
-  <xsl:choose>
-    <xsl:when test="contains($vendor, 'SAXON 6.2')">
-      <!-- Saxon 6.2.x uses xsl:document -->
-      <xsl:document href="{$filename}" method="{$method}" encoding="{$encoding}" indent="{$indent}" saxon:character-representation="{$saxon.character.representation}">
-        <xsl:copy-of select="$content"/>
-      </xsl:document>
-    </xsl:when>
-    <xsl:when test="contains($vendor, 'SAXON')">
-      <!-- Saxon uses saxon:output -->
-      <saxon:output file="{$filename}" href="{$filename}" method="{$method}" encoding="{$encoding}" indent="{$indent}" saxon:character-representation="{$saxon.character.representation}">
-        <xsl:copy-of select="$content"/>
-      </saxon:output>
-    </xsl:when>
-    <xsl:when test="contains($vendor, 'Apache')">
-      <!-- Xalan uses redirect -->
-      <redirect:write file="{$filename}">
-        <xsl:copy-of select="$content"/>
-      </redirect:write>
-    </xsl:when>
-    <xsl:otherwise>
-      <!-- it doesn't matter since we won't be making chunks... -->
-      <xsl:message terminate="yes">
-        <xsl:text>Can't make chunks with </xsl:text>
-        <xsl:value-of select="$vendor"/>
-        <xsl:text>'s processor.</xsl:text>
-      </xsl:message>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="write.chunk.with.doctype">
-  <xsl:param name="filename" select="''"/>
-  <xsl:param name="method" select="'html'"/>
-  <xsl:param name="encoding" select="$default.encoding"/>
-  <xsl:param name="indent" select="'no'"/>
-  <xsl:param name="doctype-public" select="''"/>
-  <xsl:param name="doctype-system" select="''"/>
-  <xsl:param name="content" select="''"/>
-
-  <xsl:message>
-    <xsl:text>Writing </xsl:text>
-    <xsl:value-of select="$filename"/>
-    <xsl:if test="name(.) != ''">
-      <xsl:text> for </xsl:text>
-      <xsl:value-of select="name(.)"/>
-    </xsl:if>
-  </xsl:message>
-
-  <xsl:variable name="vendor" select="system-property('xsl:vendor')"/>
-
-  <xsl:choose>
-    <xsl:when test="contains($vendor, 'SAXON 6.2')">
-      <!-- Saxon 6.2.x uses xsl:document -->
-      <xsl:document href="{$filename}" method="{$method}" encoding="{$encoding}" indent="{$indent}" doctype-public="{$doctype-public}" doctype-system="{$doctype-system}" saxon:character-representation="{$saxon.character.representation}">
-        <xsl:copy-of select="$content"/>
-      </xsl:document>
-    </xsl:when>
-    <xsl:when test="contains($vendor, 'SAXON')">
-      <!-- Saxon uses saxon:output -->
-      <saxon:output file="{$filename}" href="{$filename}" method="{$method}" encoding="{$encoding}" indent="{$indent}" doctype-public="{$doctype-public}" doctype-system="{$doctype-system}" saxon:character-representation="{$saxon.character.representation}">
-        <xsl:copy-of select="$content"/>
-      </saxon:output>
-    </xsl:when>
-    <xsl:when test="contains($vendor, 'Apache')">
-      <!-- Xalan uses redirect -->
-      <redirect:write file="{$filename}">
-        <xsl:copy-of select="$content"/>
-      </redirect:write>
-    </xsl:when>
-    <xsl:otherwise>
-      <!-- it doesn't matter since we won't be making chunks... -->
-      <xsl:message terminate="yes">
-        <xsl:text>Can't make chunks with </xsl:text>
-        <xsl:value-of select="$vendor"/>
-        <xsl:text>'s processor.</xsl:text>
-      </xsl:message>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/onechunk.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/onechunk.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,36 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" xmlns="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="doc">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:import href="chunk.xsl"/>
-
-<!-- Ok, using the onechunk parameter makes this all work again. -->
-<!-- It does have the disadvantage that it only works for documents that have -->
-<!-- a root element that is considered a chunk by the chunk.xsl stylesheet. -->
-<!-- Ideally, onechunk would let anything be a chunk. But not today. -->
-
-<xsl:param name="onechunk" select="1"/>
-<xsl:param name="suppress.navigation">1</xsl:param>
-
-<xsl:template name="href.target.uri">
-  <xsl:param name="object" select="."/>
-  <xsl:text>#</xsl:text>
-  <xsl:call-template name="object.id">
-    <xsl:with-param name="object" select="$object"/>
-  </xsl:call-template>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/param.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/param.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,414 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<!-- This file is generated from param.xweb -->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<xsl:param name="admon.graphics.extension">.png</xsl:param>
-<xsl:param name="admon.graphics" select="0"/>
-<xsl:param name="admon.graphics.path">images/</xsl:param>
-<xsl:param name="admon.style">
-  <xsl:text>margin-left: 0.5in; margin-right: 0.5in;</xsl:text>
-</xsl:param>
-<xsl:param name="admon.textlabel" select="1"/>
-<xsl:param name="annotate.toc" select="1"/>
-<xsl:param name="annotation.css">
-/* ======================================================================
-   Annotations
-*/
-
-div.annotation-list  { visibility: hidden;
-                     }
-
-div.annotation-nocss { position: absolute;
-                       visibility: hidden;
-                     }
-
-div.annotation-popup { position: absolute;
-                       z-index: 4;
-                       visibility: hidden;
-                       padding: 0px;
-                       margin: 2px;
-                       border-style: solid;
-                       border-width: 1px;
-                       width: 200px;
-		       background-color: white;
-                     }
-
-div.annotation-title { padding: 1px;
-                       font-weight: bold;
-                       border-bottom-style: solid;
-                       border-bottom-width: 1px;
-		       color: white;
-		       background-color: black;
-                     }
-
-div.annotation-body  { padding: 2px;
-                     }
-
-div.annotation-body p { margin-top: 0px;
-                        padding-top: 0px;
-                      }
-
-div.annotation-close { position: absolute;
-                       top: 2px;
-                       right: 2px;
-                     }
-</xsl:param>
-
-<xsl:param name="annotation.js">
-<xsl:text>http://docbook.sourceforge.net/release/script/AnchorPosition.js http://docbook.sourceforge.net/release/script/PopupWindow.js</xsl:text></xsl:param>
-
-<xsl:param name="annotation.graphic.open">http://docbook.sourceforge.net/release/images/annot-open.png</xsl:param>
-<xsl:param name="annotation.graphic.close">
-http://docbook.sourceforge.net/release/images/annot-close.png</xsl:param>
-<xsl:param name="annotation.support" select="0"/>
-<xsl:param name="appendix.autolabel">A</xsl:param>
-<xsl:param name="author.othername.in.middle" select="1"/>
-<xsl:param name="autotoc.label.separator">. </xsl:param>
-<xsl:param name="autotoc.label.in.hyperlink" select="1"/>
-<xsl:param name="base.dir"/>
-<xsl:param name="biblioentry.item.separator">. </xsl:param>
-<xsl:param name="bibliography.collection">http://docbook.sourceforge.net/release/bibliography/bibliography.xml</xsl:param>
-
-<xsl:param name="bibliography.numbered" select="0"/>
-<xsl:param name="bibliography.style">normal</xsl:param>
-<xsl:param name="blurb.on.titlepage.enabled" select="0"/>
-<xsl:param name="bridgehead.in.toc" select="0"/>
-<xsl:param name="callout.defaultcolumn">60</xsl:param>
-<xsl:param name="callout.graphics.extension">.png</xsl:param>
-
-<xsl:param name="callout.graphics" select="1"/>
-<xsl:param name="callout.graphics.number.limit">15</xsl:param>
-
-<xsl:param name="callout.graphics.path">images/callouts/</xsl:param>
-<xsl:param name="callout.list.table" select="1"/>
-<xsl:param name="callout.unicode" select="0"/>
-<xsl:param name="callout.unicode.number.limit">10</xsl:param>
-<xsl:param name="callout.unicode.start.character">10102</xsl:param>
-<xsl:param name="callouts.extension" select="1"/>
-<xsl:param name="chapter.autolabel" select="1"/>
-<xsl:param name="chunk.append"/>
-<xsl:param name="chunk.first.sections" select="0"/>
-<xsl:param name="chunk.quietly" select="0"/>
-<xsl:param name="chunk.section.depth" select="1"/>
-<xsl:param name="chunk.toc"/>
-<xsl:param name="chunk.tocs.and.lots" select="0"/>
-<xsl:param name="chunk.tocs.and.lots.has.title" select="1"/>
-<xsl:param name="chunk.separate.lots" select="0"/>
-<xsl:param name="citerefentry.link" select="0"/>
-<xsl:param name="collect.xref.targets">no</xsl:param>
-<xsl:param name="component.label.includes.part.label" select="0"/>
-<xsl:param name="contrib.inline.enabled">1</xsl:param>
-<xsl:param name="css.decoration" select="1"/>
-<xsl:param name="current.docid"/>
-<xsl:param name="default.float.class">
-  <xsl:choose>
-    <xsl:when test="contains($stylesheet.result.type,'html')">left</xsl:when>
-    <xsl:otherwise>before</xsl:otherwise>
-  </xsl:choose>
-</xsl:param>
-<xsl:param name="default.image.width"/>
-<xsl:param name="default.table.width"/>
-<xsl:param name="default.table.frame">all</xsl:param>
-<xsl:param name="draft.mode">maybe</xsl:param>
-<xsl:param name="draft.watermark.image">http://docbook.sourceforge.net/release/images/draft.png</xsl:param>
-<xsl:param name="ebnf.table.bgcolor">#F5DCB3</xsl:param>
-<xsl:param name="ebnf.table.border" select="1"/>
-<xsl:param name="ebnf.assignment">
-<code>::=</code>
-</xsl:param>
-
-<xsl:param name="ebnf.statement.terminator"/>
-
-<xsl:param name="eclipse.autolabel" select="0"/>
-<xsl:param name="eclipse.plugin.name">DocBook Online Help Sample</xsl:param>
-<xsl:param name="eclipse.plugin.id">com.example.help</xsl:param>
-<xsl:param name="eclipse.plugin.provider">Example provider</xsl:param>
-<xsl:param name="editedby.enabled">1</xsl:param>
-<xsl:param name="email.delimiters.enabled" select="1"/>
-<xsl:param name="emphasis.propagates.style" select="1"/>
-<xsl:param name="entry.propagates.style" select="1"/>
-<xsl:param name="firstterm.only.link" select="0"/>
-<xsl:param name="footer.rule" select="1"/>
-<xsl:param name="footnote.number.format">1</xsl:param>
-<xsl:param name="footnote.number.symbols"/>
-<xsl:param name="formal.procedures" select="1"/>
-<xsl:param name="formal.title.placement">
-figure before
-example before
-equation before
-table before
-procedure before
-task before
-</xsl:param>
-<xsl:param name="funcsynopsis.decoration" select="1"/>
-<xsl:param name="funcsynopsis.style">kr</xsl:param>
-<xsl:param name="funcsynopsis.tabular.threshold">40</xsl:param>
-<xsl:param name="function.parens" select="0"/>
-<xsl:param name="generate.id.attributes" select="0"/>
-<xsl:param name="generate.index" select="1"/>
-<xsl:param name="generate.legalnotice.link" select="0"/>
-<xsl:param name="generate.revhistory.link" select="0"/>
-<xsl:param name="generate.manifest" select="0"/>
-<xsl:param name="generate.meta.abstract" select="1"/>
-<xsl:param name="generate.section.toc.level" select="0"/>
-<xsl:param name="generate.toc">
-appendix  toc,title
-article/appendix  nop
-article   toc,title
-book      toc,title,figure,table,example,equation
-chapter   toc,title
-part      toc,title
-preface   toc,title
-qandadiv  toc
-qandaset  toc
-reference toc,title
-sect1     toc
-sect2     toc
-sect3     toc
-sect4     toc
-sect5     toc
-section   toc
-set       toc,title
-</xsl:param>
-
-<xsl:param name="glossary.collection"/>
-<xsl:param name="glossary.sort" select="0"/>
-<xsl:param name="glossentry.show.acronym">no</xsl:param>
-<xsl:param name="glossterm.auto.link" select="0"/>
-<xsl:param name="graphic.default.extension"/>
-<xsl:param name="graphicsize.extension" select="1"/>
-<xsl:param name="graphicsize.use.img.src.path" select="0"/>
-<xsl:param name="header.rule" select="1"/>
-<xsl:param name="highlight.default.language"/>
-<xsl:param name="highlight.source" select="0"/>
-<xsl:param name="html.append"/>
-<xsl:param name="html.base"/>
-<xsl:param name="html.cellpadding"/>
-<xsl:param name="html.cellspacing"/>
-<xsl:param name="html.cleanup" select="1"/>
-<xsl:param name="html.ext">.html</xsl:param>
-<xsl:param name="html.extra.head.links" select="0"/>
-<xsl:param name="html.head.legalnotice.link.types">copyright</xsl:param>
-<xsl:param name="html.head.legalnotice.link.multiple" select="1"/>
-<xsl:param name="html.longdesc" select="1"/>
-<xsl:param name="html.longdesc.link" select="$html.longdesc"/>
-<xsl:param name="html.stylesheet"/>
-<xsl:param name="html.stylesheet.type">text/css</xsl:param>
-<xsl:param name="htmlhelp.alias.file">alias.h</xsl:param>
-<xsl:param name="htmlhelp.autolabel" select="0"/>
-<xsl:param name="htmlhelp.button.back" select="1"/>
-<xsl:param name="htmlhelp.button.forward" select="0"/>
-<xsl:param name="htmlhelp.button.hideshow" select="1"/>
-<xsl:param name="htmlhelp.button.home" select="0"/>
-<xsl:param name="htmlhelp.button.home.url"/>
-<xsl:param name="htmlhelp.button.jump1" select="0"/>
-<xsl:param name="htmlhelp.button.jump1.title">User1</xsl:param>
-<xsl:param name="htmlhelp.button.jump1.url"/>
-<xsl:param name="htmlhelp.button.jump2" select="0"/>
-<xsl:param name="htmlhelp.button.jump2.title">User2</xsl:param>
-<xsl:param name="htmlhelp.button.jump2.url"/>
-<xsl:param name="htmlhelp.button.locate" select="0"/>
-<xsl:param name="htmlhelp.button.next" select="1"/>
-<xsl:param name="htmlhelp.button.options" select="1"/>
-<xsl:param name="htmlhelp.button.prev" select="1"/>
-<xsl:param name="htmlhelp.button.print" select="1"/>
-<xsl:param name="htmlhelp.button.refresh" select="0"/>
-<xsl:param name="htmlhelp.button.stop" select="0"/>
-<xsl:param name="htmlhelp.button.zoom" select="0"/>
-<xsl:param name="htmlhelp.chm">htmlhelp.chm</xsl:param>
-<xsl:param name="htmlhelp.default.topic"/>
-<xsl:param name="htmlhelp.display.progress" select="1"/>
-<xsl:param name="htmlhelp.encoding">iso-8859-1</xsl:param>
-<xsl:param name="htmlhelp.enhanced.decompilation" select="0"/>
-<xsl:param name="htmlhelp.enumerate.images" select="0"/>
-<xsl:param name="htmlhelp.force.map.and.alias" select="0"/>
-<xsl:param name="htmlhelp.hhc.binary" select="1"/>
-<xsl:param name="htmlhelp.hhc.folders.instead.books" select="1"/>
-<xsl:param name="htmlhelp.hhc">toc.hhc</xsl:param>
-<xsl:param name="htmlhelp.hhc.section.depth">5</xsl:param>
-<xsl:param name="htmlhelp.hhc.show.root" select="1"/>
-<xsl:param name="htmlhelp.hhc.width"/>
-<xsl:param name="htmlhelp.hhk">index.hhk</xsl:param>
-<xsl:param name="htmlhelp.hhp">htmlhelp.hhp</xsl:param>
-<xsl:param name="htmlhelp.hhp.tail"/>
-<xsl:param name="htmlhelp.hhp.window">Main</xsl:param>
-<xsl:param name="htmlhelp.hhp.windows"/>
-<xsl:param name="htmlhelp.map.file">context.h</xsl:param>
-<xsl:param name="htmlhelp.only" select="0"/>
-<xsl:param name="htmlhelp.remember.window.position" select="0"/>
-<xsl:param name="htmlhelp.show.advanced.search" select="0"/>
-<xsl:param name="htmlhelp.show.favorities" select="0"/>
-<xsl:param name="htmlhelp.show.menu" select="0"/>
-<xsl:param name="htmlhelp.show.toolbar.text" select="1"/>
-<xsl:param name="htmlhelp.title"/>
-<xsl:param name="htmlhelp.use.hhk" select="0"/>
-<xsl:param name="htmlhelp.window.geometry"/>
-<xsl:param name="img.src.path"/>
-<xsl:param name="id.warnings" select="0"/>
-<xsl:param name="index.method">basic</xsl:param>
-<xsl:param name="index.on.role" select="0"/>
-<xsl:param name="index.on.type" select="0"/>
-<xsl:param name="index.number.separator"/>
-<xsl:param name="index.term.separator"/>
-<xsl:param name="index.range.separator"/>
-<xsl:param name="index.prefer.titleabbrev" select="0"/>
-<xsl:param name="ignore.image.scaling" select="0"/>
-<xsl:param name="inherit.keywords" select="1"/>
-<xsl:param name="insert.xref.page.number">no</xsl:param>
-<xsl:param name="javahelp.encoding">iso-8859-1</xsl:param>
-<xsl:param name="keep.relative.image.uris" select="1"/>
-
-<xsl:param name="l10n.gentext.default.language">en</xsl:param>
-<xsl:param name="l10n.gentext.language"/>
-<xsl:param name="l10n.gentext.use.xref.language" select="0"/>
-<xsl:param name="l10n.lang.value.rfc.compliant" select="1"/>
-<xsl:param name="label.from.part" select="0"/>
-<xsl:param name="linenumbering.everyNth">5</xsl:param>
-<xsl:param name="linenumbering.extension" select="1"/>
-<xsl:param name="linenumbering.separator"><xsl:text> </xsl:text></xsl:param>
-<xsl:param name="linenumbering.width">3</xsl:param>
-<xsl:param name="link.mailto.url"/>
-<xsl:param name="make.graphic.viewport" select="1"/>
-<xsl:param name="make.single.year.ranges" select="0"/>
-<xsl:param name="make.valid.html" select="1"/>
-<xsl:param name="make.year.ranges" select="0"/>
-    <xsl:param name="manifest">HTML.manifest</xsl:param>
-    
-<xsl:param name="manifest.in.base.dir" select="0"/>
-<xsl:param name="manual.toc"/>
-<xsl:param name="menuchoice.menu.separator"> &#8594; </xsl:param>
-<xsl:param name="menuchoice.separator">+</xsl:param>
-<xsl:param name="navig.graphics.extension">.gif</xsl:param>
-<xsl:param name="navig.graphics" select="0"/>
-<xsl:param name="navig.graphics.path">images/</xsl:param>
-<xsl:param name="navig.showtitles">1</xsl:param>
-<xsl:param name="nominal.image.depth" select="4 * $pixels.per.inch"/>
-<xsl:param name="nominal.image.width" select="6 * $pixels.per.inch"/>
-<xsl:param name="nominal.table.width">6in</xsl:param>
-<xsl:param name="olink.base.uri"/>
-<xsl:param name="olink.debug" select="0"/>
-<xsl:attribute-set name="olink.properties">
-  <xsl:attribute name="show-destination">replace</xsl:attribute>
-</xsl:attribute-set>
-<xsl:param name="insert.olink.page.number">no</xsl:param>
-<xsl:param name="insert.olink.pdf.frag" select="0"/>
-<xsl:param name="prefer.internal.olink" select="0"/>
-<xsl:param name="olink.lang.fallback.sequence"/>
-<xsl:param name="olink.doctitle">no</xsl:param> 
-<xsl:param name="olink.fragid">fragid=</xsl:param>
-<xsl:param name="olink.outline.ext">.olink</xsl:param>
-<xsl:param name="olink.pubid">pubid</xsl:param>
-  <xsl:param name="olink.resolver">/cgi-bin/olink</xsl:param>
-<xsl:param name="olink.sysid">sysid</xsl:param>
-<xsl:param name="abstract.notitle.enabled" select="0"/>
-<xsl:param name="othercredit.like.author.enabled">0</xsl:param>
-<xsl:param name="para.propagates.style" select="1"/>
-<xsl:param name="part.autolabel">I</xsl:param>
-<xsl:param name="phrase.propagates.style" select="1"/>
-<xsl:param name="pixels.per.inch">90</xsl:param>
-<xsl:param name="points.per.em">10</xsl:param>
-<xsl:param name="preface.autolabel" select="0"/>
-<xsl:param name="preferred.mediaobject.role"/>
-<xsl:param name="process.empty.source.toc" select="0"/>
-<xsl:param name="process.source.toc" select="0"/>
-<xsl:param name="profile.arch"/>
-<xsl:param name="profile.audience"/>
-<xsl:param name="profile.attribute"/>
-<xsl:param name="profile.condition"/>
-<xsl:param name="profile.conformance"/>
-<xsl:param name="profile.lang"/>
-<xsl:param name="profile.os"/>
-<xsl:param name="profile.revision"/>
-<xsl:param name="profile.revisionflag"/>
-<xsl:param name="profile.role"/>
-<xsl:param name="profile.security"/>
-<xsl:param name="profile.separator">;</xsl:param>
-<xsl:param name="profile.status"/>
-<xsl:param name="profile.userlevel"/>
-<xsl:param name="profile.value"/>
-<xsl:param name="profile.vendor"/>
-<xsl:param name="profile.wordsize"/>
-<xsl:param name="punct.honorific">.</xsl:param>
-<xsl:param name="qanda.defaultlabel">number</xsl:param>
-<xsl:param name="qanda.inherit.numeration" select="1"/>
-<xsl:param name="qanda.in.toc" select="0"/>
-<xsl:param name="qanda.nested.in.toc" select="0"/>
-<xsl:param name="qandadiv.autolabel" select="1"/>
-<xsl:param name="refentry.generate.name" select="1"/>
-<xsl:param name="refentry.generate.title" select="0"/>
-<xsl:param name="refentry.separator" select="1"/>
-<xsl:param name="refentry.xref.manvolnum" select="1"/>
-  <xsl:param name="reference.autolabel">I</xsl:param>
-<xsl:param name="refclass.suppress" select="0"/>
-<xsl:param name="root.filename">index</xsl:param>
-<xsl:param name="rootid"/>
-<xsl:param name="runinhead.default.title.end.punct">.</xsl:param>
-<xsl:param name="runinhead.title.end.punct">.!?:</xsl:param>
-<xsl:param name="section.autolabel" select="0"/>
-<xsl:param name="section.autolabel.max.depth">8</xsl:param>
-<xsl:param name="section.label.includes.component.label" select="0"/>
-<xsl:param name="segmentedlist.as.table" select="0"/>
-<xsl:param name="shade.verbatim" select="0"/>
-<xsl:attribute-set name="shade.verbatim.style">
-  <xsl:attribute name="border">0</xsl:attribute>
-  <xsl:attribute name="bgcolor">#E0E0E0</xsl:attribute>
-</xsl:attribute-set>
-
-<xsl:param name="show.comments" select="1"/>
-<xsl:param name="show.revisionflag" select="0"/>
-<xsl:param name="simplesect.in.toc" select="0"/>
-<xsl:param name="spacing.paras" select="0"/>
-<xsl:param name="suppress.footer.navigation">0</xsl:param>
-<xsl:param name="suppress.header.navigation" select="0"/>
-<xsl:param name="suppress.navigation" select="0"/>
-<xsl:param name="table.borders.with.css" select="0"/>
-<xsl:param name="table.cell.border.color"/>
-
-<xsl:param name="table.cell.border.style">solid</xsl:param>
-<xsl:param name="table.cell.border.thickness">0.5pt</xsl:param>
-<xsl:param name="table.footnote.number.format">a</xsl:param>
-<xsl:param name="table.footnote.number.symbols"/>
-<xsl:param name="table.frame.border.color"/>
-
-<xsl:param name="table.frame.border.style">solid</xsl:param>
-<xsl:param name="table.frame.border.thickness">0.5pt</xsl:param>
-<xsl:param name="tablecolumns.extension" select="1"/>
- <xsl:param name="target.database.document">olinkdb.xml</xsl:param>
-<xsl:param name="targets.filename">target.db</xsl:param>
-<xsl:param name="textdata.default.encoding"/>
-<xsl:param name="tex.math.delims" select="1"/>
-<xsl:param name="tex.math.file">tex-math-equations.tex</xsl:param>
-<xsl:param name="tex.math.in.alt"/>
-  <xsl:param name="textinsert.extension" select="1"/>
-<xsl:param name="toc.list.type">dl</xsl:param>
-<xsl:param name="toc.section.depth">2</xsl:param>
-<xsl:param name="toc.max.depth">8</xsl:param>
-<xsl:param name="ulink.target">_top</xsl:param>
-<xsl:param name="use.embed.for.svg" select="0"/>
-<xsl:param name="use.extensions" select="0"/>
-<xsl:param name="use.id.as.filename" select="0"/>
-<xsl:param name="use.local.olink.style" select="0"/> 
-<xsl:param name="use.role.as.xrefstyle" select="1"/>
-<xsl:param name="use.role.for.mediaobject" select="1"/>
-<xsl:param name="use.svg" select="1"/>
-<xsl:param name="variablelist.as.table" select="0"/>
-<xsl:param name="variablelist.term.separator">, </xsl:param>
-<xsl:param name="variablelist.term.break.after">0</xsl:param>
-<xsl:param name="xref.with.number.and.title" select="1"/>
-<xsl:param name="xref.label-title.separator">: </xsl:param>
-<xsl:param name="xref.label-page.separator"><xsl:text> </xsl:text></xsl:param>
-<xsl:param name="xref.title-page.separator"><xsl:text> </xsl:text></xsl:param>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/pi.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/pi.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,1182 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/1999/xhtml" exclude-result-prefixes="doc" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<doc:reference xmlns=""><info xmlns="http://www.w3.org/1999/xhtml"><title>HTML Processing Instruction Reference</title>
-    <releaseinfo role="meta">
-      $Id$
-    </releaseinfo>
-  </info>
-  <partintro xmlns="http://www.w3.org/1999/xhtml" xml:id="partintro">
-    <title>Introduction</title>
-    <para>This is generated reference documentation for all
-      user-specifiable processing instructions (PIs) in the DocBook
-      XSL stylesheets for HTML output.
-      <note>
-        <para>You add these PIs at particular points in a document to
-          cause specific &#8220;exceptions&#8221; to formatting/output behavior. To
-          make global changes in formatting/output behavior across an
-          entire document, it&#8217;s better to do it by setting an
-          appropriate stylesheet parameter (if there is one).</para>
-      </note>
-    </para>
-  </partintro>
-</doc:reference>
-
-<!-- ==================================================================== -->
-
-<doc:pi xmlns="" name="dbhtml_background-color">
-  <refpurpose xmlns="http://www.w3.org/1999/xhtml">Sets background color for an image</refpurpose>
-  <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>Use the <tag class="xmlpi">dbhtml background-color</tag> PI before or
-      after an image (<tag>graphic</tag>, <tag>inlinegraphic</tag>,
-      <tag>imagedata</tag>, or <tag>videodata</tag> element) as a
-      sibling to the element, to set a background color for the
-      image.</para>
-  </refdescription>
-  <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
-    <synopsis><tag class="xmlpi">dbhtml background-color="<replaceable>color</replaceable>"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter xmlns="http://www.w3.org/1999/xhtml">
-    <variablelist>
-      <varlistentry><term>background-color="<replaceable>color</replaceable>"</term>
-        <listitem>
-          <para>An HTML color value</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
-    <para><link role="tcg" xlink:href="BGcolor.html">Background color</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbhtml_background-color">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbhtml-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/>
-    <xsl:with-param name="attribute" select="'background-color'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi xmlns="" name="dbhtml_bgcolor">
-  <refpurpose xmlns="http://www.w3.org/1999/xhtml">Sets background color on a table row or table cell</refpurpose>
-  <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>Use the <tag class="xmlpi">dbhtml bgcolor</tag> PI as child of a table row
-      or cell to set a background color for that table row or cell.</para>
-  </refdescription>
-  <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
-    <synopsis><tag class="xmlpi">dbhtml bgcolor="<replaceable>color</replaceable>"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter xmlns="http://www.w3.org/1999/xhtml">
-    <variablelist>
-      <varlistentry><term>bgcolor="<replaceable>color</replaceable>"</term>
-        <listitem>
-          <para>An HTML color value</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
-    <para><link role="tcg" xlink:href="BGtableColor.html#CellBGColor">Cell background color</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbhtml_bgcolor">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbhtml-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/>
-    <xsl:with-param name="attribute" select="'bgcolor'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi xmlns="" name="dbhtml_cellpadding">
-  <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies cellpadding in table or qandaset output</refpurpose>
-  <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>Use the <tag class="xmlpi">dbhtml cellpadding</tag> PI as a child of a
-      <tag>table</tag> or <tag>qandaset</tag> to specify the value
-      for the HTML <literal>cellpadding</literal> attribute in the
-      output HTML table.</para>
-  </refdescription>
-  <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
-    <synopsis><tag class="xmlpi">dbhtml cellpadding="<replaceable>number</replaceable>"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter xmlns="http://www.w3.org/1999/xhtml">
-    <variablelist>
-      <varlistentry><term>cellpadding="<replaceable>number</replaceable>"</term>
-        <listitem>
-          <para>Specifies the cellpadding</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="params">
-    <para><parameter>html.cellpadding</parameter></para>
-  </refsee>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
-    <para><link role="tcg" xlink:href="CellSpacing.html">Cell spacing and cell padding</link>,
-      <link role="tcg" xlink:href="QandAformat.html">Q and A formatting</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbhtml_cellpadding">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbhtml-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/>
-    <xsl:with-param name="attribute" select="'cellpadding'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi xmlns="" name="dbhtml_cellspacing">
-  <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies cellspacing in table or qandaset output</refpurpose>
-  <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>Use the <tag class="xmlpi">dbhtml cellspacing</tag> PI as a child of a
-      <tag>table</tag> or <tag>qandaset</tag> to specify the value
-      for the HTML <literal>cellspacing</literal> attribute in the
-      output HTML table.</para>
-  </refdescription>
-  <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
-    <synopsis><tag class="xmlpi">dbhtml cellspacing="<replaceable>number</replaceable>"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter xmlns="http://www.w3.org/1999/xhtml">
-    <variablelist>
-      <varlistentry><term>cellspacing="<replaceable>number</replaceable>"</term>
-        <listitem>
-          <para>Specifies the cellspacing</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="params">
-    <para><parameter>html.cellspacing</parameter></para>
-  </refsee>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
-    <para><link role="tcg" xlink:href="CellSpacing.html">Cell spacing and cell padding</link>,
-      <link role="tcg" xlink:href="QandAformat.html">Q and A formatting</link></para>
-    </refsee>
-</doc:pi>
-<xsl:template name="pi.dbhtml_cellspacing">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbhtml-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/>
-    <xsl:with-param name="attribute" select="'cellspacing'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi xmlns="" name="dbhtml_class">
-  <refpurpose xmlns="http://www.w3.org/1999/xhtml">Set value of the class attribute for a table row</refpurpose>
-  <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>Use the <tag class="xmlpi">dbhtml class</tag> PI as a child of a
-      <tag>row</tag> to specify a <literal>class</literal>
-      attribute and value in the HTML output for that row.</para>
-  </refdescription>
-  <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
-    <synopsis><tag class="xmlpi">dbhtml class="<replaceable>name</replaceable>"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter xmlns="http://www.w3.org/1999/xhtml">
-    <variablelist>
-      <varlistentry><term>class="<replaceable>name</replaceable>"</term>
-        <listitem>
-          <para>Specifies the class name</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
-    <para><link role="tcg" xlink:href="CSSTableCells.html">Table styles in HTML output</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbhtml_class">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbhtml-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/>
-    <xsl:with-param name="attribute" select="'class'"/>
-  </xsl:call-template>
-</xsl:template> 
-
-<doc:pi xmlns="" name="dbhtml_dir">
-  <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies a directory name in which to write files</refpurpose>
-  <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>When chunking output, use the <tag class="xmlpi">dbhtml dir</tag> PI
-      as a child of a chunk source to cause the output of that
-      chunk to be written to the specified directory; also, use it
-      as a child of a <tag>mediaobject</tag> to specify a
-      directory into which any long-description files for that
-      <tag>mediaobject</tag> will be written.</para>
-  </refdescription>
-  <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
-    <synopsis><tag class="xmlpi">dbhtml dir="<replaceable>path</replaceable>"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter xmlns="http://www.w3.org/1999/xhtml">
-    <variablelist>
-      <varlistentry><term>dir="<replaceable>path</replaceable>"</term>
-        <listitem>
-          <para>Specifies the pathname for the directory</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="params">
-    <para><parameter>base.dir</parameter></para>
-  </refsee>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
-    <para><link role="tcg" xlink:href="Chunking.html#dbhtmlDirPI">dbhtml dir processing instruction</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbhtml_dir">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbhtml-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/>
-    <xsl:with-param name="attribute" select="'dir'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi xmlns="" name="dbhtml_filename">
-  <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies a filename for a chunk</refpurpose>
-  <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>When chunking output, use the <tag class="xmlpi">dbhtml filename</tag>
-      PI as a child of a chunk source to specify a filename for
-      the output file for that chunk.</para>
-  </refdescription>
-  <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
-    <synopsis><tag class="xmlpi">dbhtml filename="<replaceable>filename</replaceable>"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter xmlns="http://www.w3.org/1999/xhtml">
-    <variablelist>
-      <varlistentry><term>filename="<replaceable>path</replaceable>"</term>
-        <listitem>
-          <para>Specifies the filename for the file</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="params">
-    <para><parameter>use.id.as.filename</parameter></para>
-  </refsee>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
-    <para><link role="tcg" xlink:href="Chunking.html#DbhtmlFilenames">dbhtml filenames</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbhtml_filename">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbhtml-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/>
-    <xsl:with-param name="attribute" select="'filename'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi xmlns="" name="dbhtml_funcsynopsis-style">
-  <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies presentation style for a funcsynopsis</refpurpose>
-  <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>Use the <tag class="xmlpi">dbhtml funcsynopsis-style</tag> PI as a child of
-      a <tag>funcprototype</tag> or anywhere within a funcprototype
-      control the presentation style for the <tag>funcsynopsis</tag>
-      in output.</para>
-  </refdescription>
-  <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
-    <synopsis><tag class="xmlpi">dbhtml funcsynopsis-style="kr"|"ansi"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter xmlns="http://www.w3.org/1999/xhtml">
-    <variablelist>
-      <varlistentry><term>funcsynopsis-style="kr"</term>
-        <listitem>
-          <para>Displays the <tag>funcprototype</tag> in K&amp;R style</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry><term>funcsynopsis-style="ansi"</term>
-        <listitem>
-          <para>Displays the <tag>funcprototype</tag> in ANSI style</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="params">
-    <para><parameter>funcsynopsis.style</parameter></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbhtml_funcsynopsis-style">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbhtml-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/>
-    <xsl:with-param name="attribute" select="'funcsynopsis-style'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi xmlns="" name="dbhtml_img.src.path">
-  <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies a path to the location of an image file</refpurpose>
-  <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>Use the <tag class="xmlpi">dbhtml img.src.path</tag> PI before or
-      after an image (<tag>graphic</tag>,
-      <tag>inlinegraphic</tag>, <tag>imagedata</tag>, or
-      <tag>videodata</tag> element) as a sibling to the element,
-      to specify a path to the location of the image; in HTML
-      output, the value specified for the
-      <code>img.src.path</code> attribute is prepended to the
-      filename.</para>
-  </refdescription>
-  <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
-    <synopsis><tag class="xmlpi">dbhtml img.src.path="<replaceable>path</replaceable>"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter xmlns="http://www.w3.org/1999/xhtml">
-    <variablelist>
-      <varlistentry><term>img.src.path="<replaceable>path</replaceable>"</term>
-        <listitem>
-          <para>Specifies the pathname to prepend to the name of the image file</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="params">
-    <para><parameter>img.src.path</parameter></para>
-  </refsee>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
-    <para><link role="tcg" xlink:href="GraphicsLocations.html#UsingFileref">Using fileref</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbhtml_img.src.path">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbhtml-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/>
-    <xsl:with-param name="attribute" select="'img.src.path'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi xmlns="" name="dbhtml_label-width">
-  <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies the label width for a qandaset</refpurpose>
-  <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>Use the <tag class="xmlpi">dbhtml label-width</tag> PI as a child of a
-      <tag>qandaset</tag> to specify the width of labels.</para>
-  </refdescription>
-  <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
-    <synopsis><tag class="xmlpi">dbhtml label-width="<replaceable>width</replaceable>"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter xmlns="http://www.w3.org/1999/xhtml">
-    <variablelist>
-      <varlistentry><term>label-width="<replaceable>width</replaceable>"</term>
-        <listitem>
-          <para>Specifies the label width (including units)</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
-    <para><link role="tcg" xlink:href="QandAformat.html">Q and A formatting</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbhtml_label-width">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbhtml-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/>
-    <xsl:with-param name="attribute" select="'label-width'"/>
-  </xsl:call-template>
-</xsl:template> 
-
-<doc:pi xmlns="" name="dbhtml_linenumbering.everyNth">
-  <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies interval for lines numbers in verbatims</refpurpose>
-  <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>Use the <tag class="xmlpi">dbhtml linenumbering.everyNth</tag> PI as a child
-      of a &#8220;verbatim&#8221; element &#8211; <tag>programlisting</tag>,
-      <tag>screen</tag>, <tag>synopsis</tag> &#8212; to specify
-      the interval at which lines are numbered.</para>
-  </refdescription>
-  <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
-    <synopsis><tag class="xmlpi">dbhtml linenumbering.everyNth="<replaceable>N</replaceable>"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter xmlns="http://www.w3.org/1999/xhtml">
-    <variablelist>
-      <varlistentry><term>linenumbering.everyNth="<replaceable>N</replaceable>"</term>
-        <listitem>
-          <para>Specifies numbering interval; a number is output
-            before every <replaceable>N</replaceable>th line</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="params">
-    <para><parameter>linenumbering.everyNth</parameter></para>
-  </refsee>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
-    <para><link role="tcg" xlink:href="AnnotateListing.html#LineNumbering">Line numbering</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbhtml_linenumbering.everyNth">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbhtml-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/>
-    <xsl:with-param name="attribute" select="'linenumbering.everyNth'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi xmlns="" name="dbhtml_linenumbering.separator">
-  <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies separator text for line numbers in verbatims</refpurpose>
-  <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>Use the <tag class="xmlpi">dbhtml linenumbering.separator</tag> PI as a child
-      of a &#8220;verbatim&#8221; element &#8211; <tag>programlisting</tag>,
-      <tag>screen</tag>, <tag>synopsis</tag> &#8212; to specify
-      the separator text output between the line numbers and content.</para>
-  </refdescription>
-  <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
-    <synopsis><tag class="xmlpi">dbhtml linenumbering.separator="<replaceable>text</replaceable>"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter xmlns="http://www.w3.org/1999/xhtml">
-    <variablelist>
-      <varlistentry><term>linenumbering.separator="<replaceable>text</replaceable>"</term>
-        <listitem>
-          <para>Specifies the text (zero or more characters)</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="params">
-    <para><parameter>linenumbering.separator</parameter></para>
-  </refsee>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
-    <para><link role="tcg" xlink:href="AnnotateListing.html#LineNumbering">Line numbering</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbhtml_linenumbering.separator">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbhtml-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/>
-    <xsl:with-param name="attribute" select="'linenumbering.separator'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi xmlns="" name="dbhtml_linenumbering.width">
-  <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies width for line numbers in verbatims</refpurpose>
-  <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>Use the <tag class="xmlpi">dbhtml linenumbering.width</tag> PI as a child
-      of a &#8220;verbatim&#8221; element &#8211; <tag>programlisting</tag>,
-      <tag>screen</tag>, <tag>synopsis</tag> &#8212; to specify
-      the width set aside for line numbers.</para>
-  </refdescription>
-  <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
-    <synopsis><tag class="xmlpi">dbhtml linenumbering.width="<replaceable>width</replaceable>"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter xmlns="http://www.w3.org/1999/xhtml">
-    <variablelist>
-      <varlistentry><term>linenumbering.width="<replaceable>width</replaceable>"</term>
-        <listitem>
-          <para>Specifies the width (inluding units)</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="params">
-    <para><parameter>linenumbering.width</parameter></para>
-  </refsee>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
-    <para><link role="tcg" xlink:href="AnnotateListing.html#LineNumbering">Line numbering</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbhtml_linenumbering.width">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbhtml-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/>
-    <xsl:with-param name="attribute" select="'linenumbering.width'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi xmlns="" name="dbhtml_list-presentation">
-  <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies presentation style for a variablelist or
-    segmentedlist</refpurpose>
-  <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>Use the <tag class="xmlpi">dbhtml list-presentation</tag> PI as a child of
-      a <tag>variablelist</tag> or <tag>segmentedlist</tag> to
-      control the presentation style for the list (to cause it, for
-      example, to be displayed as a table).</para>
-  </refdescription>
-  <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
-    <synopsis><tag class="xmlpi">dbhtml list-presentation="list"|"table"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter xmlns="http://www.w3.org/1999/xhtml">
-    <variablelist>
-      <varlistentry><term>list-presentation="list"</term>
-        <listitem>
-          <para>Displays the list as a list</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry><term>list-presentation="table"</term>
-        <listitem>
-          <para>Displays the list as a table</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="params">
-    <itemizedlist>
-      <listitem>
-        <para><parameter>variablelist.as.table</parameter></para>
-      </listitem>
-      <listitem>
-        <para><parameter>segmentedlist.as.table</parameter></para>
-      </listitem>
-    </itemizedlist>
-  </refsee>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
-    <para><link role="tcg" xlink:href="Variablelists.html#VarListFormatting">Variable list formatting in HTML</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbhtml_list-presentation">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbhtml-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/>
-    <xsl:with-param name="attribute" select="'list-presentation'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi xmlns="" name="dbhtml_list-width">
-  <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies the width of a variablelist or simplelist</refpurpose>
-  <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>Use the <tag class="xmlpi">dbhtml list-width</tag> PI as a child of a
-      <tag>variablelist</tag> or a <tag>simplelist</tag> presented
-      as a table, to specify the output width.</para>
-  </refdescription>
-  <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
-    <synopsis><tag class="xmlpi">dbhtml list-width="<replaceable>width</replaceable>"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter xmlns="http://www.w3.org/1999/xhtml">
-    <variablelist>
-      <varlistentry><term>list-width="<replaceable>width</replaceable>"</term>
-        <listitem>
-          <para>Specifies the output width (including units)</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
-    <para><link role="tcg" xlink:href="Variablelists.html#VarListFormatting">Variable list formatting in HTML</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbhtml_list-width">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbhtml-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/>
-    <xsl:with-param name="attribute" select="'list-width'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi xmlns="" name="dbhtml_row-height">
-  <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies the height for a table row</refpurpose>
-  <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>Use the <tag class="xmlpi">dbhtml row-height</tag> PI as a child of a
-      <tag>row</tag> to specify the height of the row.</para>
-  </refdescription>
-  <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
-    <synopsis><tag class="xmlpi">dbhtml row-height="<replaceable>height</replaceable>"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter xmlns="http://www.w3.org/1999/xhtml">
-    <variablelist>
-      <varlistentry><term>row-height="<replaceable>height</replaceable>"</term>
-        <listitem>
-          <para>Specifies the label height (including units)</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
-    <para><link role="tcg" xlink:href="RowHeight.html">Row height</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbhtml_row-height">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbhtml-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/>
-    <xsl:with-param name="attribute" select="'row-height'"/>
-  </xsl:call-template>
-</xsl:template> 
-
-<doc:pi xmlns="" name="dbhtml_start">
-  <refpurpose xmlns="http://www.w3.org/1999/xhtml">(obsolete) Sets the starting number on an ordered list</refpurpose>
-  <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para><emphasis>This PI is obsolete</emphasis>. The intent of
-      this PI was to provide a means for setting a specific starting
-      number for an ordered list. Instead of this PI, set a value
-      for the <literal>override</literal> attribute on the first
-      <tag>listitem</tag> in the list; that will have the same
-      effect as what this PI was intended for.</para>
-  </refdescription>
-  <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
-    <synopsis><tag class="xmlpi">dbhtml start="<replaceable>character</replaceable>"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter xmlns="http://www.w3.org/1999/xhtml">
-    <variablelist>
-      <varlistentry><term>start="<replaceable>character</replaceable>"</term>
-        <listitem>
-          <para>Specifies the character to use as the starting
-            number; use 0-9, a-z, A-Z, or lowercase or uppercase
-            Roman numerals</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
-    <para><link role="tcg" xlink:href="Orderedlists.html#ListStartNum">List starting number</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbhtml_start">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="pi-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/>
-    <xsl:with-param name="attribute" select="'start'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi xmlns="" name="dbhtml_table-summary">
-  <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies summary for table, variablelist, segmentedlist, or qandaset output</refpurpose>
-  <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>Use the <tag class="xmlpi">dbhtml table-summary</tag> PI as a child of
-      a <tag>table</tag>, <tag>variablelist</tag>,
-      <tag>segmentedlist</tag>, or <tag>qandaset</tag> to specify
-      the text for the HTML <literal>summary</literal> attribute
-      in the output HTML table.</para>
-  </refdescription>
-  <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
-    <synopsis><tag class="xmlpi">dbhtml table-summary="<replaceable>text</replaceable>"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter xmlns="http://www.w3.org/1999/xhtml">
-    <variablelist>
-      <varlistentry><term>table-summary="<replaceable>text</replaceable>"</term>
-        <listitem>
-          <para>Specifies the summary text (zero or more characters)</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
-    <para><link role="tcg" xlink:href="Variablelists.html#VarListFormatting">Variable list formatting in HTML</link>,
-      <link role="tcg" xlink:href="TableSummary.html">Table summary text</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbhtml_table-summary">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbhtml-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/>
-    <xsl:with-param name="attribute" select="'table-summary'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi xmlns="" name="dbhtml_table-width">
-  <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies the width for a table</refpurpose>
-  <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>Use the <tag class="xmlpi">dbhtml table-width</tag> PI as a child of a
-      <tag>table</tag> to specify the width of the table in
-      output.</para>
-  </refdescription>
-  <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
-    <synopsis><tag class="xmlpi">dbhtml table-width="<replaceable>width</replaceable>"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter xmlns="http://www.w3.org/1999/xhtml">
-    <variablelist>
-      <varlistentry><term>table-width="<replaceable>width</replaceable>"</term>
-        <listitem>
-          <para>Specifies the table width (including units or as a percentage)</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="params">
-    <para><parameter>default.table.width</parameter></para>
-  </refsee>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
-    <para><link role="tcg" xlink:href="Tables.html#TableWidth">Table width</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbhtml_table-width">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbhtml-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/>
-    <xsl:with-param name="attribute" select="'table-width'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi xmlns="" name="dbhtml_term-presentation">
-  <refpurpose xmlns="http://www.w3.org/1999/xhtml">Sets character formatting for terms in a variablelist</refpurpose>
-  <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>Use the <tag class="xmlpi">dbhtml term-presentation</tag> PI as a child
-      of a <tag>variablelist</tag> to set character formatting for
-      the <tag>term</tag> output of the list.</para>
-  </refdescription>
-  <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
-    <synopsis><tag class="xmlpi">dbhtml term-presentation="bold"|"italic"|"bold-italic"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter xmlns="http://www.w3.org/1999/xhtml">
-    <variablelist>
-      <varlistentry><term>term-presentation="<replaceable>bold</replaceable>"</term>
-        <listitem>
-          <para>Specifies that terms are displayed in bold</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry><term>term-presentation="<replaceable>italic</replaceable>"</term>
-        <listitem>
-          <para>Specifies that terms are displayed in italic</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry><term>term-presentation="<replaceable>bold-italic</replaceable>"</term>
-        <listitem>
-          <para>Specifies that terms are displayed in bold-italic</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
-    <para><link role="tcg" xlink:href="Variablelists.html#VarListFormatting">Variable list formatting in HTML</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbhtml_term-presentation">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbhtml-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/>
-    <xsl:with-param name="attribute" select="'term-presentation'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi xmlns="" name="dbhtml_term-separator">
-  <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies separator text among terms in a varlistentry</refpurpose>
-  <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>Use the <tag class="xmlpi">dbhtml term-separator</tag> PI as a child
-      of a <tag>variablelist</tag> to specify the separator text
-      among <tag>term</tag> instances.</para>
-  </refdescription>
-  <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
-    <synopsis><tag class="xmlpi">dbhtml term-separator="<replaceable>text</replaceable>"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter xmlns="http://www.w3.org/1999/xhtml">
-    <variablelist>
-      <varlistentry><term>term-separator="<replaceable>text</replaceable>"</term>
-        <listitem>
-          <para>Specifies the text (zero or more characters)</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="params">
-    <para><parameter>variablelist.term.separator</parameter></para>
-  </refsee>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
-    <para><link role="tcg" xlink:href="Variablelists.html#VarListFormatting">Variable list formatting in HTML</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbhtml_term-separator">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbhtml-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/>
-    <xsl:with-param name="attribute" select="'term-separator'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi xmlns="" name="dbhtml_term-width">
-  <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies the term width for a variablelist</refpurpose>
-  <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>Use the <tag class="xmlpi">dbhtml term-width</tag> PI as a child of a
-      <tag>variablelist</tag> to specify the width for
-      <tag>term</tag> output.</para>
-  </refdescription>
-  <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
-    <synopsis><tag class="xmlpi">dbhtml term-width="<replaceable>width</replaceable>"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter xmlns="http://www.w3.org/1999/xhtml">
-    <variablelist>
-      <varlistentry><term>term-width="<replaceable>width</replaceable>"</term>
-        <listitem>
-          <para>Specifies the term width (including units)</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
-    <para><link role="tcg" xlink:href="Variablelists.html#VarListFormatting">Variable list formatting in HTML</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbhtml_term-width">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbhtml-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/>
-    <xsl:with-param name="attribute" select="'term-width'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi xmlns="" name="dbhtml_toc">
-  <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies whether a TOC should be generated for a qandaset</refpurpose>
-  <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>Use the <tag class="xmlpi">dbhtml toc</tag> PI as a child of a
-      <tag>qandaset</tag> to specify whether a table of contents
-      (TOC) is generated for the <tag>qandaset</tag>.</para>
-  </refdescription>
-  <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
-    <synopsis><tag class="xmlpi">dbhtml toc="0"|"1"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter xmlns="http://www.w3.org/1999/xhtml">
-    <variablelist>
-      <varlistentry><term>toc="0"</term>
-        <listitem>
-          <para>If zero, no TOC is generated</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry><term>toc="1"</term>
-        <listitem>
-          <para>If <code>1</code> (or any non-zero value),
-            a TOC is generated</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
-    <para><link role="tcg" xlink:href="QandAtoc.html">Q and A list of questions</link>,
-      <link role="tcg" xlink:href="QandAformat.html">Q and A formatting</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbhtml_toc">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbhtml-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/>
-    <xsl:with-param name="attribute" select="'toc'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi xmlns="" name="dbcmdlist">
-  <refpurpose xmlns="http://www.w3.org/1999/xhtml">Generates a hyperlinked list of commands</refpurpose>
-  <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>Use the <tag class="xmlpi">dbcmdlist</tag> PI as the child of any
-      element (for example, <tag>refsynopsisdiv</tag>) containing multiple
-      <tag>cmdsynopsis</tag> instances; a hyperlinked navigational
-      &#8220;command list&#8221; will be generated at the top of output for that
-      element, enabling users to quickly jump
-      to each command synopsis.</para>
-  </refdescription>
-  <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
-    <synopsis><tag class="xmlpi">dbcmdlist</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter xmlns="http://www.w3.org/1999/xhtml">
-    <para>[No parameters]</para>
-  </refparameter>
-</doc:pi>
-<xsl:template name="pi.dbcmdlist">
-  <xsl:variable name="cmdsynopses" select="..//cmdsynopsis"/>
-  <xsl:if test="count($cmdsynopses)&lt;1">
-    <xsl:message><xsl:text>No cmdsynopsis elements matched dbcmdlist PI, perhaps it's nested too deep?</xsl:text>
-    </xsl:message>
-  </xsl:if>
-  <dl>
-    <xsl:call-template name="process.cmdsynopsis.list">
-      <xsl:with-param name="cmdsynopses" select="$cmdsynopses"/>
-    </xsl:call-template>
-  </dl>
-</xsl:template>
-
-<doc:pi xmlns="" name="dbfunclist">
-  <refpurpose xmlns="http://www.w3.org/1999/xhtml">Generates a hyperlinked list of functions</refpurpose>
-  <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>Use the <tag class="xmlpi">dbfunclist</tag> PI as the child of any
-      element (for example, <tag>refsynopsisdiv</tag>) containing multiple
-      <tag>funcsynopsis</tag> instances; a hyperlinked
-      navigational &#8220;function list&#8221; will be generated at the top of
-      output for that element, enabling users to quickly
-      jump to to each function synopsis.</para>
-  </refdescription>
-  <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
-    <synopsis><tag class="xmlpi">dbfunclist</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter xmlns="http://www.w3.org/1999/xhtml">
-    <para>[No parameters]</para>
-  </refparameter>
-</doc:pi>
-<xsl:template name="pi.dbfunclist">
-  <xsl:variable name="funcsynopses" select="..//funcsynopsis"/>
-  <xsl:if test="count($funcsynopses)&lt;1">
-    <xsl:message><xsl:text>No funcsynopsis elements matched dbfunclist PI, perhaps it's nested too deep?</xsl:text>
-    </xsl:message>
-  </xsl:if>
-  <dl>
-    <xsl:call-template name="process.funcsynopsis.list">
-      <xsl:with-param name="funcsynopses" select="$funcsynopses"/>
-    </xsl:call-template>
-  </dl>
-</xsl:template>
-
-<doc:pi xmlns="" name="dbhtml-include_href">
-  <refpurpose xmlns="http://www.w3.org/1999/xhtml">Copies an external well-formed HTML/XML file into current doc</refpurpose>
-  <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>Use the <tag class="xmlpi">dbhtml-include href</tag> PI anywhere in a
-      document to cause the contents of the file referenced by the
-      <code>href</code> pseudo-attribute to be copied/inserted &#8220;as
-      is&#8221; into your HTML output at the point in document order
-      where the PI occurs in the source.</para>
-    <note>
-      <para>The referenced file may contain plain text (as long as
-        it is &#8220;wrapped&#8221; in an <tag>html</tag> element &#8212; see the
-        note below) or markup in any arbitrary vocabulary,
-        including HTML &#8212; but it must conform to XML
-        well-formedness constraints (because the feature in XSLT
-        1.0 for opening external files, the
-        <function>document()</function> function, can only handle
-        files that meet XML well-formedness constraints).</para>
-      <para>Among other things, XML well-formedness constraints
-        require a document to have <emphasis>a single root
-          element</emphasis>. So if the content you want to
-        include is plain text or is markup that does
-        <emphasis>not</emphasis> have a single root element,
-        <emphasis role="strong">wrap the content in an
-          <tag>html</tag> element</emphasis>. The stylesheets will
-        strip out that surrounding <tag>html</tag> &#8220;wrapper&#8221; when
-        they find it, leaving just the content you want to
-        insert.</para>
-    </note>
-  </refdescription>
-  <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
-    <synopsis><tag class="xmlpi">dbhtml-include href="<replaceable>URI</replaceable>"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter xmlns="http://www.w3.org/1999/xhtml">
-    <variablelist>
-      <varlistentry><term>href="<replaceable>URI</replaceable>"</term>
-        <listitem>
-          <para>Specifies the URI for the file to include; the URI
-            can be, for example, a remote <literal>http:</literal>
-            URI, or a local filesystem <literal>file:</literal>
-            URI</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="params">
-    <para><parameter>textinsert.extension</parameter></para>
-  </refsee>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
-    <para><link role="tcg" xlink:href="InsertExtHtml.html">Inserting external HTML code</link>,
-      <link xlink:href="ExternalCode.html">External code files</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbhtml-include">
-  <xsl:param name="href">
-    <xsl:call-template name="dbhtml-attribute">
-      <xsl:with-param name="pis" select="."/>
-      <xsl:with-param name="attribute">href</xsl:with-param>
-    </xsl:call-template>
-  </xsl:param>
-  <xsl:choose>
-    <xsl:when test="$href != ''">
-      <xsl:variable name="content" select="document($href,/)"/>
-      <xsl:choose>
-        <xsl:when test="$content/*">
-          <xsl:choose>
-            <xsl:when test="$content/*[1][self::html]">
-              <!-- include just the children of html wrapper -->
-              <xsl:copy-of select="$content/*[1]/node()"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:copy-of select="$content"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:message>
-            <xsl:text>ERROR: dbhtml-include processing instruction </xsl:text>
-            <xsl:text>href has no content.</xsl:text>
-          </xsl:message>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:message>
-        <xsl:text>ERROR: dbhtml-include processing instruction has </xsl:text>
-        <xsl:text>missing or empty href value.</xsl:text>
-      </xsl:message>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="dbhtml-attribute">
-  <!-- * dbhtml-attribute is an interal utility template for retrieving -->
-  <!-- * pseudo-attributes/parameters from PIs -->
-  <xsl:param name="pis" select="processing-instruction('dbhtml')"/>
-  <xsl:param name="attribute">filename</xsl:param>
-  <xsl:call-template name="pi-attribute">
-    <xsl:with-param name="pis" select="$pis"/>
-    <xsl:with-param name="attribute" select="$attribute"/>
-  </xsl:call-template>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="processing-instruction()">
-</xsl:template>
-
-<xsl:template match="processing-instruction('dbhtml')">
-  <!-- nop -->
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="processing-instruction('dbcmdlist')">
-  <xsl:call-template name="pi.dbcmdlist"/>
-</xsl:template>
-<xsl:template name="process.cmdsynopsis.list">
-  <xsl:param name="cmdsynopses"/><!-- empty node list by default -->
-  <xsl:param name="count" select="1"/>
-
-  <xsl:choose>
-    <xsl:when test="$count&gt;count($cmdsynopses)"/>
-    <xsl:otherwise>
-      <xsl:variable name="cmdsyn" select="$cmdsynopses[$count]"/>
-
-       <dt>
-       <a>
-         <xsl:attribute name="href">
-           <xsl:text>#</xsl:text>
-           <xsl:call-template name="object.id">
-             <xsl:with-param name="object" select="$cmdsyn"/>
-           </xsl:call-template>
-         </xsl:attribute>
-
-         <xsl:choose>
-           <xsl:when test="$cmdsyn/@xreflabel">
-             <xsl:call-template name="xref.xreflabel">
-               <xsl:with-param name="target" select="$cmdsyn"/>
-             </xsl:call-template>
-           </xsl:when>
-           <xsl:otherwise>
-             <xsl:apply-templates select="$cmdsyn" mode="xref-to">
-               <xsl:with-param name="target" select="$cmdsyn"/>
-             </xsl:apply-templates>
-           </xsl:otherwise>
-         </xsl:choose>
-       </a>
-       </dt>
-
-        <xsl:call-template name="process.cmdsynopsis.list">
-          <xsl:with-param name="cmdsynopses" select="$cmdsynopses"/>
-          <xsl:with-param name="count" select="$count+1"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="processing-instruction('dbfunclist')">
-  <xsl:call-template name="pi.dbfunclist"/>
-</xsl:template>
-<xsl:template name="process.funcsynopsis.list">
-  <xsl:param name="funcsynopses"/><!-- empty node list by default -->
-  <xsl:param name="count" select="1"/>
-
-  <xsl:choose>
-    <xsl:when test="$count&gt;count($funcsynopses)"/>
-    <xsl:otherwise>
-      <xsl:variable name="cmdsyn" select="$funcsynopses[$count]"/>
-
-       <dt>
-       <a>
-         <xsl:attribute name="href">
-           <xsl:text>#</xsl:text>
-           <xsl:call-template name="object.id">
-             <xsl:with-param name="object" select="$cmdsyn"/>
-           </xsl:call-template>
-         </xsl:attribute>
-
-         <xsl:choose>
-           <xsl:when test="$cmdsyn/@xreflabel">
-             <xsl:call-template name="xref.xreflabel">
-               <xsl:with-param name="target" select="$cmdsyn"/>
-             </xsl:call-template>
-           </xsl:when>
-           <xsl:otherwise>
-              <xsl:apply-templates select="$cmdsyn" mode="xref-to">
-                <xsl:with-param name="target" select="$cmdsyn"/>
-              </xsl:apply-templates>
-           </xsl:otherwise>
-         </xsl:choose>
-       </a>
-       </dt>
-
-        <xsl:call-template name="process.funcsynopsis.list">
-          <xsl:with-param name="funcsynopses" select="$funcsynopses"/>
-          <xsl:with-param name="count" select="$count+1"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="processing-instruction('dbhtml-include')">
-  <xsl:call-template name="pi.dbhtml-include"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="dbhtml-dir">
-  <xsl:param name="context" select="."/>
-  <!-- directories are now inherited from previous levels -->
-  <xsl:variable name="ppath">
-    <xsl:if test="$context/parent::*">
-      <xsl:call-template name="dbhtml-dir">
-        <xsl:with-param name="context" select="$context/parent::*"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:variable>
-  <xsl:variable name="path">
-    <xsl:call-template name="pi.dbhtml_dir">
-      <xsl:with-param name="node" select="$context"/>
-    </xsl:call-template>
-  </xsl:variable>
-  <xsl:choose>
-    <xsl:when test="$path = ''">
-      <xsl:if test="$ppath != ''">
-        <xsl:value-of select="$ppath"/>
-      </xsl:if>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:if test="$ppath != ''">
-        <xsl:value-of select="$ppath"/>
-        <xsl:if test="substring($ppath, string-length($ppath), 1) != '/'">
-          <xsl:text>/</xsl:text>
-        </xsl:if>
-      </xsl:if>
-      <xsl:value-of select="$path"/>
-      <xsl:text>/</xsl:text>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- There are two templates matching this PI in htmlhelp-common.xsl -->
-<doc:pi xmlns="" name="dbhh">
-  <refpurpose xmlns="http://www.w3.org/1999/xhtml">Sets topic name and topic id for context-sensitive HTML Help</refpurpose>
-  <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>Use the <tag class="xmlpi">dbhh</tag> PI as a child of components
-      that should be used as targets for context-sensitive help requests.</para>
-  </refdescription>
-  <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
-    <synopsis><tag class="xmlpi">dbhh topicname="<replaceable>name</replaceable>" topicid="<replaceable>id</replaceable>"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter xmlns="http://www.w3.org/1999/xhtml">
-    <variablelist>
-      <varlistentry><term>topicname="<replaceable>name</replaceable>"</term>
-        <listitem>
-          <para>Specifies a unique string constant that identifies a help topic</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry><term>topicid="<replaceable>id</replaceable>"</term>
-        <listitem>
-          <para>Specifies a unique integer value for the <literal>topicname</literal> string</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
-    <para><link role="tcg" xlink:href="HtmlHelp.html#HHContextHelp">Context-sensitive help</link></para>
-  </refsee>
-</doc:pi>
-
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/profile-chunk-code.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/profile-chunk-code.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,611 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<!--This file was created automatically by xsl2profile-->
-<!--from the DocBook XSL stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exsl="http://exslt.org/common" xmlns:cf="http://docbook.sourceforge.net/xmlns/chunkfast/1.0" xmlns:ng="http://docbook.org/docbook-ng" xmlns:db="http://docbook.org/ns/docbook" xmlns:exslt="http://exslt.org/common" xmlns="http://www.w3.org/1999/xhtml" exslt:dummy="dummy" ng:dummy="dummy" db:dummy="dummy" extension-element-prefixes="exslt" exclude-result-prefixes="exsl cf ng db exslt" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-
-<xsl:template match="*" mode="chunk-filename">
-  <!-- returns the filename of a chunk -->
-  <xsl:variable name="ischunk">
-    <xsl:call-template name="chunk"/>
-  </xsl:variable>
-
-  <xsl:variable name="fn">
-    <xsl:apply-templates select="." mode="recursive-chunk-filename"/>
-  </xsl:variable>
-
-  <!--
-  <xsl:message>
-    <xsl:value-of select="$ischunk"/>
-    <xsl:text> (</xsl:text>
-    <xsl:value-of select="local-name(.)"/>
-    <xsl:text>) </xsl:text>
-    <xsl:value-of select="$fn"/>
-    <xsl:text>, </xsl:text>
-    <xsl:call-template name="dbhtml-dir"/>
-  </xsl:message>
-  -->
-
-  <!-- 2003-11-25 by ndw:
-       The following test used to read test="$ischunk != 0 and $fn != ''"
-       I've removed the ischunk part of the test so that href.to.uri and
-       href.from.uri will be fully qualified even if the source or target
-       isn't a chunk. I *think* that if $fn != '' then it's appropriate
-       to put the directory on the front, even if the element isn't a
-       chunk. I could be wrong. -->
-
-  <xsl:if test="$fn != ''">
-    <xsl:call-template name="dbhtml-dir"/>
-  </xsl:if>
-
-  <xsl:value-of select="$fn"/>
-  <!-- You can't add the html.ext here because dbhtml filename= may already -->
-  <!-- have added it. It really does have to be handled in the recursive template -->
-</xsl:template>
-
-<xsl:template match="*" mode="recursive-chunk-filename">
-  <xsl:param name="recursive" select="false()"/>
-
-  <!-- returns the filename of a chunk -->
-  <xsl:variable name="ischunk">
-    <xsl:call-template name="chunk"/>
-  </xsl:variable>
-
-  <xsl:variable name="dbhtml-filename">
-    <xsl:call-template name="pi.dbhtml_filename"/>
-  </xsl:variable>
-
-  <xsl:variable name="filename">
-    <xsl:choose>
-      <xsl:when test="$dbhtml-filename != ''">
-        <xsl:value-of select="$dbhtml-filename"/>
-      </xsl:when>
-      <!-- if this is the root element, use the root.filename -->
-      <xsl:when test="not(parent::*) and $root.filename != ''">
-        <xsl:value-of select="$root.filename"/>
-        <xsl:value-of select="$html.ext"/>
-      </xsl:when>
-      <!-- Special case -->
-      <xsl:when test="self::legalnotice and not($generate.legalnotice.link = 0)">
-        <xsl:choose>
-          <xsl:when test="(@id or @xml:id) and not($use.id.as.filename = 0)">
-            <!-- * if this legalnotice has an ID, then go ahead and use -->
-            <!-- * just the value of that ID as the basename for the file -->
-            <!-- * (that is, without prepending an "ln-" too it) -->
-            <xsl:value-of select="(@id|@xml:id)[1]"/>
-            <xsl:value-of select="$html.ext"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <!-- * otherwise, if this legalnotice does not have an ID, -->
-            <!-- * then we generate an ID... -->
-            <xsl:variable name="id">
-              <xsl:call-template name="object.id"/>
-            </xsl:variable>
-            <!-- * ...and then we take that generated ID, prepend an -->
-            <!-- * "ln-" to it, and use that as the basename for the file -->
-            <xsl:value-of select="concat('ln-',$id,$html.ext)"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-      <!-- if there's no dbhtml filename, and if we're to use IDs as -->
-      <!-- filenames, then use the ID to generate the filename. -->
-      <xsl:when test="(@id or @xml:id) and $use.id.as.filename != 0">
-        <xsl:value-of select="(@id|@xml:id)[1]"/>
-        <xsl:value-of select="$html.ext"/>
-      </xsl:when>
-      <xsl:otherwise/>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$ischunk='0'">
-      <!-- if called on something that isn't a chunk, walk up... -->
-      <xsl:choose>
-        <xsl:when test="count(parent::*)&gt;0">
-          <xsl:apply-templates mode="recursive-chunk-filename" select="parent::*">
-            <xsl:with-param name="recursive" select="$recursive"/>
-          </xsl:apply-templates>
-        </xsl:when>
-        <!-- unless there is no up, in which case return "" -->
-        <xsl:otherwise/>
-      </xsl:choose>
-    </xsl:when>
-
-    <xsl:when test="not($recursive) and $filename != ''">
-      <!-- if this chunk has an explicit name, use it -->
-      <xsl:value-of select="$filename"/>
-    </xsl:when>
-
-    <xsl:when test="self::set">
-      <xsl:value-of select="$root.filename"/>
-      <xsl:if test="not($recursive)">
-        <xsl:value-of select="$html.ext"/>
-      </xsl:if>
-    </xsl:when>
-
-    <xsl:when test="self::book">
-      <xsl:text>bk</xsl:text>
-      <xsl:number level="any" format="01"/>
-      <xsl:if test="not($recursive)">
-        <xsl:value-of select="$html.ext"/>
-      </xsl:if>
-    </xsl:when>
-
-    <xsl:when test="self::article">
-      <xsl:if test="/set">
-        <!-- in a set, make sure we inherit the right book info... -->
-        <xsl:apply-templates mode="recursive-chunk-filename" select="parent::*">
-          <xsl:with-param name="recursive" select="true()"/>
-        </xsl:apply-templates>
-      </xsl:if>
-
-      <xsl:text>ar</xsl:text>
-      <xsl:number level="any" format="01" from="book"/>
-      <xsl:if test="not($recursive)">
-        <xsl:value-of select="$html.ext"/>
-      </xsl:if>
-    </xsl:when>
-
-    <xsl:when test="self::preface">
-      <xsl:if test="/set">
-        <!-- in a set, make sure we inherit the right book info... -->
-        <xsl:apply-templates mode="recursive-chunk-filename" select="parent::*">
-          <xsl:with-param name="recursive" select="true()"/>
-        </xsl:apply-templates>
-      </xsl:if>
-
-      <xsl:text>pr</xsl:text>
-      <xsl:number level="any" format="01" from="book"/>
-      <xsl:if test="not($recursive)">
-        <xsl:value-of select="$html.ext"/>
-      </xsl:if>
-    </xsl:when>
-
-    <xsl:when test="self::chapter">
-      <xsl:if test="/set">
-        <!-- in a set, make sure we inherit the right book info... -->
-        <xsl:apply-templates mode="recursive-chunk-filename" select="parent::*">
-          <xsl:with-param name="recursive" select="true()"/>
-        </xsl:apply-templates>
-      </xsl:if>
-
-      <xsl:text>ch</xsl:text>
-      <xsl:number level="any" format="01" from="book"/>
-      <xsl:if test="not($recursive)">
-        <xsl:value-of select="$html.ext"/>
-      </xsl:if>
-    </xsl:when>
-
-    <xsl:when test="self::appendix">
-      <xsl:if test="/set">
-        <!-- in a set, make sure we inherit the right book info... -->
-        <xsl:apply-templates mode="recursive-chunk-filename" select="parent::*">
-          <xsl:with-param name="recursive" select="true()"/>
-        </xsl:apply-templates>
-      </xsl:if>
-
-      <xsl:text>ap</xsl:text>
-      <xsl:number level="any" format="a" from="book"/>
-      <xsl:if test="not($recursive)">
-        <xsl:value-of select="$html.ext"/>
-      </xsl:if>
-    </xsl:when>
-
-    <xsl:when test="self::part">
-      <xsl:choose>
-        <xsl:when test="/set">
-          <!-- in a set, make sure we inherit the right book info... -->
-          <xsl:apply-templates mode="recursive-chunk-filename" select="parent::*">
-            <xsl:with-param name="recursive" select="true()"/>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-        </xsl:otherwise>
-      </xsl:choose>
-
-      <xsl:text>pt</xsl:text>
-      <xsl:number level="any" format="01" from="book"/>
-      <xsl:if test="not($recursive)">
-        <xsl:value-of select="$html.ext"/>
-      </xsl:if>
-    </xsl:when>
-
-    <xsl:when test="self::reference">
-      <xsl:choose>
-        <xsl:when test="/set">
-          <!-- in a set, make sure we inherit the right book info... -->
-          <xsl:apply-templates mode="recursive-chunk-filename" select="parent::*">
-            <xsl:with-param name="recursive" select="true()"/>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-        </xsl:otherwise>
-      </xsl:choose>
-
-      <xsl:text>rn</xsl:text>
-      <xsl:number level="any" format="01" from="book"/>
-      <xsl:if test="not($recursive)">
-        <xsl:value-of select="$html.ext"/>
-      </xsl:if>
-    </xsl:when>
-
-    <xsl:when test="self::refentry">
-      <xsl:choose>
-        <xsl:when test="parent::reference">
-          <xsl:apply-templates mode="recursive-chunk-filename" select="parent::*">
-            <xsl:with-param name="recursive" select="true()"/>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-        </xsl:otherwise>
-      </xsl:choose>
-
-      <xsl:text>re</xsl:text>
-      <xsl:number level="any" format="01" from="book"/>
-      <xsl:if test="not($recursive)">
-        <xsl:value-of select="$html.ext"/>
-      </xsl:if>
-    </xsl:when>
-
-    <xsl:when test="self::colophon">
-      <xsl:choose>
-        <xsl:when test="/set">
-          <!-- in a set, make sure we inherit the right book info... -->
-          <xsl:apply-templates mode="recursive-chunk-filename" select="parent::*">
-            <xsl:with-param name="recursive" select="true()"/>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-        </xsl:otherwise>
-      </xsl:choose>
-
-      <xsl:text>co</xsl:text>
-      <xsl:number level="any" format="01" from="book"/>
-      <xsl:if test="not($recursive)">
-        <xsl:value-of select="$html.ext"/>
-      </xsl:if>
-    </xsl:when>
-
-    <xsl:when test="self::sect1                     or self::sect2                     or self::sect3                     or self::sect4                     or self::sect5                     or self::section">
-      <xsl:apply-templates mode="recursive-chunk-filename" select="parent::*">
-        <xsl:with-param name="recursive" select="true()"/>
-      </xsl:apply-templates>
-      <xsl:text>s</xsl:text>
-      <xsl:number format="01"/>
-      <xsl:if test="not($recursive)">
-        <xsl:value-of select="$html.ext"/>
-      </xsl:if>
-    </xsl:when>
-
-    <xsl:when test="self::bibliography">
-      <xsl:choose>
-        <xsl:when test="/set">
-          <!-- in a set, make sure we inherit the right book info... -->
-          <xsl:apply-templates mode="recursive-chunk-filename" select="parent::*">
-            <xsl:with-param name="recursive" select="true()"/>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-        </xsl:otherwise>
-      </xsl:choose>
-
-      <xsl:text>bi</xsl:text>
-      <xsl:number level="any" format="01" from="book"/>
-      <xsl:if test="not($recursive)">
-        <xsl:value-of select="$html.ext"/>
-      </xsl:if>
-    </xsl:when>
-
-    <xsl:when test="self::glossary">
-      <xsl:choose>
-        <xsl:when test="/set">
-          <!-- in a set, make sure we inherit the right book info... -->
-          <xsl:apply-templates mode="recursive-chunk-filename" select="parent::*">
-            <xsl:with-param name="recursive" select="true()"/>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-        </xsl:otherwise>
-      </xsl:choose>
-
-      <xsl:text>go</xsl:text>
-      <xsl:number level="any" format="01" from="book"/>
-      <xsl:if test="not($recursive)">
-        <xsl:value-of select="$html.ext"/>
-      </xsl:if>
-    </xsl:when>
-
-    <xsl:when test="self::index">
-      <xsl:choose>
-        <xsl:when test="/set">
-          <!-- in a set, make sure we inherit the right book info... -->
-          <xsl:apply-templates mode="recursive-chunk-filename" select="parent::*">
-            <xsl:with-param name="recursive" select="true()"/>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-        </xsl:otherwise>
-      </xsl:choose>
-
-      <xsl:text>ix</xsl:text>
-      <xsl:number level="any" format="01" from="book"/>
-      <xsl:if test="not($recursive)">
-        <xsl:value-of select="$html.ext"/>
-      </xsl:if>
-    </xsl:when>
-
-    <xsl:when test="self::setindex">
-      <xsl:text>si</xsl:text>
-      <xsl:number level="any" format="01" from="set"/>
-      <xsl:if test="not($recursive)">
-        <xsl:value-of select="$html.ext"/>
-      </xsl:if>
-    </xsl:when>
-
-    <xsl:otherwise>
-      <xsl:text>chunk-filename-error-</xsl:text>
-      <xsl:value-of select="name(.)"/>
-      <xsl:number level="any" format="01" from="set"/>
-      <xsl:if test="not($recursive)">
-        <xsl:value-of select="$html.ext"/>
-      </xsl:if>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-
-
-<xsl:template match="processing-instruction('dbhtml')">
-  <!-- nop -->
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-
-<xsl:template match="*" mode="find.chunks">
-  <xsl:variable name="chunk">
-    <xsl:call-template name="chunk"/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$chunk != 0">
-      <cf:div id="{generate-id()}">
-        <xsl:apply-templates select="." mode="class.attribute"/>
-        <xsl:apply-templates select="*" mode="find.chunks"/>
-      </cf:div>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates select="*" mode="find.chunks"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xslo:include xmlns:xslo="http://www.w3.org/1999/XSL/Transform" href="../profiling/profile-mode.xsl"/><xslo:variable xmlns:xslo="http://www.w3.org/1999/XSL/Transform" name="profiled-content"><xslo:choose><xslo:when test="*/self::ng:* or */self::db:*"><xslo:message>Note: namesp. cut : stripped namespace before processing</xslo:message><xslo:variable name="stripped-content"><xslo:apply-templates select="/" mode="stripNS"/></xslo:variable><xslo:message>Note: namesp. cut : processing stripped document</xslo:message><xslo:apply-templates select="exslt:node-set($stripped-content)" mode="profile"/></xslo:when><xslo:otherwise><xslo:apply-templates select="/" mode="profile"/></xslo:otherwise></xslo:choose></xslo:variable><xslo:variable xmlns:xslo="http://www.w3.org/1999/XSL/Transform" name="profiled-nodes" select="exslt:node-set($profiled-content)"/><xsl:template match="/">
-  <!-- * Get a title for current doc so that we let the user -->
-  <!-- * know what document we are processing at this point. -->
-  <xsl:variable name="doc.title">
-    <xsl:call-template name="get.doc.title"/>
-  </xsl:variable>
-  <xsl:choose>
-    <!-- Hack! If someone hands us a DocBook V5.x or DocBook NG document,
-         toss the namespace and continue.  Use the docbook5 namespaced
-	 stylesheets for DocBook5 if you don't want to use this feature.-->
-    <!-- include extra test for Xalan quirk -->
-    <xsl:when test="false()"/>
-    <!-- Can't process unless namespace removed -->
-    <xsl:when test="false()"/>
-    <xsl:otherwise>
-      <xsl:choose>
-        <xsl:when test="$rootid != ''">
-          <xsl:choose>
-            <xsl:when test="count($profiled-nodes//*[@id=$rootid]) = 0">
-              <xsl:message terminate="yes">
-                <xsl:text>ID '</xsl:text>
-                <xsl:value-of select="$rootid"/>
-                <xsl:text>' not found in document.</xsl:text>
-              </xsl:message>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:if test="$collect.xref.targets = 'yes' or                             $collect.xref.targets = 'only'">
-                <xsl:apply-templates select="key('id', $rootid)" mode="collect.targets"/>
-              </xsl:if>
-              <xsl:if test="$collect.xref.targets != 'only'">
-                <xsl:apply-templates select="$profiled-nodes//*[@id=$rootid]" mode="process.root"/>
-                <xsl:if test="$tex.math.in.alt != ''">
-                  <xsl:apply-templates select="$profiled-nodes//*[@id=$rootid]" mode="collect.tex.math"/>
-                </xsl:if>
-                <xsl:if test="$generate.manifest != 0">
-                  <xsl:call-template name="generate.manifest">
-                    <xsl:with-param name="node" select="key('id',$rootid)"/>
-                  </xsl:call-template>
-                </xsl:if>
-              </xsl:if>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:if test="$collect.xref.targets = 'yes' or                         $collect.xref.targets = 'only'">
-            <xsl:apply-templates select="$profiled-nodes" mode="collect.targets"/>
-          </xsl:if>
-          <xsl:if test="$collect.xref.targets != 'only'">
-            <xsl:apply-templates select="$profiled-nodes" mode="process.root"/>
-            <xsl:if test="$tex.math.in.alt != ''">
-              <xsl:apply-templates select="$profiled-nodes" mode="collect.tex.math"/>
-            </xsl:if>
-            <xsl:if test="$generate.manifest != 0">
-              <xsl:call-template name="generate.manifest">
-                <xsl:with-param name="node" select="$profiled-nodes"/>
-              </xsl:call-template>
-            </xsl:if>
-          </xsl:if>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="*" mode="process.root">
-  <xsl:apply-templates select="."/>
-</xsl:template>
-
-<!-- ====================================================================== -->
-
-<xsl:template match="set|book|part|preface|chapter|appendix                      |article                      |reference|refentry                      |book/glossary|article/glossary|part/glossary                      |book/bibliography|article/bibliography|part/bibliography                      |colophon">
-  <xsl:choose>
-    <xsl:when test="$onechunk != 0 and parent::*">
-      <xsl:apply-imports/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="process-chunk-element"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="sect1|sect2|sect3|sect4|sect5|section">
-  <xsl:variable name="ischunk">
-    <xsl:call-template name="chunk"/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="not(parent::*)">
-      <xsl:call-template name="process-chunk-element"/>
-    </xsl:when>
-    <xsl:when test="$ischunk = 0">
-      <xsl:apply-imports/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="process-chunk-element"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="setindex                      |book/index                      |article/index                      |part/index">
-  <!-- some implementations use completely empty index tags to indicate -->
-  <!-- where an automatically generated index should be inserted. so -->
-  <!-- if the index is completely empty, skip it. -->
-  <xsl:if test="count(*)&gt;0 or $generate.index != '0'">
-    <xsl:call-template name="process-chunk-element"/>
-  </xsl:if>
-</xsl:template>
-
-<!-- Resolve xml:base attributes -->
-<xsl:template match="@fileref">
-  <!-- need a check for absolute urls -->
-  <xsl:choose>
-    <xsl:when test="contains(., ':')">
-      <!-- it has a uri scheme so it is an absolute uri -->
-      <xsl:value-of select="."/>
-    </xsl:when>
-    <xsl:when test="$keep.relative.image.uris != 0">
-      <!-- leave it alone -->
-      <xsl:value-of select="."/>
-    </xsl:when>
-    <xsl:otherwise>
-      <!-- its a relative uri -->
-      <xsl:call-template name="relative-uri">
-        <xsl:with-param name="destdir">
-          <xsl:call-template name="dbhtml-dir">
-            <xsl:with-param name="context" select=".."/>
-          </xsl:call-template>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-<xsl:template match="set|book|part|preface|chapter|appendix                      |article                      |reference|refentry                      |sect1|sect2|sect3|sect4|sect5                      |section                      |book/glossary|article/glossary|part/glossary                      |book/bibliography|article/bibliography|part/bibliography                      |colophon" mode="enumerate-files">
-  <xsl:variable name="ischunk"><xsl:call-template name="chunk"/></xsl:variable>
-  <xsl:if test="$ischunk='1'">
-    <xsl:call-template name="make-relative-filename">
-      <xsl:with-param name="base.dir">
-        <xsl:if test="$manifest.in.base.dir = 0">
-          <xsl:value-of select="$base.dir"/>
-        </xsl:if>
-      </xsl:with-param>
-      <xsl:with-param name="base.name">
-        <xsl:apply-templates mode="chunk-filename" select="."/>
-      </xsl:with-param>
-    </xsl:call-template>
-    <xsl:text>
-</xsl:text>
-  </xsl:if>
-  <xsl:apply-templates select="*" mode="enumerate-files"/>
-</xsl:template>
-
-<xsl:template match="book/index|article/index|part/index" mode="enumerate-files">
-  <xsl:if test="$htmlhelp.output != 1">
-    <xsl:variable name="ischunk"><xsl:call-template name="chunk"/></xsl:variable>
-    <xsl:if test="$ischunk='1'">
-      <xsl:call-template name="make-relative-filename">
-        <xsl:with-param name="base.dir">
-          <xsl:if test="$manifest.in.base.dir = 0">
-            <xsl:value-of select="$base.dir"/>
-          </xsl:if>
-        </xsl:with-param>
-        <xsl:with-param name="base.name">
-          <xsl:apply-templates mode="chunk-filename" select="."/>
-        </xsl:with-param>
-      </xsl:call-template>
-      <xsl:text>
-</xsl:text>
-    </xsl:if>
-    <xsl:apply-templates select="*" mode="enumerate-files"/>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="enumerate-files">
-  <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
-  <xsl:if test="$generate.legalnotice.link != 0">
-    <xsl:call-template name="make-relative-filename">
-      <xsl:with-param name="base.dir">
-        <xsl:if test="$manifest.in.base.dir = 0">
-          <xsl:value-of select="$base.dir"/>
-        </xsl:if>
-      </xsl:with-param>
-      <xsl:with-param name="base.name">
-        <xsl:apply-templates mode="chunk-filename" select="."/>
-      </xsl:with-param>
-    </xsl:call-template>
-    <xsl:text>
-</xsl:text>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="mediaobject[imageobject] | inlinemediaobject[imageobject]" mode="enumerate-files">
-  <xsl:variable name="longdesc.uri">
-    <xsl:call-template name="longdesc.uri">
-      <xsl:with-param name="mediaobject" select="."/>
-    </xsl:call-template>
-  </xsl:variable>
-  <xsl:variable name="mediaobject" select="."/>
-
-  <xsl:if test="$html.longdesc != 0 and $mediaobject/textobject[not(phrase)]">
-    <xsl:call-template name="longdesc.uri">
-      <xsl:with-param name="mediaobject" select="$mediaobject"/>
-    </xsl:call-template>
-    <xsl:text>
-</xsl:text>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="text()" mode="enumerate-files">
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/profile-chunk.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/profile-chunk.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,52 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exsl="http://exslt.org/common" xmlns="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<!-- First import the non-chunking templates that format elements
-     within each chunk file. In a customization, you should
-     create a separate non-chunking customization layer such
-     as mydocbook.xsl that imports the original docbook.xsl and
-     customizes any presentation templates. Then your chunking
-     customization should import mydocbook.xsl instead of
-     docbook.xsl.  -->
-<xsl:import href="docbook.xsl"/>
-
-<!-- chunk-common.xsl contains all the named templates for chunking.
-     In a customization file, you import chunk-common.xsl, then
-     add any customized chunking templates of the same name. 
-     They will have import precedence over the original 
-     chunking templates in chunk-common.xsl. -->
-<xsl:import href="chunk-common.xsl"/>
-
-<!-- The manifest.xsl module is no longer imported because its
-     templates were moved into chunk-common and chunk-code -->
-
-<!-- chunk-code.xsl contains all the chunking templates that use
-     a match attribute.  In a customization it should be referenced
-     using <xsl:include> instead of <xsl:import>, and then add
-     any customized chunking templates with match attributes. But be sure
-     to add a priority="1" to such customized templates to resolve
-     its conflict with the original, since they have the
-     same import precedence.
-     
-     Using xsl:include prevents adding another layer
-     of import precedence, which would cause any
-     customizations that use xsl:apply-imports to wrongly
-     apply the chunking version instead of the original
-     non-chunking version to format an element.  -->
-<xsl:include href="profile-chunk-code.xsl"/>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/profile-docbook.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/profile-docbook.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,409 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<!--This file was created automatically by xsl2profile-->
-<!--from the DocBook XSL stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:ng="http://docbook.org/docbook-ng" xmlns:db="http://docbook.org/ns/docbook" xmlns:exsl="http://exslt.org/common" xmlns:exslt="http://exslt.org/common" xmlns="http://www.w3.org/1999/xhtml" exslt:dummy="dummy" ng:dummy="dummy" db:dummy="dummy" extension-element-prefixes="exslt" exclude-result-prefixes="db ng exsl exslt" version="1.0">
-
-<xsl:output method="xml" encoding="UTF-8" indent="no" doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:include href="../VERSION"/>
-<xsl:include href="param.xsl"/>
-<xsl:include href="../lib/lib.xsl"/>
-<xsl:include href="../common/l10n.xsl"/>
-<xsl:include href="../common/common.xsl"/>
-<xsl:include href="../common/utility.xsl"/>
-<xsl:include href="../common/labels.xsl"/>
-<xsl:include href="../common/titles.xsl"/>
-<xsl:include href="../common/subtitles.xsl"/>
-<xsl:include href="../common/gentext.xsl"/>
-<xsl:include href="../common/targets.xsl"/>
-<xsl:include href="../common/olink.xsl"/>
-<xsl:include href="../common/pi.xsl"/>
-<xsl:include href="autotoc.xsl"/>
-<xsl:include href="autoidx.xsl"/>
-<xsl:include href="lists.xsl"/>
-<xsl:include href="callout.xsl"/>
-<xsl:include href="verbatim.xsl"/>
-<xsl:include href="graphics.xsl"/>
-<xsl:include href="xref.xsl"/>
-<xsl:include href="formal.xsl"/>
-<xsl:include href="table.xsl"/>
-<xsl:include href="htmltbl.xsl"/>
-<xsl:include href="sections.xsl"/>
-<xsl:include href="inline.xsl"/>
-<xsl:include href="footnote.xsl"/>
-<xsl:include href="html.xsl"/>
-<xsl:include href="info.xsl"/>
-<xsl:include href="keywords.xsl"/>
-<xsl:include href="division.xsl"/>
-<xsl:include href="toc.xsl"/>
-<xsl:include href="index.xsl"/>
-<xsl:include href="refentry.xsl"/>
-<xsl:include href="math.xsl"/>
-<xsl:include href="admon.xsl"/>
-<xsl:include href="component.xsl"/>
-<xsl:include href="biblio.xsl"/>
-<xsl:include href="biblio-iso690.xsl"/>
-<xsl:include href="glossary.xsl"/>
-<xsl:include href="block.xsl"/>
-<xsl:include href="task.xsl"/>
-<xsl:include href="qandaset.xsl"/>
-<xsl:include href="synop.xsl"/>
-<xsl:include href="titlepage.xsl"/>
-<xsl:include href="titlepage.templates.xsl"/>
-<xsl:include href="pi.xsl"/>
-<xsl:include href="ebnf.xsl"/>
-<xsl:include href="chunker.xsl"/>
-<xsl:include href="html-rtf.xsl"/>
-<xsl:include href="annotations.xsl"/>
-<xsl:include href="../common/stripns.xsl"/>
-
-<xsl:param name="stylesheet.result.type" select="'xhtml'"/>
-<xsl:param name="htmlhelp.output" select="0"/>
-
-<!-- ==================================================================== -->
-
-<xsl:key name="id" match="*" use="@id|@xml:id"/>
-<xsl:key name="gid" match="*" use="generate-id()"/>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="*">
-  <xsl:message>
-    <xsl:text>Element </xsl:text>
-    <xsl:value-of select="local-name(.)"/>
-    <xsl:text> in namespace '</xsl:text>
-    <xsl:value-of select="namespace-uri(.)"/>
-    <xsl:text>' encountered</xsl:text>
-    <xsl:if test="parent::*">
-      <xsl:text> in </xsl:text>
-      <xsl:value-of select="name(parent::*)"/>
-    </xsl:if>
-    <xsl:text>, but no template matches.</xsl:text>
-  </xsl:message>
-
-  <span style="color: red">
-    <xsl:text>&lt;</xsl:text>
-    <xsl:value-of select="name(.)"/>
-    <xsl:text>&gt;</xsl:text>
-    <xsl:apply-templates/>
-    <xsl:text>&lt;/</xsl:text>
-    <xsl:value-of select="name(.)"/>
-    <xsl:text>&gt;</xsl:text>
-  </span>
-</xsl:template>
-
-<xsl:template match="text()">
-  <xsl:value-of select="."/>
-</xsl:template>
-
-<xsl:template name="body.attributes">
-<!-- no apply-templates; make it empty -->
-</xsl:template>
-
-<xsl:template name="head.content">
-  <xsl:param name="node" select="."/>
-  <xsl:param name="title">
-    <xsl:apply-templates select="$node" mode="object.title.markup.textonly"/>
-  </xsl:param>
-
-  <title>
-    <xsl:copy-of select="$title"/>
-  </title>
-
-  <xsl:if test="$html.stylesheet != ''">
-    <xsl:call-template name="output.html.stylesheets">
-      <xsl:with-param name="stylesheets" select="normalize-space($html.stylesheet)"/>
-    </xsl:call-template>
-  </xsl:if>
-
-  <xsl:if test="$link.mailto.url != ''">
-    <link rev="made" href="{$link.mailto.url}"/>
-  </xsl:if>
-
-  <xsl:if test="$html.base != ''">
-    <base href="{$html.base}"/>
-  </xsl:if>
-
-  <meta name="generator" content="DocBook {$DistroTitle} V{$VERSION}"/>
-
-  <xsl:if test="$generate.meta.abstract != 0">
-    <xsl:variable name="info" select="(articleinfo                                       |bookinfo                                       |prefaceinfo                                       |chapterinfo                                       |appendixinfo                                       |sectioninfo                                       |sect1info                                       |sect2info                                       |sect3info                                       |sect4info                                       |sect5info                                       |referenceinfo                                       |refentryinfo                                       |partinfo                                       |info                                       |docinfo)[1]"/>
-    <xsl:if test="$info and $info/abstract">
-      <meta name="description">
-        <xsl:attribute name="content">
-          <xsl:for-each select="$info/abstract[1]/*">
-            <xsl:value-of select="normalize-space(.)"/>
-            <xsl:if test="position() &lt; last()">
-              <xsl:text> </xsl:text>
-            </xsl:if>
-          </xsl:for-each>
-        </xsl:attribute>
-      </meta>
-    </xsl:if>
-  </xsl:if>
-
-  <xsl:if test="($draft.mode = 'yes' or                 ($draft.mode = 'maybe' and                 ancestor-or-self::*[@status][1]/@status = 'draft'))                 and $draft.watermark.image != ''">
-    <style type="text/css"><xsl:text>
-body { background-image: url('</xsl:text>
-<xsl:value-of select="$draft.watermark.image"/><xsl:text>');
-       background-repeat: no-repeat;
-       background-position: top left;
-       /* The following properties make the watermark "fixed" on the page. */
-       /* I think that's just a bit too distracting for the reader... */
-       /* background-attachment: fixed; */
-       /* background-position: center center; */
-     }</xsl:text>
-    </style>
-  </xsl:if>
-  <xsl:apply-templates select="." mode="head.keywords.content"/>
-</xsl:template>
-
-<xsl:template name="output.html.stylesheets">
-  <xsl:param name="stylesheets" select="''"/>
-
-  <xsl:choose>
-    <xsl:when test="contains($stylesheets, ' ')">
-      <link rel="stylesheet" href="{substring-before($stylesheets, ' ')}">
-        <xsl:if test="$html.stylesheet.type != ''">
-          <xsl:attribute name="type">
-            <xsl:value-of select="$html.stylesheet.type"/>
-          </xsl:attribute>
-        </xsl:if>
-      </link>
-      <xsl:call-template name="output.html.stylesheets">
-        <xsl:with-param name="stylesheets" select="substring-after($stylesheets, ' ')"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="$stylesheets != ''">
-      <link rel="stylesheet" href="{$stylesheets}">
-        <xsl:if test="$html.stylesheet.type != ''">
-          <xsl:attribute name="type">
-            <xsl:value-of select="$html.stylesheet.type"/>
-          </xsl:attribute>
-        </xsl:if>
-      </link>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ============================================================ -->
-
-<xsl:template match="*" mode="head.keywords.content">
-  <xsl:apply-templates select="chapterinfo/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="appendixinfo/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="prefaceinfo/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="bookinfo/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="setinfo/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="articleinfo/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="artheader/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="sect1info/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="sect2info/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="sect3info/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="sect4info/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="sect5info/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="sectioninfo/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="refsect1info/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="refsect2info/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="refsect3info/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="bibliographyinfo/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="glossaryinfo/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="indexinfo/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="refentryinfo/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="partinfo/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="referenceinfo/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="docinfo/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="info/keywordset" mode="html.header"/>
-
-  <xsl:if test="$inherit.keywords != 0                 and parent::*">
-    <xsl:apply-templates select="parent::*" mode="head.keywords.content"/>
-  </xsl:if>
-</xsl:template>
-
-<!-- ============================================================ -->
-
-<xsl:template name="system.head.content">
-  <xsl:param name="node" select="."/>
-
-  <!-- FIXME: When chunking, only the annotations actually used
-              in this chunk should be referenced. I don't think it
-              does any harm to reference them all, but it adds
-              unnecessary bloat to each chunk. -->
-  <xsl:if test="$annotation.support != 0 and //annotation">
-    <xsl:call-template name="add.annotation.links"/>
-    <script type="text/javascript">
-      <xsl:text>
-// Create PopupWindow objects</xsl:text>
-      <xsl:for-each select="//annotation">
-        <xsl:text>
-var popup_</xsl:text>
-        <xsl:value-of select="generate-id(.)"/>
-        <xsl:text> = new PopupWindow("popup-</xsl:text>
-        <xsl:value-of select="generate-id(.)"/>
-        <xsl:text>");
-</xsl:text>
-        <xsl:text>popup_</xsl:text>
-        <xsl:value-of select="generate-id(.)"/>
-        <xsl:text>.offsetY = 15;
-</xsl:text>
-        <xsl:text>popup_</xsl:text>
-        <xsl:value-of select="generate-id(.)"/>
-        <xsl:text>.autoHide();
-</xsl:text>
-      </xsl:for-each>
-    </script>
-
-    <style type="text/css">
-      <xsl:value-of select="$annotation.css"/>
-    </style>
-  </xsl:if>
-
-  <!-- system.head.content is like user.head.content, except that
-       it is called before head.content. This is important because it
-       means, for example, that <style> elements output by system.head.content
-       have a lower CSS precedence than the users stylesheet. -->
-</xsl:template>
-
-<!-- ============================================================ -->
-
-<xsl:template name="user.preroot">
-  <!-- Pre-root output, can be used to output comments and PIs. -->
-  <!-- This must not output any element content! -->
-</xsl:template>
-
-<xsl:template name="user.head.content">
-  <xsl:param name="node" select="."/>
-</xsl:template>
-
-<xsl:template name="user.header.navigation">
-  <xsl:param name="node" select="."/>
-</xsl:template>
-
-<xsl:template name="user.header.content">
-  <xsl:param name="node" select="."/>
-</xsl:template>
-
-<xsl:template name="user.footer.content">
-  <xsl:param name="node" select="."/>
-</xsl:template>
-
-<xsl:template name="user.footer.navigation">
-  <xsl:param name="node" select="."/>
-</xsl:template>
-
-<xslo:include xmlns:xslo="http://www.w3.org/1999/XSL/Transform" href="../profiling/profile-mode.xsl"/><xslo:variable xmlns:xslo="http://www.w3.org/1999/XSL/Transform" name="profiled-content"><xslo:choose><xslo:when test="*/self::ng:* or */self::db:*"><xslo:message>Note: namesp. cut : stripped namespace before processing</xslo:message><xslo:variable name="stripped-content"><xslo:apply-templates select="/" mode="stripNS"/></xslo:variable><xslo:message>Note: namesp. cut : processing stripped document</xslo:message><xslo:apply-templates select="exslt:node-set($stripped-content)" mode="profile"/></xslo:when><xslo:otherwise><xslo:apply-templates select="/" mode="profile"/></xslo:otherwise></xslo:choose></xslo:variable><xslo:variable xmlns:xslo="http://www.w3.org/1999/XSL/Transform" name="profiled-nodes" select="exslt:node-set($profiled-content)"/><xsl:template match="/">
-  <!-- * Get a title for current doc so that we let the user -->
-  <!-- * know what document we are processing at this point. -->
-  <xsl:variable name="doc.title">
-    <xsl:call-template name="get.doc.title"/>
-  </xsl:variable>
-  <xsl:choose>
-    <!-- Hack! If someone hands us a DocBook V5.x or DocBook NG document,
-         toss the namespace and continue.  Use the docbook5 namespaced
-         stylesheets for DocBook5 if you don't want to use this feature.-->
-    <!-- include extra test for Xalan quirk -->
-    <xsl:when test="false()"/>
-    <!-- Can't process unless namespace removed -->
-    <xsl:when test="false()"/>
-    <xsl:otherwise>
-      <xsl:choose>
-        <xsl:when test="$rootid != ''">
-          <xsl:choose>
-            <xsl:when test="count($profiled-nodes//*[@id=$rootid]) = 0">
-              <xsl:message terminate="yes">
-                <xsl:text>ID '</xsl:text>
-                <xsl:value-of select="$rootid"/>
-                <xsl:text>' not found in document.</xsl:text>
-              </xsl:message>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:if test="$collect.xref.targets = 'yes' or                             $collect.xref.targets = 'only'">
-                <xsl:apply-templates select="key('id', $rootid)" mode="collect.targets"/>
-              </xsl:if>
-              <xsl:if test="$collect.xref.targets != 'only'">
-                <xsl:apply-templates select="$profiled-nodes//*[@id=$rootid]" mode="process.root"/>
-                <xsl:if test="$tex.math.in.alt != ''">
-                  <xsl:apply-templates select="$profiled-nodes//*[@id=$rootid]" mode="collect.tex.math"/>
-                </xsl:if>
-              </xsl:if>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:if test="$collect.xref.targets = 'yes' or                         $collect.xref.targets = 'only'">
-            <xsl:apply-templates select="$profiled-nodes" mode="collect.targets"/>
-          </xsl:if>
-          <xsl:if test="$collect.xref.targets != 'only'">
-            <xsl:apply-templates select="$profiled-nodes" mode="process.root"/>
-            <xsl:if test="$tex.math.in.alt != ''">
-              <xsl:apply-templates select="$profiled-nodes" mode="collect.tex.math"/>
-            </xsl:if>
-          </xsl:if>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="*" mode="process.root">
-  <xsl:variable name="doc" select="self::*"/>
-
-  <xsl:call-template name="user.preroot"/>
-  <xsl:call-template name="root.messages"/>
-
-  <html>
-    <head>
-      <xsl:call-template name="system.head.content">
-        <xsl:with-param name="node" select="$doc"/>
-      </xsl:call-template>
-      <xsl:call-template name="head.content">
-        <xsl:with-param name="node" select="$doc"/>
-      </xsl:call-template>
-      <xsl:call-template name="user.head.content">
-        <xsl:with-param name="node" select="$doc"/>
-      </xsl:call-template>
-    </head>
-    <body>
-      <xsl:call-template name="body.attributes"/>
-      <xsl:call-template name="user.header.content">
-        <xsl:with-param name="node" select="$doc"/>
-      </xsl:call-template>
-      <xsl:apply-templates select="."/>
-      <xsl:call-template name="user.footer.content">
-        <xsl:with-param name="node" select="$doc"/>
-      </xsl:call-template>
-    </body>
-  </html>
-  <xsl:value-of select="$html.append"/>
-</xsl:template>
-
-<xsl:template name="root.messages">
-  <!-- redefine this any way you'd like to output messages -->
-  <!-- DO NOT OUTPUT ANYTHING FROM THIS TEMPLATE -->
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="chunk">
-  <xsl:param name="node" select="."/>
-
-  <!-- The default is that we are not chunking... -->
-  <xsl:text>0</xsl:text>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/profile-onechunk.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/profile-onechunk.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,36 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" xmlns="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="doc">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:import href="profile-chunk.xsl"/>
-
-<!-- Ok, using the onechunk parameter makes this all work again. -->
-<!-- It does have the disadvantage that it only works for documents that have -->
-<!-- a root element that is considered a chunk by the chunk.xsl stylesheet. -->
-<!-- Ideally, onechunk would let anything be a chunk. But not today. -->
-
-<xsl:param name="onechunk" select="1"/>
-<xsl:param name="suppress.navigation">1</xsl:param>
-
-<xsl:template name="href.target.uri">
-  <xsl:param name="object" select="."/>
-  <xsl:text>#</xsl:text>
-  <xsl:call-template name="object.id">
-    <xsl:with-param name="object" select="$object"/>
-  </xsl:call-template>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/qandaset.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/qandaset.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,371 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" xmlns="http://www.w3.org/1999/xhtml" exclude-result-prefixes="doc" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:template match="qandaset">
-  <xsl:variable name="title" select="(blockinfo/title|info/title|title)[1]"/>
-  <xsl:variable name="preamble" select="*[local-name(.) != 'title'                                           and local-name(.) != 'titleabbrev'                                           and local-name(.) != 'qandadiv'                                           and local-name(.) != 'qandaentry']"/>
-  <xsl:variable name="toc">
-    <xsl:call-template name="pi.dbhtml_toc"/>
-  </xsl:variable>
-
-  <xsl:variable name="toc.params">
-    <xsl:call-template name="find.path.params">
-      <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates select="$title"/>
-    <xsl:if test="((contains($toc.params, 'toc') and $toc != '0') or $toc = '1')                   and not(ancestor::answer and not($qanda.nested.in.toc=0))">
-      <xsl:call-template name="process.qanda.toc"/>
-    </xsl:if>
-    <xsl:apply-templates select="$preamble"/>
-    <xsl:call-template name="process.qandaset"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="qandaset/blockinfo/title|                      qandaset/info/title|                      qandaset/title">
-  <xsl:variable name="qalevel">
-    <xsl:call-template name="qanda.section.level"/>
-  </xsl:variable>
-  <xsl:element name="h{string(number($qalevel)+1)}" namespace="http://www.w3.org/1999/xhtml">
-    <xsl:attribute name="class">
-      <xsl:value-of select="local-name(.)"/>
-    </xsl:attribute>
-    <xsl:call-template name="anchor">
-      <xsl:with-param name="node" select=".."/>
-      <xsl:with-param name="conditional" select="0"/>
-    </xsl:call-template>
-    <xsl:apply-templates/>
-  </xsl:element>
-</xsl:template>
-
-<xsl:template match="qandaset/blockinfo|qandaset/info">
-  <!-- what should this template really do? -->
-  <xsl:apply-templates select="legalnotice" mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="qandadiv">
-  <xsl:variable name="preamble" select="*[local-name(.) != 'title'                                           and local-name(.) != 'titleabbrev'                                           and local-name(.) != 'qandadiv'                                           and local-name(.) != 'qandaentry']"/>
-
-  <xsl:if test="blockinfo/title|info/title|title">
-    <tr class="qandadiv">
-      <td align="left" valign="top" colspan="2">
-        <xsl:apply-templates select="(blockinfo/title|info/title|title)[1]"/>
-      </td>
-    </tr>
-  </xsl:if>
-
-  <xsl:variable name="toc">
-    <xsl:call-template name="pi.dbhtml_toc"/>
-  </xsl:variable>
-
-  <xsl:variable name="toc.params">
-    <xsl:call-template name="find.path.params">
-      <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:if test="(contains($toc.params, 'toc') and $toc != '0') or $toc = '1'">
-    <tr class="toc">
-      <td align="left" valign="top" colspan="2">
-        <xsl:call-template name="process.qanda.toc"/>
-      </td>
-    </tr>
-  </xsl:if>
-  <xsl:if test="$preamble">
-    <tr class="toc">
-      <td align="left" valign="top" colspan="2">
-        <xsl:apply-templates select="$preamble"/>
-      </td>
-    </tr>
-  </xsl:if>
-  <xsl:apply-templates select="qandadiv|qandaentry"/>
-</xsl:template>
-
-<xsl:template match="qandadiv/blockinfo/title|                      qandadiv/info/title|                      qandadiv/title">
-  <xsl:variable name="qalevel">
-    <xsl:call-template name="qandadiv.section.level"/>
-  </xsl:variable>
-
-  <xsl:element name="h{string(number($qalevel)+1)}" namespace="http://www.w3.org/1999/xhtml">
-    <xsl:attribute name="class">
-      <xsl:value-of select="local-name(.)"/>
-    </xsl:attribute>
-    <xsl:call-template name="anchor">
-      <xsl:with-param name="node" select=".."/>
-      <xsl:with-param name="conditional" select="0"/>
-    </xsl:call-template>
-    <xsl:apply-templates select="parent::qandadiv" mode="label.markup"/>
-    <xsl:if test="$qandadiv.autolabel != 0">
-      <xsl:apply-templates select="." mode="intralabel.punctuation"/>
-      <xsl:text> </xsl:text>
-    </xsl:if>
-    <xsl:apply-templates/>
-  </xsl:element>
-</xsl:template>
-
-<xsl:template match="qandaentry">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="question">
-  <xsl:variable name="deflabel">
-    <xsl:choose>
-      <xsl:when test="ancestor-or-self::*[@defaultlabel]">
-        <xsl:value-of select="(ancestor-or-self::*[@defaultlabel])[last()]                               /@defaultlabel"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$qanda.defaultlabel"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <tr>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <td align="left" valign="top">
-      <xsl:call-template name="anchor">
-        <xsl:with-param name="node" select=".."/>
-        <xsl:with-param name="conditional" select="0"/>
-      </xsl:call-template>
-      <xsl:call-template name="anchor">
-        <xsl:with-param name="conditional" select="0"/>
-      </xsl:call-template>
-
-      <xsl:variable name="label.content">
-        <xsl:apply-templates select="." mode="label.markup"/>
-        <xsl:if test="$deflabel = 'number' and not(label)">
-          <xsl:apply-templates select="." mode="intralabel.punctuation"/>
-        </xsl:if>
-      </xsl:variable>
-
-      <xsl:if test="string-length($label.content) &gt; 0">
-        <p><b>
-          <xsl:copy-of select="$label.content"/>
-        </b></p>
-      </xsl:if>
-    </td>
-    <td align="left" valign="top">
-      <xsl:choose>
-        <xsl:when test="$deflabel = 'none' and not(label)">
-          <b><xsl:apply-templates select="*[local-name(.) != 'label']"/></b>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates select="*[local-name(.) != 'label']"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </td>
-  </tr>
-</xsl:template>
-
-<xsl:template match="answer">
-  <xsl:variable name="deflabel">
-    <xsl:choose>
-      <xsl:when test="ancestor-or-self::*[@defaultlabel]">
-        <xsl:value-of select="(ancestor-or-self::*[@defaultlabel])[last()]                               /@defaultlabel"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$qanda.defaultlabel"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <tr class="{local-name(.)}">
-    <td align="left" valign="top">
-      <xsl:call-template name="anchor"/>
-      <xsl:variable name="answer.label">
-        <xsl:apply-templates select="." mode="label.markup"/>
-      </xsl:variable>
-      <xsl:if test="string-length($answer.label) &gt; 0">
-        <p><b>
-          <xsl:copy-of select="$answer.label"/>
-        </b></p>
-      </xsl:if>
-    </td>
-    <td align="left" valign="top">
-      <xsl:apply-templates select="*[local-name(.) != 'label'         and local-name(.) != 'qandaentry']"/>
-      <!-- * handle nested answer/qandaentry instances -->
-      <!-- * (bug 1509043 from Daniel Leidert) -->
-      <xsl:if test="descendant::question">
-        <xsl:call-template name="process.qandaset"/>
-      </xsl:if>
-    </td>
-  </tr>
-</xsl:template>
-
-<xsl:template match="label">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="process.qanda.toc">
-  <!-- * if user wants nested qandaset and qandaentry in main Qandaset TOC, -->
-  <!-- * then don't also include the nested stuff in the sub TOCs -->
-  <dl>
-    <xsl:apply-templates select="qandadiv" mode="qandatoc.mode"/>
-    <xsl:apply-templates select="qandaset|qandaentry" mode="qandatoc.mode"/>
-  </dl>
-</xsl:template>
-
-<xsl:template match="qandadiv" mode="qandatoc.mode">
-  <dt><xsl:apply-templates select="title" mode="qandatoc.mode"/></dt>
-  <dd><xsl:call-template name="process.qanda.toc"/></dd>
-</xsl:template>
-
-<xsl:template match="qandadiv/blockinfo/title|                      qandadiv/info/title|                      qandadiv/title" mode="qandatoc.mode">
-  <xsl:variable name="qalevel">
-    <xsl:call-template name="qandadiv.section.level"/>
-  </xsl:variable>
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="parent::*"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:apply-templates select="parent::qandadiv" mode="label.markup"/>
-  <xsl:value-of select="$autotoc.label.separator"/>
-  <xsl:text> </xsl:text>
-  <a>
-    <xsl:attribute name="href">
-      <xsl:call-template name="href.target">
-        <xsl:with-param name="object" select="parent::*"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:apply-templates/>
-  </a>
-</xsl:template>
-
-<xsl:template match="qandaset" mode="qandatoc.mode">
-  <xsl:for-each select="qandaentry">
-    <xsl:apply-templates select="." mode="qandatoc.mode"/>
-  </xsl:for-each>
-</xsl:template>
-
-<xsl:template match="qandaentry" mode="qandatoc.mode">
-  <xsl:apply-templates select="question" mode="qandatoc.mode"/>
-</xsl:template>
-
-<xsl:template match="question" mode="qandatoc.mode">
-  <xsl:variable name="firstch">
-    <xsl:apply-templates select="(*[local-name(.)!='label'])[1]"/>
-  </xsl:variable>
-  <xsl:variable name="deflabel">
-    <xsl:choose>
-      <xsl:when test="ancestor-or-self::*[@defaultlabel]">
-        <xsl:value-of select="(ancestor-or-self::*[@defaultlabel])[last()]                               /@defaultlabel"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$qanda.defaultlabel"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <dt>
-    <xsl:apply-templates select="." mode="label.markup"/>
-    <xsl:if test="$deflabel = 'number' and not(label)">
-      <xsl:apply-templates select="." mode="intralabel.punctuation"/>
-    </xsl:if>
-    <xsl:text> </xsl:text>
-    <a>
-      <xsl:attribute name="href">
-        <xsl:call-template name="href.target">
-          <xsl:with-param name="object" select=".."/>
-        </xsl:call-template>
-      </xsl:attribute>
-      <xsl:value-of select="$firstch"/>
-    </a>
-  </dt>
-  <!-- * include nested qandaset/qandaentry in TOC if user wants it -->
-  <xsl:if test="not($qanda.nested.in.toc = 0)">
-    <xsl:apply-templates select="following-sibling::answer" mode="qandatoc.mode"/>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="answer" mode="qandatoc.mode">
-  <xsl:if test="descendant::question">
-    <dd>
-      <xsl:call-template name="process.qanda.toc"/>
-    </dd>
-  </xsl:if>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="process.qandaset">
-
-  <xsl:variable name="label-width">
-    <xsl:call-template name="pi.dbhtml_label-width"/>
-  </xsl:variable>
-
-  <xsl:variable name="table-summary">
-    <xsl:call-template name="pi.dbhtml_table-summary"/>
-  </xsl:variable>
-
-  <xsl:variable name="cellpadding">
-    <xsl:call-template name="pi.dbhtml_cellpadding"/>
-  </xsl:variable>
-
-  <xsl:variable name="cellspacing">
-    <xsl:call-template name="pi.dbhtml_cellspacing"/>
-  </xsl:variable>
-
-  <table border="0" summary="Q and A Set">
-    <xsl:if test="$table-summary != ''">
-      <xsl:attribute name="summary">
-        <xsl:value-of select="$table-summary"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <xsl:if test="$cellpadding != ''">
-      <xsl:attribute name="cellpadding">
-        <xsl:value-of select="$cellpadding"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <xsl:if test="$cellspacing != ''">
-      <xsl:attribute name="cellspacing">
-        <xsl:value-of select="$cellspacing"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <col align="left">
-      <xsl:attribute name="width">
-        <xsl:choose>
-          <xsl:when test="$label-width != ''">
-            <xsl:value-of select="$label-width"/>
-          </xsl:when>
-          <xsl:otherwise>1%</xsl:otherwise>
-        </xsl:choose>
-      </xsl:attribute>
-    </col>
-    <tbody>
-      <xsl:apply-templates select="qandaentry|qandadiv"/>
-    </tbody>
-  </table>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="*" mode="no.wrapper.mode">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/refentry.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/refentry.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,309 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:template match="reference">
-  <xsl:call-template name="id.warning"/>
-
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="dir">
-      <xsl:with-param name="inherit" select="1"/>
-    </xsl:call-template>
-    <xsl:call-template name="language.attribute"/>
-    <xsl:if test="$generate.id.attributes != 0">
-      <xsl:attribute name="id">
-        <xsl:call-template name="object.id"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <xsl:call-template name="reference.titlepage"/>
-
-    <xsl:variable name="toc.params">
-      <xsl:call-template name="find.path.params">
-        <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <xsl:if test="not(partintro) and contains($toc.params, 'toc')">
-      <xsl:call-template name="division.toc"/>
-    </xsl:if>
-    <xsl:apply-templates/>
-  </div>
-</xsl:template>
-
-<xsl:template match="reference" mode="division.number">
-  <xsl:number from="book" count="reference" format="I."/>
-</xsl:template>
-
-<xsl:template match="reference/docinfo"/>
-<xsl:template match="reference/referenceinfo"/>
-<xsl:template match="reference/title"/>
-<xsl:template match="reference/subtitle"/>
-<xsl:template match="reference/titleabbrev"/>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="refentry.title">
-  <xsl:param name="node" select="."/>
-  <xsl:variable name="refmeta" select="$node//refmeta"/>
-  <xsl:variable name="refentrytitle" select="$refmeta//refentrytitle"/>
-  <xsl:variable name="refnamediv" select="$node//refnamediv"/>
-  <xsl:variable name="refname" select="$refnamediv//refname"/>
-  <xsl:variable name="refdesc" select="$refnamediv//refdescriptor"/>
-  <xsl:variable name="title">
-    <xsl:choose>
-      <xsl:when test="$refentrytitle">
-        <xsl:apply-templates select="$refentrytitle[1]" mode="title"/>
-      </xsl:when>
-      <xsl:when test="$refdesc">
-	<xsl:apply-templates select="$refdesc[1]" mode="title"/>
-      </xsl:when>
-      <xsl:when test="$refname">
-        <xsl:apply-templates select="$refname[1]" mode="title"/>
-      </xsl:when>
-      <xsl:otherwise/>
-    </xsl:choose>
-  </xsl:variable>
-
-  <h1 class="title">
-    <xsl:copy-of select="$title"/>
-  </h1>
-</xsl:template>
-
-<xsl:template match="refentry">
-  <xsl:call-template name="id.warning"/>
-
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="dir">
-      <xsl:with-param name="inherit" select="1"/>
-    </xsl:call-template>
-    <xsl:call-template name="language.attribute"/>
-    <xsl:if test="$refentry.separator != 0 and preceding-sibling::refentry">
-      <div class="refentry.separator">
-        <hr/>
-      </div>
-    </xsl:if>
-    <xsl:call-template name="anchor">
-      <xsl:with-param name="conditional" select="0"/>
-    </xsl:call-template>
-    <xsl:call-template name="refentry.titlepage"/>
-    <xsl:apply-templates/>
-    <xsl:call-template name="process.footnotes"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="refentry/docinfo|refentry/refentryinfo"/>
-<xsl:template match="refentry/info"/>
-
-<xsl:template match="refentrytitle|refname|refdescriptor" mode="title">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="refmeta">
-</xsl:template>
-
-<xsl:template match="manvolnum">
-  <xsl:if test="$refentry.xref.manvolnum != 0">
-    <xsl:text>(</xsl:text>
-    <xsl:apply-templates/>
-    <xsl:text>)</xsl:text>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="refmiscinfo">
-</xsl:template>
-
-<xsl:template match="refentrytitle">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="refnamediv">
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="dir">
-      <xsl:with-param name="inherit" select="1"/>
-    </xsl:call-template>
-    <xsl:call-template name="anchor"/>
-
-    <xsl:choose>
-      <xsl:when test="preceding-sibling::refnamediv">
-	<!-- no title on secondary refnamedivs! -->
-      </xsl:when>
-      <xsl:when test="$refentry.generate.name != 0">
-        <h2>
-          <xsl:call-template name="gentext">
-            <xsl:with-param name="key" select="'RefName'"/>
-          </xsl:call-template>
-        </h2>
-      </xsl:when>
-      <xsl:when test="$refentry.generate.title != 0">
-        <h2>
-          <xsl:choose>
-            <xsl:when test="../refmeta/refentrytitle">
-              <xsl:apply-templates select="../refmeta/refentrytitle"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:apply-templates select="refname[1]"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </h2>
-      </xsl:when>
-    </xsl:choose>
-
-    <p>
-      <xsl:apply-templates/>
-    </p>
-  </div>
-</xsl:template>
-
-<xsl:template match="refname">
-  <xsl:if test="not(preceding-sibling::refdescriptor)">
-    <xsl:apply-templates/>
-    <xsl:if test="following-sibling::refname">
-      <xsl:text>, </xsl:text>
-    </xsl:if>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="refpurpose">
-  <xsl:if test="node()">
-    <xsl:text> </xsl:text>
-    <xsl:call-template name="dingbat">
-      <xsl:with-param name="dingbat">em-dash</xsl:with-param>
-    </xsl:call-template>
-    <xsl:text> </xsl:text>
-    <xsl:apply-templates/>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="refdescriptor">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="refclass">
-  <xsl:if test="$refclass.suppress = 0">
-  <p>
-    <b>
-      <xsl:if test="@role">
-        <xsl:value-of select="@role"/>
-        <xsl:text>: </xsl:text>
-      </xsl:if>
-      <xsl:apply-templates/>
-    </b>
-  </p>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="refsynopsisdiv">
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="dir">
-      <xsl:with-param name="inherit" select="1"/>
-    </xsl:call-template>
-    <xsl:call-template name="anchor"/>
-    <h2>
-      <xsl:choose>
-        <xsl:when test="refsynopsisdiv/title|title">
-          <xsl:apply-templates select="(refsynopsisdiv/title|title)[1]" mode="titlepage.mode"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="gentext">
-            <xsl:with-param name="key" select="'RefSynopsisDiv'"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </h2>
-    <xsl:apply-templates/>
-  </div>
-</xsl:template>
-
-<xsl:template match="refsynopsisdivinfo"/>
-
-<xsl:template match="refsynopsisdiv/title">
-</xsl:template>
-
-<xsl:template match="refsynopsisdiv/title" mode="titlepage.mode">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="refsection|refsect1|refsect2|refsect3">
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="dir">
-      <xsl:with-param name="inherit" select="1"/>
-    </xsl:call-template>
-    <xsl:call-template name="language.attribute"/>
-    <xsl:call-template name="anchor">
-      <xsl:with-param name="conditional" select="0"/>
-    </xsl:call-template>
-    <!-- pick up info title -->
-    <xsl:apply-templates select="(title|info/title)[1]"/>
-    <xsl:apply-templates select="node()[not(self::title) and not(self::info)]"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="refsection/title|refsection/info/title">
-  <!-- the ID is output in the block.object call for refsect1 -->
-  <xsl:variable name="level" select="count(ancestor-or-self::refsection)"/>
-  <xsl:variable name="refsynopsisdiv">
-    <xsl:text>0</xsl:text>
-    <xsl:if test="ancestor::refsynopsisdiv">1</xsl:if>
-  </xsl:variable>
-  <xsl:variable name="hlevel">
-    <xsl:choose>
-      <xsl:when test="$level+$refsynopsisdiv &gt; 5">6</xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$level+1+$refsynopsisdiv"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-  <xsl:element name="h{$hlevel}" namespace="http://www.w3.org/1999/xhtml">
-    <xsl:apply-templates/>
-  </xsl:element>
-</xsl:template>
-
-<xsl:template match="refsect1/title|refsect1/info/title">
-  <!-- the ID is output in the block.object call for refsect1 -->
-  <h2>
-    <xsl:apply-templates/>
-  </h2>
-</xsl:template>
-
-<xsl:template match="refsect2/title|refsect2/info/title">
-  <!-- the ID is output in the block.object call for refsect2 -->
-  <h3>
-    <xsl:apply-templates/>
-  </h3>
-</xsl:template>
-
-<xsl:template match="refsect3/title|refsect3/info/title">
-  <!-- the ID is output in the block.object call for refsect3 -->
-  <h4>
-    <xsl:apply-templates/>
-  </h4>
-</xsl:template>
-
-<xsl:template match="refsectioninfo|refsection/info"/>
-<xsl:template match="refsect1info|refsect1/info"/>
-<xsl:template match="refsect2info|refsect2/info"/>
-<xsl:template match="refsect3info|refsect3/info"/>
-
-
-<!-- ==================================================================== -->
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/sections.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/sections.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,548 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:template match="section">
-  <xsl:variable name="depth" select="count(ancestor::section)+1"/>
-
-  <xsl:call-template name="id.warning"/>
-
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="dir">
-      <xsl:with-param name="inherit" select="1"/>
-    </xsl:call-template>
-    <xsl:call-template name="language.attribute"/>
-    <xsl:call-template name="section.titlepage"/>
-
-    <xsl:variable name="toc.params">
-      <xsl:call-template name="find.path.params">
-        <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <xsl:if test="contains($toc.params, 'toc')                   and $depth &lt;= $generate.section.toc.level">
-      <xsl:call-template name="section.toc">
-        <xsl:with-param name="toc.title.p" select="contains($toc.params, 'title')"/>
-      </xsl:call-template>
-      <xsl:call-template name="section.toc.separator"/>
-    </xsl:if>
-    <xsl:apply-templates/>
-    <xsl:call-template name="process.chunk.footnotes"/>
-  </div>
-</xsl:template>
-
-<xsl:template name="section.title">
-  <!-- the context node should be the title of a section when called -->
-  <xsl:variable name="section" select="(ancestor::section                                         |ancestor::simplesect                                         |ancestor::sect1                                         |ancestor::sect2                                         |ancestor::sect3                                         |ancestor::sect4                                         |ancestor::sect5)[last()]"/>
-
-  <xsl:variable name="renderas">
-    <xsl:choose>
-      <xsl:when test="$section/@renderas = 'sect1'">1</xsl:when>
-      <xsl:when test="$section/@renderas = 'sect2'">2</xsl:when>
-      <xsl:when test="$section/@renderas = 'sect3'">3</xsl:when>
-      <xsl:when test="$section/@renderas = 'sect4'">4</xsl:when>
-      <xsl:when test="$section/@renderas = 'sect5'">5</xsl:when>
-      <xsl:otherwise><xsl:value-of select="''"/></xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="level">
-    <xsl:choose>
-      <xsl:when test="$renderas != ''">
-        <xsl:value-of select="$renderas"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="section.level">
-          <xsl:with-param name="node" select="$section"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:call-template name="section.heading">
-    <xsl:with-param name="section" select="$section"/>
-    <xsl:with-param name="level" select="$level"/>
-    <xsl:with-param name="title">
-      <xsl:apply-templates select="$section" mode="object.title.markup">
-        <xsl:with-param name="allow-anchors" select="1"/>
-      </xsl:apply-templates>
-    </xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="section/title                     |section/info/title                     |sectioninfo/title" mode="titlepage.mode" priority="2">
-  <xsl:call-template name="section.title"/>
-</xsl:template>
-
-<xsl:template match="sect1">
-  <xsl:call-template name="id.warning"/>
-
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="dir">
-      <xsl:with-param name="inherit" select="1"/>
-    </xsl:call-template>
-    <xsl:call-template name="language.attribute"/>
-
-    <xsl:choose>
-      <xsl:when test="@renderas = 'sect2'">
-        <xsl:call-template name="sect2.titlepage"/>
-      </xsl:when>
-      <xsl:when test="@renderas = 'sect3'">
-        <xsl:call-template name="sect3.titlepage"/>
-      </xsl:when>
-      <xsl:when test="@renderas = 'sect4'">
-        <xsl:call-template name="sect4.titlepage"/>
-      </xsl:when>
-      <xsl:when test="@renderas = 'sect5'">
-        <xsl:call-template name="sect5.titlepage"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="sect1.titlepage"/>
-      </xsl:otherwise>
-    </xsl:choose>
-
-    <xsl:variable name="toc.params">
-      <xsl:call-template name="find.path.params">
-        <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <xsl:if test="contains($toc.params, 'toc')                   and $generate.section.toc.level &gt;= 1">
-      <xsl:call-template name="section.toc">
-        <xsl:with-param name="toc.title.p" select="contains($toc.params, 'title')"/>
-      </xsl:call-template>
-      <xsl:call-template name="section.toc.separator"/>
-    </xsl:if>
-    <xsl:apply-templates/>
-    <xsl:call-template name="process.chunk.footnotes"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="sect1/title                     |sect1/info/title                     |sect1info/title" mode="titlepage.mode" priority="2">
-  <xsl:call-template name="section.title"/>
-</xsl:template>
-
-<xsl:template match="sect2">
-  <xsl:call-template name="id.warning"/>
-
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="dir">
-      <xsl:with-param name="inherit" select="1"/>
-    </xsl:call-template>
-    <xsl:call-template name="language.attribute"/>
-
-    <xsl:choose>
-      <xsl:when test="@renderas = 'sect1'">
-        <xsl:call-template name="sect1.titlepage"/>
-      </xsl:when>
-      <xsl:when test="@renderas = 'sect3'">
-        <xsl:call-template name="sect3.titlepage"/>
-      </xsl:when>
-      <xsl:when test="@renderas = 'sect4'">
-        <xsl:call-template name="sect4.titlepage"/>
-      </xsl:when>
-      <xsl:when test="@renderas = 'sect5'">
-        <xsl:call-template name="sect5.titlepage"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="sect2.titlepage"/>
-      </xsl:otherwise>
-    </xsl:choose>
-
-    <xsl:variable name="toc.params">
-      <xsl:call-template name="find.path.params">
-        <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <xsl:if test="contains($toc.params, 'toc')                   and $generate.section.toc.level &gt;= 2">
-      <xsl:call-template name="section.toc">
-        <xsl:with-param name="toc.title.p" select="contains($toc.params, 'title')"/>
-      </xsl:call-template>
-      <xsl:call-template name="section.toc.separator"/>
-    </xsl:if>
-    <xsl:apply-templates/>
-    <xsl:call-template name="process.chunk.footnotes"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="sect2/title                     |sect2/info/title                     |sect2info/title" mode="titlepage.mode" priority="2">
-  <xsl:call-template name="section.title"/>
-</xsl:template>
-
-<xsl:template match="sect3">
-  <xsl:call-template name="id.warning"/>
-
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="dir">
-      <xsl:with-param name="inherit" select="1"/>
-    </xsl:call-template>
-    <xsl:call-template name="language.attribute"/>
-
-    <xsl:choose>
-      <xsl:when test="@renderas = 'sect1'">
-        <xsl:call-template name="sect1.titlepage"/>
-      </xsl:when>
-      <xsl:when test="@renderas = 'sect2'">
-        <xsl:call-template name="sect2.titlepage"/>
-      </xsl:when>
-      <xsl:when test="@renderas = 'sect4'">
-        <xsl:call-template name="sect4.titlepage"/>
-      </xsl:when>
-      <xsl:when test="@renderas = 'sect5'">
-        <xsl:call-template name="sect5.titlepage"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="sect3.titlepage"/>
-      </xsl:otherwise>
-    </xsl:choose>
-
-    <xsl:variable name="toc.params">
-      <xsl:call-template name="find.path.params">
-        <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <xsl:if test="contains($toc.params, 'toc')                   and $generate.section.toc.level &gt;= 3">
-      <xsl:call-template name="section.toc">
-        <xsl:with-param name="toc.title.p" select="contains($toc.params, 'title')"/>
-      </xsl:call-template>
-      <xsl:call-template name="section.toc.separator"/>
-    </xsl:if>
-    <xsl:apply-templates/>
-    <xsl:call-template name="process.chunk.footnotes"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="sect3/title                     |sect3/info/title                     |sect3info/title" mode="titlepage.mode" priority="2">
-  <xsl:call-template name="section.title"/>
-</xsl:template>
-
-<xsl:template match="sect4">
-  <xsl:call-template name="id.warning"/>
-
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="dir">
-      <xsl:with-param name="inherit" select="1"/>
-    </xsl:call-template>
-    <xsl:call-template name="language.attribute"/>
-
-    <xsl:choose>
-      <xsl:when test="@renderas = 'sect1'">
-        <xsl:call-template name="sect1.titlepage"/>
-      </xsl:when>
-      <xsl:when test="@renderas = 'sect2'">
-        <xsl:call-template name="sect2.titlepage"/>
-      </xsl:when>
-      <xsl:when test="@renderas = 'sect3'">
-        <xsl:call-template name="sect3.titlepage"/>
-      </xsl:when>
-      <xsl:when test="@renderas = 'sect5'">
-        <xsl:call-template name="sect5.titlepage"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="sect4.titlepage"/>
-      </xsl:otherwise>
-    </xsl:choose>
-
-    <xsl:variable name="toc.params">
-      <xsl:call-template name="find.path.params">
-        <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <xsl:if test="contains($toc.params, 'toc')                   and $generate.section.toc.level &gt;= 4">
-      <xsl:call-template name="section.toc">
-        <xsl:with-param name="toc.title.p" select="contains($toc.params, 'title')"/>
-      </xsl:call-template>
-      <xsl:call-template name="section.toc.separator"/>
-    </xsl:if>
-    <xsl:apply-templates/>
-    <xsl:call-template name="process.chunk.footnotes"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="sect4/title                     |sect4/info/title                     |sect4info/title" mode="titlepage.mode" priority="2">
-  <xsl:call-template name="section.title"/>
-</xsl:template>
-
-<xsl:template match="sect5">
-  <xsl:call-template name="id.warning"/>
-
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="dir">
-      <xsl:with-param name="inherit" select="1"/>
-    </xsl:call-template>
-    <xsl:call-template name="language.attribute"/>
-
-    <xsl:choose>
-      <xsl:when test="@renderas = 'sect1'">
-        <xsl:call-template name="sect1.titlepage"/>
-      </xsl:when>
-      <xsl:when test="@renderas = 'sect2'">
-        <xsl:call-template name="sect2.titlepage"/>
-      </xsl:when>
-      <xsl:when test="@renderas = 'sect3'">
-        <xsl:call-template name="sect3.titlepage"/>
-      </xsl:when>
-      <xsl:when test="@renderas = 'sect4'">
-        <xsl:call-template name="sect4.titlepage"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="sect5.titlepage"/>
-      </xsl:otherwise>
-    </xsl:choose>
-
-    <xsl:variable name="toc.params">
-      <xsl:call-template name="find.path.params">
-        <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <xsl:if test="contains($toc.params, 'toc')                   and $generate.section.toc.level &gt;= 5">
-      <xsl:call-template name="section.toc">
-        <xsl:with-param name="toc.title.p" select="contains($toc.params, 'title')"/>
-      </xsl:call-template>
-      <xsl:call-template name="section.toc.separator"/>
-    </xsl:if>
-    <xsl:apply-templates/>
-    <xsl:call-template name="process.chunk.footnotes"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="sect5/title                     |sect5/info/title                     |sect5info/title" mode="titlepage.mode" priority="2">
-  <xsl:call-template name="section.title"/>
-</xsl:template>
-
-<xsl:template match="simplesect">
-  <xsl:call-template name="id.warning"/>
-
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="dir">
-      <xsl:with-param name="inherit" select="1"/>
-    </xsl:call-template>
-    <xsl:call-template name="language.attribute"/>
-    <xsl:call-template name="simplesect.titlepage"/>
-    <xsl:apply-templates/>
-  </div>
-</xsl:template>
-
-<xsl:template match="simplesect/title|simplesect/info/title" mode="titlepage.mode" priority="2">
-  <xsl:call-template name="section.title"/>
-</xsl:template>
-
-<xsl:template match="section/title"/>
-<xsl:template match="section/titleabbrev"/>
-<xsl:template match="section/subtitle"/>
-<xsl:template match="sectioninfo"/>
-<xsl:template match="section/info"/>
-
-<xsl:template match="sect1/title"/>
-<xsl:template match="sect1/titleabbrev"/>
-<xsl:template match="sect1/subtitle"/>
-<xsl:template match="sect1info"/>
-<xsl:template match="sect1/info"/>
-
-<xsl:template match="sect2/title"/>
-<xsl:template match="sect2/subtitle"/>
-<xsl:template match="sect2/titleabbrev"/>
-<xsl:template match="sect2info"/>
-<xsl:template match="sect2/info"/>
-
-<xsl:template match="sect3/title"/>
-<xsl:template match="sect3/subtitle"/>
-<xsl:template match="sect3/titleabbrev"/>
-<xsl:template match="sect3info"/>
-<xsl:template match="sect3/info"/>
-
-<xsl:template match="sect4/title"/>
-<xsl:template match="sect4/subtitle"/>
-<xsl:template match="sect4/titleabbrev"/>
-<xsl:template match="sect4info"/>
-<xsl:template match="sect4/info"/>
-
-<xsl:template match="sect5/title"/>
-<xsl:template match="sect5/subtitle"/>
-<xsl:template match="sect5/titleabbrev"/>
-<xsl:template match="sect5info"/>
-<xsl:template match="sect5/info"/>
-
-<xsl:template match="simplesect/title"/>
-<xsl:template match="simplesect/subtitle"/>
-<xsl:template match="simplesect/titleabbrev"/>
-<xsl:template match="simplesect/info"/>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="section.heading">
-  <xsl:param name="section" select="."/>
-  <xsl:param name="level" select="1"/>
-  <xsl:param name="allow-anchors" select="1"/>
-  <xsl:param name="title"/>
-  <xsl:param name="class" select="'title'"/>
-
-  <xsl:variable name="id">
-    <xsl:choose>
-      <!-- if title is in an *info wrapper, get the grandparent -->
-      <xsl:when test="contains(local-name(..), 'info')">
-        <xsl:call-template name="object.id">
-          <xsl:with-param name="object" select="../.."/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="object.id">
-          <xsl:with-param name="object" select=".."/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <!-- HTML H level is one higher than section level -->
-  <xsl:variable name="hlevel">
-    <xsl:choose>
-      <!-- highest valid HTML H level is H6; so anything nested deeper
-           than 5 levels down just becomes H6 -->
-      <xsl:when test="$level &gt; 5">6</xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$level + 1"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-  <xsl:element name="h{$hlevel}" namespace="http://www.w3.org/1999/xhtml">
-    <xsl:attribute name="class"><xsl:value-of select="$class"/></xsl:attribute>
-    <xsl:if test="$css.decoration != '0'">
-      <xsl:if test="$hlevel&lt;3">
-        <xsl:attribute name="style">clear: both</xsl:attribute>
-      </xsl:if>
-    </xsl:if>
-    <xsl:if test="$allow-anchors != 0 and $generate.id.attributes = 0">
-      <xsl:call-template name="anchor">
-        <xsl:with-param name="node" select="$section"/>
-        <xsl:with-param name="conditional" select="0"/>
-      </xsl:call-template>
-    </xsl:if>
-    <xsl:if test="$generate.id.attributes != 0 and not(local-name(.) = 'appendix')">
-      <xsl:attribute name="id"><xsl:value-of select="$id"/></xsl:attribute>
-    </xsl:if>
-    <xsl:copy-of select="$title"/>
-  </xsl:element>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="bridgehead">
-  <xsl:variable name="container" select="(ancestor::appendix                         |ancestor::article                         |ancestor::bibliography                         |ancestor::chapter                         |ancestor::glossary                         |ancestor::glossdiv                         |ancestor::index                         |ancestor::partintro                         |ancestor::preface                         |ancestor::refsect1                         |ancestor::refsect2                         |ancestor::refsect3                         |ancestor::sect1                         |ancestor::sect2                         |ancestor::sect3                         |ancestor::sect4                         |ancestor::sect5                         |ancestor::section                         |ancestor::setindex                         |ancestor::simplesect)[last()]"/>
-
-  <xsl:variable name="clevel">
-    <xsl:choose>
-      <xsl:when test="local-name($container) = 'appendix'                       or local-name($container) = 'chapter'                       or local-name($container) = 'article'                       or local-name($container) = 'bibliography'                       or local-name($container) = 'glossary'                       or local-name($container) = 'index'                       or local-name($container) = 'partintro'                       or local-name($container) = 'preface'                       or local-name($container) = 'setindex'">1</xsl:when>
-      <xsl:when test="local-name($container) = 'glossdiv'">
-        <xsl:value-of select="count(ancestor::glossdiv)+1"/>
-      </xsl:when>
-      <xsl:when test="local-name($container) = 'sect1'                       or local-name($container) = 'sect2'                       or local-name($container) = 'sect3'                       or local-name($container) = 'sect4'                       or local-name($container) = 'sect5'                       or local-name($container) = 'refsect1'                       or local-name($container) = 'refsect2'                       or local-name($container) = 'refsect3'                       or local-name($container) = 'section'                       or local-name($container) = 'simplesect'">
-        <xsl:variable name="slevel">
-          <xsl:call-template name="section.level">
-            <xsl:with-param name="node" select="$container"/>
-          </xsl:call-template>
-        </xsl:variable>
-        <xsl:value-of select="$slevel + 1"/>
-      </xsl:when>
-      <xsl:otherwise>1</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <!-- HTML H level is one higher than section level -->
-  <xsl:variable name="hlevel">
-    <xsl:choose>
-      <xsl:when test="@renderas = 'sect1'">2</xsl:when>
-      <xsl:when test="@renderas = 'sect2'">3</xsl:when>
-      <xsl:when test="@renderas = 'sect3'">4</xsl:when>
-      <xsl:when test="@renderas = 'sect4'">5</xsl:when>
-      <xsl:when test="@renderas = 'sect5'">6</xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$clevel + 1"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:element name="h{$hlevel}" namespace="http://www.w3.org/1999/xhtml">
-    <xsl:call-template name="anchor">
-      <xsl:with-param name="conditional" select="0"/>
-    </xsl:call-template>
-    <xsl:apply-templates/>
-  </xsl:element>
-</xsl:template>
-
-<xsl:template match="section/subtitle" mode="titlepage.mode" priority="2">
-  <xsl:call-template name="section.subtitle"/>
-</xsl:template>
-
-<xsl:template match="simplesect/subtitle" mode="titlepage.mode" priority="2">
-  <xsl:call-template name="section.subtitle"/>
-</xsl:template>
-
-<xsl:template match="sect1/subtitle" mode="titlepage.mode" priority="2">
-  <xsl:call-template name="section.subtitle"/>
-</xsl:template>
-
-<xsl:template match="sect2/subtitle" mode="titlepage.mode" priority="2">
-  <xsl:call-template name="section.subtitle"/>
-</xsl:template>
-
-<xsl:template match="sect3/subtitle" mode="titlepage.mode" priority="2">
-  <xsl:call-template name="section.subtitle"/>
-</xsl:template>
-
-<xsl:template match="sect4/subtitle" mode="titlepage.mode" priority="2">
-  <xsl:call-template name="section.subtitle"/>
-</xsl:template>
-
-<xsl:template match="sect5/subtitle" mode="titlepage.mode" priority="2">
-  <xsl:call-template name="section.subtitle"/>
-</xsl:template>
-
-<xsl:template name="section.subtitle">
-  <!-- the context node should be the subtitle of a section when called -->
-  <xsl:variable name="section" select="(ancestor::section                                         |ancestor::simplesect                                         |ancestor::sect1                                         |ancestor::sect2                                         |ancestor::sect3                                         |ancestor::sect4                                         |ancestor::sect5)[last()]"/>
-
-  <xsl:variable name="level">
-    <xsl:call-template name="section.level">
-      <xsl:with-param name="node" select="$section"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:call-template name="section.heading">
-    <xsl:with-param name="section" select=".."/>
-    <xsl:with-param name="allow-anchors" select="0"/>
-    <!-- subtitle heading level one higher than section level -->
-    <xsl:with-param name="level" select="$level + 1"/>
-    <xsl:with-param name="class" select="'subtitle'"/>
-    <xsl:with-param name="title">
-      <xsl:apply-templates select="$section" mode="object.subtitle.markup">
-        <xsl:with-param name="allow-anchors" select="0"/>
-      </xsl:apply-templates>
-    </xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/synop.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/synop.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,1551 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<!-- synopsis is in verbatim -->
-
-<!-- ==================================================================== -->
-
-<xsl:template match="cmdsynopsis">
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <p>
-      <xsl:if test="..//processing-instruction('dbcmdlist')">
-        <!-- * Placing a dbcmdlist PI as a child of a particular element -->
-        <!-- * creates a hyperlinked list of all cmdsynopsis instances -->
-        <!-- * that are descendants of that element; so for any -->
-        <!-- * cmdsynopsis that is a descendant of an element containing -->
-        <!-- * a dbcmdlist PI, we need to output an a@id instance so that -->
-        <!-- * we will have something to link to -->
-        <xsl:call-template name="anchor">
-          <xsl:with-param name="conditional" select="0"/>
-        </xsl:call-template>
-      </xsl:if>
-      <xsl:apply-templates/>
-    </p>
-  </div>
-</xsl:template>
-
-<xsl:template match="cmdsynopsis/command">
-  <br/>
-  <xsl:call-template name="inline.monoseq"/>
-  <xsl:text> </xsl:text>
-</xsl:template>
-
-<xsl:template match="cmdsynopsis/command[1]" priority="2">
-  <xsl:call-template name="inline.monoseq"/>
-  <xsl:text> </xsl:text>
-</xsl:template>
-
-<xsl:template match="group|arg" name="group-or-arg">
-  <xsl:variable name="choice" select="@choice"/>
-  <xsl:variable name="rep" select="@rep"/>
-  <xsl:variable name="sepchar">
-    <xsl:choose>
-      <xsl:when test="ancestor-or-self::*/@sepchar">
-        <xsl:value-of select="ancestor-or-self::*/@sepchar"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:text> </xsl:text>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:if test="preceding-sibling::*">
-    <xsl:value-of select="$sepchar"/>
-  </xsl:if>
-  <xsl:choose>
-    <xsl:when test="$choice='plain'">
-      <xsl:value-of select="$arg.choice.plain.open.str"/>
-    </xsl:when>
-    <xsl:when test="$choice='req'">
-      <xsl:value-of select="$arg.choice.req.open.str"/>
-    </xsl:when>
-    <xsl:when test="$choice='opt'">
-      <xsl:value-of select="$arg.choice.opt.open.str"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$arg.choice.def.open.str"/>
-    </xsl:otherwise>
-  </xsl:choose>
-  <xsl:apply-templates/>
-  <xsl:choose>
-    <xsl:when test="$rep='repeat'">
-      <xsl:value-of select="$arg.rep.repeat.str"/>
-    </xsl:when>
-    <xsl:when test="$rep='norepeat'">
-      <xsl:value-of select="$arg.rep.norepeat.str"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$arg.rep.def.str"/>
-    </xsl:otherwise>
-  </xsl:choose>
-  <xsl:choose>
-    <xsl:when test="$choice='plain'">
-      <xsl:value-of select="$arg.choice.plain.close.str"/>
-    </xsl:when>
-    <xsl:when test="$choice='req'">
-      <xsl:value-of select="$arg.choice.req.close.str"/>
-    </xsl:when>
-    <xsl:when test="$choice='opt'">
-      <xsl:value-of select="$arg.choice.opt.close.str"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$arg.choice.def.close.str"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="group/arg">
-  <xsl:variable name="choice" select="@choice"/>
-  <xsl:variable name="rep" select="@rep"/>
-  <xsl:if test="preceding-sibling::*">
-    <xsl:value-of select="$arg.or.sep"/>
-  </xsl:if>
-  <xsl:call-template name="group-or-arg"/>
-</xsl:template>
-
-<xsl:template match="sbr">
-  <br/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="synopfragmentref">
-  <xsl:variable name="target" select="key('id',@linkend)"/>
-  <xsl:variable name="snum">
-    <xsl:apply-templates select="$target" mode="synopfragment.number"/>
-  </xsl:variable>
-  <i>
-    <a href="#{@linkend}">
-      <xsl:text>(</xsl:text>
-      <xsl:value-of select="$snum"/>
-      <xsl:text>)</xsl:text>
-    </a>
-    <xsl:text>&#160;</xsl:text>
-    <xsl:apply-templates/>
-  </i>
-</xsl:template>
-
-<xsl:template match="synopfragment" mode="synopfragment.number">
-  <xsl:number format="1"/>
-</xsl:template>
-
-<xsl:template match="synopfragment">
-  <xsl:variable name="snum">
-    <xsl:apply-templates select="." mode="synopfragment.number"/>
-  </xsl:variable>
-  <p>
-    <xsl:variable name="id">
-      <xsl:call-template name="object.id"/>
-    </xsl:variable>
-    <a id="{$id}">
-      <xsl:text>(</xsl:text>
-      <xsl:value-of select="$snum"/>
-      <xsl:text>)</xsl:text>
-    </a>
-    <xsl:text> </xsl:text>
-    <xsl:apply-templates/>
-  </p>
-</xsl:template>
-
-<xsl:template match="funcsynopsis">
-  <xsl:if test="..//processing-instruction('dbfunclist')">
-    <!-- * Placing a dbfunclist PI as a child of a particular element -->
-    <!-- * creates a hyperlinked list of all funcsynopsis instances that -->
-    <!-- * are descendants of that element; so for any funcsynopsis that is -->
-    <!-- * a descendant of an element containing a dbfunclist PI, we need -->
-    <!-- * to output an a@id instance so that we will have something to -->
-    <!-- * link to -->
-    <xsl:call-template name="anchor">
-      <xsl:with-param name="conditional" select="0"/>
-    </xsl:call-template>
-  </xsl:if>
-  <xsl:call-template name="informal.object"/>
-</xsl:template>
-
-<xsl:template match="funcsynopsisinfo">
-  <pre>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates/>
-  </pre>
-</xsl:template>
-
-<!-- ====================================================================== -->
-<!-- funcprototype -->
-<!--
-
-funcprototype ::= (funcdef,
-                   (void|varargs|paramdef+))
-
-funcdef       ::= (#PCDATA|type|replaceable|function)*
-
-paramdef      ::= (#PCDATA|type|replaceable|parameter|funcparams)*
--->
-
-<xsl:template match="funcprototype">
-  <xsl:variable name="html-style">
-    <xsl:call-template name="pi.dbhtml_funcsynopsis-style">
-      <xsl:with-param name="node" select="ancestor::funcsynopsis/descendant-or-self::*"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="style">
-    <xsl:choose>
-      <xsl:when test="$html-style != ''">
-        <xsl:value-of select="$html-style"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$funcsynopsis.style"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-<!--
-  <xsl:variable name="tabular-p"
-                select="$funcsynopsis.tabular.threshold &gt; 0
-                        and string-length(.) &gt; $funcsynopsis.tabular.threshold"/>
--->
-
-  <xsl:variable name="tabular-p" select="true()"/>
-
-  <xsl:choose>
-    <xsl:when test="$style = 'kr' and $tabular-p">
-      <xsl:apply-templates select="." mode="kr-tabular"/>
-    </xsl:when>
-    <xsl:when test="$style = 'kr'">
-      <xsl:apply-templates select="." mode="kr-nontabular"/>
-    </xsl:when>
-    <xsl:when test="$style = 'ansi' and $tabular-p">
-      <xsl:apply-templates select="." mode="ansi-tabular"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates select="." mode="ansi-nontabular"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ====================================================================== -->
-<!-- funcprototype: kr, non-tabular -->
-
-<xsl:template match="funcprototype" mode="kr-nontabular">
-  <p>
-    <xsl:apply-templates mode="kr-nontabular"/>
-    <xsl:if test="paramdef">
-      <br/>
-      <xsl:apply-templates select="paramdef" mode="kr-funcsynopsis-mode"/>
-    </xsl:if>
-  </p>
-</xsl:template>
-
-<xsl:template match="funcdef" mode="kr-nontabular">
-  <code>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="kr-nontabular"/>
-    <xsl:text>(</xsl:text>
-  </code>
-</xsl:template>
-
-<xsl:template match="funcdef/function" mode="kr-nontabular">
-  <xsl:choose>
-    <xsl:when test="$funcsynopsis.decoration != 0">
-      <b class="fsfunc"><xsl:apply-templates mode="kr-nontabular"/></b>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates mode="kr-nontabular"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="void" mode="kr-nontabular">
-  <code>)</code>
-  <xsl:text>;</xsl:text>
-</xsl:template>
-
-<xsl:template match="varargs" mode="kr-nontabular">
-  <xsl:text>...</xsl:text>
-  <code>)</code>
-  <xsl:text>;</xsl:text>
-</xsl:template>
-
-<xsl:template match="paramdef" mode="kr-nontabular">
-  <xsl:apply-templates select="parameter" mode="kr-nontabular"/>
-  <xsl:choose>
-    <xsl:when test="following-sibling::*">
-      <xsl:text>, </xsl:text>
-    </xsl:when>
-    <xsl:otherwise>
-      <code>)</code>
-      <xsl:text>;</xsl:text>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="paramdef/parameter" mode="kr-nontabular">
-  <xsl:choose>
-    <xsl:when test="$funcsynopsis.decoration != 0">
-      <var class="pdparam">
-        <xsl:apply-templates mode="kr-nontabular"/>
-      </var>
-    </xsl:when>
-    <xsl:otherwise>
-      <code>
-	<xsl:apply-templates mode="kr-nontabular"/>
-      </code>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="paramdef" mode="kr-funcsynopsis-mode">
-  <xsl:if test="preceding-sibling::paramdef"><br/></xsl:if>
-  <code>
-    <xsl:apply-templates mode="kr-funcsynopsis-mode"/>
-  </code>
-  <xsl:text>;</xsl:text>
-</xsl:template>
-
-<xsl:template match="paramdef/parameter" mode="kr-funcsynopsis-mode">
-  <xsl:choose>
-    <xsl:when test="$funcsynopsis.decoration != 0">
-      <var class="pdparam">
-        <xsl:apply-templates mode="kr-funcsynopsis-mode"/>
-      </var>
-    </xsl:when>
-    <xsl:otherwise>
-      <code>
-	<xsl:apply-templates mode="kr-funcsynopsis-mode"/>
-      </code>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="funcparams" mode="kr-funcsynopsis-mode">
-  <code>(</code>
-  <xsl:apply-templates mode="kr-funcsynopsis-mode"/>
-  <code>)</code>
-</xsl:template>
-
-<!-- ====================================================================== -->
-<!-- funcprototype: kr, tabular -->
-
-<xsl:template match="funcprototype" mode="kr-tabular">
-  <table border="0" summary="Function synopsis" cellspacing="0" cellpadding="0" style="padding-bottom: 1em">
-    <tr>
-      <td>
-        <xsl:apply-templates select="funcdef" mode="kr-tabular"/>
-      </td>
-      <xsl:apply-templates select="(void|varargs|paramdef)[1]" mode="kr-tabular"/>
-    </tr>
-    <xsl:for-each select="(void|varargs|paramdef)[preceding-sibling::*[not(self::funcdef)]]">
-      <tr>
-        <td>&#160;</td>
-        <xsl:apply-templates select="." mode="kr-tabular"/>
-      </tr>
-    </xsl:for-each>
-  </table>
-  <xsl:if test="paramdef">
-    <table border="0" summary="Function argument synopsis" cellspacing="0" cellpadding="0">
-      <xsl:if test="following-sibling::funcprototype">
-        <xsl:attribute name="style">padding-bottom: 1em</xsl:attribute>
-      </xsl:if>
-      <xsl:apply-templates select="paramdef" mode="kr-tabular-funcsynopsis-mode"/>
-    </table>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="funcdef" mode="kr-tabular">
-  <code>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="kr-tabular"/>
-    <xsl:text>(</xsl:text>
-  </code>
-</xsl:template>
-
-<xsl:template match="funcdef/function" mode="kr-tabular">
-  <xsl:choose>
-    <xsl:when test="$funcsynopsis.decoration != 0">
-      <b class="fsfunc"><xsl:apply-templates mode="kr-nontabular"/></b>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates mode="kr-tabular"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="void" mode="kr-tabular">
-  <td>
-    <code>)</code>
-    <xsl:text>;</xsl:text>
-  </td>
-  <td>&#160;</td>
-</xsl:template>
-
-<xsl:template match="varargs" mode="kr-tabular">
-  <td>
-    <xsl:text>...</xsl:text>
-    <code>)</code>
-    <xsl:text>;</xsl:text>
-  </td>
-  <td>&#160;</td>
-</xsl:template>
-
-<xsl:template match="paramdef" mode="kr-tabular">
-  <td>
-    <xsl:apply-templates select="parameter" mode="kr-tabular"/>
-    <xsl:choose>
-      <xsl:when test="following-sibling::*">
-	<xsl:text>, </xsl:text>
-      </xsl:when>
-      <xsl:otherwise>
-	<code>)</code>
-	<xsl:text>;</xsl:text>
-      </xsl:otherwise>
-    </xsl:choose>
-  </td>
-  <td>&#160;</td>
-</xsl:template>
-
-<xsl:template match="paramdef/parameter" mode="kr-tabular">
-  <xsl:choose>
-    <xsl:when test="$funcsynopsis.decoration != 0">
-      <var class="pdparam">
-        <xsl:apply-templates mode="kr-tabular"/>
-      </var>
-    </xsl:when>
-    <xsl:otherwise>
-      <code>
-	<xsl:apply-templates mode="kr-tabular"/>
-      </code>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="paramdef" mode="kr-tabular-funcsynopsis-mode">
-  <xsl:variable name="type">
-    <xsl:choose>
-      <xsl:when test="type">
-	<xsl:apply-templates select="type" mode="kr-tabular-funcsynopsis-mode"/>
-      </xsl:when>
-      <xsl:when test="normalize-space(parameter/preceding-sibling::node()[not(self::parameter)]) != ''">
-	<xsl:copy-of select="parameter/preceding-sibling::node()[not(self::parameter)]"/>
-      </xsl:when>
-    </xsl:choose>
-  </xsl:variable>
-
-  <tr>
-    <xsl:choose>
-      <xsl:when test="$type != '' and funcparams">
-        <td>
-	  <code>
-	    <xsl:copy-of select="$type"/>
-	  </code>
-          <xsl:text>&#160;</xsl:text>
-        </td>
-        <td>
-	  <code>
-	    <xsl:choose>
-	      <xsl:when test="type">
-		<xsl:apply-templates select="type/following-sibling::*" mode="kr-tabular-funcsynopsis-mode"/>
-	      </xsl:when>
-	      <xsl:otherwise>
-		<xsl:apply-templates select="*" mode="kr-tabular-funcsynopsis-mode"/>
-	      </xsl:otherwise>
-	    </xsl:choose>
-	  </code>
-        </td>
-      </xsl:when>
-
-      <xsl:when test="funcparams">
-        <td colspan="2">
-	  <code>
-	    <xsl:apply-templates mode="kr-tabular-funcsynopsis-mode"/>
-	  </code>
-        </td>
-      </xsl:when>
-
-      <xsl:otherwise>
-        <td>
-	  <code>
-	    <xsl:apply-templates select="parameter/preceding-sibling::node()[not(self::parameter)]" mode="kr-tabular-funcsynopsis-mode"/>
-	  </code>
-          <xsl:text>&#160;</xsl:text>
-        </td>
-        <td>
-	  <code>
-	    <xsl:apply-templates select="parameter" mode="kr-tabular"/>
-	    <xsl:apply-templates select="parameter/following-sibling::*[not(self::parameter)]" mode="kr-tabular-funcsynopsis-mode"/>
-	    <xsl:text>;</xsl:text>
-	  </code>
-        </td>
-      </xsl:otherwise>
-    </xsl:choose>
-  </tr>
-</xsl:template>
-
-<xsl:template match="paramdef/parameter" mode="kr-tabular-funcsynopsis-mode">
-  <xsl:choose>
-    <xsl:when test="$funcsynopsis.decoration != 0">
-      <var class="pdparam">
-        <xsl:apply-templates mode="kr-tabular-funcsynopsis-mode"/>
-      </var>
-    </xsl:when>
-    <xsl:otherwise>
-      <code>
-	<xsl:apply-templates mode="kr-tabular-funcsynopsis-mode"/>
-      </code>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="funcparams" mode="kr-tabular-funcsynopsis-mode">
-  <code>(</code>
-  <xsl:apply-templates mode="kr-tabular-funcsynopsis-mode"/>
-  <code>)</code>
-  <xsl:text>;</xsl:text>
-</xsl:template>
-
-<!-- ====================================================================== -->
-<!-- funcprototype: ansi, non-tabular -->
-
-<xsl:template match="funcprototype" mode="ansi-nontabular">
-  <p>
-    <xsl:apply-templates mode="ansi-nontabular"/>
-  </p>
-</xsl:template>
-
-<xsl:template match="funcdef" mode="ansi-nontabular">
-  <code>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="ansi-nontabular"/>
-    <xsl:text>(</xsl:text>
-  </code>
-</xsl:template>
-
-<xsl:template match="funcdef/function" mode="ansi-nontabular">
-  <xsl:choose>
-    <xsl:when test="$funcsynopsis.decoration != 0">
-      <b class="fsfunc"><xsl:apply-templates mode="ansi-nontabular"/></b>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates mode="ansi-nontabular"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="void" mode="ansi-nontabular">
-  <code>void)</code>
-  <xsl:text>;</xsl:text>
-</xsl:template>
-
-<xsl:template match="varargs" mode="ansi-nontabular">
-  <xsl:text>...</xsl:text>
-  <code>)</code>
-  <xsl:text>;</xsl:text>
-</xsl:template>
-
-<xsl:template match="paramdef" mode="ansi-nontabular">
-  <xsl:apply-templates mode="ansi-nontabular"/>
-  <xsl:choose>
-    <xsl:when test="following-sibling::*">
-      <xsl:text>, </xsl:text>
-    </xsl:when>
-    <xsl:otherwise>
-      <code>)</code>
-      <xsl:text>;</xsl:text>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="paramdef/parameter" mode="ansi-nontabular">
-  <xsl:choose>
-    <xsl:when test="$funcsynopsis.decoration != 0">
-      <var class="pdparam">
-        <xsl:apply-templates mode="ansi-nontabular"/>
-      </var>
-    </xsl:when>
-    <xsl:otherwise>
-      <code>
-	<xsl:apply-templates mode="ansi-nontabular"/>
-      </code>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="funcparams" mode="ansi-nontabular">
-  <code>(</code>
-  <xsl:apply-templates mode="ansi-nontabular"/>
-  <code>)</code>
-</xsl:template>
-
-<!-- ====================================================================== -->
-<!-- funcprototype: ansi, tabular -->
-
-<xsl:template match="funcprototype" mode="ansi-tabular">
-  <table border="0" summary="Function synopsis" cellspacing="0" cellpadding="0">
-    <xsl:if test="following-sibling::funcprototype">
-      <xsl:attribute name="style">padding-bottom: 1em</xsl:attribute>
-    </xsl:if>
-    <tr>
-      <td>
-        <xsl:apply-templates select="funcdef" mode="ansi-tabular"/>
-      </td>
-      <xsl:apply-templates select="(void|varargs|paramdef)[1]" mode="ansi-tabular"/>
-    </tr>
-    <xsl:for-each select="(void|varargs|paramdef)[preceding-sibling::*[not(self::funcdef)]]">
-      <tr>
-        <td>&#160;</td>
-        <xsl:apply-templates select="." mode="ansi-tabular"/>
-      </tr>
-    </xsl:for-each>
-  </table>
-</xsl:template>
-
-<xsl:template match="funcdef" mode="ansi-tabular">
-  <code>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="ansi-tabular"/>
-    <xsl:text>(</xsl:text>
-  </code>
-</xsl:template>
-
-<xsl:template match="funcdef/function" mode="ansi-tabular">
-  <xsl:choose>
-    <xsl:when test="$funcsynopsis.decoration != 0">
-      <b class="fsfunc"><xsl:apply-templates mode="ansi-nontabular"/></b>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates mode="kr-tabular"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="void" mode="ansi-tabular">
-  <td>
-    <code>void)</code>
-    <xsl:text>;</xsl:text>
-  </td>
-  <td>&#160;</td>
-</xsl:template>
-
-<xsl:template match="varargs" mode="ansi-tabular">
-  <td>
-    <xsl:text>...</xsl:text>
-    <code>)</code>
-    <xsl:text>;</xsl:text>
-  </td>
-  <td>&#160;</td>
-</xsl:template>
-
-<xsl:template match="paramdef" mode="ansi-tabular">
-  <xsl:variable name="type">
-    <xsl:choose>
-      <xsl:when test="type">
-	<xsl:apply-templates select="type" mode="ansi-tabular"/>
-      </xsl:when>
-      <xsl:when test="normalize-space(parameter/preceding-sibling::node()[not(self::parameter)]) != ''">
-	<xsl:copy-of select="parameter/preceding-sibling::node()[not(self::parameter)]"/>
-      </xsl:when>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$type != '' and funcparams">
-      <td>
-	<xsl:copy-of select="$type"/>
-        <xsl:text>&#160;</xsl:text>
-      </td>
-      <td>
-	<xsl:choose>
-	  <xsl:when test="type">
-	    <xsl:apply-templates select="type/following-sibling::*" mode="ansi-tabular"/>
-	  </xsl:when>
-	  <xsl:otherwise>
-	    <xsl:apply-templates select="*" mode="ansi-tabular"/>
-	  </xsl:otherwise>
-	</xsl:choose>
-        <xsl:choose>
-          <xsl:when test="following-sibling::*">
-            <xsl:text>, </xsl:text>
-          </xsl:when>
-          <xsl:otherwise>
-            <code>)</code>
-            <xsl:text>;</xsl:text>
-          </xsl:otherwise>
-        </xsl:choose>
-      </td>
-    </xsl:when>
-    <xsl:otherwise>
-      <td>
-        <xsl:apply-templates select="parameter/preceding-sibling::node()[not(self::parameter)]" mode="ansi-tabular"/>
-        <xsl:text>&#160;</xsl:text>
-      </td>
-      <td>
-        <xsl:apply-templates select="parameter" mode="ansi-tabular"/>
-        <xsl:apply-templates select="parameter/following-sibling::*[not(self::parameter)]" mode="ansi-tabular"/>
-        <xsl:choose>
-          <xsl:when test="following-sibling::*">
-            <xsl:text>, </xsl:text>
-          </xsl:when>
-          <xsl:otherwise>
-            <code>)</code>
-            <xsl:text>;</xsl:text>
-          </xsl:otherwise>
-        </xsl:choose>
-      </td>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="paramdef/parameter" mode="ansi-tabular">
-  <xsl:choose>
-    <xsl:when test="$funcsynopsis.decoration != 0">
-      <var class="pdparam">
-        <xsl:apply-templates mode="ansi-tabular"/>
-      </var>
-    </xsl:when>
-    <xsl:otherwise>
-      <code>
-	<xsl:apply-templates mode="ansi-tabular"/>
-      </code>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="funcparams" mode="ansi-tabular">
-  <code>(</code>
-  <xsl:apply-templates/>
-  <code>)</code>
-</xsl:template>
-
-<!-- ====================================================================== -->
-
-<xsl:variable name="default-classsynopsis-language">java</xsl:variable>
-
-<xsl:template match="classsynopsis                      |fieldsynopsis                      |methodsynopsis                      |constructorsynopsis                      |destructorsynopsis">
-  <xsl:param name="language">
-    <xsl:choose>
-      <xsl:when test="@language">
-	<xsl:value-of select="@language"/>
-      </xsl:when>
-      <xsl:otherwise>
-	<xsl:value-of select="$default-classsynopsis-language"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:param>
-
-  <xsl:choose>
-    <xsl:when test="$language='java' or $language='Java'">
-      <xsl:apply-templates select="." mode="java"/>
-    </xsl:when>
-    <xsl:when test="$language='perl' or $language='Perl'">
-      <xsl:apply-templates select="." mode="perl"/>
-    </xsl:when>
-    <xsl:when test="$language='idl' or $language='IDL'">
-      <xsl:apply-templates select="." mode="idl"/>
-    </xsl:when>
-    <xsl:when test="$language='cpp' or $language='c++' or $language='C++'">
-      <xsl:apply-templates select="." mode="cpp"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:message>
-	<xsl:text>Unrecognized language on </xsl:text>
-        <xsl:value-of select="local-name(.)"/>
-        <xsl:text>: </xsl:text>
-	<xsl:value-of select="$language"/>
-      </xsl:message>
-      <xsl:apply-templates select=".">
-	<xsl:with-param name="language" select="$default-classsynopsis-language"/>
-      </xsl:apply-templates>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="synop-break">
-  <xsl:if test="parent::classsynopsis                 or (following-sibling::fieldsynopsis                     |following-sibling::methodsynopsis                     |following-sibling::constructorsynopsis                     |following-sibling::destructorsynopsis)">
-    <br/>
-  </xsl:if>
-</xsl:template>
-
-
-<!-- ===== Java ======================================================== -->
-
-<xsl:template match="classsynopsis" mode="java">
-  <pre>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates select="ooclass[1]" mode="java"/>
-    <xsl:if test="ooclass[preceding-sibling::*]">
-      <xsl:text> extends</xsl:text>
-      <xsl:apply-templates select="ooclass[preceding-sibling::*]" mode="java"/>
-      <xsl:if test="oointerface|ooexception">
-        <br/>
-	<xsl:text>&#160;&#160;&#160;&#160;</xsl:text>
-      </xsl:if>
-    </xsl:if>
-    <xsl:if test="oointerface">
-      <xsl:text>implements</xsl:text>
-      <xsl:apply-templates select="oointerface" mode="java"/>
-      <xsl:if test="ooexception">
-        <br/>
-	<xsl:text>&#160;&#160;&#160;&#160;</xsl:text>
-      </xsl:if>
-    </xsl:if>
-    <xsl:if test="ooexception">
-      <xsl:text>throws</xsl:text>
-      <xsl:apply-templates select="ooexception" mode="java"/>
-    </xsl:if>
-    <xsl:text>&#160;{</xsl:text>
-    <br/>
-    <xsl:apply-templates select="constructorsynopsis                                  |destructorsynopsis                                  |fieldsynopsis                                  |methodsynopsis                                  |classsynopsisinfo" mode="java"/>
-    <xsl:text>}</xsl:text>
-  </pre>
-</xsl:template>
-
-<xsl:template match="classsynopsisinfo" mode="java">
-  <xsl:apply-templates mode="java"/>
-</xsl:template>
-
-<xsl:template match="ooclass|oointerface|ooexception" mode="java">
-  <xsl:choose>
-    <xsl:when test="preceding-sibling::*">
-      <xsl:text>, </xsl:text>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:text> </xsl:text>
-    </xsl:otherwise>
-  </xsl:choose>
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="java"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="modifier|package" mode="java">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="java"/>
-    <xsl:if test="following-sibling::*">
-      <xsl:text>&#160;</xsl:text>
-    </xsl:if>
-  </span>
-</xsl:template>
-
-<xsl:template match="classname" mode="java">
-  <xsl:if test="local-name(preceding-sibling::*[1]) = 'classname'">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="java"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="interfacename" mode="java">
-  <xsl:if test="local-name(preceding-sibling::*[1]) = 'interfacename'">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="java"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="exceptionname" mode="java">
-  <xsl:if test="local-name(preceding-sibling::*[1]) = 'exceptionname'">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="java"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="fieldsynopsis" mode="java">
-  <code>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:if test="parent::classsynopsis">
-      <xsl:text>&#160;&#160;</xsl:text>
-    </xsl:if>
-    <xsl:apply-templates mode="java"/>
-    <xsl:text>;</xsl:text>
-  </code>
-  <xsl:call-template name="synop-break"/>
-</xsl:template>
-
-<xsl:template match="type" mode="java">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="java"/>
-    <xsl:text>&#160;</xsl:text>
-  </span>
-</xsl:template>
-
-<xsl:template match="varname" mode="java">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="java"/>
-    <xsl:text>&#160;</xsl:text>
-  </span>
-</xsl:template>
-
-<xsl:template match="initializer" mode="java">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:text>=&#160;</xsl:text>
-    <xsl:apply-templates mode="java"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="void" mode="java">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:text>void&#160;</xsl:text>
-  </span>
-</xsl:template>
-
-<xsl:template match="methodname" mode="java">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="java"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="methodparam" mode="java">
-  <xsl:param name="indent">0</xsl:param>
-  <xsl:if test="preceding-sibling::methodparam">
-    <xsl:text>,</xsl:text>
-    <br/>
-    <xsl:if test="$indent &gt; 0">
-      <xsl:call-template name="copy-string">
-	<xsl:with-param name="string">&#160;</xsl:with-param>
-	<xsl:with-param name="count" select="$indent + 1"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:if>
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="java"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="parameter" mode="java">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="java"/>
-  </span>
-</xsl:template>
-
-<xsl:template mode="java" match="constructorsynopsis|destructorsynopsis|methodsynopsis">
-  <xsl:variable name="start-modifiers" select="modifier[following-sibling::*[local-name(.) != 'modifier']]"/>
-  <xsl:variable name="notmod" select="*[local-name(.) != 'modifier']"/>
-  <xsl:variable name="end-modifiers" select="modifier[preceding-sibling::*[local-name(.) != 'modifier']]"/>
-  <xsl:variable name="decl">
-    <xsl:if test="parent::classsynopsis">
-      <xsl:text>&#160;&#160;</xsl:text>
-    </xsl:if>
-    <xsl:apply-templates select="$start-modifiers" mode="java"/>
-
-    <!-- type -->
-    <xsl:if test="local-name($notmod[1]) != 'methodname'">
-      <xsl:apply-templates select="$notmod[1]" mode="java"/>
-    </xsl:if>
-
-    <xsl:apply-templates select="methodname" mode="java"/>
-  </xsl:variable>
-
-  <code>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:copy-of select="$decl"/>
-    <xsl:text>(</xsl:text>
-    <xsl:apply-templates select="methodparam" mode="java">
-      <xsl:with-param name="indent" select="string-length($decl)"/>
-    </xsl:apply-templates>
-    <xsl:text>)</xsl:text>
-    <xsl:if test="exceptionname">
-      <br/>
-      <xsl:text>&#160;&#160;&#160;&#160;throws&#160;</xsl:text>
-      <xsl:apply-templates select="exceptionname" mode="java"/>
-    </xsl:if>
-    <xsl:if test="modifier[preceding-sibling::*[local-name(.) != 'modifier']]">
-      <xsl:text> </xsl:text>
-      <xsl:apply-templates select="$end-modifiers" mode="java"/>
-    </xsl:if>
-    <xsl:text>;</xsl:text>
-  </code>
-  <xsl:call-template name="synop-break"/>
-</xsl:template>
-
-<!-- ===== C++ ========================================================= -->
-
-<xsl:template match="classsynopsis" mode="cpp">
-  <pre>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates select="ooclass[1]" mode="cpp"/>
-    <xsl:if test="ooclass[preceding-sibling::*]">
-      <xsl:text>: </xsl:text>
-      <xsl:apply-templates select="ooclass[preceding-sibling::*]" mode="cpp"/>
-      <xsl:if test="oointerface|ooexception">
-        <br/>
-	<xsl:text>&#160;&#160;&#160;&#160;</xsl:text>
-      </xsl:if>
-    </xsl:if>
-    <xsl:if test="oointerface">
-      <xsl:text> implements</xsl:text>
-      <xsl:apply-templates select="oointerface" mode="cpp"/>
-      <xsl:if test="ooexception">
-        <br/>
-	<xsl:text>&#160;&#160;&#160;&#160;</xsl:text>
-      </xsl:if>
-    </xsl:if>
-    <xsl:if test="ooexception">
-      <xsl:text> throws</xsl:text>
-      <xsl:apply-templates select="ooexception" mode="cpp"/>
-    </xsl:if>
-    <xsl:text>&#160;{</xsl:text>
-    <br/>
-    <xsl:apply-templates select="constructorsynopsis                                  |destructorsynopsis                                  |fieldsynopsis                                  |methodsynopsis                                  |classsynopsisinfo" mode="cpp"/>
-    <xsl:text>}</xsl:text>
-  </pre>
-</xsl:template>
-
-<xsl:template match="classsynopsisinfo" mode="cpp">
-  <xsl:apply-templates mode="cpp"/>
-</xsl:template>
-
-<xsl:template match="ooclass|oointerface|ooexception" mode="cpp">
-  <xsl:if test="preceding-sibling::*">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="cpp"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="modifier|package" mode="cpp">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="cpp"/>
-    <xsl:if test="following-sibling::*">
-      <xsl:text>&#160;</xsl:text>
-    </xsl:if>
-  </span>
-</xsl:template>
-
-<xsl:template match="classname" mode="cpp">
-  <xsl:if test="local-name(preceding-sibling::*[1]) = 'classname'">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="cpp"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="interfacename" mode="cpp">
-  <xsl:if test="local-name(preceding-sibling::*[1]) = 'interfacename'">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="cpp"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="exceptionname" mode="cpp">
-  <xsl:if test="local-name(preceding-sibling::*[1]) = 'exceptionname'">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="cpp"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="fieldsynopsis" mode="cpp">
-  <code>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:if test="parent::classsynopsis">
-      <xsl:text>&#160;&#160;</xsl:text>
-    </xsl:if>
-    <xsl:apply-templates mode="cpp"/>
-    <xsl:text>;</xsl:text>
-  </code>
-  <xsl:call-template name="synop-break"/>
-</xsl:template>
-
-<xsl:template match="type" mode="cpp">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="cpp"/>
-    <xsl:text>&#160;</xsl:text>
-  </span>
-</xsl:template>
-
-<xsl:template match="varname" mode="cpp">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="cpp"/>
-    <xsl:text>&#160;</xsl:text>
-  </span>
-</xsl:template>
-
-<xsl:template match="initializer" mode="cpp">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:text>=&#160;</xsl:text>
-    <xsl:apply-templates mode="cpp"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="void" mode="cpp">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:text>void&#160;</xsl:text>
-  </span>
-</xsl:template>
-
-<xsl:template match="methodname" mode="cpp">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="cpp"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="methodparam" mode="cpp">
-  <xsl:if test="preceding-sibling::methodparam">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="cpp"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="parameter" mode="cpp">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="cpp"/>
-  </span>
-</xsl:template>
-
-<xsl:template mode="cpp" match="constructorsynopsis|destructorsynopsis|methodsynopsis">
-  <xsl:variable name="start-modifiers" select="modifier[following-sibling::*[local-name(.) != 'modifier']]"/>
-  <xsl:variable name="notmod" select="*[local-name(.) != 'modifier']"/>
-  <xsl:variable name="end-modifiers" select="modifier[preceding-sibling::*[local-name(.) != 'modifier']]"/>
-
-  <code>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:if test="parent::classsynopsis">
-      <xsl:text>&#160;&#160;</xsl:text>
-    </xsl:if>
-    <xsl:apply-templates select="$start-modifiers" mode="cpp"/>
-
-    <!-- type -->
-    <xsl:if test="local-name($notmod[1]) != 'methodname'">
-      <xsl:apply-templates select="$notmod[1]" mode="cpp"/>
-    </xsl:if>
-
-    <xsl:apply-templates select="methodname" mode="cpp"/>
-    <xsl:text>(</xsl:text>
-    <xsl:apply-templates select="methodparam" mode="cpp"/>
-    <xsl:text>)</xsl:text>
-    <xsl:if test="exceptionname">
-      <br/>
-      <xsl:text>&#160;&#160;&#160;&#160;throws&#160;</xsl:text>
-      <xsl:apply-templates select="exceptionname" mode="cpp"/>
-    </xsl:if>
-    <xsl:if test="modifier[preceding-sibling::*[local-name(.) != 'modifier']]">
-      <xsl:text> </xsl:text>
-      <xsl:apply-templates select="$end-modifiers" mode="cpp"/>
-    </xsl:if>
-    <xsl:text>;</xsl:text>
-  </code>
-  <xsl:call-template name="synop-break"/>
-</xsl:template>
-
-<!-- ===== IDL ========================================================= -->
-
-<xsl:template match="classsynopsis" mode="idl">
-  <pre>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:text>interface </xsl:text>
-    <xsl:apply-templates select="ooclass[1]" mode="idl"/>
-    <xsl:if test="ooclass[preceding-sibling::*]">
-      <xsl:text>: </xsl:text>
-      <xsl:apply-templates select="ooclass[preceding-sibling::*]" mode="idl"/>
-      <xsl:if test="oointerface|ooexception">
-        <br/>
-	<xsl:text>&#160;&#160;&#160;&#160;</xsl:text>
-      </xsl:if>
-    </xsl:if>
-    <xsl:if test="oointerface">
-      <xsl:text> implements</xsl:text>
-      <xsl:apply-templates select="oointerface" mode="idl"/>
-      <xsl:if test="ooexception">
-        <br/>
-	<xsl:text>&#160;&#160;&#160;&#160;</xsl:text>
-      </xsl:if>
-    </xsl:if>
-    <xsl:if test="ooexception">
-      <xsl:text> throws</xsl:text>
-      <xsl:apply-templates select="ooexception" mode="idl"/>
-    </xsl:if>
-    <xsl:text>&#160;{</xsl:text>
-    <br/>
-    <xsl:apply-templates select="constructorsynopsis                                  |destructorsynopsis                                  |fieldsynopsis                                  |methodsynopsis                                  |classsynopsisinfo" mode="idl"/>
-    <xsl:text>}</xsl:text>
-  </pre>
-</xsl:template>
-
-<xsl:template match="classsynopsisinfo" mode="idl">
-  <xsl:apply-templates mode="idl"/>
-</xsl:template>
-
-<xsl:template match="ooclass|oointerface|ooexception" mode="idl">
-  <xsl:if test="preceding-sibling::*">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="idl"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="modifier|package" mode="idl">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="idl"/>
-    <xsl:if test="following-sibling::*">
-      <xsl:text>&#160;</xsl:text>
-    </xsl:if>
-  </span>
-</xsl:template>
-
-<xsl:template match="classname" mode="idl">
-  <xsl:if test="local-name(preceding-sibling::*[1]) = 'classname'">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="idl"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="interfacename" mode="idl">
-  <xsl:if test="local-name(preceding-sibling::*[1]) = 'interfacename'">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="idl"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="exceptionname" mode="idl">
-  <xsl:if test="local-name(preceding-sibling::*[1]) = 'exceptionname'">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="idl"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="fieldsynopsis" mode="idl">
-  <code>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:if test="parent::classsynopsis">
-      <xsl:text>&#160;&#160;</xsl:text>
-    </xsl:if>
-    <xsl:apply-templates mode="idl"/>
-    <xsl:text>;</xsl:text>
-  </code>
-  <xsl:call-template name="synop-break"/>
-</xsl:template>
-
-<xsl:template match="type" mode="idl">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="idl"/>
-    <xsl:text>&#160;</xsl:text>
-  </span>
-</xsl:template>
-
-<xsl:template match="varname" mode="idl">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="idl"/>
-    <xsl:text>&#160;</xsl:text>
-  </span>
-</xsl:template>
-
-<xsl:template match="initializer" mode="idl">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:text>=&#160;</xsl:text>
-    <xsl:apply-templates mode="idl"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="void" mode="idl">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:text>void&#160;</xsl:text>
-  </span>
-</xsl:template>
-
-<xsl:template match="methodname" mode="idl">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="idl"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="methodparam" mode="idl">
-  <xsl:if test="preceding-sibling::methodparam">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="idl"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="parameter" mode="idl">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="idl"/>
-  </span>
-</xsl:template>
-
-<xsl:template mode="idl" match="constructorsynopsis|destructorsynopsis|methodsynopsis">
-  <xsl:variable name="start-modifiers" select="modifier[following-sibling::*[local-name(.) != 'modifier']]"/>
-  <xsl:variable name="notmod" select="*[local-name(.) != 'modifier']"/>
-  <xsl:variable name="end-modifiers" select="modifier[preceding-sibling::*[local-name(.) != 'modifier']]"/>
-  <code>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:if test="parent::classsynopsis">
-      <xsl:text>&#160;&#160;</xsl:text>
-    </xsl:if>
-    <xsl:apply-templates select="$start-modifiers" mode="idl"/>
-
-    <!-- type -->
-    <xsl:if test="local-name($notmod[1]) != 'methodname'">
-      <xsl:apply-templates select="$notmod[1]" mode="idl"/>
-    </xsl:if>
-
-    <xsl:apply-templates select="methodname" mode="idl"/>
-    <xsl:text>(</xsl:text>
-    <xsl:apply-templates select="methodparam" mode="idl"/>
-    <xsl:text>)</xsl:text>
-    <xsl:if test="exceptionname">
-      <br/>
-      <xsl:text>&#160;&#160;&#160;&#160;raises(</xsl:text>
-      <xsl:apply-templates select="exceptionname" mode="idl"/>
-      <xsl:text>)</xsl:text>
-    </xsl:if>
-    <xsl:if test="modifier[preceding-sibling::*[local-name(.) != 'modifier']]">
-      <xsl:text> </xsl:text>
-      <xsl:apply-templates select="$end-modifiers" mode="idl"/>
-    </xsl:if>
-    <xsl:text>;</xsl:text>
-  </code>
-  <xsl:call-template name="synop-break"/>
-</xsl:template>
-
-<!-- ===== Perl ======================================================== -->
-
-<xsl:template match="classsynopsis" mode="perl">
-  <pre>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:text>package </xsl:text>
-    <xsl:apply-templates select="ooclass[1]" mode="perl"/>
-    <xsl:text>;</xsl:text>
-    <br/>
-
-    <xsl:if test="ooclass[preceding-sibling::*]">
-      <xsl:text>@ISA = (</xsl:text>
-      <xsl:apply-templates select="ooclass[preceding-sibling::*]" mode="perl"/>
-      <xsl:text>);</xsl:text>
-      <br/>
-    </xsl:if>
-
-    <xsl:apply-templates select="constructorsynopsis                                  |destructorsynopsis                                  |fieldsynopsis                                  |methodsynopsis                                  |classsynopsisinfo" mode="perl"/>
-  </pre>
-</xsl:template>
-
-<xsl:template match="classsynopsisinfo" mode="perl">
-  <xsl:apply-templates mode="perl"/>
-</xsl:template>
-
-<xsl:template match="ooclass|oointerface|ooexception" mode="perl">
-  <xsl:if test="preceding-sibling::*">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="perl"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="modifier|package" mode="perl">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="perl"/>
-    <xsl:if test="following-sibling::*">
-      <xsl:text>&#160;</xsl:text>
-    </xsl:if>
-  </span>
-</xsl:template>
-
-<xsl:template match="classname" mode="perl">
-  <xsl:if test="local-name(preceding-sibling::*[1]) = 'classname'">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="perl"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="interfacename" mode="perl">
-  <xsl:if test="local-name(preceding-sibling::*[1]) = 'interfacename'">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="perl"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="exceptionname" mode="perl">
-  <xsl:if test="local-name(preceding-sibling::*[1]) = 'exceptionname'">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="perl"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="fieldsynopsis" mode="perl">
-  <code>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:if test="parent::classsynopsis">
-      <xsl:text>&#160;&#160;</xsl:text>
-    </xsl:if>
-    <xsl:apply-templates mode="perl"/>
-    <xsl:text>;</xsl:text>
-  </code>
-  <xsl:call-template name="synop-break"/>
-</xsl:template>
-
-<xsl:template match="type" mode="perl">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="perl"/>
-    <xsl:text>&#160;</xsl:text>
-  </span>
-</xsl:template>
-
-<xsl:template match="varname" mode="perl">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="perl"/>
-    <xsl:text>&#160;</xsl:text>
-  </span>
-</xsl:template>
-
-<xsl:template match="initializer" mode="perl">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:text>=&#160;</xsl:text>
-    <xsl:apply-templates mode="perl"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="void" mode="perl">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:text>void&#160;</xsl:text>
-  </span>
-</xsl:template>
-
-<xsl:template match="methodname" mode="perl">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="perl"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="methodparam" mode="perl">
-  <xsl:if test="preceding-sibling::methodparam">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="perl"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="parameter" mode="perl">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="perl"/>
-  </span>
-</xsl:template>
-
-<xsl:template mode="perl" match="constructorsynopsis|destructorsynopsis|methodsynopsis">
-  <xsl:variable name="start-modifiers" select="modifier[following-sibling::*[local-name(.) != 'modifier']]"/>
-  <xsl:variable name="notmod" select="*[local-name(.) != 'modifier']"/>
-  <xsl:variable name="end-modifiers" select="modifier[preceding-sibling::*[local-name(.) != 'modifier']]"/>
-
-  <code>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:text>sub </xsl:text>
-
-    <xsl:apply-templates select="methodname" mode="perl"/>
-    <xsl:text> { ... };</xsl:text>
-  </code>
-  <xsl:call-template name="synop-break"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<!-- * DocBook 5 allows linking elements (link, olink, and xref) -->
-<!-- * within the OO *synopsis elements (classsynopsis, fieldsynopsis, -->
-<!-- * methodsynopsis, constructorsynopsis, destructorsynopsis) and -->
-<!-- * their children. So we need to have mode="java|cpp|idl|perl" -->
-<!-- * per-mode matches for those linking elements in order for them -->
-<!-- * to be processed as expected. -->
-
-<xsl:template match="link|olink|xref" mode="java">
-  <xsl:apply-templates select="."/>
-</xsl:template>
-
-<xsl:template match="link|olink|xref" mode="cpp">
-  <xsl:apply-templates select="."/>
-</xsl:template>
-
-<xsl:template match="link|olink|xref" mode="idl">
-  <xsl:apply-templates select="."/>
-</xsl:template>
-
-<xsl:template match="link|olink|xref" mode="perl">
-  <xsl:apply-templates select="."/>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/table.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/table.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,1093 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" xmlns:stbl="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.Table" xmlns:xtbl="xalan://com.nwalsh.xalan.Table" xmlns:lxslt="http://xml.apache.org/xslt" xmlns:ptbl="http://nwalsh.com/xslt/ext/xsltproc/python/Table" xmlns="http://www.w3.org/1999/xhtml" exclude-result-prefixes="doc stbl xtbl lxslt ptbl" version="1.0">
-
-<xsl:include href="../common/table.xsl"/>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<lxslt:component prefix="xtbl" functions="adjustColumnWidths"/>
-
-<xsl:template name="empty.table.cell">
-  <xsl:param name="colnum" select="0"/>
-
-  <xsl:variable name="rowsep">
-    <xsl:choose>
-      <!-- If this is the last row, rowsep never applies. -->
-      <xsl:when test="not(ancestor-or-self::row[1]/following-sibling::row                           or ancestor-or-self::thead/following-sibling::tbody                           or ancestor-or-self::tbody/preceding-sibling::tfoot)">
-        <xsl:value-of select="0"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="inherited.table.attribute">
-          <xsl:with-param name="entry" select="NOT-AN-ELEMENT-NAME"/>
-          <xsl:with-param name="row" select="ancestor-or-self::row[1]"/>
-          <xsl:with-param name="colnum" select="$colnum"/>
-          <xsl:with-param name="attribute" select="'rowsep'"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="colsep">
-    <xsl:choose>
-      <!-- If this is the last column, colsep never applies. -->
-      <xsl:when test="number($colnum) &gt;= ancestor::tgroup/@cols">0</xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="inherited.table.attribute">
-          <xsl:with-param name="entry" select="NOT-AN-ELEMENT-NAME"/>
-          <xsl:with-param name="row" select="ancestor-or-self::row[1]"/>
-          <xsl:with-param name="colnum" select="$colnum"/>
-          <xsl:with-param name="attribute" select="'colsep'"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <td class="auto-generated">
-    <xsl:if test="$table.borders.with.css != 0">
-      <xsl:attribute name="style">
-        <xsl:if test="$colsep &gt; 0">
-          <xsl:call-template name="border">
-            <xsl:with-param name="side" select="'right'"/>
-          </xsl:call-template>
-        </xsl:if>
-        <xsl:if test="$rowsep &gt; 0">
-          <xsl:call-template name="border">
-            <xsl:with-param name="side" select="'bottom'"/>
-          </xsl:call-template>
-        </xsl:if>
-      </xsl:attribute>
-    </xsl:if>
-    <xsl:text>&#160;</xsl:text>
-  </td>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="border">
-  <xsl:param name="side" select="'left'"/>
-  <xsl:param name="padding" select="0"/>
-  <xsl:param name="style" select="$table.cell.border.style"/>
-  <xsl:param name="color" select="$table.cell.border.color"/>
-  <xsl:param name="thickness" select="$table.cell.border.thickness"/>
-
-  <!-- Note: Some browsers (mozilla) require at least a width and style. -->
-
-  <xsl:choose>
-    <xsl:when test="($thickness != ''                      and $style != ''                      and $color != '')                     or ($thickness != ''                         and $style != '')                     or ($thickness != '')">
-      <!-- use the compound property if we can: -->
-      <!-- it saves space and probably works more reliably -->
-      <xsl:text>border-</xsl:text>
-      <xsl:value-of select="$side"/>
-      <xsl:text>: </xsl:text>
-      <xsl:value-of select="$thickness"/>
-      <xsl:text> </xsl:text>
-      <xsl:value-of select="$style"/>
-      <xsl:text> </xsl:text>
-      <xsl:value-of select="$color"/>
-      <xsl:text>; </xsl:text>
-    </xsl:when>
-    <xsl:otherwise>
-      <!-- we need to specify the styles individually -->
-      <xsl:if test="$thickness != ''">
-        <xsl:text>border-</xsl:text>
-        <xsl:value-of select="$side"/>
-        <xsl:text>-width: </xsl:text>
-        <xsl:value-of select="$thickness"/>
-        <xsl:text>; </xsl:text>
-      </xsl:if>
-
-      <xsl:if test="$style != ''">
-        <xsl:text>border-</xsl:text>
-        <xsl:value-of select="$side"/>
-        <xsl:text>-style: </xsl:text>
-        <xsl:value-of select="$style"/>
-        <xsl:text>; </xsl:text>
-      </xsl:if>
-
-      <xsl:if test="$color != ''">
-        <xsl:text>border-</xsl:text>
-        <xsl:value-of select="$side"/>
-        <xsl:text>-color: </xsl:text>
-        <xsl:value-of select="$color"/>
-        <xsl:text>; </xsl:text>
-      </xsl:if>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="tgroup" name="tgroup">
-  <xsl:if test="not(@cols) or @cols = '' or string(number(@cols)) = 'NaN'">
-    <xsl:message terminate="yes">
-      <xsl:text>Error: CALS tables must specify the number of columns.</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <xsl:variable name="summary">
-    <xsl:call-template name="pi.dbhtml_table-summary"/>
-  </xsl:variable>
-
-  <xsl:variable name="cellspacing">
-    <xsl:call-template name="pi.dbhtml_cellspacing"/>
-  </xsl:variable>
-
-  <xsl:variable name="cellpadding">
-    <xsl:call-template name="pi.dbhtml_cellpadding"/>
-  </xsl:variable>
-
-  <table>
-    <xsl:choose>
-      <!-- If there's a textobject/phrase for the table summary, use it -->
-      <xsl:when test="../textobject/phrase">
-        <xsl:attribute name="summary">
-          <xsl:value-of select="../textobject/phrase"/>
-        </xsl:attribute>
-      </xsl:when>
-
-      <!-- If there's a <?dbhtml table-summary="foo"?> PI, use it for
-           the HTML table summary attribute -->
-      <xsl:when test="$summary != ''">
-        <xsl:attribute name="summary">
-          <xsl:value-of select="$summary"/>
-        </xsl:attribute>
-      </xsl:when>
-
-      <!-- Otherwise, if there's a title, use that -->
-      <xsl:when test="../title">
-        <xsl:attribute name="summary">
-          <xsl:value-of select="string(../title)"/>
-        </xsl:attribute>
-      </xsl:when>
-
-      <!-- Otherwise, forget the whole idea -->
-      <xsl:otherwise><!-- nevermind --></xsl:otherwise>
-    </xsl:choose>
-
-    <xsl:if test="$cellspacing != '' or $html.cellspacing != ''">
-      <xsl:attribute name="cellspacing">
-        <xsl:choose>
-          <xsl:when test="$cellspacing != ''">
-            <xsl:value-of select="$cellspacing"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="$html.cellspacing"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:attribute>
-    </xsl:if>
-
-    <xsl:if test="$cellpadding != '' or $html.cellpadding != ''">
-      <xsl:attribute name="cellpadding">
-        <xsl:choose>
-          <xsl:when test="$cellpadding != ''">
-            <xsl:value-of select="$cellpadding"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="$html.cellpadding"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:attribute>
-    </xsl:if>
-
-    <xsl:if test="../@pgwide=1 or local-name(.) = 'entrytbl'">
-      <xsl:attribute name="width">100%</xsl:attribute>
-    </xsl:if>
-
-    <xsl:choose>
-      <xsl:when test="$table.borders.with.css != 0">
-        <xsl:choose>
-          <xsl:when test="../@frame='all' or (not(../@frame) and $default.table.frame='all')">
-            <xsl:attribute name="style">
-              <xsl:text>border-collapse: collapse;</xsl:text>
-              <xsl:call-template name="border">
-                <xsl:with-param name="side" select="'top'"/>
-                <xsl:with-param name="style" select="$table.frame.border.style"/>
-                <xsl:with-param name="color" select="$table.frame.border.color"/>
-                <xsl:with-param name="thickness" select="$table.frame.border.thickness"/>
-              </xsl:call-template>
-              <xsl:call-template name="border">
-                <xsl:with-param name="side" select="'bottom'"/>
-                <xsl:with-param name="style" select="$table.frame.border.style"/>
-                <xsl:with-param name="color" select="$table.frame.border.color"/>
-                <xsl:with-param name="thickness" select="$table.frame.border.thickness"/>
-              </xsl:call-template>
-              <xsl:call-template name="border">
-                <xsl:with-param name="side" select="'left'"/>
-                <xsl:with-param name="style" select="$table.frame.border.style"/>
-                <xsl:with-param name="color" select="$table.frame.border.color"/>
-                <xsl:with-param name="thickness" select="$table.frame.border.thickness"/>
-              </xsl:call-template>
-              <xsl:call-template name="border">
-                <xsl:with-param name="side" select="'right'"/>
-                <xsl:with-param name="style" select="$table.frame.border.style"/>
-                <xsl:with-param name="color" select="$table.frame.border.color"/>
-                <xsl:with-param name="thickness" select="$table.frame.border.thickness"/>
-              </xsl:call-template>
-            </xsl:attribute>
-          </xsl:when>
-          <xsl:when test="../@frame='topbot' or (not(../@frame) and $default.table.frame='topbot')">
-            <xsl:attribute name="style">
-              <xsl:text>border-collapse: collapse;</xsl:text>
-              <xsl:call-template name="border">
-                <xsl:with-param name="side" select="'top'"/>
-                <xsl:with-param name="style" select="$table.frame.border.style"/>
-                <xsl:with-param name="color" select="$table.frame.border.color"/>
-                <xsl:with-param name="thickness" select="$table.frame.border.thickness"/>
-              </xsl:call-template>
-              <xsl:call-template name="border">
-                <xsl:with-param name="side" select="'bottom'"/>
-                <xsl:with-param name="style" select="$table.frame.border.style"/>
-                <xsl:with-param name="color" select="$table.frame.border.color"/>
-                <xsl:with-param name="thickness" select="$table.frame.border.thickness"/>
-              </xsl:call-template>
-            </xsl:attribute>
-          </xsl:when>
-          <xsl:when test="../@frame='top' or (not(../@frame) and $default.table.frame='top')">
-            <xsl:attribute name="style">
-              <xsl:text>border-collapse: collapse;</xsl:text>
-              <xsl:call-template name="border">
-                <xsl:with-param name="side" select="'top'"/>
-                <xsl:with-param name="style" select="$table.frame.border.style"/>
-                <xsl:with-param name="color" select="$table.frame.border.color"/>
-                <xsl:with-param name="thickness" select="$table.frame.border.thickness"/>
-              </xsl:call-template>
-            </xsl:attribute>
-          </xsl:when>
-          <xsl:when test="../@frame='bottom' or (not(../@frame) and $default.table.frame='bottom')">
-            <xsl:attribute name="style">
-              <xsl:text>border-collapse: collapse;</xsl:text>
-              <xsl:call-template name="border">
-                <xsl:with-param name="side" select="'bottom'"/>
-                <xsl:with-param name="style" select="$table.frame.border.style"/>
-                <xsl:with-param name="color" select="$table.frame.border.color"/>
-                <xsl:with-param name="thickness" select="$table.frame.border.thickness"/>
-              </xsl:call-template>
-            </xsl:attribute>
-          </xsl:when>
-          <xsl:when test="../@frame='sides' or (not(../@frame) and $default.table.frame='sides')">
-            <xsl:attribute name="style">
-              <xsl:text>border-collapse: collapse;</xsl:text>
-              <xsl:call-template name="border">
-                <xsl:with-param name="side" select="'left'"/>
-                <xsl:with-param name="style" select="$table.frame.border.style"/>
-                <xsl:with-param name="color" select="$table.frame.border.color"/>
-                <xsl:with-param name="thickness" select="$table.frame.border.thickness"/>
-              </xsl:call-template>
-              <xsl:call-template name="border">
-                <xsl:with-param name="side" select="'right'"/>
-                <xsl:with-param name="style" select="$table.frame.border.style"/>
-                <xsl:with-param name="color" select="$table.frame.border.color"/>
-                <xsl:with-param name="thickness" select="$table.frame.border.thickness"/>
-              </xsl:call-template>
-            </xsl:attribute>
-          </xsl:when>
-	  <xsl:when test="../@frame='none'">
-	    <xsl:attribute name="style">
-	      <xsl:text>border: none;</xsl:text>
-	    </xsl:attribute>
-	  </xsl:when>
-          <xsl:otherwise>
-            <xsl:attribute name="style">
-              <xsl:text>border-collapse: collapse;</xsl:text>
-            </xsl:attribute>
-          </xsl:otherwise>
-        </xsl:choose>
-
-      </xsl:when>
-      <xsl:when test="../@frame='none' or (not(../@frame) and $default.table.frame='none') or local-name(.) = 'entrytbl'">
-        <xsl:attribute name="border">0</xsl:attribute>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:attribute name="border">1</xsl:attribute>
-      </xsl:otherwise>
-    </xsl:choose>
-
-    <xsl:variable name="colgroup">
-      <colgroup>
-        <xsl:call-template name="generate.colgroup">
-          <xsl:with-param name="cols" select="@cols"/>
-        </xsl:call-template>
-      </colgroup>
-    </xsl:variable>
-
-    <xsl:variable name="explicit.table.width">
-      <xsl:call-template name="pi.dbhtml_table-width">
-        <xsl:with-param name="node" select=".."/>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <xsl:variable name="table.width">
-      <xsl:choose>
-        <xsl:when test="$explicit.table.width != ''">
-          <xsl:value-of select="$explicit.table.width"/>
-        </xsl:when>
-        <xsl:when test="$default.table.width = ''">
-          <xsl:text>100%</xsl:text>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="$default.table.width"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-
-    <xsl:if test="$default.table.width != ''                   or $explicit.table.width != ''">
-      <xsl:attribute name="width">
-        <xsl:choose>
-          <xsl:when test="contains($table.width, '%')">
-            <xsl:value-of select="$table.width"/>
-          </xsl:when>
-          <xsl:when test="$use.extensions != 0                           and $tablecolumns.extension != 0">
-            <xsl:choose>
-              <xsl:when test="function-available('stbl:convertLength')">
-                <xsl:value-of select="stbl:convertLength($table.width)"/>
-              </xsl:when>
-              <xsl:when test="function-available('xtbl:convertLength')">
-                <xsl:value-of select="xtbl:convertLength($table.width)"/>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:message terminate="yes">
-                  <xsl:text>No convertLength function available.</xsl:text>
-                </xsl:message>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="$table.width"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:attribute>
-    </xsl:if>
-
-    <xsl:choose>
-      <xsl:when test="$use.extensions != 0                       and $tablecolumns.extension != 0">
-        <xsl:choose>
-          <xsl:when test="function-available('stbl:adjustColumnWidths')">
-            <xsl:copy-of select="stbl:adjustColumnWidths($colgroup)"/>
-          </xsl:when>
-          <xsl:when test="function-available('xtbl:adjustColumnWidths')">
-            <xsl:copy-of select="xtbl:adjustColumnWidths($colgroup)"/>
-          </xsl:when>
-          <xsl:when test="function-available('ptbl:adjustColumnWidths')">
-            <xsl:copy-of select="ptbl:adjustColumnWidths($colgroup)"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:message terminate="yes">
-              <xsl:text>No adjustColumnWidths function available.</xsl:text>
-            </xsl:message>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:copy-of select="$colgroup"/>
-      </xsl:otherwise>
-    </xsl:choose>
-
-    <xsl:apply-templates select="thead"/>
-    <xsl:apply-templates select="tfoot"/>
-    <xsl:apply-templates select="tbody"/>
-
-    <xsl:if test=".//footnote">
-      <tbody class="footnotes">
-        <tr>
-          <td colspan="{@cols}">
-            <xsl:apply-templates select=".//footnote" mode="table.footnote.mode"/>
-          </td>
-        </tr>
-      </tbody>
-    </xsl:if>
-  </table>
-</xsl:template>
-
-<xsl:template match="tgroup/processing-instruction('dbhtml')">
-  <xsl:variable name="summary">
-    <xsl:call-template name="pi.dbhtml_table-summary"/>
-  </xsl:variable>
-
-  <!-- Suppress the table-summary PI -->
-  <xsl:if test="$summary = ''">
-    <xsl:processing-instruction name="dbhtml">
-      <xsl:value-of select="."/>
-    </xsl:processing-instruction>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="colspec"/>
-
-<xsl:template match="spanspec"/>
-
-<xsl:template match="thead|tfoot">
-  <xsl:element name="{local-name(.)}" namespace="http://www.w3.org/1999/xhtml">
-    <xsl:if test="@align">
-      <xsl:attribute name="align">
-        <xsl:value-of select="@align"/>
-      </xsl:attribute>
-    </xsl:if>
-    <xsl:if test="@char">
-      <xsl:attribute name="char">
-        <xsl:value-of select="@char"/>
-      </xsl:attribute>
-    </xsl:if>
-    <xsl:if test="@charoff">
-      <xsl:attribute name="charoff">
-        <xsl:value-of select="@charoff"/>
-      </xsl:attribute>
-    </xsl:if>
-    <xsl:if test="@valign">
-      <xsl:attribute name="valign">
-        <xsl:value-of select="@valign"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <xsl:apply-templates select="row[1]">
-      <xsl:with-param name="spans">
-        <xsl:call-template name="blank.spans">
-          <xsl:with-param name="cols" select="../@cols"/>
-        </xsl:call-template>
-      </xsl:with-param>
-    </xsl:apply-templates>
-
-  </xsl:element>
-</xsl:template>
-
-<xsl:template match="tbody">
-  <tbody>
-    <xsl:if test="@align">
-      <xsl:attribute name="align">
-        <xsl:value-of select="@align"/>
-      </xsl:attribute>
-    </xsl:if>
-    <xsl:if test="@char">
-      <xsl:attribute name="char">
-        <xsl:value-of select="@char"/>
-      </xsl:attribute>
-    </xsl:if>
-    <xsl:if test="@charoff">
-      <xsl:attribute name="charoff">
-        <xsl:value-of select="@charoff"/>
-      </xsl:attribute>
-    </xsl:if>
-    <xsl:if test="@valign">
-      <xsl:attribute name="valign">
-        <xsl:value-of select="@valign"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <xsl:apply-templates select="row[1]">
-      <xsl:with-param name="spans">
-        <xsl:call-template name="blank.spans">
-          <xsl:with-param name="cols" select="../@cols"/>
-        </xsl:call-template>
-      </xsl:with-param>
-    </xsl:apply-templates>
-
-  </tbody>
-</xsl:template>
-
-<xsl:template match="row">
-  <xsl:param name="spans"/>
-
-  <xsl:choose>
-    <xsl:when test="contains($spans, '0')">
-      <xsl:call-template name="normal-row">
-	<xsl:with-param name="spans" select="$spans"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <!--
-      <xsl:message>
-	<xsl:text>Ignoring row: </xsl:text>
-	<xsl:value-of select="$spans"/>
-	<xsl:text> = </xsl:text>
-	<xsl:call-template name="consume-row">
-	  <xsl:with-param name="spans" select="$spans"/>
-	</xsl:call-template>
-      </xsl:message>
-      -->
-
-      <xsl:if test="normalize-space(.//text()) != ''">
-	<xsl:message>Warning: overlapped row contains content!</xsl:message>
-      </xsl:if>
-
-      <tr><xsl:comment> This row intentionally left blank </xsl:comment></tr>
-
-      <xsl:apply-templates select="following-sibling::row[1]">
-	<xsl:with-param name="spans">
-	  <xsl:call-template name="consume-row">
-	    <xsl:with-param name="spans" select="$spans"/>
-	  </xsl:call-template>
-	</xsl:with-param>
-      </xsl:apply-templates>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="normal-row">
-  <xsl:param name="spans"/>
-
-  <xsl:variable name="row-height">
-    <xsl:if test="processing-instruction('dbhtml')">
-      <xsl:call-template name="pi.dbhtml_row-height"/>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:variable name="bgcolor">
-    <xsl:if test="processing-instruction('dbhtml')">
-      <xsl:call-template name="pi.dbhtml_bgcolor"/>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:variable name="class">
-    <xsl:if test="processing-instruction('dbhtml')">
-      <xsl:call-template name="pi.dbhtml_class"/>
-    </xsl:if>
-  </xsl:variable>
-
-  <tr>
-    <xsl:call-template name="tr.attributes">
-      <xsl:with-param name="rownum">
-        <xsl:number from="tgroup" count="row"/>
-      </xsl:with-param>
-    </xsl:call-template>
-
-    <xsl:if test="$row-height != ''">
-      <xsl:attribute name="height">
-        <xsl:value-of select="$row-height"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <xsl:if test="$bgcolor != ''">
-      <xsl:attribute name="bgcolor">
-        <xsl:value-of select="$bgcolor"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <xsl:if test="$class != ''">
-      <xsl:attribute name="class">
-        <xsl:value-of select="$class"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <xsl:if test="$table.borders.with.css != 0">
-      <xsl:if test="@rowsep = 1 and following-sibling::row">
-        <xsl:attribute name="style">
-          <xsl:call-template name="border">
-            <xsl:with-param name="side" select="'bottom'"/>
-          </xsl:call-template>
-        </xsl:attribute>
-      </xsl:if>
-    </xsl:if>
-
-    <xsl:if test="@align">
-      <xsl:attribute name="align">
-        <xsl:value-of select="@align"/>
-      </xsl:attribute>
-    </xsl:if>
-    <xsl:if test="@char">
-      <xsl:attribute name="char">
-        <xsl:value-of select="@char"/>
-      </xsl:attribute>
-    </xsl:if>
-    <xsl:if test="@charoff">
-      <xsl:attribute name="charoff">
-        <xsl:value-of select="@charoff"/>
-      </xsl:attribute>
-    </xsl:if>
-    <xsl:if test="@valign">
-      <xsl:attribute name="valign">
-        <xsl:value-of select="@valign"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <xsl:apply-templates select="(entry|entrytbl)[1]">
-      <xsl:with-param name="spans" select="$spans"/>
-    </xsl:apply-templates>
-  </tr>
-
-  <xsl:if test="following-sibling::row">
-    <xsl:variable name="nextspans">
-      <xsl:apply-templates select="(entry|entrytbl)[1]" mode="span">
-        <xsl:with-param name="spans" select="$spans"/>
-      </xsl:apply-templates>
-    </xsl:variable>
-
-    <xsl:apply-templates select="following-sibling::row[1]">
-      <xsl:with-param name="spans" select="$nextspans"/>
-    </xsl:apply-templates>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="entry|entrytbl" name="entry">
-  <xsl:param name="col" select="1"/>
-  <xsl:param name="spans"/>
-
-  <xsl:variable name="cellgi">
-    <xsl:choose>
-      <xsl:when test="ancestor::thead">th</xsl:when>
-      <xsl:when test="ancestor::tfoot">th</xsl:when>
-      <xsl:otherwise>td</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="empty.cell" select="count(node()) = 0"/>
-
-  <xsl:variable name="named.colnum">
-    <xsl:call-template name="entry.colnum"/>
-  </xsl:variable>
-
-  <xsl:variable name="entry.colnum">
-    <xsl:choose>
-      <xsl:when test="$named.colnum &gt; 0">
-        <xsl:value-of select="$named.colnum"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$col"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="entry.colspan">
-    <xsl:choose>
-      <xsl:when test="@spanname or @namest">
-        <xsl:call-template name="calculate.colspan"/>
-      </xsl:when>
-      <xsl:otherwise>1</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="following.spans">
-    <xsl:call-template name="calculate.following.spans">
-      <xsl:with-param name="colspan" select="$entry.colspan"/>
-      <xsl:with-param name="spans" select="$spans"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="rowsep">
-    <xsl:choose>
-      <!-- If this is the last row, rowsep never applies. -->
-      <xsl:when test="ancestor::entrytbl                       and not (ancestor-or-self::row[1]/following-sibling::row)">
-        <xsl:value-of select="0"/>
-      </xsl:when>
-      <xsl:when test="not(ancestor-or-self::row[1]/following-sibling::row                           or ancestor-or-self::thead/following-sibling::tbody                           or ancestor-or-self::tbody/preceding-sibling::tfoot)">
-        <xsl:value-of select="0"/>
-      </xsl:when>
-      <xsl:when test="@morerows and not(@morerows &lt;                   count(ancestor-or-self::row[1]/following-sibling::row))">
-        <xsl:value-of select="0"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="inherited.table.attribute">
-          <xsl:with-param name="entry" select="."/>
-          <xsl:with-param name="colnum" select="$entry.colnum"/>
-          <xsl:with-param name="attribute" select="'rowsep'"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="colsep">
-    <xsl:choose>
-      <!-- If this is the last column, colsep never applies. -->
-      <xsl:when test="$following.spans = ''">0</xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="inherited.table.attribute">
-          <xsl:with-param name="entry" select="."/>
-          <xsl:with-param name="colnum" select="$entry.colnum"/>
-          <xsl:with-param name="attribute" select="'colsep'"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="valign">
-    <xsl:call-template name="inherited.table.attribute">
-      <xsl:with-param name="entry" select="."/>
-      <xsl:with-param name="colnum" select="$entry.colnum"/>
-      <xsl:with-param name="attribute" select="'valign'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="align">
-    <xsl:call-template name="inherited.table.attribute">
-      <xsl:with-param name="entry" select="."/>
-      <xsl:with-param name="colnum" select="$entry.colnum"/>
-      <xsl:with-param name="attribute" select="'align'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="char">
-    <xsl:call-template name="inherited.table.attribute">
-      <xsl:with-param name="entry" select="."/>
-      <xsl:with-param name="colnum" select="$entry.colnum"/>
-      <xsl:with-param name="attribute" select="'char'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="charoff">
-    <xsl:call-template name="inherited.table.attribute">
-      <xsl:with-param name="entry" select="."/>
-      <xsl:with-param name="colnum" select="$entry.colnum"/>
-      <xsl:with-param name="attribute" select="'charoff'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$spans != '' and not(starts-with($spans,'0:'))">
-      <xsl:call-template name="entry">
-        <xsl:with-param name="col" select="$col+1"/>
-        <xsl:with-param name="spans" select="substring-after($spans,':')"/>
-      </xsl:call-template>
-    </xsl:when>
-
-    <xsl:when test="number($entry.colnum) &gt; $col">
-      <xsl:call-template name="empty.table.cell"/>
-      <xsl:call-template name="entry">
-        <xsl:with-param name="col" select="$col+1"/>
-        <xsl:with-param name="spans" select="substring-after($spans,':')"/>
-      </xsl:call-template>
-    </xsl:when>
-
-    <xsl:otherwise>
-      <xsl:variable name="bgcolor">
-        <xsl:if test="processing-instruction('dbhtml')">
-          <xsl:call-template name="pi.dbhtml_bgcolor"/>
-        </xsl:if>
-      </xsl:variable>
-
-      <xsl:element name="{$cellgi}" namespace="http://www.w3.org/1999/xhtml">
-        <xsl:if test="$bgcolor != ''">
-          <xsl:attribute name="bgcolor">
-            <xsl:value-of select="$bgcolor"/>
-          </xsl:attribute>
-        </xsl:if>
-
-        <xsl:if test="$entry.propagates.style != 0 and @role">
-          <xsl:apply-templates select="." mode="class.attribute">
-            <xsl:with-param name="class" select="@role"/>
-          </xsl:apply-templates>
-        </xsl:if>
-
-        <xsl:if test="$show.revisionflag and @revisionflag">
-          <xsl:attribute name="class">
-            <xsl:value-of select="@revisionflag"/>
-          </xsl:attribute>
-        </xsl:if>
-
-        <xsl:if test="$table.borders.with.css != 0">
-          <xsl:attribute name="style">
-            <xsl:if test="$colsep &gt; 0">
-              <xsl:call-template name="border">
-                <xsl:with-param name="side" select="'right'"/>
-              </xsl:call-template>
-            </xsl:if>
-            <xsl:if test="$rowsep &gt; 0">
-              <xsl:call-template name="border">
-                <xsl:with-param name="side" select="'bottom'"/>
-              </xsl:call-template>
-            </xsl:if>
-          </xsl:attribute>
-        </xsl:if>
-
-        <xsl:if test="@morerows &gt; 0">
-          <xsl:attribute name="rowspan">
-            <xsl:value-of select="1+@morerows"/>
-          </xsl:attribute>
-        </xsl:if>
-
-        <xsl:if test="$entry.colspan &gt; 1">
-          <xsl:attribute name="colspan">
-            <xsl:value-of select="$entry.colspan"/>
-          </xsl:attribute>
-        </xsl:if>
-
-        <xsl:if test="$align != ''">
-          <xsl:attribute name="align">
-            <xsl:value-of select="$align"/>
-          </xsl:attribute>
-        </xsl:if>
-
-        <xsl:if test="$valign != ''">
-          <xsl:attribute name="valign">
-            <xsl:value-of select="$valign"/>
-          </xsl:attribute>
-        </xsl:if>
-
-        <xsl:if test="$char != ''">
-          <xsl:attribute name="char">
-            <xsl:value-of select="$char"/>
-          </xsl:attribute>
-        </xsl:if>
-
-        <xsl:if test="$charoff != ''">
-          <xsl:attribute name="charoff">
-            <xsl:value-of select="$charoff"/>
-          </xsl:attribute>
-        </xsl:if>
-
-        <xsl:if test="not(preceding-sibling::*) and                      (ancestor::row[1]/@id or ancestor::row[1]/@xml:id)">
-          <xsl:call-template name="anchor">
-            <xsl:with-param name="node" select="ancestor::row[1]"/>
-          </xsl:call-template>
-        </xsl:if>
-
-        <xsl:call-template name="anchor"/>
-
-        <xsl:choose>
-          <xsl:when test="$empty.cell">
-            <xsl:text>&#160;</xsl:text>
-          </xsl:when>
-          <xsl:when test="self::entrytbl">
-            <xsl:call-template name="tgroup"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:apply-templates/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:element>
-
-      <xsl:choose>
-        <xsl:when test="following-sibling::entry|following-sibling::entrytbl">
-          <xsl:apply-templates select="(following-sibling::entry                                        |following-sibling::entrytbl)[1]">
-            <xsl:with-param name="col" select="$col+$entry.colspan"/>
-            <xsl:with-param name="spans" select="$following.spans"/>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="finaltd">
-            <xsl:with-param name="spans" select="$following.spans"/>
-            <xsl:with-param name="col" select="$col+$entry.colspan"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="entry|entrytbl" name="sentry" mode="span">
-  <xsl:param name="col" select="1"/>
-  <xsl:param name="spans"/>
-
-  <xsl:variable name="entry.colnum">
-    <xsl:call-template name="entry.colnum"/>
-  </xsl:variable>
-
-  <xsl:variable name="entry.colspan">
-    <xsl:choose>
-      <xsl:when test="@spanname or @namest">
-        <xsl:call-template name="calculate.colspan"/>
-      </xsl:when>
-      <xsl:otherwise>1</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="following.spans">
-    <xsl:call-template name="calculate.following.spans">
-      <xsl:with-param name="colspan" select="$entry.colspan"/>
-      <xsl:with-param name="spans" select="$spans"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$spans != '' and not(starts-with($spans,'0:'))">
-      <xsl:value-of select="substring-before($spans,':')-1"/>
-      <xsl:text>:</xsl:text>
-      <xsl:call-template name="sentry">
-        <xsl:with-param name="col" select="$col+1"/>
-        <xsl:with-param name="spans" select="substring-after($spans,':')"/>
-      </xsl:call-template>
-    </xsl:when>
-
-    <xsl:when test="number($entry.colnum) &gt; $col">
-      <xsl:text>0:</xsl:text>
-      <xsl:call-template name="sentry">
-        <xsl:with-param name="col" select="$col+$entry.colspan"/>
-        <xsl:with-param name="spans" select="$following.spans"/>
-      </xsl:call-template>
-    </xsl:when>
-
-    <xsl:otherwise>
-      <xsl:call-template name="copy-string">
-        <xsl:with-param name="count" select="$entry.colspan"/>
-        <xsl:with-param name="string">
-          <xsl:choose>
-            <xsl:when test="@morerows">
-              <xsl:value-of select="@morerows"/>
-            </xsl:when>
-            <xsl:otherwise>0</xsl:otherwise>
-          </xsl:choose>
-          <xsl:text>:</xsl:text>
-        </xsl:with-param>
-      </xsl:call-template>
-
-      <xsl:choose>
-        <xsl:when test="following-sibling::entry|following-sibling::entrytbl">
-          <xsl:apply-templates select="(following-sibling::entry                                         |following-sibling::entrytbl)[1]" mode="span">
-            <xsl:with-param name="col" select="$col+$entry.colspan"/>
-            <xsl:with-param name="spans" select="$following.spans"/>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="sfinaltd">
-            <xsl:with-param name="spans" select="$following.spans"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="generate.colgroup">
-  <xsl:param name="cols" select="1"/>
-  <xsl:param name="count" select="1"/>
-  <xsl:choose>
-    <xsl:when test="$count &gt; $cols"/>
-    <xsl:otherwise>
-      <xsl:call-template name="generate.col">
-        <xsl:with-param name="countcol" select="$count"/>
-      </xsl:call-template>
-      <xsl:call-template name="generate.colgroup">
-        <xsl:with-param name="cols" select="$cols"/>
-        <xsl:with-param name="count" select="$count+1"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="generate.col">
-  <xsl:param name="countcol">1</xsl:param>
-  <xsl:param name="colspecs" select="./colspec"/>
-  <xsl:param name="count">1</xsl:param>
-  <xsl:param name="colnum">1</xsl:param>
-
-  <xsl:choose>
-    <xsl:when test="$count&gt;count($colspecs)">
-      <col/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:variable name="colspec" select="$colspecs[$count=position()]"/>
-      <xsl:variable name="colspec.colnum">
-        <xsl:choose>
-          <xsl:when test="$colspec/@colnum">
-            <xsl:value-of select="$colspec/@colnum"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="$colnum"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-
-      <xsl:choose>
-        <xsl:when test="$colspec.colnum=$countcol">
-          <col>
-            <xsl:if test="$colspec/@colwidth                           and $use.extensions != 0                           and $tablecolumns.extension != 0">
-              <xsl:attribute name="width">
-	        <xsl:choose>
-		  <xsl:when test="normalize-space($colspec/@colwidth) = '*'">
-                    <xsl:value-of select="'1*'"/>
-		  </xsl:when>
-		  <xsl:otherwise>
-                    <xsl:value-of select="$colspec/@colwidth"/>
-		  </xsl:otherwise>
-		</xsl:choose>
-              </xsl:attribute>
-            </xsl:if>
-
-            <xsl:choose>
-              <xsl:when test="$colspec/@align">
-                <xsl:attribute name="align">
-                  <xsl:value-of select="$colspec/@align"/>
-                </xsl:attribute>
-              </xsl:when>
-              <!-- Suggested by Pavel ZAMPACH <zampach@nemcb.cz> -->
-              <xsl:when test="$colspecs/ancestor::tgroup/@align">
-                <xsl:attribute name="align">
-                  <xsl:value-of select="$colspecs/ancestor::tgroup/@align"/>
-                </xsl:attribute>
-              </xsl:when>
-            </xsl:choose>
-
-            <xsl:if test="$colspec/@char">
-              <xsl:attribute name="char">
-                <xsl:value-of select="$colspec/@char"/>
-              </xsl:attribute>
-            </xsl:if>
-            <xsl:if test="$colspec/@charoff">
-              <xsl:attribute name="charoff">
-                <xsl:value-of select="$colspec/@charoff"/>
-              </xsl:attribute>
-            </xsl:if>
-          </col>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="generate.col">
-            <xsl:with-param name="countcol" select="$countcol"/>
-            <xsl:with-param name="colspecs" select="$colspecs"/>
-            <xsl:with-param name="count" select="$count+1"/>
-            <xsl:with-param name="colnum">
-              <xsl:choose>
-                <xsl:when test="$colspec/@colnum">
-                  <xsl:value-of select="$colspec/@colnum + 1"/>
-                </xsl:when>
-                <xsl:otherwise>
-                  <xsl:value-of select="$colnum + 1"/>
-                </xsl:otherwise>
-              </xsl:choose>
-            </xsl:with-param>
-           </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="colspec.colwidth">
-  <!-- when this macro is called, the current context must be an entry -->
-  <xsl:param name="colname"/>
-  <!-- .. = row, ../.. = thead|tbody, ../../.. = tgroup -->
-  <xsl:param name="colspecs" select="../../../../tgroup/colspec"/>
-  <xsl:param name="count">1</xsl:param>
-  <xsl:choose>
-    <xsl:when test="$count&gt;count($colspecs)"/>
-    <xsl:otherwise>
-      <xsl:variable name="colspec" select="$colspecs[$count=position()]"/>
-      <xsl:choose>
-        <xsl:when test="$colspec/@colname=$colname">
-          <xsl:value-of select="$colspec/@colwidth"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="colspec.colwidth">
-            <xsl:with-param name="colname" select="$colname"/>
-            <xsl:with-param name="colspecs" select="$colspecs"/>
-            <xsl:with-param name="count" select="$count+1"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ====================================================================== -->
-
-<xsl:template name="tr.attributes">
-  <xsl:param name="row" select="."/>
-  <xsl:param name="rownum" select="0"/>
-
-  <!-- by default, do nothing. But you might want to say:
-
-  <xsl:if test="$rownum mod 2 = 0">
-    <xsl:attribute name="class">oddrow</xsl:attribute>
-  </xsl:if>
-
-  -->
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/task.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/task.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,73 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:template match="task">
-  <xsl:variable name="param.placement" select="substring-after(normalize-space($formal.title.placement),                                         concat(local-name(.), ' '))"/>
-
-  <xsl:variable name="placement">
-    <xsl:choose>
-      <xsl:when test="contains($param.placement, ' ')">
-        <xsl:value-of select="substring-before($param.placement, ' ')"/>
-      </xsl:when>
-      <xsl:when test="$param.placement = ''">before</xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$param.placement"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="preamble" select="*[not(self::title                               or self::titleabbrev)]"/>
-
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="anchor"/>
-
-    <xsl:if test="title and $placement = 'before'">
-      <xsl:call-template name="formal.object.heading"/>
-    </xsl:if>
-
-    <xsl:apply-templates select="$preamble"/>
-
-    <xsl:if test="title and $placement != 'before'">
-      <xsl:call-template name="formal.object.heading"/>
-    </xsl:if>
-  </div>
-</xsl:template>
-
-<xsl:template match="task/title">
-  <!-- nop -->
-</xsl:template>
-
-<xsl:template match="tasksummary">
-  <xsl:call-template name="semiformal.object"/>
-</xsl:template>
-
-<xsl:template match="tasksummary/title"/>
-
-<xsl:template match="taskprerequisites">
-  <xsl:call-template name="semiformal.object"/>
-</xsl:template>
-
-<xsl:template match="taskprerequisites/title"/>
-
-<xsl:template match="taskrelated">
-  <xsl:call-template name="semiformal.object"/>
-</xsl:template>
-
-<xsl:template match="taskrelated/title"/>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/titlepage.templates.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/titlepage.templates.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,3622 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exsl="http://exslt.org/common" xmlns="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl">
-
-<!-- This stylesheet was created by template/titlepage.xsl-->
-
-<xsl:template name="article.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="articleinfo/title">
-      <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/title"/>
-    </xsl:when>
-    <xsl:when test="artheader/title">
-      <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="articleinfo/subtitle">
-      <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="artheader/subtitle">
-      <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/corpauthor"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/corpauthor"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/corpauthor"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/authorgroup"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/authorgroup"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/authorgroup"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/author"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/author"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/author"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/othercredit"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/othercredit"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/othercredit"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/releaseinfo"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/releaseinfo"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/releaseinfo"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/copyright"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/copyright"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/copyright"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/legalnotice"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/legalnotice"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/legalnotice"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/pubdate"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/pubdate"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/pubdate"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/revision"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/revision"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/revision"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/revhistory"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/revhistory"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/revhistory"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/abstract"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/abstract"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/abstract"/>
-</xsl:template>
-
-<xsl:template name="article.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="article.titlepage.separator"><hr/>
-</xsl:template>
-
-<xsl:template name="article.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="article.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="article.titlepage">
-  <div class="titlepage">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="article.titlepage.before.recto"/>
-      <xsl:call-template name="article.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$recto.content"/></div>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="article.titlepage.before.verso"/>
-      <xsl:call-template name="article.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$verso.content"/></div>
-    </xsl:if>
-    <xsl:call-template name="article.titlepage.separator"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="*" mode="article.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="article.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="article.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="article.titlepage.recto.style">
-<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="article.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="article.titlepage.recto.style">
-<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="article.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="article.titlepage.recto.style">
-<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="article.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="article.titlepage.recto.style">
-<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="author" mode="article.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="article.titlepage.recto.style">
-<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="article.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="article.titlepage.recto.style">
-<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="article.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="article.titlepage.recto.style">
-<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="copyright" mode="article.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="article.titlepage.recto.style">
-<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="article.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="article.titlepage.recto.style">
-<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="article.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="article.titlepage.recto.style">
-<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="revision" mode="article.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="article.titlepage.recto.style">
-<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="article.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="article.titlepage.recto.style">
-<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="abstract" mode="article.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="article.titlepage.recto.style">
-<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template name="set.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="setinfo/title">
-      <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="setinfo/subtitle">
-      <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/corpauthor"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/corpauthor"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/authorgroup"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/authorgroup"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/author"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/author"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/othercredit"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/othercredit"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/releaseinfo"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/releaseinfo"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/copyright"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/copyright"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/legalnotice"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/legalnotice"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/pubdate"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/pubdate"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/revision"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/revision"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/revhistory"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/revhistory"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/abstract"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/abstract"/>
-</xsl:template>
-
-<xsl:template name="set.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="set.titlepage.separator"><hr/>
-</xsl:template>
-
-<xsl:template name="set.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="set.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="set.titlepage">
-  <div class="titlepage">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="set.titlepage.before.recto"/>
-      <xsl:call-template name="set.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$recto.content"/></div>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="set.titlepage.before.verso"/>
-      <xsl:call-template name="set.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$verso.content"/></div>
-    </xsl:if>
-    <xsl:call-template name="set.titlepage.separator"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="*" mode="set.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="set.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="set.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="set.titlepage.recto.style">
-<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="set.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="set.titlepage.recto.style">
-<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="set.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="set.titlepage.recto.style">
-<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="set.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="set.titlepage.recto.style">
-<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="author" mode="set.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="set.titlepage.recto.style">
-<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="set.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="set.titlepage.recto.style">
-<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="set.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="set.titlepage.recto.style">
-<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="copyright" mode="set.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="set.titlepage.recto.style">
-<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="set.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="set.titlepage.recto.style">
-<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="set.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="set.titlepage.recto.style">
-<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="revision" mode="set.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="set.titlepage.recto.style">
-<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="set.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="set.titlepage.recto.style">
-<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="abstract" mode="set.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="set.titlepage.recto.style">
-<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template name="book.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="bookinfo/title">
-      <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="bookinfo/subtitle">
-      <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/corpauthor"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/corpauthor"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/authorgroup"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/authorgroup"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/author"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/author"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/othercredit"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/othercredit"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/releaseinfo"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/releaseinfo"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/copyright"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/copyright"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/legalnotice"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/legalnotice"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/pubdate"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/pubdate"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/revision"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/revision"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/revhistory"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/revhistory"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/abstract"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/abstract"/>
-</xsl:template>
-
-<xsl:template name="book.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="book.titlepage.separator"><hr/>
-</xsl:template>
-
-<xsl:template name="book.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="book.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="book.titlepage">
-  <div class="titlepage">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="book.titlepage.before.recto"/>
-      <xsl:call-template name="book.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$recto.content"/></div>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="book.titlepage.before.verso"/>
-      <xsl:call-template name="book.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$verso.content"/></div>
-    </xsl:if>
-    <xsl:call-template name="book.titlepage.separator"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="*" mode="book.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="book.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="book.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="book.titlepage.recto.style">
-<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="book.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="book.titlepage.recto.style">
-<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="book.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="book.titlepage.recto.style">
-<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="book.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="book.titlepage.recto.style">
-<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="author" mode="book.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="book.titlepage.recto.style">
-<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="book.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="book.titlepage.recto.style">
-<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="book.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="book.titlepage.recto.style">
-<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="copyright" mode="book.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="book.titlepage.recto.style">
-<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="book.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="book.titlepage.recto.style">
-<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="book.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="book.titlepage.recto.style">
-<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="revision" mode="book.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="book.titlepage.recto.style">
-<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="book.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="book.titlepage.recto.style">
-<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="abstract" mode="book.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="book.titlepage.recto.style">
-<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template name="part.titlepage.recto">
-  <div xsl:use-attribute-sets="part.titlepage.recto.style">
-<xsl:call-template name="division.title">
-<xsl:with-param name="node" select="ancestor-or-self::part[1]"/>
-</xsl:call-template></div>
-  <xsl:choose>
-    <xsl:when test="partinfo/subtitle">
-      <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="docinfo/subtitle">
-      <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/corpauthor"/>
-  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="docinfo/corpauthor"/>
-  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="info/corpauthor"/>
-  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/authorgroup"/>
-  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="docinfo/authorgroup"/>
-  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="info/authorgroup"/>
-  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/author"/>
-  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="docinfo/author"/>
-  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="info/author"/>
-  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/othercredit"/>
-  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="docinfo/othercredit"/>
-  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="info/othercredit"/>
-  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/releaseinfo"/>
-  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="docinfo/releaseinfo"/>
-  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="info/releaseinfo"/>
-  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/copyright"/>
-  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="docinfo/copyright"/>
-  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="info/copyright"/>
-  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/legalnotice"/>
-  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="docinfo/legalnotice"/>
-  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="info/legalnotice"/>
-  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/pubdate"/>
-  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="docinfo/pubdate"/>
-  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="info/pubdate"/>
-  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/revision"/>
-  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="docinfo/revision"/>
-  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="info/revision"/>
-  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/revhistory"/>
-  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="docinfo/revhistory"/>
-  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="info/revhistory"/>
-  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/abstract"/>
-  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="docinfo/abstract"/>
-  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="info/abstract"/>
-</xsl:template>
-
-<xsl:template name="part.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="part.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="part.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="part.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="part.titlepage">
-  <div class="titlepage">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="part.titlepage.before.recto"/>
-      <xsl:call-template name="part.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$recto.content"/></div>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="part.titlepage.before.verso"/>
-      <xsl:call-template name="part.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$verso.content"/></div>
-    </xsl:if>
-    <xsl:call-template name="part.titlepage.separator"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="*" mode="part.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="part.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="part.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="part.titlepage.recto.style">
-<xsl:apply-templates select="." mode="part.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="part.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="part.titlepage.recto.style">
-<xsl:apply-templates select="." mode="part.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="part.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="part.titlepage.recto.style">
-<xsl:apply-templates select="." mode="part.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="author" mode="part.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="part.titlepage.recto.style">
-<xsl:apply-templates select="." mode="part.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="part.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="part.titlepage.recto.style">
-<xsl:apply-templates select="." mode="part.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="part.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="part.titlepage.recto.style">
-<xsl:apply-templates select="." mode="part.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="copyright" mode="part.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="part.titlepage.recto.style">
-<xsl:apply-templates select="." mode="part.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="part.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="part.titlepage.recto.style">
-<xsl:apply-templates select="." mode="part.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="part.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="part.titlepage.recto.style">
-<xsl:apply-templates select="." mode="part.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="revision" mode="part.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="part.titlepage.recto.style">
-<xsl:apply-templates select="." mode="part.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="part.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="part.titlepage.recto.style">
-<xsl:apply-templates select="." mode="part.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="abstract" mode="part.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="part.titlepage.recto.style">
-<xsl:apply-templates select="." mode="part.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template name="partintro.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="partintroinfo/title">
-      <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/title"/>
-    </xsl:when>
-    <xsl:when test="docinfo/title">
-      <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="partintroinfo/subtitle">
-      <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="docinfo/subtitle">
-      <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/corpauthor"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/corpauthor"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/corpauthor"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/authorgroup"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/authorgroup"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/authorgroup"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/author"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/author"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/author"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/othercredit"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/othercredit"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/othercredit"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/releaseinfo"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/releaseinfo"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/releaseinfo"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/copyright"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/copyright"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/copyright"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/legalnotice"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/legalnotice"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/legalnotice"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/pubdate"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/pubdate"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/pubdate"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/revision"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/revision"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/revision"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/revhistory"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/revhistory"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/revhistory"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/abstract"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/abstract"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/abstract"/>
-</xsl:template>
-
-<xsl:template name="partintro.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="partintro.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="partintro.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="partintro.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="partintro.titlepage">
-  <div>
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="partintro.titlepage.before.recto"/>
-      <xsl:call-template name="partintro.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$recto.content"/></div>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="partintro.titlepage.before.verso"/>
-      <xsl:call-template name="partintro.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$verso.content"/></div>
-    </xsl:if>
-    <xsl:call-template name="partintro.titlepage.separator"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="*" mode="partintro.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="partintro.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="partintro.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="partintro.titlepage.recto.style">
-<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="partintro.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="partintro.titlepage.recto.style">
-<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="partintro.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="partintro.titlepage.recto.style">
-<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="partintro.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="partintro.titlepage.recto.style">
-<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="author" mode="partintro.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="partintro.titlepage.recto.style">
-<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="partintro.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="partintro.titlepage.recto.style">
-<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="partintro.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="partintro.titlepage.recto.style">
-<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="copyright" mode="partintro.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="partintro.titlepage.recto.style">
-<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="partintro.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="partintro.titlepage.recto.style">
-<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="partintro.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="partintro.titlepage.recto.style">
-<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="revision" mode="partintro.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="partintro.titlepage.recto.style">
-<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="partintro.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="partintro.titlepage.recto.style">
-<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="abstract" mode="partintro.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="partintro.titlepage.recto.style">
-<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template name="reference.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="referenceinfo/title">
-      <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/title"/>
-    </xsl:when>
-    <xsl:when test="docinfo/title">
-      <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="referenceinfo/subtitle">
-      <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="docinfo/subtitle">
-      <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/corpauthor"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/corpauthor"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/corpauthor"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/authorgroup"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/authorgroup"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/authorgroup"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/author"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/author"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/author"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/othercredit"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/othercredit"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/othercredit"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/releaseinfo"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/releaseinfo"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/releaseinfo"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/copyright"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/copyright"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/copyright"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/legalnotice"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/legalnotice"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/legalnotice"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/pubdate"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/pubdate"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/pubdate"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/revision"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/revision"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/revision"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/revhistory"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/revhistory"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/revhistory"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/abstract"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/abstract"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/abstract"/>
-</xsl:template>
-
-<xsl:template name="reference.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="reference.titlepage.separator"><hr/>
-</xsl:template>
-
-<xsl:template name="reference.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="reference.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="reference.titlepage">
-  <div class="titlepage">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="reference.titlepage.before.recto"/>
-      <xsl:call-template name="reference.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$recto.content"/></div>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="reference.titlepage.before.verso"/>
-      <xsl:call-template name="reference.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$verso.content"/></div>
-    </xsl:if>
-    <xsl:call-template name="reference.titlepage.separator"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="*" mode="reference.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="reference.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="reference.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="reference.titlepage.recto.style">
-<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="reference.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="reference.titlepage.recto.style">
-<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="reference.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="reference.titlepage.recto.style">
-<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="reference.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="reference.titlepage.recto.style">
-<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="author" mode="reference.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="reference.titlepage.recto.style">
-<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="reference.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="reference.titlepage.recto.style">
-<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="reference.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="reference.titlepage.recto.style">
-<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="copyright" mode="reference.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="reference.titlepage.recto.style">
-<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="reference.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="reference.titlepage.recto.style">
-<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="reference.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="reference.titlepage.recto.style">
-<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="revision" mode="reference.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="reference.titlepage.recto.style">
-<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="reference.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="reference.titlepage.recto.style">
-<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="abstract" mode="reference.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="reference.titlepage.recto.style">
-<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template name="refentry.titlepage.recto">
-</xsl:template>
-
-<xsl:template name="refentry.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="refentry.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="refentry.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="refentry.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="refentry.titlepage">
-  <div class="titlepage">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="refentry.titlepage.before.recto"/>
-      <xsl:call-template name="refentry.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$recto.content"/></div>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="refentry.titlepage.before.verso"/>
-      <xsl:call-template name="refentry.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$verso.content"/></div>
-    </xsl:if>
-    <xsl:call-template name="refentry.titlepage.separator"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="*" mode="refentry.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="refentry.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template name="dedication.titlepage.recto">
-  <div xsl:use-attribute-sets="dedication.titlepage.recto.style">
-<xsl:call-template name="component.title">
-<xsl:with-param name="node" select="ancestor-or-self::dedication[1]"/>
-</xsl:call-template></div>
-  <xsl:choose>
-    <xsl:when test="dedicationinfo/subtitle">
-      <xsl:apply-templates mode="dedication.titlepage.recto.auto.mode" select="dedicationinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="docinfo/subtitle">
-      <xsl:apply-templates mode="dedication.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="dedication.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="dedication.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-</xsl:template>
-
-<xsl:template name="dedication.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="dedication.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="dedication.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="dedication.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="dedication.titlepage">
-  <div class="titlepage">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="dedication.titlepage.before.recto"/>
-      <xsl:call-template name="dedication.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$recto.content"/></div>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="dedication.titlepage.before.verso"/>
-      <xsl:call-template name="dedication.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$verso.content"/></div>
-    </xsl:if>
-    <xsl:call-template name="dedication.titlepage.separator"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="*" mode="dedication.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="dedication.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="dedication.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="dedication.titlepage.recto.style">
-<xsl:apply-templates select="." mode="dedication.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template name="preface.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="prefaceinfo/title">
-      <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/title"/>
-    </xsl:when>
-    <xsl:when test="docinfo/title">
-      <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="prefaceinfo/subtitle">
-      <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="docinfo/subtitle">
-      <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/corpauthor"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/corpauthor"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/corpauthor"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/authorgroup"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/authorgroup"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/authorgroup"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/author"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/author"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/author"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/othercredit"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/othercredit"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/othercredit"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/releaseinfo"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/releaseinfo"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/releaseinfo"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/copyright"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/copyright"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/copyright"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/legalnotice"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/legalnotice"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/legalnotice"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/pubdate"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/pubdate"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/pubdate"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/revision"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/revision"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/revision"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/revhistory"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/revhistory"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/revhistory"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/abstract"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/abstract"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/abstract"/>
-</xsl:template>
-
-<xsl:template name="preface.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="preface.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="preface.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="preface.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="preface.titlepage">
-  <div class="titlepage">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="preface.titlepage.before.recto"/>
-      <xsl:call-template name="preface.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$recto.content"/></div>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="preface.titlepage.before.verso"/>
-      <xsl:call-template name="preface.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$verso.content"/></div>
-    </xsl:if>
-    <xsl:call-template name="preface.titlepage.separator"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="*" mode="preface.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="preface.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="preface.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="preface.titlepage.recto.style">
-<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="preface.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="preface.titlepage.recto.style">
-<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="preface.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="preface.titlepage.recto.style">
-<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="preface.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="preface.titlepage.recto.style">
-<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="author" mode="preface.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="preface.titlepage.recto.style">
-<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="preface.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="preface.titlepage.recto.style">
-<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="preface.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="preface.titlepage.recto.style">
-<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="copyright" mode="preface.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="preface.titlepage.recto.style">
-<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="preface.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="preface.titlepage.recto.style">
-<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="preface.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="preface.titlepage.recto.style">
-<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="revision" mode="preface.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="preface.titlepage.recto.style">
-<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="preface.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="preface.titlepage.recto.style">
-<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="abstract" mode="preface.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="preface.titlepage.recto.style">
-<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template name="chapter.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="chapterinfo/title">
-      <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/title"/>
-    </xsl:when>
-    <xsl:when test="docinfo/title">
-      <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="chapterinfo/subtitle">
-      <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="docinfo/subtitle">
-      <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/corpauthor"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/corpauthor"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/corpauthor"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/authorgroup"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/authorgroup"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/authorgroup"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/author"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/author"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/author"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/othercredit"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/othercredit"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/othercredit"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/releaseinfo"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/releaseinfo"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/releaseinfo"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/copyright"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/copyright"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/copyright"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/legalnotice"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/legalnotice"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/legalnotice"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/pubdate"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/pubdate"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/pubdate"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/revision"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/revision"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/revision"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/revhistory"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/revhistory"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/revhistory"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/abstract"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/abstract"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/abstract"/>
-</xsl:template>
-
-<xsl:template name="chapter.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="chapter.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="chapter.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="chapter.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="chapter.titlepage">
-  <div class="titlepage">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="chapter.titlepage.before.recto"/>
-      <xsl:call-template name="chapter.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$recto.content"/></div>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="chapter.titlepage.before.verso"/>
-      <xsl:call-template name="chapter.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$verso.content"/></div>
-    </xsl:if>
-    <xsl:call-template name="chapter.titlepage.separator"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="*" mode="chapter.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="chapter.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="chapter.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="chapter.titlepage.recto.style">
-<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="chapter.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="chapter.titlepage.recto.style">
-<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="chapter.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="chapter.titlepage.recto.style">
-<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="chapter.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="chapter.titlepage.recto.style">
-<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="author" mode="chapter.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="chapter.titlepage.recto.style">
-<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="chapter.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="chapter.titlepage.recto.style">
-<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="chapter.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="chapter.titlepage.recto.style">
-<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="copyright" mode="chapter.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="chapter.titlepage.recto.style">
-<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="chapter.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="chapter.titlepage.recto.style">
-<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="chapter.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="chapter.titlepage.recto.style">
-<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="revision" mode="chapter.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="chapter.titlepage.recto.style">
-<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="chapter.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="chapter.titlepage.recto.style">
-<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="abstract" mode="chapter.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="chapter.titlepage.recto.style">
-<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template name="appendix.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="appendixinfo/title">
-      <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/title"/>
-    </xsl:when>
-    <xsl:when test="docinfo/title">
-      <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="appendixinfo/subtitle">
-      <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="docinfo/subtitle">
-      <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/corpauthor"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/corpauthor"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/corpauthor"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/authorgroup"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/authorgroup"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/authorgroup"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/author"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/author"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/author"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/othercredit"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/othercredit"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/othercredit"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/releaseinfo"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/releaseinfo"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/releaseinfo"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/copyright"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/copyright"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/copyright"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/legalnotice"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/legalnotice"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/legalnotice"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/pubdate"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/pubdate"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/pubdate"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/revision"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/revision"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/revision"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/revhistory"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/revhistory"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/revhistory"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/abstract"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/abstract"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/abstract"/>
-</xsl:template>
-
-<xsl:template name="appendix.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="appendix.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="appendix.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="appendix.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="appendix.titlepage">
-  <div class="titlepage">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="appendix.titlepage.before.recto"/>
-      <xsl:call-template name="appendix.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$recto.content"/></div>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="appendix.titlepage.before.verso"/>
-      <xsl:call-template name="appendix.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$verso.content"/></div>
-    </xsl:if>
-    <xsl:call-template name="appendix.titlepage.separator"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="*" mode="appendix.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="appendix.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="appendix.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="appendix.titlepage.recto.style">
-<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="appendix.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="appendix.titlepage.recto.style">
-<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="appendix.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="appendix.titlepage.recto.style">
-<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="appendix.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="appendix.titlepage.recto.style">
-<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="author" mode="appendix.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="appendix.titlepage.recto.style">
-<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="appendix.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="appendix.titlepage.recto.style">
-<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="appendix.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="appendix.titlepage.recto.style">
-<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="copyright" mode="appendix.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="appendix.titlepage.recto.style">
-<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="appendix.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="appendix.titlepage.recto.style">
-<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="appendix.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="appendix.titlepage.recto.style">
-<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="revision" mode="appendix.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="appendix.titlepage.recto.style">
-<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="appendix.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="appendix.titlepage.recto.style">
-<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="abstract" mode="appendix.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="appendix.titlepage.recto.style">
-<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template name="section.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="sectioninfo/title">
-      <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="sectioninfo/subtitle">
-      <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/corpauthor"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/corpauthor"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/authorgroup"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/authorgroup"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/author"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/author"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/othercredit"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/othercredit"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/releaseinfo"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/releaseinfo"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/copyright"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/copyright"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/legalnotice"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/legalnotice"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/pubdate"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/pubdate"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/revision"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/revision"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/revhistory"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/revhistory"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/abstract"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/abstract"/>
-</xsl:template>
-
-<xsl:template name="section.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="section.titlepage.separator"><xsl:if test="count(parent::*)='0'"><hr/></xsl:if>
-</xsl:template>
-
-<xsl:template name="section.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="section.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="section.titlepage">
-  <div class="titlepage">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="section.titlepage.before.recto"/>
-      <xsl:call-template name="section.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$recto.content"/></div>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="section.titlepage.before.verso"/>
-      <xsl:call-template name="section.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$verso.content"/></div>
-    </xsl:if>
-    <xsl:call-template name="section.titlepage.separator"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="*" mode="section.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="section.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="section.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="section.titlepage.recto.style">
-<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="section.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="section.titlepage.recto.style">
-<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="section.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="section.titlepage.recto.style">
-<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="section.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="section.titlepage.recto.style">
-<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="author" mode="section.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="section.titlepage.recto.style">
-<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="section.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="section.titlepage.recto.style">
-<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="section.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="section.titlepage.recto.style">
-<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="copyright" mode="section.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="section.titlepage.recto.style">
-<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="section.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="section.titlepage.recto.style">
-<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="section.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="section.titlepage.recto.style">
-<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="revision" mode="section.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="section.titlepage.recto.style">
-<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="section.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="section.titlepage.recto.style">
-<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="abstract" mode="section.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="section.titlepage.recto.style">
-<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template name="sect1.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="sect1info/title">
-      <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="sect1info/subtitle">
-      <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/corpauthor"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/corpauthor"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/authorgroup"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/authorgroup"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/author"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/author"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/othercredit"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/othercredit"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/releaseinfo"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/releaseinfo"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/copyright"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/copyright"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/legalnotice"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/legalnotice"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/pubdate"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/pubdate"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/revision"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/revision"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/revhistory"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/revhistory"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/abstract"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/abstract"/>
-</xsl:template>
-
-<xsl:template name="sect1.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="sect1.titlepage.separator"><xsl:if test="count(parent::*)='0'"><hr/></xsl:if>
-</xsl:template>
-
-<xsl:template name="sect1.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="sect1.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="sect1.titlepage">
-  <div class="titlepage">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="sect1.titlepage.before.recto"/>
-      <xsl:call-template name="sect1.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$recto.content"/></div>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="sect1.titlepage.before.verso"/>
-      <xsl:call-template name="sect1.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$verso.content"/></div>
-    </xsl:if>
-    <xsl:call-template name="sect1.titlepage.separator"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="*" mode="sect1.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="sect1.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="sect1.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect1.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="sect1.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect1.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="sect1.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect1.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="sect1.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect1.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="author" mode="sect1.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect1.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="sect1.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect1.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="sect1.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect1.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="copyright" mode="sect1.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect1.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="sect1.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect1.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="sect1.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect1.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="revision" mode="sect1.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect1.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="sect1.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect1.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="abstract" mode="sect1.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect1.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template name="sect2.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="sect2info/title">
-      <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="sect2info/subtitle">
-      <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/corpauthor"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/corpauthor"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/authorgroup"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/authorgroup"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/author"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/author"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/othercredit"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/othercredit"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/releaseinfo"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/releaseinfo"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/copyright"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/copyright"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/legalnotice"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/legalnotice"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/pubdate"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/pubdate"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/revision"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/revision"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/revhistory"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/revhistory"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/abstract"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/abstract"/>
-</xsl:template>
-
-<xsl:template name="sect2.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="sect2.titlepage.separator"><xsl:if test="count(parent::*)='0'"><hr/></xsl:if>
-</xsl:template>
-
-<xsl:template name="sect2.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="sect2.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="sect2.titlepage">
-  <div class="titlepage">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="sect2.titlepage.before.recto"/>
-      <xsl:call-template name="sect2.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$recto.content"/></div>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="sect2.titlepage.before.verso"/>
-      <xsl:call-template name="sect2.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$verso.content"/></div>
-    </xsl:if>
-    <xsl:call-template name="sect2.titlepage.separator"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="*" mode="sect2.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="sect2.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="sect2.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect2.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="sect2.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect2.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="sect2.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect2.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="sect2.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect2.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="author" mode="sect2.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect2.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="sect2.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect2.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="sect2.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect2.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="copyright" mode="sect2.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect2.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="sect2.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect2.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="sect2.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect2.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="revision" mode="sect2.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect2.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="sect2.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect2.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="abstract" mode="sect2.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect2.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template name="sect3.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="sect3info/title">
-      <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="sect3info/subtitle">
-      <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/corpauthor"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/corpauthor"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/authorgroup"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/authorgroup"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/author"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/author"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/othercredit"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/othercredit"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/releaseinfo"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/releaseinfo"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/copyright"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/copyright"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/legalnotice"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/legalnotice"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/pubdate"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/pubdate"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/revision"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/revision"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/revhistory"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/revhistory"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/abstract"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/abstract"/>
-</xsl:template>
-
-<xsl:template name="sect3.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="sect3.titlepage.separator"><xsl:if test="count(parent::*)='0'"><hr/></xsl:if>
-</xsl:template>
-
-<xsl:template name="sect3.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="sect3.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="sect3.titlepage">
-  <div class="titlepage">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="sect3.titlepage.before.recto"/>
-      <xsl:call-template name="sect3.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$recto.content"/></div>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="sect3.titlepage.before.verso"/>
-      <xsl:call-template name="sect3.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$verso.content"/></div>
-    </xsl:if>
-    <xsl:call-template name="sect3.titlepage.separator"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="*" mode="sect3.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="sect3.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="sect3.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect3.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="sect3.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect3.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="sect3.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect3.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="sect3.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect3.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="author" mode="sect3.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect3.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="sect3.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect3.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="sect3.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect3.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="copyright" mode="sect3.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect3.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="sect3.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect3.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="sect3.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect3.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="revision" mode="sect3.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect3.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="sect3.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect3.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="abstract" mode="sect3.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect3.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template name="sect4.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="sect4info/title">
-      <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="sect4info/subtitle">
-      <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/corpauthor"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/corpauthor"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/authorgroup"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/authorgroup"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/author"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/author"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/othercredit"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/othercredit"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/releaseinfo"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/releaseinfo"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/copyright"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/copyright"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/legalnotice"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/legalnotice"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/pubdate"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/pubdate"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/revision"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/revision"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/revhistory"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/revhistory"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/abstract"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/abstract"/>
-</xsl:template>
-
-<xsl:template name="sect4.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="sect4.titlepage.separator"><xsl:if test="count(parent::*)='0'"><hr/></xsl:if>
-</xsl:template>
-
-<xsl:template name="sect4.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="sect4.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="sect4.titlepage">
-  <div class="titlepage">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="sect4.titlepage.before.recto"/>
-      <xsl:call-template name="sect4.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$recto.content"/></div>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="sect4.titlepage.before.verso"/>
-      <xsl:call-template name="sect4.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$verso.content"/></div>
-    </xsl:if>
-    <xsl:call-template name="sect4.titlepage.separator"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="*" mode="sect4.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="sect4.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="sect4.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect4.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="sect4.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect4.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="sect4.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect4.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="sect4.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect4.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="author" mode="sect4.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect4.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="sect4.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect4.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="sect4.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect4.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="copyright" mode="sect4.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect4.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="sect4.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect4.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="sect4.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect4.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="revision" mode="sect4.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect4.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="sect4.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect4.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="abstract" mode="sect4.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect4.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template name="sect5.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="sect5info/title">
-      <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="sect5info/subtitle">
-      <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/corpauthor"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/corpauthor"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/authorgroup"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/authorgroup"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/author"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/author"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/othercredit"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/othercredit"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/releaseinfo"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/releaseinfo"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/copyright"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/copyright"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/legalnotice"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/legalnotice"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/pubdate"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/pubdate"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/revision"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/revision"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/revhistory"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/revhistory"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/abstract"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/abstract"/>
-</xsl:template>
-
-<xsl:template name="sect5.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="sect5.titlepage.separator"><xsl:if test="count(parent::*)='0'"><hr/></xsl:if>
-</xsl:template>
-
-<xsl:template name="sect5.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="sect5.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="sect5.titlepage">
-  <div class="titlepage">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="sect5.titlepage.before.recto"/>
-      <xsl:call-template name="sect5.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$recto.content"/></div>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="sect5.titlepage.before.verso"/>
-      <xsl:call-template name="sect5.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$verso.content"/></div>
-    </xsl:if>
-    <xsl:call-template name="sect5.titlepage.separator"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="*" mode="sect5.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="sect5.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="sect5.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect5.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="sect5.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect5.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="sect5.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect5.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="sect5.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect5.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="author" mode="sect5.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect5.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="sect5.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect5.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="sect5.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect5.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="copyright" mode="sect5.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect5.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="sect5.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect5.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="sect5.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect5.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="revision" mode="sect5.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect5.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="sect5.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect5.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="abstract" mode="sect5.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect5.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template name="simplesect.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="simplesectinfo/title">
-      <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/title"/>
-    </xsl:when>
-    <xsl:when test="docinfo/title">
-      <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="simplesectinfo/subtitle">
-      <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="docinfo/subtitle">
-      <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/corpauthor"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/corpauthor"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/corpauthor"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/authorgroup"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/authorgroup"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/authorgroup"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/author"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/author"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/author"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/othercredit"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/othercredit"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/othercredit"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/releaseinfo"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/releaseinfo"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/releaseinfo"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/copyright"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/copyright"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/copyright"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/legalnotice"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/legalnotice"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/legalnotice"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/pubdate"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/pubdate"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/pubdate"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/revision"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/revision"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/revision"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/revhistory"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/revhistory"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/revhistory"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/abstract"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/abstract"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/abstract"/>
-</xsl:template>
-
-<xsl:template name="simplesect.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="simplesect.titlepage.separator"><xsl:if test="count(parent::*)='0'"><hr/></xsl:if>
-</xsl:template>
-
-<xsl:template name="simplesect.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="simplesect.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="simplesect.titlepage">
-  <div class="titlepage">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="simplesect.titlepage.before.recto"/>
-      <xsl:call-template name="simplesect.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$recto.content"/></div>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="simplesect.titlepage.before.verso"/>
-      <xsl:call-template name="simplesect.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$verso.content"/></div>
-    </xsl:if>
-    <xsl:call-template name="simplesect.titlepage.separator"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="*" mode="simplesect.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="simplesect.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="simplesect.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="simplesect.titlepage.recto.style">
-<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="simplesect.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="simplesect.titlepage.recto.style">
-<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="simplesect.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="simplesect.titlepage.recto.style">
-<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="simplesect.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="simplesect.titlepage.recto.style">
-<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="author" mode="simplesect.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="simplesect.titlepage.recto.style">
-<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="simplesect.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="simplesect.titlepage.recto.style">
-<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="simplesect.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="simplesect.titlepage.recto.style">
-<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="copyright" mode="simplesect.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="simplesect.titlepage.recto.style">
-<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="simplesect.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="simplesect.titlepage.recto.style">
-<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="simplesect.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="simplesect.titlepage.recto.style">
-<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="revision" mode="simplesect.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="simplesect.titlepage.recto.style">
-<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="simplesect.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="simplesect.titlepage.recto.style">
-<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="abstract" mode="simplesect.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="simplesect.titlepage.recto.style">
-<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template name="bibliography.titlepage.recto">
-  <div xsl:use-attribute-sets="bibliography.titlepage.recto.style">
-<xsl:call-template name="component.title">
-<xsl:with-param name="node" select="ancestor-or-self::bibliography[1]"/>
-</xsl:call-template></div>
-  <xsl:choose>
-    <xsl:when test="bibliographyinfo/subtitle">
-      <xsl:apply-templates mode="bibliography.titlepage.recto.auto.mode" select="bibliographyinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="docinfo/subtitle">
-      <xsl:apply-templates mode="bibliography.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="bibliography.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="bibliography.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-</xsl:template>
-
-<xsl:template name="bibliography.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="bibliography.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="bibliography.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="bibliography.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="bibliography.titlepage">
-  <div class="titlepage">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="bibliography.titlepage.before.recto"/>
-      <xsl:call-template name="bibliography.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$recto.content"/></div>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="bibliography.titlepage.before.verso"/>
-      <xsl:call-template name="bibliography.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$verso.content"/></div>
-    </xsl:if>
-    <xsl:call-template name="bibliography.titlepage.separator"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="*" mode="bibliography.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="bibliography.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="bibliography.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="bibliography.titlepage.recto.style">
-<xsl:apply-templates select="." mode="bibliography.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template name="glossary.titlepage.recto">
-  <div xsl:use-attribute-sets="glossary.titlepage.recto.style">
-<xsl:call-template name="component.title">
-<xsl:with-param name="node" select="ancestor-or-self::glossary[1]"/>
-</xsl:call-template></div>
-  <xsl:choose>
-    <xsl:when test="glossaryinfo/subtitle">
-      <xsl:apply-templates mode="glossary.titlepage.recto.auto.mode" select="glossaryinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="docinfo/subtitle">
-      <xsl:apply-templates mode="glossary.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="glossary.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="glossary.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-</xsl:template>
-
-<xsl:template name="glossary.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="glossary.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="glossary.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="glossary.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="glossary.titlepage">
-  <div class="titlepage">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="glossary.titlepage.before.recto"/>
-      <xsl:call-template name="glossary.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$recto.content"/></div>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="glossary.titlepage.before.verso"/>
-      <xsl:call-template name="glossary.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$verso.content"/></div>
-    </xsl:if>
-    <xsl:call-template name="glossary.titlepage.separator"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="*" mode="glossary.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="glossary.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="glossary.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="glossary.titlepage.recto.style">
-<xsl:apply-templates select="." mode="glossary.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template name="index.titlepage.recto">
-  <div xsl:use-attribute-sets="index.titlepage.recto.style">
-<xsl:call-template name="component.title">
-<xsl:with-param name="node" select="ancestor-or-self::index[1]"/>
-</xsl:call-template></div>
-  <xsl:choose>
-    <xsl:when test="indexinfo/subtitle">
-      <xsl:apply-templates mode="index.titlepage.recto.auto.mode" select="indexinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="docinfo/subtitle">
-      <xsl:apply-templates mode="index.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="index.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="index.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-</xsl:template>
-
-<xsl:template name="index.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="index.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="index.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="index.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="index.titlepage">
-  <div class="titlepage">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="index.titlepage.before.recto"/>
-      <xsl:call-template name="index.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$recto.content"/></div>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="index.titlepage.before.verso"/>
-      <xsl:call-template name="index.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$verso.content"/></div>
-    </xsl:if>
-    <xsl:call-template name="index.titlepage.separator"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="*" mode="index.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="index.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="index.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="index.titlepage.recto.style">
-<xsl:apply-templates select="." mode="index.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template name="setindex.titlepage.recto">
-  <div xsl:use-attribute-sets="setindex.titlepage.recto.style">
-<xsl:call-template name="component.title">
-<xsl:with-param name="node" select="ancestor-or-self::setindex[1]"/>
-</xsl:call-template></div>
-  <xsl:choose>
-    <xsl:when test="setindexinfo/subtitle">
-      <xsl:apply-templates mode="setindex.titlepage.recto.auto.mode" select="setindexinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="docinfo/subtitle">
-      <xsl:apply-templates mode="setindex.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="setindex.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="setindex.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-</xsl:template>
-
-<xsl:template name="setindex.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="setindex.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="setindex.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="setindex.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="setindex.titlepage">
-  <div class="titlepage">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="setindex.titlepage.before.recto"/>
-      <xsl:call-template name="setindex.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$recto.content"/></div>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="setindex.titlepage.before.verso"/>
-      <xsl:call-template name="setindex.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$verso.content"/></div>
-    </xsl:if>
-    <xsl:call-template name="setindex.titlepage.separator"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="*" mode="setindex.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="setindex.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="setindex.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="setindex.titlepage.recto.style">
-<xsl:apply-templates select="." mode="setindex.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/titlepage.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/titlepage.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,960 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:attribute-set name="book.titlepage.recto.style"/>
-<xsl:attribute-set name="book.titlepage.verso.style"/>
-
-<xsl:attribute-set name="article.titlepage.recto.style"/>
-<xsl:attribute-set name="article.titlepage.verso.style"/>
-
-<xsl:attribute-set name="set.titlepage.recto.style"/>
-<xsl:attribute-set name="set.titlepage.verso.style"/>
-
-<xsl:attribute-set name="part.titlepage.recto.style"/>
-<xsl:attribute-set name="part.titlepage.verso.style"/>
-
-<xsl:attribute-set name="partintro.titlepage.recto.style"/>
-<xsl:attribute-set name="partintro.titlepage.verso.style"/>
-
-<xsl:attribute-set name="reference.titlepage.recto.style"/>
-<xsl:attribute-set name="reference.titlepage.verso.style"/>
-
-<xsl:attribute-set name="refentry.titlepage.recto.style"/>
-<xsl:attribute-set name="refentry.titlepage.verso.style"/>
-
-<xsl:attribute-set name="dedication.titlepage.recto.style"/>
-<xsl:attribute-set name="dedication.titlepage.verso.style"/>
-
-<xsl:attribute-set name="preface.titlepage.recto.style"/>
-<xsl:attribute-set name="preface.titlepage.verso.style"/>
-
-<xsl:attribute-set name="chapter.titlepage.recto.style"/>
-<xsl:attribute-set name="chapter.titlepage.verso.style"/>
-
-<xsl:attribute-set name="appendix.titlepage.recto.style"/>
-<xsl:attribute-set name="appendix.titlepage.verso.style"/>
-
-<xsl:attribute-set name="bibliography.titlepage.recto.style"/>
-<xsl:attribute-set name="bibliography.titlepage.verso.style"/>
-
-<xsl:attribute-set name="glossary.titlepage.recto.style"/>
-<xsl:attribute-set name="glossary.titlepage.verso.style"/>
-
-<xsl:attribute-set name="index.titlepage.recto.style"/>
-<xsl:attribute-set name="index.titlepage.verso.style"/>
-
-<xsl:attribute-set name="setindex.titlepage.recto.style"/>
-<xsl:attribute-set name="setindex.titlepage.verso.style"/>
-
-<xsl:attribute-set name="section.titlepage.recto.style"/>
-<xsl:attribute-set name="section.titlepage.verso.style"/>
-
-<xsl:attribute-set name="sect1.titlepage.recto.style" use-attribute-sets="section.titlepage.recto.style"/>
-<xsl:attribute-set name="sect1.titlepage.verso.style" use-attribute-sets="section.titlepage.verso.style"/>
-
-<xsl:attribute-set name="sect2.titlepage.recto.style" use-attribute-sets="section.titlepage.recto.style"/>
-<xsl:attribute-set name="sect2.titlepage.verso.style" use-attribute-sets="section.titlepage.verso.style"/>
-
-<xsl:attribute-set name="sect3.titlepage.recto.style" use-attribute-sets="section.titlepage.recto.style"/>
-<xsl:attribute-set name="sect3.titlepage.verso.style" use-attribute-sets="section.titlepage.verso.style"/>
-
-<xsl:attribute-set name="sect4.titlepage.recto.style" use-attribute-sets="section.titlepage.recto.style"/>
-<xsl:attribute-set name="sect4.titlepage.verso.style" use-attribute-sets="section.titlepage.verso.style"/>
-
-<xsl:attribute-set name="sect5.titlepage.recto.style" use-attribute-sets="section.titlepage.recto.style"/>
-<xsl:attribute-set name="sect5.titlepage.verso.style" use-attribute-sets="section.titlepage.verso.style"/>
-
-<xsl:attribute-set name="simplesect.titlepage.recto.style" use-attribute-sets="section.titlepage.recto.style"/>
-<xsl:attribute-set name="simplesect.titlepage.verso.style" use-attribute-sets="section.titlepage.verso.style"/>
-
-<xsl:attribute-set name="table.of.contents.titlepage.recto.style"/>
-<xsl:attribute-set name="table.of.contents.titlepage.verso.style"/>
-
-<xsl:attribute-set name="list.of.tables.titlepage.recto.style"/>
-<xsl:attribute-set name="list.of.tables.contents.titlepage.verso.style"/>
-
-<xsl:attribute-set name="list.of.figures.titlepage.recto.style"/>
-<xsl:attribute-set name="list.of.figures.contents.titlepage.verso.style"/>
-
-<xsl:attribute-set name="list.of.equations.titlepage.recto.style"/>
-<xsl:attribute-set name="list.of.equations.contents.titlepage.verso.style"/>
-
-<xsl:attribute-set name="list.of.examples.titlepage.recto.style"/>
-<xsl:attribute-set name="list.of.examples.contents.titlepage.verso.style"/>
-
-<xsl:attribute-set name="list.of.unknowns.titlepage.recto.style"/>
-<xsl:attribute-set name="list.of.unknowns.contents.titlepage.verso.style"/>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="*" mode="titlepage.mode">
-  <!-- if an element isn't found in this mode, try the default mode -->
-  <xsl:apply-templates select="."/>
-</xsl:template>
-
-<xsl:template match="abbrev" mode="titlepage.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-    <br/>
-  </span>
-</xsl:template>
-
-<xsl:template match="abstract" mode="titlepage.mode">
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="anchor"/>
-    <xsl:if test="$abstract.notitle.enabled = 0">
-      <xsl:call-template name="formal.object.heading">
-        <xsl:with-param name="title">
-          <xsl:apply-templates select="." mode="title.markup"/>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:if>
-    <xsl:apply-templates mode="titlepage.mode"/>
-    <xsl:call-template name="process.footnotes"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="abstract/title" mode="titlepage.mode">
-</xsl:template>
-
-<xsl:template match="address" mode="titlepage.mode">
-  <xsl:param name="suppress-numbers" select="'0'"/>
-
-  <xsl:variable name="rtf">
-    <xsl:apply-templates mode="titlepage.mode"/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$suppress-numbers = '0'                     and @linenumbering = 'numbered'                     and $use.extensions != '0'                     and $linenumbering.extension != '0'">
-      <div>
-        <xsl:apply-templates select="." mode="class.attribute"/>
-        <xsl:call-template name="paragraph">
-          <xsl:with-param name="content">
-            <xsl:call-template name="number.rtf.lines">
-              <xsl:with-param name="rtf" select="$rtf"/>
-            </xsl:call-template>
-          </xsl:with-param>
-        </xsl:call-template>
-      </div>
-    </xsl:when>
-
-    <xsl:otherwise>
-      <div>
-        <xsl:apply-templates select="." mode="class.attribute"/>
-        <xsl:call-template name="paragraph">
-          <xsl:with-param name="content">
-            <xsl:call-template name="make-verbatim">
-              <xsl:with-param name="rtf" select="$rtf"/>
-            </xsl:call-template>
-          </xsl:with-param>
-        </xsl:call-template>
-      </div>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="affiliation" mode="titlepage.mode">
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="artpagenums" mode="titlepage.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-    <br/>
-  </span>
-</xsl:template>
-
-<xsl:template match="author|editor" mode="titlepage.mode">
-  <xsl:call-template name="credits.div"/>
-</xsl:template>
-
-<xsl:template name="credits.div">
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:if test="self::editor[position()=1] and not($editedby.enabled = 0)">
-      <h4 class="editedby"><xsl:call-template name="gentext.edited.by"/></h4>
-    </xsl:if>
-    <h3>
-      <xsl:apply-templates select="." mode="class.attribute"/>
-      <xsl:choose>
-        <xsl:when test="orgname">
-          <xsl:apply-templates/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="person.name"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </h3>
-    <xsl:if test="not($contrib.inline.enabled = 0)">
-      <xsl:apply-templates mode="titlepage.mode" select="contrib"/>
-    </xsl:if>
-    <xsl:apply-templates mode="titlepage.mode" select="affiliation"/>
-    <xsl:apply-templates mode="titlepage.mode" select="email"/>
-    <xsl:if test="not($blurb.on.titlepage.enabled = 0)">
-      <xsl:choose>
-        <xsl:when test="$contrib.inline.enabled = 0">
-          <xsl:apply-templates mode="titlepage.mode" select="contrib|authorblurb|personblurb"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates mode="titlepage.mode" select="authorblurb|personblurb"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:if>
-  </div>
-</xsl:template>
-
-<xsl:template match="authorblurb|personblurb" mode="titlepage.mode">
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="titlepage.mode">
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="anchor"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="authorinitials" mode="titlepage.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-    <br/>
-  </span>
-</xsl:template>
-
-<xsl:template match="bibliomisc" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="bibliomset" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="collab" mode="titlepage.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-    <br/>
-  </span>
-</xsl:template>
-
-<xsl:template match="collabname" mode="titlepage.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="confgroup" mode="titlepage.mode">
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="confdates" mode="titlepage.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-    <br/>
-  </span>
-</xsl:template>
-
-<xsl:template match="confsponsor" mode="titlepage.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-    <br/>
-  </span>
-</xsl:template>
-
-<xsl:template match="conftitle" mode="titlepage.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-    <br/>
-  </span>
-</xsl:template>
-
-<xsl:template match="confnum" mode="titlepage.mode">
-  <!-- suppress -->
-</xsl:template>
-
-<xsl:template match="contractnum" mode="titlepage.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-    <br/>
-  </span>
-</xsl:template>
-
-<xsl:template match="contractsponsor" mode="titlepage.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-    <br/>
-  </span>
-</xsl:template>
-
-<xsl:template match="contrib" mode="titlepage.mode">
-  <xsl:choose>
-    <xsl:when test="not($contrib.inline.enabled = 0)">
-      <span>
-        <xsl:apply-templates select="." mode="class.attribute"/>
-        <xsl:apply-templates mode="titlepage.mode"/>
-      </span><xsl:text>&#160;</xsl:text>
-    </xsl:when>
-    <xsl:otherwise>
-      <div>
-        <xsl:apply-templates select="." mode="class.attribute"/>
-        <p><xsl:apply-templates mode="titlepage.mode"/></p>
-      </div>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="copyright" mode="titlepage.mode">
-  <p>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="gentext">
-      <xsl:with-param name="key" select="'Copyright'"/>
-    </xsl:call-template>
-    <xsl:call-template name="gentext.space"/>
-    <xsl:call-template name="dingbat">
-      <xsl:with-param name="dingbat">copyright</xsl:with-param>
-    </xsl:call-template>
-    <xsl:call-template name="gentext.space"/>
-    <xsl:call-template name="copyright.years">
-      <xsl:with-param name="years" select="year"/>
-      <xsl:with-param name="print.ranges" select="$make.year.ranges"/>
-      <xsl:with-param name="single.year.ranges" select="$make.single.year.ranges"/>
-    </xsl:call-template>
-    <xsl:call-template name="gentext.space"/>
-    <xsl:apply-templates select="holder" mode="titlepage.mode"/>
-  </p>
-</xsl:template>
-
-<xsl:template match="year" mode="titlepage.mode">
-  <xsl:choose>
-    <xsl:when test="$show.revisionflag != 0 and @revisionflag">
-      <span class="{@revisionflag}">
-        <xsl:apply-templates mode="titlepage.mode"/>
-      </span>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates mode="titlepage.mode"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="holder" mode="titlepage.mode">
-  <xsl:choose>
-    <xsl:when test="$show.revisionflag != 0 and @revisionflag">
-      <span class="{@revisionflag}">
-        <xsl:apply-templates mode="titlepage.mode"/>
-      </span>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates mode="titlepage.mode"/>
-    </xsl:otherwise>
-  </xsl:choose>
-  <xsl:if test="position() &lt; last()">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="titlepage.mode">
-  <h3>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-  </h3>
-</xsl:template>
-
-<xsl:template match="corpcredit" mode="titlepage.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-    <br/>
-  </span>
-</xsl:template>
-
-<xsl:template match="corpname" mode="titlepage.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-    <br/>
-  </span>
-</xsl:template>
-
-<xsl:template match="date" mode="titlepage.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-    <br/>
-  </span>
-</xsl:template>
-
-<xsl:template match="edition" mode="titlepage.mode">
-  <p>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-    <xsl:call-template name="gentext.space"/>
-    <xsl:call-template name="gentext">
-      <xsl:with-param name="key" select="'Edition'"/>
-    </xsl:call-template>
-  </p>
-</xsl:template>
-
-<xsl:template match="email" mode="titlepage.mode">
-  <!-- use the normal e-mail handling code -->
-  <xsl:apply-templates select="."/>
-</xsl:template>
-
-<xsl:template match="firstname" mode="titlepage.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-    <br/>
-  </span>
-</xsl:template>
-
-<xsl:template match="graphic" mode="titlepage.mode">
-  <!-- use the normal graphic handling code -->
-  <xsl:apply-templates select="."/>
-</xsl:template>
-
-<xsl:template match="honorific" mode="titlepage.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-    <br/>
-  </span>
-</xsl:template>
-
-<xsl:template match="isbn" mode="titlepage.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-    <br/>
-  </span>
-</xsl:template>
-
-<xsl:template match="issn" mode="titlepage.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-    <br/>
-  </span>
-</xsl:template>
-
-<xsl:template match="biblioid" mode="titlepage.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-    <br/>
-  </span>
-</xsl:template>
-
-<xsl:template match="itermset" mode="titlepage.mode">
-</xsl:template>
-
-<xsl:template match="invpartnumber" mode="titlepage.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-    <br/>
-  </span>
-</xsl:template>
-
-<xsl:template match="issuenum" mode="titlepage.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-    <br/>
-  </span>
-</xsl:template>
-
-<xsl:template match="jobtitle" mode="titlepage.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-    <br/>
-  </span>
-</xsl:template>
-
-<xsl:template match="keywordset" mode="titlepage.mode">
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="titlepage.mode">
-  <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
-  <xsl:choose>
-    <xsl:when test="$generate.legalnotice.link != 0">
-      <xsl:variable name="filename">
-        <xsl:call-template name="make-relative-filename">
-          <xsl:with-param name="base.dir" select="$base.dir"/>
-	  <xsl:with-param name="base.name" select="concat($id,$html.ext)"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <xsl:variable name="title">
-        <xsl:apply-templates select="." mode="title.markup"/>
-      </xsl:variable>
-
-      <xsl:variable name="href">
-        <xsl:apply-templates mode="chunk-filename" select="."/>
-      </xsl:variable>
-
-      <a href="{$href}">
-        <xsl:copy-of select="$title"/>
-      </a>
-
-      <xsl:call-template name="write.chunk">
-        <xsl:with-param name="filename" select="$filename"/>
-        <xsl:with-param name="quiet" select="$chunk.quietly"/>
-        <xsl:with-param name="content">
-        <xsl:call-template name="user.preroot"/>
-          <html>
-            <head>
-              <xsl:call-template name="system.head.content"/>
-              <xsl:call-template name="head.content"/>
-              <xsl:call-template name="user.head.content"/>
-            </head>
-            <body>
-              <xsl:call-template name="body.attributes"/>
-              <div>
-                <xsl:apply-templates select="." mode="class.attribute"/>
-                <xsl:apply-templates mode="titlepage.mode"/>
-              </div>
-            </body>
-          </html>
-          <xsl:value-of select="$chunk.append"/>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <div>
-        <xsl:apply-templates select="." mode="class.attribute"/>
-        <a id="{$id}"/>
-        <xsl:apply-templates mode="titlepage.mode"/>
-      </div>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="legalnotice/title" mode="titlepage.mode">
-  <p class="legalnotice-title"><b><xsl:apply-templates/></b></p>
-</xsl:template>
-
-<xsl:template match="lineage" mode="titlepage.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-    <br/>
-  </span>
-</xsl:template>
-
-<xsl:template match="modespec" mode="titlepage.mode">
-</xsl:template>
-
-<xsl:template match="orgdiv" mode="titlepage.mode">
-  <xsl:if test="preceding-sibling::*[1][self::orgname]">
-    <xsl:text> </xsl:text>
-  </xsl:if>
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-    <br/>
-  </span>
-</xsl:template>
-
-<xsl:template match="orgname" mode="titlepage.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-    <br/>
-  </span>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="titlepage.mode">
-<xsl:choose>
-  <xsl:when test="not($othercredit.like.author.enabled = 0)">
-  <xsl:variable name="contrib" select="string(contrib)"/>
-  <xsl:choose>
-    <xsl:when test="contrib">
-      <xsl:if test="not(preceding-sibling::othercredit[string(contrib)=$contrib])">
-        <xsl:call-template name="paragraph">
-          <xsl:with-param name="class" select="local-name(.)"/>
-          <xsl:with-param name="content">
-            <xsl:apply-templates mode="titlepage.mode" select="contrib"/>
-            <xsl:text>: </xsl:text>
-            <xsl:call-template name="person.name"/>
-            <xsl:apply-templates mode="titlepage.mode" select="affiliation"/>
-            <xsl:apply-templates select="following-sibling::othercredit[string(contrib)=$contrib]" mode="titlepage.othercredits"/>
-          </xsl:with-param>
-        </xsl:call-template>
-      </xsl:if>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="paragraph">
-        <xsl:with-param name="class" select="local-name(.)"/>
-        <xsl:with-param name="content">
-          <xsl:call-template name="person.name"/>
-        </xsl:with-param>
-      </xsl:call-template>
-      <xsl:apply-templates mode="titlepage.mode" select="affiliation"/>
-    </xsl:otherwise>
-  </xsl:choose>
-  </xsl:when>
-  <xsl:otherwise>
-    <xsl:call-template name="credits.div"/>
-  </xsl:otherwise>
-</xsl:choose>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="titlepage.othercredits">
-  <xsl:text>, </xsl:text>
-  <xsl:call-template name="person.name"/>
-</xsl:template>
-
-<xsl:template match="othername" mode="titlepage.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-    <br/>
-  </span>
-</xsl:template>
-
-<xsl:template match="pagenums" mode="titlepage.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-    <br/>
-  </span>
-</xsl:template>
-
-<xsl:template match="printhistory" mode="titlepage.mode">
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="productname" mode="titlepage.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-    <br/>
-  </span>
-</xsl:template>
-
-<xsl:template match="productnumber" mode="titlepage.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-    <br/>
-  </span>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="titlepage.mode">
-  <xsl:call-template name="paragraph">
-    <xsl:with-param name="class" select="local-name(.)"/>
-    <xsl:with-param name="content">
-      <xsl:apply-templates mode="titlepage.mode"/>
-    </xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="publisher" mode="titlepage.mode">
-  <xsl:call-template name="paragraph">
-    <xsl:with-param name="class" select="local-name(.)"/>
-    <xsl:with-param name="content">
-      <xsl:apply-templates mode="titlepage.mode"/>
-    </xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="publishername" mode="titlepage.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-    <br/>
-  </span>
-</xsl:template>
-
-<xsl:template match="pubsnumber" mode="titlepage.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-    <br/>
-  </span>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="titlepage.mode">
-  <xsl:call-template name="paragraph">
-    <xsl:with-param name="class" select="local-name(.)"/>
-    <xsl:with-param name="content">
-      <xsl:apply-templates mode="titlepage.mode"/>
-    </xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="titlepage.mode">
-  <xsl:variable name="numcols">
-    <xsl:choose>
-      <xsl:when test=".//authorinitials|.//author">3</xsl:when>
-      <xsl:otherwise>2</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
-
-  <xsl:variable name="title">
-    <xsl:call-template name="gentext">
-      <xsl:with-param name="key">RevHistory</xsl:with-param>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="contents">
-    <div>
-      <xsl:apply-templates select="." mode="class.attribute"/>
-      <table border="1" width="100%" summary="Revision history">
-        <tr>
-          <th align="left" valign="top" colspan="{$numcols}">
-            <b>
-              <xsl:call-template name="gentext">
-                <xsl:with-param name="key" select="'RevHistory'"/>
-              </xsl:call-template>
-            </b>
-          </th>
-        </tr>
-        <xsl:apply-templates mode="titlepage.mode">
-          <xsl:with-param name="numcols" select="$numcols"/>
-        </xsl:apply-templates>
-      </table>
-    </div>
-  </xsl:variable>
-  
-  <xsl:choose>
-    <xsl:when test="$generate.revhistory.link != 0">
-      <xsl:variable name="filename">
-        <xsl:call-template name="make-relative-filename">
-          <xsl:with-param name="base.dir" select="$base.dir"/>
-          <xsl:with-param name="base.name" select="concat($id,$html.ext)"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <a href="{concat($id,$html.ext)}">
-        <xsl:copy-of select="$title"/>
-      </a>
-
-      <xsl:call-template name="write.chunk">
-        <xsl:with-param name="filename" select="$filename"/>
-        <xsl:with-param name="quiet" select="$chunk.quietly"/>
-        <xsl:with-param name="content">
-        <xsl:call-template name="user.preroot"/>
-          <html>
-            <head>
-              <xsl:call-template name="system.head.content"/>
-              <xsl:call-template name="head.content">
-                <xsl:with-param name="title">
-                    <xsl:value-of select="$title"/>
-                    <xsl:if test="../../title">
-                        <xsl:value-of select="concat(' (', ../../title, ')')"/>
-                    </xsl:if>
-                </xsl:with-param>
-              </xsl:call-template>
-              <xsl:call-template name="user.head.content"/>
-            </head>
-            <body>
-              <xsl:call-template name="body.attributes"/>
-              <xsl:copy-of select="$contents"/>
-            </body>
-          </html>
-          <xsl:text>
-</xsl:text>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:copy-of select="$contents"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="revhistory/revision" mode="titlepage.mode">
-  <xsl:param name="numcols" select="'3'"/>
-  <xsl:variable name="revnumber" select="revnumber"/>
-  <xsl:variable name="revdate" select="date"/>
-  <xsl:variable name="revauthor" select="authorinitials|author"/>
-  <xsl:variable name="revremark" select="revremark|revdescription"/>
-  <tr>
-    <td align="left">
-      <xsl:if test="$revnumber">
-        <xsl:call-template name="gentext">
-          <xsl:with-param name="key" select="'Revision'"/>
-        </xsl:call-template>
-        <xsl:call-template name="gentext.space"/>
-        <xsl:apply-templates select="$revnumber[1]" mode="titlepage.mode"/>
-      </xsl:if>
-    </td>
-    <td align="left">
-      <xsl:apply-templates select="$revdate[1]" mode="titlepage.mode"/>
-    </td>
-    <xsl:choose>
-      <xsl:when test="$revauthor">
-        <td align="left">
-          <xsl:for-each select="$revauthor">
-            <xsl:apply-templates select="." mode="titlepage.mode"/>
-            <xsl:if test="position() != last()">
-	      <xsl:text>, </xsl:text>
-	    </xsl:if>
-	  </xsl:for-each>
-        </td>
-      </xsl:when>
-      <xsl:when test="$numcols &gt; 2">
-        <td>&#160;</td>
-      </xsl:when>
-      <xsl:otherwise/>
-    </xsl:choose>
-  </tr>
-  <xsl:if test="$revremark">
-    <tr>
-      <td align="left" colspan="{$numcols}">
-        <xsl:apply-templates select="$revremark[1]" mode="titlepage.mode"/>
-      </td>
-    </tr>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="revision/revnumber" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="revision/date" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="revision/authorinitials" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="revision/author" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="revision/revremark" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="revision/revdescription" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="seriesvolnums" mode="titlepage.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-    <br/>
-  </span>
-</xsl:template>
-
-<xsl:template match="shortaffil" mode="titlepage.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-    <br/>
-  </span>
-</xsl:template>
-
-<xsl:template match="subjectset" mode="titlepage.mode">
-</xsl:template>
-
-<xsl:template match="subtitle" mode="titlepage.mode">
-  <h2>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-  </h2>
-</xsl:template>
-
-<xsl:template match="surname" mode="titlepage.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-    <br/>
-  </span>
-</xsl:template>
-
-<xsl:template match="title" mode="titlepage.mode">
-  <xsl:variable name="id">
-    <xsl:choose>
-      <!-- if title is in an *info wrapper, get the grandparent -->
-      <xsl:when test="contains(local-name(..), 'info')">
-        <xsl:call-template name="object.id">
-          <xsl:with-param name="object" select="../.."/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="object.id">
-          <xsl:with-param name="object" select=".."/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <h1>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:if test="$generate.id.attributes = 0">
-      <a id="{$id}"/>
-    </xsl:if>
-    <xsl:choose>
-      <xsl:when test="$show.revisionflag != 0 and @revisionflag">
-	<span class="{@revisionflag}">
-	  <xsl:apply-templates mode="titlepage.mode"/>
-	</span>
-      </xsl:when>
-      <xsl:otherwise>
-	<xsl:apply-templates mode="titlepage.mode"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </h1>
-</xsl:template>
-
-<xsl:template match="titleabbrev" mode="titlepage.mode">
-  <!-- nop; title abbreviations don't belong on the title page! -->
-</xsl:template>
-
-<xsl:template match="volumenum" mode="titlepage.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-    <br/>
-  </span>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/toc.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/toc.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,163 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:template match="toc">
-  <xsl:choose>
-    <xsl:when test="*">
-      <xsl:if test="$process.source.toc != 0">
-        <!-- if the toc isn't empty, process it -->
-        <xsl:element name="{$toc.list.type}" namespace="http://www.w3.org/1999/xhtml">
-          <xsl:apply-templates/>
-        </xsl:element>
-      </xsl:if>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:if test="$process.empty.source.toc != 0">
-        <xsl:choose>
-          <xsl:when test="parent::section                           or parent::sect1                           or parent::sect2                           or parent::sect3                           or parent::sect4                           or parent::sect5">
-            <xsl:apply-templates select="parent::*" mode="toc.for.section"/>
-          </xsl:when>
-          <xsl:when test="parent::article">
-            <xsl:apply-templates select="parent::*" mode="toc.for.component"/>
-          </xsl:when>
-          <xsl:when test="parent::book                           or parent::part">
-            <xsl:apply-templates select="parent::*" mode="toc.for.division"/>
-          </xsl:when>
-          <xsl:when test="parent::set">
-            <xsl:apply-templates select="parent::*" mode="toc.for.set"/>
-          </xsl:when>
-          <!-- there aren't any other contexts that allow toc -->
-          <xsl:otherwise>
-            <xsl:message>
-              <xsl:text>I don't know how to make a TOC in this context!</xsl:text>
-            </xsl:message>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:if>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="tocpart|tocchap                      |toclevel1|toclevel2|toclevel3|toclevel4|toclevel5">
-  <xsl:variable name="sub-toc">
-    <xsl:if test="tocchap|toclevel1|toclevel2|toclevel3|toclevel4|toclevel5">
-      <xsl:choose>
-        <xsl:when test="$toc.list.type = 'dl'">
-          <dd>
-            <xsl:element name="{$toc.list.type}" namespace="http://www.w3.org/1999/xhtml">
-              <xsl:apply-templates select="tocchap|toclevel1|toclevel2|toclevel3|toclevel4|toclevel5"/>
-            </xsl:element>
-          </dd>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:element name="{$toc.list.type}" namespace="http://www.w3.org/1999/xhtml">
-            <xsl:apply-templates select="tocchap|toclevel1|toclevel2|toclevel3|toclevel4|toclevel5"/>
-          </xsl:element>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:apply-templates select="tocentry[position() != last()]"/>
-
-  <xsl:choose>
-    <xsl:when test="$toc.list.type = 'dl'">
-      <dt>
-        <xsl:apply-templates select="tocentry[position() = last()]"/>
-      </dt>
-      <xsl:copy-of select="$sub-toc"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <li>
-        <xsl:apply-templates select="tocentry[position() = last()]"/>
-        <xsl:copy-of select="$sub-toc"/>
-      </li>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="tocentry|tocfront|tocback">
-  <xsl:choose>
-    <xsl:when test="$toc.list.type = 'dl'">
-      <dt>
-        <xsl:call-template name="tocentry-content"/>
-      </dt>
-    </xsl:when>
-    <xsl:otherwise>
-      <li>
-        <xsl:call-template name="tocentry-content"/>
-      </li>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="tocentry[position() = last()]" priority="2">
-  <xsl:call-template name="tocentry-content"/>
-</xsl:template>
-
-<xsl:template name="tocentry-content">
-  <xsl:variable name="targets" select="key('id',@linkend)"/>
-  <xsl:variable name="target" select="$targets[1]"/>
-
-  <xsl:choose>
-    <xsl:when test="@linkend">
-      <xsl:call-template name="check.id.unique">
-        <xsl:with-param name="linkend" select="@linkend"/>
-      </xsl:call-template>
-      <a>
-        <xsl:attribute name="href">
-          <xsl:call-template name="href.target">
-            <xsl:with-param name="object" select="$target"/>
-          </xsl:call-template>
-        </xsl:attribute>
-        <xsl:apply-templates/>
-      </a>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="*" mode="toc.for.section">
-  <xsl:call-template name="section.toc"/>
-</xsl:template>
-
-<xsl:template match="*" mode="toc.for.component">
-  <xsl:call-template name="component.toc"/>
-</xsl:template>
-
-<xsl:template match="*" mode="toc.for.section">
-  <xsl:call-template name="section.toc"/>
-</xsl:template>
-
-<xsl:template match="*" mode="toc.for.division">
-  <xsl:call-template name="division.toc"/>
-</xsl:template>
-
-<xsl:template match="*" mode="toc.for.set">
-  <xsl:call-template name="set.toc"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="lot|lotentry">
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/verbatim.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/verbatim.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,354 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:sverb="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.Verbatim" xmlns:xverb="xalan://com.nwalsh.xalan.Verbatim" xmlns:lxslt="http://xml.apache.org/xslt" xmlns:exsl="http://exslt.org/common" xmlns="http://www.w3.org/1999/xhtml" exclude-result-prefixes="sverb xverb lxslt exsl" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<xsl:include href="../highlighting/common.xsl"/>
-<xsl:include href="highlight.xsl"/>
-
-<lxslt:component prefix="xverb" functions="numberLines"/>
-
-<xsl:template match="programlisting|screen|synopsis">
-  <xsl:param name="suppress-numbers" select="'0'"/>
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:call-template name="anchor"/>
-
-  <xsl:if test="$shade.verbatim != 0">
-    <xsl:message>
-      <xsl:text>The shade.verbatim parameter is deprecated. </xsl:text>
-      <xsl:text>Use CSS instead,</xsl:text>
-    </xsl:message>
-    <xsl:message>
-      <xsl:text>for example: pre.</xsl:text>
-      <xsl:value-of select="local-name(.)"/>
-      <xsl:text> { background-color: #E0E0E0; }</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <xsl:choose>
-    <xsl:when test="$suppress-numbers = '0'       and @linenumbering = 'numbered'       and $use.extensions != '0'       and $linenumbering.extension != '0'">
-      <xsl:variable name="rtf">
-	<xsl:call-template name="apply-highlighting"/>
-      </xsl:variable>
-      <pre>
-        <xsl:apply-templates select="." mode="class.attribute"/>
-	<xsl:call-template name="number.rtf.lines">
-	  <xsl:with-param name="rtf" select="$rtf"/>
-	</xsl:call-template>
-      </pre>
-    </xsl:when>
-    <xsl:otherwise>
-      <pre>
-        <xsl:apply-templates select="." mode="class.attribute"/>
-	<xsl:call-template name="apply-highlighting"/>
-      </pre>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="literallayout">
-  <xsl:param name="suppress-numbers" select="'0'"/>
-
-  <xsl:variable name="rtf">
-    <xsl:apply-templates/>
-  </xsl:variable>
-
-  <xsl:if test="$shade.verbatim != 0 and @class='monospaced'">
-    <xsl:message>
-      <xsl:text>The shade.verbatim parameter is deprecated. </xsl:text>
-      <xsl:text>Use CSS instead,</xsl:text>
-    </xsl:message>
-    <xsl:message>
-      <xsl:text>for example: pre.</xsl:text>
-      <xsl:value-of select="local-name(.)"/>
-      <xsl:text> { background-color: #E0E0E0; }</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <xsl:choose>
-    <xsl:when test="$suppress-numbers = '0'       and @linenumbering = 'numbered'       and $use.extensions != '0'       and $linenumbering.extension != '0'">
-      <xsl:choose>
-	<xsl:when test="@class='monospaced'">
-          <pre>
-            <xsl:apply-templates select="." mode="class.attribute"/>
-	    <xsl:call-template name="number.rtf.lines">
-	      <xsl:with-param name="rtf" select="$rtf"/>
-	    </xsl:call-template>
-	  </pre>
-	</xsl:when>
-	<xsl:otherwise>
-          <div>
-            <xsl:apply-templates select="." mode="class.attribute"/>
-	    <p>
-	      <xsl:call-template name="number.rtf.lines">
-		<xsl:with-param name="rtf" select="$rtf"/>
-	      </xsl:call-template>
-	    </p>
-	  </div>
-	</xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:choose>
-	<xsl:when test="@class='monospaced'">
-          <pre>
-            <xsl:apply-templates select="." mode="class.attribute"/>
-	    <xsl:copy-of select="$rtf"/>
-	  </pre>
-	</xsl:when>
-	<xsl:otherwise>
-          <div>
-            <xsl:apply-templates select="." mode="class.attribute"/>
-	    <p>
-	      <xsl:call-template name="make-verbatim">
-		<xsl:with-param name="rtf" select="$rtf"/>
-	      </xsl:call-template>
-	    </p>
-	  </div>
-	</xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="address">
-  <xsl:param name="suppress-numbers" select="'0'"/>
-
-  <xsl:variable name="rtf">
-    <xsl:apply-templates/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$suppress-numbers = '0'                     and @linenumbering = 'numbered'                     and $use.extensions != '0'                     and $linenumbering.extension != '0'">
-      <div>
-        <xsl:apply-templates select="." mode="class.attribute"/>
-        <p>
-          <xsl:call-template name="number.rtf.lines">
-            <xsl:with-param name="rtf" select="$rtf"/>
-          </xsl:call-template>
-        </p>
-      </div>
-    </xsl:when>
-
-    <xsl:otherwise>
-      <div>
-        <xsl:apply-templates select="." mode="class.attribute"/>
-        <p>
-          <xsl:call-template name="make-verbatim">
-            <xsl:with-param name="rtf" select="$rtf"/>
-          </xsl:call-template>
-        </p>
-      </div>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="number.rtf.lines">
-  <xsl:param name="rtf" select="''"/>
-  <xsl:param name="pi.context" select="."/>
-
-  <!-- Save the global values -->
-  <xsl:variable name="global.linenumbering.everyNth" select="$linenumbering.everyNth"/>
-
-  <xsl:variable name="global.linenumbering.separator" select="$linenumbering.separator"/>
-
-  <xsl:variable name="global.linenumbering.width" select="$linenumbering.width"/>
-
-  <!-- Extract the <?dbhtml linenumbering.*?> PI values -->
-  <xsl:variable name="pi.linenumbering.everyNth">
-    <xsl:call-template name="pi.dbhtml_linenumbering.everyNth">
-      <xsl:with-param name="node" select="$pi.context"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="pi.linenumbering.separator">
-    <xsl:call-template name="pi.dbhtml_linenumbering.separator">
-      <xsl:with-param name="node" select="$pi.context"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="pi.linenumbering.width">
-    <xsl:call-template name="pi.dbhtml_linenumbering.width">
-      <xsl:with-param name="node" select="$pi.context"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <!-- Construct the 'in-context' values -->
-  <xsl:variable name="linenumbering.everyNth">
-    <xsl:choose>
-      <xsl:when test="$pi.linenumbering.everyNth != ''">
-        <xsl:value-of select="$pi.linenumbering.everyNth"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$global.linenumbering.everyNth"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="linenumbering.separator">
-    <xsl:choose>
-      <xsl:when test="$pi.linenumbering.separator != ''">
-        <xsl:value-of select="$pi.linenumbering.separator"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$global.linenumbering.separator"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="linenumbering.width">
-    <xsl:choose>
-      <xsl:when test="$pi.linenumbering.width != ''">
-        <xsl:value-of select="$pi.linenumbering.width"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$global.linenumbering.width"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="linenumbering.startinglinenumber">
-    <xsl:choose>
-      <xsl:when test="$pi.context/@startinglinenumber">
-        <xsl:value-of select="$pi.context/@startinglinenumber"/>
-      </xsl:when>
-      <xsl:when test="$pi.context/@continuation='continues'">
-        <xsl:variable name="lastLine">
-          <xsl:choose>
-            <xsl:when test="$pi.context/self::programlisting">
-              <xsl:call-template name="lastLineNumber">
-                <xsl:with-param name="listings" select="preceding::programlisting[@linenumbering='numbered']"/>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:when test="$pi.context/self::screen">
-              <xsl:call-template name="lastLineNumber">
-                <xsl:with-param name="listings" select="preceding::screen[@linenumbering='numbered']"/>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:when test="$pi.context/self::literallayout">
-              <xsl:call-template name="lastLineNumber">
-                <xsl:with-param name="listings" select="preceding::literallayout[@linenumbering='numbered']"/>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:when test="$pi.context/self::address">
-              <xsl:call-template name="lastLineNumber">
-                <xsl:with-param name="listings" select="preceding::address[@linenumbering='numbered']"/>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:when test="$pi.context/self::synopsis">
-              <xsl:call-template name="lastLineNumber">
-                <xsl:with-param name="listings" select="preceding::synopsis[@linenumbering='numbered']"/>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:message>
-                <xsl:text>Unexpected verbatim environment: </xsl:text>
-                <xsl:value-of select="local-name($pi.context)"/>
-              </xsl:message>
-              <xsl:value-of select="0"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:variable>
-
-        <xsl:value-of select="$lastLine + 1"/>
-      </xsl:when>
-      <xsl:otherwise>1</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="function-available('sverb:numberLines')">
-      <xsl:copy-of select="sverb:numberLines($rtf)"/>
-    </xsl:when>
-    <xsl:when test="function-available('xverb:numberLines')">
-      <xsl:copy-of select="xverb:numberLines($rtf)"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:message terminate="yes">
-        <xsl:text>No numberLines function available.</xsl:text>
-      </xsl:message>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="make-verbatim">
-  <xsl:param name="rtf"/>
-
-  <!-- I want to make this RTF verbatim. There are two possibilities: either
-       I have access to the exsl:node-set extension function and I can "do it right"
-       or I have to rely on CSS. -->
-
-  <xsl:choose>
-    <xsl:when test="function-available('exsl:node-set')">
-      <xsl:apply-templates select="exsl:node-set($rtf)" mode="make.verbatim.mode"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <span style="white-space: pre;">
-        <xsl:copy-of select="$rtf"/>
-      </span>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ======================================================================== -->
-
-<xsl:template name="lastLineNumber">
-  <xsl:param name="listings"/>
-  <xsl:param name="number" select="0"/>
-
-  <xsl:variable name="lines">
-    <xsl:call-template name="countLines">
-      <xsl:with-param name="listing" select="string($listings[1])"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="not($listings)">
-      <xsl:value-of select="$number"/>
-    </xsl:when>
-    <xsl:when test="$listings[1]/@startinglinenumber">
-      <xsl:value-of select="$number + $listings[1]/@startinglinenumber + $lines - 1"/>
-    </xsl:when>
-    <xsl:when test="$listings[1]/@continuation='continues'">
-      <xsl:call-template name="lastLineNumber">
-        <xsl:with-param name="listings" select="listings[position() &gt; 1]"/>
-        <xsl:with-param name="number" select="$number + $lines"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$lines"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="countLines">
-  <xsl:param name="listing"/>
-  <xsl:param name="count" select="1"/>
-
-  <xsl:choose>
-    <xsl:when test="contains($listing, '&#10;')">
-      <xsl:call-template name="countLines">
-        <xsl:with-param name="listing" select="substring-after($listing, '&#10;')"/>
-        <xsl:with-param name="count" select="$count + 1"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$count"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/xref.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/xref.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,1288 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:suwl="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.UnwrapLinks" xmlns:exsl="http://exslt.org/common" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/1999/xhtml" exclude-result-prefixes="suwl exsl xlink" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- Use internal variable for olink xlink role for consistency -->
-<xsl:variable name="xolink.role">http://docbook.org/xlink/role/olink</xsl:variable>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="anchor">
-  <xsl:call-template name="anchor"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="xref" name="xref">
-  <xsl:param name="xhref" select="@xlink:href"/>
-  <!-- is the @xlink:href a local idref link? -->
-  <xsl:param name="xlink.idref">
-    <xsl:if test="starts-with($xhref,'#')                   and (not(contains($xhref,'('))                   or starts-with($xhref, '#xpointer(id('))">
-      <xsl:call-template name="xpointer.idref">
-        <xsl:with-param name="xpointer" select="$xhref"/>
-      </xsl:call-template>
-   </xsl:if>
-  </xsl:param>
-  <xsl:param name="xlink.targets" select="key('id',$xlink.idref)"/>
-  <xsl:param name="linkend.targets" select="key('id',@linkend)"/>
-  <xsl:param name="target" select="($xlink.targets | $linkend.targets)[1]"/>
-
-  <xsl:variable name="xrefstyle">
-    <xsl:choose>
-      <xsl:when test="@role and not(@xrefstyle)                        and $use.role.as.xrefstyle != 0">
-        <xsl:value-of select="@role"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="@xrefstyle"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:call-template name="anchor"/>
-
-  <xsl:variable name="content">
-    <xsl:choose>
-  
-      <xsl:when test="@endterm">
-        <xsl:variable name="etargets" select="key('id',@endterm)"/>
-        <xsl:variable name="etarget" select="$etargets[1]"/>
-        <xsl:choose>
-          <xsl:when test="count($etarget) = 0">
-            <xsl:message>
-              <xsl:value-of select="count($etargets)"/>
-              <xsl:text>Endterm points to nonexistent ID: </xsl:text>
-              <xsl:value-of select="@endterm"/>
-            </xsl:message>
-            <xsl:text>???</xsl:text>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:apply-templates select="$etarget" mode="endterm"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-  
-      <xsl:when test="$target/@xreflabel">
-        <xsl:call-template name="xref.xreflabel">
-          <xsl:with-param name="target" select="$target"/>
-        </xsl:call-template>
-      </xsl:when>
-  
-      <xsl:when test="$target">
-        <xsl:if test="not(parent::citation)">
-          <xsl:apply-templates select="$target" mode="xref-to-prefix"/>
-        </xsl:if>
-  
-        <xsl:apply-templates select="$target" mode="xref-to">
-          <xsl:with-param name="referrer" select="."/>
-          <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-        </xsl:apply-templates>
-  
-        <xsl:if test="not(parent::citation)">
-          <xsl:apply-templates select="$target" mode="xref-to-suffix"/>
-        </xsl:if>
-      </xsl:when>
-
-      <xsl:otherwise>
-        <xsl:message>
-          <xsl:text>ERROR: xref linking to </xsl:text>
-          <xsl:value-of select="@linkend|@xlink:href"/>
-          <xsl:text> has no generated link text.</xsl:text>
-        </xsl:message>
-        <xsl:text>???</xsl:text>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:call-template name="simple.xlink">
-    <xsl:with-param name="content" select="$content"/>
-  </xsl:call-template>
-
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<!-- biblioref handled largely like an xref -->
-<!-- To be done: add support for begin, end, and units attributes -->
-<xsl:template match="biblioref">
-  <xsl:variable name="targets" select="key('id',@linkend)"/>
-  <xsl:variable name="target" select="$targets[1]"/>
-  <xsl:variable name="refelem" select="local-name($target)"/>
-
-  <xsl:call-template name="check.id.unique">
-    <xsl:with-param name="linkend" select="@linkend"/>
-  </xsl:call-template>
-
-  <xsl:call-template name="anchor"/>
-
-  <xsl:choose>
-    <xsl:when test="count($target) = 0">
-      <xsl:message>
-        <xsl:text>XRef to nonexistent id: </xsl:text>
-        <xsl:value-of select="@linkend"/>
-      </xsl:message>
-      <xsl:text>???</xsl:text>
-    </xsl:when>
-
-    <xsl:when test="@endterm">
-      <xsl:variable name="href">
-        <xsl:call-template name="href.target">
-          <xsl:with-param name="object" select="$target"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <xsl:variable name="etargets" select="key('id',@endterm)"/>
-      <xsl:variable name="etarget" select="$etargets[1]"/>
-      <xsl:choose>
-        <xsl:when test="count($etarget) = 0">
-          <xsl:message>
-            <xsl:value-of select="count($etargets)"/>
-            <xsl:text>Endterm points to nonexistent ID: </xsl:text>
-            <xsl:value-of select="@endterm"/>
-          </xsl:message>
-          <a href="{$href}">
-            <xsl:apply-templates select="." mode="class.attribute"/>
-            <xsl:text>???</xsl:text>
-          </a>
-        </xsl:when>
-        <xsl:otherwise>
-          <a href="{$href}">
-            <xsl:apply-templates select="." mode="class.attribute"/>
-            <xsl:apply-templates select="$etarget" mode="endterm"/>
-          </a>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-
-    <xsl:when test="$target/@xreflabel">
-      <a>
-        <xsl:apply-templates select="." mode="class.attribute"/>
-        <xsl:attribute name="href">
-          <xsl:call-template name="href.target">
-            <xsl:with-param name="object" select="$target"/>
-          </xsl:call-template>
-        </xsl:attribute>
-        <xsl:call-template name="xref.xreflabel">
-          <xsl:with-param name="target" select="$target"/>
-        </xsl:call-template>
-      </a>
-    </xsl:when>
-
-    <xsl:otherwise>
-      <xsl:variable name="href">
-        <xsl:call-template name="href.target">
-          <xsl:with-param name="object" select="$target"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <xsl:if test="not(parent::citation)">
-        <xsl:apply-templates select="$target" mode="xref-to-prefix"/>
-      </xsl:if>
-
-      <a href="{$href}">
-        <xsl:apply-templates select="." mode="class.attribute"/>
-        <xsl:if test="$target/title or $target/*/title">
-          <xsl:attribute name="title">
-            <xsl:apply-templates select="$target" mode="xref-title"/>
-          </xsl:attribute>
-        </xsl:if>
-        <xsl:apply-templates select="$target" mode="xref-to">
-          <xsl:with-param name="referrer" select="."/>
-          <xsl:with-param name="xrefstyle">
-            <xsl:choose>
-              <xsl:when test="@role and not(@xrefstyle) and $use.role.as.xrefstyle != 0">
-                <xsl:value-of select="@role"/>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:value-of select="@xrefstyle"/>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:with-param>
-        </xsl:apply-templates>
-      </a>
-
-      <xsl:if test="not(parent::citation)">
-        <xsl:apply-templates select="$target" mode="xref-to-suffix"/>
-      </xsl:if>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="*" mode="endterm">
-  <!-- Process the children of the endterm element -->
-  <xsl:variable name="endterm">
-    <xsl:apply-templates select="child::node()"/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="function-available('exsl:node-set')">
-      <xsl:apply-templates select="exsl:node-set($endterm)" mode="remove-ids"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:copy-of select="$endterm"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="*" mode="remove-ids">
-  <xsl:choose>
-    <!-- handle html or xhtml -->
-    <xsl:when test="local-name(.) = 'a'                     and (namespace-uri(.) = ''                          or namespace-uri(.) = 'http://www.w3.org/1999/xhtml')">
-      <xsl:choose>
-        <xsl:when test="(@name and count(@*) = 1)                         or (@id and count(@*) = 1)                         or (@xml:id and count(@*) = 1)                         or (@xml:id and @name and count(@*) = 2)                         or (@id and @name and count(@*) = 2)">
-          <xsl:message>suppress anchor</xsl:message>
-          <!-- suppress the whole thing -->
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:copy>
-            <xsl:for-each select="@*">
-              <xsl:choose>
-                <xsl:when test="local-name(.) != 'name' and local-name(.) != 'id'">
-                  <xsl:copy/>
-                </xsl:when>
-                <xsl:otherwise>
-                  <xsl:message>removing <xsl:value-of select="local-name(.)"/></xsl:message>
-                </xsl:otherwise>
-              </xsl:choose>
-            </xsl:for-each>
-          </xsl:copy>
-          <xsl:apply-templates mode="remove-ids"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:copy>
-        <xsl:for-each select="@*">
-          <xsl:choose>
-            <xsl:when test="local-name(.) != 'id'">
-              <xsl:copy/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:message>removing <xsl:value-of select="local-name(.)"/></xsl:message>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:for-each>
-        <xsl:apply-templates mode="remove-ids"/>
-      </xsl:copy>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="*" mode="xref-to-prefix"/>
-<xsl:template match="*" mode="xref-to-suffix"/>
-
-<xsl:template match="*" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:if test="$verbose">
-    <xsl:message>
-      <xsl:text>Don't know what gentext to create for xref to: "</xsl:text>
-      <xsl:value-of select="name(.)"/>
-      <xsl:text>", ("</xsl:text>
-      <xsl:value-of select="(@id|@xml:id)[1]"/>
-      <xsl:text>")</xsl:text>
-    </xsl:message>
-  </xsl:if>
-  <xsl:text>???</xsl:text>
-</xsl:template>
-
-<xsl:template match="title" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <!-- if you xref to a title, xref to the parent... -->
-  <xsl:choose>
-    <!-- FIXME: how reliable is this? -->
-    <xsl:when test="contains(local-name(parent::*), 'info')">
-      <xsl:apply-templates select="parent::*[2]" mode="xref-to">
-        <xsl:with-param name="referrer" select="$referrer"/>
-        <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-        <xsl:with-param name="verbose" select="$verbose"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates select="parent::*" mode="xref-to">
-        <xsl:with-param name="referrer" select="$referrer"/>
-        <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-        <xsl:with-param name="verbose" select="$verbose"/>
-      </xsl:apply-templates>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="abstract|authorblurb|personblurb|bibliodiv|bibliomset                      |biblioset|blockquote|calloutlist|caution|colophon                      |constraintdef|formalpara|glossdiv|important|indexdiv                      |itemizedlist|legalnotice|lot|msg|msgexplan|msgmain                      |msgrel|msgset|msgsub|note|orderedlist|partintro                      |productionset|qandadiv|refsynopsisdiv|segmentedlist                      |set|setindex|sidebar|tip|toc|variablelist|warning" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <!-- catch-all for things with (possibly optional) titles -->
-  <xsl:apply-templates select="." mode="object.xref.markup">
-    <xsl:with-param name="purpose" select="'xref'"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="author|editor|othercredit|personname" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-
-  <xsl:call-template name="person.name"/>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-
-  <xsl:call-template name="person.name.list"/>
-</xsl:template>
-
-<xsl:template match="figure|example|table|equation" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates select="." mode="object.xref.markup">
-    <xsl:with-param name="purpose" select="'xref'"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="procedure" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose"/>
-
-  <xsl:apply-templates select="." mode="object.xref.markup">
-    <xsl:with-param name="purpose" select="'xref'"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="task" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose"/>
-
-  <xsl:apply-templates select="." mode="object.xref.markup">
-    <xsl:with-param name="purpose" select="'xref'"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="cmdsynopsis" mode="xref-to">
-  <xsl:apply-templates select="(.//command)[1]" mode="xref"/>
-</xsl:template>
-
-<xsl:template match="funcsynopsis" mode="xref-to">
-  <xsl:apply-templates select="(.//function)[1]" mode="xref"/>
-</xsl:template>
-
-<xsl:template match="dedication|preface|chapter|appendix|article" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates select="." mode="object.xref.markup">
-    <xsl:with-param name="purpose" select="'xref'"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="bibliography" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates select="." mode="object.xref.markup">
-    <xsl:with-param name="purpose" select="'xref'"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="biblioentry|bibliomixed" mode="xref-to-prefix">
-  <xsl:text>[</xsl:text>
-</xsl:template>
-
-<xsl:template match="biblioentry|bibliomixed" mode="xref-to-suffix">
-  <xsl:text>]</xsl:text>
-</xsl:template>
-
-<xsl:template match="biblioentry|bibliomixed" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <!-- handles both biblioentry and bibliomixed -->
-  <xsl:choose>
-    <xsl:when test="string(.) = ''">
-      <xsl:variable name="bib" select="document($bibliography.collection,.)"/>
-      <xsl:variable name="id" select="(@id|@xml:id)[1]"/>
-      <xsl:variable name="entry" select="$bib/bibliography/                                     *[@id=$id or @xml:id=$id][1]"/>
-      <xsl:choose>
-        <xsl:when test="$entry">
-          <xsl:choose>
-            <xsl:when test="$bibliography.numbered != 0">
-              <xsl:number from="bibliography" count="biblioentry|bibliomixed" level="any" format="1"/>
-            </xsl:when>
-            <xsl:when test="local-name($entry/*[1]) = 'abbrev'">
-              <xsl:apply-templates select="$entry/*[1]"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:value-of select="(@id|@xml:id)[1]"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:message>
-            <xsl:text>No bibliography entry: </xsl:text>
-            <xsl:value-of select="$id"/>
-            <xsl:text> found in </xsl:text>
-            <xsl:value-of select="$bibliography.collection"/>
-          </xsl:message>
-          <xsl:value-of select="(@id|@xml:id)[1]"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:choose>
-        <xsl:when test="$bibliography.numbered != 0">
-          <xsl:number from="bibliography" count="biblioentry|bibliomixed" level="any" format="1"/>
-        </xsl:when>
-        <xsl:when test="local-name(*[1]) = 'abbrev'">
-          <xsl:apply-templates select="*[1]"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="(@id|@xml:id)[1]"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="glossary" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates select="." mode="object.xref.markup">
-    <xsl:with-param name="purpose" select="'xref'"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="glossentry" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-  <xsl:choose>
-    <xsl:when test="$glossentry.show.acronym = 'primary'">
-      <xsl:choose>
-        <xsl:when test="acronym|abbrev">
-          <xsl:apply-templates select="(acronym|abbrev)[1]"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates select="glossterm[1]" mode="xref-to">
-            <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-            <xsl:with-param name="referrer" select="$referrer"/>
-            <xsl:with-param name="verbose" select="$verbose"/>
-          </xsl:apply-templates>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates select="glossterm[1]" mode="xref-to">
-        <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-        <xsl:with-param name="referrer" select="$referrer"/>
-        <xsl:with-param name="verbose" select="$verbose"/>
-      </xsl:apply-templates>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="glossterm" mode="xref-to">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="index" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates select="." mode="object.xref.markup">
-    <xsl:with-param name="purpose" select="'xref'"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="listitem" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose"/>
-
-  <xsl:apply-templates select="." mode="object.xref.markup">
-    <xsl:with-param name="purpose" select="'xref'"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="section|simplesect                      |sect1|sect2|sect3|sect4|sect5                      |refsect1|refsect2|refsect3|refsection" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates select="." mode="object.xref.markup">
-    <xsl:with-param name="purpose" select="'xref'"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-  <!-- FIXME: What about "in Chapter X"? -->
-</xsl:template>
-
-<xsl:template match="bridgehead" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates select="." mode="object.xref.markup">
-    <xsl:with-param name="purpose" select="'xref'"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-  <!-- FIXME: What about "in Chapter X"? -->
-</xsl:template>
-
-<xsl:template match="qandaset" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates select="." mode="object.xref.markup">
-    <xsl:with-param name="purpose" select="'xref'"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="qandadiv" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates select="." mode="object.xref.markup">
-    <xsl:with-param name="purpose" select="'xref'"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="qandaentry" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates select="question[1]" mode="object.xref.markup">
-    <xsl:with-param name="purpose" select="'xref'"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="question|answer" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates select="." mode="object.xref.markup">
-    <xsl:with-param name="purpose" select="'xref'"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="part|reference" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates select="." mode="object.xref.markup">
-    <xsl:with-param name="purpose" select="'xref'"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="refentry" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-
-  <xsl:choose>
-    <xsl:when test="refmeta/refentrytitle">
-      <xsl:apply-templates select="refmeta/refentrytitle"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates select="refnamediv/refname[1]"/>
-    </xsl:otherwise>
-  </xsl:choose>
-  <xsl:apply-templates select="refmeta/manvolnum"/>
-</xsl:template>
-
-<xsl:template match="refnamediv" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates select="refname[1]" mode="xref-to">
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="refname" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates mode="xref-to"/>
-</xsl:template>
-
-<xsl:template match="step" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-
-  <xsl:call-template name="gentext">
-    <xsl:with-param name="key" select="'Step'"/>
-  </xsl:call-template>
-  <xsl:text> </xsl:text>
-  <xsl:apply-templates select="." mode="number"/>
-</xsl:template>
-
-<xsl:template match="varlistentry" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates select="term[1]" mode="xref-to">
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="varlistentry/term" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-
-  <!-- to avoid the comma that will be generated if there are several terms -->
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="co" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-
-  <xsl:apply-templates select="." mode="callout-bug"/>
-</xsl:template>
-
-<xsl:template match="area|areaset" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-
-  <xsl:call-template name="callout-bug">
-    <xsl:with-param name="conum">
-      <xsl:apply-templates select="." mode="conumber"/>
-    </xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="book" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates select="." mode="object.xref.markup">
-    <xsl:with-param name="purpose" select="'xref'"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="para" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:variable name="context" select="(ancestor::simplesect                                        |ancestor::section                                        |ancestor::sect1                                        |ancestor::sect2                                        |ancestor::sect3                                        |ancestor::sect4                                        |ancestor::sect5                                        |ancestor::refsection                                        |ancestor::refsect1                                        |ancestor::refsect2                                        |ancestor::refsect3                                        |ancestor::chapter                                        |ancestor::appendix                                        |ancestor::preface                                        |ancestor::partintro                                        |ancestor::dedication                                        |ancestor::colophon                                        |ancestor::bibliography                                        |ancestor::index                                        |ancestor::glossary                                        |ancestor::glossentry                                        |ancestor::listitem                                        |ancestor::varlistentry)[last()]"/>
-
-  <xsl:apply-templates select="$context" mode="xref-to">
-    <xsl:with-param name="purpose" select="'xref'"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="*" mode="xref-title">
-  <xsl:variable name="title">
-    <xsl:apply-templates select="." mode="object.title.markup"/>
-  </xsl:variable>
-
-  <xsl:value-of select="$title"/>
-</xsl:template>
-
-<xsl:template match="author" mode="xref-title">
-  <xsl:variable name="title">
-    <xsl:call-template name="person.name"/>
-  </xsl:variable>
-
-  <xsl:value-of select="$title"/>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="xref-title">
-  <xsl:variable name="title">
-    <xsl:call-template name="person.name.list"/>
-  </xsl:variable>
-
-  <xsl:value-of select="$title"/>
-</xsl:template>
-
-<xsl:template match="cmdsynopsis" mode="xref-title">
-  <xsl:variable name="title">
-    <xsl:apply-templates select="(.//command)[1]" mode="xref"/>
-  </xsl:variable>
-
-  <xsl:value-of select="$title"/>
-</xsl:template>
-
-<xsl:template match="funcsynopsis" mode="xref-title">
-  <xsl:variable name="title">
-    <xsl:apply-templates select="(.//function)[1]" mode="xref"/>
-  </xsl:variable>
-
-  <xsl:value-of select="$title"/>
-</xsl:template>
-
-<xsl:template match="biblioentry|bibliomixed" mode="xref-title">
-  <!-- handles both biblioentry and bibliomixed -->
-  <xsl:variable name="title">
-    <xsl:text>[</xsl:text>
-    <xsl:choose>
-      <xsl:when test="local-name(*[1]) = 'abbrev'">
-        <xsl:apply-templates select="*[1]"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="(@id|@xml:id)[1]"/>
-      </xsl:otherwise>
-    </xsl:choose>
-    <xsl:text>]</xsl:text>
-  </xsl:variable>
-
-  <xsl:value-of select="$title"/>
-</xsl:template>
-
-<xsl:template match="step" mode="xref-title">
-  <xsl:call-template name="gentext">
-    <xsl:with-param name="key" select="'Step'"/>
-  </xsl:call-template>
-  <xsl:text> </xsl:text>
-  <xsl:apply-templates select="." mode="number"/>
-</xsl:template>
-
-<xsl:template match="step[not(./title)]" mode="title.markup">
-  <xsl:call-template name="gentext">
-    <xsl:with-param name="key" select="'Step'"/>
-  </xsl:call-template>
-  <xsl:text> </xsl:text>
-  <xsl:apply-templates select="." mode="number"/>
-</xsl:template>
-
-<xsl:template match="co" mode="xref-title">
-  <xsl:variable name="title">
-    <xsl:apply-templates select="." mode="callout-bug"/>
-  </xsl:variable>
-
-  <xsl:value-of select="$title"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="link" name="link">
-  <xsl:param name="linkend" select="@linkend"/>
-  <xsl:param name="a.target"/>
-  <xsl:param name="xhref" select="@xlink:href"/>
-
-  <xsl:variable name="content">
-    <xsl:call-template name="anchor"/>
-    <xsl:choose>
-      <xsl:when test="count(child::node()) &gt; 0">
-        <!-- If it has content, use it -->
-        <xsl:apply-templates/>
-      </xsl:when>
-      <!-- else look for an endterm -->
-      <xsl:when test="@endterm">
-        <xsl:variable name="etargets" select="key('id',@endterm)"/>
-        <xsl:variable name="etarget" select="$etargets[1]"/>
-        <xsl:choose>
-          <xsl:when test="count($etarget) = 0">
-            <xsl:message>
-              <xsl:value-of select="count($etargets)"/>
-              <xsl:text>Endterm points to nonexistent ID: </xsl:text>
-              <xsl:value-of select="@endterm"/>
-            </xsl:message>
-            <xsl:text>???</xsl:text>
-          </xsl:when>
-          <xsl:otherwise>
-              <xsl:apply-templates select="$etarget" mode="endterm"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-      <!-- Use the xlink:href if no other text -->
-      <xsl:when test="@xlink:href">
-        <xsl:value-of select="@xlink:href"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:message>
-          <xsl:text>Link element has no content and no Endterm. </xsl:text>
-          <xsl:text>Nothing to show in the link to </xsl:text>
-          <xsl:value-of select="(@xlink:href|@linkend)[1]"/>
-        </xsl:message>
-        <xsl:text>???</xsl:text>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:call-template name="simple.xlink">
-    <xsl:with-param name="node" select="."/>
-    <xsl:with-param name="linkend" select="$linkend"/>
-    <xsl:with-param name="content" select="$content"/>
-    <xsl:with-param name="a.target" select="$a.target"/>
-    <xsl:with-param name="xhref" select="$xhref"/>
-  </xsl:call-template>
-
-</xsl:template>
-
-<xsl:template match="ulink" name="ulink">
-  <xsl:param name="url" select="@url"/>
-  <xsl:variable name="link">
-    <a>
-      <xsl:apply-templates select="." mode="class.attribute"/>
-      <xsl:if test="@id or @xml:id">
-        <xsl:attribute name="id">
-          <xsl:value-of select="(@id|@xml:id)[1]"/>
-        </xsl:attribute>
-      </xsl:if>
-      <xsl:attribute name="href"><xsl:value-of select="$url"/></xsl:attribute>
-      <xsl:if test="$ulink.target != ''">
-        <xsl:attribute name="target">
-          <xsl:value-of select="$ulink.target"/>
-        </xsl:attribute>
-      </xsl:if>
-      <xsl:choose>
-        <xsl:when test="count(child::node())=0">
-          <xsl:value-of select="$url"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </a>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="function-available('suwl:unwrapLinks')">
-      <xsl:copy-of select="suwl:unwrapLinks($link)"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:copy-of select="$link"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="olink" name="olink">
-  <!-- olink content may be passed in from xlink olink -->
-  <xsl:param name="content" select="NOTANELEMENT"/>
-
-  <xsl:call-template name="anchor"/>
-
-  <xsl:variable name="localinfo" select="@localinfo"/>
-
-  <xsl:choose>
-    <!-- olinks resolved by stylesheet and target database -->
-    <xsl:when test="@targetdoc or @targetptr or                     (@xlink:role=$xolink.role and                      contains(@xlink:href, '#') )">
-
-      <xsl:variable name="targetdoc.att">
-        <xsl:choose>
-          <xsl:when test="@targetdoc != ''">
-            <xsl:value-of select="@targetdoc"/>
-          </xsl:when>
-          <xsl:when test="@xlink:role=$xolink.role and                        contains(@xlink:href, '#')">
-            <xsl:value-of select="substring-before(@xlink:href, '#')"/>
-          </xsl:when>
-        </xsl:choose>
-      </xsl:variable>
-
-      <xsl:variable name="targetptr.att">
-        <xsl:choose>
-          <xsl:when test="@targetptr != ''">
-            <xsl:value-of select="@targetptr"/>
-          </xsl:when>
-          <xsl:when test="@xlink:role=$xolink.role and                        contains(@xlink:href, '#')">
-            <xsl:value-of select="substring-after(@xlink:href, '#')"/>
-          </xsl:when>
-        </xsl:choose>
-      </xsl:variable>
-
-      <xsl:variable name="olink.lang">
-        <xsl:call-template name="l10n.language">
-          <xsl:with-param name="xref-context" select="true()"/>
-        </xsl:call-template>
-      </xsl:variable>
-    
-      <xsl:variable name="target.database.filename">
-        <xsl:call-template name="select.target.database">
-          <xsl:with-param name="targetdoc.att" select="$targetdoc.att"/>
-          <xsl:with-param name="targetptr.att" select="$targetptr.att"/>
-          <xsl:with-param name="olink.lang" select="$olink.lang"/>
-        </xsl:call-template>
-      </xsl:variable>
-    
-      <xsl:variable name="target.database" select="document($target.database.filename,/)"/>
-    
-      <xsl:if test="$olink.debug != 0">
-        <xsl:message>
-          <xsl:text>Olink debug: root element of target.database '</xsl:text>
-          <xsl:value-of select="$target.database.filename"/>
-          <xsl:text>' is '</xsl:text>
-          <xsl:value-of select="local-name($target.database/*[1])"/>
-          <xsl:text>'.</xsl:text>
-        </xsl:message>
-      </xsl:if>
-    
-      <xsl:variable name="olink.key">
-        <xsl:call-template name="select.olink.key">
-          <xsl:with-param name="targetdoc.att" select="$targetdoc.att"/>
-          <xsl:with-param name="targetptr.att" select="$targetptr.att"/>
-          <xsl:with-param name="olink.lang" select="$olink.lang"/>
-          <xsl:with-param name="target.database" select="$target.database"/>
-        </xsl:call-template>
-      </xsl:variable>
-    
-      <xsl:if test="string-length($olink.key) = 0">
-        <xsl:message>
-          <xsl:text>Error: unresolved olink: </xsl:text>
-          <xsl:text>targetdoc/targetptr = '</xsl:text>
-          <xsl:value-of select="$targetdoc.att"/>
-          <xsl:text>/</xsl:text>
-          <xsl:value-of select="$targetptr.att"/>
-          <xsl:text>'.</xsl:text>
-        </xsl:message>
-      </xsl:if>
-
-      <xsl:variable name="href">
-        <xsl:call-template name="make.olink.href">
-          <xsl:with-param name="olink.key" select="$olink.key"/>
-          <xsl:with-param name="target.database" select="$target.database"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <xsl:variable name="hottext">
-        <xsl:choose>
-          <xsl:when test="$content">
-            <xsl:copy-of select="$content"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:call-template name="olink.hottext">
-              <xsl:with-param name="olink.key" select="$olink.key"/>
-              <xsl:with-param name="olink.lang" select="$olink.lang"/>
-              <xsl:with-param name="target.database" select="$target.database"/>
-            </xsl:call-template>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-
-      <xsl:variable name="olink.docname.citation">
-        <xsl:call-template name="olink.document.citation">
-          <xsl:with-param name="olink.key" select="$olink.key"/>
-          <xsl:with-param name="target.database" select="$target.database"/>
-          <xsl:with-param name="olink.lang" select="$olink.lang"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <xsl:variable name="olink.page.citation">
-        <xsl:call-template name="olink.page.citation">
-          <xsl:with-param name="olink.key" select="$olink.key"/>
-          <xsl:with-param name="target.database" select="$target.database"/>
-          <xsl:with-param name="olink.lang" select="$olink.lang"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <xsl:choose>
-        <xsl:when test="$href != ''">
-          <a href="{$href}">
-            <xsl:apply-templates select="." mode="class.attribute"/>
-            <xsl:copy-of select="$hottext"/>
-          </a>
-          <xsl:copy-of select="$olink.page.citation"/>
-          <xsl:copy-of select="$olink.docname.citation"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <span class="olink"><xsl:copy-of select="$hottext"/></span>
-          <xsl:copy-of select="$olink.page.citation"/>
-          <xsl:copy-of select="$olink.docname.citation"/>
-        </xsl:otherwise>
-      </xsl:choose>
-
-    </xsl:when>
-
-    <!-- Or use old olink mechanism -->
-    <xsl:otherwise>
-      <xsl:variable name="href">
-        <xsl:choose>
-          <xsl:when test="@linkmode">
-            <!-- use the linkmode to get the base URI, use localinfo as fragid -->
-            <xsl:variable name="modespec" select="key('id',@linkmode)"/>
-            <xsl:if test="count($modespec) != 1                           or local-name($modespec) != 'modespec'">
-              <xsl:message>Warning: olink linkmode pointer is wrong.</xsl:message>
-            </xsl:if>
-            <xsl:value-of select="$modespec"/>
-            <xsl:if test="@localinfo">
-              <xsl:text>#</xsl:text>
-              <xsl:value-of select="@localinfo"/>
-            </xsl:if>
-          </xsl:when>
-          <xsl:when test="@type = 'href'">
-            <xsl:call-template name="olink.outline">
-              <xsl:with-param name="outline.base.uri" select="unparsed-entity-uri(@targetdocent)"/>
-              <xsl:with-param name="localinfo" select="@localinfo"/>
-              <xsl:with-param name="return" select="'href'"/>
-            </xsl:call-template>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="$olink.resolver"/>
-            <xsl:text>?</xsl:text>
-            <xsl:value-of select="$olink.sysid"/>
-            <xsl:value-of select="unparsed-entity-uri(@targetdocent)"/>
-            <!-- XSL gives no access to the public identifier (grumble...) -->
-            <xsl:if test="@localinfo">
-              <xsl:text>&amp;</xsl:text>
-              <xsl:value-of select="$olink.fragid"/>
-              <xsl:value-of select="@localinfo"/>
-            </xsl:if>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-    
-      <xsl:choose>
-        <xsl:when test="$href != ''">
-          <a href="{$href}">
-            <xsl:apply-templates select="." mode="class.attribute"/>
-            <xsl:call-template name="olink.hottext"/>
-          </a>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="olink.hottext"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="*" mode="pagenumber.markup">
-  <!-- no-op in HTML -->
-</xsl:template>
-
-
-<xsl:template name="olink.outline">
-  <xsl:param name="outline.base.uri"/>
-  <xsl:param name="localinfo"/>
-  <xsl:param name="return" select="href"/>
-
-  <xsl:variable name="outline-file" select="concat($outline.base.uri,                                $olink.outline.ext)"/>
-
-  <xsl:variable name="outline" select="document($outline-file,.)/div"/>
-
-  <xsl:variable name="node-href">
-    <xsl:choose>
-      <xsl:when test="$localinfo != ''">
-        <xsl:variable name="node" select="$outline//                                    *[@id=$localinfo or @xml:id=$localinfo]"/>
-        <xsl:value-of select="$node/@href"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$outline/@href"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="node-xref">
-    <xsl:choose>
-      <xsl:when test="$localinfo != ''">
-        <xsl:variable name="node" select="$outline//                                *[@id=$localinfo or @xml:id=$localinfo]"/>
-        <xsl:copy-of select="$node/xref"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$outline/xref"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$return = 'href'">
-      <xsl:value-of select="$node-href"/>
-    </xsl:when>
-    <xsl:when test="$return = 'xref'">
-      <xsl:value-of select="$node-xref"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:copy-of select="$node-xref"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="xref.xreflabel">
-  <!-- called to process an xreflabel...you might use this to make  -->
-  <!-- xreflabels come out in the right font for different targets, -->
-  <!-- for example. -->
-  <xsl:param name="target" select="."/>
-  <xsl:value-of select="$target/@xreflabel"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="title" mode="xref">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="command" mode="xref">
-  <xsl:call-template name="inline.boldseq"/>
-</xsl:template>
-
-<xsl:template match="function" mode="xref">
-  <xsl:call-template name="inline.monoseq"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="*" mode="insert.title.markup">
-  <xsl:param name="purpose"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="title"/>
-
-  <xsl:choose>
-    <!-- FIXME: what about the case where titleabbrev is inside the info? -->
-    <xsl:when test="$purpose = 'xref' and titleabbrev">
-      <xsl:apply-templates select="." mode="titleabbrev.markup"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:copy-of select="$title"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="chapter|appendix" mode="insert.title.markup">
-  <xsl:param name="purpose"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="title"/>
-
-  <xsl:choose>
-    <xsl:when test="$purpose = 'xref'">
-      <i>
-        <xsl:copy-of select="$title"/>
-      </i>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:copy-of select="$title"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="*" mode="insert.subtitle.markup">
-  <xsl:param name="purpose"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="subtitle"/>
-
-  <xsl:copy-of select="$subtitle"/>
-</xsl:template>
-
-<xsl:template match="*" mode="insert.label.markup">
-  <xsl:param name="purpose"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="label"/>
-
-  <xsl:copy-of select="$label"/>
-</xsl:template>
-
-<xsl:template match="*" mode="insert.pagenumber.markup">
-  <xsl:param name="purpose"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="pagenumber"/>
-
-  <xsl:copy-of select="$pagenumber"/>
-</xsl:template>
-
-<xsl:template match="*" mode="insert.direction.markup">
-  <xsl:param name="purpose"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="direction"/>
-
-  <xsl:copy-of select="$direction"/>
-</xsl:template>
-
-<xsl:template match="*" mode="insert.olink.docname.markup">
-  <xsl:param name="purpose"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="docname"/>
-
-  <span class="olinkdocname">
-    <xsl:copy-of select="$docname"/>
-  </span>
-
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/lfs-l10n.xml
===================================================================
--- BOOK/stylesheets/lfs-xsl/lfs-l10n.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,75 +1,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<!--
-$LastChangedBy$
-$Date$
--->
-
-<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
-
-    <!-- Template to add more languages -->
-  <l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0"
-          language="xx" english-language-name="xxxxx">
-
-    <l:gentext key="description" text=""/>
-    <l:gentext key="Bootscripts" text=""/>
-    <l:gentext key="Configuration Files" text=""/>
-    <l:gentext key="Kernel Configuration" text=""/>
-    <l:gentext key="Libraries" text=""/>
-    <l:gentext key="Others" text=""/>
-    <l:gentext key="Packages" text=""/>
-    <l:gentext key="Programs" text=""/>
-    <l:gentext key="Scripts" text=""/>
-
-  </l:l10n>
-
-
-    <!-- English -->
-  <l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0"
-          language="en" english-language-name="English">
-
-    <l:gentext key="description" text="description"/>
-    <l:gentext key="Bootscripts" text="Bootscripts"/>
-    <l:gentext key="Configuration Files" text="Configuration Files"/>
-    <l:gentext key="Kernel Configuration" text="Kernel Configuration"/>
-    <l:gentext key="Libraries" text="Libraries"/>
-    <l:gentext key="Others" text="Others"/>
-    <l:gentext key="Packages" text="Packages"/>
-    <l:gentext key="Programs" text="Programs"/>
-    <l:gentext key="Scripts" text="Scripts"/>
-
-  </l:l10n>
-
-    <!-- Italian -->
-  <l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0"
-          language="it" english-language-name="Italian">
-
-    <l:gentext key="description" text="descrizione"/>
-    <l:gentext key="Bootscripts" text="Script di avvio"/>
-    <l:gentext key="Configuration Files" text="File di configurazione"/>
-    <l:gentext key="Kernel Configuration" text="Configurazione del kernel"/>
-    <l:gentext key="Libraries" text="Librerie"/>
-    <l:gentext key="Others" text="Altri"/>
-    <l:gentext key="Packages" text="Pacchetti"/>
-    <l:gentext key="Programs" text="Programmi"/>
-    <l:gentext key="Scripts" text="Script"/>
-
-  </l:l10n>
-
-    <!-- Spanish -->
-  <l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0"
-          language="es" english-language-name="Spanish">
-
-    <l:gentext key="description" text="descripci&#243;n"/>
-    <l:gentext key="Bootscripts" text="Guiones de arranque"/>
-    <l:gentext key="Configuration Files" text="Ficheros de configuraci&#243;n"/>
-    <l:gentext key="Kernel Configuration" text="Configuraci&#243;n del n&#250;cleo"/>
-    <l:gentext key="Libraries" text="Librer&#237;as"/>
-    <l:gentext key="Others" text="Otros"/>
-    <l:gentext key="Packages" text="Paquetes"/>
-    <l:gentext key="Programs" text="Programas"/>
-    <l:gentext key="Scripts" text="Guiones"/>
-
-  </l:l10n>
-
-</l:i18n>
Index: OK/stylesheets/lfs-xsl/lfs-print.css
===================================================================
--- BOOK/stylesheets/lfs-xsl/lfs-print.css	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,9 +1,0 @@
-/*
-$LastChangedBy$
-$Date$
-*/
-@import url(lfs.css);
-
-.navfooter, .headerlinks {
-   display: none;
-}
Index: OK/stylesheets/lfs-xsl/lfs.css
===================================================================
--- BOOK/stylesheets/lfs-xsl/lfs.css	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,604 +1,0 @@
-/*
-$LastChangedBy$
-$Date$
-*/
-/* Global settings */
-body {
-  font-family: verdana, tahoma, helvetica, arial, sans-serif;
-  text-align: left;
-  background: #fff;
-  color: #222;
-  margin: 1em;
-  padding: 0;
-  font-size: 1em;
-  line-height: 1.2em
-}
-
-
-/* Links */
-a:link { color: #22b; }
-a.ulink:link { font-weight: bold; color: #55f; }
-a:visited { color: #7e4988 ! important; }
-a:hover, a:focus { color: #d30e08 ! important; }
-a:active { color: #6b77b1 ! important;}
-
-
-/* Book titlepage */
-.book .titlepage {
-  background: #f5f6f7;
-  margin: 0px auto;
-  padding: 0 1em;
-}
-
-.book hr {
-  background: #dbddec;
-  height: .3em;
-  border: 0px;
-  margin: 0 -1em;
-  padding: 0;
-}
-
-div.dedication {
-  padding-left: 1em;
-}
-
-
-/* Sections */
-div.sect1, div.appendix {
-  padding-left: .3em;
-  text-align: justify;
-}
-
-.package, .kernel, .installation, .commands, .testing, .configuration, .content {
-  padding: 0 .5em .2em 0;
-  margin: 0;
-}
-
-.lfs .package {
-  background: #f5f6f7;
-  border-bottom: 0.2em solid #dbddec;
-  padding-top: .1em;
-  margin-top: 0;
-}
-
-.lfs .configuration {
-  background:   #fefefe;
-  border-top: 0.2em solid #dbddec;
-}
-
-.lfs .content {
-  background: #f5f6f7;
-  border-top: 0.2em solid #dbddec;
-  padding-bottom: .1em;
-  margin-bottom: 0;
-}
-
-
-/* Headers */
-h1, h2, h3, h4, h5, h6, b, .strong {
-  color: #000;
-  font-weight: bold;
-  line-height: 1em;
-}
-
-h1 {
-  font-size: 173%;
-  text-align: center;
-}
-
-.book h1 {
-  margin: 0;
-  padding: 0.4em;
-}
-
-.preface h1, .part h1, .chapter h1, .appendix h1, .index h1, .sect1 h1 {
-  background: #f5f6f7;
-  border-bottom: .1em solid #dbddec;
-  margin-bottom: 1em;
-  margin-top: 0;
-  padding: .4em;
-}
-
-.sect1 h1, .appendix h1 {
-  margin-left: -.2em;
-}
-
-.wrap h1 {
-  background: #f5f6f7;
-  margin: 0;
-  padding: .4em;
-}
-
-h1.title sup {
-  font-size: small;
-}
-
-h2 {
-  font-size: 144%;
-}
-
-.book h2.subtitle {
-  text-align: center;
-  background: #dbddec;
-  margin: 0;
-  padding: 0.2em;
-}
-
-.appendix h2 {
-  font-size: 133%;
-  margin-top: .8em;
-  margin-bottom: 0.2em;
-}
-
-h3 {
-  font-size: 120%;
-}
-
-h4 {
-  font-size: 110%;
-}
-
-.package h4, h5, h6 {
-  font-size: 100%;
-  font-style: italic;
-}
-
-
-/* Navigation */
-div.navheader, div.navfooter {
-  background: #ecedef;
-  margin: 0;
-  padding: 0.1em .5em;
-}
-
-div.navheader {
-  border-bottom: 1px solid #dbddec;
-}
-
-div.navfooter {
-  border-top: 1px solid #dbddec;
-}
-
-div.navheader h4 {
-  margin-top: .4em;
-  margin-bottom: 0;
-  text-align: center;
-}
-
-div.navheader h3 {
-  margin-top: .2em;
-  margin-bottom: 0;
-  text-align: center;
-}
-
-div.navheader ul, div.navfooter ul {
-  padding: .2em .5em .5em 0;
-  margin: .5em 0;
-  position: relative;
-  background: #dbddec;
-}
-
-div.navheader ul li, div.navfooter ul li {
-  display: inline;
-  width: 40%;
-}
-
-div.navheader ul li.prev, div.navfooter ul li.prev {
-  position: absolute;
-  display: block;
-  left: 0;
-  text-align: left;
-  padding: 0.2em 1em;
-  margin-left: 6px;
-}
-
-div.navheader ul li.next, div.navfooter ul li.next {
-  position: absolute;
-  display: block;
-  text-align: right;
-  right: 5px;
-  padding: 0.2em 0.5em;
-  margin-right: 7px;
-}
-
-div.navheader ul li.prev p, div.navfooter ul li.prev p,
-div.navheader ul li.next p, div.navfooter ul li.next p {
-  padding: 0;
-  margin: 1px 0px;
-}
-
-div.navheader ul li.home, div.navheader ul li.up,
-div.navfooter ul li.home, div.navfooter ul li.up {
-  text-align: center;
-  padding: 0;
-  margin: 0px auto;
-  display: block;
-  color: #dbddec;
-}
-
-
-/* TOC */
-div.toc ul, div.index ul, div.navheader ul, div.navfooter ul {
-  list-style: none;
-}
-
-div.toc {
-  padding-left: 1em;
-}
-
-li.preface, .part li.appendix {
-  margin-left: 1em;
-}
-
-div.toc h3 {
-  margin: 1em 0 .3em 0;
-}
-
-li.appendix h3, li.glossary h3, li.index h3 {
-  margin: .5em
-}
-
-div.toc h4 {
-  margin: .6em 0 .2em 0;
-}
-
-li.chapter h4 a {
-  display: block;
-  margin-bottom: .4em
-}
-
-.dummy {
-  display: block;
-  font-weight: bold;
-  font-size: 110%;
-  margin: .6em 0 .2em 0;
-}
-
-
-/* Index */
-.item {
-    float: left;
-    margin-right: 1em
-}
-
-.secitem {
-    font-weight: normal;
-    float: left;
-    margin-right: 1em
-}
-
-.indexref {
-    display: block;
-}
-
-.item + .indexref {
-    margin-left: 20em;
-}
-
-.secitem + .indexref {
-    margin-left: 19em;
-}
-
-
-/* Admonitions */
-div.admon img {
-  padding: .3em;
-}
-
-div.admon h3 {
-  display: inline;
-  margin-left: 2em;
-}
-
-div.admon p {
-  margin-left: .5em;
-}
-
-div.admon pre {
-  margin: 0.5em 3em;
-}
-
-div.note, div.tip {
-  background-color: #fffff6;
-  border: 2px solid #dbddec;
-  width: 90%;
-  margin: .5em auto;
-}
-
-div.important, div.warning, div.caution {
-  background-color: #fffff6;
-  border: medium solid #400;
-  width: 90%;
-  margin: .5em auto;
-  color: #600;
-}
-
-div.important h3, div.warning h3, div.caution h3 {
-  color: #900;
-}
-
-div.important em, div.warning em, div.caution em {
-  color: #000;
-  font-weight: bold;
-}
-
-
-/* table */
-.table p.title {
-  text-align: center;
-  margin-top: 0;
-  margin-bottom: .3em;
-}
-
-.table table {
-  margin-left: auto;
-  margin-right: auto;
-}
-
-.table table th, .table table td {
-  padding: 0.2em 2em 0.2em 2em;
-  text-align: left;
-}
-
-.revhistory {
-  padding-left: 1em;
-}
-
-.revhistory th {
-  line-height: 2em;
-  text-align: left;
-}
-
-.revhistory td {
-  padding-right: 1em;
-}
-
-
-/* variablelist as table */
-.variablelist table {
-  width: auto;
-  margin: 0 1em 0 1em;
-}
-
-.variablelist td {
-  vertical-align: top;
-}
-
-.variablelist td span, td p {
-  margin: 0.25em;
-}
-
-
-/* variablelist as list */
-dl {
-  padding-left: 1em
-}
-
-dt {
-  font-weight: bold;
-  margin-left: 1em;
-}
-
-dd {
-  margin-bottom: .6em;
-  margin-left: 1em;
-}
-
-dd p {
-  margin-top: 0;
-  margin-bottom: 0;
-  padding-top: 0;
-  padding-bottom: 0;
-}
-
-div.materials dt {
-  display: list-item;
-}
-
-div.materials dd {
-  margin-left: 0;
-  padding-left: 0;
-}
-
-
-/* segmentedlist */
-.appendix .segmentedlist {
-  padding-left: 1em;
-}
-
-.package .seg {
-  margin-bottom: 0em;
-  margin-top: 0em;
-  clear: left;
-}
-
-.content .seg {
-  margin-bottom: .4em;
-  margin-top: .4em;
-  clear: left;
-}
-
-.segtitle {
-  float: left;
-}
-
-.package .segbody, .appendix .segbody {
-  display: block;
-  padding-left: 14em;
-}
-
-.content .segbody {
-  display: block;
-  padding-left: 12em;
-}
-
-
-/* itemizedlist */
-ul {
-  padding-left: 1em
-}
-
-.itemizedlist ul {
-  margin-left: 1em
-}
-
-.itemizedlist li ul {
-  margin-bottom: 1.2em;
-}
-
-.itemizedlist li ul li p {
-  margin-top: .5em;
-  margin-bottom: .5em;
-}
-
-.itemizedlist li ul li:first-child p:first-child {
-  margin-top: -.6em;
-}
-
-ul.compact {
-  list-style: none;
-}
-
-.blfs ul.compact {
-  list-style: disc;
-}
-
-ul.compact li {
-  margin: 0em;
-  padding: 0em;
-}
-
-ul.compact li p {
-  padding: 0.3em;
-  margin: 0em;
-}
-
-.blfs ul.compact li p {
-  background-color: #f0fff0;
-}
-
-/* orderedlist */
-ol {
-  list-style: decimal;
-}
-
-ol ol {
-  list-style: lower-alpha;
-}
-
-ol ol ol {
-  list-style: lower-roman;
-}
-
-ol.compact li {
-  margin: 0em;
-  padding: 0em;
-}
-
-ol.compact li p {
-  padding: 0.3em;
-  margin: 0em;
-}
-
-
-/* Indented blocks */
-p, blockquote {
-  padding-left: 1em;
-  padding-right: 1em;
-}
-
-
-/* Monospaced elements */
-tt, code, kbd, pre, .command {
-  font-family: monospace;
-}
-
-.systemitem {
-  font-style: italic;
-}
-
-pre {
-  background-color: #e5e5e5;
-  border: 1px solid #050505;
-  padding: .5em 1em;
-  margin: 0 2em .5em 2em;
-  font-weight: bold;
-  overflow: auto;
-}
-
-pre.userinput {
-  color: #101310;
-}
-
-pre.root {
-  color: #101310;
-  border: 1px solid #11a;
-}
-
-pre.screen {
-  color: #000;
-  background-color: #e9e9e9;
-  font-weight: normal;
-}
-
-.literal, .prompt {
-  font-weight: normal;
-}
-
-
-/* Mixed tags */
-p.usernotes {
-  margin-left: -1em;
-  font-size: small;
-  font-weight: bold;
-  font-style: italic;
-}
-
-.underlined {
-  text-decoration: underline;
-}
-
-
-/* Last edited info */
-p.updated {
-  font-size: small;
-  font-weight: bold;
-  font-style: italic;
-}
-
-
-/* Special colored blocks */
-  /* OrangeRed4 */
-.feature-ssp {
-  color: #8B2500;
-}
-
-  /* RoyalBlue3 */
-.feature-aslr {
-  color: #3A5FCD;
-}
-
-  /* NavyBlue */
-.feature-pax {
-  color: #000080;
-}
-
-  /* VioletRed */
-.feature-hardened_tmp {
-  color: #d02090;
-}
-
-  /* PaleTurquoise4 */
-.feature-warnings {
-  color: #668b8b;
-}
-
-  /* RosyBrown */
-.feature-misc {
-  color: #bc8f8f;
-}
-
-  /* Sienna*/
-.feature-blowfish {
-  color: #8E6B23
-}
Index: OK/stylesheets/lfs-xsl/nochunks.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/nochunks.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,639 +1,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<!--
-$LastChangedBy$
-$Date$
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns="http://www.w3.org/1999/xhtml"
-                version="1.0">
-
-   <!-- Stylesheet for non-chunked XHTML output
-        Replaces {docbook-xsl}/xhtml/profile-docbook.xsl -->
-
-    <!-- Upstream XHTML templates -->
-  <xsl:import href="docbook-xsl-snapshot/xhtml/docbook.xsl"/>
-
-    <!-- Fix encoding issues with default UTF-8 output of the xhtml stylesheet -->
-  <xsl:output method="html" encoding="ISO-8859-1" indent="no" />
-
-   <!-- Including our others customized templates -->
-  <xsl:include href="common.xsl"/>
-  <xsl:include href="xhtml/lfs-index.xsl"/>
-  <xsl:include href="xhtml/lfs-mixed.xsl"/>
-  <xsl:include href="xhtml/lfs-sections.xsl"/>
-  <xsl:include href="xhtml/lfs-toc.xsl"/>
-  <xsl:include href="xhtml/lfs-xref.xsl"/>
-
-    <!-- Control generation of ToCs and LoTs -->
-  <xsl:param name="generate.toc">
-    book      toc,title
-    preface   nop
-    part      nop
-    chapter   nop
-    appendix  nop
-    sect1     nop
-    sect2     nop
-    sect3     nop
-    sect4     nop
-    sect5     nop
-    section   nop
-  </xsl:param>
-
-    <!-- How deep should recursive sections appear in the TOC? -->
-  <xsl:param name="toc.section.depth">1</xsl:param>
-
-    <!-- How maximaly deep should be each TOC? -->
-  <xsl:param name="toc.max.depth">3</xsl:param>
-
-    <!-- Dropping some unwanted style attributes -->
-  <xsl:param name="ulink.target" select="''"></xsl:param>
-  <xsl:param name="css.decoration" select="0"></xsl:param>
-
-    <!-- Don't use graphics in admonitions -->
-  <xsl:param name="admon.graphics" select="0"/>
-
-    <!-- Changing the admonitions output tagging:
-           Removed $admon.style support
-           Hardcoded $admon.textlabel feature -->
-    <!-- The original template is in {docbook-xsl}/xhtml/admon.xsl -->
-  <xsl:template name="nongraphical.admonition">
-    <div class="admon {name(.)}">
-      <h3>
-        <xsl:apply-templates select="." mode="object.title.markup"/>
-      </h3>
-      <xsl:apply-templates/>
-    </div>
-  </xsl:template>
-
-    <!-- sect2.titlepage:
-           Removed a lot of unneeded code.
-           Skip empty titles.
-           No label in preface (actualy, skip the hardcoded dot). -->
-    <!-- The original template is in {docbook-xsl}/xhtml/titlepage.templates.xsl -->
-  <xsl:template name="sect2.titlepage">
-    <xsl:choose>
-      <xsl:when test="string-length(title) = 0"/>
-      <xsl:otherwise>
-        <h3 class="{name(.)}">
-          <xsl:if test="@id">
-            <a id="{@id}" name="{@id}"/>
-          </xsl:if>
-          <xsl:if test="not(ancestor::preface) and $section.autolabel != 0">
-            <xsl:apply-templates select="." mode="label.markup"/>
-            <xsl:text>. </xsl:text>
-          </xsl:if>
-          <xsl:value-of select="title"/>
-        </h3>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-    <!-- The CSS Stylesheet:
-           Note: there is some diferences with lfs.css code releated
-                 to h* values, admonitions and no navigational code. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/docbook.xsl -->
-  <xsl:template name='user.head.content'>
-    <style type="text/css">
-      <xsl:text>
-/* Global settings */
-body {
-  font-family: verdana, tahoma, helvetica, arial, sans-serif;
-  text-align: left;
-  background: #fff;
-  color: #222;
-  margin: 1em;
-  padding: 0;
-  font-size: 1em;
-  line-height: 1.2em
-}
-
-
-/* Links */
-a:link { color: #22b; }
-a.ulink:link { font-weight: bold; color: #55f; }
-a:visited { color: #7e4988 ! important; }
-a:hover, a:focus { color: #d30e08 ! important; }
-a:active { color: #6b77b1 ! important;}
-
-
-/* Book titlepage */
-.book {
-  margin: 0px auto;
-  padding: 0 1em;
-}
-
-.book h1, .book .copyright, .book .legalnotice .revhistory {
-  background: #f5f6f7;
-  margin: 0px auto;
-  padding: .1em 1em;
-}
-
-.book hr {
-  background: #dbddec;
-  height: .3em;
-  border: 0px;
-  margin: 0;
-  padding: 0;
-}
-
-div.dedication {
-  padding-left: 1em;
-}
-
-
-/* Sections */
-div.sect1, div.appendix {
-  padding-left: .3em;
-}
-
-.package, .kernel, .installation, .commands, .testing, .configuration, .content {
-  padding: 0 .5em .2em 0;
-  margin: 0;
-}
-
-.lfs .package {
-  background: #f5f6f7;
-  border-bottom: 0.2em solid #dbddec;
-  padding-top: .1em;
-  margin-top: 0;
-}
-
-.lfs .configuration {
-  background:   #fefefe;
-  border-top: 0.2em solid #dbddec;
-}
-
-.lfs .content {
-  background: #f5f6f7;
-  border-top: 0.2em solid #dbddec;
-  border-bottom: 0.2em solid #dbddec;
-  padding-bottom: .1em;
-  margin-bottom: 0;
-}
-
-
-/* Headers */
-h1, h2, h3, h4, h5, h6, b, .strong {
-  color: #000;
-  font-weight: bold;
-  line-height: 1em;
-}
-
-h1 {
-  font-size: 173%;
-  text-align: center;
-}
-
-.book h1 {
-  margin: 0;
-  padding: 0.4em;
-}
-
-h1.title sup {
-  font-size: small;
-}
-
-h2 {
-  font-size: 144%;
-}
-
-.preface h2, .part h1, .chapter h2, .appendix h2, .index h1, .sect1 h2 {
-  background: #f5f6f7;
-  border-top: .2em solid #dbddec;
-  border-bottom: .2em solid #dbddec;
-  margin-bottom: 1em;
-  margin-top: 1em;
-  padding: .4em;
-  text-align: center;
-}
-
-.sect1 h2, .appendix h2 {
-  margin-left: -.2em;
-}
-
-.wrap h2 {
-  background: #f5f6f7;
-  border-bottom: 0;
-  margin-top: 1em;
-  margin-bottom: 0;
-  padding-top: .4em;
-}
-
-.book h2.subtitle {
-  text-align: center;
-  background: #dbddec;
-  margin: 0;
-  padding: 0.2em;
-}
-
-h3 {
-  font-size: 120%;
-}
-
-.appendix h3 {
-  font-size: 133%;
-  margin-top: .8em;
-  margin-bottom: 0.2em;
-}
-
-h4 {
-  font-size: 110%;
-}
-
-.package h4, h5, h6 {
-  font-size: 100%;
-  font-style: italic;
-}
-
-
-/* TOC */
-div.toc ul, div.index ul, div.navheader ul, div.navfooter ul {
-  list-style: none;
-}
-
-div.toc {
-  padding-left: 1em;
-}
-
-li.preface, .part li.appendix {
-  margin-left: 1em;
-}
-
-div.toc h3 {
-  margin: 1em 0 .3em 0;
-}
-
-li.appendix h3, li.glossary h3, li.index h3 {
-  margin: .5em
-}
-
-div.toc h4 {
-  margin: .6em 0 .2em 0;
-}
-
-li.chapter h4 a {
-  display: block;
-  margin-bottom: .4em
-}
-
-.dummy {
-  display: block;
-  font-weight: bold;
-  font-size: 110%;
-  margin: .6em 0 .2em 0;
-}
-
-
-/* Index */
-.item {
-    float: left;
-    margin-right: 1em
-}
-
-.secitem {
-    font-weight: normal;
-    float: left;
-    margin-right: 1em
-}
-
-.indexref {
-    display: block;
-}
-
-.item + .indexref {
-    margin-left: 20em;
-}
-
-.secitem + .indexref {
-    margin-left: 19em;
-}
-
-
-/* Admonitions */
-div.admon h3 {
-  padding-left: 2.5em;
-  padding-top: 1em;
-}
-
-div.admon p {
-  margin-left: .5em;
-}
-
-div.admon pre {
-  margin: 0.5em 3em;
-}
-
-div.note, div.tip {
-  background-color: #fffff6;
-  border: 2px solid #dbddec;
-  width: 90%;
-  margin: .5em auto;
-}
-
-div.important, div.warning, div.caution {
-  background-color: #fffff6;
-  border: medium solid #400;
-  width: 90%;
-  margin: .5em auto;
-  color: #600;
-}
-
-div.important h3, div.warning h3, div.caution h3 {
-  color: #900;
-}
-
-div.important em, div.warning em, div.caution em {
-  color: #000;
-  font-weight: bold;
-}
-
-
-/* table */
-.table p.title {
-  text-align: center;
-  margin-top: 0;
-  margin-bottom: .3em;
-}
-
-.table table {
-  margin-left: auto;
-  margin-right: auto;
-}
-
-.table table th, .table table td {
-  padding: 0.2em 2em 0.2em 2em;
-  text-align: left;
-}
-
-.revhistory {
-  padding-left: 1em;
-}
-
-.revhistory th {
-  line-height: 2em;
-  text-align: left;
-}
-
-.revhistory td {
-  padding-right: 1em;
-}
-
-
-/* variablelist as table */
-.variablelist table {
-  width: auto;
-  margin: 0 1em 0 1em;
-}
-
-.variablelist td {
-  vertical-align: top;
-}
-
-.variablelist td span, td p {
-  margin: 0.25em;
-}
-
-.variablelist td p {
-  margin-top: 0;
-}
-
-
-/* variablelist as list */
-dl {
-  padding-left: 1em
-}
-
-dt {
-  font-weight: bold;
-  margin-left: 1em;
-}
-
-dd {
-  margin-bottom: .6em;
-  margin-left: 1em;
-}
-
-dd p {
-  margin-top: 0;
-  margin-bottom: 0;
-  padding-top: 0;
-  padding-bottom: 0;
-}
-
-div.materials dt {
-  display: list-item;
-}
-
-div.materials dd {
-  margin-left: 0;
-  padding-left: 0;
-}
-
-
-/* segmentedlist */
-.appendix .segmentedlist {
-  padding-left: 1em;
-}
-
-.package .seg {
-  margin-bottom: 0em;
-  margin-top: 0em;
-  clear: left;
-}
-
-.content .seg {
-  margin-bottom: .4em;
-  margin-top: .4em;
-  clear: left;
-}
-
-.segtitle {
-  float: left;
-}
-
-.package .segbody, .appendix .segbody {
-  display: block;
-  padding-left: 14em;
-}
-
-.content .segbody {
-  display: block;
-  padding-left: 12em;
-}
-
-
-/* itemizedlist */
-ul {
-  padding-left: 1em
-}
-
-.itemizedlist ul {
-  margin-left: 1em
-}
-
-.itemizedlist li ul {
-  margin-bottom: 1.2em;
-}
-
-.itemizedlist li ul li p {
-  margin-top: .5em;
-  margin-bottom: .5em;
-}
-
-.itemizedlist li ul li:first-child p:first-child {
-  margin-top: -.6em;
-}
-
-ul.compact {
-  list-style: none;
-}
-
-.blfs ul.compact {
-  list-style: disc;
-}
-
-ul.compact li {
-  margin: 0em;
-  padding: 0em;
-}
-
-ul.compact li p {
-  padding: 0.3em;
-  margin: 0em;
-}
-
-.blfs ul.compact li p {
-  background-color: #f0fff0;
-}
-
-/* orderedlist */
-ol {
-  list-style: decimal;
-}
-
-ol ol {
-  list-style: lower-alpha;
-}
-
-ol ol ol {
-  list-style: lower-roman;
-}
-
-ol.compact li {
-  margin: 0em;
-  padding: 0em;
-}
-
-ol.compact li p {
-  padding: 0.3em;
-  margin: 0em;
-}
-
-
-/* Indented blocks */
-p, blockquote {
-  padding-left: 1em;
-  padding-right: 1em;
-}
-
-
-/* Monospaced elements */
-tt, code, kbd, pre, .command {
-  font-family: monospace;
-}
-
-.systemitem {
-  font-style: italic;
-}
-
-pre {
-  background-color: #e5e5e5;
-  border: 1px solid #050505;
-  padding: .5em 1em;
-  margin: 0 2em .5em 2em;
-  font-weight: bold;
-}
-
-pre.userinput {
-  color: #101310;
-}
-
-pre.root {
-  color: #101310;
-  border: 1px solid #11a;
-}
-
-pre.screen {
-  color: #000;
-  background-color: #e9e9e9;
-  font-weight: normal;
-}
-
-.literal, .prompt {
-  font-weight: normal;
-}
-
-
-/* Mixed tags */
-p.usernotes {
-  margin-left: -1em;
-  font-size: small;
-  font-weight: bold;
-  font-style: italic;
-}
-
-.underlined {
-  text-decoration: underline;
-}
-
-
-/* Last edited info */
-p.updated {
-  font-size: small;
-  font-weight: bold;
-  font-style: italic;
-}
-
-
-/* Special colored blocks */
-  /* OrangeRed4 */
-.feature-ssp {
-  color: #8B2500;
-}
-
-  /* RoyalBlue3 */
-.feature-aslr {
-  color: #3A5FCD;
-}
-
-  /* NavyBlue */
-.feature-pax {
-  color: #000080;
-}
-
-  /* VioletRed */
-.feature-hardened_tmp {
-  color: #d02090;
-}
-
-  /* PaleTurquoise4 */
-.feature-warnings {
-  color: #668b8b;
-}
-
-  /* RosyBrown */
-.feature-misc {
-  color: #bc8f8f;
-}
-
-  /* Sienna*/
-.feature-blowfish {
-  color: #8E6B23
-}
-      </xsl:text>
-    </style>
-  </xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/pdf.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/pdf.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,108 +1,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<!--
-$LastChangedBy$
-$Date$
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version="1.0">
-
-   <!-- Stylesheet for FO output used to generate PDF
-        Sets global params and include customization stylesheets. -->
-
-    <!-- Upstream FO templates. Profiled version is not supported by
-         xsltproc, thus pofiling must be done in two steps (see Makefile) -->
-  <xsl:import href="docbook-xsl-snapshot/fo/docbook.xsl"/>
-
-    <!-- Uncomment the next for debugging the raw FO code.
-         Note that FOP will complaints about a lot of paragraph overflows
-         due that verbatim output is also indented.
-         Remember to comment the "rm $(BASEDIR)/lfs-pdf.fo" in
-         the Makefile. -->
-  <!--<xsl:output  encoding="UTF-8" indent="yes" />-->
-
-    <!-- Including our others customized templates. -->
-  <xsl:include href="common.xsl"/>
-  <xsl:include href="pdf/lfs-admon.xsl"/>
-  <xsl:include href="pdf/lfs-index.xsl"/>
-  <xsl:include href="pdf/lfs-lists.xsl"/>
-  <xsl:include href="pdf/lfs-mixed.xsl"/>
-  <xsl:include href="pdf/lfs-pagesetup.xsl"/>
-  <xsl:include href="pdf/lfs-xref.xsl"/>
-
-    <!-- Activating FOP-1 extensions. We use FOP-0.93 as the FO procesor. -->
-  <xsl:param name="fop1.extensions" select="1"/>
-
-    <!-- Desactivate draft mode at all. -->
-  <xsl:param name="draft.mode" select="'no'"/>
-
-   <!-- Paper size -->
-  <xsl:param name="paper.type" select="'USletter'"/>
-
-    <!-- Paper size required by the publisher
-  <xsl:param name="paper.type" select="'Customized'"/>
-  <xsl:param name="page.width">7.25in</xsl:param>
-  <xsl:param name="page.height">9.25in</xsl:param>
-    -->
-
-    <!-- Is the document to be printed double sided? 1 = yes, 0 = no -->
-    <!-- Change "double.sided" to "1" for published versions. -->
-  <xsl:param name="double.sided" select="0"/>
-
-    <!-- Hyphenate? -->
-  <xsl:param name="hyphenate">false</xsl:param>
-
-    <!-- Allow URLs to be automatically hyphenated.
-         We have expanded the support to several inline tags.
-         See pdf/lfs-mixed.xsl -->
-  <xsl:param name="ulink.hyphenate" select="'&#x200B;'"/>
-
-    <!-- List of characters to allow ulink URLs, and supported inline tags,
-         to be automatically hyphenated on.
-         Note: the / character is in the list but FOP-0.93 ignores it. -->
-  <xsl:param name="ulink.hyphenate.chars" select="'/._-'"/>
-
-    <!-- Specify the default text alignment. -->
-  <xsl:param name="alignment">justify</xsl:param>
-
-    <!-- Specifies the default point size for body text.
-         Used for titles size calculation. -->
-  <xsl:param name="body.font.master">9</xsl:param>
-
-    <!-- Specifies the default font size for body text. -->
-  <xsl:param name="body.font.size">12pt</xsl:param>
-
-    <!-- Control generation of ToCs and LoTs -->
-  <xsl:param name="generate.toc">
-    book      toc,title
-    part      nop
-  </xsl:param>
-
-    <!-- How deep should recursive sections appear in the TOC? -->
-  <xsl:param name="toc.section.depth">1</xsl:param>
-
-    <!-- Amount of indentation for TOC entries. -->
-  <xsl:param name="toc.indent.width" select="18"/>
-
-    <!-- Turns page numbers in xrefs on and off. -->
-  <xsl:param name="insert.xref.page.number">no</xsl:param>
-
-    <!-- Display URLs after ulinks? 1 = yes, 0 = no
-         Set to 0 to prevent duplicate e-mails in the Acknowledgments pages. -->
-  <xsl:param name="ulink.show" select="0"/>
-
-    <!-- Processing instruction for hard page breaks.
-         FOP-0.93 supports now @keep-*.*, @orphans, and @widows attributes,
-         that solves several page break issues.
-         It also supports the soft page break procesing instruction included
-         in the DocBook stylesheets.
-         But some times we may need hard page breaks for final book versions. -->
-    <!-- To know how to use all that page break features, see
-         http://www.sagehill.net/docbookxsl/PageBreaking.html -->
-  <xsl:template match="processing-instruction('hard-pagebreak')">
-    <fo:block break-before='page'/>
-  </xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/pdf/lfs-admon.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/pdf/lfs-admon.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,81 +1,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<!--
-$LastChangedBy$
-$Date$
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version="1.0">
-
-  <!-- This stylesheet controls how admonitions are displayed -->
-
-    <!-- Use graphics in admonitions? 1 = yes, 0 = no -->
-  <xsl:param name="admon.graphics" select="1"/>
-
-    <!-- Path to admonition graphics relative to index.xml -->
-  <xsl:param name="admon.graphics.path" select="'images/'"/>
-
-    <!-- Global admonitions properties -->
-  <xsl:attribute-set name="graphical.admonition.properties">
-    <xsl:attribute name="keep-together.within-column">
-      <xsl:variable name="keep.together">
-        <xsl:call-template name="pi.dbfo_keep-together"/>
-      </xsl:variable>
-      <xsl:choose>
-        <xsl:when test="$keep.together != ''">
-          <xsl:value-of select="$keep.together"/>
-        </xsl:when>
-        <xsl:otherwise>always</xsl:otherwise>
-      </xsl:choose>
-    </xsl:attribute>
-    <xsl:attribute name="space-before.optimum">0.6em</xsl:attribute>
-    <xsl:attribute name="space-before.minimum">0.4em</xsl:attribute>
-    <xsl:attribute name="space-before.maximum">0.8em</xsl:attribute>
-    <xsl:attribute name="space-after.optimum">0.6em</xsl:attribute>
-    <xsl:attribute name="space-after.minimum">0.4em</xsl:attribute>
-    <xsl:attribute name="space-after.maximum">0.8em</xsl:attribute>
-    <xsl:attribute name="padding-start">5pt</xsl:attribute>
-    <xsl:attribute name="padding-top">5pt</xsl:attribute>
-    <xsl:attribute name="padding-bottom">5pt</xsl:attribute>
-    <xsl:attribute name="border-style">solid</xsl:attribute>
-    <xsl:attribute name="border-width">0.5pt</xsl:attribute>
-    <xsl:attribute name="background-color">#FFFFE6</xsl:attribute>
-    <xsl:attribute name="border-color">
-      <xsl:choose>
-        <xsl:when test="self::note | self::tip">#E0E0E0</xsl:when>
-        <xsl:otherwise>#DCC</xsl:otherwise>
-      </xsl:choose>
-    </xsl:attribute>
-  </xsl:attribute-set>
-
-    <!-- Properties for admonitions titles -->
-  <xsl:attribute-set name="admonition.title.properties">
-    <xsl:attribute name="font-size">14pt</xsl:attribute>
-    <xsl:attribute name="font-weight">bold</xsl:attribute>
-    <xsl:attribute name="hyphenate">false</xsl:attribute>
-    <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
-    <xsl:attribute name="color">
-      <xsl:choose>
-        <xsl:when test="ancestor-or-self::important | ancestor-or-self::warning
-                        | ancestor-or-self::caution">#500</xsl:when>
-        <xsl:otherwise>#000</xsl:otherwise>
-      </xsl:choose>
-    </xsl:attribute>
-  </xsl:attribute-set>
-
-    <!-- Properties for admonitions text -->
-  <xsl:attribute-set name="admonition.properties">
-    <xsl:attribute name="margin-right">5pt</xsl:attribute>
-  </xsl:attribute-set>
-
-    <!-- admon.graphic.width:
-           Making the graphic smaller. -->
-    <!-- The original template is in {docbook-xsl}/fo/admon.xsl -->
-  <xsl:template match="*" mode="admon.graphic.width">
-    <xsl:param name="node" select="."/>
-    <xsl:text>24pt</xsl:text>
-  </xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/pdf/lfs-index.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/pdf/lfs-index.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,140 +1,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<!--
-$LastChangedBy$
-$Date$
--->
-
-<!DOCTYPE xsl:stylesheet [
-<!ENTITY lowercase "'Aa&#192;&#224;&#193;&#225;&#194;&#226;&#195;&#227;&#196;&#228;&#197;&#229;&#256;&#257;&#258;&#259;&#260;&#261;&#461;&#462;&#478;&#479;&#480;&#481;&#506;&#507;&#512;&#513;&#514;&#515;&#550;&#551;&#7680;&#7681;&#7834;&#7840;&#7841;&#7842;&#7843;&#7844;&#7845;&#7846;&#7847;&#7848;&#7849;&#7850;&#7851;&#7852;&#7853;&#7854;&#7855;&#7856;&#7857;&#7858;&#7859;&#7860;&#7861;&#7862;&#7863;Bb&#384;&#385;&#595;&#386;&#387;&#7682;&#7683;&#7684;&#7685;&#7686;&#7687;Cc&#199;&#231;&#262;&#263;&#264;&#265;&#266;&#267;&#268;&#269;&#391;&#392;&#597;&#7688;&#7689;Dd&#270;&#271;&#272;&#273;&#394;&#599;&#395;&#396;&#453;&#498;&#545;&#598;&#7690;&#7691;&#7692;&#7693;&#7694;&#7695;&#7696;&#7697;&#7698;&#7699;Ee&#200;&#232;&#201;&#233;&#202;&#234;&#203;&#235;&#274;&#275;&#276;&#277;&#278;&#279;&#280;&#281;&#282;&#283;&#516;&#517;&#518;&#519;&#552;&#553;&#7700;&#7701;&#7702;&#7703;&#7704;&#7705;&#7706;&#7707;&#7708;&#7709;&#7864;&#7865;&#7866;&#7867;&#7868;&#7869;&#7870;&#7871;&#7872;&#7873;&#7874;&#7875;&#7876;&#7877;&#7878;&#7879;Ff&#401;&#402;&#7710;&#7711;Gg&#284;&#285;&#286;&#287;&#288;&#289;&#290;&#291;&#403;&#608;&#484;&#485;&#486;&#487;&#500;&#501;&#7712;&#7713;Hh&#292;&#293;&#294;&#295;&#542;&#543;&#614;&#7714;&#7715;&#7716;&#7717;&#7718;&#7719;&#7720;&#7721;&#7722;&#7723;&#7830;Ii&#204;&#236;&#205;&#237;&#206;&#238;&#207;&#239;&#296;&#297;&#298;&#299;&#300;&#301;&#302;&#303;&#304;&#407;&#616;&#463;&#464;&#520;&#521;&#522;&#523;&#7724;&#7725;&#7726;&#7727;&#7880;&#7881;&#7882;&#7883;Jj&#308;&#309;&#496;&#669;Kk&#310;&#311;&#408;&#409;&#488;&#489;&#7728;&#7729;&#7730;&#7731;&#7732;&#7733;Ll&#313;&#314;&#315;&#316;&#317;&#318;&#319;&#320;&#321;&#322;&#410;&#456;&#564;&#619;&#620;&#621;&#7734;&#7735;&#7736;&#7737;&#7738;&#7739;&#7740;&#7741;Mm&#625;&#7742;&#7743;&#7744;&#7745;&#7746;&#7747;Nn&#209;&#241;&#323;&#324;&#325;&#326;&#327;&#328;&#413;&#626;&#414;&#544;&#459;&#504;&#505;&#565;&#627;&#7748;&#7749;&#7750;&#7751;&#7752;&#7753;&#7754;&#7755;Oo&#210;&#242;&#211;&#243;&#212;&#244;&#213;&#245;&#214;&#246;&#216;&#248;&#332;&#333;&#334;&#335;&#336;&#337;&#415;&#416;&#417;&#465;&#466;&#490;&#491;&#492;&#493;&#510;&#511;&#524;&#525;&#526;&#527;&#554;&#555;&#556;&#557;&#558;&#559;&#560;&#561;&#7756;&#7757;&#7758;&#7759;&#7760;&#7761;&#7762;&#7763;&#7884;&#7885;&#7886;&#7887;&#7888;&#7889;&#7890;&#7891;&#7892;&#7893;&#7894;&#7895;&#7896;&#7897;&#7898;&#7899;&#7900;&#7901;&#7902;&#7903;&#7904;&#7905;&#7906;&#7907;Pp&#420;&#421;&#7764;&#7765;&#7766;&#7767;Qq&#672;Rr&#340;&#341;&#342;&#343;&#344;&#345;&#528;&#529;&#530;&#531;&#636;&#637;&#638;&#7768;&#7769;&#7770;&#7771;&#7772;&#7773;&#7774;&#7775;Ss&#346;&#347;&#348;&#349;&#350;&#351;&#352;&#353;&#536;&#537;&#642;&#7776;&#7777;&#7778;&#7779;&#7780;&#7781;&#7782;&#7783;&#7784;&#7785;Tt&#354;&#355;&#356;&#357;&#358;&#359;&#427;&#428;&#429;&#430;&#648;&#538;&#539;&#566;&#7786;&#7787;&#7788;&#7789;&#7790;&#7791;&#7792;&#7793;&#7831;Uu&#217;&#249;&#218;&#250;&#219;&#251;&#220;&#252;&#360;&#361;&#362;&#363;&#364;&#365;&#366;&#367;&#368;&#369;&#370;&#371;&#431;&#432;&#467;&#468;&#469;&#470;&#471;&#472;&#473;&#474;&#475;&#476;&#532;&#533;&#534;&#535;&#7794;&#7795;&#7796;&#7797;&#7798;&#7799;&#7800;&#7801;&#7802;&#7803;&#7908;&#7909;&#7910;&#7911;&#7912;&#7913;&#7914;&#7915;&#7916;&#7917;&#7918;&#7919;&#7920;&#7921;Vv&#434;&#651;&#7804;&#7805;&#7806;&#7807;Ww&#372;&#373;&#7808;&#7809;&#7810;&#7811;&#7812;&#7813;&#7814;&#7815;&#7816;&#7817;&#7832;Xx&#7818;&#7819;&#7820;&#7821;Yy&#221;&#253;&#255;&#376;&#374;&#375;&#435;&#436;&#562;&#563;&#7822;&#7823;&#7833;&#7922;&#7923;&#7924;&#7925;&#7926;&#7927;&#7928;&#7929;Zz&#377;&#378;&#379;&#380;&#381;&#382;&#437;&#438;&#548;&#549;&#656;&#657;&#7824;&#7825;&#7826;&#7827;&#7828;&#7829;&#7829;'">
-<!ENTITY uppercase "'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ'">
-<!ENTITY primary   'normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""]))'>
-<!ENTITY scope     "count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))">
-]>
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version="1.0">
-
-  <!-- This stylesheet controls how the Index is generated.
-       Entities comes from {docbook-xsl}/common/entities.ent -->
-
-    <!-- Override for punctuation separating an index term from its list
-         of page references. -->
-  <xsl:param name="index.term.separator" select="': '"></xsl:param>
-
-    <!-- Divisions title properties. -->
-  <xsl:attribute-set name="index.div.title.properties">
-    <xsl:attribute name="margin-left">0pt</xsl:attribute>
-    <xsl:attribute name="font-size">14.4pt</xsl:attribute>
-    <xsl:attribute name="font-family">
-      <xsl:value-of select="$title.fontset"/>
-    </xsl:attribute>
-    <xsl:attribute name="font-weight">bold</xsl:attribute>
-    <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
-    <xsl:attribute name="space-before.optimum">1em</xsl:attribute>
-    <xsl:attribute name="space-before.minimum">0.8em</xsl:attribute>
-    <xsl:attribute name="space-before.maximum">1.2em</xsl:attribute>
-    <xsl:attribute name="space-after.optimum">0.5em</xsl:attribute>
-    <xsl:attribute name="space-after.minimum">0.3em</xsl:attribute>
-    <xsl:attribute name="space-after.maximum">0.7em</xsl:attribute>
-    <xsl:attribute name="start-indent">0pt</xsl:attribute>
-  </xsl:attribute-set>
-
-    <!-- Properties applied to the block containing entries in an Index. -->
-  <xsl:attribute-set name="index.entry.properties">
-    <xsl:attribute name="start-indent">0.5pc</xsl:attribute>
-  </xsl:attribute-set>
-
-    <!-- Divisions:
-          Translate alphabetical divisons titles to by-type titles. -->
-    <!-- The original template is in {docbook-xsl}/fo/autoidx.xsl -->
-  <xsl:template match="indexterm" mode="index-div-basic">
-    <xsl:param name="scope" select="."/>
-    <xsl:param name="role" select="''"/>
-    <xsl:param name="type" select="''"/>
-    <xsl:variable name="key"
-                  select="translate(substring(&primary;, 1, 1),&lowercase;,&uppercase;)"/>
-    <xsl:variable name="divtitle" select="translate($key, &lowercase;, &uppercase;)"/>
-    <xsl:if test="key('letter', $key)[&scope;]
-                  [count(.|key('primary', &primary;)[&scope;][1]) = 1]">
-      <fo:block>
-        <xsl:if test="contains(concat(&lowercase;, &uppercase;), $key)">
-          <xsl:call-template name="indexdiv.title">
-            <xsl:with-param name="titlecontent">
-              <xsl:choose>
-                <xsl:when test="$divtitle = 'A'">
-                  <xsl:call-template name="gentext">
-                    <xsl:with-param name="key">Packages</xsl:with-param>
-                  </xsl:call-template>
-                </xsl:when>
-                <xsl:when test="$divtitle = 'B'">
-                  <xsl:call-template name="gentext">
-                    <xsl:with-param name="key">Programs</xsl:with-param>
-                  </xsl:call-template>
-                </xsl:when>
-                <xsl:when test="$divtitle = 'C'">
-                  <xsl:call-template name="gentext">
-                    <xsl:with-param name="key">Libraries</xsl:with-param>
-                  </xsl:call-template>
-                </xsl:when>
-                <xsl:when test="$divtitle = 'D'">
-                  <xsl:choose>
-                    <xsl:when test="$book-type = 'blfs'">
-                      <xsl:call-template name="gentext">
-                        <xsl:with-param name="key">Kernel Configuration</xsl:with-param>
-                      </xsl:call-template>
-                    </xsl:when>
-                    <xsl:otherwise>
-                      <xsl:call-template name="gentext">
-                        <xsl:with-param name="key">Scripts</xsl:with-param>
-                      </xsl:call-template>
-                    </xsl:otherwise>
-                  </xsl:choose>
-                </xsl:when>
-                <xsl:when test="$divtitle = 'E'">
-                  <xsl:choose>
-                    <xsl:when test="$book-type = 'blfs'">
-                      <xsl:call-template name="gentext">
-                        <xsl:with-param name="key">Configuration Files</xsl:with-param>
-                      </xsl:call-template>
-                    </xsl:when>
-                    <xsl:otherwise>
-                      <xsl:call-template name="gentext">
-                        <xsl:with-param name="key">Others</xsl:with-param>
-                      </xsl:call-template>
-                    </xsl:otherwise>
-                  </xsl:choose>
-                </xsl:when>
-                <xsl:when test="$divtitle = 'F'">
-                    <xsl:call-template name="gentext">
-                      <xsl:with-param name="key">Bootscripts</xsl:with-param>
-                    </xsl:call-template>
-                </xsl:when>
-                <xsl:when test="$divtitle = 'G'">
-                    <xsl:call-template name="gentext">
-                      <xsl:with-param name="key">Others</xsl:with-param>
-                    </xsl:call-template>
-                </xsl:when>
-                <xsl:otherwise>
-                  <xsl:value-of select="$divtitle"/>
-                </xsl:otherwise>
-              </xsl:choose>
-            </xsl:with-param>
-          </xsl:call-template>
-        </xsl:if>
-        <fo:block xsl:use-attribute-sets="index.entry.properties">
-          <xsl:apply-templates select="key('letter', $key)[&scope;]
-                                      [count(.|key('primary', &primary;)[&scope;][1])=1]"
-                              mode="index-primary">
-            <xsl:sort select="translate(&primary;, &lowercase;, &uppercase;)"/>
-            <xsl:with-param name="scope" select="$scope"/>
-            <xsl:with-param name="role" select="$role"/>
-            <xsl:with-param name="type" select="$type"/>
-          </xsl:apply-templates>
-        </fo:block>
-      </fo:block>
-    </xsl:if>
-  </xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/pdf/lfs-lists.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/pdf/lfs-lists.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,174 +1,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<!--
-$LastChangedBy$
-$Date$
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version="1.0">
-
-  <!-- This stylesheet controls how list are generated. -->
-
-    <!-- What spacing do you want before and after lists? -->
-  <xsl:attribute-set name="list.block.spacing">
-    <xsl:attribute name="space-before.optimum">0.6em</xsl:attribute>
-    <xsl:attribute name="space-before.minimum">0.4em</xsl:attribute>
-    <xsl:attribute name="space-before.maximum">0.8em</xsl:attribute>
-    <xsl:attribute name="space-after.optimum">0.6em</xsl:attribute>
-    <xsl:attribute name="space-after.minimum">0.4em</xsl:attribute>
-    <xsl:attribute name="space-after.maximum">0.8em</xsl:attribute>
-  </xsl:attribute-set>
-
-    <!-- What spacing do you want between list items? -->
-  <xsl:attribute-set name="list.item.spacing">
-    <xsl:attribute name="space-before.optimum">0.4em</xsl:attribute>
-    <xsl:attribute name="space-before.minimum">0.2em</xsl:attribute>
-    <xsl:attribute name="space-before.maximum">0.6em</xsl:attribute>
-  </xsl:attribute-set>
-
-    <!-- Properties that apply to each list-block generated by itemizedlist. -->
-  <xsl:attribute-set name="itemizedlist.properties"
-                     use-attribute-sets="list.block.properties">
-    <xsl:attribute name="text-align">left</xsl:attribute>
-  </xsl:attribute-set>
-
-    <!-- Format variablelists lists as blocks? 1 = yes, 0 = no
-           Default variablelist format. We override it when necesary
-           using the list-presentation processing instruction. -->
-  <xsl:param name="variablelist.as.blocks" select="1"/>
-
-    <!-- Specifies the longest term in variablelists.
-         Used when list-presentation = list -->
-  <xsl:param name="variablelist.max.termlength">35</xsl:param>
-
-    <!-- varlistentry mode block:
-           Addibg a bullet, left alignament, and @kepp-*.* attributes
-           for packages and paches list. -->
-    <!-- The original template is in {docbook-xsl}/fo/list.xsl -->
-  <xsl:template match="varlistentry" mode="vl.as.blocks">
-    <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
-    <xsl:choose>
-      <xsl:when test="ancestor::variablelist/@role = 'materials'">
-        <fo:block id="{$id}" xsl:use-attribute-sets="list.item.spacing"
-                  keep-together.within-column="always" font-weight="bold"
-                  keep-with-next.within-column="always" text-align="left">
-          <xsl:text>&#x2022;   </xsl:text>
-          <xsl:apply-templates select="term"/>
-        </fo:block>
-        <fo:block text-align="left"
-                  keep-together.within-column="always"
-                  keep-with-previous.within-column="always">
-          <xsl:apply-templates select="listitem"/>
-        </fo:block>
-      </xsl:when>
-      <xsl:otherwise>
-        <fo:block id="{$id}" xsl:use-attribute-sets="list.item.spacing"
-                  keep-together.within-column="always"
-                  keep-with-next.within-column="always" margin-left="1em">
-          <xsl:apply-templates select="term"/>
-        </fo:block>
-        <fo:block margin-left="2em">
-          <xsl:apply-templates select="listitem"/>
-        </fo:block>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-    <!-- segmentedlist:
-           Making it an actual FO list to can indent items.
-           Adjust vertical space. -->
-    <!-- The original template is in {docbook-xsl}/fo/list.xsl -->
-  <xsl:template match="segmentedlist">
-    <xsl:variable name="id">
-      <xsl:call-template name="object.id"/>
-    </xsl:variable>
-    <fo:list-block id="{$id}" provisional-distance-between-starts="12em"
-                   provisional-label-separation="1em"
-                   keep-together.within-column="always">
-      <xsl:choose>
-        <xsl:when test="ancestor::appendix[@id='appendixc']">
-          <xsl:attribute name="space-before.optimum">0.2em</xsl:attribute>
-          <xsl:attribute name="space-before.minimum">0em</xsl:attribute>
-          <xsl:attribute name="space-before.maximum">0.4em</xsl:attribute>
-          <xsl:attribute name="space-after.optimum">0.2em</xsl:attribute>
-          <xsl:attribute name="space-after.minimum">0em</xsl:attribute>
-          <xsl:attribute name="space-after.maximum">0.4em</xsl:attribute>
-          <xsl:attribute name="keep-with-previous.within-column">always</xsl:attribute>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:attribute name="space-before.optimum">0.4em</xsl:attribute>
-          <xsl:attribute name="space-before.minimum">0.2em</xsl:attribute>
-          <xsl:attribute name="space-before.maximum">0.6em</xsl:attribute>
-          <xsl:attribute name="space-after.optimum">0.4em</xsl:attribute>
-          <xsl:attribute name="space-after.minimum">0.2em</xsl:attribute>
-          <xsl:attribute name="space-after.maximum">0.6em</xsl:attribute>
-        </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="seglistitem/seg"/>
-    </fo:list-block>
-  </xsl:template>
-
-    <!-- seg:
-           Self-made template based on the original seg template
-           found in {docbook-xsl}/fo/list.xsl
-           Making segmentedlist an actual FO list to can indent items. -->
-  <xsl:template match="seglistitem/seg">
-    <xsl:variable name="id">
-      <xsl:call-template name="object.id"/>
-    </xsl:variable>
-    <xsl:variable name="segnum" select="count(preceding-sibling::seg)+1"/>
-    <xsl:variable name="seglist" select="ancestor::segmentedlist"/>
-    <xsl:variable name="segtitles" select="$seglist/segtitle"/>
-    <fo:list-item xsl:use-attribute-sets="compact.list.item.spacing">
-      <fo:list-item-label end-indent="label-end()" text-align="start">
-        <fo:block>
-          <fo:inline font-weight="bold">
-            <xsl:apply-templates select="$segtitles[$segnum=position()]"
-                                 mode="segtitle-in-seg"/>
-            <xsl:text>:</xsl:text>
-          </fo:inline>
-        </fo:block>
-      </fo:list-item-label>
-      <fo:list-item-body start-indent="body-start()">
-        <fo:block id="{$id}">
-          <xsl:apply-templates/>
-        </fo:block>
-      </fo:list-item-body>
-    </fo:list-item>
-  </xsl:template>
-
-    <!-- simplelist:
-           Self-made template. Wrap it into a fo:block and process member childs.
-           If @type is specified, the original templates will be used.
-           NOTE: when using type='horiz' or type='vert', FOP-0.93 will complaints
-             about not supported table-layout="auto" -->
-  <xsl:template match="simplelist">
-    <fo:block xsl:use-attribute-sets="simplelist.properties">
-      <xsl:apply-templates mode="condensed"/>
-    </fo:block>
-  </xsl:template>
-
-    <!-- member:
-           Self-made template to wrap it into a fo:block using customized
-           properties. -->
-  <xsl:template match="member" mode="condensed">
-    <fo:block xsl:use-attribute-sets="simplelist.properties">
-      <xsl:call-template name="simple.xlink">
-        <xsl:with-param name="content">
-          <xsl:apply-templates/>
-        </xsl:with-param>
-      </xsl:call-template>
-    </fo:block>
-  </xsl:template>
-
-    <!-- Properties associated with our simplelist format. -->
-  <xsl:attribute-set name="simplelist.properties">
-    <xsl:attribute name="keep-with-previous.within-column">always</xsl:attribute>
-    <xsl:attribute name="space-before.optimum">0em</xsl:attribute>
-    <xsl:attribute name="space-before.minimum">0em</xsl:attribute>
-    <xsl:attribute name="space-before.maximum">0.2em</xsl:attribute>
-  </xsl:attribute-set>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/pdf/lfs-mixed.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/pdf/lfs-mixed.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,360 +1,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<!--
-$LastChangedBy$
-$Date$
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version="1.0">
-
-  <!-- This stylesheet contains misc params, attribute sets and templates
-       for output formating.
-       This file is for that templates that don't fit in other files. -->
-
-    <!-- What space do you want between normal paragraphs. -->
-  <xsl:attribute-set name="normal.para.spacing">
-    <xsl:attribute name="space-before.optimum">0.6em</xsl:attribute>
-    <xsl:attribute name="space-before.minimum">0.4em</xsl:attribute>
-    <xsl:attribute name="space-before.maximum">0.8em</xsl:attribute>
-    <xsl:attribute name="orphans">3</xsl:attribute>
-    <xsl:attribute name="widows">3</xsl:attribute>
-  </xsl:attribute-set>
-
-    <!-- Properties associated with verbatim text. -->
-  <xsl:attribute-set name="verbatim.properties">
-    <xsl:attribute name="keep-with-previous.within-column">always</xsl:attribute>
-    <xsl:attribute name="space-before.optimum">0.6em</xsl:attribute>
-    <xsl:attribute name="space-before.minimum">0.4em</xsl:attribute>
-    <xsl:attribute name="space-before.maximum">0.8em</xsl:attribute>
-    <xsl:attribute name="space-after.optimum">0.6em</xsl:attribute>
-    <xsl:attribute name="space-after.minimum">0.4em</xsl:attribute>
-    <xsl:attribute name="space-after.maximum">0.8em</xsl:attribute>
-    <xsl:attribute name="hyphenate">false</xsl:attribute>
-    <xsl:attribute name="wrap-option">no-wrap</xsl:attribute>
-    <xsl:attribute name="white-space-collapse">false</xsl:attribute>
-    <xsl:attribute name="white-space-treatment">preserve</xsl:attribute>
-    <xsl:attribute name="linefeed-treatment">preserve</xsl:attribute>
-    <xsl:attribute name="text-align">start</xsl:attribute>
-  </xsl:attribute-set>
-
-    <!-- Should verbatim environments be shaded? 1 =yes, 0 = no -->
-  <xsl:param name="shade.verbatim" select="1"/>
-
-    <!-- Properties that specify the style of shaded verbatim listings -->
-  <xsl:attribute-set name="shade.verbatim.style">
-    <xsl:attribute name="background-color">#E9E9E9</xsl:attribute>
-    <xsl:attribute name="border-style">solid</xsl:attribute>
-    <xsl:attribute name="border-width">0.5pt</xsl:attribute>
-    <xsl:attribute name="border-color">#888</xsl:attribute>
-    <xsl:attribute name="padding-start">5pt</xsl:attribute>
-    <xsl:attribute name="padding-top">2pt</xsl:attribute>
-    <xsl:attribute name="padding-bottom">2pt</xsl:attribute>
-  </xsl:attribute-set>
-
-    <!-- para:
-           Skip empty "Home page" in packages.xml.
-           Allow forced line breaks inside paragraphs emulating literallayout.
-           Removed vertical space in variablelist. -->
-    <!-- The original template is in {docbook-xsl}/fo/block.xsl -->
-  <xsl:template match="para">
-    <xsl:choose>
-      <xsl:when test="child::ulink[@url=' ']"/>
-      <xsl:when test="./@remap='verbatim'">
-        <fo:block xsl:use-attribute-sets="verbatim.properties">
-          <xsl:call-template name="anchor"/>
-          <xsl:apply-templates/>
-        </fo:block>
-      </xsl:when>
-      <xsl:when test="ancestor::variablelist">
-        <fo:block>
-          <xsl:attribute name="space-before.optimum">0.1em</xsl:attribute>
-          <xsl:attribute name="space-before.minimum">0em</xsl:attribute>
-          <xsl:attribute name="space-before.maximum">0.2em</xsl:attribute>
-          <xsl:call-template name="anchor"/>
-          <xsl:apply-templates/>
-        </fo:block>
-      </xsl:when>
-      <xsl:otherwise>
-        <fo:block xsl:use-attribute-sets="normal.para.spacing">
-          <xsl:call-template name="anchor"/>
-          <xsl:apply-templates/>
-        </fo:block>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-    <!-- screen, literallayout:
-          Self-made template that creates a fo:block wrapper with keep-together
-          processing instruction support around the output generated by
-          original screen templates. -->
-  <xsl:template match="screen|literallayout">
-    <xsl:variable name="keep.together">
-      <xsl:call-template name="pi.dbfo_keep-together"/>
-    </xsl:variable>
-    <fo:block>
-      <xsl:attribute name="keep-together.within-column">
-        <xsl:choose>
-          <xsl:when test="$keep.together != ''">
-            <xsl:value-of select="$keep.together"/>
-          </xsl:when>
-          <xsl:otherwise>always</xsl:otherwise>
-        </xsl:choose>
-      </xsl:attribute>
-      <xsl:apply-imports/>
-    </fo:block>
-  </xsl:template>
-
-    <!-- literal:
-           Be sure that literal will use allways normal font weight. -->
-    <!-- The original template is in {docbook-xsl}/fo/inline.xsl -->
-  <xsl:template match="literal">
-    <fo:inline  font-weight="normal">
-      <xsl:call-template name="inline.monoseq"/>
-    </fo:inline>
-  </xsl:template>
-
-    <!-- inline.monoseq:
-           Added hyphenate-url support to classname, exceptionname, interfacename,
-           methodname, computeroutput, constant, envar, filename, function, code,
-           literal, option, promt, systemitem, varname, sgmltag, tag, and uri -->
-    <!-- The original template is in {docbook-xsl}/fo/inline.xsl -->
-  <xsl:template name="inline.monoseq">
-    <xsl:param name="content">
-      <xsl:call-template name="simple.xlink">
-        <xsl:with-param name="content">
-          <xsl:choose>
-            <xsl:when test="ancestor::para and not(ancestor::screen)
-                            and not(descendant::ulink)">
-              <xsl:call-template name="hyphenate-url">
-                <xsl:with-param name="url">
-                  <xsl:apply-templates/>
-                </xsl:with-param>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:apply-templates/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:param>
-    <fo:inline xsl:use-attribute-sets="monospace.properties">
-      <xsl:if test="@dir">
-        <xsl:attribute name="direction">
-          <xsl:choose>
-            <xsl:when test="@dir = 'ltr' or @dir = 'lro'">ltr</xsl:when>
-            <xsl:otherwise>rtl</xsl:otherwise>
-          </xsl:choose>
-        </xsl:attribute>
-      </xsl:if>
-      <xsl:copy-of select="$content"/>
-    </fo:inline>
-  </xsl:template>
-
-    <!-- inline.italicmonoseq:
-           Added hyphenate-url support to parameter, replaceable, structfield,
-           function/parameter, and function/replaceable -->
-    <!-- The original template is in {docbook-xsl}/fo/inline.xsl -->
-  <xsl:template name="inline.italicmonoseq">
-    <xsl:param name="content">
-      <xsl:call-template name="simple.xlink">
-        <xsl:with-param name="content">
-          <xsl:choose>
-            <xsl:when test="ancestor::para and not(ancestor::screen)
-                            and not(descendant::ulink)">
-              <xsl:call-template name="hyphenate-url">
-                <xsl:with-param name="url">
-                  <xsl:apply-templates/>
-                </xsl:with-param>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:apply-templates/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:param>
-    <fo:inline font-style="italic" xsl:use-attribute-sets="monospace.properties">
-      <xsl:call-template name="anchor"/>
-      <xsl:if test="@dir">
-        <xsl:attribute name="direction">
-          <xsl:choose>
-            <xsl:when test="@dir = 'ltr' or @dir = 'lro'">ltr</xsl:when>
-            <xsl:otherwise>rtl</xsl:otherwise>
-          </xsl:choose>
-        </xsl:attribute>
-      </xsl:if>
-      <xsl:copy-of select="$content"/>
-    </fo:inline>
-  </xsl:template>
-
-    <!-- Show external URLs in italic font -->
-  <xsl:attribute-set name="xref.properties">
-    <xsl:attribute name="font-style">
-      <xsl:choose>
-        <xsl:when test="self::ulink">italic</xsl:when>
-        <xsl:otherwise>inherit</xsl:otherwise>
-      </xsl:choose>
-    </xsl:attribute>
-  </xsl:attribute-set>
-
-   <!-- Center table title. -->
-  <xsl:attribute-set name="formal.title.properties">
-    <xsl:attribute name="text-align">
-      <xsl:choose>
-        <xsl:when test="local-name(.) = 'table'">center</xsl:when>
-        <xsl:otherwise>left</xsl:otherwise>
-      </xsl:choose>
-    </xsl:attribute>
-  </xsl:attribute-set>
-
-    <!-- table.layout:
-           We want all tables centered. Based on a hack posted
-           by Ellen Juhlin on docbook-apps mailing list. -->
-    <!-- The original template is in {docbook-xsl}/fo/table.xsl -->
-  <xsl:template name="table.layout">
-    <xsl:param name="table.content" select="NOTANODE"/>
-    <fo:table table-layout="fixed" width="100%">
-      <fo:table-column column-width ="proportional-column-width(1)"/>
-      <fo:table-column>
-        <!-- Set center column width equal to table width -->
-        <xsl:attribute name="column-width">
-          <xsl:call-template name="table.width"/>
-        </xsl:attribute>
-      </fo:table-column>
-      <fo:table-column column-width ="proportional-column-width(1)"/>
-      <fo:table-body>
-        <fo:table-row>
-          <fo:table-cell column-number="2">
-            <xsl:copy-of select="$table.content"/>
-          </fo:table-cell>
-        </fo:table-row>
-      </fo:table-body>
-    </fo:table>
-  </xsl:template>
-
-
-  <!-- Revision History -->
-
-    <!-- revhistory titlepage:
-           Self-made template to add missing support on bookinfo. -->
-  <xsl:template match="revhistory" mode="book.titlepage.verso.auto.mode">
-    <fo:block space-before.optimum="2em"
-              space-before.minimum="1.5em"
-              space-before.maximum="2.5em">
-      <xsl:apply-templates select="." mode="book.titlepage.verso.mode"/>
-    </fo:block>
-  </xsl:template>
-
-    <!-- revhitory title properties -->
-  <xsl:attribute-set name="revhistory.title.properties">
-    <xsl:attribute name="text-align">center</xsl:attribute>
-    <xsl:attribute name="font-weight">bold</xsl:attribute>
-  </xsl:attribute-set>
-
-    <!-- revhistory/revision mode titlepage.mode:
-           Removed authorinitials | author support placing
-           revremark | revdescription instead on that table-cell. -->
-    <!-- The original template is in {docbook-xsl}/fo/titlepage.xsl -->
-  <xsl:template match="revhistory/revision" mode="titlepage.mode">
-    <xsl:variable name="revnumber" select="revnumber"/>
-    <xsl:variable name="revdate"   select="date"/>
-    <xsl:variable name="revremark" select="revremark|revdescription"/>
-    <fo:table-row>
-      <fo:table-cell xsl:use-attribute-sets="revhistory.table.cell.properties">
-        <fo:block>
-          <xsl:if test="$revnumber">
-            <xsl:call-template name="gentext">
-              <xsl:with-param name="key" select="'Revision'"/>
-            </xsl:call-template>
-            <xsl:call-template name="gentext.space"/>
-            <xsl:apply-templates select="$revnumber[1]" mode="titlepage.mode"/>
-          </xsl:if>
-        </fo:block>
-      </fo:table-cell>
-      <fo:table-cell xsl:use-attribute-sets="revhistory.table.cell.properties">
-        <fo:block>
-          <xsl:apply-templates select="$revdate[1]"/>
-        </fo:block>
-      </fo:table-cell>
-      <fo:table-cell xsl:use-attribute-sets="revhistory.table.cell.properties">
-        <fo:block>
-          <xsl:apply-templates select="$revremark[1]"/>
-        </fo:block>
-      </fo:table-cell>
-    </fo:table-row>
-  </xsl:template>
-
-
-  <!-- Dummy sect1 -->
-
-    <!-- sect1:
-           Self-made template to skip dummy sect1 pages generation. -->
-  <xsl:template match="sect1">
-    <xsl:choose>
-      <xsl:when test="@role = 'dummy'"/>
-      <xsl:otherwise>
-        <xsl:apply-imports/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-    <!-- sect1 mode fop1.outline:
-           Self-made template to skip dummy sect1 bookmarks generation. -->
-  <xsl:template match="sect1" mode="fop1.outline">
-    <xsl:choose>
-      <xsl:when test="@role = 'dummy'"/>
-      <xsl:otherwise>
-        <xsl:apply-imports/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-    <!-- toc.line:
-           For dummy sect1 output only the title. -->
-    <!-- The original template is in {docbook-xsl}/fo/autotoc.xsl -->
-  <xsl:template name="toc.line">
-    <xsl:param name="toc-context" select="NOTANODE"/>
-    <xsl:variable name="id">
-      <xsl:call-template name="object.id"/>
-    </xsl:variable>
-    <xsl:variable name="label">
-      <xsl:apply-templates select="." mode="label.markup"/>
-    </xsl:variable>
-    <xsl:choose>
-      <xsl:when test="@role = 'dummy'">
-        <fo:block text-align="left">
-          <xsl:apply-templates select="." mode="titleabbrev.markup"/>
-        </fo:block>
-      </xsl:when>
-      <xsl:otherwise>
-        <fo:block xsl:use-attribute-sets="toc.line.properties">
-          <fo:inline keep-with-next.within-line="always">
-            <fo:basic-link internal-destination="{$id}">
-              <xsl:if test="$label != ''">
-                <xsl:copy-of select="$label"/>
-                <xsl:value-of select="$autotoc.label.separator"/>
-              </xsl:if>
-              <xsl:apply-templates select="." mode="titleabbrev.markup"/>
-            </fo:basic-link>
-          </fo:inline>
-          <fo:inline keep-together.within-line="always">
-            <xsl:text> </xsl:text>
-            <fo:leader leader-pattern="dots"
-                       leader-pattern-width="3pt"
-                       leader-alignment="reference-area"
-                       keep-with-next.within-line="always"/>
-            <xsl:text> </xsl:text>
-            <fo:basic-link internal-destination="{$id}">
-              <fo:page-number-citation ref-id="{$id}"/>
-            </fo:basic-link>
-          </fo:inline>
-        </fo:block>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/pdf/lfs-pagesetup.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/pdf/lfs-pagesetup.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,249 +1,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<!--
-$LastChangedBy$
-$Date$
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version="1.0">
-
-  <!-- This stylesheet controls page margins, sections page break,
-       header content and titles size. -->
-
-    <!-- The inner page margin. -->
-  <xsl:param name="page.margin.inner" select="'0.32in'"/>
-
-    <!-- The outer page margin. -->
-  <xsl:param name="page.margin.outer" select="'0.32in'"/>
-
-    <!-- The bottom margin of the page. -->
-  <xsl:param name="page.margin.bottom" select="'0.35in'"/>
-
-    <!-- The top margin of the page. -->
-  <xsl:param name="page.margin.top" select="'0.35in'"/>
-
-    <!-- The bottom margin of the body text. -->
-  <xsl:param name="body.margin.bottom" select="'0.4in'"/>
-
-    <!-- The top margin of the body text. -->
-  <xsl:param name="body.margin.top" select="'0.4in'"/>
-
-    <!-- Specifies the height of the header. -->
-  <xsl:param name="region.before.extent" select="'0.25in'"/>
-
-    <!-- Specifies the height of the footer. -->
-  <xsl:param name="region.after.extent" select="'0.25in'"/>
-
-    <!-- The start-indent for the body text. -->
-  <xsl:param name="body.start.indent" select="'0pc'"/>
-
-    <!-- Adjust the left margin for titles. -->
-  <xsl:param name="title.margin.left">-0.8pc</xsl:param>
-
-    <!-- Default table width on tables that do not specify an alternate
-         width using the dbfo processing instruction.
-         This value is used also on bookinfo/revhistory table. -->
-  <xsl:param name="default.table.width" select="'70%'"/>
-
-    <!-- Properties for component titles -->
-  <xsl:attribute-set name="component.title.properties">
-    <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
-    <xsl:attribute name="space-before.optimum">
-      <xsl:value-of select="concat($body.font.master, 'pt')"/>
-    </xsl:attribute>
-    <xsl:attribute name="space-before.minimum">
-      <xsl:value-of select="concat($body.font.master, 'pt * 0.8')"/>
-    </xsl:attribute>
-    <xsl:attribute name="space-before.maximum">
-      <xsl:value-of select="concat($body.font.master, 'pt * 1.2')"/>
-    </xsl:attribute>
-    <xsl:attribute name="hyphenate">false</xsl:attribute>
-    <xsl:attribute name="text-align">
-      <xsl:choose>
-        <xsl:when test="((parent::article | parent::articleinfo |
-                          parent::info/parent::article)
-                          and not(ancestor::book) and not(self::bibliography))
-                        or (parent::slides | parent::slidesinfo)
-                        or self::index">center</xsl:when>
-        <xsl:otherwise>left</xsl:otherwise>
-      </xsl:choose>
-    </xsl:attribute>
-    <xsl:attribute name="start-indent">
-      <xsl:value-of select="$title.margin.left"/>
-    </xsl:attribute>
-  </xsl:attribute-set>
-
-    <!-- Rule under headers? 1 =yes, 0 = no -->
-  <xsl:param name="header.rule" select="0"/>
-
-    <!-- Rule over footers? 1 =yes, 0 = no -->
-  <xsl:param name="footer.rule" select="0"></xsl:param>
-
-    <!-- Control depth of sections shown in running headers or footers.
-         Be sure that no unneeded fo:marker are generated. -->
-  <xsl:param name="marker.section.level" select="-1"></xsl:param>
-
-     <!-- Force package's sect1 onto a new page -->
-  <xsl:attribute-set name="section.level1.properties">
-    <xsl:attribute name="break-before">
-      <xsl:choose>
-        <!--<xsl:when test="not(. = //*/sect1[1])">
-          <xsl:text>page</xsl:text>
-        </xsl:when>-->
-        <xsl:when test="preceding-sibling::sect1[position()=1]/sect2/@role='package'
-                        or self::sect1/sect2/@role='package'">page</xsl:when>
-        <xsl:otherwise>
-          <xsl:text>auto</xsl:text>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:attribute>
-  </xsl:attribute-set>
-
-    <!-- part/partintro:
-           Be sure that partintro is on a new page. -->
-    <!-- The original template is in {docbook-xsl}/fo/divisions.xsl -->
-  <xsl:template match="part/partintro">
-    <xsl:apply-templates select=".." mode="part.titlepage.mode">
-      <xsl:with-param name="additional.content">
-        <fo:block break-before="page"/>
-        <xsl:if test="title">
-          <xsl:call-template name="partintro.titlepage"/>
-        </xsl:if>
-        <xsl:apply-templates/>
-      </xsl:with-param>
-    </xsl:apply-templates>
-    <xsl:call-template name="generate.part.toc">
-      <xsl:with-param name="part" select=".."/>
-    </xsl:call-template>
-  </xsl:template>
-
-    <!-- book title:
-          Centered the title and removed unused code.
-          Removed book.titlepage.separator. -->
-    <!-- The original template is in {docbook-xsl}/fo/titlepage.templates.xsl -->
-  <xsl:template name="book.titlepage">
-    <fo:block margin-top="3in">
-      <fo:block>
-        <xsl:call-template name="book.titlepage.before.recto"/>
-        <xsl:call-template name="book.titlepage.recto"/>
-      </fo:block>
-      <fo:block>
-        <xsl:call-template name="book.titlepage.before.verso"/>
-        <xsl:call-template name="book.titlepage.verso"/>
-      </fo:block>
-    </fo:block>
-  </xsl:template>
-
-    <!-- book titlepage verso:
-           Added missing bibliosource and revhistory support.
-           Removed unused code. -->
-    <!-- The original template is in {docbook-xsl}/fo/titlepage.templates.xsl -->
-  <xsl:template name="book.titlepage.verso">
-    <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/title"/>
-    <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/corpauthor"/>
-    <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/authorgroup"/>
-    <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/author"/>
-    <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/othercredit"/>
-    <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/releaseinfo"/>
-    <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/pubdate"/>
-    <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/copyright"/>
-    <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/bibliosource"/>
-    <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/abstract"/>
-    <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/revhistory"/>
-    <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/legalnotice"/>
-  </xsl:template>
-
-    <!-- bibliosource:
-           Self-made template to handle bibliosource when inside bookinfo. -->
-  <xsl:template match="bibliosource" mode="book.titlepage.verso.auto.mode">
-    <fo:block font-size="8pt">
-      <xsl:apply-templates/>
-    </fo:block>
-  </xsl:template>
-
-    <!-- part title:
-           Centered the title and removed unused code. -->
-    <!-- The original template is in {docbook-xsl}/fo/titlepage.templates.xsl -->
-  <xsl:template name="part.titlepage">
-    <fo:block>
-      <fo:block margin-top="3.5in">
-        <xsl:call-template name="part.titlepage.before.recto"/>
-        <xsl:call-template name="part.titlepage.recto"/>
-      </fo:block>
-      <fo:block>
-        <xsl:call-template name="part.titlepage.before.verso"/>
-        <xsl:call-template name="part.titlepage.verso"/>
-      </fo:block>
-      <xsl:call-template name="part.titlepage.separator"/>
-    </fo:block>
-  </xsl:template>
-
-    <!-- chapter title:
-           Small font size and left alignament. -->
-    <!-- The original template is in {docbook-xsl}/fo/titlepage.templates.xsl -->
-  <xsl:template match="title" mode="chapter.titlepage.recto.auto.mode">
-    <fo:block xsl:use-attribute-sets="chapter.titlepage.recto.style"
-              font-size="21pt" font-weight="bold" text-align="left">
-      <xsl:call-template name="component.title">
-        <xsl:with-param name="node" select="ancestor-or-self::chapter[1]"/>
-      </xsl:call-template>
-    </fo:block>
-  </xsl:template>
-
-    <!-- sect2 title:
-           Skip sect2.titlepage run when title is empty.
-           Removed unused code. -->
-    <!-- The original template is in {docbook-xsl}/fo/sections.xsl -->
-  <xsl:template match="sect2">
-    <xsl:variable name="id">
-      <xsl:call-template name="object.id"/>
-    </xsl:variable>
-    <fo:block xsl:use-attribute-sets="section.level2.properties">
-      <xsl:attribute name="id">
-        <xsl:value-of select="$id"/>
-      </xsl:attribute>
-      <xsl:if test="not(string-length(title)=0)">
-        <xsl:call-template name="sect2.titlepage"/>
-      </xsl:if>
-      <xsl:apply-templates/>
-    </fo:block>
-  </xsl:template>
-
-   <!-- header.table:
-          Re-made template to not generate a fo:table in the header,
-          allowing a more simple header.content customization. -->
-    <!-- The original template is in {docbook-xsl}/fo/pagesetup.xsl -->
-  <xsl:template name="header.table">
-    <xsl:param name="sequence" select="''"/>
-    <xsl:param name="gentext-key" select="''"/>
-    <xsl:choose>
-      <xsl:when test="$gentext-key = 'book' or $sequence = 'blank'"/>
-      <xsl:otherwise>
-        <xsl:call-template name="header.content">
-          <xsl:with-param name="sequence" select="$sequence"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-    <!-- header.content
-           Re-made template to show the book title and version on all pages. -->
-    <!-- The original template is in {docbook-xsl}/fo/pagesetup.xsl -->
-  <xsl:template name="header.content">
-    <xsl:param name="sequence" select="''"/>
-    <fo:block>
-      <xsl:attribute name="text-align">
-        <xsl:choose>
-          <xsl:when test="$sequence = 'first' or $sequence = 'odd'">right</xsl:when>
-          <xsl:otherwise>left</xsl:otherwise>
-        </xsl:choose>
-      </xsl:attribute>
-      <xsl:value-of select="/book/bookinfo/title"/>
-      <xsl:text> - </xsl:text>
-      <xsl:value-of select="/book/bookinfo/subtitle"/>
-    </fo:block>
-  </xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/pdf/lfs-xref.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/pdf/lfs-xref.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,169 +1,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<!--
-$LastChangedBy$
-$Date$
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:xlink="http://www.w3.org/1999/xlink"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                exclude-result-prefixes="xlink"
-                version="1.0">
-
-
-  <!-- This stylesheet fixes English punctuation in xref links
-       (as was requested by the publisher) via adding @role propagation
-       in xref tags.
-       This hack may not work with xref flavours not used in the book.
-       For other languages, just remove the xref @role attributes
-       in the book XML sources and/or comment-out the inclusion of
-       this file in lfs-pdf.xsl -->
-
-     <!--  xref:
-           Added role variable and use it when calling mode xref-to.-->
-    <!-- The original template is in {docbook-xsl}/fo/xref.xsl -->
-  <xsl:template match="xref" name="xref">
-    <xsl:param name="xhref" select="@xlink:href"/>
-    <!-- is the @xlink:href a local idref link? -->
-    <xsl:param name="xlink.idref">
-      <xsl:if test="starts-with($xhref,'#')
-                    and (not(contains($xhref,'&#40;'))
-                    or starts-with($xhref, '#xpointer&#40;id&#40;'))">
-        <xsl:call-template name="xpointer.idref">
-          <xsl:with-param name="xpointer" select="$xhref"/>
-        </xsl:call-template>
-    </xsl:if>
-    </xsl:param>
-    <xsl:param name="xlink.targets" select="key('id',$xlink.idref)"/>
-    <xsl:param name="linkend.targets" select="key('id',@linkend)"/>
-    <xsl:param name="target" select="($xlink.targets | $linkend.targets)[1]"/>
-    <xsl:param name="refelem" select="local-name($target)"/>
-      <!-- Added role variable -->
-    <xsl:variable name="role" select="@role"/>
-    <xsl:variable name="xrefstyle">
-      <xsl:choose>
-        <xsl:when test="@role and not(@xrefstyle)
-                        and $use.role.as.xrefstyle != 0">
-          <xsl:value-of select="@role"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="@xrefstyle"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:variable name="content">
-      <fo:inline xsl:use-attribute-sets="xref.properties">
-        <xsl:choose>
-          <xsl:when test="@endterm">
-            <xsl:variable name="etargets" select="key('id',@endterm)"/>
-            <xsl:variable name="etarget" select="$etargets[1]"/>
-            <xsl:choose>
-              <xsl:when test="count($etarget) = 0">
-                <xsl:message>
-                  <xsl:value-of select="count($etargets)"/>
-                  <xsl:text>Endterm points to nonexistent ID: </xsl:text>
-                  <xsl:value-of select="@endterm"/>
-                </xsl:message>
-                <xsl:text>???</xsl:text>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:apply-templates select="$etarget" mode="endterm"/>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:when>
-          <xsl:when test="$target/@xreflabel">
-            <xsl:call-template name="xref.xreflabel">
-              <xsl:with-param name="target" select="$target"/>
-            </xsl:call-template>
-          </xsl:when>
-          <xsl:when test="$target">
-            <xsl:if test="not(parent::citation)">
-              <xsl:apply-templates select="$target" mode="xref-to-prefix"/>
-            </xsl:if>
-            <xsl:apply-templates select="$target" mode="xref-to">
-              <xsl:with-param name="referrer" select="."/>
-              <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-              <!-- Propagate role -->
-              <xsl:with-param name="role" select="$role"/>
-            </xsl:apply-templates>
-            <xsl:if test="not(parent::citation)">
-              <xsl:apply-templates select="$target" mode="xref-to-suffix"/>
-            </xsl:if>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:message>
-              <xsl:text>ERROR: xref linking to </xsl:text>
-              <xsl:value-of select="@linkend|@xlink:href"/>
-              <xsl:text> has no generated link text.</xsl:text>
-            </xsl:message>
-            <xsl:text>???</xsl:text>
-          </xsl:otherwise>
-        </xsl:choose>
-      </fo:inline>
-    </xsl:variable>
-    <!-- Convert it into an active link -->
-    <xsl:call-template name="simple.xlink">
-      <xsl:with-param name="content" select="$content"/>
-    </xsl:call-template>
-    <!-- Add standard page reference? -->
-    <xsl:choose>
-      <xsl:when test="not($target)">
-        <!-- page numbers only for local targets -->
-      </xsl:when>
-      <xsl:when test="starts-with(normalize-space($xrefstyle), 'select:')
-                    and contains($xrefstyle, 'nopage')">
-        <!-- negative xrefstyle in instance turns it off -->
-      </xsl:when>
-      <!-- positive xrefstyle already handles it -->
-      <xsl:when test="not(starts-with(normalize-space($xrefstyle), 'select:')
-                    and (contains($xrefstyle, 'page')
-                        or contains($xrefstyle, 'Page')))
-                    and ( $insert.xref.page.number = 'yes'
-                      or $insert.xref.page.number = '1')
-                    or local-name($target) = 'para'">
-        <xsl:apply-templates select="$target" mode="page.citation">
-          <xsl:with-param name="id" select="$target/@id|$target/@xml:id"/>
-        </xsl:apply-templates>
-      </xsl:when>
-    </xsl:choose>
-  </xsl:template>
-
-    <!-- sect* mode xref-to:
-           Propagate role to mode object.xref.markup (see ../lfs-common.xsl) -->
-    <!-- The original template is in {docbook-xsl}/fo/xref.xsl -->
-  <xsl:template match="section|simplesect|sect1|sect2|sect3|sect4|sect5
-                      |refsect1|refsect2|refsect3|refsection" mode="xref-to">
-    <xsl:param name="referrer"/>
-    <xsl:param name="xrefstyle"/>
-    <xsl:param name="verbose" select="1"/>
-    <xsl:param name="role"/>
-    <xsl:apply-templates select="." mode="object.xref.markup">
-      <xsl:with-param name="purpose" select="'xref'"/>
-      <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-      <xsl:with-param name="referrer" select="$referrer"/>
-      <xsl:with-param name="verbose" select="$verbose"/>
-      <xsl:with-param name="role" select="$role"/>
-    </xsl:apply-templates>
-  </xsl:template>
-
-    <!-- insert.title.markup:
-           Apply the role value. -->
-    <!-- The original template is in {docbook-xsl}/fo/xref.xsl -->
-  <xsl:template match="*" mode="insert.title.markup">
-    <xsl:param name="purpose"/>
-    <xsl:param name="xrefstyle"/>
-    <xsl:param name="title"/>
-    <xsl:param name="role"/>
-    <xsl:choose>
-      <xsl:when test="$purpose = 'xref' and titleabbrev">
-        <xsl:apply-templates select="." mode="titleabbrev.markup"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:copy-of select="$title"/>
-        <xsl:value-of select="$role"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/profile.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/profile.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<!--
-$LastChangedBy$
-$Date$
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="1.0">
-
-  <!-- Stylesheet to create profiled XML output.
-       Replaces {docbook-xsl}/profiling/profile.xsl -->
-
-  <!-- Include common profiling stylesheet -->
-  <xsl:import href="docbook-xsl-snapshot/profiling/profile-mode.xsl"/>
-
-    <!-- This file must be included, because profile-mode is using
-         templates from it -->
-  <xsl:import href="docbook-xsl-snapshot/common/stripns.xsl"/>
-
-    <!-- In the two pass processing there is no need for base URI fixup -->
-  <xsl:param name="profile.baseuri.fixup" select="false()"/>
-
-  <!-- Generate DocBook instance with correct DOCTYPE -->
-  <xsl:output method="xml"
-              doctype-public="-//OASIS//DTD DocBook XML V4.5//EN"
-              doctype-system="http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"/>
-
-  <!-- Profiling parameters:
-         profile.separator changed from ";" to "," to let it work
-         at command line. -->
-  <xsl:param name="profile.arch" select="''"/>
-  <xsl:param name="profile.audience" select="''"/>
-  <xsl:param name="profile.condition" select="''"/>
-  <xsl:param name="profile.conformance" select="''"/>
-  <xsl:param name="profile.lang" select="''"/>
-  <xsl:param name="profile.os" select="''"/>
-  <xsl:param name="profile.revision" select="''"/>
-  <xsl:param name="profile.revisionflag" select="''"/>
-  <xsl:param name="profile.role" select="''"/>
-  <xsl:param name="profile.security" select="''"/>
-  <xsl:param name="profile.status" select="''"/>
-  <xsl:param name="profile.userlevel" select="''"/>
-  <xsl:param name="profile.vendor" select="''"/>
-  <xsl:param name="profile.wordsize" select="''"/>
-  <xsl:param name="profile.attribute" select="''"/>
-  <xsl:param name="profile.value" select="''"/>
-  <xsl:param name="profile.separator" select="','"/>
-
-  <!-- Call common profiling mode -->
-  <xsl:template match="/">
-    <xsl:apply-templates select="." mode="profile"/>
-  </xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/xhtml/lfs-admon.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/xhtml/lfs-admon.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,59 +1,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<!--
-$LastChangedBy$
-$Date$
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns="http://www.w3.org/1999/xhtml"
-                version="1.0">
-
-  <!-- This stylesheet controls how admonitions are displayed -->
-
-    <!-- Use graphics in admonitions? 1 = yes, 0 = no -->
-  <xsl:param name="admon.graphics" select="1"/>
-
-    <!-- Relative path to images directory. We set here relative path
-    from sub-dirs HTML files. The path from top-level HTML files (index.html,
-    partX.html, etc) MUST be fixed via a sed in the Makefile. -->
-  <xsl:param name="admon.graphics.path">../images/</xsl:param>
-
-    <!-- The images files extension -->
-  <xsl:param name="admon.graphics.extension" select="'.png'"/>
-
-    <!-- Changing the output tagging:
-           Removed $admon.style support
-           Hardcoded $admon.textlabel feature
-           Changed the output format from table to nested divs -->
-    <!-- The original template is in {docbook-xsl}/xhtml/admon.xsl -->
-  <xsl:template name="graphical.admonition">
-    <xsl:variable name="admon.type">
-      <xsl:choose>
-        <xsl:when test="local-name(.)='note'">Note</xsl:when>
-        <xsl:when test="local-name(.)='warning'">Warning</xsl:when>
-        <xsl:when test="local-name(.)='caution'">Caution</xsl:when>
-        <xsl:when test="local-name(.)='tip'">Tip</xsl:when>
-        <xsl:when test="local-name(.)='important'">Important</xsl:when>
-        <xsl:otherwise>Note</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:variable name="alt">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="$admon.type"/>
-      </xsl:call-template>
-    </xsl:variable>
-    <div class="admon {name(.)}">
-      <img alt="[{$alt}]">
-        <xsl:attribute name="src">
-          <xsl:call-template name="admon.graphic"/>
-        </xsl:attribute>
-      </img>
-      <h3>
-        <xsl:apply-templates select="." mode="object.title.markup"/>
-      </h3>
-      <xsl:apply-templates/>
-    </div>
-  </xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/xhtml/lfs-index.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/xhtml/lfs-index.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,268 +1,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<!--
-$LastChangedBy$
-$Date$
--->
-
-<!DOCTYPE xsl:stylesheet [
-<!ENTITY lowercase "'Aa&#192;&#224;&#193;&#225;&#194;&#226;&#195;&#227;&#196;&#228;&#197;&#229;&#256;&#257;&#258;&#259;&#260;&#261;&#461;&#462;&#478;&#479;&#480;&#481;&#506;&#507;&#512;&#513;&#514;&#515;&#550;&#551;&#7680;&#7681;&#7834;&#7840;&#7841;&#7842;&#7843;&#7844;&#7845;&#7846;&#7847;&#7848;&#7849;&#7850;&#7851;&#7852;&#7853;&#7854;&#7855;&#7856;&#7857;&#7858;&#7859;&#7860;&#7861;&#7862;&#7863;Bb&#384;&#385;&#595;&#386;&#387;&#7682;&#7683;&#7684;&#7685;&#7686;&#7687;Cc&#199;&#231;&#262;&#263;&#264;&#265;&#266;&#267;&#268;&#269;&#391;&#392;&#597;&#7688;&#7689;Dd&#270;&#271;&#272;&#273;&#394;&#599;&#395;&#396;&#453;&#498;&#545;&#598;&#7690;&#7691;&#7692;&#7693;&#7694;&#7695;&#7696;&#7697;&#7698;&#7699;Ee&#200;&#232;&#201;&#233;&#202;&#234;&#203;&#235;&#274;&#275;&#276;&#277;&#278;&#279;&#280;&#281;&#282;&#283;&#516;&#517;&#518;&#519;&#552;&#553;&#7700;&#7701;&#7702;&#7703;&#7704;&#7705;&#7706;&#7707;&#7708;&#7709;&#7864;&#7865;&#7866;&#7867;&#7868;&#7869;&#7870;&#7871;&#7872;&#7873;&#7874;&#7875;&#7876;&#7877;&#7878;&#7879;Ff&#401;&#402;&#7710;&#7711;Gg&#284;&#285;&#286;&#287;&#288;&#289;&#290;&#291;&#403;&#608;&#484;&#485;&#486;&#487;&#500;&#501;&#7712;&#7713;Hh&#292;&#293;&#294;&#295;&#542;&#543;&#614;&#7714;&#7715;&#7716;&#7717;&#7718;&#7719;&#7720;&#7721;&#7722;&#7723;&#7830;Ii&#204;&#236;&#205;&#237;&#206;&#238;&#207;&#239;&#296;&#297;&#298;&#299;&#300;&#301;&#302;&#303;&#304;&#407;&#616;&#463;&#464;&#520;&#521;&#522;&#523;&#7724;&#7725;&#7726;&#7727;&#7880;&#7881;&#7882;&#7883;Jj&#308;&#309;&#496;&#669;Kk&#310;&#311;&#408;&#409;&#488;&#489;&#7728;&#7729;&#7730;&#7731;&#7732;&#7733;Ll&#313;&#314;&#315;&#316;&#317;&#318;&#319;&#320;&#321;&#322;&#410;&#456;&#564;&#619;&#620;&#621;&#7734;&#7735;&#7736;&#7737;&#7738;&#7739;&#7740;&#7741;Mm&#625;&#7742;&#7743;&#7744;&#7745;&#7746;&#7747;Nn&#209;&#241;&#323;&#324;&#325;&#326;&#327;&#328;&#413;&#626;&#414;&#544;&#459;&#504;&#505;&#565;&#627;&#7748;&#7749;&#7750;&#7751;&#7752;&#7753;&#7754;&#7755;Oo&#210;&#242;&#211;&#243;&#212;&#244;&#213;&#245;&#214;&#246;&#216;&#248;&#332;&#333;&#334;&#335;&#336;&#337;&#415;&#416;&#417;&#465;&#466;&#490;&#491;&#492;&#493;&#510;&#511;&#524;&#525;&#526;&#527;&#554;&#555;&#556;&#557;&#558;&#559;&#560;&#561;&#7756;&#7757;&#7758;&#7759;&#7760;&#7761;&#7762;&#7763;&#7884;&#7885;&#7886;&#7887;&#7888;&#7889;&#7890;&#7891;&#7892;&#7893;&#7894;&#7895;&#7896;&#7897;&#7898;&#7899;&#7900;&#7901;&#7902;&#7903;&#7904;&#7905;&#7906;&#7907;Pp&#420;&#421;&#7764;&#7765;&#7766;&#7767;Qq&#672;Rr&#340;&#341;&#342;&#343;&#344;&#345;&#528;&#529;&#530;&#531;&#636;&#637;&#638;&#7768;&#7769;&#7770;&#7771;&#7772;&#7773;&#7774;&#7775;Ss&#346;&#347;&#348;&#349;&#350;&#351;&#352;&#353;&#536;&#537;&#642;&#7776;&#7777;&#7778;&#7779;&#7780;&#7781;&#7782;&#7783;&#7784;&#7785;Tt&#354;&#355;&#356;&#357;&#358;&#359;&#427;&#428;&#429;&#430;&#648;&#538;&#539;&#566;&#7786;&#7787;&#7788;&#7789;&#7790;&#7791;&#7792;&#7793;&#7831;Uu&#217;&#249;&#218;&#250;&#219;&#251;&#220;&#252;&#360;&#361;&#362;&#363;&#364;&#365;&#366;&#367;&#368;&#369;&#370;&#371;&#431;&#432;&#467;&#468;&#469;&#470;&#471;&#472;&#473;&#474;&#475;&#476;&#532;&#533;&#534;&#535;&#7794;&#7795;&#7796;&#7797;&#7798;&#7799;&#7800;&#7801;&#7802;&#7803;&#7908;&#7909;&#7910;&#7911;&#7912;&#7913;&#7914;&#7915;&#7916;&#7917;&#7918;&#7919;&#7920;&#7921;Vv&#434;&#651;&#7804;&#7805;&#7806;&#7807;Ww&#372;&#373;&#7808;&#7809;&#7810;&#7811;&#7812;&#7813;&#7814;&#7815;&#7816;&#7817;&#7832;Xx&#7818;&#7819;&#7820;&#7821;Yy&#221;&#253;&#255;&#376;&#374;&#375;&#435;&#436;&#562;&#563;&#7822;&#7823;&#7833;&#7922;&#7923;&#7924;&#7925;&#7926;&#7927;&#7928;&#7929;Zz&#377;&#378;&#379;&#380;&#381;&#382;&#437;&#438;&#548;&#549;&#656;&#657;&#7824;&#7825;&#7826;&#7827;&#7828;&#7829;&#7829;'">
-<!ENTITY uppercase "'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ'">
-<!ENTITY primary   'normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""]))'>
-<!ENTITY secondary 'normalize-space(concat(secondary/@sortas, secondary[not(@sortas) or @sortas = ""]))'>
-<!ENTITY scope     "count(ancestor::node()|$scope) = count(ancestor::node())">
-<!ENTITY section   "(ancestor-or-self::set |ancestor-or-self::book |ancestor-or-self::part |ancestor-or-self::reference |ancestor-or-self::partintro |ancestor-or-self::chapter |ancestor-or-self::appendix |ancestor-or-self::preface |ancestor-or-self::article |ancestor-or-self::section |ancestor-or-self::sect1 |ancestor-or-self::sect2 |ancestor-or-self::sect3 |ancestor-or-self::sect4 |ancestor-or-self::sect5 |ancestor-or-self::refentry |ancestor-or-self::refsect1 |ancestor-or-self::refsect2 |ancestor-or-self::refsect3 |ancestor-or-self::simplesect |ancestor-or-self::bibliography |ancestor-or-self::glossary |ancestor-or-self::index |ancestor-or-self::webpage)[last()]">
-<!ENTITY section.id "generate-id(&section;)">
-<!ENTITY sep '" "'>
-]>
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns="http://www.w3.org/1999/xhtml"
-                version="1.0">
-
-  <!-- This stylesheet controls how the Index is generated.
-       Due how they are created, the original XHTML stylesheets don't make
-       use of the entities from {docbook-xsl}/common/entities.ent.
-       We add the relevant ones in the DOCTYPE to have more readable templates.
-       Also, we remove support for @role and @type based Index due that it is
-       broken when used with @zone based cross-references. -->
-
-    <!-- The file name of the Index page.
-         There is no upstream template with match="index", only a global
-         match="*", thus the next template is enought to force the Index
-         filename. -->
-  <xsl:template match="index" mode="recursive-chunk-filename">
-    <xsl:text>longindex.html</xsl:text>
-  </xsl:template>
-
-    <!-- The Index title in the longindex.html page:
-           Removed a lot of code not useful for us.
-           Forced h1 title size. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/titlepage.templates.xsl -->
-  <xsl:template name="index.titlepage">
-    <h1 class="index">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="$index-title"/>
-      </xsl:call-template>
-    </h1>
-  </xsl:template>
-
-    <!--Divisions:
-          Translate alphabetical divisons titles to by-type titles.
-          Added gentext support to divisions titles.
-          Using h2 for divisions titles.
-          Changed output from dl format to ul format. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/autoidx.xsl -->
-  <xsl:template match="indexterm" mode="index-div-basic">
-    <xsl:param name="scope" select="."/>
-    <xsl:variable name="key" select="translate(substring(&primary;, 1, 1),&lowercase;,&uppercase;)"/>
-    <xsl:variable name="divtitle" select="translate($key, &lowercase;, &uppercase;)"/>
-      <!-- Make sure that we don't generate a div if there are no terms in scope -->
-    <xsl:if test="key('letter', $key)[&scope;] [count(.|key('primary', &primary;)[&scope;][1]) = 1]">
-      <xsl:if test="contains(concat(&lowercase;, &uppercase;), $key)">
-        <h2>
-          <xsl:choose>
-            <xsl:when test="$divtitle = 'A'">
-              <a id="package-index" name="package-index"/>
-              <xsl:call-template name="gentext">
-                <xsl:with-param name="key">Packages</xsl:with-param>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:when test="$divtitle = 'B'">
-              <a id="program-index" name="program-index"/>
-              <xsl:call-template name="gentext">
-                <xsl:with-param name="key">Programs</xsl:with-param>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:when test="$divtitle = 'C'">
-              <a id="library-index" name="library-index"/>
-              <xsl:call-template name="gentext">
-                <xsl:with-param name="key">Libraries</xsl:with-param>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:when test="$divtitle = 'D'">
-              <xsl:choose>
-                <xsl:when test="$book-type = 'blfs'">
-                  <a id="kernel-config-index" name="kernel-config-index"/>
-                  <xsl:call-template name="gentext">
-                    <xsl:with-param name="key">Kernel Configuration</xsl:with-param>
-                  </xsl:call-template>
-                </xsl:when>
-                <xsl:otherwise>
-                  <a id="scripts-index" name="scripts-index"/>
-                  <xsl:call-template name="gentext">
-                    <xsl:with-param name="key">Scripts</xsl:with-param>
-                  </xsl:call-template>
-                </xsl:otherwise>
-              </xsl:choose>
-            </xsl:when>
-            <xsl:when test="$divtitle = 'E'">
-              <xsl:choose>
-                <xsl:when test="$book-type = 'blfs'">
-                  <a id="config-file-index" name="config-file-index"/>
-                  <xsl:call-template name="gentext">
-                    <xsl:with-param name="key">Configuration Files</xsl:with-param>
-                  </xsl:call-template>
-                </xsl:when>
-                <xsl:otherwise>
-                  <a id="other-index" name="other-index"/>
-                  <xsl:call-template name="gentext">
-                    <xsl:with-param name="key">Others</xsl:with-param>
-                  </xsl:call-template>
-                </xsl:otherwise>
-              </xsl:choose>
-            </xsl:when>
-            <xsl:when test="$divtitle = 'F'">
-                <a id="bootscript-index" name="bootscript-index"/>
-                <xsl:call-template name="gentext">
-                  <xsl:with-param name="key">Bootscripts</xsl:with-param>
-                </xsl:call-template>
-            </xsl:when>
-            <xsl:when test="$divtitle = 'G'">
-              <a id="other-index" name="other-index"/>
-              <xsl:call-template name="gentext">
-                <xsl:with-param name="key">Others</xsl:with-param>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:value-of select="$divtitle"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </h2>
-      </xsl:if>
-      <ul>
-        <xsl:apply-templates select="key('letter', $key)[&scope;] [count(.|key('primary', &primary;)[&scope;][1])=1]"
-                              mode="index-primary">
-          <xsl:with-param name="scope" select="$scope"/>
-          <xsl:sort select="translate(&primary;, &lowercase;, &uppercase;)"/>
-        </xsl:apply-templates>
-      </ul>
-    </xsl:if>
-  </xsl:template>
-
-    <!-- Dropping $term.separator and $number.separator from here.
-         We add our customized ones in the output flow.
-         As all our indexterm have @zone attributes, removed a lot of
-         unused code. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/autoidx.xsl -->
-  <xsl:template match="indexterm" mode="reference">
-    <xsl:param name="scope" select="."/>
-    <xsl:call-template name="reference">
-      <xsl:with-param name="zones" select="normalize-space(@zone)"/>
-      <xsl:with-param name="scope" select="$scope"/>
-    </xsl:call-template>
-  </xsl:template>
-
-    <!-- Primary items:
-           Changed the output format from dl to ul.
-           Placed the term and separator into strong tags.
-           Placed the target links into a div.
-           Removed code for unused see and sealso childs. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/autoidx.xsl -->
-  <xsl:template match="indexterm" mode="index-primary">
-    <xsl:param name="scope" select="."/>
-    <xsl:variable name="key" select="&primary;"/>
-    <xsl:variable name="refs" select="key('primary', $key)[&scope;]"/>
-    <li>
-      <strong class="item">
-        <xsl:value-of select="primary"/>
-        <xsl:text>: </xsl:text>
-      </strong>
-      <span class='indexref'>
-        <xsl:for-each select="$refs[generate-id() = generate-id(key('primary-section',concat($key, &sep;, &section.id;))[&scope;][1])]">
-          <xsl:apply-templates select="." mode="reference">
-            <xsl:with-param name="scope" select="$scope"/>
-          </xsl:apply-templates>
-        </xsl:for-each>
-      </span>
-      <xsl:if test="$refs/secondary">
-        <ul>
-          <xsl:apply-templates select="$refs[secondary and count(.|key('secondary', concat($key, &sep;, &secondary;))[&scope;][1]) = 1]"
-                               mode="index-secondary">
-            <xsl:with-param name="scope" select="$scope"/>
-            <xsl:sort select="translate(&secondary;, &lowercase;, &uppercase;)"/>
-          </xsl:apply-templates>
-         </ul>
-      </xsl:if>
-    </li>
-  </xsl:template>
-
-    <!-- Secondary items:
-           Changed the output format from dl to ul.
-           Placed the term and separator into strong tags.
-           Placed the target links into a div.
-           Removed code for unused tertiary, see, and sealso childs. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/autoidx.xsl -->
-  <xsl:template match="indexterm" mode="index-secondary">
-    <xsl:param name="scope" select="."/>
-    <xsl:variable name="key" select="concat(&primary;, &sep;, &secondary;)"/>
-    <xsl:variable name="refs" select="key('secondary', $key)[&scope;]"/>
-    <li>
-      <strong class="secitem">
-        <xsl:value-of select="secondary"/>
-        <xsl:text>: </xsl:text>
-      </strong>
-      <span class='indexref'>
-        <xsl:for-each select="$refs[generate-id() = generate-id(key('secondary-section', concat($key, &sep;, &section.id;))[&scope;][1])]">
-          <xsl:apply-templates select="." mode="reference">
-            <xsl:with-param name="scope" select="$scope"/>
-          </xsl:apply-templates>
-        </xsl:for-each>
-      </span>
-    </li>
-  </xsl:template>
-
-    <!-- The target links:
-           Changed links separator.
-           On the second @zone link, we use a fixed string for the text
-           with gentext support.
-           Assume that there is no more than 2 @zone in a indexterm.
-           Use href.target.uri named template to resolve the links. It is faster
-           than the default href.target named template. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/autoidx.xsl -->
-  <xsl:template name="reference">
-    <xsl:param name="scope" select="."/>
-    <xsl:param name="zones"/>
-    <xsl:choose>
-      <xsl:when test="contains($zones, ' ')">
-        <xsl:variable name="zone" select="substring-before($zones, ' ')"/>
-        <xsl:variable name="zone2" select="substring-after($zones, ' ')"/>
-        <xsl:variable name="target" select="key('sections', $zone)[&scope;]"/>
-        <xsl:variable name="target2" select="key('sections', $zone2)[&scope;]"/>
-        <a>
-          <xsl:attribute name="href">
-            <xsl:call-template name="href.target.uri">
-              <xsl:with-param name="object" select="$target[1]"/>
-            </xsl:call-template>
-          </xsl:attribute>
-          <xsl:apply-templates select="$target[1]" mode="index-title-content"/>
-        </a>
-        <xsl:text> -- </xsl:text>
-        <a>
-          <xsl:attribute name="href">
-            <xsl:call-template name="href.target.uri">
-              <xsl:with-param name="object" select="$target2[1]"/>
-            </xsl:call-template>
-          </xsl:attribute>
-          <xsl:call-template name="gentext">
-            <xsl:with-param name="key">description</xsl:with-param>
-          </xsl:call-template>
-        </a>
-        <br/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:variable name="zone" select="$zones"/>
-        <xsl:variable name="target" select="key('sections', $zone)[&scope;]"/>
-        <a>
-          <xsl:attribute name="href">
-            <xsl:call-template name="href.target.uri">
-              <xsl:with-param name="object" select="$target[1]"/>
-            </xsl:call-template>
-          </xsl:attribute>
-          <xsl:apply-templates select="$target[1]" mode="index-title-content"/>
-        </a>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/xhtml/lfs-legalnotice.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/xhtml/lfs-legalnotice.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,82 +1,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<!--
-$LastChangedBy$
-$Date$
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns="http://www.w3.org/1999/xhtml"
-                version="1.0">
-
-  <!-- This stylesheet controls how legalnotice page is created -->
-
-    <!-- Generating the legalnotice page:
-           We are forcing separate legalnotice page generation.
-           Removed the default link to legalnotice page. We want it in Copyright.
-           Added footer navigational link to Home.  -->
-    <!-- The original template is in {docbook-xsl}/xhtml/titlepage.xsl -->
-  <xsl:template match="legalnotice" mode="titlepage.mode">
-    <xsl:variable name="id">
-      <xsl:call-template name="object.id"/>
-    </xsl:variable>
-    <xsl:variable name="filename" select="concat($base.dir, 'legalnotice.html')"/>
-    <xsl:call-template name="write.chunk">
-      <xsl:with-param name="filename" select="$filename"/>
-      <xsl:with-param name="quiet" select="$chunk.quietly"/>
-      <xsl:with-param name="content">
-        <html>
-          <xsl:call-template name="html.head"/>
-          <body>
-            <xsl:call-template name="body.attributes"/>
-            <div class="{local-name(.)}">
-              <xsl:apply-templates mode="titlepage.mode"/>
-            </div>
-            <div class="navfooter">
-              <ul class="footerlinks">
-                <li class="home">
-                  <a accesskey="h" href="index.html">
-                    <xsl:attribute name="title">
-                      <xsl:value-of select="/book/bookinfo/title"/>
-                      <xsl:text> - </xsl:text>
-                      <xsl:value-of select="/book/bookinfo/subtitle"/>
-                    </xsl:attribute>
-                    <xsl:call-template name="navig.content">
-                      <xsl:with-param name="direction" select="'home'"/>
-                    </xsl:call-template>
-                  </a>
-                </li>
-              </ul>
-            </div>
-          </body>
-        </html>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:template>
-
-    <!-- Making the legalnotice link:
-         We make the "Copyright" word a link to legalnotice page. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/titlepage.xsl -->
-  <xsl:template match="copyright" mode="titlepage.mode">
-    <p class="{name(.)}">
-      <a href="legalnotice.html">
-        <xsl:call-template name="gentext">
-          <xsl:with-param name="key" select="'Copyright'"/>
-        </xsl:call-template>
-      </a>
-      <xsl:call-template name="gentext.space"/>
-      <xsl:call-template name="dingbat">
-        <xsl:with-param name="dingbat">copyright</xsl:with-param>
-      </xsl:call-template>
-      <xsl:call-template name="gentext.space"/>
-      <xsl:call-template name="copyright.years">
-        <xsl:with-param name="years" select="year"/>
-        <xsl:with-param name="print.ranges" select="$make.year.ranges"/>
-        <xsl:with-param name="single.year.ranges" select="$make.single.year.ranges"/>
-      </xsl:call-template>
-      <xsl:call-template name="gentext.space"/>
-      <xsl:apply-templates select="holder" mode="titlepage.mode"/>
-    </p>
-  </xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/xhtml/lfs-mixed.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/xhtml/lfs-mixed.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,312 +1,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<!--
-$LastChangedBy$
-$Date$
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns="http://www.w3.org/1999/xhtml"
-                version="1.0">
-
-  <!-- This stylesheet contains misc templates for output formating.
-       This file is for that templates that don't fit in other files
-       and that not afect the chunk algorithm. -->
-
-  <!-- Individual elements templates -->
-
-    <!-- para:
-           Added a choose to skip empty "Home page" in packages.xml.
-           Added an if for HLFS features. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/block.xsl -->
-  <xsl:template match="para">
-    <xsl:choose>
-      <xsl:when test="child::ulink[@url=' ']"/>
-      <xsl:otherwise>
-        <xsl:call-template name="paragraph">
-          <xsl:with-param name="class">
-            <xsl:if test="@role">
-              <xsl:if test="$book-type = 'hlfs'">
-                <xsl:if test="contains($hlfs-features,concat(',',@role,','))">
-                  <xsl:text>feature-</xsl:text>
-                </xsl:if>
-              </xsl:if>
-              <xsl:value-of select="@role"/>
-            </xsl:if>
-          </xsl:with-param>
-          <xsl:with-param name="content">
-            <xsl:if test="position() = 1 and parent::listitem">
-              <xsl:call-template name="anchor">
-                <xsl:with-param name="node" select="parent::listitem"/>
-              </xsl:call-template>
-            </xsl:if>
-            <xsl:call-template name="anchor"/>
-            <xsl:apply-templates/>
-          </xsl:with-param>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-    <!-- screen:
-           Changed class attribute asignament to fit our look needs.
-           Removed unused line numbering support. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/verbatim.xsl
-         It match also programlisting and synopsis. The code for that tags
-         is unchanged. -->
-  <xsl:template match="screen">
-    <pre>
-      <xsl:attribute name="class">
-        <xsl:choose>
-          <xsl:when test="@role and not(@role = 'nodump')">
-            <xsl:if test="$book-type = 'hlfs'">
-              <xsl:if test="contains($hlfs-features,concat(',',@role,','))">
-                <xsl:text>feature-</xsl:text>
-              </xsl:if>
-            </xsl:if>
-            <xsl:value-of select="@role"/>
-          </xsl:when>
-          <xsl:when test="child::* = userinput">userinput</xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="name(.)"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:attribute>
-      <xsl:apply-templates/>
-    </pre>
-  </xsl:template>
-
-    <!-- userinput:
-           Using a customized output when inside screen.
-           In other cases, use the original template. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/inline.xsl -->
-  <xsl:template match="userinput">
-    <xsl:choose>
-      <xsl:when test="ancestor::screen">
-        <kbd class="command">
-          <xsl:apply-templates/>
-        </kbd>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:apply-imports/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-    <!-- itemizadlist:
-           @compact is not allowed in XHTML 1.0 Strict DTD. Changing it
-           to @class. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/lists.xsl -->
-  <xsl:template match="itemizedlist">
-    <div>
-      <xsl:apply-templates select="." mode="class.attribute"/>
-      <xsl:call-template name="anchor"/>
-      <xsl:if test="title">
-        <xsl:call-template name="formal.object.heading"/>
-      </xsl:if>
-      <xsl:apply-templates select="*[not(self::listitem or self::title
-                              or self::titleabbrev)]
-                              |comment()[not(preceding-sibling::listitem)]
-                              |processing-instruction()[not(preceding-sibling::listitem)]"/>
-      <ul>
-        <xsl:if test="@spacing='compact'">
-          <xsl:attribute name="class">
-            <xsl:value-of select="@spacing"/>
-          </xsl:attribute>
-        </xsl:if>
-        <xsl:apply-templates select="listitem |comment()[preceding-sibling::listitem]
-                                |processing-instruction()[preceding-sibling::listitem]"/>
-      </ul>
-    </div>
-  </xsl:template>
-
-    <!-- orderedlist:
-           @start, @type, and @compact sre not allowed in XHTML 1.0 Strict DTD.
-           @start and @type can be replaced by CSS code.
-           Changing @compact to @class. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/lists.xsl -->
-  <xsl:template match="orderedlist">
-    <div>
-      <xsl:apply-templates select="." mode="class.attribute"/>
-      <xsl:call-template name="anchor"/>
-      <xsl:if test="title">
-        <xsl:call-template name="formal.object.heading"/>
-      </xsl:if>
-      <xsl:apply-templates select="*[not(self::listitem or self::title
-                              or self::titleabbrev)]
-                              |comment()[not(preceding-sibling::listitem)]
-                              |processing-instruction()[not(preceding-sibling::listitem)]"/>
-       <ol>
-        <xsl:if test="@spacing='compact'">
-          <xsl:attribute name="class">
-            <xsl:value-of select="@spacing"/>
-          </xsl:attribute>
-        </xsl:if>
-        <xsl:apply-templates select="listitem |comment()[preceding-sibling::listitem]
-                                |processing-instruction()[preceding-sibling::listitem]"/>
-      </ol>
-    </div>
-  </xsl:template>
-
-    <!-- seg in segementedlist:
-           Added a span around seg text to can match it with CSS code. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/lists.xsl -->
-  <xsl:template match="seg">
-    <xsl:variable name="segnum" select="count(preceding-sibling::seg)+1"/>
-    <xsl:variable name="seglist" select="ancestor::segmentedlist"/>
-    <xsl:variable name="segtitles" select="$seglist/segtitle"/>
-      <!-- Note: segtitle is only going to be the right thing in a well formed
-      SegmentedList.  If there are too many Segs or too few SegTitles,
-      you'll get something odd...maybe an error -->
-    <div class="seg">
-      <strong class="segtitle">
-        <xsl:apply-templates select="$segtitles[$segnum=position()]"
-                              mode="segtitle-in-seg"/>
-        <xsl:text>: </xsl:text>
-      </strong>
-      <span class="segbody">
-        <xsl:if test="@id">
-          <a id="{@id}" name="{@id}"/>
-        </xsl:if>
-        <xsl:apply-templates/>
-      </span>
-    </div>
-  </xsl:template>
-
-    <!-- variablelist:
-           If it have a role attribute, wrap the default output into a div with
-           a class attribute matching that role attribute.
-           Apply the original template in all cases. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/lists.xsl -->
-  <xsl:template match="variablelist">
-    <xsl:choose>
-      <xsl:when test="@role">
-        <div class="{@role}">
-          <xsl:apply-imports/>
-        </div>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:apply-imports/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-    <!-- para/simplelist:
-           Self-made template. Add a line break and process the childs.
-           If @type is specified, the original templates should be used,
-           but not tested. -->
-  <xsl:template match="para/simplelist">
-    <br/>
-    <xsl:apply-templates mode="condensed"/>
-  </xsl:template>
-
-    <!-- member:
-           Self-made template to process it and add a line break. -->
-  <xsl:template match="member" mode="condensed">
-    <xsl:call-template name="anchor"/>
-    <xsl:call-template name="simple.xlink">
-      <xsl:with-param name="content">
-        <xsl:apply-templates/>
-      </xsl:with-param>
-    </xsl:call-template>
-    <br/>
-  </xsl:template>
-
-
-  <!-- Named formating templates -->
-
-    <!-- Body attributes:
-           Add to the body XHTML output tag a class attribute with the book type
-           and a id atribute with the book type and version. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/docbook.xsl -->
-  <xsl:template name="body.attributes">
-    <xsl:attribute name="class">
-      <xsl:value-of select="$book-type"/>
-    </xsl:attribute>
-    <xsl:attribute name="id">
-      <xsl:value-of select="$book-type"/>
-      <xsl:text>-</xsl:text>
-      <xsl:value-of select="substring-after(/book/bookinfo/subtitle, ' ')"/>
-    </xsl:attribute>
-  </xsl:template>
-
-  <!-- Revision History -->
-
-    <!-- revhistory mode titlepage.mode:
-           Removed hardcoded style attributes.
-           Removed support for separate revhistory file. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/titlepage.xsl -->
-  <xsl:template match="revhistory" mode="titlepage.mode">
-    <xsl:variable name="numcols">
-      <xsl:choose>
-        <xsl:when test="//authorinitials">4</xsl:when>
-        <xsl:otherwise>3</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:variable name="title">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key">RevHistory</xsl:with-param>
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="contents">
-      <table summary="{$title}" class="{name(.)}">
-        <tr>
-          <th colspan="{$numcols}">
-            <b>
-              <xsl:value-of select="$title"/>
-            </b>
-          </th>
-        </tr>
-        <xsl:apply-templates mode="titlepage.mode">
-          <xsl:with-param name="numcols" select="$numcols"/>
-        </xsl:apply-templates>
-      </table>
-    </xsl:variable>
-    <xsl:copy-of select="$contents"/>
-  </xsl:template>
-
-    <!-- revhistory/revision mode titlepage.mode:
-           Removed hardcoded style attributes. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/titlepage.xsl -->
-  <xsl:template match="revhistory/revision" mode="titlepage.mode">
-    <xsl:param name="numcols" select="'3'"/>
-    <xsl:variable name="revnumber" select="revnumber"/>
-    <xsl:variable name="revdate" select="date"/>
-    <xsl:variable name="revauthor" select="authorinitials|author"/>
-    <xsl:variable name="revremark" select="revremark|revdescription"/>
-    <tr>
-      <td>
-        <xsl:if test="$revnumber">
-          <xsl:call-template name="gentext">
-            <xsl:with-param name="key" select="'Revision'"/>
-          </xsl:call-template>
-          <xsl:call-template name="gentext.space"/>
-          <xsl:apply-templates select="$revnumber[1]" mode="titlepage.mode"/>
-        </xsl:if>
-      </td>
-      <td>
-        <xsl:apply-templates select="$revdate[1]" mode="titlepage.mode"/>
-      </td>
-      <xsl:choose>
-        <xsl:when test="$revauthor">
-          <td>
-            <xsl:for-each select="$revauthor">
-              <xsl:apply-templates select="." mode="titlepage.mode"/>
-              <xsl:if test="position() != last()">
-                <xsl:text>, </xsl:text>
-              </xsl:if>
-            </xsl:for-each>
-          </td>
-        </xsl:when>
-        <xsl:when test="$numcols &gt; 3">
-          <td>&#160;</td>
-        </xsl:when>
-        <xsl:otherwise/>
-      </xsl:choose>
-      <td>
-        <xsl:apply-templates select="$revremark[1]" mode="titlepage.mode"/>
-      </td>
-    </tr>
-  </xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/xhtml/lfs-navigational.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/xhtml/lfs-navigational.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,364 +1,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<!--
-$LastChangedBy$
-$Date$
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns="http://www.w3.org/1999/xhtml"
-                version="1.0">
-
-  <!-- This stylesheet controls how page header and navigational links
-       are generated. -->
-
-    <!-- html.head:
-           Drop all navigational links from inside head xhtml output. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/chunk-common.xsl -->
-  <xsl:template name="html.head">
-    <head>
-      <xsl:call-template name="system.head.content"/>
-      <xsl:call-template name="head.content"/>
-      <xsl:call-template name="user.head.content"/>
-    </head>
-  </xsl:template>
-
-    <!-- header.navigation:
-           Self-made template that full replaces the original one -->
-    <!-- The original template is in {docbook-xsl}/xhtml/chunk-common.xsl -->
-  <xsl:template name="header.navigation">
-    <xsl:param name="prev" select="/foo"/>
-    <xsl:param name="next" select="/foo"/>
-    <xsl:variable name="up" select="parent::*"/>
-    <xsl:variable name="home" select="/*[1]"/>
-      <!-- Don't generate the header in index.html -->
-    <xsl:if test="$home != .">
-      <div class="navheader">
-          <!-- Book title and version -->
-        <h4>
-          <xsl:apply-templates select="$home" mode="object.title.markup"/>
-          <xsl:text> - </xsl:text>
-          <xsl:apply-templates select="$home" mode="object.subtitle.markup"/>
-        </h4>
-          <!-- Except for preface, part, and index, add the title of the parent -->
-        <xsl:if test="$up != $home">
-          <h3>
-            <xsl:apply-templates select="$up" mode="object.title.markup"/>
-          </h3>
-        </xsl:if>
-          <!-- Create header navigational links -->
-        <xsl:call-template name="navigational.links">
-          <xsl:with-param name="prev" select="$prev"/>
-          <xsl:with-param name="next" select="$next"/>
-          <xsl:with-param name="up" select="$up"/>
-          <xsl:with-param name="home" select="$home"/>
-        </xsl:call-template>
-      </div>
-    </xsl:if>
-  </xsl:template>
-
-    <!-- footer.navigation:
-           Self-made template that full replaces the original one -->
-    <!-- The original template is in {docbook-xsl}/xhtml/chunk-common.xsl -->
-  <xsl:template name="footer.navigation">
-    <xsl:param name="prev" select="/foo"/>
-    <xsl:param name="next" select="/foo"/>
-    <xsl:variable name="up" select="parent::*"/>
-    <xsl:variable name="home" select="/*[1]"/>
-      <!-- Create footer navigational links -->
-    <div class="navfooter">
-      <xsl:call-template name="navigational.links">
-        <xsl:with-param name="prev" select="$prev"/>
-        <xsl:with-param name="next" select="$next"/>
-        <xsl:with-param name="up" select="$up"/>
-        <xsl:with-param name="home" select="$home"/>
-      </xsl:call-template>
-    </div>
-      <!-- In HLFS, add the features.js call -->
-    <xsl:if test="$book-type = 'hlfs'">
-      <script type="text/javascript">
-        <xsl:attribute name="src">
-          <xsl:choose>
-            <xsl:when test="local-name(.)='book' or local-name(.)='part' or
-                            local-name(.)='index'">../features.js</xsl:when>
-            <xsl:otherwise>../../features.js</xsl:otherwise>
-          </xsl:choose>
-        </xsl:attribute>
-      </script>
-    </xsl:if>
-  </xsl:template>
-
-    <!-- navigational.links:
-           Self-made template to generate navigational links.
-           Most of the code come from the original header.navigation and
-           footer.navigation templates, with this changes:
-             Changed the output format from table to ul.
-             Placed the same links on both header and footer.
-             Added a title attribute to the link containing the target title
-               (it content is displayed when placing the mouse over the link)
-             For "Prev" and "Next" links, added the target title under it.
-             When "Next" target is the Index, added gentext support for the
-               Index title.
-             Skip links to dummy sect1. -->
-  <xsl:template name="navigational.links">
-    <xsl:param name="prev"/>
-    <xsl:param name="next"/>
-    <xsl:param name="up"/>
-    <xsl:param name="home"/>
-    <ul>
-        <!-- No prev link when prev is home -->
-      <xsl:if test="count($prev)&gt;0 and $prev != $home">
-        <li class="prev">
-          <xsl:choose>
-
-              <!-- If prev is a dummy sect1 that is the first one in a chapter,
-                   links to the parent chapter.-->
-            <xsl:when test="$prev[@role='dummy'] and
-                            count(preceding-sibling::sect1)=1">
-              <a accesskey="p">
-                <xsl:attribute name="href">
-                  <xsl:call-template name="href.target">
-                    <xsl:with-param name="object" select=".."/>
-                  </xsl:call-template>
-                </xsl:attribute>
-                <xsl:attribute name="title">
-                  <xsl:value-of select="../title"/>
-                </xsl:attribute>
-                <xsl:call-template name="navig.content">
-                  <xsl:with-param name="direction" select="'prev'"/>
-                </xsl:call-template>
-              </a>
-              <p>
-                <xsl:value-of select="../title"/>
-              </p>
-            </xsl:when>
-
-              <!-- If prev is a dummy sect1 that is not the first one in a chapter,
-                   links to the previous sect1.-->
-            <xsl:when test="$prev[@role='dummy'] and
-                            count(preceding-sibling::sect1)&gt;1">
-              <a accesskey="p">
-                <xsl:attribute name="href">
-                  <xsl:call-template name="href.target">
-                    <xsl:with-param name="object" select="preceding-sibling::sect1[position()=2]"/>
-                  </xsl:call-template>
-                </xsl:attribute>
-                <xsl:attribute name="title">
-                  <xsl:value-of select="preceding-sibling::sect1[position()=2]/title"/>
-                </xsl:attribute>
-                <xsl:call-template name="navig.content">
-                  <xsl:with-param name="direction" select="'prev'"/>
-                </xsl:call-template>
-              </a>
-              <p>
-                <xsl:value-of select="preceding-sibling::sect1[position()=2]/title"/>
-              </p>
-            </xsl:when>
-
-              <!-- Code for the "To Boot or To Chroot" CLFS links jumps. -->
-            <xsl:when test="$prev[@id='ch-chroot-pwdgroup'] or $prev[@id='ch-boot-whatnext']">
-              <a accesskey="p">
-                <xsl:attribute name="href">
-                  <xsl:call-template name="href.target">
-                    <xsl:with-param name="object" select="//sect1[@id='ch-temp-system-choose']"/>
-                  </xsl:call-template>
-                </xsl:attribute>
-                <xsl:attribute name="title">
-                  <xsl:value-of select="//sect1[@id='ch-temp-system-choose']/title"/>
-                </xsl:attribute>
-                <xsl:call-template name="navig.content">
-                  <xsl:with-param name="direction" select="'prev'"/>
-                </xsl:call-template>
-              </a>
-              <p>
-                <xsl:value-of select="//sect1[@id='ch-temp-system-choose']/title"/>
-              </p>
-            </xsl:when>
-
-              <!-- Normal prev links -->
-            <xsl:otherwise>
-              <a accesskey="p">
-                <xsl:attribute name="href">
-                  <xsl:call-template name="href.target">
-                    <xsl:with-param name="object" select="$prev"/>
-                  </xsl:call-template>
-                </xsl:attribute>
-                <xsl:attribute name="title">
-                  <xsl:value-of select="$prev/title"/>
-                </xsl:attribute>
-                <xsl:call-template name="navig.content">
-                  <xsl:with-param name="direction" select="'prev'"/>
-                </xsl:call-template>
-              </a>
-              <p>
-                <xsl:value-of select="$prev/title"/>
-              </p>
-            </xsl:otherwise>
-          </xsl:choose>
-        </li>
-      </xsl:if>
-
-
-        <!-- Next link except in the last page and in the CLFS "choose" page -->
-      <xsl:if test="count($next)&gt;0 and (not(@id) or @id!='ch-temp-system-choose')">
-        <li class="next">
-          <xsl:choose>
-
-              <!-- Current page is sect1 a next is a dummy sect1, link to the next one -->
-            <xsl:when test="$next[@role='dummy'] and local-name(.) = 'sect1'">
-              <a accesskey="n">
-                <xsl:attribute name="href">
-                  <xsl:call-template name="href.target">
-                    <xsl:with-param name="object" select="following-sibling::sect1[position()=2]"/>
-                  </xsl:call-template>
-                </xsl:attribute>
-                <xsl:attribute name="title">
-                  <xsl:value-of select="following-sibling::sect1[position()=2]/title"/>
-                </xsl:attribute>
-                <xsl:call-template name="navig.content">
-                  <xsl:with-param name="direction" select="'next'"/>
-                </xsl:call-template>
-              </a>
-              <p>
-                <xsl:value-of select="following-sibling::sect1[position()=2]/title"/>
-              </p>
-            </xsl:when>
-
-              <!-- Current page is chapter and next is a dummy sect1, link to the next one -->
-            <xsl:when test="$next[@role='dummy'] and local-name(.) = 'chapter'">
-              <a accesskey="n">
-                <xsl:attribute name="href">
-                  <xsl:call-template name="href.target">
-                    <xsl:with-param name="object" select="descendant::sect1[position()=2]"/>
-                  </xsl:call-template>
-                </xsl:attribute>
-                <xsl:attribute name="title">
-                  <xsl:value-of select="descendant::sect1[position()=2]/title"/>
-                </xsl:attribute>
-                <xsl:call-template name="navig.content">
-                  <xsl:with-param name="direction" select="'next'"/>
-                </xsl:call-template>
-              </a>
-              <p>
-                <xsl:value-of select="descendant::sect1[position()=2]/title"/>
-              </p>
-            </xsl:when>
-
-              <!-- Code for the "To Boot or To Chroot" CLFS links jumps. -->
-            <xsl:when test="$next[@id='chapter-chroot'] or $next[@id='chapter-boot']">
-              <a accesskey="n">
-                <xsl:attribute name="href">
-                  <xsl:call-template name="href.target">
-                    <xsl:with-param name="object" select="//part[@id='part5']"/>
-                  </xsl:call-template>
-                </xsl:attribute>
-                <xsl:attribute name="title">
-                  <xsl:value-of select="//part[@id='part5']/title"/>
-                </xsl:attribute>
-                <xsl:call-template name="navig.content">
-                  <xsl:with-param name="direction" select="'next'"/>
-                </xsl:call-template>
-              </a>
-              <p>
-                <xsl:value-of select="//part[@id='part5']/title"/>
-              </p>
-            </xsl:when>
-
-              <!-- Normal next links. Take care of Index gentext support. -->
-            <xsl:otherwise>
-              <a accesskey="n">
-                <xsl:attribute name="href">
-                  <xsl:call-template name="href.target">
-                    <xsl:with-param name="object" select="$next"/>
-                  </xsl:call-template>
-                </xsl:attribute>
-                <xsl:attribute name="title">
-                  <xsl:choose>
-                    <xsl:when test="local-name($next)='index'">
-                      <xsl:call-template name="gentext">
-                        <xsl:with-param name="key">Index</xsl:with-param>
-                      </xsl:call-template>
-                    </xsl:when>
-                    <xsl:otherwise>
-                      <xsl:value-of select="$next/title"/>
-                    </xsl:otherwise>
-                  </xsl:choose>
-                </xsl:attribute>
-                <xsl:call-template name="navig.content">
-                  <xsl:with-param name="direction" select="'next'"/>
-                </xsl:call-template>
-              </a>
-              <p>
-                <xsl:choose>
-                  <xsl:when test="local-name($next)='index'">
-                    <xsl:call-template name="gentext">
-                      <xsl:with-param name="key">Index</xsl:with-param>
-                    </xsl:call-template>
-                  </xsl:when>
-                  <xsl:otherwise>
-                    <xsl:value-of select="$next/title"/>
-                  </xsl:otherwise>
-                </xsl:choose>
-              </p>
-            </xsl:otherwise>
-          </xsl:choose>
-        </li>
-      </xsl:if>
-
-
-      <li class="up">
-        <xsl:choose>
-            <!-- Up link except if up is home -->
-          <xsl:when test="count($up)&gt;0 and $up != $home">
-            <a accesskey="u">
-              <xsl:attribute name="href">
-                <xsl:call-template name="href.target">
-                  <xsl:with-param name="object" select="$up"/>
-                </xsl:call-template>
-              </xsl:attribute>
-              <xsl:attribute name="title">
-                <xsl:apply-templates select="$up" mode="object.title.markup"/>
-              </xsl:attribute>
-              <xsl:call-template name="navig.content">
-                <xsl:with-param name="direction" select="'up'"/>
-              </xsl:call-template>
-            </a>
-          </xsl:when>
-            <!-- Hack to let the CSS code do its work when there is no up link -->
-          <xsl:otherwise>
-            <xsl:text>.</xsl:text>
-          </xsl:otherwise>
-        </xsl:choose>
-      </li>
-
-
-      <li class="home">
-        <xsl:choose>
-            <!-- No home link in home page -->
-          <xsl:when test="$home != .">
-            <a accesskey="h">
-              <xsl:attribute name="href">
-                <xsl:call-template name="href.target">
-                  <xsl:with-param name="object" select="$home"/>
-                </xsl:call-template>
-              </xsl:attribute>
-              <xsl:attribute name="title">
-                <xsl:value-of select="$home/bookinfo/title"/>
-                <xsl:text> - </xsl:text>
-                <xsl:value-of select="$home/bookinfo/subtitle"/>
-              </xsl:attribute>
-              <xsl:call-template name="navig.content">
-                <xsl:with-param name="direction" select="'home'"/>
-              </xsl:call-template>
-            </a>
-          </xsl:when>
-            <!-- Hack to let the CSS code do its work when there is no home link -->
-          <xsl:otherwise>
-            <xsl:text>.</xsl:text>
-          </xsl:otherwise>
-        </xsl:choose>
-      </li>
-    </ul>
-  </xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/xhtml/lfs-sections.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/xhtml/lfs-sections.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,165 +1,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<!--
-$LastChangedBy$
-$Date$
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns="http://www.w3.org/1999/xhtml"
-                version="1.0">
-
-  <!-- This stylesheet controls how preface, chapter, and sections are handled -->
-
-    <!-- Chunk the first top-level section? 1 = yes, 0 = no
-         If preface and chapters TOC are generated, this must be 1. -->
-  <xsl:param name="chunk.first.sections" select="1"/>
-
-    <!-- preface:
-           Output non sect1 child elements before the TOC -->
-    <!-- The original template is in {docbook-xsl}/xhtml/components.xsl -->
-  <xsl:template match="preface">
-    <xsl:call-template name="id.warning"/>
-    <div>
-      <xsl:apply-templates select="." mode="class.attribute"/>
-      <xsl:call-template name="dir">
-        <xsl:with-param name="inherit" select="1"/>
-      </xsl:call-template>
-      <xsl:call-template name="language.attribute"/>
-      <xsl:if test="$generate.id.attributes != 0">
-        <xsl:attribute name="id">
-          <xsl:call-template name="object.id"/>
-        </xsl:attribute>
-      </xsl:if>
-      <xsl:call-template name="component.separator"/>
-      <xsl:call-template name="preface.titlepage"/>
-      <xsl:apply-templates/>
-      <xsl:variable name="toc.params">
-        <xsl:call-template name="find.path.params">
-          <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:if test="contains($toc.params, 'toc')">
-        <xsl:call-template name="component.toc">
-          <xsl:with-param name="toc.title.p" select="contains($toc.params, 'title')"/>
-        </xsl:call-template>
-        <xsl:call-template name="component.toc.separator"/>
-      </xsl:if>
-      <xsl:call-template name="process.footnotes"/>
-    </div>
-  </xsl:template>
-
-    <!-- chapter:
-           Output non sect1 child elements before the TOC -->
-    <!-- The original template is in {docbook-xsl}/xhtml/components.xsl -->
-  <xsl:template match="chapter">
-    <xsl:call-template name="id.warning"/>
-    <div>
-      <xsl:apply-templates select="." mode="class.attribute"/>
-      <xsl:call-template name="dir">
-        <xsl:with-param name="inherit" select="1"/>
-      </xsl:call-template>
-      <xsl:call-template name="language.attribute"/>
-      <xsl:if test="$generate.id.attributes != 0">
-        <xsl:attribute name="id">
-          <xsl:call-template name="object.id"/>
-        </xsl:attribute>
-      </xsl:if>
-      <xsl:call-template name="component.separator"/>
-      <xsl:call-template name="chapter.titlepage"/>
-      <xsl:apply-templates/>
-      <xsl:variable name="toc.params">
-        <xsl:call-template name="find.path.params">
-          <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:if test="contains($toc.params, 'toc')">
-        <xsl:call-template name="component.toc">
-          <xsl:with-param name="toc.title.p" select="contains($toc.params, 'title')"/>
-        </xsl:call-template>
-        <xsl:call-template name="component.toc.separator"/>
-      </xsl:if>
-      <xsl:call-template name="process.footnotes"/>
-    </div>
-  </xsl:template>
-
-    <!-- sect1:
-           When there is a role attibute, use it as the class value.
-           Process the SVN keywords found in sect1info as a footnote.
-           Removed unused code. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/sections.xsl -->
-  <xsl:template match="sect1">
-    <div>
-      <xsl:choose>
-        <xsl:when test="@role">
-          <xsl:attribute name="class">
-            <xsl:value-of select="@role"/>
-          </xsl:attribute>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates select="." mode="class.attribute"/>
-        </xsl:otherwise>
-      </xsl:choose>
-      <xsl:call-template name="language.attribute"/>
-      <xsl:call-template name="sect1.titlepage"/>
-      <xsl:apply-templates/>
-      <xsl:apply-templates select="sect1info" mode="svn-keys"/>
-    </div>
-  </xsl:template>
-
-    <!-- sect2:
-           When there is a role attibute, use it as the class value.
-           Removed unused code. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/sections.xsl -->
-  <xsl:template match="sect2">
-    <div>
-      <xsl:choose>
-        <xsl:when test="@role">
-          <xsl:attribute name="class">
-            <xsl:value-of select="@role"/>
-          </xsl:attribute>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:attribute name="class">
-            <xsl:value-of select="name(.)"/>
-          </xsl:attribute>
-        </xsl:otherwise>
-      </xsl:choose>
-      <xsl:call-template name="language.attribute"/>
-      <xsl:call-template name="sect2.titlepage"/>
-      <xsl:apply-templates/>
-    </div>
-  </xsl:template>
-
-    <!-- sect1info mode svn-keys:
-           Self-made template to process SVN keywords found in sect1info. -->
-  <xsl:template match="sect1info" mode="svn-keys">
-    <p class="updated">Last updated <!-- by
-      <xsl:apply-templates select="othername" mode="svn-keys"/> -->
-      on
-      <xsl:apply-templates select="date" mode="svn-keys"/>
-    </p>
-  </xsl:template>
-
-    <!-- othername mode svn-keys:
-           Self-made template to process the $LastChangedBy SVN keyword. -->
-  <xsl:template match="othername" mode="svn-keys">
-    <xsl:variable name="author">
-      <xsl:value-of select="."/>
-    </xsl:variable>
-    <xsl:variable name="nameonly">
-      <xsl:value-of select="substring($author,16)"/>
-    </xsl:variable>
-    <xsl:value-of select="substring-before($nameonly,'$')"/>
-  </xsl:template>
-
-    <!-- date mode svn-keys:
-           Self-made template to process the $Date SVN keyword. -->
-  <xsl:template match="date" mode="svn-keys">
-    <xsl:variable name="date">
-      <xsl:value-of select="."/>
-    </xsl:variable>
-    <xsl:value-of select="substring($date,7,26)"/>
-  </xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/xhtml/lfs-titles.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/xhtml/lfs-titles.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,197 +1,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<!--
-$LastChangedBy$
-$Date$
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns="http://www.w3.org/1999/xhtml"
-                version="1.0">
-
-  <!-- This stylesheet controls the h* xhtml tags used for several titles -->
-
-    <!-- preface.titlepage:
-           Uses h1 and removed a lot of unneeded code.
-           No label in preface. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/titlepage.templates.xsl -->
-  <xsl:template name="preface.titlepage">
-    <h1 class="{name(.)}">
-      <xsl:if test="@id">
-        <a id="{@id}" name="{@id}"/>
-      </xsl:if>
-      <xsl:value-of select="title"/>
-    </h1>
-  </xsl:template>
-
-    <!-- part.titlepage:
-           Uses h1 and removed a lot of unneeded code.
-           When sections are not labeled, we want the part label in TOC
-           but not in titlepage. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/titlepage.templates.xsl -->
-  <xsl:template name="part.titlepage">
-    <h1 class="{name(.)}">
-      <xsl:if test="@id">
-        <a id="{@id}" name="{@id}"/>
-      </xsl:if>
-      <xsl:if test="$section.autolabel != 0">
-        <xsl:apply-templates select="." mode="label.markup"/>
-        <xsl:text>. </xsl:text>
-      </xsl:if>
-      <xsl:value-of select="title"/>
-    </h1>
-  </xsl:template>
-
-    <!-- partintro.titlepage:
-           Uses h2 and removed a lot of unneeded code. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/titlepage.templates.xsl -->
-  <xsl:template name="partintro.titlepage">
-    <xsl:if test="title">
-      <h2 class="{name(.)}">
-        <xsl:if test="@id">
-          <a id="{@id}" name="{@id}"/>
-        </xsl:if>
-        <xsl:value-of select="title"/>
-      </h2>
-    </xsl:if>
-  </xsl:template>
-
-    <!-- appendix.titlepage:
-           Uses h1 and removed a lot of unneeded code.
-           When sections are not labeled, we want the appendix label in TOC
-           but not in titlepage. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/titlepage.templates.xsl -->
-  <xsl:template name="appendix.titlepage">
-    <h1 class="{name(.)}">
-      <xsl:if test="@id">
-        <a id="{@id}" name="{@id}"/>
-      </xsl:if>
-      <xsl:if test="$section.autolabel != 0">
-        <xsl:apply-templates select="." mode="label.markup"/>
-        <xsl:text>. </xsl:text>
-      </xsl:if>
-      <xsl:value-of select="title"/>
-    </h1>
-  </xsl:template>
-
-    <!-- chapter.titlepage:
-           Uses h1 and removed a lot of unneeded code.
-           When sections are not labeled, we want the chapter label in TOC
-           but not in titlepage. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/titlepage.templates.xsl -->
-  <xsl:template name="chapter.titlepage">
-    <h1 class="{name(.)}">
-      <xsl:if test="@id">
-        <a id="{@id}" name="{@id}"/>
-      </xsl:if>
-      <xsl:if test="$section.autolabel != 0">
-        <xsl:apply-templates select="." mode="label.markup"/>
-        <xsl:text>. </xsl:text>
-      </xsl:if>
-      <xsl:value-of select="title"/>
-    </h1>
-  </xsl:template>
-
-    <!-- sect1.titlepage:
-           Uses h1 and removed a lot of unneeded code. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/titlepage.templates.xsl -->
-  <xsl:template name="sect1.titlepage">
-    <h1 class="{name(.)}">
-      <xsl:if test="@id">
-        <a id="{@id}" name="{@id}"/>
-      </xsl:if>
-      <xsl:if test="$section.autolabel != 0">
-        <xsl:apply-templates select="." mode="label.markup"/>
-        <xsl:text>. </xsl:text>
-      </xsl:if>
-      <xsl:value-of select="title"/>
-    </h1>
-  </xsl:template>
-
-    <!-- sect2.titlepage:
-           Uses h2 and removed a lot of unneeded code.
-           Skip empty titles.
-           No label in preface. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/titlepage.templates.xsl -->
-  <xsl:template name="sect2.titlepage">
-    <xsl:choose>
-      <xsl:when test="string-length(title) = 0"/>
-      <xsl:otherwise>
-        <h2 class="{name(.)}">
-          <xsl:if test="@id">
-            <a id="{@id}" name="{@id}"/>
-          </xsl:if>
-          <xsl:if test="not(ancestor::preface) and $section.autolabel != 0">
-            <xsl:apply-templates select="." mode="label.markup"/>
-            <xsl:text>. </xsl:text>
-          </xsl:if>
-          <xsl:value-of select="title"/>
-        </h2>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-    <!-- sect3.titlepage:
-           Uses h3 and removed a lot of unneeded code. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/titlepage.templates.xsl -->
-  <xsl:template name="sect3.titlepage">
-    <h3 class="{name(.)}">
-      <xsl:if test="@id">
-        <a id="{@id}" name="{@id}"/>
-      </xsl:if>
-      <xsl:if test="$section.autolabel != 0">
-        <xsl:apply-templates select="." mode="label.markup"/>
-        <xsl:text>. </xsl:text>
-      </xsl:if>
-      <xsl:value-of select="title"/>
-    </h3>
-  </xsl:template>
-
-    <!-- dedication.titlepage:
-           Uses h2 and removed a lot of unneeded code. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/titlepage.templates.xsl -->
-  <xsl:template name="dedication.titlepage">
-    <h2>
-      <xsl:value-of select="title"/>
-    </h2>
-  </xsl:template>
-
-    <!-- bridgehead:
-           We use always renderas attributes and want the output h* level
-           matching the defined sect* level.
-           Create the anchor only if there is an @id. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/sections.xsl -->
-  <xsl:template match="bridgehead">
-    <xsl:variable name="hlevel">
-      <xsl:choose>
-        <xsl:when test="@renderas = 'sect1'">1</xsl:when>
-        <xsl:when test="@renderas = 'sect2'">2</xsl:when>
-        <xsl:when test="@renderas = 'sect3'">3</xsl:when>
-        <xsl:when test="@renderas = 'sect4'">4</xsl:when>
-        <xsl:when test="@renderas = 'sect5'">5</xsl:when>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:element name="h{$hlevel}" namespace="http://www.w3.org/1999/xhtml">
-      <xsl:if test="@id">
-        <a id="{@id}" name="{@id}"/>
-      </xsl:if>
-      <xsl:apply-templates/>
-    </xsl:element>
-  </xsl:template>
-
-    <!-- book.titlepage.verso:
-           Process bookinfo/bibliosource from here. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/titlepage.templates.xsl -->
-  <xsl:template name="book.titlepage.verso">
-    <xsl:apply-templates select="bookinfo/bibliosource"/>
-  </xsl:template>
-
-    <!-- bookinfo/bibliosource:
-           Self-made template to handle bibliosource when inside bookinfo. -->
-  <xsl:template match="bookinfo/bibliosource">
-    <p class="copyright">
-      <xsl:apply-templates/>
-    </p>
-  </xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/xhtml/lfs-toc.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/xhtml/lfs-toc.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,194 +1,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<!--
-$LastChangedBy$
-$Date$
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns="http://www.w3.org/1999/xhtml"
-                version="1.0">
-
-  <!-- This stylesheet controls how the TOC are generated -->
-
-    <!-- make.toc:
-           Using h3 for TOC title.
-           Using ul for TOC list style.
-           Removed code for $manual.toc and $qanda.in.toc -->
-    <!-- The original template is in {docbook-xsl}/xhtml/autotoc.xsl -->
-  <xsl:template name="make.toc">
-    <xsl:param name="toc-context" select="."/>
-    <xsl:param name="nodes" select="/NOT-AN-ELEMENT"/>
-    <xsl:if test="$nodes">
-      <div class="toc">
-        <h3>
-          <xsl:call-template name="gentext">
-            <xsl:with-param name="key">TableofContents</xsl:with-param>
-          </xsl:call-template>
-        </h3>
-        <ul>
-          <xsl:apply-templates select="$nodes" mode="toc">
-            <xsl:with-param name="toc-context" select="$toc-context"/>
-          </xsl:apply-templates>
-        </ul>
-      </div>
-    </xsl:if>
-  </xsl:template>
-
-    <!-- subtoc:
-           Using ul for TOC list style.
-           Removed code for $qanda.in.toc
-           Removed code for sect* others than sect1 -->
-    <!-- The original template is in {docbook-xsl}/xhtml/autotoc.xsl -->
-  <xsl:template name="subtoc">
-    <xsl:param name="toc-context" select="."/>
-    <xsl:param name="nodes" select="NOT-AN-ELEMENT"/>
-    <xsl:variable name="subtoc">
-      <ul>
-        <xsl:apply-templates mode="toc" select="$nodes">
-          <xsl:with-param name="toc-context" select="$toc-context"/>
-        </xsl:apply-templates>
-      </ul>
-    </xsl:variable>
-    <xsl:variable name="depth">
-      <xsl:choose>
-        <xsl:when test="local-name(.) = 'sect1'">1</xsl:when>
-        <xsl:otherwise>0</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:variable name="depth.from.context"
-                  select="count(ancestor::*)-count($toc-context/ancestor::*)"/>
-    <li class="{name(.)}">
-      <xsl:call-template name="toc.line">
-        <xsl:with-param name="toc-context" select="$toc-context"/>
-      </xsl:call-template>
-      <xsl:if test="$toc.section.depth &gt; $depth and count($nodes)&gt;0
-                    and $toc.max.depth &gt; $depth.from.context">
-        <xsl:copy-of select="$subtoc"/>
-      </xsl:if>
-    </li>
-  </xsl:template>
-
-    <!-- toc.line:
-           Adding the h* tags and dropping unneded links.
-           This template is a full re-made version of the original one. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/autotoc.xsl -->
-  <xsl:template name="toc.line">
-    <xsl:param name="toc-context" select="."/>
-    <xsl:choose>
-        <!-- For non dummy sect1 targets, create a link. -->
-      <xsl:when test="local-name(.) = 'sect1'">
-        <xsl:choose>
-          <xsl:when test="@role='dummy'">
-            <span class="dummy">
-              <xsl:apply-templates select="." mode="titleabbrev.markup"/>
-            </span>
-          </xsl:when>
-          <xsl:otherwise>
-            <a>
-              <xsl:attribute name="href">
-                <xsl:call-template name="href.target">
-                  <xsl:with-param name="context" select="$toc-context"/>
-                </xsl:call-template>
-              </xsl:attribute>
-              <xsl:apply-templates select="." mode="titleabbrev.markup"/>
-            </a>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-        <!-- For part, preface, and chapter, use hX and add the label.
-             For BLFS, make it a link. -->
-      <xsl:when test="local-name(.) = 'part' or local-name(.) = 'preface'
-                      or local-name(.) = 'chapter'">
-        <xsl:choose>
-          <xsl:when test="$book-type = 'blfs'">
-            <xsl:apply-templates select="." mode="add.hX">
-              <xsl:with-param name="toc-context" select="$toc-context"/>
-              <xsl:with-param name="with-link" select="1"/>
-            </xsl:apply-templates>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:apply-templates select="." mode="add.hX">
-              <xsl:with-param name="toc-context" select="$toc-context"/>
-              <xsl:with-param name="with-link" select="0"/>
-            </xsl:apply-templates>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-        <!-- For appendix , create a link and add the label.
-             For BLFS, use hX. -->
-      <xsl:when test="local-name(.) = 'appendix'">
-        <xsl:choose>
-          <xsl:when test="$book-type = 'blfs'">
-            <xsl:apply-templates select="." mode="add.hX">
-              <xsl:with-param name="toc-context" select="$toc-context"/>
-              <xsl:with-param name="with-link" select="1"/>
-            </xsl:apply-templates>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:apply-templates select="." mode="add.link">
-              <xsl:with-param name="toc-context" select="$toc-context"/>
-            </xsl:apply-templates>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-        <!-- For other targets like Index, use hX, create a link, and label it. -->
-      <xsl:otherwise>
-        <xsl:apply-templates select="." mode="add.hX">
-          <xsl:with-param name="toc-context" select="$toc-context"/>
-          <xsl:with-param name="with-link" select="1"/>
-        </xsl:apply-templates>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-    <!-- Self-made template to add hX tags to toc lines. -->
-  <xsl:template match="*" mode="add.hX">
-    <xsl:param name="toc-context" select="."/>
-    <xsl:param name="with-link" select="0"/>
-    <xsl:param name="hlevel">
-      <xsl:choose>
-        <xsl:when test="local-name(.)='chapter' or local-name(.)='preface'">4</xsl:when>
-        <xsl:otherwise>3</xsl:otherwise>
-      </xsl:choose>
-    </xsl:param>
-    <xsl:element name="h{$hlevel}" namespace="http://www.w3.org/1999/xhtml">
-      <xsl:choose>
-        <xsl:when test="$with-link != 0">
-          <xsl:apply-templates select="." mode="add.link">
-            <xsl:with-param name="toc-context" select="$toc-context"/>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates select="." mode="label.and.title"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:element>
-  </xsl:template>
-
-    <!-- Self-made template to made toc line a link. -->
-  <xsl:template match="*" mode="add.link">
-    <xsl:param name="toc-context" select="."/>
-    <a>
-      <xsl:attribute name="href">
-        <xsl:call-template name="href.target">
-          <xsl:with-param name="context" select="$toc-context"/>
-        </xsl:call-template>
-      </xsl:attribute>
-      <xsl:apply-templates select="." mode="label.and.title"/>
-    </a>
-  </xsl:template>
-
-    <!-- Self-made template to write the target title and label it. -->
-  <xsl:template match="*" mode="label.and.title">
-    <xsl:variable name="label">
-      <xsl:apply-templates select="." mode="label.markup"/>
-    </xsl:variable>
-    <xsl:copy-of select="$label"/>
-    <xsl:if test="$label != ''">
-      <xsl:value-of select="$autotoc.label.separator"/>
-    </xsl:if>
-    <xsl:apply-templates select="." mode="titleabbrev.markup"/>
-  </xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/xhtml/lfs-xref.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/xhtml/lfs-xref.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,142 +1,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<!--
-$LastChangedBy$
-$Date$
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:xlink="http://www.w3.org/1999/xlink"
-                xmlns="http://www.w3.org/1999/xhtml"
-                exclude-result-prefixes="xlink"
-                version="1.0">
-
-  <!-- This stylesheet fixes English punctuation in xref links
-       (as was requested by the publisher) via adding @role propagation
-       in xref tags.
-       This hack may not work with xref flavours not used in the book.
-       For other languages, just remove the xref @role attributes
-       in the book XML sources and/or comment-out the inclusion of
-       this file in lfs-chunked2.xsl -->
-
-    <!-- xref:
-           Added role variable and use it when calling mode xref-to.-->
-    <!-- The original template is in {docbook-xsl}/xhtml/xref.xsl -->
-  <xsl:template match="xref" name="xref">
-    <xsl:param name="xhref" select="@xlink:href"/>
-    <!-- is the @xlink:href a local idref link? -->
-    <xsl:param name="xlink.idref">
-      <xsl:if test="starts-with($xhref,'#') and (not(contains($xhref,'('))
-                    or starts-with($xhref, '#xpointer(id('))">
-        <xsl:call-template name="xpointer.idref">
-          <xsl:with-param name="xpointer" select="$xhref"/>
-        </xsl:call-template>
-      </xsl:if>
-    </xsl:param>
-    <xsl:param name="xlink.targets" select="key('id',$xlink.idref)"/>
-    <xsl:param name="linkend.targets" select="key('id',@linkend)"/>
-    <xsl:param name="target" select="($xlink.targets | $linkend.targets)[1]"/>
-      <!-- Added role variable -->
-    <xsl:variable name="role" select="@role"/>
-    <xsl:variable name="xrefstyle">
-      <xsl:choose>
-        <xsl:when test="@role and not(@xrefstyle) and $use.role.as.xrefstyle != 0">
-          <xsl:value-of select="@role"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="@xrefstyle"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:call-template name="anchor"/>
-    <xsl:variable name="content">
-      <xsl:choose>
-        <xsl:when test="@endterm">
-          <xsl:variable name="etargets" select="key('id',@endterm)"/>
-          <xsl:variable name="etarget" select="$etargets[1]"/>
-          <xsl:choose>
-            <xsl:when test="count($etarget) = 0">
-              <xsl:message>
-                <xsl:value-of select="count($etargets)"/>
-                <xsl:text>Endterm points to nonexistent ID: </xsl:text>
-                <xsl:value-of select="@endterm"/>
-              </xsl:message>
-              <xsl:text>???</xsl:text>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:apply-templates select="$etarget" mode="endterm"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:when>
-        <xsl:when test="$target/@xreflabel">
-          <xsl:call-template name="xref.xreflabel">
-            <xsl:with-param name="target" select="$target"/>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:when test="$target">
-          <xsl:if test="not(parent::citation)">
-            <xsl:apply-templates select="$target" mode="xref-to-prefix"/>
-          </xsl:if>
-          <xsl:apply-templates select="$target" mode="xref-to">
-            <xsl:with-param name="referrer" select="."/>
-            <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-             <!-- Propagate role -->
-            <xsl:with-param name="role" select="$role"/>
-          </xsl:apply-templates>
-          <xsl:if test="not(parent::citation)">
-            <xsl:apply-templates select="$target" mode="xref-to-suffix"/>
-          </xsl:if>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:message>
-            <xsl:text>ERROR: xref linking to </xsl:text>
-            <xsl:value-of select="@linkend|@xlink:href"/>
-            <xsl:text> has no generated link text.</xsl:text>
-          </xsl:message>
-          <xsl:text>???</xsl:text>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:call-template name="simple.xlink">
-      <xsl:with-param name="content" select="$content"/>
-    </xsl:call-template>
-  </xsl:template>
-
-    <!-- sect* mode xref-to:
-           Propagate role to mode object.xref.markup (see ../lfs-common.xsl) -->
-    <!-- The original template is in {docbook-xsl}/xhtml/xref.xsl -->
-  <xsl:template match="section|simplesect|sect1|sect2|sect3|sect4|sect5|refsect1
-                       |refsect2|refsect3|refsection" mode="xref-to">
-    <xsl:param name="referrer"/>
-    <xsl:param name="xrefstyle"/>
-    <xsl:param name="verbose" select="1"/>
-    <xsl:param name="role"/>
-    <xsl:apply-templates select="." mode="object.xref.markup">
-      <xsl:with-param name="purpose" select="'xref'"/>
-      <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-      <xsl:with-param name="referrer" select="$referrer"/>
-      <xsl:with-param name="verbose" select="$verbose"/>
-      <xsl:with-param name="role" select="$role"/>
-    </xsl:apply-templates>
-  </xsl:template>
-
-    <!-- insert.title.markup:
-           Apply the role value. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/xref.xsl -->
-  <xsl:template match="*" mode="insert.title.markup">
-    <xsl:param name="purpose"/>
-    <xsl:param name="xrefstyle"/>
-    <xsl:param name="title"/>
-    <xsl:param name="role"/>
-    <xsl:choose>
-      <xsl:when test="$purpose = 'xref' and titleabbrev">
-        <xsl:apply-templates select="." mode="titleabbrev.markup"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:copy-of select="$title"/>
-        <xsl:value-of select="$role"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/md5sum.xsl
===================================================================
--- BOOK/stylesheets/md5sum.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,67 +1,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-<!DOCTYPE xsl:stylesheet [
- <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<!--
-XSLT stylesheet to create md5sum file for packages and patches to check integrity.
-Only for Cross-LFS.
-
-Usage example:
-
-xsltproc -xinclude -nonet -output mips64.md5sum stylesheets/md5sum.xsl materials/mips64-chapter.xml
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    version="1.0">
-
-  <xsl:output method="text"/>
-
-  <xsl:template match="/">
-    <xsl:apply-templates select="//ulink"/>
-  </xsl:template>
-
-  <xsl:template name="filename-basename">
-    <!-- We assume all filenames are really URIs and use "/" -->
-    <xsl:param name="filename"></xsl:param>
-    <xsl:param name="recurse" select="false()"/>
-
-    <xsl:choose>
-      <xsl:when test="contains($filename, '/')">
-        <xsl:call-template name="filename-basename">
-          <xsl:with-param name="filename"
-                          select="substring-after($filename, '/')"/>
-          <xsl:with-param name="recurse" select="true()"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:choose>
-          <xsl:when test="contains($filename, '?')">
-            <xsl:value-of select="substring-before($filename,'?')"/>
-	  </xsl:when>
-	  <xsl:otherwise>
-            <xsl:value-of select="$filename"/>
-	  </xsl:otherwise>
-        </xsl:choose>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template match="ulink">
-      <!-- Packages. If some package don't have the string ".tar." in their
-      name, the next test must be fixed to match it also. -->
-    <xsl:if test="contains(@url, '.tar.') or contains(@url, '.tgz')
-            or contains(@url, '.patch') and contains(@url, '&patches-root;')
-            and not(ancestor-or-self::*/@condition = 'pdf')">
-      <xsl:value-of select="../following-sibling::para/literal"/>
-      <xsl:text>  </xsl:text>
-      <xsl:call-template name="filename-basename">
-        <xsl:with-param name="filename" select="@url"/>
-        <xsl:with-param name="recurse" select="true()"/>
-      </xsl:call-template>
-      <xsl:text>&#x0a;</xsl:text>
-    </xsl:if>
-  </xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/top-index.xsl
===================================================================
--- BOOK/stylesheets/top-index.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,243 +1,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-<!DOCTYPE xsl:stylesheet [
- <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns="http://www.w3.org/1999/xhtml"
-                version="1.0">
-
-  <xsl:output method="html" encoding="iso-8859-1"/>
-
-  <xsl:template match="/">
-    <html>
-      <head>
-        <title>
-          Cross-Compiled Linux From Scratch
-        </title>
-        <style type="text/css">
-          <xsl:text>
-/* Global settings */
-body {
-  font-family: verdana, tahoma, helvetica, arial, sans-serif;
-  text-align: left;
-  background: #fff;
-  color: #222;
-  margin: 1em;
-  padding: 0;
-  font-size: 1em;
-  line-height: 1.2em
-}
-
-a:link { color: #22b; }
-a.ulink:link { font-weight: bold; color: #55f; }
-a:visited { color: #7e4988 ! important; }
-a:hover, a:focus { color: #d30e08 ! important; }
-a:active { color: #6b77b1 ! important;}
-
-h1, h2 h3, h4 {
-  color: #000;
-  font-weight: bold;
-  line-height: 1em;
-}
-
-h1 { font-size: 173%; text-align: center; }
-h2 { font-size: 144%; text-align: center; }
-h3 { font-size: 120%; }
-h4 { font-size: 110%; }
-
-.toc {
-  padding-left: 1em;
-}
-
-.toc ul li h3, .toc ul li h4 {
-  margin: .4em;
-}
-
-.book h1 {
-  background: #f5f6f7;
-  margin: 0px auto;
-  padding: 0.5em;
-}
-
-.book h2 {
-  background: #dbddec;
-  margin: 0px auto;
-  padding: 0.2em;
-}
-.author, .copyright {
-  background: #f5f6f7;
-  margin: 0px auto;
-  padding: 0.5em 1em;
-}
-
-hr {
-  background: #dbddec;
-  height: .3em;
-  border: 0px;
-  margin: 0px auto;
-  padding: 0;
-}
-          </xsl:text>
-        </style>
-      </head>
-      <body>
-        <xsl:apply-templates/>
-      </body>
-    </html>
-  </xsl:template>
-
-  <xsl:template match="bookinfo">
-    <div class="book">
-      <div class="titlepage">
-        <xsl:apply-templates/>
-        <hr/>
-      </div>
-      <div class="toc">
-        <h3>
-          <xsl:text>Select your target architecture:</xsl:text>
-        </h3>
-        <h3>
-          <xsl:text>Intel/AMD x86</xsl:text>
-        </h3>
-        <ul>
-          <li>
-            <h4>
-              <a href="x86">
-                <xsl:text>32 Bits</xsl:text>
-              </a>
-            </h4>
-          </li>
-          <li>
-            <h4>
-              <a href="x86_64-64">
-                <xsl:text>64 Bits</xsl:text>
-              </a>
-            </h4>
-          </li>
-          <li>
-            <h4>
-              <a href="x86_64">
-                <xsl:text>Multilib</xsl:text>
-              </a>
-            </h4>
-          </li>
-	</ul>
-        <h3>
-          <xsl:text>MIPS</xsl:text>
-        </h3>
-	<ul>
-          <li>
-            <h4>
-              <a href="mips">
-                <xsl:text>32 Bits</xsl:text>
-              </a>
-            </h4>
-          </li>
-          <li>
-            <h4>
-              <a href="mips64-64">
-                <xsl:text>64 Bits</xsl:text>
-              </a>
-            </h4>
-          </li>
-          <li>
-            <h4>
-              <a href="mips64">
-                <xsl:text>Multilib</xsl:text>
-              </a>
-            </h4>
-          </li>
-	</ul>
-        <h3>
-          <xsl:text>PowerPC</xsl:text>
-        </h3>
-	<ul>
-          <li>
-            <h4>
-              <a href="ppc">
-                <xsl:text>32 Bits</xsl:text>
-              </a>
-            </h4>
-          </li>
-          <li>
-            <h4>
-              <a href="ppc64-64">
-                <xsl:text>64 Bits</xsl:text>
-              </a>
-            </h4>
-          </li>
-          <li>
-            <h4>
-              <a href="ppc64">
-                <xsl:text>Multilib</xsl:text>
-              </a>
-            </h4>
-          </li>
-        </ul>
-        <h3>
-          <xsl:text>Sparc</xsl:text>
-        </h3>
-	<ul>
-          <li>
-            <h4>
-              <a href="sparc">
-                <xsl:text>32 Bits</xsl:text>
-              </a>
-            </h4>
-          </li>
-          <li>
-            <h4>
-              <a href="sparc64-64">
-                <xsl:text>64 Bits</xsl:text>
-              </a>
-            </h4>
-          </li>
-          <li>
-            <h4>
-              <a href="sparc64">
-                <xsl:text>Multilib</xsl:text>
-              </a>
-            </h4>
-          </li>
-	</ul>
-      </div>
-    </div>
-  </xsl:template>
-
-  <xsl:template match="title">
-    <h1 class="title">
-      <xsl:value-of select="."/>
-    </h1>
-    <h2 class="subtitle">
-      <xsl:text>Version &version;</xsl:text>
-    </h2>
-  </xsl:template>
-
-  <xsl:template match="copyright">
-    <p class="copyright">
-      <xsl:text>Copyright ©</xsl:text>
-      <xsl:apply-templates/>
-    </p>
-  </xsl:template>
-
-  <xsl:template match="year">
-    <xsl:value-of select="."/>
-  </xsl:template>
-
-  <xsl:template match="holder">
-    <xsl:value-of select="."/>
-  </xsl:template>
-
-  <xsl:template match="bibliosource">
-    <p class="copyright">
-      <em>
-        <xsl:apply-templates/>
-      </em>
-    </p>
-  </xsl:template>
-
-  <xsl:template match="subtitle|author|firstname|surname|legalnotice"/>
-
-</xsl:stylesheet>
Index: OK/stylesheets/wget.xsl
===================================================================
--- BOOK/stylesheets/wget.xsl	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,41 +1,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-<!DOCTYPE xsl:stylesheet [
- <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<!--
-XSLT stylesheet to create wget scripts to download packages and patches.
-Only for Cross-LFS.
-
-Usage example:
-
-xsltproc -xinclude -output x86.wget stylesheets/wget.xsl x86-index.xml
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    version="1.0">
-
-  <xsl:output method="text"/>
-
-  <xsl:template match="/">
-    <xsl:apply-templates select="//ulink"/>
-  </xsl:template>
-
-  <xsl:template match="ulink">
-      <!-- Packages. If some package doesn't have the string ".tar." or
-      ".tgz" in its name, the next test must be fixed to match it also. -->
-    <xsl:if test="contains(@url, '.tar.') or contains(@url, '.tgz')">
-      <xsl:value-of select="@url"/>
-      <xsl:text>&#x0a;</xsl:text>
-    </xsl:if>
-      <!-- Patches. Match only the patches and skip possible duplicated
-      URLs that may be split for PDF output-->
-    <xsl:if test="contains(@url, '&patches-root;') and @url != '&patches-root;'
-            and not(ancestor-or-self::*/@condition = 'pdf')">
-      <xsl:value-of select="@url"/>
-      <xsl:text>&#x0a;</xsl:text>
-    </xsl:if>
-  </xsl:template>
-
-</xsl:stylesheet>
Index: OK/system-config/common/clock.xml
===================================================================
--- BOOK/system-config/common/clock.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,81 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-config-clock">
-  <?dbhtml filename="clock.html"?>
-
-  <title>Configuring the system clock</title>
-
-  <indexterm zone="ch-config-clock">
-    <primary sortas="d-clock">clock</primary>
-  <secondary>configuring</secondary></indexterm>
-
-  <para>This section discusses how to configure the
-  <command>systemd-timedated</command> system service, which configures
-  system clock and timezone.</para>
-
-  <para>Systemd provides a <command>timedatectl</command> utility which is
-  used to communicate with <command>systemd-timedated</command>. It can be used
-  to set the system clock in local time or UTC time, depending on the hardware
-  clock setting. By default, <command>systemd-timedated</command> will assume
-  that clock is set to UTC time.</para>
-
-  <para>If you cannot remember whether or not the hardware clock is set to UTC,
-  find out by running the <userinput>hwclock --localtime --show</userinput>
-  command. This will display what the current time is according to the hardware
-  clock. If this time matches whatever your watch says, then the hardware clock is
-  set to local time. If the output from <command>hwclock</command> is not local
-  time, chances are it is set to UTC time. Verify this by adding or subtracting
-  the proper amount of hours for the timezone to the time shown by
-  <command>hwclock</command>. For example, if you are currently in the MST
-  timezone, which is also known as GMT -0700, add seven hours to the local
-  time.</para>
-
-  <para><command>systemd-timedated</command> reads
-  <filename>/etc/adjtime</filename>, and depending on the contents of the file,
-  it sets the clock to either UTC or local time.</para>
-
- <para>Create the <filename>/etc/adjtime</filename> file with the following
- contents if your hardware clock is set to local time:</para>
-
-<screen role="nodump"><userinput>cat &gt; /etc/adjtime &lt;&lt; "EOF"
-<literal>0.0 0 0.0
-0
-LOCAL</literal>
-EOF</userinput></screen>
-
- <para>If <filename>/etc/adjtime</filename> isn't present at first boot,
- <command>systemd-timedated</command> will assume that hardware clock is
- set to UTC and adjust the file according to that.</para>
-
-  <para>If your clock is set to local time, tell
-  <command>systemd-timedated</command> about it by running the following
-  command:</para>
-
-<screen role="nodump"><userinput>timedatectl set-local-rtc 1</userinput></screen>
-
-  <para><command>timedatectl</command> can also be used to change system time and
-  time zone.</para>
-
-  <para>To change your current system time, issue:</para>
-
-<screen role="nodump"><userinput>timedatectl set-time YYYY:MM:DD HH:MM:SS</userinput></screen>
-
-  <para>Hardware clock will also be updated accordingly.</para>
-
-  <para>To change your current time zone, issue:</para>
-
-<screen role="nodump"><userinput>timedatectl set-timezone TIMEZONE</userinput></screen>
-
-  <para>You can get list of available time zones by running:</para>
-
-<screen role="nodump"><userinput>timedatectl list-timezones</userinput></screen>
-
-  <note><para>Please note that <command>timedatectl</command> command can
-  be used only on a system booted with systemd.</para></note>
-
-</sect1>
Index: OK/system-config/common/console.xml
===================================================================
--- BOOK/system-config/common/console.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,136 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-config-console">
-  <?dbhtml filename="console.html"?>
-  <title>Configuring the Linux Console</title>
-
-  <indexterm zone="ch-config-console">
-    <primary sortas="d-console">console</primary>
-  <secondary>configuring</secondary></indexterm>
-
-  <para>This section discusses how to configure the
-  <command>systemd-vconsole-setup</command> system service which configures
-  the virtual console font and console keymap.
-
-  The <command>systemd-vconsole-setup</command> service reads <filename>
-  /etc/vconsole.conf</filename> for configuration information. Decide which
-  keymap and screen font will be used. Various language-specific HOWTO's can
-  help. with this (see
-  <ulink url="http://www.tldp.org/HOWTO/HOWTO-INDEX/other-lang.html"/>. Examine
-  <command>localectl list-keymaps</command> output for a list of valid console
-  keymaps. Look in
-  <filename class="directory">/usr/share/consolefonts</filename> for valid
-  screen fonts.</para>
-
-  <para>The <filename>/etc/vconsole.conf</filename> file should contain lines
-  of the form: VARIABLE="value". The following variables are recognized:</para>
-
-  <variablelist>
-
-    <varlistentry>
-      <term>KEYMAP</term>
-      <listitem>
-        <para>This variable specifies the key mapping table for the keyboard. If
-        unset, it defaults to <literal>us</literal>.</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>KEYMAP_TOGGLE</term>
-      <listitem>
-        <para>This variable can be used to configure a second toggle keymap and
-        is unset by default.</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>FONT</term>
-      <listitem>
-        <para>This variable specifies the font used by the virtual
-        console.</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>FONT_MAP</term>
-      <listitem>
-        <para>This variable specifies the console map to be used.</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>FONT_UNIMAP</term>
-      <listitem>
-        <para>This variable specifies the unicode font map.</para>
-      </listitem>
-    </varlistentry>
-
-  </variablelist>
-
-  <para>An example for a German keyboard and console is given below:</para>
-
-<screen role="nodump"><userinput>cat &gt; /etc/vconsole.conf &lt;&lt; "EOF"
-<literal>KEYMAP=de-latin1
-FONT=Lat2-Terminus16</literal>
-EOF</userinput></screen>
-
-  <para>You can change KEYMAP value at runtime by using the
-  <command>localectl</command> utility:</para>
-
-<screen role="nodump"><userinput>localectl set-keymap MAP</userinput></screen>
-
-  <note><para>Please note that <command>localectl</command> command can
-  be used  only on a system booted with systemd.</para></note>
-
-  <para>You can also use <command>localectl</command> utility with the
-  corresponding parameters to change X11 keyboard layout, model, variant
-  and options:</para>
-
-<screen role="nodump"><userinput>localectl set-x11-keymap LAYOUT [MODEL] [VARIANT] [OPTIONS]</userinput></screen>
-
-  <para>To list possible values for <command>localectl set-x11-keymap</command>
-  parameters, run <command>localectl</command> with parameters listed below:
-  </para>
-
-  <variablelist>
-
-    <varlistentry>
-      <term>list-x11-keymap-models</term>
-      <listitem>
-        <para>Show known X11 keyboard mapping models.</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>list-x11-keymap-layouts</term>
-      <listitem>
-        <para>Show known X11 keyboard mapping layouts.</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>list-x11-keymap-variants</term>
-      <listitem>
-        <para>Show known X11 keyboard mapping variants.</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>list-x11-keymap-options</term>
-      <listitem>
-        <para>Show known X11 keyboard mapping options.</para>
-      </listitem>
-    </varlistentry>
-
-  </variablelist>
-
-  <note><para>Using any of the parameters listed above requires
-  <ulink url="http://cblfs.clfs.org/index.php/Xorg7/Data">
-  XKeyboard Client</ulink> package from CBLFS.</para></note>
-
-</sect1>
Index: OK/system-config/common/fstab.xml
===================================================================
--- BOOK/system-config/common/fstab.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,43 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-config-fstab">
-  <?dbhtml filename="fstab.html"?>
-
-  <title>Creating the /etc/fstab File</title>
-
-  <indexterm zone="ch-config-fstab">
-    <primary sortas="e-/etc/fstab">/etc/fstab</primary>
-    <secondary>system config</secondary>
-  </indexterm>
-
-  <para os="a">The <filename>/etc/fstab</filename> file is used by some
-  programs to determine where file systems are to be mounted by default,
-  in which order, and which must be checked (for integrity errors) prior
-  to mounting. Create a new file systems table like this:</para>
-
-<screen><userinput>cat &gt; /etc/fstab &lt;&lt; "EOF"
-<literal># Begin /etc/fstab
-
-# file system  mount-point  type   options          dump  fsck
-#                                                         order
-
-/dev/<replaceable>[xxx]</replaceable>     /            <replaceable>[fff]</replaceable>  defaults         1     1
-/dev/<replaceable>[yyy]</replaceable>     swap         swap   pri=1            0     0
-
-# End /etc/fstab</literal>
-EOF</userinput></screen>
-
-  <para os="b">Replace <replaceable>[xxx]</replaceable>,
-  <replaceable>[yyy]</replaceable>, and <replaceable>[fff]</replaceable>
-  with the values appropriate for the system, for example, <filename
-  class="partition">sda2</filename>, <filename
-  class="partition">sda5</filename>, and <systemitem
-  class="filesystem">ext2</systemitem>. For details on the six
-  fields in this file, see <command>man 5 fstab</command>.</para>
-
-</sect1>
Index: OK/system-config/common/inputrc.xml
===================================================================
--- BOOK/system-config/common/inputrc.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,85 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-   <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-config-inputrc">
-  <?dbhtml filename="inputrc.html"?>
-
-  <title>Creating the /etc/inputrc File</title>
-
-  <indexterm zone="ch-config-inputrc">
-    <primary sortas="e-/etc/inputrc">/etc/inputrc</primary>
-  </indexterm>
-
-  <para>The <filename>/etc/inputrc</filename> file deals with mapping
-  the keyboard for specific situations. This file is the start-up file
-  used by Readline &mdash; the input-related library &mdash; used by Bash
-  and most other shells.</para>
-
-  <para>Most people do not need user-specific keyboard mappings so
-  the command below creates a global <filename>/etc/inputrc</filename>
-  used by everyone who logs in. If you later decide you need to override
-  the defaults on a per-user basis, you can create a
-  <filename>.inputrc</filename> file in the user's home directory with
-  the modified mappings.</para>
-
-  <para>For more information on how to edit the <filename>inputrc</filename>
-  file, see <command>info bash</command> under the <emphasis>Readline Init
-  File</emphasis> section. <command>info readline</command> is also a good
-  source of information.</para>
-
-  <para>Below is a generic global <filename>inputrc</filename> along
-  with comments to explain what the various options do. Note that
-  comments cannot be on the same line as commands. Create the file
-  using the following command:</para>
-
-<screen><?dbfo keep-together="auto"?><userinput>cat &gt; /etc/inputrc &lt;&lt; "EOF"
-<literal># Begin /etc/inputrc
-# Modified by Chris Lynn &lt;roryo@roryo.dynup.net&gt;
-
-# Allow the command prompt to wrap to the next line
-set horizontal-scroll-mode Off
-
-# Enable 8bit input
-set meta-flag On
-set input-meta On
-
-# Turns off 8th bit stripping
-set convert-meta Off
-
-# Keep the 8th bit for display
-set output-meta On
-
-# none, visible or audible
-set bell-style none
-
-# All of the following map the escape sequence of the
-# value contained inside the 1st argument to the
-# readline specific functions
-
-"\eOd": backward-word
-"\eOc": forward-word
-
-# for linux console
-"\e[1~": beginning-of-line
-"\e[4~": end-of-line
-"\e[5~": beginning-of-history
-"\e[6~": end-of-history
-"\e[3~": delete-char
-"\e[2~": quoted-insert
-
-# for xterm
-"\eOH": beginning-of-line
-"\eOF": end-of-line
-
-# for Konsole
-"\e[H": beginning-of-line
-"\e[F": end-of-line
-
-# End /etc/inputrc</literal>
-EOF</userinput></screen>
-
-</sect1>
Index: OK/system-config/common/introduction.xml
===================================================================
--- BOOK/system-config/common/introduction.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,17 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-config-introduction">
-  <?dbhtml filename="introduction.html"?>
-
-  <title>Introduction</title>
-
-  <para>This chapter details how to finish configuring the base system.
-  This includes some final configuration for systemd as well as locales and
-  a simple bash profile that should be suitable for most users.</para>
-
-</sect1>
Index: OK/system-config/common/locale.xml
===================================================================
--- BOOK/system-config/common/locale.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,148 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-config-locale">
-  <title>Setting Up Locale Information</title>
-  <?dbhtml filename="locale.html"?>
-
-  <indexterm zone="ch-config-locale">
-    <primary sortas="e-/etc/locale.conf">/etc/locale.conf</primary>
-  </indexterm>
-
-  <para>The <filename>/etc/locale.conf</filename> below sets some environment
-  variables necessary for native language support. Setting them properly
-  results in:</para>
-
-  <itemizedlist>
-    <listitem>
-      <para>The output of programs translated into the native language</para>
-    </listitem>
-    <listitem>
-      <para>Correct classification of characters into letters, digits and other
-      classes. This is necessary for <command>bash</command> to properly accept
-      non-ASCII characters in command lines in non-English locales</para>
-    </listitem>
-    <listitem>
-      <para>The correct alphabetical sorting order for the country</para>
-    </listitem>
-    <listitem>
-      <para>Appropriate default paper size</para>
-    </listitem>
-    <listitem>
-      <para>Correct formatting of monetary, time, and date values</para>
-    </listitem>
-  </itemizedlist>
-
-  <para>Replace <replaceable>[ll]</replaceable> below with the
-  two-letter code for the desired language (e.g., <quote>en</quote>) and
-  <replaceable>[CC]</replaceable> with the two-letter code for the
-  appropriate country (e.g., <quote>GB</quote> or <quote>US</quote>).
-  <replaceable>[charmap]</replaceable> should be replaced with the
-  canonical charmap for your chosen locale. Optional modifiers such as
-  <quote>@euro</quote> may also be present.</para>
-
-  <para>The list of all locales supported by Glibc can be obtained by running
-  the following command:</para>
-
-<screen role="nodump"><userinput>locale -a</userinput></screen>
-
-  <para>Locales can have a number of synonyms, e.g. <quote>ISO-8859-1</quote>
-  is also referred to as <quote>iso8859-1</quote> and <quote>iso88591</quote>.
-  Some applications cannot handle the various synonyms correctly, so it is
-  safest to choose the canonical name for a particular locale. To determine
-  the canonical name, run the following command, where <replaceable>[locale
-  name]</replaceable> is the output given by <command>locale -a</command> for
-  your preferred locale (<quote>en_US.utf8</quote> in our example).</para>
-
-<screen role="nodump"><userinput>LC_ALL=<replaceable>[locale name]</replaceable> locale charmap</userinput></screen>
-
-  <para>For the <quote>en_US.utf8</quote> locale, the above command
-  will print:</para>
-
-<screen><computeroutput>UTF-8</computeroutput></screen>
-
-  <para>This results in a final locale setting of <quote>en_US.UTF-8</quote>.
-  It is important that the locale found using the heuristic above is tested
-  prior to it being added to <filename>/etc/locale.conf</filename>:</para>
-
-<screen role="nodump"><userinput>LC_ALL=[locale name] locale territory
-LC_ALL=[locale name] locale language
-LC_ALL=[locale name] locale charmap
-LC_ALL=[locale name] locale int_curr_symbol
-LC_ALL=[locale name] locale int_prefix</userinput></screen>
-
-  <para>The above commands should print the language name, the character
-  encoding used by the locale, the local currency, and the prefix to dial
-  before the telephone number in order to get into the country. If any of the
-  commands above fail with a message similar to the one shown below, this means
-  that your locale was either not installed in Chapter 10 or is not supported by
-  the default installation of Glibc.</para>
-
-<screen><computeroutput>locale: Cannot set LC_* to default locale: No such file or directory</computeroutput></screen>
-
-  <para>If this happens, you should either install the desired locale using
-  the <command>localedef</command> command, or consider choosing a different
-  locale. Further instructions assume that there are no such error messages
-  from Glibc.</para>
-
-  <para>Some packages beyond CLFS may also lack support for your chosen locale.
-  One example is the X library (part of the X Window System), which outputs
-  the following error message:</para>
-
-<screen><computeroutput>Warning: locale not supported by Xlib, locale set to C</computeroutput></screen>
-
-  <para>Sometimes it is possible to fix this by removing the charmap part of
-  the locale specification, as long as that does not change the character map
-  that Glibc associates with the locale (this can be checked by running the
-  <command>locale charmap</command> command in both locales). For example,
-  one would have to change &quot;de_DE.ISO-8859-15@euro&quot; to
-  &quot;de_DE@euro&quot; in order to get this locale recognized by Xlib.</para>
-
-  <para>Other packages can also function incorrectly (but may not necessarily
-  display any error messages) if the locale name does not meet their
-  expectations. In those cases, investigating how other Linux distributions
-  support your locale might provide some useful information.</para>
-
-  <para>Once the proper locale settings have been determined, create the
-  <filename>/etc/locale.conf</filename> file:</para>
-
-<screen><userinput>cat &gt; /etc/locale.conf &lt;&lt; "EOF"
-<literal># Begin /etc/locale.conf
-
-LANG=<replaceable>[ll]</replaceable>_<replaceable>[CC]</replaceable>.<replaceable>[charmap]</replaceable><replaceable>[@modifiers]</replaceable>
-
-# End /etc/locale.conf</literal>
-EOF</userinput></screen>
-
-  <para>Note that you can modify <filename>/etc/locale.conf</filename> with
-  systemd's <command>localectl</command> utility. To use
-  <command>localectl</command> for the example above, run:</para>
-
-<screen role="nodump"><userinput>localectl set-locale LANG="<replaceable>[ll]_[CC][charmap][@modifiers]</replaceable>"</userinput></screen>
-
-  <para>You can also specify other language specific environment variables such
-  as <envar>LANG</envar>, <envar>LC_CTYPE</envar>, <envar>LC_NUMERIC</envar> or
-  any other environment variable from <command>locale</command> output. Just
-  separate them with a space. An example where <envar>LANG</envar> is set as
-  en_US.UTF-8 but <envar>LC_CTYPE</envar> is set as just en_US is:</para>
-
-<screen role="nodump"><userinput>localectl set-locale LANG="en_US.UTF-8" LC_CTYPE="en_US"</userinput></screen>
-
-  <note><para>Please note that <command>localectl</command> command can
-  be used  only on a system booted with systemd.</para></note>
-  <para>Setting the keyboard layout, screen font, and locale-related
-  environment variables are the only internationalization steps needed to
-  support locales that use ordinary single-byte encodings and left-to-right
-  writing direction. UTF-8 has been tested on the English, French, German,
-  Italian, and Spanish locales. All other locales are untested. If you discover
-  issues with any other locale please open a ticket in our Trac system.</para>
-
-  <para>Some locales need additional programs and support. CLFS will not be
-  supporting these locales in the book. We welcome the support for these other
-  locales via <ulink url="&cblfs-root;"/>.</para>
-
-</sect1>
Index: OK/system-config/common/profile.xml
===================================================================
--- BOOK/system-config/common/profile.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,63 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-config-profile">
-  <title>The Bash Shell Startup Files</title>
-  <?dbhtml filename="profile.html"?>
-
-  <indexterm zone="ch-config-profile">
-    <primary sortas="e-/etc/profile">/etc/profile</primary>
-  </indexterm>
-
-  <para>The shell program <command>/bin/bash</command> (hereafter
-  referred to as <quote>the shell</quote>) uses a collection of startup
-  files to help create an environment to run in. Each file has a
-  specific use and may affect login and interactive environments
-  differently. The files in the <filename class="directory">/etc</filename>
-  directory provide global settings. If an equivalent file exists in the
-  home directory, it may override the global settings.</para>
-
-  <para>An interactive login shell is started after a successful login,
-  using <command>/bin/login</command>, by reading the
-  <filename>/etc/passwd</filename> file. An interactive non-login shell
-  is started at the command-line (e.g.,
-  <prompt>[prompt]$</prompt><command>/bin/bash</command>). A
-  non-interactive shell is usually present when a shell script is
-  running. It is non-interactive because it is processing a script and
-  not waiting for user input between commands.</para>
-
-  <para>For more information, see <command>info bash</command> under the
-  <emphasis>Bash Startup Files and Interactive Shells</emphasis> section,
-  and <ulink url="&cblfs-root;index.php/Bash_Startup_Files">Bash Startup
-  Files</ulink> in CBLFS.</para>
-
-  <para>The files <filename>/etc/profile</filename> and
-  <filename>~/.bash_profile</filename> are read when the shell is
-  invoked as an interactive login shell. Create a base
-  <filename>/etc/profile</filename> that will read locale information from
-  <filename>/etc/locale.conf</filename> and load
-  any Bash auto completion files that may be on the system. This script also
-  sets the <envar>INPUTRC</envar> environment variable that makes Bash and
-  Readline use <filename>/etc/inputrc</filename>:</para>
-
-<screen><userinput>cat &gt; /etc/profile &lt;&lt; "EOF"
-<literal># Begin /etc/profile
-
-source /etc/locale.conf
-
-for f in /etc/bash_completion.d/*
-do
-  if [ -e ${f} ]; then source ${f}; fi
-done
-unset f
-
-export INPUTRC=/etc/inputrc
-
-# End /etc/profile</literal>
-EOF</userinput></screen>
-
-</sect1>
Index: OK/system-config/common/symlinks.xml
===================================================================
--- BOOK/system-config/common/symlinks.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,138 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-config-symlinks">
-  <?dbhtml filename="symlinks.html"?>
-
-  <title>Creating custom symlinks to devices</title>
-
-  <sect2>
-
-    <title>CD-ROM symlinks</title>
-
-    <para>Some software that you may want to install later (e.g., various
-    media players) expect the /dev/cdrom and /dev/dvd symlinks to exist.
-    Also, it may be convenient to put references to those symlinks into
-    <filename>/etc/fstab</filename>. For each of your CD-ROM devices,
-    find the corresponding directory under
-    <filename class="directory">/sys</filename> (e.g., this can be
-    <filename class="directory">/sys/block/hdd</filename>) and
-    run a command similar to the following:</para>
-
-<screen role="nodump"><userinput>udevadm test /sys/block/hdd</userinput></screen>
-
-    <para>Look at the lines containing the output of various *_id programs.</para>
-
-    <para>There are two approaches to creating symlinks. The first one is to
-    use the model name and the serial number, the second one is based on the
-    location of the device on the bus. If you are going to use the first
-    approach, create a file similar to the following:</para>
-
-<screen role="nodump"><userinput>cat &gt;/etc/udev/rules.d/82-cdrom.rules &lt;&lt; EOF
-<literal>
-# Custom CD-ROM symlinks
-SUBSYSTEM=="block", ENV{ID_MODEL}=="SAMSUNG_CD-ROM_SC-148F", \
-    ENV{ID_REVISION}=="PS05", SYMLINK+="cdrom"
-SUBSYSTEM=="block", ENV{ID_MODEL}=="PHILIPS_CDD5301", \
-    ENV{ID_SERIAL}=="5VO1306DM00190", SYMLINK+="cdrom1 dvd"
-</literal>
-EOF</userinput></screen>
-
-    <note>
-      <para>Although the examples in this book work properly, be aware
-      that Udev does not recognize the backslash for line continuation.
-      If modifying Udev rules with an editor, be sure to leave each rule
-      on one physical line.</para>
-    </note>
-
-    <para>This way, the symlinks will stay correct even if you move the drives
-    to different positions on the IDE bus, but the
-    <filename>/dev/cdrom</filename> symlink won't be created if you replace
-    the old SAMSUNG CD-ROM with a new drive.</para>
-<!-- The symlinks in the first approach survive even the transition
-     to libata for IDE drives, but that is not for the book. -->
-
-    <para>The SUBSYSTEM==&quot;block&quot; key is needed in order to avoid
-    matching SCSI generic devices. Without it, in the case with SCSI
-    CD-ROMs, the symlinks will sometimes point to the correct
-    <filename>/dev/srX</filename> devices, and sometimes to
-    <filename>/dev/sgX</filename>, which is wrong.</para>
-
-    <para>The second approach yields:</para>
-
-<screen role="nodump"><userinput>cat &gt;/etc/udev/rules.d/82-cdrom.rules &lt;&lt; EOF
-<literal>
-# Custom CD-ROM symlinks
-SUBSYSTEM=="block", ENV{ID_TYPE}=="cd", \
-    ENV{ID_PATH}=="pci-0000:00:07.1-ide-0:1", SYMLINK+="cdrom"
-SUBSYSTEM=="block", ENV{ID_TYPE}=="cd", \
-    ENV{ID_PATH}=="pci-0000:00:07.1-ide-1:1", SYMLINK+="cdrom1 dvd"
-</literal>
-EOF</userinput></screen>
-
-    <para>This way, the symlinks will stay correct even if you replace drives
-    with different models, but place them to the old positions on the IDE
-    bus. The ENV{ID_TYPE}==&quot;cd&quot; key makes sure that the symlink
-    disappears if you put something other than a CD-ROM in that position on
-    the bus.</para>
-
-    <para>Of course, it is possible to mix the two approaches.</para>
-
-  </sect2>
-
-  <sect2>
-
-    <title>Dealing with duplicate devices</title>
-
-    <para>As explained in <xref linkend="ch-config-udev"/>, the order in
-    which devices with the same function appear in
-    <filename class="directory">/dev</filename> is essentially random.
-    E.g., if you have a USB web camera and a TV tuner, sometimes
-    <filename>/dev/video0</filename> refers to the camera and
-    <filename>/dev/video1</filename> refers to the tuner, and sometimes
-    after a reboot the order changes to the opposite one.
-    For all classes of hardware except sound cards and network cards, this is
-    fixable by creating udev rules for custom persistent symlinks.
-    The case of network cards is covered separately in
-    <xref linkend="chapter-network"/>, and sound card configuration can
-    be found in <ulink url="&cblfs-root;">CBLFS</ulink>.</para>
-
-    <para>For each of your devices that is likely to have this problem
-    (even if the problem doesn't exist in your current Linux distribution),
-    find the corresponding directory under
-    <filename class="directory">/sys/class</filename> or
-    <filename class="directory">/sys/block</filename>.
-    For video devices, this may be
-    <filename
-    class="directory">/sys/class/video4linux/video<replaceable>X</replaceable></filename>.
-    Figure out the attributes that identify the device uniquely (usually,
-    vendor and product IDs and/or serial numbers work):</para>
-
-<screen role="nodump"><userinput>udevadm info -a -p /sys/class/video4linux/video0</userinput></screen>
-
-    <para>Then write rules that create the symlinks, e.g.:</para>
-
-<screen role="nodump"><userinput>cat &gt;/etc/udev/rules.d/83-duplicate_devs.rules &lt;&lt; EOF
-<literal>
-# Persistent symlinks for webcam and tuner
-KERNEL=="video*", SYSFS{idProduct}=="1910", SYSFS{idVendor}=="0d81", \
-    SYMLINK+="webcam"
-KERNEL=="video*", SYSFS{device}=="0x036f", SYSFS{vendor}=="0x109e", \
-    SYMLINK+="tvtuner"
-</literal>
-EOF</userinput></screen>
-
-    <para>The result is that <filename>/dev/video0</filename> and
-    <filename>/dev/video1</filename> devices still refer randomly to the tuner
-    and the web camera (and thus should never be used directly), but there are
-    symlinks <filename>/dev/tvtuner</filename> and
-    <filename>/dev/webcam</filename> that always point to the correct
-    device.</para>
-
- </sect2>
-
-</sect1>
Index: OK/system-config/common/udev.xml
===================================================================
--- BOOK/system-config/common/udev.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,333 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-config-udev">
-  <?dbhtml filename="udev.html"?>
-
-  <title>Device and Module Handling on a CLFS System</title>
-
-  <indexterm zone="ch-config-udev">
-    <primary sortas="a-Udev">Udev</primary>
-    <secondary>usage</secondary>
-  </indexterm>
-
-  <para>In <xref linkend="chapter-building-system"/>, we installed Udev,
-  as one of the components of systemd. Before we go into the details regarding
-  how this works, a brief history of previous methods of handling devices is in
-  order.</para>
-
-  <sect2>
-    <title>History</title>
-
-    <sect3>
-      <title>Static Device Nodes</title>
-
-      <para>Linux systems in general traditionally use a static device creation
-      method, whereby a great many device nodes are created under <filename
-      class="directory">/dev</filename> (sometimes literally thousands of
-      nodes), regardless of whether the corresponding hardware devices actually
-      exist. This is typically done via a <command>MAKEDEV</command> script,
-      which contains a number of calls to the <command>mknod</command> program
-      with the relevant major and minor device numbers for every possible
-      device that might exist in the world.</para>
-
-    </sect3>
-
-    <sect3>
-      <title>Devfs</title>
-
-      <para>In February 2000, a new filesystem called <systemitem
-      class="filesystem">devfs</systemitem>, which dynamically created device
-      nodes as devices were found by the kernel, was merged into the
-      2.3.46 kernel and was made available during the 2.4 series of stable
-      kernels. Although it was present in the kernel source itself, this method
-      of creating devices dynamically never received overwhelming support from
-      the core kernel developers.</para>
-
-      <para>The main problem with the approach adopted by <systemitem
-      class="filesystem">devfs</systemitem> was the way it handled device
-      detection, creation, and naming. The latter issue, that of device node
-      naming, was perhaps the most critical. It is generally accepted that if
-      device names are allowed to be configurable, then the device naming policy
-      should be up to a system administrator, not imposed on them by any
-      particular developer(s). The <systemitem
-      class="filesystem">devfs</systemitem> file system also suffered from race
-      conditions that were inherent in its design and could not be fixed without
-      a substantial revision to the kernel. It was marked deprecated with the
-      release of the 2.6 kernel series, and was removed entirely as of version
-      2.6.18.</para>
-
-    </sect3>
-
-    <sect3>
-      <title>Sysfs</title>
-
-      <para>With the development of the unstable 2.5 kernel tree, later released
-      as the 2.6 series of stable kernels, a new virtual filesystem called
-      <systemitem class="filesystem">sysfs</systemitem> came to be. The job of
-      <systemitem class="filesystem">sysfs</systemitem> is to export a view of
-      the system's hardware configuration to userspace processes. Drivers that
-      have been compiled into the kernel directly register their objects with
-      <systemitem class="filesystem">sysfs</systemitem> as they are detected by
-      the kernel. For drivers compiled as modules, this registration will happen
-      when the module is loaded. Once the <systemitem
-      class="filesystem">sysfs</systemitem> filesystem is mounted (on <filename
-      class="directory">/sys</filename>), data which the built-in drivers
-      registered with <systemitem class="filesystem">sysfs</systemitem> are
-      available to userspace processes. With this userspace-visible
-      representation, the possibility of seeing a userspace replacement for
-      <systemitem class="filesystem">devfs</systemitem> became much more
-      realistic.</para>
-
-    </sect3>
-
-    <sect3>
-      <title>Udev Implementation</title>
-
-      <para>Shortly after the introduction of
-      <systemitem class="filesystem">sysfs</systemitem>, work began on a
-      program called Udev to advantage of it. The <command>udev</command>
-      daemon made calls to <function>mknod()</function> to create device nodes
-      in <filename class="directory">/dev</filename> dynamically, based on the
-      information from <systemitem class="filesystem">sysfs</systemitem>, in
-      <filename class="directory">/sys</filename>. For example,
-      <filename>/sys/class/tty/vcs/dev</filename> contains the string
-      <quote>7:0</quote>. This string was used by <command>udev</command>
-      to create a device node with major number <emphasis>7</emphasis> and
-      minor number <emphasis>0</emphasis>.</para>
-
-      <para>Linux kernel version 2.6.32 introduced a new virtual file system
-      called <systemitem class="filesystem">devtmpfs</systemitem>, an improved
-      replacement for <systemitem class="filesystem">devfs</systemitem>. This
-      allows device nodes to once again be dynamically created by the kernel,
-      without many of the problems of
-      <systemitem class="filesystem">devfs</systemitem>. As of version 176,
-      Udev no longer creates device nodes itself, instead relying on
-      <systemitem class="filesystem">devtmpfs</systemitem> to do so.</para>
-
-    </sect3>
-
-    <sect3>
-      <title>Systemd and Eudev</title>
-
-        <para>In 2010, development began on systemd, an alternate
-        <command>init</command> implementation. Starting with Udev 183, Udev's
-        source tree was merged with systemd. Several Gentoo
-        developers who disagreed with this merge announced a project fork
-        called Eudev in December 2012, created by extracting the
-        Udev code from systemd. One of the goals of Eudev is to allow for
-        easier installation and usage of <command>udevd</command> without
-        the need for the rest of systemd.</para>
-    </sect3>
-
-  </sect2>
-
-  <sect2>
-    <title>Device Node Creation</title>
-
-    <para>By default, device nodes created by the kernel in a
-    <systemitem class="filesystem">devtmpfs</systemitem> are owned by
-    <emphasis>root:root</emphasis> and have <emphasis>600</emphasis>
-    permissions. <command>udevd</command> can modify ownership and permissions
-    of the nodes under the <filename class="directory">/dev</filename>
-    directory, and can also create additional symlinks, based on rules
-    specified in the files within the
-    <filename class="directory">/etc/udev/rules.d</filename>,
-    <filename class="directory">/lib/udev/rules.d</filename>,
-    and <filename class="directory">/run/udev/rules.d</filename> directories.
-    The names for these files start with a number, to indicate the order in
-    which they are run, and they have a <filename>.rules</filename>
-    extension (<command>udevd</command> will ignore files with any other
-    extension). All of the rules files from these directories are combined into
-    a single list, sorted by filename, and run in that order. In the event of
-    a conflict, where a rules file with the same name exists in two or more of
-    these directories, the rules in <filename class="directory">/etc</filename>
-    take the highest priority, followed by rules files in
-    <filename class="directory">/run</filename>, and finally
-    <filename class="directory">/lib</filename>. Any device for which a rule
-    cannot be found will just be ignored by <command>udevd</command>
-    and be left at the defaults defined by the kernel, as described above. For
-    more details about writing Udev rules, see
-    <filename><ulink url="/usr/share/doc/systemd-&systemd-version;/udev.html"/></filename>.</para>
-
-  </sect2>
-
-  <sect2>
-    <title>Module Loading</title>
-
-    <para>Device drivers compiled as modules may have aliases built into them.
-    Aliases are visible in the output of the <command>modinfo</command>
-    program and are usually related to the bus-specific identifiers of devices
-    supported by a module. For example, the <emphasis>snd-fm801</emphasis>
-    driver supports PCI devices with vendor ID 0x1319 and device ID 0x0801,
-    and has an alias of <quote>pci:v00001319d00000801sv*sd*bc04sc01i*</quote>.
-    For most devices, the bus driver exports the alias of the driver that
-    would handle the device via <systemitem
-    class="filesystem">sysfs</systemitem>. E.g., the
-    <filename>/sys/bus/pci/devices/0000:00:0d.0/modalias</filename> file
-    might contain the string
-    <quote>pci:v00001319d00000801sv00001319sd00001319bc04sc01i00</quote>.
-    The default rules provided by Udev will cause <command>udevd</command>
-    to call out to <command>/sbin/modprobe</command> with the contents of the
-    <envar>MODALIAS</envar> uevent environment variable (that should be the
-    same as the contents of the <filename>modalias</filename> file in sysfs),
-    thus loading all modules whose aliases match this string after wildcard
-    expansion.</para>
-
-    <para>In this example, this means that, in addition to
-    <emphasis>snd-fm801</emphasis>, the obsolete (and unwanted)
-    <emphasis>forte</emphasis> driver will be loaded if it is
-    available. See below for ways in which the loading of unwanted drivers can
-    be prevented.</para>
-
-    <para>The kernel itself is also able to load modules for network
-    protocols, filesystems and NLS support on demand.</para>
-
-  </sect2>
-
-  <sect2>
-    <title>Problems with Loading Modules and Creating Devices</title>
-
-    <para>There are a few possible problems when it comes to automatically
-    creating device nodes.</para>
-
-    <sect3>
-      <title>A kernel module is not loaded automatically</title>
-
-      <para>Udev will only load a module if it has a bus-specific alias and the
-      bus driver properly exports the necessary aliases to <systemitem
-      class="filesystem">sysfs</systemitem>. In other cases, one should
-      arrange module loading by other means. With Linux-&linux-version2;, Udev
-      is known to load properly-written drivers for INPUT, IDE, PCI, USB, SCSI,
-      SERIO and FireWire devices.</para>
-
-      <para>To determine if the device driver you require has the necessary
-      support for Udev, run <command>modinfo</command> with the module name as
-      the argument.  Now try locating the device directory under
-      <filename class="directory">/sys/bus</filename> and check whether there is
-      a <filename>modalias</filename> file there.</para>
-
-      <para>If the <filename>modalias</filename> file exists in <systemitem
-      class="filesystem">sysfs</systemitem>, the driver supports the device and
-      can talk to it directly, but doesn't have the alias, it is a bug in the
-      driver. Load the driver without the help from Udev and expect the issue
-      to be fixed later.</para>
-
-      <para>If there is no <filename>modalias</filename> file in the relevant
-      directory under <filename class="directory">/sys/bus</filename>, this
-      means that the kernel developers have not yet added modalias support to
-      this bus type. With Linux-&linux-version2;, this is the
-      case with ISA busses. Expect this issue to be fixed in later kernel
-      versions.</para>
-
-      <para>Udev is not intended to load <quote>wrapper</quote> drivers such as
-      <emphasis>snd-pcm-oss</emphasis> and non-hardware drivers such as
-      <emphasis>loop</emphasis> at all.</para>
-
-    </sect3>
-
-    <sect3>
-      <title>A kernel module is not loaded automatically, and Udev is not
-      intended to load it</title>
-
-      <para>If the <quote>wrapper</quote> module only enhances the functionality
-      provided by some other module (e.g., <emphasis>snd-pcm-oss</emphasis>
-      enhances the functionality of <emphasis>snd-pcm</emphasis> by making the
-      sound cards available to OSS applications), configure
-      <command>modprobe</command> to load the wrapper after Udev loads the
-      wrapped module. To do this, add an <quote>install</quote> line to a file
-      in <filename>/etc/modprobe.d</filename>. For example:</para>
-
-<screen role="nodump"><literal>install snd-pcm /sbin/modprobe -i snd-pcm ; \
-    /sbin/modprobe snd-pcm-oss ; true</literal></screen>
-
-      <para>If the module in question is not a wrapper and is useful by itself,
-      configure the <command>S05modules</command> bootscript to load this
-      module on system boot. To do this, add the module name to the
-      <filename>/etc/sysconfig/modules</filename> file on a separate line.
-      This works for wrapper modules too, but is suboptimal in that case.</para>
-
-    </sect3>
-
-    <sect3>
-      <title>Udev loads some unwanted module</title>
-
-      <para>Either don't build the module, or blacklist it in
-      <filename>/etc/modprobe.d</filename> file as done with the
-      <emphasis>forte</emphasis> module in the example below:</para>
-
-<screen role="nodump"><literal>blacklist forte</literal></screen>
-
-      <para>Blacklisted modules can still be loaded manually with the
-      explicit <command>modprobe</command> command.</para>
-
-    </sect3>
-
-    <sect3>
-      <title>Udev makes a wrong symlink</title>
-
-      <para>This usually happens if a rule unexpectedly matches a device. For
-      example, a poorly-written rule can match both a SCSI disk (as desired)
-      and the corresponding SCSI generic device (incorrectly) by vendor.
-      Find the offending rule and make it more specific, with the help of
-      <command>udevadm info</command>.</para>
-
-    </sect3>
-
-    <sect3>
-      <title>Udev rule works unreliably</title>
-
-      <para>This may be another manifestation of the previous problem. If not,
-      and your rule uses <systemitem class="filesystem">sysfs</systemitem>
-      attributes, it may be a kernel timing issue, to be fixed in later kernels.
-      For now, you can work around it by creating a rule that waits for the used
-      <systemitem class="filesystem">sysfs</systemitem> attribute and appending
-      it to the <filename>/etc/udev/rules.d/10-wait_for_sysfs.rules</filename>
-      file. Please notify the CLFS Development list if you do so and it
-      helps.</para>
-
-    </sect3>
-
-    <sect3>
-      <title>Device naming order changes randomly after rebooting</title>
-
-      <para>This is due to the fact that Udev, by design, handles uevents and
-      loads modules in parallel, and thus in an unpredictable order. This will
-      never be <quote>fixed</quote>. You should not rely upon the kernel device
-      names being stable. Instead, create your own rules that make symlinks with
-      stable names based on some stable attributes of the device, such as a
-      serial number or the output of various *_id utilities installed by Udev.
-      See <xref linkend="ch-config-symlinks"/> and
-      <xref linkend="chapter-network"/> for examples.</para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2>
-    <title>Useful Reading</title>
-
-    <para>Additional helpful documentation is available at the following
-    sites:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para remap="verbatim">A Userspace Implementation of <systemitem class="filesystem">devfs</systemitem>
-        <ulink url="http://www.kroah.com/linux/talks/ols_2003_udev_paper/Reprint-Kroah-Hartman-OLS2003.pdf"/></para>
-      </listitem>
-
-      <listitem>
-        <para remap="verbatim">The <systemitem class="filesystem">sysfs</systemitem> Filesystem
-        <ulink url="http://www.kernel.org/pub/linux/kernel/people/mochel/doc/papers/ols-2005/mochel.pdf"/></para>
-      </listitem>
-
-    </itemizedlist>
-
-  </sect2>
-
-</sect1>
Index: OK/system-config/common/usage.xml
===================================================================
--- BOOK/system-config/common/usage.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,151 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-config-usage">
-  <?dbhtml filename="usage.html"?>
-
-  <title>How does Systemd work?</title>
-
-  <indexterm zone="ch-config-usage">
-    <primary sortas="a-systemd">Systemd</primary>
-  <secondary>usage</secondary></indexterm>
-
-  <warning>
-    <para>Please disregard this page until it is complete and verified.</para>
-  </warning>
-
-  <sect2>
-    <title>Introduction to Systemd</title>
-
-
-    <para>Systemd is a system management daemon designed exclusively for the
-    Linux kernel API. In the Linux startup process, it is the first process to
-    execute in user land; therefore, it is also the parent process of all child
-    processes in user land.</para>
-
-    <para>Systemd's initialization instructions for each daemon are recorded in
-    a declarative configuration file rather than a shell script. For
-    inter-process communication, systemd makes Unix domain sockets and D-Bus
-    available to the running daemons. Because systemd tracks processes using
-    Linux cgroups instead of process identifiers (PIDs), daemons cannot "escape"
-    systemd; not even by double-forking. Systemd is also capable of aggressive
-    parallelization.</para>
-
-    <para>Among systemd's auxiliary features are a cron-like job scheduler
-    called systemd Calendar Timers, and an event logging subsystem called
-    journal. The system administrator may choose whether to log system events
-    with systemd or syslog. Systemd's logfile is a binary file. The state of
-    systemd itself can be preserved in a snapshot for future recall.</para>
-
-    <para>Systemd provides a replacement for sysvinit, pm-utils, inetd, acpid,
-    syslog, watchdog, cron and atd, and obsoletes ConsoleKit.</para>
-
-  </sect2>
-
-  <sect2>
-    <title>Systemctl</title>
-
-    <para><command>systemctl</command> is the main command used to introspect
-     and control systemd.</para>
-
-    <variablelist>
-
-      <varlistentry>
-        <term>List running units:</term>
-        <listitem>
-          <para><command>systemctl</command> or <command>systemctl list-units</command></para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>List failed units:</term>
-        <listitem>
-          <para><command>systemctl --failed</command></para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>List available unit files:</term>
-        <listitem>
-          <para><command>systemctl list-unit-files</command></para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>Activate a unit immediately:</term>
-        <listitem>
-          <para><command>systemctl start</command> <replaceable>unit</replaceable></para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>Stop a unit immediately:</term>
-        <listitem>
-          <para><command>systemctl stop </command><replaceable>unit</replaceable></para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>Restart a unit:</term>
-        <listitem>
-          <para><command>systemctl restart </command><replaceable>unit</replaceable></para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>Reload unit configuration:</term>
-        <listitem>
-          <para><command>systemctl reload </command><replaceable>unit</replaceable></para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>Show status of a unit:</term>
-        <listitem>
-          <para><command>systemctl status </command><replaceable>unit</replaceable></para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>Check if a unit is enabled or disabled:</term>
-        <listitem>
-          <para><command>systemctl is-enabled </command><replaceable>unit</replaceable></para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>Enable a unit to start during boot:</term>
-        <listitem>
-          <para><command>systemctl enable </command><replaceable>unit</replaceable></para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>Disable a unit to not start during boot:</term>
-        <listitem>
-          <para><command>systemctl disable </command><replaceable>unit</replaceable></para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>Reload systemd and scan for new or changed units:</term>
-        <listitem>
-          <para><command>systemctl daemon-reload</command></para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para>For more information regarding systemd, please refer to the systemd
-    and related man-pages and
-    <ulink url="https://fedoraproject.org/wiki/Systemd">Systemd at
-    FedoraProject</ulink> for documentation, examples, features, and other
-    information.</para>
-
-  </sect2>
-
-</sect1>
Index: OK/system-config/mips-chapter.xml
===================================================================
--- BOOK/system-config/mips-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,25 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-system-config" xreflabel="System Configuration">
-  <?dbhtml dir="system-config"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>System Configuration</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/clock.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/symlinks.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/profile.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/locale.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/inputrc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
-
-</chapter>
Index: OK/system-config/mips64-64-chapter.xml
===================================================================
--- BOOK/system-config/mips64-64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,25 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-system-config" xreflabel="System Configuration">
-  <?dbhtml dir="system-config"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>System Configuration</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/clock.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/symlinks.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/profile.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/locale.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/inputrc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
-
-</chapter>
Index: OK/system-config/mips64-chapter.xml
===================================================================
--- BOOK/system-config/mips64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,25 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-system-config" xreflabel="System Configuration">
-  <?dbhtml dir="system-config"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>System Configuration</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/clock.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/symlinks.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/profile.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/locale.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/inputrc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
-
-</chapter>
Index: OK/system-config/ppc-chapter.xml
===================================================================
--- BOOK/system-config/ppc-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,25 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-system-config" xreflabel="System Configuration">
-  <?dbhtml dir="system-config"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>System Configuration</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/clock.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/symlinks.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/profile.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/locale.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/inputrc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
-
-</chapter>
Index: OK/system-config/ppc64-64-chapter.xml
===================================================================
--- BOOK/system-config/ppc64-64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,25 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-system-config" xreflabel="System Configuration">
-  <?dbhtml dir="system-config"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>System Configuration</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/clock.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/symlinks.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/profile.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/locale.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/inputrc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
-
-</chapter>
Index: OK/system-config/ppc64-chapter.xml
===================================================================
--- BOOK/system-config/ppc64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,25 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-system-config" xreflabel="System Configuration">
-  <?dbhtml dir="system-config"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>System Configuration</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/clock.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/symlinks.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/profile.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/locale.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/inputrc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
-
-</chapter>
Index: OK/system-config/sparc-chapter.xml
===================================================================
--- BOOK/system-config/sparc-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,25 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-system-config" xreflabel="System Configuration">
-  <?dbhtml dir="system-config"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>System Configuration</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/clock.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/symlinks.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/profile.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/locale.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/inputrc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/fstab.xml"/>
-
-</chapter>
Index: OK/system-config/sparc/fstab.xml
===================================================================
--- BOOK/system-config/sparc/fstab.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,44 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-config-fstab">
-  <?dbhtml filename="fstab.html"?>
-
-  <title>Creating the /etc/fstab File</title>
-
-  <indexterm zone="ch-config-fstab">
-    <primary sortas="e-/etc/fstab">/etc/fstab</primary>
-    <secondary>system config</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/fstab.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-<screen><userinput>cat &gt; /etc/fstab &lt;&lt; "EOF"
-<literal># Begin /etc/fstab
-
-# file system  mount-point     type        options          dump  fsck
-#                                                                 order
-
-/dev/<replaceable>[xxx]</replaceable>     /               <replaceable>[fff]</replaceable>       defaults         1     1
-/dev/<replaceable>[yyy]</replaceable>     swap            swap        pri=1            0     0
-proc           /proc           proc        defaults         0     0
-sysfs          /sys            sysfs       defaults         0     0
-devpts         /dev/pts        devpts      gid=&gid-tty;,mode=620  0     0
-shm            /dev/shm        tmpfs       defaults         0     0
-tmpfs          /run            tmpfs       defaults         0     0
-devtmpfs       /dev            devtmpfs    mode=0755,nosuid 0     0
-none           /proc/openprom  openpromfs  defaults         0     0
-# End /etc/fstab</literal>
-EOF</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/fstab.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
-</sect1>
Index: OK/system-config/sparc64-64-chapter.xml
===================================================================
--- BOOK/system-config/sparc64-64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,25 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-system-config" xreflabel="System Configuration">
-  <?dbhtml dir="system-config"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>System Configuration</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/clock.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/symlinks.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/profile.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/locale.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/inputrc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/fstab.xml"/>
-
-</chapter>
Index: OK/system-config/sparc64-chapter.xml
===================================================================
--- BOOK/system-config/sparc64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,25 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-system-config" xreflabel="System Configuration">
-  <?dbhtml dir="system-config"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>System Configuration</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/clock.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/symlinks.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/profile.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/locale.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/inputrc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/fstab.xml"/>
-
-</chapter>
Index: OK/system-config/x86-chapter.xml
===================================================================
--- BOOK/system-config/x86-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,25 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-system-config" xreflabel="System Configuration">
-  <?dbhtml dir="system-config"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>System Configuration</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/clock.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/symlinks.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/profile.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/locale.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/inputrc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
-
-</chapter>
Index: OK/system-config/x86_64-64-chapter.xml
===================================================================
--- BOOK/system-config/x86_64-64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,25 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-system-config" xreflabel="System Configuration">
-  <?dbhtml dir="system-config"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>System Configuration</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/clock.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/symlinks.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/profile.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/locale.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/inputrc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
-
-</chapter>
Index: OK/system-config/x86_64-chapter.xml
===================================================================
--- BOOK/system-config/x86_64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,25 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-system-config" xreflabel="System Configuration">
-  <?dbhtml dir="system-config"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>System Configuration</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/clock.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/symlinks.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/profile.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/locale.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/inputrc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
-
-</chapter>
Index: OK/temp-system/64/binutils.xml
===================================================================
--- BOOK/temp-system/64/binutils.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,91 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-binutils" role="wrap">
-  <?dbhtml filename="binutils.html"?>
-
-  <title>Binutils-&binutils-version;</title>
-
-  <indexterm zone="ch-temp-system-binutils">
-    <primary sortas="a-Binutils">Binutils</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/binutils.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Binutils</title>
-
-<!-- Branch update patch area
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/binutils.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/binutils.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-<screen os="j"><userinput>../binutils-&binutils-dir;/configure \
-    --prefix=/tools \
-    --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET} \
-    --target=${CLFS_TARGET} \
-    --with-lib-path=/tools/lib \
-    --disable-nls \
-    --enable-shared \
-    --enable-64-bit-bfd \
-    --disable-multilib \
-    --enable-gold=yes \
-    --enable-plugins \
-    --with-system-zlib \
-    --enable-threads</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='be'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='bf'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='bh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='bi'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-binutils" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/64/gcc.xml
===================================================================
--- BOOK/temp-system/64/gcc.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,118 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-gcc" role="wrap">
-  <?dbhtml filename="gcc.html"?>
-
-  <title>GCC-&gcc-version;</title>
-
-  <indexterm zone="ch-temp-system-gcc">
-    <primary sortas="a-GCC">GCC</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GCC</title>
-
-<!--GCC Branch Update Area
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ag'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ah'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='fix1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='fix2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-<screen os="ck"><userinput>../gcc-&gcc-version;/configure \
-    --prefix=/tools \
-    --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET} \
-    --target=${CLFS_TARGET} \
-    --with-local-prefix=/tools \
-    --disable-multilib \
-    --enable-languages=c,c++ \
-    --with-system-zlib \
-    --with-native-system-header-dir=/tools/include \
-    --disable-libssp \
-    --enable-install-libiberty</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cl'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cm'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cn'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='co'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cp'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/64/variables.xml
===================================================================
--- BOOK/temp-system/64/variables.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,47 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-variables">
-  <?dbhtml filename="variables.html"?>
-
-  <title>Build Variables</title>
-
-  <para>Setup target-specific variables for the compiler
-  and linkers:</para>
-
-<screen><userinput>export CC="${CLFS_TARGET}-gcc ${BUILD64}"
-export CXX="${CLFS_TARGET}-g++ ${BUILD64}"
-export AR="${CLFS_TARGET}-ar"
-export AS="${CLFS_TARGET}-as"
-export RANLIB="${CLFS_TARGET}-ranlib"
-export LD="${CLFS_TARGET}-ld"
-export STRIP="${CLFS_TARGET}-strip"</userinput></screen>
-
-    <variablelist os="ca">
-      <title>The meaning of the new configure options:</title>
-
-      <varlistentry os="dd1">
-        <term><parameter>CXX="${CXX} ${BUILD64}"</parameter></term>
-        <listitem>
-          <para>This forces the C++ compiler to use our 64 Bit flags.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  <para>Then add the build variables to <filename>~/.bashrc</filename> to
-  prevent issues if you stop and come back later:</para>
-
-<screen><userinput>echo export CC=\""${CC}\"" &gt;&gt; ~/.bashrc
-echo export CXX=\""${CXX}\"" &gt;&gt; ~/.bashrc
-echo export AR=\""${AR}\"" &gt;&gt; ~/.bashrc
-echo export AS=\""${AS}\"" &gt;&gt; ~/.bashrc
-echo export RANLIB=\""${RANLIB}\"" &gt;&gt; ~/.bashrc
-echo export LD=\""${LD}\"" &gt;&gt; ~/.bashrc
-echo export STRIP=\""${STRIP}\"" &gt;&gt; ~/.bashrc</userinput></screen>
-
-</sect1>
Index: OK/temp-system/common/bash.xml
===================================================================
--- BOOK/temp-system/common/bash.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,106 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-bash" role="wrap">
-  <?dbhtml filename="bash.html"?>
-
-  <title>Bash-&bash-version;</title>
-
-  <indexterm zone="ch-temp-system-bash">
-    <primary sortas="a-Bash">Bash</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/bash.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Bash</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/bash.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/bash.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <para os="t1">When Bash is cross-compiled, it cannot test for the presence
-    of named pipes, among other things. If you used <command>su</command> to
-    become an unprivileged user, this combination will cause Bash to build
-    without <emphasis>process substitution</emphasis>, which will break one
-    of the C++ test scripts in <literal>glibc</literal>. The following prevents
-    future problems by skipping the check for named pipes, as well as other
-    tests that can not run while cross-compiling or that do not run properly:</para>
-
-<screen os="t2"><userinput>cat &gt; config.cache &lt;&lt; "EOF"
-ac_cv_func_mmap_fixed_mapped=yes
-ac_cv_func_strcoll_works=yes
-ac_cv_func_working_mktime=yes
-bash_cv_func_sigsetjmp=present
-bash_cv_getcwd_malloc=yes
-bash_cv_job_control_missing=present
-bash_cv_printf_a_format=yes
-bash_cv_sys_named_pipes=present
-bash_cv_ulimit_maxfds=yes
-bash_cv_under_sys_siglist=yes
-bash_cv_unusable_rtsigs=no
-gt_cv_int_divbyzero_sigfpe=yes
-EOF</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/bash.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>./configure \
-    --prefix=/tools \
-    --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET} \
-    --without-bash-malloc \
-    --cache-file=config.cache</userinput></screen>
-
-    <variablelist os="c">
-      <title>The meaning of the new configure option:</title>
-
-      <varlistentry>
-        <term><parameter>--without-bash-malloc</parameter></term>
-        <listitem>
-          <para>This option turns off the use of Bash's memory allocation
-          (malloc) function which is known to cause segmentation faults.
-          By turning this option off, Bash will use the malloc functions
-          from Glibc which are more stable.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/bash.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/bash.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/bash.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-<screen os="h"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-bash" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/common/binutils.xml
===================================================================
--- BOOK/temp-system/common/binutils.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,101 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-binutils" role="wrap">
-  <?dbhtml filename="binutils.html"?>
-
-  <title>Binutils-&binutils-version;</title>
-
-  <indexterm zone="ch-temp-system-binutils">
-    <primary sortas="a-Binutils">Binutils</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/binutils.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Binutils</title>
-
-<!-- Branch update patch area
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/binutils.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/binutils.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/binutils.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/binutils.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/binutils.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-<screen os="j"><userinput>../binutils-&binutils-dir;/configure \
-    --prefix=/tools \
-    --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET} \
-    --target=${CLFS_TARGET} \
-    --with-lib-path=/tools/lib \
-    --disable-nls \
-    --enable-shared \
-    --disable-multilib \
-    --enable-gold=yes \
-    --enable-plugins \
-    --with-system-zlib \
-    --enable-threads</userinput></screen>
-
-    <variablelist os="k">
-      <title>The meaning of the new configure option:</title>
-
-      <varlistentry>
-        <term><parameter>--enable-shared</parameter></term>
-        <listitem>
-          <para>When this is specified, Binutils will create a shared
-          <filename class="libraryfile">libbfd</filename> and link its programs
-          to it.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/common/binutils.xml"
-    xpointer="xpointer(//*[@os='be'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/common/binutils.xml"
-    xpointer="xpointer(//*[@os='bf'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/common/binutils.xml"
-    xpointer="xpointer(//*[@os='bh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/common/binutils.xml"
-    xpointer="xpointer(//*[@os='bi'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-binutils" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/common/bison.xml
===================================================================
--- BOOK/temp-system/common/bison.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,67 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-bison" role="wrap">
-  <?dbhtml filename="bison.html"?>
-
-  <title>Bison-&bison-version;</title>
-
-  <indexterm zone="ch-temp-system-bison">
-    <primary sortas="a-Bison">Bison</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/bison.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Bison</title>
-
-    <para os='s1'>Apply a <command>sed</command> which disables the building of <filename>bison.help</filename> when cross-compiling.</para>
-
-<screen os='s2'><userinput>cp -v Makefile.in{,.orig}
-sed '/bison.help:/s/^/# /' Makefile.in.orig &gt; Makefile.in</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/bison.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="ca"><userinput>M4=m4 \
-./configure \
-    --prefix=/tools \
-    --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET} \
-    --cache-file=config.cache</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/bison.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/bison.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/bison.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/bison.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-bison" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/common/bzip2.xml
===================================================================
--- BOOK/temp-system/common/bzip2.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,52 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-bzip2" role="wrap">
-  <?dbhtml filename="bzip2.html"?>
-
-  <title>Bzip2-&bzip2-version;</title>
-
-  <indexterm zone="ch-temp-system-bzip2">
-    <primary sortas="a-Bzip2">Bzip2</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/bzip2.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Bzip2</title>
-
-    <para os="ca">Bzip2's default <filename>Makefile</filename> target
-    automatically runs the test suite as well. Disable the tests since they
-    won't work on a multi-architecture build:</para>
-
-<screen os="cb"><userinput>cp -v Makefile{,.orig}
-sed -e '/^all/s/ test$//' Makefile.orig &gt; Makefile</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/bzip2.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="cc"><userinput>make CC="${CC}" AR="${AR}" RANLIB="${RANLIB}"</userinput></screen>
-
-    <para os="cd">Install the package:</para>
-
-<screen os="ce"><userinput>make PREFIX=/tools install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-bzip2" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/common/check.xml
===================================================================
--- BOOK/temp-system/common/check.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,92 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-check" role="wrap">
-  <?dbhtml filename="check.html"?>
-
-  <title>Check-&check-version;</title>
-
-  <indexterm zone="ch-temp-system-check">
-    <primary sortas="a-Check">Check</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Check package is a unit testing framework for C.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Check</title>
-
-    <para os="a">We will install Check into
-    <filename class="directory">/tools</filename> to satisfy a dependency
-    on it for Kbd and Libpipeline in the final system.</para>
-
-    <para os="c">Prepare Check for compilation:</para>
-
-<screen os="d"><userinput>./configure \
-    --prefix=/tools \
-    --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET}</userinput></screen>
-
-    <para os="f">Build the package:</para>
-
-<screen os="g"><userinput>make</userinput></screen>
-
-    <para os="i">Install the package:</para>
-
-<screen os="j"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-check" role="content">
-    <title>Contents of Check</title>
-
-    <segmentedlist>
-      <segtitle>Installed program</segtitle>
-      <segtitle>Installed library</segtitle>
-
-      <seglistitem>
-        <seg>checkmk</seg>
-        <seg>libcheck.{a,so}</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="checkmk">
-        <term><command>checkmk</command></term>
-        <listitem>
-          <para>Awk script for generating C unit tests for use with the C the
-          Check unit testing framework</para>
-          <indexterm zone="ch-temp-system-check checkmk">
-            <primary sortas="b-check">checkmk</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcheck">
-        <term><filename class="libraryfile">libcheck.{a,so}</filename></term>
-        <listitem>
-          <para>Contains functions that allow Check to be called from a test
-          program</para>
-          <indexterm zone="ch-temp-system-check libcheck">
-            <primary sortas="c-libcheck">libcheck.{a,so}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/common/choose.xml
===================================================================
--- BOOK/temp-system/common/choose.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-choose">
-  <?dbhtml filename="choose.html"?>
-
-  <title>To Boot or to Chroot?</title>
-
-  <para os="a">There are two different ways you can proceed from this point
-  to build the final system. You can build a kernel, a bootloader, and
-  a few other utilities, boot into the temporary system, and build the
-  rest there. Alternatively, you can mount a few virtual filesystems and
-  chroot into the temporary system.</para>
-
-  <para os="b">The <command>chroot</command> (change root) program is used to
-  enter a virtual environment and start a new shell whose root directory will
-  be set to the CLFS partition. This is very similar to rebooting and
-  instructing the kernel to mount the CLFS partition as the root partition.
-  The major advantage is that <quote>chrooting</quote> allows the builder to
-  continue using the host while CLFS is being built. While waiting for package
-  compilation to complete, a user can switch to a different virtual console
-  (VC) or X desktop and continue using the computer as normal.</para>
-
-  <!-- We also describe some alternative booting methods in <xref linkend="ch-boot-whatnext"/> -->
-
-  <para os="c">The main downside to chrooting is that you are more limited in
-  when you can use it - booting will always work for any CLFS build, but the
-  chroot method can only be used when you are building on the same
-  architecture. For example, if you are building on, and for, an x86 system,
-  you can simply chroot. Booting is required when you are compiling for a
-  different architecture, such as building a PowerPC system from an x86. The
-  rule of thumb here is that if the architectures match and you are running
-  the same series kernel (specifically, a &glibc-kernel-version; or newer
-  Linux kernel) you can just chroot. If you aren't running the same series
-  kernel, or are wanting to run a different ABI, you will need to use the boot
-  option.</para>
-
-  <para os="d">If you are in any doubt about this, you can try the following
-  commands to see if you can chroot:</para>
-
-<screen os="e"><userinput>/tools/lib/libc.so.6
-/tools/bin/gcc -v</userinput></screen>
-
-  <para os="f">If either of these commands fail, you will have to follow the
-  boot method.</para>
-
-  <para os="g">For the boot method, follow <xref linkend="chapter-boot"/>.</para>
-
-  <para os="h">For the chroot method, follow <xref linkend="chapter-chroot"/>.</para>
-
-</sect1>
Index: OK/temp-system/common/coreutils.xml
===================================================================
--- BOOK/temp-system/common/coreutils.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,69 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-coreutils" role="wrap">
-  <?dbhtml filename="coreutils.html"?>
-
-  <title>Coreutils-&coreutils-version;</title>
-
-  <indexterm zone="ch-temp-system-coreutils">
-    <primary sortas="a-Coreutils">Coreutils</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/coreutils.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Coreutils</title>
-
-    <para os="bd">Prepare Coreutils for compilation:</para>
-
-<screen os="be"><userinput>./configure \
-    --prefix=/tools \
-    --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET} \
-    --enable-install-program=hostname \
-    --cache-file=config.cache</userinput></screen>
-
-    <variablelist os="be1">
-      <title>The meaning of the new configure option:</title>
-
-      <varlistentry>
-        <term><parameter>--enable-install-program=hostname</parameter></term>
-        <listitem>
-          <para>Tells Coreutils to install <command>hostname</command>,
-          which is needed for the Perl test suite.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-   <para os="s1">Adjust the Makefile so man pages aren't generated:</para>
-
-<screen os="s2"><userinput>sed -i -e 's/^man1_MANS/#man1_MANS/' Makefile</userinput></screen>
-
-   <para os="bf">Compile the package:</para>
-
-<screen os="bg"><userinput>make</userinput></screen>
-
-    <para os="bh">Install the package:</para>
-
-<screen os="bi"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-coreutils" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/common/diffutils.xml
===================================================================
--- BOOK/temp-system/common/diffutils.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,50 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-diffutils" role="wrap">
-  <?dbhtml filename="diffutils.html"?>
-
-  <title>Diffutils-&diffutils-version;</title>
-
-  <indexterm zone="ch-temp-system-diffutils">
-    <primary sortas="a-Diffutils">Diffutils</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/diffutils.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Diffutils</title>
-
-    <para os="a">Prepare Diffutils for compilation:</para>
-
-<screen os="b"><userinput>./configure \
-    --prefix=/tools \
-    --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET}</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">Install the package:</para>
-
-<screen os="f"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-diffutils" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/common/file.xml
===================================================================
--- BOOK/temp-system/common/file.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,50 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-file" role="wrap">
-  <?dbhtml filename="file.html"?>
-
-  <title>File-&file-version;</title>
-
-  <indexterm zone="ch-temp-system-file">
-    <primary sortas="a-File">File</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/file.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of File</title>
-
-    <para os="a">Prepare File for compilation:</para>
-
-<screen os="b"><userinput>./configure \
-    --prefix=/tools \
-    --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET}</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="f">Install the package:</para>
-
-<screen os="g"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-file" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/common/findutils.xml
===================================================================
--- BOOK/temp-system/common/findutils.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,67 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-findutils" role="wrap">
-  <?dbhtml filename="findutils.html"?>
-
-  <title>Findutils-&findutils-version;</title>
-
-  <indexterm zone="ch-temp-system-findutils">
-    <primary sortas="a-Findutils">Findutils</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/findutils.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Findutils</title>
-
-    <para os="t1">The following cache entries set the values for tests that do
-    not run while cross-compiling:</para>
-
-<screen os="t2"><userinput>echo "gl_cv_func_wcwidth_works=yes" &gt; config.cache
-echo "ac_cv_func_fnmatch_gnu=yes" &gt;&gt; config.cache</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/findutils.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="ac"><userinput>./configure \
-    --prefix=/tools \
-    --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET} \
-    --cache-file=config.cache</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/findutils.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/findutils.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/findutils.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/findutils.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-findutils" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/common/flex.xml
===================================================================
--- BOOK/temp-system/common/flex.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,70 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-flex" role="wrap">
-  <?dbhtml filename="flex.html"?>
-
-  <title>Flex-&flex-version;</title>
-
-  <indexterm zone="ch-temp-system-flex">
-    <primary sortas="a-Flex">Flex</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/flex.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Flex</title>
-
-    <para os="t3">When cross compiling, the <command>configure</command>
-    script does not determine the correct values for the following.
-    Set the values manually:</para>
-
-<screen os="t4"><userinput>cat &gt; config.cache &lt;&lt; EOF
-ac_cv_func_malloc_0_nonnull=yes
-ac_cv_func_realloc_0_nonnull=yes
-EOF</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/flex.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="cb"><userinput>M4=m4 ./configure \
-    --prefix=/tools \
-    --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET} \
-    --cache-file=config.cache</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/flex.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/flex.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/flex.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/flex.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-flex" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/common/gawk.xml
===================================================================
--- BOOK/temp-system/common/gawk.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,50 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-gawk" role="wrap">
-  <?dbhtml filename="gawk.html"?>
-
-  <title>Gawk-&gawk-version;</title>
-
-  <indexterm zone="ch-temp-system-gawk">
-    <primary sortas="a-Gawk">Gawk</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/gawk.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Gawk</title>
-
-    <para os="a">Prepare Gawk for compilation:</para>
-
-<screen os="b"><userinput>./configure \
-    --prefix=/tools \
-    --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET}</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">Install the package:</para>
-
-<screen os="f"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gawk" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/common/gcc.xml
===================================================================
--- BOOK/temp-system/common/gcc.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,120 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-gcc" role="wrap">
-  <?dbhtml filename="gcc.html"?>
-
-  <title>GCC-&gcc-version;</title>
-
-  <indexterm zone="ch-temp-system-gcc">
-    <primary sortas="a-GCC">GCC</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GCC</title>
-
-<!--GCC Branch Update Area
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ag'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ah'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='fix1'])"/>
-
-<screen os="fix2"><userinput>cp -v gcc/Makefile.in{,.orig}
-sed 's@\./fixinc\.sh@-c true@' gcc/Makefile.in.orig &gt; gcc/Makefile.in</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <para os="cj">Before starting to build GCC, remember to unset any environment
-    variables that override the default optimization flags.</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-<screen os="ck"><userinput>../gcc-&gcc-version;/configure \
-    --prefix=/tools \
-    --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET} \
-    --target=${CLFS_TARGET} \
-    --with-local-prefix=/tools \
-    --disable-multilib \
-    --enable-languages=c,c++ \
-    --with-system-zlib \
-    --with-native-system-header-dir=/tools/include \
-    --disable-libssp \
-    --enable-install-libiberty</userinput></screen>
-
-    <variablelist os="cl">
-      <title>The meaning of the new configure option:</title>
-
-      <varlistentry os="cl1">
-        <term><parameter>--enable-install-libiberty</parameter></term>
-        <listitem>
-          <para>Allows GCC to build and install
-          <filename class="libraryfile">libiberty.a</filename>
-          and its associated headers. This library is needed for some packages
-          to compile.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para os="cm">Compile the package:</para>
-
-<screen os="cn"><userinput>make AS_FOR_TARGET="${AS}" \
-    LD_FOR_TARGET="${LD}"</userinput></screen>
-
-    <para os="co">Install the package:</para>
-
-<screen os="cp"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/common/gettext.xml
===================================================================
--- BOOK/temp-system/common/gettext.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,80 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-gettext" role="wrap">
-  <?dbhtml filename="gettext.html"?>
-
-  <title>Gettext-&gettext-version;</title>
-
-  <indexterm zone="ch-temp-system-gettext">
-    <primary sortas="a-Gettext">Gettext</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/gettext.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Gettext</title>
-
-    <para os="i">Many packages' installation procedures use the
-    <command>msgfmt</command> program for i18n support, so we will compile
-    and install it into <filename class="directory">/tools</filename>.
-    Attr also needs <command>msgmerge</command> and <command>xgettext</command>,
-    so we will install those as well.</para>
-
-    <para os="a">Only the programs in the
-    <filename class="directory">gettext-tools</filename> directory need to be
-    installed for the temp-system:</para>
-
-<screen os="b"><userinput>cd gettext-tools</userinput></screen>
-
-    <para os="c">Prepare Gettext for compilation:</para>
-
-<screen os="d"><userinput>EMACS="no" \
-./configure \
-    --prefix=/tools \
-    --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET} \
-    --disable-shared</userinput></screen>
-
-    <variablelist os="e">
-      <title>The meaning of the new configure options:</title>
-
-      <varlistentry>
-        <term><parameter>EMACS="no"</parameter></term>
-        <listitem>
-          <para>Prevents the configure script from installing Emacs Lisp files
-          as the test is known to hang on some hosts.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para os="f">Compile the required programs and support library:</para>
-
-<screen os="g"><userinput>make -C gnulib-lib
-make -C intl pluralx.c
-make -C src msgfmt msgmerge xgettext</userinput></screen>
-
-    <para os="h">Install the <command>msgfmt</command>,
-    <command>msgmerge</command> and <command>xgettext</command> binaries:</para>
-
-<screen os="i"><userinput>cp -v src/{msgfmt,msgmerge,xgettext} /tools/bin</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gettext" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/common/gmp.xml
===================================================================
--- BOOK/temp-system/common/gmp.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,80 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-gmp" role="wrap">
-  <?dbhtml filename="gmp.html"?>
-
-  <title>GMP-&gmp-version;</title>
-
-  <indexterm zone="ch-temp-system-gmp">
-    <primary sortas="a-GMP">GMP</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/gmp.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GMP</title>
-
-<!--
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gmp.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gmp.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <para os="a">As with the Cross-Tools, we will compile GMP, MPFR, MPC, and
-    ISL so that GCC can use them, though this time we will
-    cross-compile them into <filename class="directory">/tools</filename>.</para>
-
-    <para os="b">Prepare GMP for compilation:</para>
-
-<screen os="c"><userinput>CC_FOR_BUILD=gcc \
-./configure \
-    --prefix=/tools \
-    --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET} \
-    --enable-cxx</userinput></screen>
-
-    <variablelist os="ca">
-      <title>The meaning of the new configure option:</title>
-
-      <varlistentry os="ca1">
-        <term><parameter>CC_FOR_BUILD=gcc</parameter></term>
-        <listitem>
-          <para>Tells <command>configure</command> to use the host's
-          <command>gcc</command> instead of our cross-compiler to build
-          native tools it needs while compiling.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para os="d">Compile the package:</para>
-
-<screen os="e"><userinput>make</userinput></screen>
-
-    <para os="f">Install the package:</para>
-
-<screen os="g"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gmp" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/common/grep.xml
===================================================================
--- BOOK/temp-system/common/grep.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,76 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-grep" role="wrap">
-  <?dbhtml filename="grep.html"?>
-
-  <title>Grep-&grep-version;</title>
-
-  <indexterm zone="ch-temp-system-grep">
-    <primary sortas="a-Grep">Grep</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/grep.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Grep</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/grep.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="ca"><userinput>./configure \
-    --prefix=/tools \
-    --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET} \
-    --without-included-regex</userinput></screen>
-
-    <variablelist os="cb">
-      <title>The meaning of the new configure option:</title>
-
-      <varlistentry>
-        <term><parameter>--without-included-regex</parameter></term>
-        <listitem>
-          <para>When cross-compiling, Grep's <command>configure</command>
-          assumes there is no usable <filename>regex.h</filename> installed and
-          instead uses the one included with Grep. This switch forces the use of
-          the regex functions from Glibc.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/grep.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/grep.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/grep.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/grep.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-grep" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/common/gzip.xml
===================================================================
--- BOOK/temp-system/common/gzip.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,60 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-gzip" role="wrap">
-  <?dbhtml filename="gzip.html"?>
-
-  <title>Gzip-&gzip-version;</title>
-
-  <indexterm zone="ch-temp-system-gzip">
-    <primary sortas="a-Gzip">Gzip</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/gzip.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Gzip</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gzip.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>./configure \
-    --prefix=/tools \
-    --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET}</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gzip.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gzip.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gzip.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gzip.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gzip" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/common/introduction.xml
===================================================================
--- BOOK/temp-system/common/introduction.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,43 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-introduction">
-  <?dbhtml filename="introduction.html"?>
-
-  <title>Introduction</title>
-
-  <para>This chapter shows how to compile and install a minimal Linux
-  system. This system will contain just enough tools to start
-  constructing the final CLFS system in <xref
-  linkend="chapter-building-system"/> and allow a working environment
-  with more user convenience than a minimum environment would.</para>
-
-  <para>The tools in this chapter are cross-compiled using the toolchain in
-  <filename class="directory">/cross-tools</filename> and will be installed under the
-  <filename class="directory">${CLFS}/tools</filename> directory to keep
-  them separate from the files installed in <xref
-  linkend="chapter-building-system"/> and the host production directories.
-  Since the packages compiled here are temporary, we do not want them to
-  pollute the soon-to-be CLFS system.</para>
-
-  <para>Check one last time that the <envar>CLFS</envar> environment
-  variable is set up properly:</para>
-
-<screen><userinput>echo ${CLFS}</userinput></screen>
-
-  <para>Make sure the output shows the path to the CLFS partition's mount
-  point, which is <filename class="directory">/mnt/clfs</filename>, using
-  our example.</para>
-
-  <para>During this section of the build you will see several WARNING
-  messages like the ones below. It is safe to ignore these messages.</para>
-
-<screen><computeroutput>configure: WARNING: result yes guessed because of cross compilation
-configure: WARNING: cannot check WCONTINUED if cross compiling -- defaulting to no</computeroutput></screen>
-
-
-</sect1>
Index: OK/temp-system/common/isl.xml
===================================================================
--- BOOK/temp-system/common/isl.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,50 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-isl" role="wrap">
-  <?dbhtml filename="isl.html"?>
-
-  <title>ISL-&isl-version;</title>
-
-  <indexterm zone="ch-temp-system-isl">
-    <primary sortas="a-ISL">ISL</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/isl.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of ISL</title>
-
-    <para os="a">Prepare ISL for compilation:</para>
-
-<screen os="b"><userinput>./configure \
-    --prefix=/tools \
-    --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET}</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">Install the package:</para>
-
-<screen os="f"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-isl" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/common/m4.xml
===================================================================
--- BOOK/temp-system/common/m4.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,66 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-m4" role="wrap">
-  <?dbhtml filename="m4.html"?>
-
-  <title>M4-&m4-version;</title>
-
-  <indexterm zone="ch-temp-system-m4">
-    <primary sortas="a-M4">M4</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/m4.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of M4</title>
-
-    <para os="cc1">Configure can not properly determine the results of the
-    following tests:</para>
-
-<screen os="cc2"><userinput>cat &gt; config.cache &lt;&lt; EOF
-gl_cv_func_btowc_eof=yes
-gl_cv_func_mbrtowc_incomplete_state=yes
-gl_cv_func_mbrtowc_sanitycheck=yes
-gl_cv_func_mbrtowc_null_arg1=yes
-gl_cv_func_mbrtowc_null_arg2=yes
-gl_cv_func_mbrtowc_retval=yes
-gl_cv_func_mbrtowc_nul_retval=yes
-gl_cv_func_wcrtomb_retval=yes
-gl_cv_func_wctob_works=yes
-EOF</userinput></screen>
-
-    <para os="a">Prepare M4 for compilation:</para>
-
-<screen os="b"><userinput>./configure \
-    --prefix=/tools \
-    --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET} \
-    --cache-file=config.cache</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">Install the package:</para>
-
-<screen os="f"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-m4" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/common/make.xml
===================================================================
--- BOOK/temp-system/common/make.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,60 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-make" role="wrap">
-  <?dbhtml filename="make.html"?>
-
-  <title>Make-&make-version;</title>
-
-  <indexterm zone="ch-temp-system-make">
-    <primary sortas="a-Make">Make</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/make.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Make</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/make.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="aa"><userinput>./configure \
-    --prefix=/tools \
-    --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET}</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/make.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/make.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/make.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/make.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-make" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/common/mpc.xml
===================================================================
--- BOOK/temp-system/common/mpc.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,50 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-mpc" role="wrap">
-  <?dbhtml filename="mpc.html"?>
-
-  <title>MPC-&mpc-version;</title>
-
-  <indexterm zone="ch-temp-system-mpc">
-    <primary sortas="a-MPC">MPC</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/mpc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of MPC</title>
-
-    <para os="a">Prepare MPC for compilation:</para>
-
-<screen os="b"><userinput>./configure \
-    --prefix=/tools \
-    --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET}</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">Install the package:</para>
-
-<screen os="f"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-mpc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/common/mpfr.xml
===================================================================
--- BOOK/temp-system/common/mpfr.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,58 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-mpfr" role="wrap">
-  <?dbhtml filename="mpfr.html"?>
-
-  <title>MPFR-&mpfr-version;</title>
-
-  <indexterm zone="ch-temp-system-mpfr">
-    <primary sortas="a-MPFR">MPFR</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/mpfr.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of MPFR</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/mpfr.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/mpfr.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <para os="a">Prepare MPFR for compilation:</para>
-
-<screen os="b"><userinput>./configure \
-    --prefix=/tools \
-    --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET}</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">Install the package:</para>
-
-<screen os="f"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-mpfr" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/common/ncurses.xml
===================================================================
--- BOOK/temp-system/common/ncurses.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,114 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-ncurses" role="wrap">
-  <?dbhtml filename="ncurses.html"?>
-
-  <title>Ncurses-&ncurses-version;</title>
-
-  <indexterm zone="ch-temp-system-ncurses">
-    <primary sortas="a-Ncurses">Ncurses</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/ncurses.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Ncurses</title>
-
-    <para os="h">We will need Ncurses for several other packages in the
-    temporary environment, including Bash, Util-linux, and Vim.</para>
-
-<!--Ncurses Branch Update Area
-    <para os="p1">The following patch fixes an issue with some Bash versions:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&ncurses-bashfix-patch;</userinput></screen>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/ncurses.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>./configure \
-    --prefix=/tools \
-    --with-shared \
-    --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET} \
-    --without-debug \
-    --without-ada \
-    --enable-overwrite \
-    --with-build-cc=gcc</userinput></screen>
-
-    <variablelist os="c">
-      <title>The meaning of the new configure options:</title>
-
-      <varlistentry>
-        <term><parameter>--with-shared</parameter></term>
-        <listitem>
-          <para>This tells Ncurses to create a shared library.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--without-ada</parameter></term>
-        <listitem>
-          <para>This ensures that Ncurses does not build support for the
-          Ada compiler which may be present on the host but will not be
-          available when building the final system.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--enable-overwrite</parameter></term>
-        <listitem>
-          <para>This tells Ncurses to install its header files into
-          <filename class="directory">/tools/include</filename>, instead of
-          <filename class="directory">/tools/include/ncurses</filename>, to
-          ensure that other packages can find the Ncurses headers
-          successfully.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--with-build-cc=gcc</parameter></term>
-        <listitem>
-          <para>This tells Ncurses which compiler to use to build native tools
-          when cross-compiling.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/ncurses.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/ncurses.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/ncurses.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/ncurses.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-ncurses" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/common/patch.xml
===================================================================
--- BOOK/temp-system/common/patch.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,50 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-patch" role="wrap">
-  <?dbhtml filename="patch.html"?>
-
-  <title>Patch-&patch-version;</title>
-
-  <indexterm zone="ch-temp-system-patch">
-    <primary sortas="a-Patch">Patch</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/patch.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Patch</title>
-
-    <para os="a">Prepare Patch for compilation:</para>
-
-<screen os="b"><userinput>./configure \
-    --prefix=/tools \
-    --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET}</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">Install the package:</para>
-
-<screen os="f"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-patch" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/common/sed.xml
===================================================================
--- BOOK/temp-system/common/sed.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,50 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-sed" role="wrap">
-  <?dbhtml filename="sed.html"?>
-
-  <title>Sed-&sed-version;</title>
-
-  <indexterm zone="ch-temp-system-sed">
-    <primary sortas="a-Sed">Sed</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/sed.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Sed</title>
-
-    <para os="a">Prepare Sed for compilation:</para>
-
-<screen os="b"><userinput>./configure \
-    --prefix=/tools \
-    --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET}</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">Install the package:</para>
-
-<screen os="f"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-sed" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/common/tar.xml
===================================================================
--- BOOK/temp-system/common/tar.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,76 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-tar" role="wrap">
-  <?dbhtml filename="tar.html"?>
-
-  <title>Tar-&tar-version;</title>
-
-  <indexterm zone="ch-temp-system-tar">
-    <primary sortas="a-Tar">Tar</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/tar.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Tar</title>
-
-    <para os="c1">Configure can not properly determine the results of a few
-    tests. Set them manually:</para>
-
-<screen os="c2"><userinput>cat &gt; config.cache &lt;&lt; EOF
-gl_cv_func_wcwidth_works=yes
-gl_cv_func_btowc_eof=yes
-ac_cv_func_malloc_0_nonnull=yes
-gl_cv_func_mbrtowc_incomplete_state=yes
-gl_cv_func_mbrtowc_nul_retval=yes
-gl_cv_func_mbrtowc_null_arg1=yes
-gl_cv_func_mbrtowc_null_arg2=yes
-gl_cv_func_mbrtowc_retval=yes
-gl_cv_func_wcrtomb_retval=yes
-EOF</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/tar.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>./configure \
-    --prefix=/tools \
-    --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET} \
-    --cache-file=config.cache</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/tar.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/tar.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/tar.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/tar.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-tar" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/common/texinfo.xml
===================================================================
--- BOOK/temp-system/common/texinfo.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,74 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-texinfo" role="wrap">
-  <?dbhtml filename="texinfo.html"?>
-
-  <title>Texinfo-&texinfo-version;</title>
-
-  <indexterm zone="ch-temp-system-texinfo">
-    <primary sortas="a-Texinfo">Texinfo</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/texinfo.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Texinfo</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/texinfo.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>PERL=/usr/bin/perl \
-./configure \
-    --prefix=/tools \
-    --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET}</userinput></screen>
-
-    <variablelist os="ba">
-      <title>The meaning of the new configure option:</title>
-
-      <varlistentry>
-        <term><parameter>PERL=/usr/bin/perl</parameter></term>
-        <listitem>
-          <para>This forces Texinfo to use
-          <filename class="directory">/usr/bin</filename> as the location of
-          <command>perl</command>, as some host systems may have it in
-          <filename class="directory">/bin</filename>.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/texinfo.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/texinfo.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/texinfo.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-texinfo" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/common/util-linux.xml
===================================================================
--- BOOK/temp-system/common/util-linux.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,102 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-util-linux" role="wrap">
-  <?dbhtml filename="util-linux.html"?>
-
-  <title>Util-linux-&util-linux-version;</title>
-
-  <indexterm zone="ch-temp-system-util-linux">
-    <primary sortas="a-Util-linux">Util-linux</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/util-linux.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Util-linux</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/util-linux.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>./configure \
-    --prefix=/tools \
-    --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET} \
-    --disable-makeinstall-chown \
-    --disable-makeinstall-setuid \
-    --disable-nologin \
-    --without-python</userinput></screen>
-
-    <variablelist os="c">
-      <title>The meaning of the new configure option:</title>
-
-      <varlistentry>
-        <term><parameter>--disable-makeinstall-chown</parameter></term>
-        <listitem>
-          <para>This prevents Util-linux from trying to perform any
-          chown commands when it is installed.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--disable-makeinstall-setuid</parameter></term>
-        <listitem>
-          <para>This prevents Util-linux from enabling the setuid bit on
-          any of its installed programs.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--disable-nologin</parameter></term>
-        <listitem>
-          <para>This prevents Util-linux from installing
-          <command>nologin</command>.</para> 
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--without-python</parameter></term>
-        <listitem>
-          <para>This avoids the building of unneeded Python bindings when
-          Python is installed on the host system.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para os='s1'>Adjust the Makefile</para>
-
-<screen os="s2"><userinput>sed -i 's/-lncursesw -ltinfo/-lncurses/' Makefile
-sed -i 's/LIBNCURSESW/LIBNCURSES/' config.h</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/util-linux.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-<screen os="e"><userinput>make</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/util-linux.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-<screen os="h"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-util-linux" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/common/variables.xml
===================================================================
--- BOOK/temp-system/common/variables.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,35 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-variables">
-  <?dbhtml filename="variables.html"?>
-
-  <title>Build Variables</title>
-
-  <para>Setup target-specific variables for the compiler
-  and linkers:</para>
-
-<screen><userinput>export CC="${CLFS_TARGET}-gcc"
-export CXX="${CLFS_TARGET}-g++"
-export AR="${CLFS_TARGET}-ar"
-export AS="${CLFS_TARGET}-as"
-export RANLIB="${CLFS_TARGET}-ranlib"
-export LD="${CLFS_TARGET}-ld"
-export STRIP="${CLFS_TARGET}-strip"</userinput></screen>
-
-  <para>Then add the build variables to <filename>~/.bashrc</filename> to
-  prevent issues if you stop and come back later:</para>
-
-<screen><userinput>echo export CC=\""${CC}\"" &gt;&gt; ~/.bashrc
-echo export CXX=\""${CXX}\"" &gt;&gt; ~/.bashrc
-echo export AR=\""${AR}\"" &gt;&gt; ~/.bashrc
-echo export AS=\""${AS}\"" &gt;&gt; ~/.bashrc
-echo export RANLIB=\""${RANLIB}\"" &gt;&gt; ~/.bashrc
-echo export LD=\""${LD}\"" &gt;&gt; ~/.bashrc
-echo export STRIP=\""${STRIP}\"" &gt;&gt; ~/.bashrc</userinput></screen>
-
-</sect1>
Index: OK/temp-system/common/vim.xml
===================================================================
--- BOOK/temp-system/common/vim.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,146 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-vim" role="wrap">
-  <?dbhtml filename="vim.html"?>
-
-  <title>Vim-&vim-version;</title>
-
-  <indexterm zone="ch-temp-system-vim">
-    <primary sortas="a-Vim">Vim</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/vim.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of VIM</title>
-
-    <para os="a">We will cross-compile Vim so that we can have a text editor in
-    <filename class="directory">/tools</filename>. Vim is not technically
-    necessary in the temporary system, in that it is not there to satisfy any
-    package dependencies in the final system, but we believe that a text editor
-    is an extremely useful tool to have there.<!-- If you prefer a different
-    editor, you may check the hints project at <ulink url="&hints-root;" />
-    for information on cross-compiling other text editors. (placeholder -
-    uncomment this sentence if/when such information actually exists)--></para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/vim.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/vim.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <para os="c1">The <command>configure</command> script is full of logic
-    that aborts at the first sign of cross compiling. Work around this by
-    setting the cached values of several tests with the following
-    command:</para>
-
-<screen os="c2"><userinput>cat &gt; src/auto/config.cache &lt;&lt; "EOF"
-vim_cv_getcwd_broken=no
-vim_cv_memmove_handles_overlap=yes
-vim_cv_stat_ignores_slash=no
-vim_cv_terminfo=yes
-vim_cv_toupper_broken=no
-vim_cv_tty_group=world
-vim_cv_tgent=zero
-EOF</userinput></screen>
-
-    <para os="b">Change the default location of
-    the <filename>vimrc</filename> configuration file to <filename
-    class="directory">/tools/etc</filename>:</para>
-
-<screen os="c"><userinput>echo '#define SYS_VIMRC_FILE "/tools/etc/vimrc"' &gt;&gt; src/feature.h</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/vim.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-<screen os="e"><userinput>./configure \
-    --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET} \
-    --prefix=/tools \
-    --enable-gui=no \
-    --disable-gtktest \
-    --disable-xim \
-    --disable-gpm \
-    --without-x \
-    --disable-netbeans \
-    --with-tlib=ncurses</userinput></screen>
-
-    <variablelist os="f">
-      <title>The meaning of the new configure options:</title>
-
-      <varlistentry>
-        <term><parameter>--enable-gui=no --disable-gtktest --disable-xim --disable-gpm --without-x --disable-netbeans</parameter></term>
-        <listitem>
-          <para>These options prevent Vim from trying to link to libraries
-          that might be on the host but won't exist inside the temporary
-          build environment.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--with-tlib=ncurses</parameter></term>
-        <listitem>
-          <para>Tells Vim to use Ncurses as its terminal library.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/vim.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/vim.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/vim.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/vim.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/vim.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-<screen os="m"><userinput>ln -sv vim /tools/bin/vi</userinput></screen>
-
-    <para os="tv1">Create a temporary vimrc to make it function more the way you may
-    expect it to. This is explained more in the final system:</para>
-
-<screen os="tv2"><userinput>cat &gt; /tools/etc/vimrc &lt;&lt; "EOF"
-<literal>" Begin /tools/etc/vimrc
-
-set nocompatible
-set backspace=2
-set ruler
-syntax on
-
-" End /tools/etc/vimrc</literal>
-EOF</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-vim" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/common/xz.xml
===================================================================
--- BOOK/temp-system/common/xz.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,56 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-xz" role="wrap">
-  <?dbhtml filename="xz.html"?>
-
-  <title>XZ Utils-&xz-version;</title>
-
-  <indexterm zone="ch-temp-system-xz">
-    <primary sortas="a-XZ Utils">XZ Utils</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/xz.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of XZ Utils</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/xz.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="cb"><userinput>./configure \
-    --prefix=/tools \
-    --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET}</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/xz.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/xz.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <para os="ce">Install the package:</para>
-
-<screen os="cf"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-xz" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/common/zlib.xml
===================================================================
--- BOOK/temp-system/common/zlib.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,62 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-zlib" role="wrap">
-  <?dbhtml filename="zlib.html"?>
-
-  <title>Zlib-&zlib-version;</title>
-
-  <indexterm zone="ch-temp-system-zlib">
-    <primary sortas="a-Zlib">Zlib</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/zlib.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Zlib</title>
-
-    <para os="h">Several packages in the temporary system use Zlib,
-    including Binutils, GCC, and Util-linux, so we will add it to
-    <filename class="directory">/tools</filename>.</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/zlib.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>./configure \
-    --prefix=/tools</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/zlib.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/zlib.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/zlib.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/zlib.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-zlib" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/mips-chapter.xml
===================================================================
--- BOOK/temp-system/mips-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,45 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-temp-system" xreflabel="Constructing a Temporary System">
-  <?dbhtml dir="temp-system"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing a Temporary System</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/isl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/zlib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/check.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
-
-</chapter>
Index: OK/temp-system/mips64-64-chapter.xml
===================================================================
--- BOOK/temp-system/mips64-64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,45 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-temp-system" xreflabel="Constructing a Temporary System">
-  <?dbhtml dir="temp-system"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing a Temporary System</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/isl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/zlib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64-64/gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/check.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
-
-</chapter>
Index: OK/temp-system/mips64-64/gcc.xml
===================================================================
--- BOOK/temp-system/mips64-64/gcc.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,117 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-gcc" role="wrap">
-  <?dbhtml filename="gcc.html"?>
-
-  <title>GCC-&gcc-version;</title>
-
-  <indexterm zone="ch-temp-system-gcc">
-    <primary sortas="a-GCC">GCC</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GCC</title>
-
-<!--GCC Branch Update Area
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ag'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ah'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='fix1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='fix2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-<screen os="ck"><userinput>../gcc-&gcc-version;/configure \
-    --prefix=/tools \
-    --disable-multilib \
-    --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET} \
-    --target=${CLFS_TARGET} \
-    --with-local-prefix=/tools \
-    --enable-languages=c,c++ \
-    --with-system-zlib \
-    --with-native-system-header-dir=/tools/include \
-    --enable-install-libiberty</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cl'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cm'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cn'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='co'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cp'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/mips64-chapter.xml
===================================================================
--- BOOK/temp-system/mips64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,45 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-temp-system" xreflabel="Constructing a Temporary System">
-  <?dbhtml dir="temp-system"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing a Temporary System</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gmp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/mpfr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/mpc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/isl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/zlib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/check.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/choose.xml"/>
-
-</chapter>
Index: OK/temp-system/mips64/choose.xml
===================================================================
--- BOOK/temp-system/mips64/choose.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,46 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-choose">
-  <?dbhtml filename="choose.html"?>
-
-  <title>To Boot or to Chroot?</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/choose.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/choose.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/choose.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/choose.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-<screen os="e"><userinput>/tools/lib/libc.so.6
-/tools/lib32/libc.so.6
-/tools/lib64/libc.so.6
-/tools/bin/gcc -v</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/choose.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/choose.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/choose.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-</sect1>
Index: OK/temp-system/mips64/gcc.xml
===================================================================
--- BOOK/temp-system/mips64/gcc.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,118 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-gcc" role="wrap">
-  <?dbhtml filename="gcc.html"?>
-
-  <title>GCC-&gcc-version;</title>
-
-  <indexterm zone="ch-temp-system-gcc">
-    <primary sortas="a-GCC">GCC</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GCC</title>
-
-<!--GCC Branch Update Area
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/multilib/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/multilib/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/multilib/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ag'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/multilib/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ah'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='fix1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='fix2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-<screen os="dc"><userinput>../gcc-&gcc-version;/configure \
-    --prefix=/tools \
-    --libdir=/tools/lib64 \
-    --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET} \
-    --target=${CLFS_TARGET} \
-    --with-local-prefix=/tools \
-    --enable-languages=c,c++ \
-    --with-abi=64 \
-    --with-system-zlib \
-    --with-native-system-header-dir=/tools/include \
-    --enable-install-libiberty</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/gcc.xml"
-    xpointer="xpointer(//*[@os='cl'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cm'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cn'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='co'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cp'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/multilib/binutils.xml
===================================================================
--- BOOK/temp-system/multilib/binutils.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,91 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-binutils" role="wrap">
-  <?dbhtml filename="binutils.html"?>
-
-  <title>Binutils-&binutils-version;</title>
-
-  <indexterm zone="ch-temp-system-binutils">
-    <primary sortas="a-Binutils">Binutils</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/binutils.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Binutils</title>
-
-<!-- Branch update patch area
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/binutils.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/binutils.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-<screen os="j"><userinput>../binutils-&binutils-dir;/configure \
-    --prefix=/tools \
-    --libdir=/tools/lib64 \
-    --with-lib-path=/tools/lib64:/tools/lib \
-    --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET} \
-    --target=${CLFS_TARGET} \
-    --disable-nls \
-    --enable-shared \
-    --enable-64-bit-bfd \
-    --enable-gold=yes \
-    --enable-plugins \
-    --with-system-zlib \
-    --enable-threads</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='be'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='bf'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='bh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='bi'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-binutils" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/multilib/bzip2.xml
===================================================================
--- BOOK/temp-system/multilib/bzip2.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,60 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-bzip2" role="wrap">
-  <?dbhtml filename="bzip2.html"?>
-
-  <title>Bzip2-&bzip2-version;</title>
-
-  <indexterm zone="ch-temp-system-bzip2">
-    <primary sortas="a-Bzip2">Bzip2</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/bzip2.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Bzip2</title>
-
-    <para os="m1">Bzip2's default Makefile target automatically runs the
-    test suite as well. We need to remove the tests since they won't work on
-    a multi-architecture build, and change the default lib path
-    to <filename class="directory">lib64</filename>:</para>
-
-<screen os="m2"><userinput>cp -v Makefile{,.orig}
-sed -e 's@^\(all:.*\) test@\1@g' \
-    -e 's@/lib\(/\| \|$\)@/lib64\1@g' Makefile.orig &gt; Makefile</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bzip2.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bzip2.xml"
-    xpointer="xpointer(//*[@os='cc'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bzip2.xml"
-    xpointer="xpointer(//*[@os='cd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bzip2.xml"
-    xpointer="xpointer(//*[@os='ce'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-bzip2" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/multilib/check.xml
===================================================================
--- BOOK/temp-system/multilib/check.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,60 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-check" role="wrap">
-  <?dbhtml filename="check.html"?>
-
-  <title>Check-&check-version;</title>
-
-  <indexterm zone="ch-temp-system-check">
-    <primary sortas="a-Check">Check</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/check.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Check</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/check.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/check.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>./configure \
-    --prefix=/tools \
-    --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET} \
-    --libdir=/tools/lib64</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/check.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/check.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/check.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/check.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/check.xml"
-  xpointer="xpointer(id('contents-check'))"/>
-
-</sect1>
Index: OK/temp-system/multilib/choose.xml
===================================================================
--- BOOK/temp-system/multilib/choose.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,44 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-choose">
-  <?dbhtml filename="choose.html"?>
-
-  <title>To Boot or to Chroot?</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/choose.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/choose.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/choose.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/choose.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-<screen os="e"><userinput>/tools/lib/libc.so.6
-/tools/lib64/libc.so.6
-/tools/bin/gcc -v</userinput></screen>
-
-  <para os="f">If any of these commands fail, you will have to follow the boot
-  method.</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/choose.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/choose.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-</sect1>
Index: OK/temp-system/multilib/file.xml
===================================================================
--- BOOK/temp-system/multilib/file.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,61 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-file" role="wrap">
-  <?dbhtml filename="file.html"?>
-
-  <title>File-&file-version;</title>
-
-  <indexterm zone="ch-temp-system-file">
-    <primary sortas="a-File">File</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/file.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of File</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/file.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>./configure \
-    --prefix=/tools \
-    --libdir=/tools/lib64 \
-    --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET}</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/file.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/file.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/file.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/file.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-file" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/multilib/flex.xml
===================================================================
--- BOOK/temp-system/multilib/flex.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,70 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-flex" role="wrap">
-  <?dbhtml filename="flex.html"?>
-
-  <title>Flex-&flex-version;</title>
-
-  <indexterm zone="ch-temp-system-flex">
-    <primary sortas="a-Flex">Flex</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/flex.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Flex</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/flex.xml"
-  xpointer="xpointer(//*[@os='t3'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/flex.xml"
-  xpointer="xpointer(//*[@os='t4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/flex.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="cb"><userinput>M4=m4 \
-./configure \
-    --prefix=/tools \
-    --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET} \
-    --cache-file=config.cache</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/flex.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/flex.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/flex.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/flex.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-flex" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/multilib/gcc.xml
===================================================================
--- BOOK/temp-system/multilib/gcc.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,118 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-gcc" role="wrap">
-  <?dbhtml filename="gcc.html"?>
-
-  <title>GCC-&gcc-version;</title>
-
-  <indexterm zone="ch-temp-system-gcc">
-    <primary sortas="a-GCC">GCC</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GCC</title>
-
-<!--GCC Branch Update Area
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/multilib/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/multilib/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/multilib/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ag'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/multilib/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ah'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='fix1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='fix2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-<screen os="dc"><userinput>../gcc-&gcc-version;/configure \
-    --prefix=/tools \
-    --libdir=/tools/lib64 \
-    --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET} \
-    --target=${CLFS_TARGET} \
-    --with-local-prefix=/tools \
-    --enable-languages=c,c++ \
-    --with-system-zlib \
-    --with-native-system-header-dir=/tools/include \
-    --disable-libssp \
-    --enable-install-libiberty</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cl'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cm'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cn'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='co'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cp'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/multilib/gmp.xml
===================================================================
--- BOOK/temp-system/multilib/gmp.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,81 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-gmp" role="wrap">
-  <?dbhtml filename="gmp.html"?>
-
-  <title>GMP-&gmp-version;</title>
-
-  <indexterm zone="ch-temp-system-gmp">
-    <primary sortas="a-GMP">GMP</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/gmp.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GMP</title>
-
-<!--
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
--->
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-<screen os="c"><userinput>CC_FOR_BUILD=gcc \
-./configure \
-    --prefix=/tools \
-    --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET} \
-    --libdir=/tools/lib64 \
-    --enable-cxx</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='ca'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gmp" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/multilib/isl.xml
===================================================================
--- BOOK/temp-system/multilib/isl.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,61 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-isl" role="wrap">
-  <?dbhtml filename="isl.html"?>
-
-  <title>ISL-&isl-version;</title>
-
-  <indexterm zone="ch-temp-system-isl">
-    <primary sortas="a-ISL">ISL</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/isl.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of ISL</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/isl.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>./configure \
-    --prefix=/tools \
-    --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET} \
-    --libdir=/tools/lib64</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/isl.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/isl.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/isl.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/isl.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-isl" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/multilib/mpc.xml
===================================================================
--- BOOK/temp-system/multilib/mpc.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,61 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-mpc" role="wrap">
-  <?dbhtml filename="mpc.html"?>
-
-  <title>MPC-&mpc-version;</title>
-
-  <indexterm zone="ch-temp-system-mpc">
-    <primary sortas="a-MPC">MPC</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/mpc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of MPC</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpc.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>./configure \
-    --prefix=/tools \
-    --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET} \
-    --libdir=/tools/lib64</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpc.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-mpc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/multilib/mpfr.xml
===================================================================
--- BOOK/temp-system/multilib/mpfr.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,69 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-mpfr" role="wrap">
-  <?dbhtml filename="mpfr.html"?>
-
-  <title>MPFR-&mpfr-version;</title>
-
-  <indexterm zone="ch-temp-system-mpfr">
-    <primary sortas="a-MPFR">MPFR</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/mpfr.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of MPFR</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/mpfr.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/mpfr.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpfr.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>./configure \
-    --prefix=/tools \
-    --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET} \
-    --libdir=/tools/lib64</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpfr.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpfr.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpfr.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpfr.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-mpfr" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/multilib/ncurses.xml
===================================================================
--- BOOK/temp-system/multilib/ncurses.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,80 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-ncurses" role="wrap">
-  <?dbhtml filename="ncurses.html"?>
-
-  <title>Ncurses-&ncurses-version;</title>
-
-  <indexterm zone="ch-temp-system-ncurses">
-    <primary sortas="a-Ncurses">Ncurses</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/ncurses.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Ncurses</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-<!--Ncurses Branch Update Area
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>./configure \
-    --prefix=/tools \
-    --with-shared \
-    --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET} \
-    --without-debug \
-    --without-ada \
-    --enable-overwrite \
-    --with-build-cc=gcc \
-    --libdir=/tools/lib64</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-ncurses" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/multilib/util-linux.xml
===================================================================
--- BOOK/temp-system/multilib/util-linux.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,77 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-util-linux" role="wrap">
-  <?dbhtml filename="util-linux.html"?>
-
-  <title>Util-linux-&util-linux-version;</title>
-
-  <indexterm zone="ch-temp-system-util-linux">
-    <primary sortas="a-Util-linux">Util-linux</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/util-linux.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Util-linux</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="be"><userinput>PKG_CONFIG_PATH="" ./configure \
-    --prefix=/tools \
-    --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET} \
-    --libdir='${prefix}'/lib64 \
-    --disable-makeinstall-chown \
-    --disable-makeinstall-setuid \
-    --disable-nologin \
-    --without-python</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-util-linux" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/multilib/xz.xml
===================================================================
--- BOOK/temp-system/multilib/xz.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,61 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-xz" role="wrap">
-  <?dbhtml filename="xz.html"?>
-
-  <title>XZ Utils-&xz-version;</title>
-
-  <indexterm zone="ch-temp-system-xz">
-    <primary sortas="a-XZ Utils">XZ Utils</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/xz.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of XZ Utils</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/xz.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="cb"><userinput>./configure \
-    --prefix=/tools \
-    --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET} \
-    --libdir=/tools/lib64</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/xz.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/xz.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/xz.xml"
-    xpointer="xpointer(//*[@os='ce'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/xz.xml"
-    xpointer="xpointer(//*[@os='cf'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-xz" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/multilib/zlib.xml
===================================================================
--- BOOK/temp-system/multilib/zlib.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,63 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-zlib" role="wrap">
-  <?dbhtml filename="zlib.html"?>
-
-  <title>Zlib-&zlib-version;</title>
-
-  <indexterm zone="ch-temp-system-zlib">
-    <primary sortas="a-Zlib">Zlib</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/zlib.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Zlib</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/zlib.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/zlib.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>./configure \
-    --prefix=/tools \
-    --libdir=/tools/lib64</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/zlib.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/zlib.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/zlib.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/zlib.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-zlib" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/ppc-chapter.xml
===================================================================
--- BOOK/temp-system/ppc-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,44 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?> <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-temp-system" xreflabel="Constructing a Temporary System">
-  <?dbhtml dir="temp-system"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing a Temporary System</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/isl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/zlib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/check.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
-
-</chapter>
Index: OK/temp-system/ppc/gcc.xml
===================================================================
--- BOOK/temp-system/ppc/gcc.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,109 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-gcc" role="wrap">
-  <?dbhtml filename="gcc.html"?>
-
-  <title>GCC-&gcc-version;</title>
-
-  <indexterm zone="ch-temp-system-gcc">
-    <primary sortas="a-GCC">GCC</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GCC</title>
-
-<!--GCC Branch Update Area
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ag'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/ppc/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ah'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='fix1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='fix2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='ck'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cl'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cm'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cn'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='co'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cp'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/ppc64-64-chapter.xml
===================================================================
--- BOOK/temp-system/ppc64-64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,45 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-temp-system" xreflabel="Constructing a Temporary System">
-  <?dbhtml dir="temp-system"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing a Temporary System</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/isl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/zlib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64-64/gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/check.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
-
-</chapter>
Index: OK/temp-system/ppc64-64/gcc.xml
===================================================================
--- BOOK/temp-system/ppc64-64/gcc.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,117 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-gcc" role="wrap">
-  <?dbhtml filename="gcc.html"?>
-
-  <title>GCC-&gcc-version;</title>
-
-  <indexterm zone="ch-temp-system-gcc">
-    <primary sortas="a-GCC">GCC</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GCC</title>
-
-<!--GCC Branch Update Area
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ag'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/ppc/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ah'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='fix1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='fix2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-<screen os="ck"><userinput>../gcc-&gcc-version;/configure \
-    --prefix=/tools \
-    --disable-multilib \
-    --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET} \
-    --target=${CLFS_TARGET} \
-    --with-local-prefix=/tools \
-    --enable-languages=c,c++ \
-    --with-system-zlib \
-    --with-native-system-header-dir=/tools/include \
-    --enable-install-libiberty</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cl'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cm'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cn'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='co'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cp'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/ppc64-chapter.xml
===================================================================
--- BOOK/temp-system/ppc64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,44 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?> <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-temp-system" xreflabel="Constructing a Temporary System">
-  <?dbhtml dir="temp-system"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing a Temporary System</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gmp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/mpfr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/mpc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/isl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/zlib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/check.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/choose.xml"/>
-
-</chapter>
Index: OK/temp-system/ppc64/choose.xml
===================================================================
--- BOOK/temp-system/ppc64/choose.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,48 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-choose">
-  <?dbhtml filename="choose.html"?>
-
-  <title>To Boot or to Chroot?</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/choose.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/choose.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/choose.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-  <para>Powerpc64 is slightly different from some of the other
-  architectures, because a 64-bit kernel running 32-bit userspace can
-  successfully chroot and execute 64-bit programs.  However, if the
-  kernel personality has been set to 32-bit by a utility such as
-  linux32, it will eventually fail when Glibc thinks it is building
-  on a 32-bit system and tries to include incompatible assembler code
-  in the 64-bit glibc.</para>
-
-  <para>To see if you can successfully chroot to build the final powerpc64
-  system, enter the following command which tests if you are running a
-  64-bit Linux 2.6 kernel (with a 64-bit personality):</para>
-
-<screen><userinput>uname -a | grep '^Linux.*2\.6\..*ppc64' &amp;&amp; \
-    echo "ok to chroot" || echo "you must boot"</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/choose.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/choose.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-</sect1>
Index: OK/temp-system/ppc64/gcc.xml
===================================================================
--- BOOK/temp-system/ppc64/gcc.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,109 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-gcc" role="wrap">
-  <?dbhtml filename="gcc.html"?>
-
-  <title>GCC-&gcc-version;</title>
-
-  <indexterm zone="ch-temp-system-gcc">
-    <primary sortas="a-GCC">GCC</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GCC</title>
-
-<!--GCC Branch Update Area
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/multilib/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/multilib/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/multilib/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ag'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/ppc/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ah'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='fix1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='fix2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/gcc.xml"
-    xpointer="xpointer(//*[@os='dc'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/gcc.xml"
-    xpointer="xpointer(//*[@os='cl'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cm'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cn'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='co'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cp'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/sparc-chapter.xml
===================================================================
--- BOOK/temp-system/sparc-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,45 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-temp-system" xreflabel="Constructing a Temporary System">
-  <?dbhtml dir="temp-system"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing a Temporary System</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/isl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/zlib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/check.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
-
-</chapter>
Index: OK/temp-system/sparc64-64-chapter.xml
===================================================================
--- BOOK/temp-system/sparc64-64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,45 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-temp-system" xreflabel="Constructing a Temporary System">
-  <?dbhtml dir="temp-system"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing a Temporary System</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/isl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/zlib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/check.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
-
-</chapter>
Index: OK/temp-system/sparc64-chapter.xml
===================================================================
--- BOOK/temp-system/sparc64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,45 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-temp-system" xreflabel="Constructing a Temporary System">
-  <?dbhtml dir="temp-system"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing a Temporary System</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gmp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/mpfr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/mpc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/isl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/zlib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/check.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/choose.xml"/>
-
-</chapter>
Index: OK/temp-system/x86-chapter.xml
===================================================================
--- BOOK/temp-system/x86-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,45 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-temp-system" xreflabel="Constructing a Temporary System">
-  <?dbhtml dir="temp-system"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing a Temporary System</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/isl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/zlib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/check.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
-
-</chapter>
Index: OK/temp-system/x86_64-64-chapter.xml
===================================================================
--- BOOK/temp-system/x86_64-64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,45 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-temp-system" xreflabel="Constructing a Temporary System">
-  <?dbhtml dir="temp-system"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing a Temporary System</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/isl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/zlib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/check.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
-
-</chapter>
Index: OK/temp-system/x86_64-chapter.xml
===================================================================
--- BOOK/temp-system/x86_64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,45 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-temp-system" xreflabel="Constructing a Temporary System">
-  <?dbhtml dir="temp-system"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing a Temporary System</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gmp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/mpfr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/mpc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/isl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/zlib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/check.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/choose.xml"/>
-
-</chapter>
Index: OK/testsuite-tools/common/dejagnu.xml
===================================================================
--- BOOK/testsuite-tools/common/dejagnu.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,70 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-testsuite-tools-dejagnu" role="wrap">
-  <?dbhtml filename="dejagnu.html"?>
-
-  <title>DejaGNU-&dejagnu-version;</title>
-
-  <indexterm zone="ch-testsuite-tools-dejagnu">
-    <primary sortas="a-DejaGNU">DejaGNU</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The DejaGNU package contains a framework for testing other
-    programs.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of DejaGNU</title>
-
-    <para os="a">Prepare DejaGNU for compilation:</para>
-
-<screen os="b"><userinput>./configure \
-    --prefix=/tools</userinput></screen>
-
-    <para os="c">Build and install the package:</para>
-
-<screen os="d"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-dejagnu" role="content">
-    <title>Contents of DejaGNU</title>
-
-    <segmentedlist>
-      <segtitle>Installed program</segtitle>
-
-      <seglistitem>
-        <seg>runtest</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="runtest">
-        <term><command>runtest</command></term>
-        <listitem>
-          <para>A wrapper script that locates the proper
-          <command>expect</command> shell and then runs DejaGNU</para>
-          <indexterm zone="ch-testsuite-tools-dejagnu runtest">
-            <primary sortas="b-runtest">runtest</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/testsuite-tools/common/expect.xml
===================================================================
--- BOOK/testsuite-tools/common/expect.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,125 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-testsuite-tools-expect" role="wrap">
-  <?dbhtml filename="expect.html"?>
-
-  <title>Expect-&expect-version;</title>
-
-  <indexterm zone="ch-testsuite-tools-expect">
-    <primary sortas="a-Expect">Expect</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Expect package contains a program for carrying out scripted
-    dialogues with other interactive programs.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Expect</title>
-
-    <para os="c">Now prepare Expect for compilation:</para>
-
-<screen os="d"><userinput>./configure \
-    --prefix=/tools \
-    --with-tcl=/tools/lib \
-    --with-tclinclude=/tools/include</userinput></screen>
-
-    <variablelist os="e">
-      <title>The meaning of the configure options:</title>
-
-      <varlistentry os="e1">
-        <term><parameter>--with-tcl=/tools/lib</parameter></term>
-        <listitem>
-          <para>This ensures that the configure script finds the Tcl
-          installation in the temporary testsuite-tools location.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="e2">
-        <term><parameter>--with-tclinclude=/tools/include</parameter></term>
-        <listitem>
-          <para>This explicitly tells Expect where to find Tcl's internal headers.
-           Using this option avoids conditions
-          where <command>configure</command> fails because it cannot
-          automatically discover the location of the Tcl source directory.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para os="f">Build the package:</para>
-
-<screen os="g"><userinput>make</userinput></screen>
-
-    <para os="i">Install the package:</para>
-
-<screen os="j"><userinput>make SCRIPTS="" install</userinput></screen>
-
-    <variablelist os="k">
-      <title>The meaning of the make parameter:</title>
-
-      <varlistentry>
-        <term><parameter>SCRIPTS=""</parameter></term>
-        <listitem>
-          <para>This prevents installation of the supplementary expect
-          scripts, which are not needed.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-  <sect2 id="contents-expect" role="content">
-    <title>Contents of Expect</title>
-
-    <segmentedlist>
-      <segtitle>Installed program</segtitle>
-      <segtitle>Installed library</segtitle>
-
-      <seglistitem>
-        <seg>expect</seg>
-        <seg>libexpect-&expect-lib-version;.a</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="expect">
-        <term><command>expect</command></term>
-        <listitem>
-          <para>Communicates with other interactive programs according
-          to a script</para>
-          <indexterm zone="ch-testsuite-tools-expect expect">
-            <primary sortas="b-expect">expect</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libexpect">
-        <term><filename class="libraryfile">libexpect-&expect-lib-version;.a</filename></term>
-        <listitem>
-          <para>Contains functions that allow Expect to be used as a Tcl
-          extension or to be used directly from C or C++ (without Tcl)</para>
-          <indexterm zone="ch-testsuite-tools-expect libexpect">
-            <primary sortas="c-libexpect-&expect-lib-version;">libexpect-&expect-lib-version;</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/testsuite-tools/common/introduction.xml
===================================================================
--- BOOK/testsuite-tools/common/introduction.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-testsuite-tools-introduction">
-  <?dbhtml filename="introduction.html"?>
-
-  <title>Introduction</title>
-
-  <para>This chapter builds the tools needed by some packages to run the tests
-  that they have. I.e., <command>make check</command>. Tcl, Expect,
-  and DejaGNU are needed for the GCC, Binutils, and Findutils test suites.
-  Installing three packages for testing purposes may seem excessive, but it is
-  very reassuring, if not essential, to know that the most important tools are
-  working properly.</para>
-
-</sect1>
Index: OK/testsuite-tools/common/tcl.xml
===================================================================
--- BOOK/testsuite-tools/common/tcl.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,114 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-testsuite-tools-tcl" role="wrap">
-  <?dbhtml filename="tcl.html"?>
-
-  <title>Tcl-&tcl-version;</title>
-
-  <indexterm zone="ch-testsuite-tools-tcl">
-    <primary sortas="a-Tcl">Tcl</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Tcl package contains the Tool Command Language.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Tcl</title>
-
-    <para os="a">Prepare Tcl for compilation:</para>
-
-<screen><userinput>cd unix
-./configure \
-    --prefix=/tools</userinput></screen>
-
-    <para os="c">Build the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">Install the package:</para>
-
-<screen os="f"><userinput>make install</userinput></screen>
-
-    <para os="g">Tcl's private header files are needed for the next
-    package, Expect. Install them into /tools:</para>
-
-<screen os="h"><userinput>make install-private-headers</userinput></screen>
-
-    <para os="i">Now make a necessary symbolic link:</para>
-
-<screen os="j"><userinput>ln -sv tclsh&tcl-version2; /tools/bin/tclsh</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-tcl" role="content">
-    <title>Contents of Tcl</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed libraries</segtitle>
-
-      <seglistitem>
-        <seg>tclsh (link to tclsh&tcl-version2;) and tclsh&tcl-version2;</seg>
-        <seg>libtcl&tcl-version2;.so, libtclstub&tcl-version2;.a</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="tclsh-version">
-        <term><command>tclsh&tcl-version2;</command></term>
-        <listitem>
-          <para>The Tcl command shell</para>
-          <indexterm zone="ch-testsuite-tools-tcl tclsh-version">
-            <primary sortas="b-tclsh-version">tclsh-version;</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tclsh">
-        <term><command>tclsh</command></term>
-        <listitem>
-          <para>A link to tclsh&tcl-version2;</para>
-          <indexterm zone="ch-testsuite-tools-tcl tclsh">
-            <primary sortas="b-tclsh">tclsh</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libtcl-version.so">
-        <term><filename class="libraryfile">libtcl&tcl-version2;.so</filename></term>
-        <listitem>
-          <para>The Tcl library</para>
-          <indexterm zone="ch-testsuite-tools-tcl libtcl-version.so">
-            <primary sortas="c-libtcl-version.so">libtcl-version.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libtclstub-version.a">
-        <term><filename class="libraryfile">libtclstub&tcl-version2;.a</filename></term>
-        <listitem>
-          <para>The Tcl Stub library</para>
-          <indexterm zone="ch-testsuite-tools-tcl libtclstub-version.a">
-            <primary sortas="c-libtclstub-version.a">libtclstub-version.a</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/testsuite-tools/mips-chapter.xml
===================================================================
--- BOOK/testsuite-tools/mips-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,19 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-testsuite-tools" xreflabel="Constructing Testsuite Tools">
-  <?dbhtml dir="testsuite"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing Testsuite Tools</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tcl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/expect.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dejagnu.xml"/>
-
-</chapter>
Index: OK/testsuite-tools/mips64-64-chapter.xml
===================================================================
--- BOOK/testsuite-tools/mips64-64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,19 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-testsuite-tools" xreflabel="Constructing Testsuite Tools">
-  <?dbhtml dir="testsuite-tools"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing Testsuite Tools</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tcl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/expect.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dejagnu.xml"/>
-
-</chapter>
Index: OK/testsuite-tools/mips64-chapter.xml
===================================================================
--- BOOK/testsuite-tools/mips64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,19 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-testsuite-tools" xreflabel="Constructing Testsuite Tools">
-  <?dbhtml dir="testsuite"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing Testsuite Tools</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/tcl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/expect.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dejagnu.xml"/>
-
-</chapter>
Index: OK/testsuite-tools/multilib/expect.xml
===================================================================
--- BOOK/testsuite-tools/multilib/expect.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,78 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-testsuite-tools-expect" role="wrap">
-  <?dbhtml filename="expect.html"?>
-
-  <title>Expect-&expect-version;</title>
-
-  <indexterm zone="ch-testsuite-tools-expect">
-    <primary sortas="a-Expect">Expect</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/expect.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Expect</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/expect.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>CC="gcc ${BUILD64}" \
-./configure \
-    --prefix=/tools \
-    --with-tcl=/tools/lib64 \
-    --with-tclinclude=/tools/include \
-    --libdir=/tools/lib64</userinput></screen>
-
-    <variablelist os="e">
-      <title>The meaning of the configure options:</title>
-
-      <varlistentry os="e1">
-        <term><parameter>--with-tcl=/tools/lib64</parameter></term>
-        <listitem>
-          <para>This ensures that the configure script finds the Tcl
-          installation in the temporary tools location.</para>
-        </listitem>
-      </varlistentry>
-
-       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-        href="../common/expect.xml"
-        xpointer="xpointer(//*[@os='e2'])"/>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/expect.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/expect.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/expect.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/expect.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/expect.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/expect.xml"
-  xpointer="xpointer(id('contents-expect'))"/>
-
-</sect1>
Index: OK/testsuite-tools/multilib/tcl.xml
===================================================================
--- BOOK/testsuite-tools/multilib/tcl.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,71 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-testsuite-tools-tcl" role="wrap">
-  <?dbhtml filename="tcl.html"?>
-
-  <title>Tcl-&tcl-version;</title>
-
-  <indexterm zone="ch-testsuite-tools-tcl">
-    <primary sortas="a-Tcl">Tcl</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/tcl.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Tcl</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/tcl.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>cd unix
-CC="gcc ${BUILD64}" ./configure \
-    --prefix=/tools \
-    --libdir=/tools/lib64</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/tcl.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/tcl.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/tcl.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/tcl.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/tcl.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/tcl.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/tcl.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/tcl.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/tcl.xml"
-  xpointer="xpointer(id('contents-tcl'))"/>
-
-</sect1>
Index: OK/testsuite-tools/ppc-chapter.xml
===================================================================
--- BOOK/testsuite-tools/ppc-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-testsuite-tools" xreflabel="Constructing Testsuite Tools">
-  <?dbhtml dir="testsuite-tools"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing Testsuite Tools</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tcl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/expect.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dejagnu.xml"/>
-
-
-</chapter>
Index: OK/testsuite-tools/ppc64-64-chapter.xml
===================================================================
--- BOOK/testsuite-tools/ppc64-64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,19 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-testsuite-tools" xreflabel="Constructing Testsuite Tools">
-  <?dbhtml dir="testsuite-tools"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing Testsuite Tools</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tcl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/expect.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dejagnu.xml"/>
-
-</chapter>
Index: OK/testsuite-tools/ppc64-chapter.xml
===================================================================
--- BOOK/testsuite-tools/ppc64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,19 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-testsuite-tools" xreflabel="Constructing Testsuite Tools">
-  <?dbhtml dir="testsuite-tools"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing Testsuite Tools</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/tcl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/expect.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dejagnu.xml"/>
-
-</chapter>
Index: OK/testsuite-tools/sparc-chapter.xml
===================================================================
--- BOOK/testsuite-tools/sparc-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,19 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-testsuite-tools" xreflabel="Constructing Testsuite Tools">
-  <?dbhtml dir="testsuite-tools"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing Testsuite Tools</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tcl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/expect.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dejagnu.xml"/>
-
-</chapter>
Index: OK/testsuite-tools/sparc64-64-chapter.xml
===================================================================
--- BOOK/testsuite-tools/sparc64-64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,19 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-testsuite-tools" xreflabel="Constructing Testsuite Tools">
-  <?dbhtml dir="testsuite-tools"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing Testsuite Tools</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tcl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/expect.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dejagnu.xml"/>
-
-</chapter>
Index: OK/testsuite-tools/sparc64-chapter.xml
===================================================================
--- BOOK/testsuite-tools/sparc64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,19 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-testsuite-tools" xreflabel="Constructing Testsuite Tools">
-  <?dbhtml dir="testsuite-tools"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing Testsuite Tools</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/tcl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/expect.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dejagnu.xml"/>
-
-</chapter>
Index: OK/testsuite-tools/x86-chapter.xml
===================================================================
--- BOOK/testsuite-tools/x86-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,19 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-testsuite-tools" xreflabel="Constructing Testsuite Tools">
-  <?dbhtml dir="testsuite-tools"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing Testsuite Tools</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tcl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/expect.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dejagnu.xml"/>
-
-</chapter>
Index: OK/testsuite-tools/x86_64-64-chapter.xml
===================================================================
--- BOOK/testsuite-tools/x86_64-64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,19 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-testsuite-tools" xreflabel="Constructing Testsuite Tools">
-  <?dbhtml dir="testsuite-tools"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing Testsuite Tools</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tcl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/expect.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dejagnu.xml"/>
-
-</chapter>
Index: OK/testsuite-tools/x86_64-chapter.xml
===================================================================
--- BOOK/testsuite-tools/x86_64-chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,19 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-testsuite-tools" xreflabel="Constructing Testsuite Tools">
-  <?dbhtml dir="testsuite-tools"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing Testsuite Tools</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/tcl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/expect.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dejagnu.xml"/>
-
-</chapter>
Index: OK/the-end/chapter.xml
===================================================================
--- BOOK/the-end/chapter.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,19 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-finalizing" xreflabel="The End">
-  <?dbhtml dir="the-end"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>The End</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="theend.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="downloadclient.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="reboot.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="whatnow.xml"/>
-
-</chapter>
Index: OK/the-end/downloadclient.xml
===================================================================
--- BOOK/the-end/downloadclient.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,94 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-finish-downloadclient">
-  <?dbhtml filename="downloadclient.html"?>
-
-  <title>Download Client</title>
-
-  <para>The final system build does not install an FTP or HTTP client for downloading files.</para>
-
-  <itemizedlist>
-    <para>Some suggested clients include:</para>
-    <listitem>
-      <para>Curl <ulink url="&cblfs-root;index.php/Curl"/></para>
-    </listitem>
-    <listitem>
-      <para>Inetutils <ulink url="&cblfs-root;index.php/Inetutils"/></para>
-    </listitem>
-    <listitem>
-      <para>LFTP <ulink url="http://lftp.yar.ru/"/></para>
-    </listitem>
-    <listitem>
-      <para>Links <ulink url="&cblfs-root;index.php/Links"/></para>
-    </listitem>
-    <listitem>
-      <para>Lynx <ulink url="&cblfs-root;index.php/Lynx"/></para>
-    </listitem>
-    <listitem>
-      <para>NcFTP Client <ulink url="&cblfs-root;index.php/Ncftp"/></para>
-    </listitem>
-    <listitem>
-      <para>Wget <ulink url="&cblfs-root;index.php/Wget"/></para>
-    </listitem>
-    <listitem>
-      <para>BASH - A user can use net redirections (if not disabled when building bash in the final system) to download wget or another program.</para>
-<screen><userinput>cat &gt; download.sh &lt;&lt; "EOF"
-#!/bin/bash
-
-WGET_VERSION='1.14'
-WGET_HOSTNAME='ftp.gnu.org'
-exec {HTTP_FD}&lt;&gt;/dev/tcp/${WGET_HOSTNAME}/80
-echo -ne "GET /gnu/wget/wget-${WGET_VERSION}.tar.xz HTTP/1.1\r\nHost: "\
-    ${WGET_HOSTNAME}'\r\nUser-Agent: '\
-    'bash/'${BASH_VERSION}'\r\n\r\n'  &gt;&amp;${HTTP_FD}
-sed -e '1,/^.$/d' &lt;&amp;${HTTP_FD} &gt;wget-${WGET_VERSION}.tar.xz
-EOF</userinput></screen>
-    </listitem>
-    <listitem>
-      <para>GAWK</para>
-<screen><userinput>cat &gt; gawkdl.sh &lt;&lt; "EOF"
-#!/bin/bash
-
-gawk 'BEGIN {
-  NetService = "/inet/tcp/0/mirror.anl.gov/80"
-  print "GET /pub/gnu/wget/wget-1.14.tar.xz" |&amp; NetService
-  while ((NetService |&amp; getline) &gt; 0)
-    print $0
-  close(NetService)
-}' &gt; binary
-
-gawk '{q=p;p=$0}NR&gt;1{print q}END{ORS = ""; print p}' binary &gt; wget-1.14.tar.xz
-
-rm binary
-EOF</userinput></screen>
-    </listitem>
-    <listitem>
-      <para>PERL with HTTP::Tiny (Included with final system PERL install).</para>
-<screen><userinput>cat &gt; download.pl &lt;&lt; "EOF"
-#!/usr/bin/perl
-
-use HTTP::Tiny;
-my $http = HTTP::Tiny->new;
-my $response;
-
-$response = $http->mirror('http://ftp.gnu.org/gnu/wget/wget-1.14.tar.xz', 'wget-1.14.tar.xz');
-die "Failed!\n" unless $response->{success};
-print "Unchanged!\n" if $response->{status} eq '304';
-EOF</userinput></screen>
-      <para>Or use this:</para>
-<screen><userinput>perl -MHTTP::Tiny -E 'say HTTP::Tiny-&gt;new-&gt;get(shift)-&gt;{content}' "http://ftp.gnu.org/gnu/wget/wget-1.14.tar.xz" &gt; binary
-perl -e 'local $/; $_ = &lt;&gt;; s/\n$//; print' binary &gt; wget-1.14.tar.xz
-rm binary</userinput></screen>
-    </listitem>
-    <listitem>
-  <para>PERL with LWP: Run <command>cpan</command> and manually configure the client. Run <command>install LWP</command> while in the CPAN shell.</para>
-    <para>Refer to <ulink url="http://www.bioinfo-user.org.uk/dokuwiki/doku.php/projects/wgetpl"/> for wgetpl.</para>
-    </listitem>
-  </itemizedlist>
-
-</sect1>
Index: OK/the-end/reboot.xml
===================================================================
--- BOOK/the-end/reboot.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,75 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-finish-reboot">
-  <?dbhtml filename="reboot.html"?>
-
-  <title>Rebooting the System</title>
-
-  <para>If you built your final system using the boot method, just run
-  <command>shutdown -r now</command> to reboot again, using your newly-built
-  kernel instead of the miminal one currently in use. If you chrooted,
-  there are a few more steps.</para>
-
-  <para>The system you have created in this book is quite minimal, and most
-  likely will not have the functionality you would need to be able to
-  continue forward. By installing a few extra packages from CBLFS
-  while still in our current chroot environment, you can leave
-  yourself in a much better position to continue on once you reboot
-  into your new CLFS installation. Installing a text mode web browser,
-  such as Lynx, you can easily view the CBLFS website in one virtual terminal,
-  while building packages in another. The GPM package will also allow you
-  to perform copy/paste actions in your virtual terminals. Lastly, if you
-  are in a situation where static IP configuration does not meet your
-  networking requirements, installing packages such as Dhcpcd or PPP at
-  this point might also be useful.</para>
-
-  <para>Now that we have said that, lets move on to booting our shiny
-  new CLFS installation for the first time! First exit from the chroot
-  environment:</para>
-
-<screen><userinput>logout</userinput></screen>
-
-  <para>Then unmount the virtual file systems:</para>
-
-<screen><userinput>umount ${CLFS}/dev/pts
-
-if [ -h ${CLFS}/dev/shm ]; then
-  link=$(readlink ${CLFS}/dev/shm)
-  umount -v ${CLFS}/$link
-  unset link
-else
-  umount -v ${CLFS}/dev/shm
-fi
-
-umount ${CLFS}/dev
-umount ${CLFS}/proc
-umount ${CLFS}/sys
-umount ${CLFS}/run</userinput></screen>
-
-  <para>Unmount the CLFS file system itself:</para>
-
-<screen><userinput>umount ${CLFS}</userinput></screen>
-
-  <para>If multiple partitions were created, unmount the other
-  partitions before unmounting the main one, like this:</para>
-
-<screen><userinput>umount ${CLFS}/usr
-umount ${CLFS}/home
-umount ${CLFS}</userinput></screen>
-
-  <para>Now, reboot the system with:</para>
-
-<screen><userinput>shutdown -r now</userinput></screen>
-
-  <para>Assuming the boot loader was set up as outlined earlier,
-  <emphasis>CLFS &version;</emphasis> will boot automatically.</para>
-
-  <para>When the reboot is complete, the CLFS system is ready for use and
-  more software may be added to suit your needs.</para>
-
-</sect1>
Index: OK/the-end/theend.xml
===================================================================
--- BOOK/the-end/theend.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,28 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-finish-theend">
-  <?dbhtml filename="theend.html"?>
-
-  <title>The End</title>
-
-  <indexterm zone="ch-finish-theend">
-    <primary sortas="e-/etc/clfs-release">/etc/clfs-release</primary>
-  </indexterm>
-
-  <para>Well done! The new CLFS system is installed! We wish you much
-  success with your shiny new custom-built Linux system.</para>
-
-  <para>It may be a good idea to create an
-  <filename>/etc/clfs-release</filename> file. By having this file, it is
-  very easy for you (and for us if you need to ask for help at some
-  point) to find out which CLFS version is installed on the system.
-  Create this file by running:</para>
-
-<screen><userinput>echo &version; &gt; /etc/clfs-release</userinput></screen>
-
-</sect1>
Index: OK/the-end/whatnow.xml
===================================================================
--- BOOK/the-end/whatnow.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,96 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-finish-whatnow">
-  <?dbhtml filename="whatnow.html"?>
-
-  <title>What Now?</title>
-
-  <para>Thank you for reading this CLFS book. We hope that you have
-  found this book helpful and have learned more about the system
-  creation process.</para>
-
-  <para>Now that the CLFS system is installed, you may be wondering
-  <quote>What next?</quote> To answer that question, we have compiled
-  a list of resources for you.</para>
-
-  <itemizedlist>
-
-    <listitem>
-      <para>Maintenance</para>
-
-      <para>Bugs and security notices are reported regularly for all software.
-      Since a CLFS system is compiled from source, it is up to you to keep
-      abreast of such reports.  There are several online resources that track
-      such reports, some of which are shown below:</para>
-
-      <itemizedlist>
-
-        <listitem>
-          <para><ulink url="http://www.cert.org/">CERT</ulink> (Computer
-          Emergency Response Team)</para>
-
-          <para>CERT has a mailing list that publishes security alerts
-          concerning various operating systems and applications.
-          Subscription information is available at <ulink
-          url="http://www.us-cert.gov/cas/signup.html"/>.</para>
-        </listitem>
-
-        <listitem>
-          <para>Bugtraq</para>
-
-          <para>Bugtraq is a full-disclosure computer security mailing list.
-          It publishes newly discovered security issues, and occasionally
-          potential fixes for them. Subscription information is available at
-          <ulink url="http://www.securityfocus.com/archive"/>.</para>
-        </listitem>
-
-      </itemizedlist>
-
-    </listitem>
-
-    <listitem>
-      <para>Community Driven Beyond Linux From Scratch</para>
-
-      <para>The Community Driven Beyond Linux From Scratch wiki covers installation
-      procedures for a wide range of software beyond the scope of the CLFS
-      Book. CBLFS is designed specifically to work with the CLFS book, and has all
-      the necessary information to continue the builds in the same manner that CLFS
-      uses. This is a community driven project, which means anyone can contribute and
-      provide updates. The CBLFS project is located at <ulink url="&cblfs-root;"/>.</para>
-    </listitem>
-
-    <listitem>
-      <para>CLFS Hints</para>
-
-      <para>The CLFS Hints are a collection of educational documents
-      submitted by volunteers in the CLFS community. The hints are available
-      at <ulink url="&hints-root;"/>.</para>
-    </listitem>
-
-    <listitem>
-      <para>Mailing lists</para>
-
-      <para>There are several CLFS mailing lists you may subscribe to if you
-      are in need of help, want to stay current with the latest developments,
-      want to contribute to the project, and more. See <xref
-      linkend="ch-intro-maillists"/> for more
-      information.</para>
-    </listitem>
-
-    <listitem>
-      <para>The Linux Documentation Project</para>
-
-      <para>The goal of The Linux Documentation Project (TLDP) is to
-      collaborate on all of the issues of Linux documentation. The TLDP features
-      a large collection of HOWTOs, guides, and man pages.  It is located at
-      <ulink url="http://www.tldp.org/"/>.</para>
-    </listitem>
-
-  </itemizedlist>
-
-</sect1>
Index: OK/tidy.conf
===================================================================
--- BOOK/tidy.conf	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,18 +1,0 @@
-indent-spaces: 2
-wrap: 78
-tab-size: 8
-input-encoding: latin1
-output-encoding: latin1
-newline: CRLF
-write-back: yes
-markup: yes
-indent: yes
-hide-endtags: no
-uppercase-tags: no
-logical-emphasis: no
-drop-font-tags: no
-tidy-mark: no
-numeric-entities: no
-show-warnings: no
-quiet: yes
-newline: LF
Index: OK/tidy.sh
===================================================================
--- BOOK/tidy.sh	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,23 +1,0 @@
-#!/bin/sh
-# Written By: Joe Ciccone <jciccone@gmail.com>
-
-if test -z "$1"; then
-  echo "Usage: $0 path"
-  exit 1
-fi
-
-TOP=`dirname $0`
-
-if test -d "$1"; then
-  find "$1" -type f -name \*.html | while read file; do
-    tidy -config "${TOP}/tidy.conf" "$file"
-    bash "${TOP}/obfuscate.sh" "$file"
-    sed -i -e "s@text/html@application/xhtml+xml@g" "$file"
-  done
-else
-  tidy -config "${TOP}/tidy.conf" "$1"
-    bash "${TOP}/obfuscate.sh" "$1"
-    sed -i -e "s@text/html@application/xhtml+xml@g" "$1"
-fi
-
-exit $?
Index: OK/users_groups.ent
===================================================================
--- BOOK/users_groups.ent	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,61 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!-- User IDs for use throughout the book -->
-
-<!ENTITY uid-root "0">
-<!ENTITY uid-bin "1">
-<!ENTITY uid-daemon "2">
-<!ENTITY uid-adm "3">
-<!ENTITY uid-lp "10">
-<!ENTITY uid-messagebus "27">
-<!ENTITY uid-mail "30">
-<!ENTITY uid-news "31">
-<!ENTITY uid-systemd-bus-proxy "71">
-<!ENTITY uid-systemd-journal "72">
-<!ENTITY uid-systemd-journal-gateway "73">
-<!ENTITY uid-systemd-journal-remote "74">
-<!ENTITY uid-systemd-journal-upload "75">
-<!ENTITY uid-systemd-network "76">
-<!ENTITY uid-systemd-resolve "77">
-<!ENTITY uid-systemd-timesync "78">
-<!ENTITY uid-systemd-coredump "79">
-<!ENTITY uid-operator "50">
-<!ENTITY uid-postmaster "51">
-<!ENTITY uid-nobody "65534">
-
-<!-- Group IDs for use throughout the book -->
-
-<!ENTITY gid-root "0">
-<!ENTITY gid-bin "1">
-<!ENTITY gid-sys "2">
-<!ENTITY gid-kmem "3">
-<!ENTITY gid-tape "4">
-<!ENTITY gid-tty "5">
-<!ENTITY gid-daemon "6">
-<!ENTITY gid-floppy "7">
-<!ENTITY gid-disk "8">
-<!ENTITY gid-lp "9">
-<!ENTITY gid-dialout "10">
-<!ENTITY gid-audio "11">
-<!ENTITY gid-video "12">
-<!ENTITY gid-utmp "13">
-<!ENTITY gid-usb "14">
-<!ENTITY gid-cdrom "15">
-<!ENTITY gid-adm "16">
-<!ENTITY gid-console "17">
-<!ENTITY gid-cdrw "18">
-<!ENTITY gid-messagebus "27">
-<!ENTITY gid-mail "30">
-<!ENTITY gid-news "31">
-<!ENTITY gid-nogroup "65533">
-<!ENTITY gid-systemd-journal "28">
-<!ENTITY gid-systemd-bus-proxy "72">
-<!ENTITY gid-systemd-journal-gateway "73">
-<!ENTITY gid-systemd-journal-remote "74">
-<!ENTITY gid-systemd-journal-upload "75">
-<!ENTITY gid-systemd-network "76">
-<!ENTITY gid-systemd-resolve "77">
-<!ENTITY gid-systemd-timesync "78">
-<!ENTITY gid-systemd-coredump "79">
-<!ENTITY gid-users "1000">
-<!ENTITY gid-wheel "39">
Index: OK/x86-index.xml
===================================================================
--- BOOK/x86-index.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,86 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "general.ent">
-  %general-entities;
-]>
-
-<book>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/x86/bookinfo.xml"/>
-  <!--
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/dedication.xml"/>
-  -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/preface.xml"/>
-
-  <part id="part1">
-    <?dbhtml filename="part1.html"?>
-
-    <title>Introduction</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="introduction/x86-chapter.xml"/>
-
-  </part>
-
-  <part id="part2">
-    <?dbhtml filename="part2.html"?>
-
-    <title>Preparing for the Build</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="partitioning/x86-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="materials/x86-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/x86-chapter.xml"/>
-
-  </part>
-
-  <part id="part3">
-    <?dbhtml filename="part3.html"?>
-
-    <title>Make the Cross-Compile Tools</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cross-tools/x86-chapter.xml"/>
-
-  </part>
-
-  <part id="part4">
-    <?dbhtml filename="part4.html"?>
-
-    <title>Building the Basic Tools</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="temp-system/x86-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="boot/x86-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="chroot/x86-chapter.xml"/>
-
-  </part>
-
-  <part id="part5">
-    <?dbhtml filename="part5.html"?>
-
-    <title>Building the CLFS System</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="testsuite-tools/x86-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-system/x86-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="system-config/x86-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="network/x86-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bootable/x86-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="the-end/chapter.xml"/>
-
-  </part>
-
-  <part id="part6">
-    <?dbhtml filename="part6.html"?>
-
-    <title>Appendices</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/acronymlist.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/dependencies/common.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/dependencies/x86.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/rationale/common.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/rationale/x86.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/license.xml"/>
-
-  </part>
-
-  <index/>
-
-</book>
Index: OK/x86_64-64-index.xml
===================================================================
--- BOOK/x86_64-64-index.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,85 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "general.ent">
-  %general-entities;
-]>
-
-<book>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/x86_64-64/bookinfo.xml"/>
-  <!--
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/dedication.xml"/>
-  -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/preface.xml"/>
-
-  <part id="part1">
-    <?dbhtml filename="part1.html"?>
-
-    <title>Introduction</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="introduction/x86_64-64-chapter.xml"/>
-
-  </part>
-
-  <part id="part2">
-    <?dbhtml filename="part2.html"?>
-
-    <title>Preparing for the Build</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="partitioning/x86-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="materials/x86_64-64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/x86_64-64-chapter.xml"/>
-
-  </part>
-
-  <part id="part3">
-    <?dbhtml filename="part3.html"?>
-
-    <title>Make the Cross-Compile Tools</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cross-tools/x86_64-64-chapter.xml"/>
-
-  </part>
-
-  <part id="part4">
-    <?dbhtml filename="part4.html"?>
-
-    <title>Building the Basic Tools</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="temp-system/x86_64-64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="boot/x86_64-64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="chroot/x86_64-64-chapter.xml"/>
-
-  </part>
-
-  <part id="part5">
-    <?dbhtml filename="part5.html"?>
-
-    <title>Building the CLFS System</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="testsuite-tools/x86_64-64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-system/x86_64-64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="system-config/x86_64-64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="network/x86_64-64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bootable/x86_64-64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="the-end/chapter.xml"/>
-
-  </part>
-
-  <part id="part6">
-    <?dbhtml filename="part6.html"?>
-
-    <title>Appendices</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/acronymlist.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/dependencies/common.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/dependencies/x86_64-64.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/rationale/common.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/license.xml"/>
-
-  </part>
-
-  <index/>
-
-</book>
Index: OK/x86_64-index.xml
===================================================================
--- BOOK/x86_64-index.xml	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,85 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "general.ent">
-  %general-entities;
-]>
-
-<book>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/x86_64/bookinfo.xml"/>
-  <!--
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/dedication.xml"/>
-  -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/preface.xml"/>
-
-  <part id="part1">
-    <?dbhtml filename="part1.html"?>
-
-    <title>Introduction</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="introduction/x86_64-chapter.xml"/>
-
-  </part>
-
-  <part id="part2">
-    <?dbhtml filename="part2.html"?>
-
-    <title>Preparing for the Build</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="partitioning/x86-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="materials/x86_64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/x86_64-chapter.xml"/>
-
-  </part>
-
-  <part id="part3">
-    <?dbhtml filename="part3.html"?>
-
-    <title>Make the Cross-Compile Tools</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cross-tools/x86_64-chapter.xml"/>
-
-  </part>
-
-  <part id="part4">
-    <?dbhtml filename="part4.html"?>
-
-    <title>Building the Basic Tools</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="temp-system/x86_64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="boot/x86_64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="chroot/x86_64-chapter.xml"/>
-
-  </part>
-
-  <part id="part5">
-    <?dbhtml filename="part5.html"?>
-
-    <title>Building the CLFS System</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="testsuite-tools/x86_64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-system/x86_64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="system-config/x86_64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="network/x86_64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bootable/x86_64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="the-end/chapter.xml"/>
-
-  </part>
-
-  <part id="part6">
-    <?dbhtml filename="part6.html"?>
-
-    <title>Appendices</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/acronymlist.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/dependencies/common.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/dependencies/x86.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/rationale/common.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/license.xml"/>
-
-  </part>
-
-  <index/>
-
-</book>
Index: tches/automake-1.15-perl_5_26-1.patch
===================================================================
--- patches/automake-1.15-perl_5_26-1.patch	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,18 +1,0 @@
-Submitted by: Chris Staub (chris at clfs dot org)
-Date: 2017-06-01
-Initial Package Version: 1.15
-Origin: https://patchwork.ozlabs.org/patch/735705/
-Description: Updates Automake to work with Perl 5.26
-
-diff -Naur automake-1.15.orig/bin/automake.in automake-1.15/bin/automake.in
---- automake-1.15.orig/bin/automake.in	2015-01-05 14:25:55.000000000 -0500
-+++ automake-1.15/bin/automake.in	2017-06-01 16:17:54.000000000 -0400
-@@ -3878,7 +3878,7 @@
- sub substitute_ac_subst_variables
- {
-   my ($text) = @_;
--  $text =~ s/\${([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge;
-+  $text =~ s/\$[{]([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge;
-   return $text;
- }
- 
Index: tches/bash-4.4-branch_update-1.patch
===================================================================
--- patches/bash-4.4-branch_update-1.patch	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,479 +1,0 @@
-Submitted By: William Harrington (kb0iic at cross-lfs dot org)
-Date: 05-03-2017
-Initial Package Version: 4.4
-Origin: Upstream
-Upstream Status: Applied
-Description: Contains all upstream patches up to 4.4-012
-
-diff -Naur bash-4.4.orig/bashline.c bash-4.4/bashline.c
---- bash-4.4.orig/bashline.c	2016-08-06 01:44:05.000000000 +0000
-+++ bash-4.4/bashline.c	2017-04-13 23:33:07.549107403 +0000
-@@ -142,7 +142,7 @@
- static rl_icppfunc_t *save_directory_hook __P((void));
- static void restore_directory_hook __P((rl_icppfunc_t));
- 
--static int directory_exists __P((const char *));
-+static int directory_exists __P((const char *, int));
- 
- static void cleanup_expansion_error __P((void));
- static void maybe_make_readline_line __P((char *));
-@@ -3102,18 +3102,20 @@
-     rl_directory_rewrite_hook = hookf;
- }
- 
--/* Check whether not the (dequoted) version of DIRNAME, with any trailing slash
--   removed, exists. */
-+/* Check whether not DIRNAME, with any trailing slash removed, exists.  If
-+   SHOULD_DEQUOTE is non-zero, we dequote the directory name first. */
- static int
--directory_exists (dirname)
-+directory_exists (dirname, should_dequote)
-      const char *dirname;
-+     int should_dequote;
- {
-   char *new_dirname;
-   int dirlen, r;
-   struct stat sb;
- 
--  /* First, dequote the directory name */
--  new_dirname = bash_dequote_filename ((char *)dirname, rl_completion_quote_character);
-+  /* We save the string and chop the trailing slash because stat/lstat behave
-+     inconsistently if one is present. */
-+  new_dirname = should_dequote ? bash_dequote_filename ((char *)dirname, rl_completion_quote_character) : savestring (dirname);
-   dirlen = STRLEN (new_dirname);
-   if (new_dirname[dirlen - 1] == '/')
-     new_dirname[dirlen - 1] = '\0';
-@@ -3145,7 +3147,7 @@
-   else if (t = mbschr (local_dirname, '`'))	/* XXX */
-     should_expand_dirname = '`';
- 
--  if (should_expand_dirname && directory_exists (local_dirname))
-+  if (should_expand_dirname && directory_exists (local_dirname, 0))
-     should_expand_dirname = 0;
-   
-   if (should_expand_dirname)  
-@@ -3155,7 +3157,7 @@
- 	 have to worry about restoring this setting. */
-       global_nounset = unbound_vars_is_error;
-       unbound_vars_is_error = 0;
--      wl = expand_prompt_string (new_dirname, 0, W_NOCOMSUB|W_COMPLETE);	/* does the right thing */
-+      wl = expand_prompt_string (new_dirname, 0, W_NOCOMSUB|W_NOPROCSUB|W_COMPLETE);	/* does the right thing */
-       unbound_vars_is_error = global_nounset;
-       if (wl)
- 	{
-@@ -3244,13 +3246,13 @@
- 	should_expand_dirname = '`';
-     }
- 
--  if (should_expand_dirname && directory_exists (local_dirname))
-+  if (should_expand_dirname && directory_exists (local_dirname, 1))
-     should_expand_dirname = 0;
- 
-   if (should_expand_dirname)  
-     {
-       new_dirname = savestring (local_dirname);
--      wl = expand_prompt_string (new_dirname, 0, W_NOCOMSUB|W_COMPLETE);	/* does the right thing */
-+      wl = expand_prompt_string (new_dirname, 0, W_NOCOMSUB|W_NOPROCSUB|W_COMPLETE);	/* does the right thing */
-       if (wl)
- 	{
- 	  *dirname = string_list (wl);
-diff -Naur bash-4.4.orig/builtins/evalstring.c bash-4.4/builtins/evalstring.c
---- bash-4.4.orig/builtins/evalstring.c	2016-08-11 18:18:51.000000000 +0000
-+++ bash-4.4/builtins/evalstring.c	2017-04-13 23:33:07.545107350 +0000
-@@ -104,12 +104,9 @@
- 	  running_trap == 0 &&
- 	  *bash_input.location.string == '\0' &&
- 	  command->type == cm_simple &&
--#if 0
- 	  signal_is_trapped (EXIT_TRAP) == 0 &&
- 	  signal_is_trapped (ERROR_TRAP) == 0 &&
--#else
- 	  any_signals_trapped () < 0 &&
--#endif
- 	  command->redirects == 0 && command->value.Simple->redirects == 0 &&
- 	  ((command->flags & CMD_TIME_PIPELINE) == 0) &&
- 	  ((command->flags & CMD_INVERT_RETURN) == 0));
-diff -Naur bash-4.4.orig/builtins/pushd.def bash-4.4/builtins/pushd.def
---- bash-4.4.orig/builtins/pushd.def	2016-01-25 18:31:49.000000000 +0000
-+++ bash-4.4/builtins/pushd.def	2017-04-13 23:33:07.546107363 +0000
-@@ -365,7 +365,7 @@
- 	break;
-     }
- 
--  if (which > directory_list_offset || (directory_list_offset == 0 && which == 0))
-+  if (which > directory_list_offset || (which < -directory_list_offset) || (directory_list_offset == 0 && which == 0))
-     {
-       pushd_error (directory_list_offset, which_word ? which_word : "");
-       return (EXECUTION_FAILURE);
-@@ -387,6 +387,11 @@
- 	 remove that directory from the list and shift the remainder
- 	 of the list into place. */
-       i = (direction == '+') ? directory_list_offset - which : which;
-+      if (i < 0 || i > directory_list_offset)
-+	{
-+	  pushd_error (directory_list_offset, which_word ? which_word : "");
-+	  return (EXECUTION_FAILURE);
-+	}
-       free (pushd_directory_list[i]);
-       directory_list_offset--;
- 
-diff -Naur bash-4.4.orig/builtins/read.def bash-4.4/builtins/read.def
---- bash-4.4.orig/builtins/read.def	2016-05-16 18:24:56.000000000 +0000
-+++ bash-4.4/builtins/read.def	2017-04-13 23:33:07.609108202 +0000
-@@ -181,7 +181,8 @@
-      WORD_LIST *list;
- {
-   register char *varname;
--  int size, i, nr, pass_next, saw_escape, eof, opt, retval, code, print_ps2;
-+  int size, nr, pass_next, saw_escape, eof, opt, retval, code, print_ps2;
-+  volatile int i;
-   int input_is_tty, input_is_pipe, unbuffered_read, skip_ctlesc, skip_ctlnul;
-   int raw, edit, nchars, silent, have_timeout, ignore_delim, fd, lastsig, t_errno;
-   unsigned int tmsec, tmusec;
-diff -Naur bash-4.4.orig/expr.c bash-4.4/expr.c
---- bash-4.4.orig/expr.c	2015-10-11 18:46:36.000000000 +0000
-+++ bash-4.4/expr.c	2017-04-13 23:33:07.552107443 +0000
-@@ -578,24 +578,23 @@
-   rval = cval = explor ();
-   if (curtok == QUES)		/* found conditional expr */
-     {
--      readtok ();
--      if (curtok == 0 || curtok == COL)
--	evalerror (_("expression expected"));
-       if (cval == 0)
- 	{
- 	  set_noeval = 1;
- 	  noeval++;
- 	}
- 
-+      readtok ();
-+      if (curtok == 0 || curtok == COL)
-+	evalerror (_("expression expected"));
-+
-       val1 = EXP_HIGHEST ();
- 
-       if (set_noeval)
- 	noeval--;
-       if (curtok != COL)
- 	evalerror (_("`:' expected for conditional expression"));
--      readtok ();
--      if (curtok == 0)
--	evalerror (_("expression expected"));
-+
-       set_noeval = 0;
-       if (cval)
-  	{
-@@ -603,7 +602,11 @@
- 	  noeval++;
-  	}
- 
-+      readtok ();
-+      if (curtok == 0)
-+	evalerror (_("expression expected"));
-       val2 = expcond ();
-+
-       if (set_noeval)
- 	noeval--;
-       rval = cval ? val1 : val2;
-diff -Naur bash-4.4.orig/jobs.c bash-4.4/jobs.c
---- bash-4.4.orig/jobs.c	2016-08-23 20:38:44.000000000 +0000
-+++ bash-4.4/jobs.c	2017-04-13 23:33:07.542107310 +0000
-@@ -453,6 +453,21 @@
-     discard_pipeline (disposer);
- }
- 
-+void
-+discard_last_procsub_child ()
-+{
-+  PROCESS *disposer;
-+  sigset_t set, oset;
-+
-+  BLOCK_CHILD (set, oset);
-+  disposer = last_procsub_child;
-+  last_procsub_child = (PROCESS *)NULL;
-+  UNBLOCK_CHILD (oset);
-+
-+  if (disposer)
-+    discard_pipeline (disposer);
-+}
-+
- struct pipeline_saver *
- alloc_pipeline_saver ()
- {
-diff -Naur bash-4.4.orig/jobs.h bash-4.4/jobs.h
---- bash-4.4.orig/jobs.h	2016-04-27 14:35:51.000000000 +0000
-+++ bash-4.4/jobs.h	2017-04-13 23:33:07.542107310 +0000
-@@ -190,6 +190,7 @@
- extern void making_children __P((void));
- extern void stop_making_children __P((void));
- extern void cleanup_the_pipeline __P((void));
-+extern void discard_last_procsub_child __P((void));
- extern void save_pipeline __P((int));
- extern PROCESS *restore_pipeline __P((int));
- extern void start_pipeline __P((void));
-diff -Naur bash-4.4.orig/lib/glob/sm_loop.c bash-4.4/lib/glob/sm_loop.c
---- bash-4.4.orig/lib/glob/sm_loop.c	2016-04-10 15:23:21.000000000 +0000
-+++ bash-4.4/lib/glob/sm_loop.c	2017-04-13 23:33:07.540107283 +0000
-@@ -330,6 +330,12 @@
-   for (pc = 0; p[pc]; pc++)
-     if (p[pc] == L('.') && p[pc+1] == L(']'))
-       break;
-+   if (p[pc] == 0)
-+    {
-+      if (vp)
-+	*vp = INVALID;
-+      return (p + pc);
-+    }
-    val = COLLSYM (p, pc);
-    if (vp)
-      *vp = val;
-@@ -483,6 +489,9 @@
-       c = *p++;
-       c = FOLD (c);
- 
-+      if (c == L('\0'))
-+	return ((test == L('[')) ? savep : (CHAR *)0);
-+
-       if ((flags & FNM_PATHNAME) && c == L('/'))
- 	/* [/] can never match when matching a pathname.  */
- 	return (CHAR *)0;
-diff -Naur bash-4.4.orig/lib/readline/history.c bash-4.4/lib/readline/history.c
---- bash-4.4.orig/lib/readline/history.c	2015-12-28 18:50:31.000000000 +0000
-+++ bash-4.4/lib/readline/history.c	2017-04-13 23:33:07.607108175 +0000
-@@ -57,6 +57,8 @@
- /* How big to make the_history when we first allocate it. */
- #define DEFAULT_HISTORY_INITIAL_SIZE	502
- 
-+#define MAX_HISTORY_INITIAL_SIZE	8192
-+
- /* The number of slots to increase the_history by. */
- #define DEFAULT_HISTORY_GROW_SIZE 50
- 
-@@ -277,6 +279,7 @@
-      const char *string;
- {
-   HIST_ENTRY *temp;
-+  int new_length;
- 
-   if (history_stifled && (history_length == history_max_entries))
-     {
-@@ -293,13 +296,9 @@
- 
-       /* Copy the rest of the entries, moving down one slot.  Copy includes
- 	 trailing NULL.  */
--#if 0
--      for (i = 0; i < history_length; i++)
--	the_history[i] = the_history[i + 1];
--#else
-       memmove (the_history, the_history + 1, history_length * sizeof (HIST_ENTRY *));
--#endif
- 
-+      new_length = history_length;
-       history_base++;
-     }
-   else
-@@ -307,11 +306,13 @@
-       if (history_size == 0)
- 	{
- 	  if (history_stifled && history_max_entries > 0)
--	    history_size = history_max_entries + 2;
-+	    history_size = (history_max_entries > MAX_HISTORY_INITIAL_SIZE)
-+				? MAX_HISTORY_INITIAL_SIZE
-+				: history_max_entries + 2;
- 	  else
- 	    history_size = DEFAULT_HISTORY_INITIAL_SIZE;
- 	  the_history = (HIST_ENTRY **)xmalloc (history_size * sizeof (HIST_ENTRY *));
--	  history_length = 1;
-+	  new_length = 1;
- 	}
-       else
- 	{
-@@ -321,14 +322,15 @@
- 	      the_history = (HIST_ENTRY **)
- 		xrealloc (the_history, history_size * sizeof (HIST_ENTRY *));
- 	    }
--	  history_length++;
-+	  new_length = history_length + 1;
- 	}
-     }
- 
-   temp = alloc_history_entry ((char *)string, hist_inittime ());
- 
--  the_history[history_length] = (HIST_ENTRY *)NULL;
--  the_history[history_length - 1] = temp;
-+  the_history[new_length] = (HIST_ENTRY *)NULL;
-+  the_history[new_length - 1] = temp;
-+  history_length = new_length;
- }
- 
- /* Change the time stamp of the most recent history entry to STRING. */
-diff -Naur bash-4.4.orig/patchlevel.h bash-4.4/patchlevel.h
---- bash-4.4.orig/patchlevel.h	2016-06-22 18:51:03.000000000 +0000
-+++ bash-4.4/patchlevel.h	2017-04-13 23:33:07.612108242 +0000
-@@ -25,6 +25,6 @@
-    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
-    looks for to find the patch level (for the sccs version string). */
- 
--#define PATCHLEVEL 0
-+#define PATCHLEVEL 12
- 
- #endif /* _PATCHLEVEL_H_ */
-diff -Naur bash-4.4.orig/sig.c bash-4.4/sig.c
---- bash-4.4.orig/sig.c	2016-02-11 20:02:45.000000000 +0000
-+++ bash-4.4/sig.c	2017-04-13 23:33:07.609108202 +0000
-@@ -585,7 +585,8 @@
- #if defined (JOB_CONTROL)
-   if (sig == SIGHUP && (interactive || (subshell_environment & (SUBSHELL_COMSUB|SUBSHELL_PROCSUB))))
-     hangup_all_jobs ();
--  end_job_control ();
-+  if ((subshell_environment & (SUBSHELL_COMSUB|SUBSHELL_PROCSUB)) == 0)
-+    end_job_control ();
- #endif /* JOB_CONTROL */
- 
- #if defined (PROCESS_SUBSTITUTION)
-diff -Naur bash-4.4.orig/subst.c bash-4.4/subst.c
---- bash-4.4.orig/subst.c	2016-08-30 20:46:38.000000000 +0000
-+++ bash-4.4/subst.c	2017-04-13 23:33:07.612108242 +0000
-@@ -2825,11 +2825,15 @@
- 
- /* Parse a single word from STRING, using SEPARATORS to separate fields.
-    ENDPTR is set to the first character after the word.  This is used by
--   the `read' builtin.  This is never called with SEPARATORS != $IFS;
--   it should be simplified.
-+   the `read' builtin.
-+   
-+   This is never called with SEPARATORS != $IFS, and takes advantage of that.
- 
-    XXX - this function is very similar to list_string; they should be
- 	 combined - XXX */
-+
-+#define islocalsep(c)	(local_cmap[(unsigned char)(c)] != 0)
-+
- char *
- get_word_from_string (stringp, separators, endptr)
-      char **stringp, *separators, **endptr;
-@@ -2837,6 +2841,7 @@
-   register char *s;
-   char *current_word;
-   int sindex, sh_style_split, whitesep, xflags;
-+  unsigned char local_cmap[UCHAR_MAX+1];	/* really only need single-byte chars here */
-   size_t slen;
- 
-   if (!stringp || !*stringp || !**stringp)
-@@ -2846,20 +2851,23 @@
- 				 separators[1] == '\t' &&
- 				 separators[2] == '\n' &&
- 				 separators[3] == '\0';
--  for (xflags = 0, s = ifs_value; s && *s; s++)
-+  memset (local_cmap, '\0', sizeof (local_cmap));
-+  for (xflags = 0, s = separators; s && *s; s++)
-     {
-       if (*s == CTLESC) xflags |= SX_NOCTLESC;
-       if (*s == CTLNUL) xflags |= SX_NOESCCTLNUL;
-+      local_cmap[(unsigned char)*s] = 1;	/* local charmap of separators */
-     }
- 
-   s = *stringp;
-   slen = 0;
- 
-   /* Remove sequences of whitespace at the beginning of STRING, as
--     long as those characters appear in IFS. */
--  if (sh_style_split || !separators || !*separators)
-+     long as those characters appear in SEPARATORS.  This happens if
-+     SEPARATORS == $' \t\n' or if IFS is unset. */
-+  if (sh_style_split || separators == 0)
-     {
--      for (; *s && spctabnl (*s) && isifs (*s); s++);
-+      for (; *s && spctabnl (*s) && islocalsep (*s); s++);
- 
-       /* If the string is nothing but whitespace, update it and return. */
-       if (!*s)
-@@ -2878,9 +2886,9 @@
- 
-      This obeys the field splitting rules in Posix.2. */
-   sindex = 0;
--  /* Don't need string length in ADVANCE_CHAR or string_extract_verbatim
--     unless multibyte chars are possible. */
--  slen = (MB_CUR_MAX > 1) ? STRLEN (s) : 1;
-+  /* Don't need string length in ADVANCE_CHAR unless multibyte chars are
-+     possible, but need it in string_extract_verbatim for bounds checking */
-+  slen = STRLEN (s);
-   current_word = string_extract_verbatim (s, slen, &sindex, separators, xflags);
- 
-   /* Set ENDPTR to the first character after the end of the word. */
-@@ -2899,19 +2907,19 @@
- 
-   /* Now skip sequences of space, tab, or newline characters if they are
-      in the list of separators. */
--  while (s[sindex] && spctabnl (s[sindex]) && isifs (s[sindex]))
-+  while (s[sindex] && spctabnl (s[sindex]) && islocalsep (s[sindex]))
-     sindex++;
- 
-   /* If the first separator was IFS whitespace and the current character is
-      a non-whitespace IFS character, it should be part of the current field
-      delimiter, not a separate delimiter that would result in an empty field.
-      Look at POSIX.2, 3.6.5, (3)(b). */
--  if (s[sindex] && whitesep && isifs (s[sindex]) && !spctabnl (s[sindex]))
-+  if (s[sindex] && whitesep && islocalsep (s[sindex]) && !spctabnl (s[sindex]))
-     {
-       sindex++;
-       /* An IFS character that is not IFS white space, along with any adjacent
- 	 IFS white space, shall delimit a field. */
--      while (s[sindex] && spctabnl (s[sindex]) && isifs (s[sindex]))
-+      while (s[sindex] && spctabnl (s[sindex]) && islocalsep(s[sindex]))
- 	sindex++;
-     }
- 
-@@ -5808,10 +5816,7 @@
-     {
- #if defined (JOB_CONTROL)
-       if (last_procsub_child)
--	{
--	  discard_pipeline (last_procsub_child);
--	  last_procsub_child = (PROCESS *)NULL;
--	}
-+	discard_last_procsub_child ();
-       last_procsub_child = restore_pipeline (0);
- #endif
- 
-@@ -5931,6 +5936,7 @@
-   char *istring, buf[128], *bufp, *s;
-   int istring_index, istring_size, c, tflag, skip_ctlesc, skip_ctlnul;
-   ssize_t bufn;
-+  int nullbyte;
- 
-   istring = (char *)NULL;
-   istring_index = istring_size = bufn = tflag = 0;
-@@ -5938,6 +5944,8 @@
-   for (skip_ctlesc = skip_ctlnul = 0, s = ifs_value; s && *s; s++)
-     skip_ctlesc |= *s == CTLESC, skip_ctlnul |= *s == CTLNUL;
- 
-+  nullbyte = 0;
-+
-   /* Read the output of the command through the pipe.  This may need to be
-      changed to understand multibyte characters in the future. */
-   while (1)
-@@ -5956,7 +5964,11 @@
-       if (c == 0)
- 	{
- #if 1
--	  internal_warning ("%s", _("command substitution: ignored null byte in input"));
-+	  if (nullbyte == 0)
-+	    {
-+	      internal_warning ("%s", _("command substitution: ignored null byte in input"));
-+	      nullbyte = 1;
-+	    }
- #endif
- 	  continue;
- 	}
-@@ -9454,6 +9466,10 @@
- 		tword->flags |= word->flags & (W_ASSIGNARG|W_ASSIGNRHS);	/* affects $@ */
- 	      if (word->flags & W_COMPLETE)
- 		tword->flags |= W_COMPLETE;	/* for command substitutions */
-+	      if (word->flags & W_NOCOMSUB)
-+		tword->flags |= W_NOCOMSUB;
-+	      if (word->flags & W_NOPROCSUB)
-+		tword->flags |= W_NOPROCSUB;
- 
- 	      temp = (char *)NULL;
- 
Index: tches/colo-1.22-make_fix-1.patch
===================================================================
--- patches/colo-1.22-make_fix-1.patch	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,57 +1,0 @@
-Submitted By: Joe Ciccone <joeciccone@crazyeyesoft.com>
-Date: 2005-11-23
-Initial Package Version: 1.19
-Upstream Status: Sent
-Origin: Joe Ciccone <joeciccone@crazyeyesoft.com
-Description: Adds flags to the stage1, stage2, and chain Makefiles
-             forcing them to build as 32bit.
-
-	     2-2-06 Updated for Colo 1.21 
-diff -Naur colo-1.21.orig/chain/Makefile colo-1.21/chain/Makefile
---- colo-1.21.orig/chain/Makefile	2006-01-17 23:03:58.000000000 +0000
-+++ colo-1.21/chain/Makefile	2006-02-02 15:43:32.000000000 +0000
-@@ -18,9 +18,9 @@
- 
- DEPS=$(OBJS:.o=.d)
- 
--LDFLAGS= -nostdlib -Wl,-T,$(TARG).lnk,-Map,$(TARG).map
--CFLAGS= -Werror -Wall -Wstrict-prototypes -fomit-frame-pointer -O2 -fno-strict-aliasing $(CFLAGS_CPU) $(CFLAGS_COLO)
--CPPFLAGS= -MD -nostdinc -Iinclude -I../include -D_DEBUG $(CPPFLAGS_GCC)
-+LDFLAGS= -mabi=32 -nostdlib -Wl,-T,$(TARG).lnk,-Map,$(TARG).map
-+CFLAGS= -mabi=32 -Werror -Wall -Wstrict-prototypes -fomit-frame-pointer -O2 -fno-strict-aliasing $(CFLAGS_CPU) $(CFLAGS_COLO)
-+CPPFLAGS= -mabi=32 -MD -nostdinc -Iinclude -I../include -D_DEBUG $(CPPFLAGS_GCC)
- 
- all:
- 	$(MAKE) -C .. binary
-diff -Naur colo-1.21.orig/stage1/Makefile colo-1.21/stage1/Makefile
---- colo-1.21.orig/stage1/Makefile	2006-01-17 23:03:58.000000000 +0000
-+++ colo-1.21/stage1/Makefile	2006-02-02 15:44:18.000000000 +0000
-@@ -21,9 +21,9 @@
- 
- DEPS=$(OBJS:.o=.d)
- 
--LDFLAGS= -nostdlib -Wl,-T,$(TARG).lnk,-Map,$(TARG).map
--CFLAGS= -Werror -Wall -Wstrict-prototypes -fomit-frame-pointer -O2 -fno-strict-aliasing $(CFLAGS_CPU) $(CFLAGS_COLO)
--CPPFLAGS= -MD -nostdinc -Iinclude -I../include -D_DEBUG $(CPPFLAGS_GCC)
-+LDFLAGS= -mabi=32 -nostdlib -Wl,-T,$(TARG).lnk,-Map,$(TARG).map
-+CFLAGS= -mabi=32 -Werror -Wall -Wstrict-prototypes -fomit-frame-pointer -O2 -fno-strict-aliasing $(CFLAGS_CPU) $(CFLAGS_COLO)
-+CPPFLAGS= -mabi=32 -MD -nostdinc -Iinclude -I../include -D_DEBUG $(CPPFLAGS_GCC)
- 
- all:
- 	$(MAKE) -C .. binary
-diff -Naur colo-1.21.orig/stage2/Makefile colo-1.21/stage2/Makefile
---- colo-1.21.orig/stage2/Makefile	2006-01-17 23:03:58.000000000 +0000
-+++ colo-1.21/stage2/Makefile	2006-02-02 15:44:02.000000000 +0000
-@@ -54,9 +54,9 @@
- 
- DEPS=$(OBJS:.o=.d)
- 
--LDFLAGS= -nostdlib -Wl,-T,$(TARG).lnk,-Map,$(TARG).map,--emit-relocs
--CFLAGS= -Werror -Wall -Wstrict-prototypes -fomit-frame-pointer -O2 -fno-strict-aliasing $(CFLAGS_CPU) $(CFLAGS_COLO)
--CPPFLAGS= -MD -nostdinc -Iinclude -I../include -D_DEBUG $(CPPFLAGS_GCC)
-+LDFLAGS= -mabi=32 -nostdlib -Wl,-T,$(TARG).lnk,-Map,$(TARG).map,--emit-relocs
-+CFLAGS= -mabi=32 -Werror -Wall -Wstrict-prototypes -fomit-frame-pointer -O2 -fno-strict-aliasing $(CFLAGS_CPU) $(CFLAGS_COLO)
-+CPPFLAGS= -mabi=32 -MD -nostdinc -Iinclude -I../include -D_DEBUG $(CPPFLAGS_GCC)
- 
- LOADADDR= $(shell $(CROSS_COMPILE)readelf -l $(TARG) | awk '$$1 ~ /^LOAD$$/ { print $$3 }')
- 
Index: tches/colo-1.22-relocation_fix-1.patch
===================================================================
--- patches/colo-1.22-relocation_fix-1.patch	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,21 +1,0 @@
-Submitted By: Joe Ciccone <jciccone@linuxfromscratch.org>
-Date: 2006-06-11
-Initial Package Version: 1.21
-Upstream Status: Unknown
-Origin: Joe Ciccone
-Description: Fixes relocation errors when linking.
-
-diff -Naur colo-1.21.orig/stage1/include/lib.h colo-1.21/stage1/include/lib.h
---- colo-1.21.orig/stage1/include/lib.h	2006-01-17 18:03:58.000000000 -0500
-+++ colo-1.21/stage1/include/lib.h	2006-07-11 01:01:29.000000000 -0400
-@@ -47,8 +47,8 @@
- 
- /* fast.c */
- 
--extern void * __attribute__((section(".data"))) _memcpy_w(void *, const void *, size_t);
--extern void * __attribute__((section(".data"))) _memset_w(void *, int, size_t);
-+extern void * _memcpy_w(void *, const void *, size_t);
-+extern void * _memset_w(void *, int, size_t);
- 
- #endif
- 
Index: tches/coreutils-8.27-uname-1.patch
===================================================================
--- patches/coreutils-8.27-uname-1.patch	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,182 +1,0 @@
-Submitted By: Jim Gifford <jim at cross-lfs dot org>
-Date: 2010-07-26
-Initial Package Version: 5.97
-Upstream Status: Not Accepted
-Origin: Gentoo - http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/coreutils
-Description: Display CPU Information from /proc/cpuinfo or /proc/sysinfo
-
-Rediffed for 7.1 by Jim Gifford
-Rediffed for 7.5 by Jim Gifford
-Rediffed for 8.4 by Joe Ciccone
-Rediffed for 8.9 by Joe Ciccone
-Rediffed for 8.16 by Jonathan Norman - 2012-06-10
-Rediffed for 8.19 by William Harrington - 2012-08-27
-Renamed for 8.20 by William Harrington - 2012-11-01
-Rediffed for 8.21 by William Harrington 2013-05-31
-Renamed for 8.22 by William Harrington - 2013-12-14
-Renamed for 8.23 by William Harrington - 2014-10-30
-Renamed for 8.27 by William Harrington - 2017-05-24
-
-diff -Naur coreutils-8.21.orig/src/uname.c coreutils-8.21/src/uname.c
---- coreutils-8.21.orig/src/uname.c	2013-01-31 00:46:24.000000000 +0000
-+++ coreutils-8.21/src/uname.c	2013-05-31 13:41:32.683326834 +0000
-@@ -49,6 +49,11 @@
- # include <mach-o/arch.h>
- #endif
- 
-+#if defined (__linux__)
-+# define USE_PROCINFO
-+# define UNAME_HARDWARE_PLATFORM
-+#endif
-+
- #include "system.h"
- #include "error.h"
- #include "quote.h"
-@@ -153,6 +158,117 @@
-   exit (status);
- }
- 
-+#if defined(USE_PROCINFO)
-+
-+# if defined(__s390__) || defined(__s390x__)
-+#  define CPUINFO_FILE    "/proc/sysinfo"
-+#  define CPUINFO_FORMAT  "%64[^\t :]%*[ :]%256[^\n]%c"
-+# else
-+#  define CPUINFO_FILE    "/proc/cpuinfo"
-+#  define CPUINFO_FORMAT  "%64[^\t:]\t:%256[^\n]%c"
-+# endif
-+
-+# define PROCINFO_PROCESSOR      0
-+# define PROCINFO_HARDWARE_PLATFORM 1
-+
-+static void __eat_cpuinfo_space(char *buf)
-+{
-+	/* first eat trailing space */
-+	char *tmp = buf + strlen(buf) - 1;
-+	while (tmp > buf && isspace(*tmp))
-+		*tmp-- = '\0';
-+	/* then eat leading space */
-+	tmp = buf;
-+	while (*tmp && isspace(*tmp))
-+		tmp++;
-+	if (tmp != buf)
-+		memmove(buf, tmp, strlen(tmp)+1);
-+	/* finally collapse whitespace */
-+	tmp = buf;
-+	while (tmp[0] && tmp[1]) {
-+		if (isspace(tmp[0]) && isspace(tmp[1])) {
-+			memmove(tmp, tmp+1, strlen(tmp));
-+			continue;
-+		}
-+		++tmp;
-+	}
-+}
-+
-+static int __linux_procinfo (int x, char *fstr, size_t s)
-+{
-+	FILE *fp;
-+
-+	char *procinfo_keys[] = {
-+		/* --processor --hardware-platform */
-+		#if defined(__alpha__)
-+			"cpu model", "system type"
-+		#elif defined(__arm__)
-+			"Processor", "Hardware"
-+		#elif defined(__avr32__)
-+			"processor", "cpu family"
-+		#elif defined(__bfin__)
-+			"CPU", "BOARD Name"
-+		#elif defined(__cris__)
-+			"cpu", "cpu model"
-+		#elif defined(__frv__)
-+			"CPU-Core", "System"
-+		#elif defined(__i386__) || defined(__x86_64__)
-+			"model name", "vendor_id"
-+		#elif defined(__ia64__)
-+			"family", "vendor"
-+		#elif defined(__hppa__)
-+			"cpu", "model"
-+		#elif defined(__m68k__)
-+			"CPU", "MMU"
-+		#elif defined(__mips__)
-+			"cpu model", "system type"
-+		#elif defined(__powerpc__) || defined(__powerpc64__)
-+			"cpu", "machine"
-+		#elif defined(__s390__) || defined(__s390x__)
-+			"Type", "Manufacturer"
-+		#elif defined(__sh__)
-+			"cpu type", "machine"
-+		#elif defined(sparc) || defined(__sparc__)
-+			"type", "cpu"
-+		#elif defined(__vax__)
-+			"cpu type", "cpu"
-+		#else
-+			"unknown", "unknown"
-+		#endif
-+	};
-+
-+	if ((fp = fopen(CPUINFO_FILE, "r")) != NULL) {
-+		char key[65], value[257], eol, *ret = NULL;
-+
-+		while (fscanf(fp, CPUINFO_FORMAT, key, value, &eol) != EOF) {
-+			__eat_cpuinfo_space(key);
-+			if (!strcmp(key, procinfo_keys[x])) {
-+				__eat_cpuinfo_space(value);
-+				ret = value;
-+				break;
-+			}
-+			if (eol != '\n') {
-+				/* we need two fscanf's here in case the previous
-+				 * length limit caused us to read right up to the
-+				 * newline ... doing "%*[^\n]\n" wont eat the newline
-+				 */
-+				fscanf(fp, "%*[^\n]");
-+				fscanf(fp, "\n");
-+			}
-+		}
-+		fclose(fp);
-+
-+		if (ret) {
-+			strncpy(fstr, ret, s);
-+			return 0;
-+		}
-+	}
-+
-+	return -1;
-+}
-+
-+#endif
-+
- /* Print ELEMENT, preceded by a space if something has already been
-    printed.  */
- 
-@@ -300,10 +416,14 @@
-   if (toprint & PRINT_PROCESSOR)
-     {
-       char const *element = unknown;
--#if HAVE_SYSINFO && defined SI_ARCHITECTURE
-+#if ( HAVE_SYSINFO && defined SI_ARCHITECTURE ) || defined(USE_PROCINFO)
-       {
-         static char processor[257];
-+#if defined(USE_PROCINFO)
-+        if (0 <= __linux_procinfo (PROCINFO_PROCESSOR, processor, sizeof processor))
-+#else
-         if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor))
-+#endif
-           element = processor;
-       }
- #endif
-@@ -356,9 +476,13 @@
-       if (element == unknown)
-         {
-           static char hardware_platform[257];
-+#if defined(USE_PROCINFO)
-+        if (0 <= __linux_procinfo (PROCINFO_HARDWARE_PLATFORM, hardware_platform, sizeof hardware_platform))
-+#else
-           size_t s = sizeof hardware_platform;
-           static int mib[] = { CTL_HW, UNAME_HARDWARE_PLATFORM };
-           if (sysctl (mib, 2, hardware_platform, &s, 0, 0) >= 0)
-+#endif
-             element = hardware_platform;
-         }
- #endif
Index: tches/dvhtool-1.0.1-fixes-1.patch
===================================================================
--- patches/dvhtool-1.0.1-fixes-1.patch	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,169 +1,0 @@
-Submitted By: Jim Gifford (patches at jg555 dot com)
-Date: 2005-11-20
-Initial Package Version: 1.0.1
-Origin: Gentoo and Debian
-Upstream Status: Applied
-Description: Fixes Build issues with Dvhtool
-             Adds support for LVM and Linux Partitions
- 
-diff -Naur dvhtool-1.0.1.orig/Makefile.in dvhtool-1.0.1/Makefile.in
---- dvhtool-1.0.1.orig/Makefile.in	2001-04-17 18:07:24.000000000 +0000
-+++ dvhtool-1.0.1/Makefile.in	2005-11-21 03:17:54.000000000 +0000
-@@ -1,4 +1,4 @@
--# Makefile.in generated automatically by automake 1.4a from Makefile.am
-+# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
- 
- # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
-@@ -46,10 +46,9 @@
- AUTOHEADER = @AUTOHEADER@
- 
- INSTALL = @INSTALL@
--INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
--INSTALL_STRIP_FLAG =
- transform = @program_transform_name@
- 
- NORMAL_INSTALL = :
-@@ -104,7 +103,7 @@
- 
- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
- 
--TAR = gtar
-+TAR = tar
- GZIP_ENV = --best
- DEP_FILES =  .deps/dvhlib.P .deps/dvhtool.P .deps/getopt.P \
- .deps/getopt1.P .deps/pread.P
-@@ -124,7 +123,7 @@
- $(ACLOCAL_M4):  configure.in  acinclude.m4
- 	cd $(srcdir) && $(ACLOCAL)
- 
--config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+config.status: $(srcdir)/configure.in $(CONFIG_STATUS_DEPENDENCIES)
- 	$(SHELL) ./config.status --recheck
- $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
- 	cd $(srcdir) && $(AUTOCONF)
-@@ -173,8 +172,8 @@
- 	$(mkinstalldirs) $(DESTDIR)$(sbindir)
- 	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
- 	  if test -f $$p; then \
--	    echo "  $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
--	     $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
-+	    echo "  $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
-+	     $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
- 	  else :; fi; \
- 	done
- 
-@@ -382,7 +381,7 @@
- all-am: Makefile $(PROGRAMS) $(MANS) $(HEADERS) config.h
- all-redirect: all-am
- install-strip:
--	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
-+	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
- installdirs:
- 	$(mkinstalldirs)  $(DESTDIR)$(sbindir) $(DESTDIR)$(mandir)/man8
- 
-diff -Naur dvhtool-1.0.1.orig/aclocal.m4 dvhtool-1.0.1/aclocal.m4
---- dvhtool-1.0.1.orig/aclocal.m4	2000-11-07 00:05:27.000000000 +0000
-+++ dvhtool-1.0.1/aclocal.m4	2005-11-21 03:17:54.000000000 +0000
-@@ -1,4 +1,4 @@
--dnl aclocal.m4 generated automatically by aclocal 1.4a
-+dnl aclocal.m4 generated automatically by aclocal 1.4-p4
- 
- dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
- dnl This file is free software; the Free Software Foundation
-@@ -51,8 +51,6 @@
- 
- AC_DEFUN(AM_INIT_AUTOMAKE,
- [AC_REQUIRE([AC_PROG_INSTALL])
--dnl We require 2.13 because we rely on SHELL being computed by configure.
--AC_PREREQ([2.13])
- PACKAGE=[$1]
- AC_SUBST(PACKAGE)
- VERSION=[$2]
-diff -Naur dvhtool-1.0.1.orig/dvh.h dvhtool-1.0.1/dvh.h
---- dvhtool-1.0.1.orig/dvh.h	2001-02-22 02:29:45.000000000 +0000
-+++ dvhtool-1.0.1/dvh.h	2005-11-21 03:18:42.000000000 +0000
-@@ -127,6 +127,10 @@
- #define	PTYPE_XFSLOG	11		/* partition is sgi XFS log */
- #define	PTYPE_XLV	12		/* partition is part of an XLV vol */
- #define	PTYPE_XVM	13		/* partition is sgi XVM */
-+#define	PTYPE_LSWAP	0x82		/* partition is Linux swap */
-+#define	PTYPE_LINUX	0x83		/* partition is Linux native */
-+#define PTYPE_LLVM	0x8e		/* partition is Linux LVM */
-+#define PTYPE_LRAID	0xfd		/* partition is Linux RAID */
- #define NPTYPES		16
- 
- #define	VHMAGIC		0xbe5a941	/* randomly chosen value */
-diff -Naur dvhtool-1.0.1.orig/dvhlib.c dvhtool-1.0.1/dvhlib.c
---- dvhtool-1.0.1.orig/dvhlib.c	2001-02-24 10:37:37.000000000 +0000
-+++ dvhtool-1.0.1/dvhlib.c	2005-11-21 03:18:42.000000000 +0000
-@@ -50,6 +50,10 @@
- 	case PTYPE_XFSLOG:	return "XFS Log";
- 	case PTYPE_XLV:		return "XLV Volume";
- 	case PTYPE_XVM:		return "XVM Volume";
-+	case PTYPE_LSWAP:	return "Linux Swap";
-+	case PTYPE_LINUX:	return "Linux Native";
-+	case PTYPE_LLVM:	return "Linux LVM";
-+	case PTYPE_LRAID:	return "Linux RAID";
- 	}
- 	return "Unknown Partition Type";
- }
-@@ -325,8 +329,10 @@
- 	if (res == -1)
- 		die("Couldn't stat source file");
- 
--	/* XXX pad to blocksize? */
--	size = vh->vh_pt[8].pt_nblks * blksize - istat.st_size;
-+	/* calculate free blocks in vh */
-+	size = vh->vh_pt[8].pt_nblks				/* total vh size */
-+		- ( vh->vh_pt[8].pt_firstlbn + 4 )		/* reserved area */
-+		- (( istat.st_size + blksize - 1 ) / blksize );	/* pad to blocksize */
- 	/*
- 	 * Are we replacing an existing file, check for enough space and free
- 	 * entry in volume header
-@@ -336,16 +342,15 @@
- 			/* It's an existing file, delete it.  */
- 			memset(vd->vd_name, 0, VDNAMESIZE);
- 			vd->vd_nbytes = 0;
--			break;
- 		}
- 		if ( vd->vd_nbytes ) {
--			size -= vd->vd_nbytes;
-+			size -= (vd->vd_nbytes + blksize - 1 ) / blksize; /* pad to blocksize */
- 			num++;
- 		}
- 		vd++;
- 	}
- 
--	if ( num == NVDIR ) 
-+	if ( num == NVDIR )
- 		die("No more free entries in volume header");
- 	if ( size <= 0 )
- 		die("Not enough space left in volume header");
-@@ -403,7 +408,7 @@
- 				die("Short write");
- 			}
- 		}
--		dest += (vd->vd_nbytes + 511) / 512;	/* XXX Blocksize  */
-+		dest += (vd->vd_nbytes + blksize - 1) / blksize;
- 		vd++;
- 	}
- 
-diff -Naur dvhtool-1.0.1.orig/dvhtool.8 dvhtool-1.0.1/dvhtool.8
---- dvhtool-1.0.1.orig/dvhtool.8	2001-02-24 10:37:37.000000000 +0000
-+++ dvhtool-1.0.1/dvhtool.8	2005-11-21 03:17:54.000000000 +0000
-@@ -1,4 +1,4 @@
--.TH DVHTOOL 1 "July 2000"
-+.TH DVHTOOL 8 "July 2000"
- .UC 4
- .SH NAME
- dvhtool \- Disk volume header manipulation tool
-@@ -85,4 +85,4 @@
- .PP
- .I dvhtool
- was written by Ralf Baechle <ralf@oss.sgi.com>, Keith M. Wesolowski <wesolows@foobazco.org>,
--Tor Arntsen <tor@spacetec.no>, Guido Guenther <guido.guenther@gmx.net>. 
-+Tor Arntsen <tor@spacetec.no>, Guido Guenther <agx@debian.org>. 
Index: tches/elftoaout-2.3-64bit_fixes-1.patch
===================================================================
--- patches/elftoaout-2.3-64bit_fixes-1.patch	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,261 +1,0 @@
-Submitted By: Jim Gifford (patches at jg555 dot com)
-Date: 2006-01-03
-Initial Package Version: 2.3
-Origin: Dave Miller
-Upstream Status: Unknown
-Description: Fixes 64 Bit Issues with Elftoaout
-
-	http://marc.theaimsgroup.com/?l=linux-sparc&m=113617505627794&w=2
- 
-diff -Naur elftoaout-2.3.orig/elftoaout.c elftoaout-2.3/elftoaout.c
---- elftoaout-2.3.orig/elftoaout.c	2000-06-03 20:20:12.000000000 +0000
-+++ elftoaout-2.3/elftoaout.c	2006-01-03 22:33:28.000000000 +0000
-@@ -20,16 +20,36 @@
-  */
- #include <stdio.h>
- #include <stdlib.h>
--#ifdef linux
- #include <linux/elf.h>
--#define ELFDATA2MSB   2
--#else
--#include <sys/elf.h>
--#endif
--
--#define swab16(x)  (((x)<<8&0xFF00)|((x)>>8&0x00FF))
--#define swab32(x)  (((x)<<24&0xFF000000)|((x)<<8&0x00FF0000)|((x)>>24&0x000000FF)|((x)>>8&0x0000FF00))
--#define swab64(x)  ((((unsigned long long)(swab32((unsigned int)x))) << 32) | (swab32(((unsigned long long)x)>>32)))
-+#include <sys/types.h>
-+
-+static inline u_int16_t swab16(u_int16_t x)
-+{
-+	return (((x << 8)  & 0xFF00) |
-+		((x >> 8) & 0x00FF));
-+}
-+
-+static inline u_int32_t swab32(u_int32_t x)
-+{
-+	return (((x << 24) & 0xFF000000) |
-+		((x <<  8) & 0x00FF0000) |
-+		((x >> 24) & 0x000000FF) |
-+		((x >>  8) & 0x0000FF00));
-+}
-+
-+static inline u_int64_t swab64(u_int64_t x)
-+{
-+	return ((u_int64_t)
-+	((u_int64_t)(((u_int64_t)x & (u_int64_t)0x00000000000000ffULL) << 56) |
-+	 (u_int64_t)(((u_int64_t)x & (u_int64_t)0x000000000000ff00ULL) << 40) |
-+	 (u_int64_t)(((u_int64_t)x & (u_int64_t)0x0000000000ff0000ULL) << 24) |
-+	 (u_int64_t)(((u_int64_t)x & (u_int64_t)0x00000000ff000000ULL) <<  8) |
-+	 (u_int64_t)(((u_int64_t)x & (u_int64_t)0x000000ff00000000ULL) >>  8) |
-+	 (u_int64_t)(((u_int64_t)x & (u_int64_t)0x0000ff0000000000ULL) >> 24) |
-+	 (u_int64_t)(((u_int64_t)x & (u_int64_t)0x00ff000000000000ULL) >> 40) |
-+	 (u_int64_t)(((u_int64_t)x & (u_int64_t)0xff00000000000000ULL) >> 56)));
-+}
-+
- 
- /* We carry a.out header here in order to compile the thing on Solaris */
- 
-@@ -37,14 +57,14 @@
- #define	CMAGIC	    0x01030108
- 
- typedef struct {
--	unsigned long	a_magic;	/* magic number */
--	unsigned long	a_text;		/* size of text segment */
--	unsigned long	a_data;		/* size of initialized data */
--	unsigned long	a_bss;		/* size of uninitialized data */
--	unsigned long	a_syms;		/* size of symbol table || checksum */
--	unsigned long	a_entry;	/* entry point */
--	unsigned long	a_trsize;	/* size of text relocation */
--	unsigned long	a_drsize;	/* size of data relocation */
-+	u_int32_t	a_magic;	/* magic number */
-+	u_int32_t	a_text;		/* size of text segment */
-+	u_int32_t	a_data;		/* size of initialized data */
-+	u_int32_t	a_bss;		/* size of uninitialized data */
-+	u_int32_t	a_syms;		/* size of symbol table || checksum */
-+	u_int32_t	a_entry;	/* entry point */
-+	u_int32_t	a_trsize;	/* size of text relocation */
-+	u_int32_t	a_drsize;	/* size of data relocation */
- } Exec;
- 
- 
-@@ -56,17 +76,16 @@
- 	int swab;
- 	int sparc64;
- 	int csum;
--	/* friend void Usage(void); */
- } Application;
- 
- typedef struct {
- 	Elf32_Phdr *tab;
--	unsigned len;
-+	unsigned int len;
- } ProgTable;
- 
- typedef struct {
- 	Elf64_Phdr *tab;
--	unsigned len;
-+	unsigned int len;
- } ProgTable64;
- 
- void get_ptab(ProgTable *t, FILE *inp, const Elf32_Ehdr *h);
-@@ -75,9 +94,9 @@
- void print_ptab64(ProgTable64 *t);
- 
- typedef struct {
--	char *buf;                /* Image data */
--	unsigned len;             /* Length of buffer */
--	unsigned bss;             /* Length of extra data */
-+	unsigned char *buf;       /* Image data */
-+	unsigned int len;         /* Length of buffer */
-+	unsigned int bss;         /* Length of extra data */
- } Segment;
- 
- void load_image(Segment *t, const ProgTable *h, FILE *inp);
-@@ -105,7 +124,8 @@
- 
- 	parse_args(&prog, argc, argv);
- 
--	if (prog.version) Version();
-+	if (prog.version)
-+		Version();
- 
- 	if (freopen(prog.iname, "r", stdin) == NULL) {
- 		fprintf(stderr, "Cannot open \"%s\"\n", prog.iname);
-@@ -141,7 +161,8 @@
- 	exit(0);
- }
- 
--void parse_args( Application *t, unsigned argc, const char **argv ){
-+void parse_args( Application *t, unsigned argc, const char **argv )
-+{
- 	const char *arg;
- 	union {
- 		char c[4];
-@@ -185,8 +206,8 @@
- 	if (t->csum && t->sun4_mode) Usage ();	/* Checksum lives in header. */
- }
- 
--void get_header(Elf32_Ehdr *t, FILE *inp) {
--
-+void get_header(Elf32_Ehdr *t, FILE *inp)
-+{
-         if (fread((void*) t, sizeof(Elf64_Ehdr), 1, inp) != 1) {
- 		fprintf(stderr, "Read error on header\n");
- 		exit(1);
-@@ -249,8 +270,9 @@
- 	}
- }
- 
--void get_ptab(ProgTable *t, FILE *inp, const Elf32_Ehdr *h) {
--	unsigned x;
-+void get_ptab(ProgTable *t, FILE *inp, const Elf32_Ehdr *h)
-+{
-+	unsigned int x;
- 
- 	/** fprintf(stderr, "Program header table off = 0x%x\n",
- 		(unsigned) h->e_phoff); **/
-@@ -294,8 +316,9 @@
- 	}
- }
- 
--void get_ptab64(ProgTable64 *t, FILE *inp, const Elf64_Ehdr *h) {
--	unsigned x;
-+void get_ptab64(ProgTable64 *t, FILE *inp, const Elf64_Ehdr *h)
-+{
-+	unsigned int x;
- 
- 	if (h->e_phoff == 0) {
- 		fprintf(stderr, "No Program Header Table\n");
-@@ -332,8 +355,9 @@
- 	}
- }
- 
--void print_ptab(ProgTable *t) {
--	unsigned x;
-+void print_ptab(ProgTable *t)
-+{
-+	unsigned int x;
- 	const Elf32_Phdr *p;
- 
- 	for (x = 0; x < t->len; x++) {
-@@ -374,8 +398,9 @@
- 	}
- }
- 
--void print_ptab64(ProgTable64 *t) {
--	unsigned x;
-+void print_ptab64(ProgTable64 *t)
-+{
-+	unsigned int x;
- 	const Elf64_Phdr *p;
- 
- 	for (x = 0; x < t->len; x++) {
-@@ -387,8 +412,11 @@
- 			break;
- 		case PT_LOAD:
- 			printf("Loadable to 0x%Lx[0x%Lx] from 0x%Lx[0x%Lx] align 0x%Lx",
--				p->p_vaddr, p->p_memsz, p->p_offset, p->p_filesz,
--				p->p_align);
-+			       (unsigned long long) p->p_vaddr,
-+			       (unsigned long long) p->p_memsz,
-+			       (unsigned long long) p->p_offset,
-+			       (unsigned long long) p->p_filesz,
-+			       (unsigned long long) p->p_align);
- 			break;
- 		case PT_DYNAMIC:
- 			printf("Dynamic");
-@@ -416,9 +444,10 @@
- 	}
- }
- 
--void load_image(Segment *t, const ProgTable *tp, FILE *inp) {
-+void load_image(Segment *t, const ProgTable *tp, FILE *inp)
-+{
- 	Elf32_Phdr *p, *q;
--	unsigned x;
-+	unsigned int x;
- 	unsigned long off, len;
- 
- 	p = 0;
-@@ -484,9 +513,10 @@
- 	}
- }
- 
--void load_image64(Segment *t, const ProgTable64 *tp, FILE *inp) {
-+void load_image64(Segment *t, const ProgTable64 *tp, FILE *inp)
-+{
- 	Elf64_Phdr *p, *q;
--	unsigned x;
-+	unsigned int x;
- 	unsigned long long off, len;
- 
- 	p = 0;
-@@ -547,7 +577,8 @@
- 	}
- }
- 
--void store_image(Segment *t, FILE *out) {
-+void store_image(Segment *t, FILE *out)
-+{
- 	Exec ohdb;
- 
- 	if (prog.swab) {
-@@ -585,13 +616,15 @@
- 	return;
- }
- 
--void Usage(){
-+void Usage()
-+{
- 	if (prog.version) Version();
- 	fprintf(stderr, "Usage: elftoaout [-o output] [-c|-b] [-V] input\n");
- 	exit(1);
- }
- 
--void Version(){
-+void Version()
-+{
- 	printf("elftoaout 2.3: ELF to a.out convertor for SPARC and SPARC64 bootstraps\n");
- }
- 
Index: tches/gcc-7.1.0-pure64-1.patch
===================================================================
--- patches/gcc-7.1.0-pure64-1.patch	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,177 +1,0 @@
-Submitted By: William Harrington <kb0iic at cross-lfs dot org>
-Date: 05-13-2017
-Initial Package Version: 6.1.0
-Origin: Idea originally developed by Ryan Oliver and Greg Schafer for
-        the Pure LFS project with help from
-        Martin Ward and Chris Staub
-Upstream Status: Not Applied - CLFS Specific
-Description: This patch makes changes to the paths for pure64, eg 64bit libs
-             in /usr/lib, 32bit in /usr/lib32.
-Comment: Rediffed for 7.1.0
-
-diff -Naur gcc-7.1.0.orig/gcc/config/i386/linux64.h gcc-7.1.0/gcc/config/i386/linux64.h
---- gcc-7.1.0.orig/gcc/config/i386/linux64.h	2017-01-01 12:07:43.000000000 +0000
-+++ gcc-7.1.0/gcc/config/i386/linux64.h	2017-05-14 03:33:00.632243461 +0000
-@@ -27,8 +27,8 @@
- #define GNU_USER_LINK_EMULATION64 "elf_x86_64"
- #define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64"
- 
--#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
-+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2"
-+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
- #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2"
- 
- #undef MUSL_DYNAMIC_LINKER32
-diff -Naur gcc-7.1.0.orig/gcc/config/i386/t-linux64 gcc-7.1.0/gcc/config/i386/t-linux64
---- gcc-7.1.0.orig/gcc/config/i386/t-linux64	2017-01-01 12:07:43.000000000 +0000
-+++ gcc-7.1.0/gcc/config/i386/t-linux64	2017-05-14 03:33:00.632243461 +0000
-@@ -33,6 +33,6 @@
- comma=,
- MULTILIB_OPTIONS    = $(subst $(comma),/,$(TM_MULTILIB_CONFIG))
- MULTILIB_DIRNAMES   = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS)))
--MULTILIB_OSDIRNAMES = m64=../lib64$(call if_multiarch,:x86_64-linux-gnu)
--MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:i386-linux-gnu)
-+MULTILIB_OSDIRNAMES = m64=../lib$(call if_multiarch,:x86_64-linux-gnu)
-+MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib32)$(call if_multiarch,:i386-linux-gnu)
- MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32)
-diff -Naur gcc-7.1.0.orig/gcc/config/linux.h gcc-7.1.0/gcc/config/linux.h
---- gcc-7.1.0.orig/gcc/config/linux.h	2017-01-01 12:07:43.000000000 +0000
-+++ gcc-7.1.0/gcc/config/linux.h	2017-05-14 03:33:00.632243461 +0000
-@@ -82,7 +82,7 @@
-    GLIBC_DYNAMIC_LINKER32 and GLIBC_DYNAMIC_LINKER64 for targets
-    supporting both 32-bit and 64-bit compilation.  */
- #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
--#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
-+#define UCLIBC_DYNAMIC_LINKER32 "/lib32/ld-uClibc.so.0"
- #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
- #define UCLIBC_DYNAMIC_LINKERX32 "/lib/ldx32-uClibc.so.0"
- #define BIONIC_DYNAMIC_LINKER "/system/bin/linker"
-diff -Naur gcc-7.1.0.orig/gcc/config/mips/t-linux64 gcc-7.1.0/gcc/config/mips/t-linux64
---- gcc-7.1.0.orig/gcc/config/mips/t-linux64	2017-01-01 12:07:43.000000000 +0000
-+++ gcc-7.1.0/gcc/config/mips/t-linux64	2017-05-14 03:33:00.632243461 +0000
-@@ -22,5 +22,5 @@
- MIPS_SOFT = $(if $(strip $(filter MASK_SOFT_FLOAT_ABI, $(target_cpu_default)) $(filter soft, $(with_float))),soft)
- MULTILIB_OSDIRNAMES = \
- 	../lib32$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT)) \
--	../lib$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \
--	../lib64$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT))
-+	../lib32$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \
-+	../lib$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT))
-diff -Naur gcc-7.1.0.orig/gcc/config/rs6000/linux64.h gcc-7.1.0/gcc/config/rs6000/linux64.h
---- gcc-7.1.0.orig/gcc/config/rs6000/linux64.h	2017-02-07 11:29:06.000000000 +0000
-+++ gcc-7.1.0/gcc/config/rs6000/linux64.h	2017-05-14 03:33:00.632243461 +0000
-@@ -412,16 +412,16 @@
- #undef	LINK_OS_DEFAULT_SPEC
- #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
- 
--#define GLIBC_DYNAMIC_LINKER32 "%(dynamic_linker_prefix)/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1"
- 
- #ifdef LINUX64_DEFAULT_ABI_ELFv2
- #define GLIBC_DYNAMIC_LINKER64 \
--"%{mabi=elfv1:%(dynamic_linker_prefix)/lib64/ld64.so.1;" \
--":%(dynamic_linker_prefix)/lib64/ld64.so.2}"
-+"%{mabi=elfv1:/lib/ld64.so.1;" \
-+":/lib/ld64.so.2}"
- #else
- #define GLIBC_DYNAMIC_LINKER64 \
--"%{mabi=elfv2:%(dynamic_linker_prefix)/lib64/ld64.so.2;" \
--":%(dynamic_linker_prefix)/lib64/ld64.so.1}"
-+"%{mabi=elfv2:/lib/ld64.so.2;" \
-+":/lib/ld64.so.1}"
- #endif
- 
- #define MUSL_DYNAMIC_LINKER32 \
-@@ -429,7 +429,7 @@
- #define MUSL_DYNAMIC_LINKER64 \
-   "/lib/ld-musl-powerpc64" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1"
- 
--#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
-+#define UCLIBC_DYNAMIC_LINKER32 "/lib32/ld-uClibc.so.0"
- #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
- #if DEFAULT_LIBC == LIBC_UCLIBC
- #define CHOOSE_DYNAMIC_LINKER(G, U, M) \
-diff -Naur gcc-7.1.0.orig/gcc/config/rs6000/t-linux64 gcc-7.1.0/gcc/config/rs6000/t-linux64
---- gcc-7.1.0.orig/gcc/config/rs6000/t-linux64	2017-01-01 12:07:43.000000000 +0000
-+++ gcc-7.1.0/gcc/config/rs6000/t-linux64	2017-05-14 03:33:00.633243476 +0000
-@@ -28,8 +28,8 @@
- MULTILIB_OPTIONS    := m64/m32
- MULTILIB_DIRNAMES   := 64 32
- MULTILIB_EXTRA_OPTS := 
--MULTILIB_OSDIRNAMES := m64=../lib64$(call if_multiarch,:powerpc64-linux-gnu)
--MULTILIB_OSDIRNAMES += m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:powerpc-linux-gnu)
-+MULTILIB_OSDIRNAMES := m64=../lib$(call if_multiarch,:powerpc64-linux-gnu)
-+MULTILIB_OSDIRNAMES += m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib32)$(call if_multiarch,:powerpc-linux-gnu)
- 
- rs6000-linux.o: $(srcdir)/config/rs6000/rs6000-linux.c
- 	$(COMPILE) $<
-diff -Naur gcc-7.1.0.orig/gcc/config/s390/linux.h gcc-7.1.0/gcc/config/s390/linux.h
---- gcc-7.1.0.orig/gcc/config/s390/linux.h	2017-02-06 10:25:05.000000000 +0000
-+++ gcc-7.1.0/gcc/config/s390/linux.h	2017-05-14 03:33:00.633243476 +0000
-@@ -73,7 +73,7 @@
- #define MULTILIB_DEFAULTS { "m31" }
- #endif
- 
--#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1"
- #define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1"
- 
- #undef  LINK_SPEC
-diff -Naur gcc-7.1.0.orig/gcc/config/s390/t-linux64 gcc-7.1.0/gcc/config/s390/t-linux64
---- gcc-7.1.0.orig/gcc/config/s390/t-linux64	2012-11-21 16:13:28.000000000 +0000
-+++ gcc-7.1.0/gcc/config/s390/t-linux64	2017-05-14 03:33:00.633243476 +0000
-@@ -7,5 +7,5 @@
- 
- MULTILIB_OPTIONS = m64/m31
- MULTILIB_DIRNAMES = 64 32
--MULTILIB_OSDIRNAMES = ../lib64$(call if_multiarch,:s390x-linux-gnu)
--MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:s390-linux-gnu)
-+MULTILIB_OSDIRNAMES = ../lib$(call if_multiarch,:s390x-linux-gnu)
-+MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib32)$(call if_multiarch,:s390-linux-gnu)
-diff -Naur gcc-7.1.0.orig/gcc/config/sparc/linux.h gcc-7.1.0/gcc/config/sparc/linux.h
---- gcc-7.1.0.orig/gcc/config/sparc/linux.h	2017-01-01 12:07:43.000000000 +0000
-+++ gcc-7.1.0/gcc/config/sparc/linux.h	2017-05-14 03:33:00.633243476 +0000
-@@ -83,7 +83,7 @@
-    When the -shared link option is used a final link is not being
-    done.  */
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-+#define GLIBC_DYNAMIC_LINKER "/lib32/ld-linux.so.2"
- 
- #undef  LINK_SPEC
- #define LINK_SPEC "-m elf32_sparc %{shared:-shared} \
-diff -Naur gcc-7.1.0.orig/gcc/config/sparc/linux64.h gcc-7.1.0/gcc/config/sparc/linux64.h
---- gcc-7.1.0.orig/gcc/config/sparc/linux64.h	2017-01-01 12:07:43.000000000 +0000
-+++ gcc-7.1.0/gcc/config/sparc/linux64.h	2017-05-14 03:33:00.634243490 +0000
-@@ -84,8 +84,8 @@
-    When the -shared link option is used a final link is not being
-    done.  */
- 
--#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2"
-+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2"
-+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux.so.2"
- 
- #ifdef SPARC_BI_ARCH
- 
-@@ -213,7 +213,7 @@
- #else /* !SPARC_BI_ARCH */
- 
- #undef LINK_SPEC
--#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
-+#define LINK_SPEC "-m elf64_sparc -Y P,%R/lib %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
-       %{rdynamic:-export-dynamic} \
-diff -Naur gcc-7.1.0.orig/gcc/config/sparc/t-linux64 gcc-7.1.0/gcc/config/sparc/t-linux64
---- gcc-7.1.0.orig/gcc/config/sparc/t-linux64	2017-01-01 12:07:43.000000000 +0000
-+++ gcc-7.1.0/gcc/config/sparc/t-linux64	2017-05-14 03:33:00.634243490 +0000
-@@ -25,5 +25,5 @@
- 
- MULTILIB_OPTIONS = m64/m32
- MULTILIB_DIRNAMES = 64 32
--MULTILIB_OSDIRNAMES = ../lib64$(call if_multiarch,:sparc64-linux-gnu)
--MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:sparc-linux-gnu)
-+MULTILIB_OSDIRNAMES = ../lib$(call if_multiarch,:sparc64-linux-gnu)
-+MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib32)$(call if_multiarch,:sparc-linux-gnu)
Index: tches/gcc-7.1.0-pure64_specs-1.patch
===================================================================
--- patches/gcc-7.1.0-pure64_specs-1.patch	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,443 +1,0 @@
-Submitted By: William Harrington <kb0iic at cross-lfs dot org>
-Date: 05-13-2017
-Initial Package Version: 6.1.0
-Origin: Idea originally developed by Ryan Oliver and Greg Schafer for
-        the Pure LFS project with help from
-        Martin Ward and Chris Staub
-Upstream Status: Not Applied - CLFS Specific
-Description: This patch makes changes to the paths for pure64, eg 64bit libs
-             in /usr/lib, 32bit in /usr/lib32.
-Comment: Rediffed for 7.1.0
-
-diff -Naur gcc-7.1.0.orig/gcc/config/aarch64/aarch64-linux.h gcc-7.1.0/gcc/config/aarch64/aarch64-linux.h
---- gcc-7.1.0.orig/gcc/config/aarch64/aarch64-linux.h	2017-01-01 12:07:43.000000000 +0000
-+++ gcc-7.1.0/gcc/config/aarch64/aarch64-linux.h	2017-05-14 03:36:52.526644991 +0000
-@@ -21,7 +21,7 @@
- #ifndef GCC_AARCH64_LINUX_H
- #define GCC_AARCH64_LINUX_H
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
- 
- #undef MUSL_DYNAMIC_LINKER
- #define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
-diff -Naur gcc-7.1.0.orig/gcc/config/alpha/linux-elf.h gcc-7.1.0/gcc/config/alpha/linux-elf.h
---- gcc-7.1.0.orig/gcc/config/alpha/linux-elf.h	2017-01-01 12:07:43.000000000 +0000
-+++ gcc-7.1.0/gcc/config/alpha/linux-elf.h	2017-05-14 03:36:52.526644991 +0000
-@@ -23,8 +23,8 @@
- #define EXTRA_SPECS \
- { "elf_dynamic_linker", ELF_DYNAMIC_LINKER },
- 
--#define GLIBC_DYNAMIC_LINKER	"/lib/ld-linux.so.2"
--#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
-+#define GLIBC_DYNAMIC_LINKER	"/tools/lib/ld-linux.so.2"
-+#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0"
- #if DEFAULT_LIBC == LIBC_UCLIBC
- #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
- #elif DEFAULT_LIBC == LIBC_GLIBC
-diff -Naur gcc-7.1.0.orig/gcc/config/arm/linux-eabi.h gcc-7.1.0/gcc/config/arm/linux-eabi.h
---- gcc-7.1.0.orig/gcc/config/arm/linux-eabi.h	2017-01-01 12:07:43.000000000 +0000
-+++ gcc-7.1.0/gcc/config/arm/linux-eabi.h	2017-05-14 03:36:52.527645006 +0000
-@@ -62,8 +62,8 @@
-    GLIBC_DYNAMIC_LINKER_DEFAULT and TARGET_DEFAULT_FLOAT_ABI.  */
- 
- #undef  GLIBC_DYNAMIC_LINKER
--#define GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "/lib/ld-linux.so.3"
--#define GLIBC_DYNAMIC_LINKER_HARD_FLOAT "/lib/ld-linux-armhf.so.3"
-+#define GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "/tools/lib/ld-linux.so.3"
-+#define GLIBC_DYNAMIC_LINKER_HARD_FLOAT "/tools/lib/ld-linux-armhf.so.3"
- #define GLIBC_DYNAMIC_LINKER_DEFAULT GLIBC_DYNAMIC_LINKER_SOFT_FLOAT
- 
- #define GLIBC_DYNAMIC_LINKER \
-diff -Naur gcc-7.1.0.orig/gcc/config/arm/linux-elf.h gcc-7.1.0/gcc/config/arm/linux-elf.h
---- gcc-7.1.0.orig/gcc/config/arm/linux-elf.h	2017-01-01 12:07:43.000000000 +0000
-+++ gcc-7.1.0/gcc/config/arm/linux-elf.h	2017-05-14 03:36:52.527645006 +0000
-@@ -60,7 +60,7 @@
- 
- #define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc"
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
- 
- #define LINUX_TARGET_LINK_SPEC  "%{h*} \
-    %{static:-Bstatic} \
-diff -Naur gcc-7.1.0.orig/gcc/config/bfin/linux.h gcc-7.1.0/gcc/config/bfin/linux.h
---- gcc-7.1.0.orig/gcc/config/bfin/linux.h	2017-01-01 12:07:43.000000000 +0000
-+++ gcc-7.1.0/gcc/config/bfin/linux.h	2017-05-14 03:36:52.528645020 +0000
-@@ -48,7 +48,7 @@
-   %{shared:-G -Bdynamic} \
-   %{!shared: %{!static: \
-    %{rdynamic:-export-dynamic} \
--   -dynamic-linker /lib/ld-uClibc.so.0} \
-+   -dynamic-linker /tools/lib/ld-uClibc.so.0} \
-    %{static}} -init __init -fini __fini"
- 
- #undef TARGET_SUPPORTS_SYNC_CALLS
-diff -Naur gcc-7.1.0.orig/gcc/config/c6x/uclinux-elf.h gcc-7.1.0/gcc/config/c6x/uclinux-elf.h
---- gcc-7.1.0.orig/gcc/config/c6x/uclinux-elf.h	2017-01-01 12:07:43.000000000 +0000
-+++ gcc-7.1.0/gcc/config/c6x/uclinux-elf.h	2017-05-14 03:36:52.528645020 +0000
-@@ -36,7 +36,7 @@
- #define STARTFILE_SPEC \
-   "%{!shared:crt1%O%s} crti%O%s %{shared|pie:crtbeginS.o%s;:crtbegin.o%s}"
- 
--#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
-+#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0"
- 
- #undef LINK_SPEC
- #define LINK_SPEC ENDIAN_LINK_SPEC \
-diff -Naur gcc-7.1.0.orig/gcc/config/cris/linux.h gcc-7.1.0/gcc/config/cris/linux.h
---- gcc-7.1.0.orig/gcc/config/cris/linux.h	2017-01-01 12:07:43.000000000 +0000
-+++ gcc-7.1.0/gcc/config/cris/linux.h	2017-05-14 03:36:52.528645020 +0000
-@@ -102,7 +102,7 @@
- #undef CRIS_DEFAULT_CPU_VERSION
- #define CRIS_DEFAULT_CPU_VERSION CRIS_CPU_NG
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
- 
- #undef CRIS_LINK_SUBTARGET_SPEC
- #define CRIS_LINK_SUBTARGET_SPEC \
-diff -Naur gcc-7.1.0.orig/gcc/config/freebsd-spec.h gcc-7.1.0/gcc/config/freebsd-spec.h
---- gcc-7.1.0.orig/gcc/config/freebsd-spec.h	2017-01-01 12:07:43.000000000 +0000
-+++ gcc-7.1.0/gcc/config/freebsd-spec.h	2017-05-14 03:36:52.529645035 +0000
-@@ -131,7 +131,7 @@
- #if FBSD_MAJOR < 6
- #define FBSD_DYNAMIC_LINKER "/usr/libexec/ld-elf.so.1"
- #else
--#define FBSD_DYNAMIC_LINKER "/libexec/ld-elf.so.1"
-+#define FBSD_DYNAMIC_LINKER "/tools/libexec/ld-elf.so.1"
- #endif
- 
- /* NOTE: The freebsd-spec.h header is included also for various
-diff -Naur gcc-7.1.0.orig/gcc/config/frv/linux.h gcc-7.1.0/gcc/config/frv/linux.h
---- gcc-7.1.0.orig/gcc/config/frv/linux.h	2017-01-01 12:07:43.000000000 +0000
-+++ gcc-7.1.0/gcc/config/frv/linux.h	2017-05-14 03:36:52.529645035 +0000
-@@ -34,7 +34,7 @@
- #define ENDFILE_SPEC \
-   "%{shared|pie:crtendS.o%s;:crtend.o%s} crtn.o%s"
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
- 
- #undef LINK_SPEC
- #define LINK_SPEC "\
-diff -Naur gcc-7.1.0.orig/gcc/config/i386/gnu.h gcc-7.1.0/gcc/config/i386/gnu.h
---- gcc-7.1.0.orig/gcc/config/i386/gnu.h	2017-01-01 12:07:43.000000000 +0000
-+++ gcc-7.1.0/gcc/config/i386/gnu.h	2017-05-14 03:36:52.529645035 +0000
-@@ -22,7 +22,7 @@
- #define GNU_USER_LINK_EMULATION "elf_i386"
- 
- #undef GNU_USER_DYNAMIC_LINKER
--#define GNU_USER_DYNAMIC_LINKER "/lib/ld.so"
-+#define GNU_USER_DYNAMIC_LINKER "/tools/lib/ld.so"
- 
- #undef	STARTFILE_SPEC
- #if defined HAVE_LD_PIE
-diff -Naur gcc-7.1.0.orig/gcc/config/i386/kfreebsd-gnu.h gcc-7.1.0/gcc/config/i386/kfreebsd-gnu.h
---- gcc-7.1.0.orig/gcc/config/i386/kfreebsd-gnu.h	2017-01-01 12:07:43.000000000 +0000
-+++ gcc-7.1.0/gcc/config/i386/kfreebsd-gnu.h	2017-05-14 03:36:52.529645035 +0000
-@@ -19,4 +19,4 @@
- <http://www.gnu.org/licenses/>.  */
- 
- #define GNU_USER_LINK_EMULATION "elf_i386_fbsd"
--#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
-diff -Naur gcc-7.1.0.orig/gcc/config/i386/kfreebsd-gnu64.h gcc-7.1.0/gcc/config/i386/kfreebsd-gnu64.h
---- gcc-7.1.0.orig/gcc/config/i386/kfreebsd-gnu64.h	2017-01-01 12:07:43.000000000 +0000
-+++ gcc-7.1.0/gcc/config/i386/kfreebsd-gnu64.h	2017-05-14 03:36:52.529645035 +0000
-@@ -22,6 +22,6 @@
- #define GNU_USER_LINK_EMULATION64 "elf_x86_64_fbsd"
- #define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64_fbsd"
- 
--#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
--#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-kfreebsd-x86-64.so.1"
--#define GLIBC_DYNAMIC_LINKERX32 "/lib/ld-kfreebsd-x32.so.1"
-+#define GLIBC_DYNAMIC_LINKER32 "/tools/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld-kfreebsd-x86-64.so.1"
-+#define GLIBC_DYNAMIC_LINKERX32 "/tools/lib/ld-kfreebsd-x32.so.1"
-diff -Naur gcc-7.1.0.orig/gcc/config/i386/linux.h gcc-7.1.0/gcc/config/i386/linux.h
---- gcc-7.1.0.orig/gcc/config/i386/linux.h	2017-01-01 12:07:43.000000000 +0000
-+++ gcc-7.1.0/gcc/config/i386/linux.h	2017-05-14 03:36:52.529645035 +0000
-@@ -20,7 +20,7 @@
- <http://www.gnu.org/licenses/>.  */
- 
- #define GNU_USER_LINK_EMULATION "elf_i386"
--#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
- 
- #undef MUSL_DYNAMIC_LINKER
- #define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1"
-diff -Naur gcc-7.1.0.orig/gcc/config/i386/linux64.h gcc-7.1.0/gcc/config/i386/linux64.h
---- gcc-7.1.0.orig/gcc/config/i386/linux64.h	2017-01-01 12:07:43.000000000 +0000
-+++ gcc-7.1.0/gcc/config/i386/linux64.h	2017-05-14 03:36:52.530645050 +0000
-@@ -27,9 +27,9 @@
- #define GNU_USER_LINK_EMULATION64 "elf_x86_64"
- #define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64"
- 
--#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
--#define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2"
-+#define GLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld-linux.so.2"
-+#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld-linux-x86-64.so.2"
-+#define GLIBC_DYNAMIC_LINKERX32 "/tools/libx32/ld-linux-x32.so.2"
- 
- #undef MUSL_DYNAMIC_LINKER32
- #define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1"
-diff -Naur gcc-7.1.0.orig/gcc/config/i386/t-linux64 gcc-7.1.0/gcc/config/i386/t-linux64
---- gcc-7.1.0.orig/gcc/config/i386/t-linux64	2017-01-01 12:07:43.000000000 +0000
-+++ gcc-7.1.0/gcc/config/i386/t-linux64	2017-05-14 03:36:52.530645050 +0000
-@@ -33,6 +33,6 @@
- comma=,
- MULTILIB_OPTIONS    = $(subst $(comma),/,$(TM_MULTILIB_CONFIG))
- MULTILIB_DIRNAMES   = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS)))
--MULTILIB_OSDIRNAMES = m64=../lib64$(call if_multiarch,:x86_64-linux-gnu)
--MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:i386-linux-gnu)
-+MULTILIB_OSDIRNAMES = m64=../lib$(call if_multiarch,:x86_64-linux-gnu)
-+MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib32)$(call if_multiarch,:i386-linux-gnu)
- MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32)
-diff -Naur gcc-7.1.0.orig/gcc/config/ia64/linux.h gcc-7.1.0/gcc/config/ia64/linux.h
---- gcc-7.1.0.orig/gcc/config/ia64/linux.h	2017-01-01 12:07:43.000000000 +0000
-+++ gcc-7.1.0/gcc/config/ia64/linux.h	2017-05-14 03:36:52.531645064 +0000
-@@ -55,7 +55,7 @@
- /* Define this for shared library support because it isn't in the main
-    linux.h file.  */
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux-ia64.so.2"
- 
- #undef LINK_SPEC
- #define LINK_SPEC "\
-diff -Naur gcc-7.1.0.orig/gcc/config/kopensolaris-gnu.h gcc-7.1.0/gcc/config/kopensolaris-gnu.h
---- gcc-7.1.0.orig/gcc/config/kopensolaris-gnu.h	2017-01-01 12:07:43.000000000 +0000
-+++ gcc-7.1.0/gcc/config/kopensolaris-gnu.h	2017-05-14 03:36:52.531645064 +0000
-@@ -31,4 +31,4 @@
-   while (0)
- 
- #undef GNU_USER_DYNAMIC_LINKER
--#define GNU_USER_DYNAMIC_LINKER "/lib/ld.so.1"
-+#define GNU_USER_DYNAMIC_LINKER "/tools/lib/ld.so.1"
-diff -Naur gcc-7.1.0.orig/gcc/config/linux.h gcc-7.1.0/gcc/config/linux.h
---- gcc-7.1.0.orig/gcc/config/linux.h	2017-01-01 12:07:43.000000000 +0000
-+++ gcc-7.1.0/gcc/config/linux.h	2017-05-14 03:36:52.531645064 +0000
-@@ -81,10 +81,10 @@
-    GLIBC_DYNAMIC_LINKER must be defined for each target using them, or
-    GLIBC_DYNAMIC_LINKER32 and GLIBC_DYNAMIC_LINKER64 for targets
-    supporting both 32-bit and 64-bit compilation.  */
--#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
--#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
--#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
--#define UCLIBC_DYNAMIC_LINKERX32 "/lib/ldx32-uClibc.so.0"
-+#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0"
-+#define UCLIBC_DYNAMIC_LINKER32 "/tools/lib/ld-uClibc.so.0"
-+#define UCLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64-uClibc.so.0"
-+#define UCLIBC_DYNAMIC_LINKERX32 "/tools/lib/ldx32-uClibc.so.0"
- #define BIONIC_DYNAMIC_LINKER "/system/bin/linker"
- #define BIONIC_DYNAMIC_LINKER32 "/system/bin/linker"
- #define BIONIC_DYNAMIC_LINKER64 "/system/bin/linker64"
-diff -Naur gcc-7.1.0.orig/gcc/config/lm32/uclinux-elf.h gcc-7.1.0/gcc/config/lm32/uclinux-elf.h
---- gcc-7.1.0.orig/gcc/config/lm32/uclinux-elf.h	2017-01-01 12:07:43.000000000 +0000
-+++ gcc-7.1.0/gcc/config/lm32/uclinux-elf.h	2017-05-14 03:36:52.531645064 +0000
-@@ -67,7 +67,7 @@
-    %{shared:-shared} \
-    %{symbolic:-Bsymbolic} \
-    %{rdynamic:-export-dynamic} \
--   -dynamic-linker /lib/ld-linux.so.2"
-+   -dynamic-linker /tools/lib/ld-linux.so.2"
- 
- #define TARGET_OS_CPP_BUILTINS() GNU_USER_TARGET_OS_CPP_BUILTINS()
- 
-diff -Naur gcc-7.1.0.orig/gcc/config/m32r/linux.h gcc-7.1.0/gcc/config/m32r/linux.h
---- gcc-7.1.0.orig/gcc/config/m32r/linux.h	2017-01-01 12:07:43.000000000 +0000
-+++ gcc-7.1.0/gcc/config/m32r/linux.h	2017-05-14 03:36:52.532645079 +0000
-@@ -37,7 +37,7 @@
-    When the -shared link option is used a final link is not being
-    done.  */
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
- 
- #undef	LINK_SPEC
- #if TARGET_LITTLE_ENDIAN
-diff -Naur gcc-7.1.0.orig/gcc/config/m68k/linux.h gcc-7.1.0/gcc/config/m68k/linux.h
---- gcc-7.1.0.orig/gcc/config/m68k/linux.h	2017-01-06 21:21:02.000000000 +0000
-+++ gcc-7.1.0/gcc/config/m68k/linux.h	2017-05-14 03:36:52.532645079 +0000
-@@ -71,7 +71,7 @@
-    When the -shared link option is used a final link is not being
-    done.  */
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
- 
- #undef LINK_SPEC
- #define LINK_SPEC "-m m68kelf %{shared} \
-diff -Naur gcc-7.1.0.orig/gcc/config/microblaze/linux.h gcc-7.1.0/gcc/config/microblaze/linux.h
---- gcc-7.1.0.orig/gcc/config/microblaze/linux.h	2017-01-01 12:07:43.000000000 +0000
-+++ gcc-7.1.0/gcc/config/microblaze/linux.h	2017-05-14 03:36:52.532645079 +0000
-@@ -28,7 +28,7 @@
- #undef TLS_NEEDS_GOT
- #define TLS_NEEDS_GOT 1
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
- #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
- 
- #if TARGET_BIG_ENDIAN_DEFAULT == 0 /* LE */
-diff -Naur gcc-7.1.0.orig/gcc/config/mn10300/linux.h gcc-7.1.0/gcc/config/mn10300/linux.h
---- gcc-7.1.0.orig/gcc/config/mn10300/linux.h	2017-01-01 12:07:43.000000000 +0000
-+++ gcc-7.1.0/gcc/config/mn10300/linux.h	2017-05-14 03:36:52.532645079 +0000
-@@ -32,7 +32,7 @@
- #undef  ASM_SPEC
- #define ASM_SPEC ""
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
- 
- #undef  LINK_SPEC
- #define LINK_SPEC "%{mrelax:--relax} %{shared:-shared} \
-diff -Naur gcc-7.1.0.orig/gcc/config/nios2/linux.h gcc-7.1.0/gcc/config/nios2/linux.h
---- gcc-7.1.0.orig/gcc/config/nios2/linux.h	2017-01-01 12:07:43.000000000 +0000
-+++ gcc-7.1.0/gcc/config/nios2/linux.h	2017-05-14 03:36:52.532645079 +0000
-@@ -29,7 +29,7 @@
- #undef CPP_SPEC
- #define CPP_SPEC "%{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT}"
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-nios2.so.1"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux-nios2.so.1"
- 
- #undef LINK_SPEC
- #define LINK_SPEC LINK_SPEC_ENDIAN \
-diff -Naur gcc-7.1.0.orig/gcc/config/pa/pa-linux.h gcc-7.1.0/gcc/config/pa/pa-linux.h
---- gcc-7.1.0.orig/gcc/config/pa/pa-linux.h	2017-01-01 12:07:43.000000000 +0000
-+++ gcc-7.1.0/gcc/config/pa/pa-linux.h	2017-05-14 03:36:52.533645094 +0000
-@@ -37,7 +37,7 @@
- /* Define this for shared library support because it isn't in the main
-    linux.h file.  */
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
- 
- #undef LINK_SPEC
- #define LINK_SPEC "\
-diff -Naur gcc-7.1.0.orig/gcc/config/rs6000/linux64.h gcc-7.1.0/gcc/config/rs6000/linux64.h
---- gcc-7.1.0.orig/gcc/config/rs6000/linux64.h	2017-02-07 11:29:06.000000000 +0000
-+++ gcc-7.1.0/gcc/config/rs6000/linux64.h	2017-05-14 03:36:52.533645094 +0000
-@@ -412,16 +412,16 @@
- #undef	LINK_OS_DEFAULT_SPEC
- #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
- 
--#define GLIBC_DYNAMIC_LINKER32 "%(dynamic_linker_prefix)/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER32 "/tools/lib/ld.so.1"
- 
- #ifdef LINUX64_DEFAULT_ABI_ELFv2
- #define GLIBC_DYNAMIC_LINKER64 \
--"%{mabi=elfv1:%(dynamic_linker_prefix)/lib64/ld64.so.1;" \
--":%(dynamic_linker_prefix)/lib64/ld64.so.2}"
-+"%{mabi=elfv1:/tools/lib64/ld64.so.1;" \
-+":/tools/lib64/ld64.so.2}"
- #else
- #define GLIBC_DYNAMIC_LINKER64 \
--"%{mabi=elfv2:%(dynamic_linker_prefix)/lib64/ld64.so.2;" \
--":%(dynamic_linker_prefix)/lib64/ld64.so.1}"
-+"%{mabi=elfv2:/tools/lib64/ld64.so.2;" \
-+":/tools/lib64/ld64.so.1}"
- #endif
- 
- #define MUSL_DYNAMIC_LINKER32 \
-@@ -429,8 +429,8 @@
- #define MUSL_DYNAMIC_LINKER64 \
-   "/lib/ld-musl-powerpc64" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1"
- 
--#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
--#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
-+#define UCLIBC_DYNAMIC_LINKER32 "/tools/lib/ld-uClibc.so.0"
-+#define UCLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64-uClibc.so.0"
- #if DEFAULT_LIBC == LIBC_UCLIBC
- #define CHOOSE_DYNAMIC_LINKER(G, U, M) \
-   "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}"
-diff -Naur gcc-7.1.0.orig/gcc/config/rs6000/sysv4.h gcc-7.1.0/gcc/config/rs6000/sysv4.h
---- gcc-7.1.0.orig/gcc/config/rs6000/sysv4.h	2017-02-07 11:29:06.000000000 +0000
-+++ gcc-7.1.0/gcc/config/rs6000/sysv4.h	2017-05-14 03:36:52.533645094 +0000
-@@ -780,8 +780,8 @@
- 
- #define MUSL_DYNAMIC_LINKER_E ENDIAN_SELECT("","le","")
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
--#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
-+#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0"
- #define MUSL_DYNAMIC_LINKER \
-   "/lib/ld-musl-powerpc" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1"
- #if DEFAULT_LIBC == LIBC_UCLIBC
-diff -Naur gcc-7.1.0.orig/gcc/config/s390/linux.h gcc-7.1.0/gcc/config/s390/linux.h
---- gcc-7.1.0.orig/gcc/config/s390/linux.h	2017-02-06 10:25:05.000000000 +0000
-+++ gcc-7.1.0/gcc/config/s390/linux.h	2017-05-14 03:36:52.534645109 +0000
-@@ -73,8 +73,8 @@
- #define MULTILIB_DEFAULTS { "m31" }
- #endif
- 
--#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
--#define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1"
-+#define GLIBC_DYNAMIC_LINKER32 "/tools/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64.so.1"
- 
- #undef  LINK_SPEC
- #define LINK_SPEC \
-diff -Naur gcc-7.1.0.orig/gcc/config/sh/linux.h gcc-7.1.0/gcc/config/sh/linux.h
---- gcc-7.1.0.orig/gcc/config/sh/linux.h	2017-01-01 12:07:43.000000000 +0000
-+++ gcc-7.1.0/gcc/config/sh/linux.h	2017-05-14 03:36:52.534645109 +0000
-@@ -64,7 +64,7 @@
-   "/lib/ld-musl-sh" MUSL_DYNAMIC_LINKER_E MUSL_DYNAMIC_LINKER_FP \
-   "%{mfdpic:-fdpic}.so.1"
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
- 
- #undef SUBTARGET_LINK_EMUL_SUFFIX
- #define SUBTARGET_LINK_EMUL_SUFFIX "%{mfdpic:_fd;:_linux}"
-diff -Naur gcc-7.1.0.orig/gcc/config/sparc/linux.h gcc-7.1.0/gcc/config/sparc/linux.h
---- gcc-7.1.0.orig/gcc/config/sparc/linux.h	2017-01-01 12:07:43.000000000 +0000
-+++ gcc-7.1.0/gcc/config/sparc/linux.h	2017-05-14 03:36:52.534645109 +0000
-@@ -83,7 +83,7 @@
-    When the -shared link option is used a final link is not being
-    done.  */
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
- 
- #undef  LINK_SPEC
- #define LINK_SPEC "-m elf32_sparc %{shared:-shared} \
-diff -Naur gcc-7.1.0.orig/gcc/config/sparc/linux64.h gcc-7.1.0/gcc/config/sparc/linux64.h
---- gcc-7.1.0.orig/gcc/config/sparc/linux64.h	2017-01-01 12:07:43.000000000 +0000
-+++ gcc-7.1.0/gcc/config/sparc/linux64.h	2017-05-14 03:36:52.535645123 +0000
-@@ -84,8 +84,8 @@
-    When the -shared link option is used a final link is not being
-    done.  */
- 
--#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2"
-+#define GLIBC_DYNAMIC_LINKER32 "/tools/lib/ld-linux.so.2"
-+#define GLIBC_DYNAMIC_LINKER64 "/tools/lib64/ld-linux.so.2"
- 
- #ifdef SPARC_BI_ARCH
- 
-@@ -213,7 +213,7 @@
- #else /* !SPARC_BI_ARCH */
- 
- #undef LINK_SPEC
--#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
-+#define LINK_SPEC "-m elf64_sparc -Y P,%R/tools/lib64 %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
-       %{rdynamic:-export-dynamic} \
-diff -Naur gcc-7.1.0.orig/gcc/config/xtensa/linux.h gcc-7.1.0/gcc/config/xtensa/linux.h
---- gcc-7.1.0.orig/gcc/config/xtensa/linux.h	2017-01-01 12:07:43.000000000 +0000
-+++ gcc-7.1.0/gcc/config/xtensa/linux.h	2017-05-14 03:36:52.535645123 +0000
-@@ -46,7 +46,7 @@
-   %{mauto-litpools:--auto-litpools} \
-   %{mno-auto-litpools:--no-auto-litpools}"
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
- 
- #undef LINK_SPEC
- #define LINK_SPEC \
Index: tches/gcc-7.1.0-specs-1.patch
===================================================================
--- patches/gcc-7.1.0-specs-1.patch	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,464 +1,0 @@
-Submitted By: William Harrington <kb0iic at cross-lfs dot org>
-Date: 05-13-2017
-Initial Package Version: 7.1.0
-Origin: Idea originally developed by Ryan Oliver and Greg Schafer for
-        the Pure LFS project
-Upstream Status: Not Applied - CLFS Specific
-Description: This patch makes changes to the paths for pure64, eg 64bit libs
-             in /usr/lib, 32bit in /usr/lib32.
-Comment: Redone for 7.1.0
-
-diff -Naur gcc-7.1.0.orig/gcc/config/aarch64/aarch64-linux.h gcc-7.1.0/gcc/config/aarch64/aarch64-linux.h
---- gcc-7.1.0.orig/gcc/config/aarch64/aarch64-linux.h	2017-01-01 12:07:43.000000000 +0000
-+++ gcc-7.1.0/gcc/config/aarch64/aarch64-linux.h	2017-05-13 00:23:29.031857437 +0000
-@@ -21,7 +21,7 @@
- #ifndef GCC_AARCH64_LINUX_H
- #define GCC_AARCH64_LINUX_H
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
- 
- #undef MUSL_DYNAMIC_LINKER
- #define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
-diff -Naur gcc-7.1.0.orig/gcc/config/alpha/linux-elf.h gcc-7.1.0/gcc/config/alpha/linux-elf.h
---- gcc-7.1.0.orig/gcc/config/alpha/linux-elf.h	2017-01-01 12:07:43.000000000 +0000
-+++ gcc-7.1.0/gcc/config/alpha/linux-elf.h	2017-05-13 00:23:29.031857437 +0000
-@@ -23,8 +23,8 @@
- #define EXTRA_SPECS \
- { "elf_dynamic_linker", ELF_DYNAMIC_LINKER },
- 
--#define GLIBC_DYNAMIC_LINKER	"/lib/ld-linux.so.2"
--#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
-+#define GLIBC_DYNAMIC_LINKER	"/tools/lib/ld-linux.so.2"
-+#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0"
- #if DEFAULT_LIBC == LIBC_UCLIBC
- #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
- #elif DEFAULT_LIBC == LIBC_GLIBC
-diff -Naur gcc-7.1.0.orig/gcc/config/arm/linux-eabi.h gcc-7.1.0/gcc/config/arm/linux-eabi.h
---- gcc-7.1.0.orig/gcc/config/arm/linux-eabi.h	2017-01-01 12:07:43.000000000 +0000
-+++ gcc-7.1.0/gcc/config/arm/linux-eabi.h	2017-05-13 00:23:29.031857437 +0000
-@@ -62,8 +62,8 @@
-    GLIBC_DYNAMIC_LINKER_DEFAULT and TARGET_DEFAULT_FLOAT_ABI.  */
- 
- #undef  GLIBC_DYNAMIC_LINKER
--#define GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "/lib/ld-linux.so.3"
--#define GLIBC_DYNAMIC_LINKER_HARD_FLOAT "/lib/ld-linux-armhf.so.3"
-+#define GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "/tools/lib/ld-linux.so.3"
-+#define GLIBC_DYNAMIC_LINKER_HARD_FLOAT "/tools/lib/ld-linux-armhf.so.3"
- #define GLIBC_DYNAMIC_LINKER_DEFAULT GLIBC_DYNAMIC_LINKER_SOFT_FLOAT
- 
- #define GLIBC_DYNAMIC_LINKER \
-diff -Naur gcc-7.1.0.orig/gcc/config/arm/linux-elf.h gcc-7.1.0/gcc/config/arm/linux-elf.h
---- gcc-7.1.0.orig/gcc/config/arm/linux-elf.h	2017-01-01 12:07:43.000000000 +0000
-+++ gcc-7.1.0/gcc/config/arm/linux-elf.h	2017-05-13 00:23:29.032857450 +0000
-@@ -60,7 +60,7 @@
- 
- #define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc"
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
- 
- #define LINUX_TARGET_LINK_SPEC  "%{h*} \
-    %{static:-Bstatic} \
-diff -Naur gcc-7.1.0.orig/gcc/config/bfin/linux.h gcc-7.1.0/gcc/config/bfin/linux.h
---- gcc-7.1.0.orig/gcc/config/bfin/linux.h	2017-01-01 12:07:43.000000000 +0000
-+++ gcc-7.1.0/gcc/config/bfin/linux.h	2017-05-13 00:23:29.032857450 +0000
-@@ -48,7 +48,7 @@
-   %{shared:-G -Bdynamic} \
-   %{!shared: %{!static: \
-    %{rdynamic:-export-dynamic} \
--   -dynamic-linker /lib/ld-uClibc.so.0} \
-+   -dynamic-linker /tools/lib/ld-uClibc.so.0} \
-    %{static}} -init __init -fini __fini"
- 
- #undef TARGET_SUPPORTS_SYNC_CALLS
-diff -Naur gcc-7.1.0.orig/gcc/config/cris/linux.h gcc-7.1.0/gcc/config/cris/linux.h
---- gcc-7.1.0.orig/gcc/config/cris/linux.h	2017-01-01 12:07:43.000000000 +0000
-+++ gcc-7.1.0/gcc/config/cris/linux.h	2017-05-13 00:23:29.032857450 +0000
-@@ -102,7 +102,7 @@
- #undef CRIS_DEFAULT_CPU_VERSION
- #define CRIS_DEFAULT_CPU_VERSION CRIS_CPU_NG
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
- 
- #undef CRIS_LINK_SUBTARGET_SPEC
- #define CRIS_LINK_SUBTARGET_SPEC \
-diff -Naur gcc-7.1.0.orig/gcc/config/freebsd-spec.h gcc-7.1.0/gcc/config/freebsd-spec.h
---- gcc-7.1.0.orig/gcc/config/freebsd-spec.h	2017-01-01 12:07:43.000000000 +0000
-+++ gcc-7.1.0/gcc/config/freebsd-spec.h	2017-05-13 00:23:29.032857450 +0000
-@@ -129,9 +129,9 @@
- #endif
- 
- #if FBSD_MAJOR < 6
--#define FBSD_DYNAMIC_LINKER "/usr/libexec/ld-elf.so.1"
-+#define FBSD_DYNAMIC_LINKER "/tools/libexec/ld-elf.so.1"
- #else
--#define FBSD_DYNAMIC_LINKER "/libexec/ld-elf.so.1"
-+#define FBSD_DYNAMIC_LINKER "/tools/libexec/ld-elf.so.1"
- #endif
- 
- /* NOTE: The freebsd-spec.h header is included also for various
-diff -Naur gcc-7.1.0.orig/gcc/config/frv/linux.h gcc-7.1.0/gcc/config/frv/linux.h
---- gcc-7.1.0.orig/gcc/config/frv/linux.h	2017-01-01 12:07:43.000000000 +0000
-+++ gcc-7.1.0/gcc/config/frv/linux.h	2017-05-13 00:23:29.032857450 +0000
-@@ -34,7 +34,7 @@
- #define ENDFILE_SPEC \
-   "%{shared|pie:crtendS.o%s;:crtend.o%s} crtn.o%s"
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
- 
- #undef LINK_SPEC
- #define LINK_SPEC "\
-diff -Naur gcc-7.1.0.orig/gcc/config/i386/gnu.h gcc-7.1.0/gcc/config/i386/gnu.h
---- gcc-7.1.0.orig/gcc/config/i386/gnu.h	2017-01-01 12:07:43.000000000 +0000
-+++ gcc-7.1.0/gcc/config/i386/gnu.h	2017-05-13 00:23:29.032857450 +0000
-@@ -22,7 +22,7 @@
- #define GNU_USER_LINK_EMULATION "elf_i386"
- 
- #undef GNU_USER_DYNAMIC_LINKER
--#define GNU_USER_DYNAMIC_LINKER "/lib/ld.so"
-+#define GNU_USER_DYNAMIC_LINKER "/tools/lib/ld.so"
- 
- #undef	STARTFILE_SPEC
- #if defined HAVE_LD_PIE
-diff -Naur gcc-7.1.0.orig/gcc/config/i386/kfreebsd-gnu.h gcc-7.1.0/gcc/config/i386/kfreebsd-gnu.h
---- gcc-7.1.0.orig/gcc/config/i386/kfreebsd-gnu.h	2017-01-01 12:07:43.000000000 +0000
-+++ gcc-7.1.0/gcc/config/i386/kfreebsd-gnu.h	2017-05-13 00:23:29.032857450 +0000
-@@ -19,4 +19,4 @@
- <http://www.gnu.org/licenses/>.  */
- 
- #define GNU_USER_LINK_EMULATION "elf_i386_fbsd"
--#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
-diff -Naur gcc-7.1.0.orig/gcc/config/i386/kfreebsd-gnu64.h gcc-7.1.0/gcc/config/i386/kfreebsd-gnu64.h
---- gcc-7.1.0.orig/gcc/config/i386/kfreebsd-gnu64.h	2017-01-01 12:07:43.000000000 +0000
-+++ gcc-7.1.0/gcc/config/i386/kfreebsd-gnu64.h	2017-05-13 00:23:29.033857463 +0000
-@@ -22,6 +22,6 @@
- #define GNU_USER_LINK_EMULATION64 "elf_x86_64_fbsd"
- #define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64_fbsd"
- 
--#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
--#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-kfreebsd-x86-64.so.1"
--#define GLIBC_DYNAMIC_LINKERX32 "/lib/ld-kfreebsd-x32.so.1"
-+#define GLIBC_DYNAMIC_LINKER32 "/tools/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld-kfreebsd-x86-64.so.1"
-+#define GLIBC_DYNAMIC_LINKERX32 "/tools/lib/ld-kfreebsd-x32.so.1"
-diff -Naur gcc-7.1.0.orig/gcc/config/i386/linux.h gcc-7.1.0/gcc/config/i386/linux.h
---- gcc-7.1.0.orig/gcc/config/i386/linux.h	2017-01-01 12:07:43.000000000 +0000
-+++ gcc-7.1.0/gcc/config/i386/linux.h	2017-05-13 00:26:43.524426013 +0000
-@@ -20,7 +20,7 @@
- <http://www.gnu.org/licenses/>.  */
- 
- #define GNU_USER_LINK_EMULATION "elf_i386"
--#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
- 
- #undef MUSL_DYNAMIC_LINKER
--#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1"
-+#define MUSL_DYNAMIC_LINKER "/tools/lib/ld-musl-i386.so.1"
-diff -Naur gcc-7.1.0.orig/gcc/config/i386/linux64.h gcc-7.1.0/gcc/config/i386/linux64.h
---- gcc-7.1.0.orig/gcc/config/i386/linux64.h	2017-01-01 12:07:43.000000000 +0000
-+++ gcc-7.1.0/gcc/config/i386/linux64.h	2017-05-13 00:40:40.776003998 +0000
-@@ -27,13 +27,13 @@
- #define GNU_USER_LINK_EMULATION64 "elf_x86_64"
- #define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64"
- 
--#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
--#define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2"
-+#define GLIBC_DYNAMIC_LINKER32 "/tools/lib/ld-linux.so.2"
-+#define GLIBC_DYNAMIC_LINKER64 "/tools/lib64/ld-linux-x86-64.so.2"
-+#define GLIBC_DYNAMIC_LINKERX32 "/tools/libx32/ld-linux-x32.so.2"
- 
- #undef MUSL_DYNAMIC_LINKER32
--#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1"
-+#define MUSL_DYNAMIC_LINKER32 "/tools/lib/ld-musl-i386.so.1"
- #undef MUSL_DYNAMIC_LINKER64
--#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-x86_64.so.1"
-+#define MUSL_DYNAMIC_LINKER64 "/tools/lib/ld-musl-x86_64.so.1"
- #undef MUSL_DYNAMIC_LINKERX32
--#define MUSL_DYNAMIC_LINKERX32 "/lib/ld-musl-x32.so.1"
-+#define MUSL_DYNAMIC_LINKERX32 "/tools/lib/ld-musl-x32.so.1"
-diff -Naur gcc-7.1.0.orig/gcc/config/ia64/linux.h gcc-7.1.0/gcc/config/ia64/linux.h
---- gcc-7.1.0.orig/gcc/config/ia64/linux.h	2017-01-01 12:07:43.000000000 +0000
-+++ gcc-7.1.0/gcc/config/ia64/linux.h	2017-05-13 00:23:29.033857463 +0000
-@@ -55,7 +55,7 @@
- /* Define this for shared library support because it isn't in the main
-    linux.h file.  */
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux-ia64.so.2"
- 
- #undef LINK_SPEC
- #define LINK_SPEC "\
-diff -Naur gcc-7.1.0.orig/gcc/config/kopensolaris-gnu.h gcc-7.1.0/gcc/config/kopensolaris-gnu.h
---- gcc-7.1.0.orig/gcc/config/kopensolaris-gnu.h	2017-01-01 12:07:43.000000000 +0000
-+++ gcc-7.1.0/gcc/config/kopensolaris-gnu.h	2017-05-13 00:23:35.155937891 +0000
-@@ -31,4 +31,5 @@
-   while (0)
- 
- #undef GNU_USER_DYNAMIC_LINKER
--#define GNU_USER_DYNAMIC_LINKER "/lib/ld.so.1"
-+#define GNU_USER_DYNAMIC_LINKER "/tools/lib/ld.so.1"
-+
-diff -Naur gcc-7.1.0.orig/gcc/config/linux.h gcc-7.1.0/gcc/config/linux.h
---- gcc-7.1.0.orig/gcc/config/linux.h	2017-01-01 12:07:43.000000000 +0000
-+++ gcc-7.1.0/gcc/config/linux.h	2017-05-13 00:23:35.155937891 +0000
-@@ -81,10 +81,10 @@
-    GLIBC_DYNAMIC_LINKER must be defined for each target using them, or
-    GLIBC_DYNAMIC_LINKER32 and GLIBC_DYNAMIC_LINKER64 for targets
-    supporting both 32-bit and 64-bit compilation.  */
--#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
--#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
--#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
--#define UCLIBC_DYNAMIC_LINKERX32 "/lib/ldx32-uClibc.so.0"
-+#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0"
-+#define UCLIBC_DYNAMIC_LINKER32 "/tools/lib/ld-uClibc.so.0"
-+#define UCLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64-uClibc.so.0"
-+#define UCLIBC_DYNAMIC_LINKERX32 "/tools/lib/ldx32-uClibc.so.0"
- #define BIONIC_DYNAMIC_LINKER "/system/bin/linker"
- #define BIONIC_DYNAMIC_LINKER32 "/system/bin/linker"
- #define BIONIC_DYNAMIC_LINKER64 "/system/bin/linker64"
-diff -Naur gcc-7.1.0.orig/gcc/config/lm32/uclinux-elf.h gcc-7.1.0/gcc/config/lm32/uclinux-elf.h
---- gcc-7.1.0.orig/gcc/config/lm32/uclinux-elf.h	2017-01-01 12:07:43.000000000 +0000
-+++ gcc-7.1.0/gcc/config/lm32/uclinux-elf.h	2017-05-13 00:23:35.155937891 +0000
-@@ -67,7 +67,7 @@
-    %{shared:-shared} \
-    %{symbolic:-Bsymbolic} \
-    %{rdynamic:-export-dynamic} \
--   -dynamic-linker /lib/ld-linux.so.2"
-+   -dynamic-linker /tools/lib/ld-linux.so.2"
- 
- #define TARGET_OS_CPP_BUILTINS() GNU_USER_TARGET_OS_CPP_BUILTINS()
- 
-diff -Naur gcc-7.1.0.orig/gcc/config/m68k/linux.h gcc-7.1.0/gcc/config/m68k/linux.h
---- gcc-7.1.0.orig/gcc/config/m68k/linux.h	2017-01-06 21:21:02.000000000 +0000
-+++ gcc-7.1.0/gcc/config/m68k/linux.h	2017-05-13 00:23:35.155937891 +0000
-@@ -71,7 +71,7 @@
-    When the -shared link option is used a final link is not being
-    done.  */
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
- 
- #undef LINK_SPEC
- #define LINK_SPEC "-m m68kelf %{shared} \
-diff -Naur gcc-7.1.0.orig/gcc/config/microblaze/linux.h gcc-7.1.0/gcc/config/microblaze/linux.h
---- gcc-7.1.0.orig/gcc/config/microblaze/linux.h	2017-01-01 12:07:43.000000000 +0000
-+++ gcc-7.1.0/gcc/config/microblaze/linux.h	2017-05-13 00:28:39.669022914 +0000
-@@ -28,8 +28,8 @@
- #undef TLS_NEEDS_GOT
- #define TLS_NEEDS_GOT 1
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
--#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
-+#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0"
- 
- #if TARGET_BIG_ENDIAN_DEFAULT == 0 /* LE */
- #define MUSL_DYNAMIC_LINKER_E "%{mbig-endian:;:el}"
-@@ -38,7 +38,7 @@
- #endif
- 
- #undef MUSL_DYNAMIC_LINKER
--#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-microblaze" MUSL_DYNAMIC_LINKER_E ".so.1"
-+#define MUSL_DYNAMIC_LINKER "/tools/lib/ld-musl-microblaze" MUSL_DYNAMIC_LINKER_E ".so.1"
- 
- #undef  SUBTARGET_EXTRA_SPECS
- #define SUBTARGET_EXTRA_SPECS \
-diff -Naur gcc-7.1.0.orig/gcc/config/mips/linux.h gcc-7.1.0/gcc/config/mips/linux.h
---- gcc-7.1.0.orig/gcc/config/mips/linux.h	2017-01-01 12:07:43.000000000 +0000
-+++ gcc-7.1.0/gcc/config/mips/linux.h	2017-05-13 00:23:35.156937904 +0000
-@@ -22,20 +22,20 @@
- #define GNU_USER_LINK_EMULATIONN32 "elf32%{EB:b}%{EL:l}tsmipn32"
- 
- #define GLIBC_DYNAMIC_LINKER32 \
--  "%{mnan=2008:/lib/ld-linux-mipsn8.so.1;:/lib/ld.so.1}"
-+  "%{mnan=2008:/tools/lib/ld-linux-mipsn8.so.1;:/tools/lib/ld.so.1}"
- #define GLIBC_DYNAMIC_LINKER64 \
--  "%{mnan=2008:/lib64/ld-linux-mipsn8.so.1;:/lib64/ld.so.1}"
-+  "%{mnan=2008:/tools/lib64/ld-linux-mipsn8.so.1;:/tools/lib64/ld.so.1}"
- #define GLIBC_DYNAMIC_LINKERN32 \
--  "%{mnan=2008:/lib32/ld-linux-mipsn8.so.1;:/lib32/ld.so.1}"
-+  "%{mnan=2008:/tools/lib32/ld-linux-mipsn8.so.1;:/tools/lib32/ld.so.1}"
- 
- #undef UCLIBC_DYNAMIC_LINKER32
- #define UCLIBC_DYNAMIC_LINKER32 \
--  "%{mnan=2008:/lib/ld-uClibc-mipsn8.so.0;:/lib/ld-uClibc.so.0}"
-+  "%{mnan=2008:/tools/lib/ld-uClibc-mipsn8.so.0;:/tools/lib/ld-uClibc.so.0}"
- #undef UCLIBC_DYNAMIC_LINKER64
- #define UCLIBC_DYNAMIC_LINKER64 \
--  "%{mnan=2008:/lib/ld64-uClibc-mipsn8.so.0;:/lib/ld64-uClibc.so.0}"
-+  "%{mnan=2008:/tools/lib/ld64-uClibc-mipsn8.so.0;:/tools/lib/ld64-uClibc.so.0}"
- #define UCLIBC_DYNAMIC_LINKERN32 \
--  "%{mnan=2008:/lib32/ld-uClibc-mipsn8.so.0;:/lib32/ld-uClibc.so.0}"
-+  "%{mnan=2008:/tools/lib32/ld-uClibc-mipsn8.so.0;:/tools/lib32/ld-uClibc.so.0}"
- 
- #undef MUSL_DYNAMIC_LINKER32
- #define MUSL_DYNAMIC_LINKER32 \
-diff -Naur gcc-7.1.0.orig/gcc/config/mn10300/linux.h gcc-7.1.0/gcc/config/mn10300/linux.h
---- gcc-7.1.0.orig/gcc/config/mn10300/linux.h	2017-01-01 12:07:43.000000000 +0000
-+++ gcc-7.1.0/gcc/config/mn10300/linux.h	2017-05-13 00:23:35.156937904 +0000
-@@ -32,7 +32,7 @@
- #undef  ASM_SPEC
- #define ASM_SPEC ""
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
- 
- #undef  LINK_SPEC
- #define LINK_SPEC "%{mrelax:--relax} %{shared:-shared} \
-diff -Naur gcc-7.1.0.orig/gcc/config/pa/pa-linux.h gcc-7.1.0/gcc/config/pa/pa-linux.h
---- gcc-7.1.0.orig/gcc/config/pa/pa-linux.h	2017-01-01 12:07:43.000000000 +0000
-+++ gcc-7.1.0/gcc/config/pa/pa-linux.h	2017-05-13 00:23:35.156937904 +0000
-@@ -37,7 +37,7 @@
- /* Define this for shared library support because it isn't in the main
-    linux.h file.  */
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
- 
- #undef LINK_SPEC
- #define LINK_SPEC "\
-diff -Naur gcc-7.1.0.orig/gcc/config/rs6000/linux64.h gcc-7.1.0/gcc/config/rs6000/linux64.h
---- gcc-7.1.0.orig/gcc/config/rs6000/linux64.h	2017-02-07 11:29:06.000000000 +0000
-+++ gcc-7.1.0/gcc/config/rs6000/linux64.h	2017-05-13 00:30:10.838301362 +0000
-@@ -412,25 +412,25 @@
- #undef	LINK_OS_DEFAULT_SPEC
- #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
- 
--#define GLIBC_DYNAMIC_LINKER32 "%(dynamic_linker_prefix)/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER32 "%(dynamic_linker_prefix)/tools/lib/ld.so.1"
- 
- #ifdef LINUX64_DEFAULT_ABI_ELFv2
- #define GLIBC_DYNAMIC_LINKER64 \
--"%{mabi=elfv1:%(dynamic_linker_prefix)/lib64/ld64.so.1;" \
--":%(dynamic_linker_prefix)/lib64/ld64.so.2}"
-+"%{mabi=elfv1:%(dynamic_linker_prefix)/tools/lib64/ld64.so.1;" \
-+":%(dynamic_linker_prefix)/tools/lib64/ld64.so.2}"
- #else
- #define GLIBC_DYNAMIC_LINKER64 \
--"%{mabi=elfv2:%(dynamic_linker_prefix)/lib64/ld64.so.2;" \
--":%(dynamic_linker_prefix)/lib64/ld64.so.1}"
-+"%{mabi=elfv2:%(dynamic_linker_prefix)/tools/lib64/ld64.so.2;" \
-+":%(dynamic_linker_prefix)/tools/lib64/ld64.so.1}"
- #endif
- 
- #define MUSL_DYNAMIC_LINKER32 \
--  "/lib/ld-musl-powerpc" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1"
-+  "/tools/lib/ld-musl-powerpc" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1"
- #define MUSL_DYNAMIC_LINKER64 \
--  "/lib/ld-musl-powerpc64" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1"
-+  "/tools/lib/ld-musl-powerpc64" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1"
- 
--#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
--#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
-+#define UCLIBC_DYNAMIC_LINKER32 "/tools/lib/ld-uClibc.so.0"
-+#define UCLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64-uClibc.so.0"
- #if DEFAULT_LIBC == LIBC_UCLIBC
- #define CHOOSE_DYNAMIC_LINKER(G, U, M) \
-   "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}"
-diff -Naur gcc-7.1.0.orig/gcc/config/rs6000/sysv4.h gcc-7.1.0/gcc/config/rs6000/sysv4.h
---- gcc-7.1.0.orig/gcc/config/rs6000/sysv4.h	2017-02-07 11:29:06.000000000 +0000
-+++ gcc-7.1.0/gcc/config/rs6000/sysv4.h	2017-05-13 00:30:47.270810369 +0000
-@@ -780,10 +780,10 @@
- 
- #define MUSL_DYNAMIC_LINKER_E ENDIAN_SELECT("","le","")
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
--#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
-+#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0"
- #define MUSL_DYNAMIC_LINKER \
--  "/lib/ld-musl-powerpc" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1"
-+  "/tools/lib/ld-musl-powerpc" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1"
- #if DEFAULT_LIBC == LIBC_UCLIBC
- #define CHOOSE_DYNAMIC_LINKER(G, U, M) \
-   "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}"
-diff -Naur gcc-7.1.0.orig/gcc/config/s390/linux.h gcc-7.1.0/gcc/config/s390/linux.h
---- gcc-7.1.0.orig/gcc/config/s390/linux.h	2017-02-06 10:25:05.000000000 +0000
-+++ gcc-7.1.0/gcc/config/s390/linux.h	2017-05-13 00:23:35.158937930 +0000
-@@ -73,8 +73,8 @@
- #define MULTILIB_DEFAULTS { "m31" }
- #endif
- 
--#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
--#define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1"
-+#define GLIBC_DYNAMIC_LINKER32 "/tools/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64.so.1"
- 
- #undef  LINK_SPEC
- #define LINK_SPEC \
-diff -Naur gcc-7.1.0.orig/gcc/config/sh/linux.h gcc-7.1.0/gcc/config/sh/linux.h
---- gcc-7.1.0.orig/gcc/config/sh/linux.h	2017-01-01 12:07:43.000000000 +0000
-+++ gcc-7.1.0/gcc/config/sh/linux.h	2017-05-13 00:23:35.158937930 +0000
-@@ -64,7 +64,7 @@
-   "/lib/ld-musl-sh" MUSL_DYNAMIC_LINKER_E MUSL_DYNAMIC_LINKER_FP \
-   "%{mfdpic:-fdpic}.so.1"
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
- 
- #undef SUBTARGET_LINK_EMUL_SUFFIX
- #define SUBTARGET_LINK_EMUL_SUFFIX "%{mfdpic:_fd;:_linux}"
-diff -Naur gcc-7.1.0.orig/gcc/config/sparc/linux.h gcc-7.1.0/gcc/config/sparc/linux.h
---- gcc-7.1.0.orig/gcc/config/sparc/linux.h	2017-01-01 12:07:43.000000000 +0000
-+++ gcc-7.1.0/gcc/config/sparc/linux.h	2017-05-13 00:23:35.158937930 +0000
-@@ -83,7 +83,7 @@
-    When the -shared link option is used a final link is not being
-    done.  */
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
- 
- #undef  LINK_SPEC
- #define LINK_SPEC "-m elf32_sparc %{shared:-shared} \
-diff -Naur gcc-7.1.0.orig/gcc/config/sparc/linux64.h gcc-7.1.0/gcc/config/sparc/linux64.h
---- gcc-7.1.0.orig/gcc/config/sparc/linux64.h	2017-01-01 12:07:43.000000000 +0000
-+++ gcc-7.1.0/gcc/config/sparc/linux64.h	2017-05-13 00:23:35.158937930 +0000
-@@ -84,8 +84,8 @@
-    When the -shared link option is used a final link is not being
-    done.  */
- 
--#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2"
-+#define GLIBC_DYNAMIC_LINKER32 "/tools/lib/ld-linux.so.2"
-+#define GLIBC_DYNAMIC_LINKER64 "/tools/lib64/ld-linux.so.2"
- 
- #ifdef SPARC_BI_ARCH
- 
-@@ -213,7 +213,7 @@
- #else /* !SPARC_BI_ARCH */
- 
- #undef LINK_SPEC
--#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
-+#define LINK_SPEC "-m elf64_sparc -Y P,%R/tools/lib64 %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
-       %{rdynamic:-export-dynamic} \
-diff -Naur gcc-7.1.0.orig/gcc/config/vax/linux.h gcc-7.1.0/gcc/config/vax/linux.h
---- gcc-7.1.0.orig/gcc/config/vax/linux.h	2017-01-01 12:07:43.000000000 +0000
-+++ gcc-7.1.0/gcc/config/vax/linux.h	2017-05-13 00:23:35.158937930 +0000
-@@ -41,7 +41,7 @@
-   %{!shared: \
-     %{!static: \
-       %{rdynamic:-export-dynamic} \
--      -dynamic-linker /lib/ld.so.1} \
-+      -dynamic-linker /tools/lib/ld.so.1} \
-     %{static:-static}}"
- 
- #undef  WCHAR_TYPE
-diff -Naur gcc-7.1.0.orig/gcc/config/xtensa/linux.h gcc-7.1.0/gcc/config/xtensa/linux.h
---- gcc-7.1.0.orig/gcc/config/xtensa/linux.h	2017-01-01 12:07:43.000000000 +0000
-+++ gcc-7.1.0/gcc/config/xtensa/linux.h	2017-05-13 00:23:35.159937943 +0000
-@@ -46,7 +46,7 @@
-   %{mauto-litpools:--auto-litpools} \
-   %{mno-auto-litpools:--no-auto-litpools}"
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
- 
- #undef LINK_SPEC
- #define LINK_SPEC \
Index: tches/hfsutils-3.2.6-fixes-1.patch
===================================================================
--- patches/hfsutils-3.2.6-fixes-1.patch	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,36 +1,0 @@
-Submitted by: Jim Gifford (jim at cross-lfs dot org)
-Date: 2009-12-16
-Initial Package Version: 3.2.6
-Upstream Status: Already Applied
-Origin: Jim Gifford
-Description: Missing Errno
-             Support Drives Larger the 2gb
-
-diff -Naur hfsutils-3.2.6.orig/libhfs/os/unix.c hfsutils-3.2.6/libhfs/os/unix.c
---- hfsutils-3.2.6.orig/libhfs/os/unix.c	1998-11-02 14:09:13.000000000 -0800
-+++ hfsutils-3.2.6/libhfs/os/unix.c	2009-02-17 15:09:36.025977091 -0800
-@@ -19,6 +19,11 @@
-  * $Id: unix.c,v 1.8 1998/11/02 22:09:13 rob Exp $
-  */
- 
-+#ifdef __linux__
-+#define _FILE_OFFSET_BITS 64
-+#define _LARGE_FILES
-+#endif
-+
- # ifdef HAVE_CONFIG_H
- #  include "config.h"
- # endif
-diff -Naur hfsutils-3.2.6.orig/tclhfs.c hfsutils-3.2.6/tclhfs.c
---- hfsutils-3.2.6.orig/tclhfs.c	1998-11-02 14:08:32.000000000 -0800
-+++ hfsutils-3.2.6/tclhfs.c	2009-02-17 15:09:15.124637798 -0800
-@@ -43,8 +43,7 @@
- # include "charset.h"
- # include "suid.h"
- # include "version.h"
--
--extern int errno;
-+# include <errno.h>
- 
- # define ERROR(code, str)	(hfs_error = (str), errno = (code))
- 
Index: tches/intltool-0.51.0-perl-5.22-compatibility.patch
===================================================================
--- patches/intltool-0.51.0-perl-5.22-compatibility.patch	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,50 +1,0 @@
-Submitted by: Chris Staub (chris at clfs dot org)
-Date: 2017-06-10
-Initial Package Version: 0.51 
-Origin: https://raw.githubusercontent.com/Alexpux/MSYS2-packages/master/intltool/perl-5.22-compatibility.patch
-Description: Updates Intltool to work with Perl 5.26
-
-diff -Naur intltool-0.51.0.orig/intltool-update.in intltool-0.51.0/intltool-update.in
---- intltool-0.51.0.orig/intltool-update.in	2015-03-09 01:39:54.000000000 +0000
-+++ intltool-0.51.0/intltool-update.in	2017-06-10 07:16:39.637921936 +0000
-@@ -1062,7 +1062,7 @@
- 	}
-     }
- 
--    if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/)
-+    if ($str =~ /^(.*)\$\{?([A-Z_]+)}?(.*)$/)
-     {
- 	my $rest = $3;
- 	my $untouched = $1;
-@@ -1190,10 +1190,10 @@
- 	$name    =~ s/\(+$//g;
- 	$version =~ s/\(+$//g;
- 
--	$varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
--	$varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
--	$varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);
--	$varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
-+	$varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/);
-+	$varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/);
-+	$varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/);
-+	$varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/);
-     }
- 
-     if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)[,]?([^,\)]+)?/m)
-@@ -1219,11 +1219,11 @@
- 	$version =~ s/\(+$//g;
-         $bugurl  =~ s/\(+$//g if (defined $bugurl);
- 
--	$varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
--	$varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
--	$varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);
--	$varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
--        $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\${?\w+}?/);
-+	$varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/);
-+	$varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/);
-+	$varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/);
-+	$varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/);
-+        $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\$\{?\w+}?/);
-     }
- 
-     # \s makes this not work, why?
Index: tches/iputils-s20150815-build-1.patch
===================================================================
--- patches/iputils-s20150815-build-1.patch	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,1286 +1,0 @@
-Submitted By: William Harrington <kb0iic at cross-lfs dot org>
-Date: 2015-08-30
-Initial Package Version: s20150815
-Upstream Status: Applied
-Origin: git://git.linux-ipv6.org/gitroot/iputils.git
-Description: Edits Makefile USE_ Variables and includes man pages.
-
-diff -Naur iputils-s20150815.orig/Makefile iputils-s20150815/Makefile
---- iputils-s20150815.orig/Makefile	2015-08-15 14:07:28.000000000 +0000
-+++ iputils-s20150815/Makefile	2015-08-24 00:28:16.063196187 +0000
-@@ -27,7 +27,7 @@
- # sysfs support (with libsysfs - deprecated) [no|yes|static]
- USE_SYSFS=no
- # IDN support  [yes|no|static]
--USE_IDN=yes
-+USE_IDN=no
- 
- # Do not use getifaddrs [no|yes|static]
- WITHOUT_IFADDRS=no
-@@ -35,7 +35,7 @@
- ARPING_DEFAULT_DEVICE=
- 
- # nettle library for ipv6 ping [yes|no|static]
--USE_NETTLE=yes
-+USE_NETTLE=no
- # libgcrypt library for ipv6 ping [no|yes|static]
- USE_GCRYPT=no
- # Crypto library for ping6 [shared|static|no]
-diff -Naur iputils-s20150815.orig/doc/arping.8 iputils-s20150815/doc/arping.8
---- iputils-s20150815.orig/doc/arping.8	1970-01-01 00:00:00.000000000 +0000
-+++ iputils-s20150815/doc/arping.8	2015-08-24 00:27:12.254377152 +0000
-@@ -0,0 +1,109 @@
-+.\" This manpage has been automatically generated by docbook2man 
-+.\" from a DocBook document.  This tool can be found at:
-+.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
-+.\" Please send any bug reports, improvements, comments, patches, 
-+.\" etc. to Steve Cheng <steve@ggi-project.org>.
-+.TH "ARPING" "8" "24 August 2015" "iputils-140519" "System Manager's Manual: iputils"
-+.SH NAME
-+arping \- send ARP REQUEST to a neighbour host
-+.SH SYNOPSIS
-+
-+\fBarping\fR [\fB-AbDfhqUV\fR] [\fB-c \fIcount\fB\fR] [\fB-w \fIdeadline\fB\fR] [\fB-s \fIsource\fB\fR] \fB-I \fIinterface\fB\fR \fB\fIdestination\fB\fR
-+
-+.SH "DESCRIPTION"
-+.PP
-+Ping \fIdestination\fR on device \fIinterface\fR by ARP packets,
-+using source address \fIsource\fR.
-+.SH "OPTIONS"
-+.TP
-+\fB-A\fR
-+The same as \fB-U\fR, but ARP REPLY packets used instead
-+of ARP REQUEST.
-+.TP
-+\fB-b\fR
-+Send only MAC level broadcasts. Normally \fBarping\fR starts
-+from sending broadcast, and switch to unicast after reply received.
-+.TP
-+\fB-c \fIcount\fB\fR
-+Stop after sending \fIcount\fR ARP REQUEST
-+packets. With 
-+\fIdeadline\fR
-+option, instead wait for
-+\fIcount\fR ARP REPLY packets, or until the timeout expires.
-+.TP
-+\fB-D\fR
-+Duplicate address detection mode (DAD). See 
-+RFC2131, 4.4.1.
-+Returns 0, if DAD succeeded i.e. no replies are received
-+.TP
-+\fB-f\fR
-+Finish after the first reply confirming that target is alive.
-+.TP
-+\fB-I \fIinterface\fB\fR
-+Name of network device where to send ARP REQUEST packets.
-+.TP
-+\fB-h\fR
-+Print help page and exit.
-+.TP
-+\fB-q\fR
-+Quiet output. Nothing is displayed.
-+.TP
-+\fB-s \fIsource\fB\fR
-+IP source address to use in ARP packets.
-+If this option is absent, source address is:
-+.RS
-+.TP 0.2i
-+\(bu
-+In DAD mode (with option \fB-D\fR) set to 0.0.0.0.
-+.TP 0.2i
-+\(bu
-+In Unsolicited ARP mode (with options \fB-U\fR or \fB-A\fR)
-+set to \fIdestination\fR.
-+.TP 0.2i
-+\(bu
-+Otherwise, it is calculated from routing tables.
-+.RE
-+.TP
-+\fB-U\fR
-+Unsolicited ARP mode to update neighbours' ARP caches.
-+No replies are expected.
-+.TP
-+\fB-V\fR
-+Print version of the program and exit.
-+.TP
-+\fB-w \fIdeadline\fB\fR
-+Specify a timeout, in seconds, before
-+\fBarping\fR
-+exits regardless of how many
-+packets have been sent or received. In this case
-+\fBarping\fR
-+does not stop after
-+\fIcount\fR
-+packet are sent, it waits either for
-+\fIdeadline\fR
-+expire or until
-+\fIcount\fR
-+probes are answered.
-+.SH "SEE ALSO"
-+.PP
-+\fBping\fR(8),
-+\fBclockdiff\fR(8),
-+\fBtracepath\fR(8).
-+.SH "AUTHOR"
-+.PP
-+\fBarping\fR was written by
-+Alexey Kuznetsov
-+<kuznet@ms2.inr.ac.ru>.
-+It is now maintained by
-+YOSHIFUJI Hideaki
-+<yoshfuji@skbuff.net>.
-+.SH "SECURITY"
-+.PP
-+\fBarping\fR requires CAP_NET_RAW capability
-+to be executed. It is not recommended to be used as set-uid root,
-+because it allows user to modify ARP caches of neighbour hosts.
-+.SH "AVAILABILITY"
-+.PP
-+\fBarping\fR is part of \fIiputils\fR package
-+and the latest versions are  available in source form at
-+http://www.skbuff.net/iputils/iputils-current.tar.bz2.
-diff -Naur iputils-s20150815.orig/doc/clockdiff.8 iputils-s20150815/doc/clockdiff.8
---- iputils-s20150815.orig/doc/clockdiff.8	1970-01-01 00:00:00.000000000 +0000
-+++ iputils-s20150815/doc/clockdiff.8	2015-08-24 00:27:12.387701056 +0000
-@@ -0,0 +1,81 @@
-+.\" This manpage has been automatically generated by docbook2man 
-+.\" from a DocBook document.  This tool can be found at:
-+.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
-+.\" Please send any bug reports, improvements, comments, patches, 
-+.\" etc. to Steve Cheng <steve@ggi-project.org>.
-+.TH "CLOCKDIFF" "8" "24 August 2015" "iputils-140519" "System Manager's Manual: iputils"
-+.SH NAME
-+clockdiff \- measure clock difference between hosts
-+.SH SYNOPSIS
-+
-+\fBclockdiff\fR [\fB-o\fR] [\fB-o1\fR] \fB\fIdestination\fB\fR
-+
-+.SH "DESCRIPTION"
-+.PP
-+\fBclockdiff\fR Measures clock difference between us and
-+\fIdestination\fR with 1 msec resolution using ICMP TIMESTAMP
-+[2]
-+packets or, optionally, IP TIMESTAMP option
-+[3]
-+option added to ICMP ECHO.
-+[1]
-+.SH "OPTIONS"
-+.TP
-+\fB-o\fR
-+Use IP TIMESTAMP with ICMP ECHO instead of ICMP TIMESTAMP
-+messages. It is useful with some destinations, which do not support
-+ICMP TIMESTAMP (f.e. Solaris <2.4).
-+.TP
-+\fB-o1\fR
-+Slightly different form of \fB-o\fR, namely it uses three-term
-+IP TIMESTAMP with prespecified hop addresses instead of four term one.
-+What flavor works better depends on target host. Particularly,
-+\fB-o\fR is better for Linux.
-+.SH "WARNINGS"
-+.TP 0.2i
-+\(bu
-+Some nodes (Cisco) use non-standard timestamps, which is allowed
-+by RFC, but makes timestamps mostly useless.
-+.TP 0.2i
-+\(bu
-+Some nodes generate messed timestamps (Solaris>2.4), when
-+run \fBxntpd\fR. Seems, its IP stack uses a corrupted clock source,
-+which is synchronized to time-of-day clock periodically and jumps
-+randomly making timestamps mostly useless. Good news is that you can
-+use NTP in this case, which is even better.
-+.TP 0.2i
-+\(bu
-+\fBclockdiff\fR shows difference in time modulo 24 days.
-+.SH "SEE ALSO"
-+.PP
-+\fBping\fR(8),
-+\fBarping\fR(8),
-+\fBtracepath\fR(8).
-+.SH "REFERENCES"
-+.PP
-+[1] ICMP ECHO,
-+RFC0792, page 14.
-+.PP
-+[2] ICMP TIMESTAMP,
-+RFC0792, page 16.
-+.PP
-+[3] IP TIMESTAMP option,
-+RFC0791, 3.1, page 16.
-+.SH "AUTHOR"
-+.PP
-+\fBclockdiff\fR was compiled by
-+Alexey Kuznetsov
-+<kuznet@ms2.inr.ac.ru>. It was based on code borrowed
-+from BSD \fBtimed\fR daemon.
-+It is now maintained by
-+YOSHIFUJI Hideaki
-+<yoshfuji@skbuff.net>.
-+.SH "SECURITY"
-+.PP
-+\fBclockdiff\fR requires CAP_NET_RAW capability
-+to be executed. It is safe to be used as set-uid root.
-+.SH "AVAILABILITY"
-+.PP
-+\fBclockdiff\fR is part of \fIiputils\fR package
-+and the latest versions are  available in source form at
-+http://www.skbuff.net/iputils/iputils-current.tar.bz2.
-diff -Naur iputils-s20150815.orig/doc/ninfod.8 iputils-s20150815/doc/ninfod.8
---- iputils-s20150815.orig/doc/ninfod.8	1970-01-01 00:00:00.000000000 +0000
-+++ iputils-s20150815/doc/ninfod.8	2015-08-24 00:27:12.524358055 +0000
-@@ -0,0 +1,72 @@
-+.\" This manpage has been automatically generated by docbook2man 
-+.\" from a DocBook document.  This tool can be found at:
-+.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
-+.\" Please send any bug reports, improvements, comments, patches, 
-+.\" etc. to Steve Cheng <steve@ggi-project.org>.
-+.TH "NINFOD" "8" "24 August 2015" "iputils-140519" "System Manager's Manual: iputils"
-+.SH NAME
-+ninfod \- Respond to IPv6 Node Information Queries
-+.SH SYNOPSIS
-+
-+\fBninfod\fR [\fB-dhv\fR] [\fB-p \fIpidfile\fB\fR] [\fB-u \fIuser\fB\fR]
-+
-+.SH "DESCRIPTION"
-+.PP
-+Responds to IPv6 Node Information Queries (RFC4620) from clients.
-+Queries can be sent by various implementations of \fBping6\fR command.
-+.SH "OPTIONS"
-+.TP
-+\fB-a\fR
-+Debug mode.  Do not go background.
-+.TP
-+\fB-h\fR
-+Show help.
-+.TP
-+\fB-v\fR
-+Verbose mode.
-+.TP
-+\fB-u \fIuser\fB\fR
-+Run as another user.
-+\fIuser\fR can either be username or user ID.
-+.TP
-+\fB-p \fIpidfile\fB\fR
-+File for process-id storage.
-+\fIuser\fR is required to be able to create the file.
-+.SH "SEE ALSO"
-+.PP
-+\fBping\fR(8).
-+.SH "AUTHOR"
-+.PP
-+\fBninfod\fR was written by USAGI/WIDE Project.
-+.SH "COPYING"
-+.PP
-+
-+.nf
-+Copyright (C) 2012 YOSHIFUJI Hideaki.
-+Copyright (C) 2002 USAGI/WIDE Project.
-+All rights reserved.
-+
-+Redistribution and use in source and binary forms, with or without
-+modification, are permitted provided that the following conditions
-+are met:
-+1. Redistributions of source code must retain the above copyright
-+   notice, this list of conditions and the following disclaimer.
-+2. Redistributions in binary form must reproduce the above copyright
-+   notice, this list of conditions and the following disclaimer in the
-+   documentation and/or other materials provided with the distribution.
-+3. Neither the name of the project nor the names of its contributors
-+   may be used to endorse or promote products derived from this software
-+   without specific prior written permission.
-+
-+THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
-+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
-+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+SUCH DAMAGE.
-+.fi
-diff -Naur iputils-s20150815.orig/doc/pg3.8 iputils-s20150815/doc/pg3.8
---- iputils-s20150815.orig/doc/pg3.8	1970-01-01 00:00:00.000000000 +0000
-+++ iputils-s20150815/doc/pg3.8	2015-08-24 00:27:12.657681956 +0000
-@@ -0,0 +1,86 @@
-+.\" This manpage has been automatically generated by docbook2man 
-+.\" from a DocBook document.  This tool can be found at:
-+.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
-+.\" Please send any bug reports, improvements, comments, patches, 
-+.\" etc. to Steve Cheng <steve@ggi-project.org>.
-+.TH "PG3" "8" "24 August 2015" "iputils-140519" "System Manager's Manual: iputils"
-+.SH NAME
-+pg3, ipg, pgset \- send stream of UDP packets
-+.SH SYNOPSIS
-+
-+\fBsource ipg\fR
-+
-+
-+\fBpg\fR
-+
-+
-+\fBpgset\fR \fB\fICOMMAND\fB\fR
-+
-+.SH "DESCRIPTION"
-+.PP
-+\fBipg\fR is not a program, it is script which should be sourced
-+to \fBbash\fR. When sourced it loads module \fIpg3\fR and
-+exports a few of functions accessible from parent shell. These macros
-+are \fBpg\fR to start packet injection and to get the results of run;
-+and \fBpgset\fR to setup packet generator.
-+.PP
-+\fBpgset\fR can send the following commands to module \fIpg3\fR:
-+.SH "COMMAND"
-+.TP
-+\fBodev \fIDEVICE\fB\fR
-+Name of Ethernet device to test. See
-+warning below.
-+.TP
-+\fBpkt_size \fIBYTES\fB\fR
-+Size of packet to generate. The size includes all the headers: UDP, IP,
-+MAC, but does not account for overhead internal to medium, i.e. FCS
-+and various paddings.
-+.TP
-+\fBfrags \fINUMBER\fB\fR
-+Each packet will contain \fINUMBER\fR of fragments.
-+Maximal amount for linux-2.4 is 6. Far not all the devices support
-+fragmented buffers.
-+.TP
-+\fBcount \fINUMBER\fB\fR
-+Send stream of \fINUMBER\fR of packets and stop after this.
-+.TP
-+\fBipg \fITIME\fB\fR
-+Introduce artificial delay between packets of \fITIME\fR
-+microseconds.
-+.TP
-+\fBdst \fIIP_ADDRESS\fB\fR
-+Select IP destination where the stream is sent to.
-+Beware, never set this address at random. \fBpg3\fR is not a toy,
-+it creates really tough stream. Default value is 0.0.0.0.
-+.TP
-+\fBdst \fIMAC_ADDRESS\fB\fR
-+Select MAC destination where the stream is sent to.
-+Default value is 00:00:00:00:00:00 in hope that this will not be received
-+by any node on LAN.
-+.TP
-+\fBstop\fR
-+Abort packet injection.
-+.SH "WARNING"
-+.PP
-+When output device is set to some random device different
-+of hardware Ethernet device, \fBpg3\fR will crash kernel.
-+.PP
-+Do not use it on VLAN, ethertap, VTUN and other devices,
-+which emulate Ethernet not being real Ethernet in fact.
-+.SH "AUTHOR"
-+.PP
-+\fBpg3\fR was written by Robert Olsson <robert.olsson@its.uu.se>.
-+.SH "SECURITY"
-+.PP
-+This can be used only by superuser.
-+.PP
-+This tool creates floods of packets which is unlikely to be handled
-+even by high-end machines. For example, it saturates gigabit link with
-+60 byte packets when used with Intel's e1000. In face of such stream
-+switches, routers and end hosts may deadlock, crash, explode.
-+Use only in test lab environment.
-+.SH "AVAILABILITY"
-+.PP
-+\fBpg3\fR is part of \fIiputils\fR package
-+and the latest versions are  available in source form at
-+http://www.skbuff.net/iputils/iputils-current.tar.bz2.
-diff -Naur iputils-s20150815.orig/doc/ping.8 iputils-s20150815/doc/ping.8
---- iputils-s20150815.orig/doc/ping.8	1970-01-01 00:00:00.000000000 +0000
-+++ iputils-s20150815/doc/ping.8	2015-08-24 00:27:12.861000903 +0000
-@@ -0,0 +1,433 @@
-+.\" This manpage has been automatically generated by docbook2man 
-+.\" from a DocBook document.  This tool can be found at:
-+.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
-+.\" Please send any bug reports, improvements, comments, patches, 
-+.\" etc. to Steve Cheng <steve@ggi-project.org>.
-+.TH "PING" "8" "24 August 2015" "iputils-140519" "System Manager's Manual: iputils"
-+.SH NAME
-+ping, ping6 \- send ICMP ECHO_REQUEST to network hosts
-+.SH SYNOPSIS
-+
-+\fBping\fR [\fB-aAbBdDfhLnOqrRUvV6\fR] [\fB-c \fIcount\fB\fR] [\fB-F \fIflowlabel\fB\fR] [\fB-i \fIinterval\fB\fR] [\fB-I \fIinterface\fB\fR] [\fB-l \fIpreload\fB\fR] [\fB-m \fImark\fB\fR] [\fB-M \fIpmtudisc_option\fB\fR] [\fB-N \fInodeinfo_option\fB\fR] [\fB-w \fIdeadline\fB\fR] [\fB-W \fItimeout\fB\fR] [\fB-p \fIpattern\fB\fR] [\fB-Q \fItos\fB\fR] [\fB-s \fIpacketsize\fB\fR] [\fB-S \fIsndbuf\fB\fR] [\fB-t \fIttl\fB\fR] [\fB-T \fItimestamp option\fB\fR] [\fB\fIhop\fB\fR\fI ...\fR] \fB\fIdestination\fB\fR
-+
-+.SH "DESCRIPTION"
-+.PP
-+\fBping\fR uses the ICMP protocol's mandatory ECHO_REQUEST
-+datagram to elicit an ICMP ECHO_RESPONSE from a host or gateway.
-+ECHO_REQUEST datagrams (``pings'') have an IP and ICMP
-+header, followed by a struct timeval and then an arbitrary
-+number of ``pad'' bytes used to fill out the packet.
-+.PP
-+\fBping6\fR is IPv6 version of \fBping\fR, and can also send Node Information Queries (RFC4620).
-+Intermediate \fIhop\fRs may not be allowed, because IPv6 source routing was deprecated (RFC5095).
-+.SH "OPTIONS"
-+.TP
-+\fB-a\fR
-+Audible ping.
-+.TP
-+\fB-A\fR
-+Adaptive ping. Interpacket interval adapts to round-trip time, so that
-+effectively not more than one (or more, if preload is set) unanswered probe
-+is present in the network. Minimal interval is 200msec for not super-user.
-+On networks with low rtt this mode is essentially equivalent to flood mode.  
-+.TP
-+\fB-b\fR
-+Allow pinging a broadcast address.
-+.TP
-+\fB-B\fR
-+Do not allow \fBping\fR to change source address of probes.
-+The address is bound to one selected when \fBping\fR starts.
-+.TP
-+\fB-c \fIcount\fB\fR
-+Stop after sending \fIcount\fR ECHO_REQUEST
-+packets. With 
-+\fIdeadline\fR
-+option, \fBping\fR waits for
-+\fIcount\fR ECHO_REPLY packets, until the timeout expires.
-+.TP
-+\fB-d\fR
-+Set the SO_DEBUG option on the socket being used.
-+Essentially, this socket option is not used by Linux kernel. 
-+.TP
-+\fB-D\fR
-+Print timestamp (unix time + microseconds as in gettimeofday) before
-+each line.
-+.TP
-+\fB-f\fR
-+Flood ping. For every ECHO_REQUEST sent a period ``.'' is printed,
-+while for ever ECHO_REPLY received a backspace is printed.
-+This provides a rapid display of how many packets are being dropped.
-+If interval is not given, it sets interval to zero and
-+outputs packets as fast as they come back or one hundred times per second,
-+whichever is more.
-+Only the super-user may use this option with zero interval.
-+.TP
-+\fB-F \fIflow label\fB\fR
-+\fBping6\fR only.
-+Allocate and set 20 bit flow label (in hex) on echo request packets.
-+If value is zero, kernel allocates random flow label.
-+.TP
-+\fB-h\fR
-+Show help.
-+.TP
-+\fB-i \fIinterval\fB\fR
-+Wait \fIinterval\fR seconds between sending each packet.
-+The default is to wait for one second between each packet normally,
-+or not to wait in flood mode. Only super-user may set interval
-+to values less 0.2 seconds.
-+.TP
-+\fB-I \fIinterface\fB\fR
-+\fIinterface\fR is either an address, or an interface name.
-+If \fIinterface\fR is an address, it sets source address
-+to specified interface address.
-+If \fIinterface\fR in an interface name, it sets
-+source interface to specified interface.
-+For \fBping6\fR, when doing ping to a link-local scope
-+address, link specification (by the '%'-notation in
-+\fIdestination\fR, or by this option) is required.
-+.TP
-+\fB-l \fIpreload\fB\fR
-+If \fIpreload\fR is specified,
-+\fBping\fR sends that many packets not waiting for reply.
-+Only the super-user may select preload more than 3.
-+.TP
-+\fB-L\fR
-+Suppress loopback of multicast packets.  This flag only applies if the ping
-+destination is a multicast address.
-+.TP
-+\fB-m \fImark\fB\fR
-+use \fImark\fR to tag the packets going out. This is useful
-+for variety of reasons within the kernel such as using policy
-+routing to select specific outbound processing.
-+.TP
-+\fB-M \fIpmtudisc_opt\fB\fR
-+Select Path MTU Discovery strategy.
-+\fIpmtudisc_option\fR may be either \fIdo\fR
-+(prohibit fragmentation, even local one), 
-+\fIwant\fR (do PMTU discovery, fragment locally when packet size
-+is large), or \fIdont\fR (do not set DF flag).
-+.TP
-+\fB-N \fInodeinfo_option\fB\fR
-+\fBping6\fR only.
-+Send ICMPv6 Node Information Queries (RFC4620), instead of Echo Request.
-+CAP_NET_RAW capability is required.
-+.RS
-+.TP
-+\fBhelp\fR
-+Show help for NI support.
-+.RE
-+.RS
-+.TP
-+\fBname\fR
-+Queries for Node Names.
-+.RE
-+.RS
-+.TP
-+\fBipv6\fR
-+Queries for IPv6 Addresses. There are several IPv6 specific flags.
-+.RS
-+.TP
-+\fBipv6-global\fR
-+Request IPv6 global-scope addresses.
-+.RE
-+.RS
-+.TP
-+\fBipv6-sitelocal\fR
-+Request IPv6 site-local addresses.
-+.RE
-+.RS
-+.TP
-+\fBipv6-linklocal\fR
-+Request IPv6 link-local addresses.
-+.RE
-+.RS
-+.TP
-+\fBipv6-all\fR
-+Request IPv6 addresses on other interfaces.
-+.RE
-+.RE
-+.RS
-+.TP
-+\fBipv4\fR
-+Queries for IPv4 Addresses.  There is one IPv4 specific flag.
-+.RS
-+.TP
-+\fBipv4-all\fR
-+Request IPv4 addresses on other interfaces.
-+.RE
-+.RE
-+.RS
-+.TP
-+\fBsubject-ipv6=\fIipv6addr\fB\fR
-+IPv6 subject address.
-+.RE
-+.RS
-+.TP
-+\fBsubject-ipv4=\fIipv4addr\fB\fR
-+IPv4 subject address.
-+.RE
-+.RS
-+.TP
-+\fBsubject-name=\fInodename\fB\fR
-+Subject name.  If it contains more than one dot,
-+fully-qualified domain name is assumed.
-+.RE
-+.RS
-+.TP
-+\fBsubject-fqdn=\fInodename\fB\fR
-+Subject name.  Fully-qualified domain name is
-+always assumed.
-+.RE
-+.TP
-+\fB-n\fR
-+Numeric output only.
-+No attempt will be made to lookup symbolic names for host addresses.
-+.TP
-+\fB-O\fR
-+Report outstanding ICMP ECHO reply before sending next packet.
-+This is useful together with the timestamp \fB-D\fR to
-+log output to a diagnostic file and search for missing answers.
-+.TP
-+\fB-p \fIpattern\fB\fR
-+You may specify up to 16 ``pad'' bytes to fill out the packet you send.
-+This is useful for diagnosing data-dependent problems in a network.
-+For example, \fB-p ff\fR will cause the sent packet
-+to be filled with all ones.
-+.TP
-+\fB-q\fR
-+Quiet output.
-+Nothing is displayed except the summary lines at startup time and
-+when finished.
-+.TP
-+\fB-Q \fItos\fB\fR
-+Set Quality of Service -related bits in ICMP datagrams.
-+\fItos\fR can be decimal (\fBping\fR only) or hex number.
-+
-+In RFC2474, these fields are interpreted as 8-bit Differentiated
-+Services (DS), consisting of: bits 0-1 (2 lowest bits) of separate
-+data, and bits 2-7 (highest 6 bits) of Differentiated Services
-+Codepoint (DSCP).  In RFC2481 and RFC3168, bits 0-1 are used for ECN.
-+
-+Historically (RFC1349, obsoleted by RFC2474), these were interpreted
-+as: bit 0 (lowest bit) for reserved (currently being redefined as
-+congestion control), 1-4 for Type of Service and bits 5-7
-+(highest bits) for Precedence.
-+.TP
-+\fB-r\fR
-+Bypass the normal routing tables and send directly to a host on an attached
-+interface.
-+If the host is not on a directly-attached network, an error is returned.
-+This option can be used to ping a local host through an interface
-+that has no route through it provided the option \fB-I\fR is also
-+used.
-+.TP
-+\fB-R\fR
-+\fBping\fR only.
-+Record route.
-+Includes the RECORD_ROUTE option in the ECHO_REQUEST
-+packet and displays the route buffer on returned packets.
-+Note that the IP header is only large enough for nine such routes.
-+Many hosts ignore or discard this option.
-+.TP
-+\fB-s \fIpacketsize\fB\fR
-+Specifies the number of data bytes to be sent.  
-+The default is 56, which translates into 64 ICMP
-+data bytes when combined with the 8 bytes of ICMP header data.
-+.TP
-+\fB-S \fIsndbuf\fB\fR
-+Set socket sndbuf. If not specified, it is selected to buffer
-+not more than one packet.
-+.TP
-+\fB-t \fIttl\fB\fR
-+\fBping\fR only.
-+Set the IP Time to Live.
-+.TP
-+\fB-T \fItimestamp option\fB\fR
-+Set special IP timestamp options.
-+\fItimestamp option\fR may be either 
-+\fItsonly\fR (only timestamps), 
-+\fItsandaddr\fR (timestamps and addresses) or 
-+\fItsprespec host1 [host2 [host3 [host4]]]\fR
-+(timestamp prespecified hops).
-+.TP
-+\fB-U\fR
-+Print full user-to-user latency (the old behaviour). Normally
-+\fBping\fR
-+prints network round trip time, which can be different
-+f.e. due to DNS failures. 
-+.TP
-+\fB-v\fR
-+Verbose output.
-+.TP
-+\fB-V\fR
-+Show version and exit.
-+.TP
-+\fB-w \fIdeadline\fB\fR
-+Specify a timeout, in seconds, before
-+\fBping\fR
-+exits regardless of how many
-+packets have been sent or received. In this case
-+\fBping\fR
-+does not stop after
-+\fIcount\fR
-+packet are sent, it waits either for
-+\fIdeadline\fR
-+expire or until
-+\fIcount\fR
-+probes are answered or for some error notification from network.   
-+.TP
-+\fB-W \fItimeout\fB\fR
-+Time to wait for a response, in seconds. The option affects only timeout
-+in absence of any responses, otherwise \fBping\fR waits for two RTTs.
-+.PP
-+When using \fBping\fR for fault isolation, it should first be run
-+on the local host, to verify that the local network interface is up
-+and running. Then, hosts and gateways further and further away should be
-+``pinged''. Round-trip times and packet loss statistics are computed.
-+If duplicate packets are received, they are not included in the packet
-+loss calculation, although the round trip time of these packets is used
-+in calculating the minimum/average/maximum round-trip time numbers.
-+When the specified number of packets have been sent (and received) or
-+if the program is terminated with a
-+SIGINT, a brief summary is displayed. Shorter current statistics
-+can be obtained without termination of process with signal
-+SIGQUIT.
-+.PP
-+If \fBping\fR does not receive any reply packets at all it will
-+exit with code 1. If a packet 
-+\fIcount\fR
-+and
-+\fIdeadline\fR
-+are both specified, and fewer than
-+\fIcount\fR
-+packets are received by the time the
-+\fIdeadline\fR
-+has arrived, it will also exit with code 1. 
-+On other error it exits with code 2. Otherwise it exits with code 0. This
-+makes it possible to use the exit code to see if a host is alive or
-+not.
-+.PP
-+This program is intended for use in network testing, measurement and
-+management.
-+Because of the load it can impose on the network, it is unwise to use
-+\fBping\fR during normal operations or from automated scripts.
-+.SH "ICMP PACKET DETAILS"
-+.PP
-+An IP header without options is 20 bytes.
-+An ICMP ECHO_REQUEST packet contains an additional 8 bytes worth
-+of ICMP header followed by an arbitrary amount of data.
-+When a \fIpacketsize\fR is given, this indicated the size of this
-+extra piece of data (the default is 56). Thus the amount of data received
-+inside of an IP packet of type ICMP ECHO_REPLY will always be 8 bytes
-+more than the requested data space (the ICMP header).
-+.PP
-+If the data space is at least of size of struct timeval
-+\fBping\fR uses the beginning bytes of this space to include
-+a timestamp which it uses in the computation of round trip times.
-+If the data space is shorter, no round trip times are given.
-+.SH "DUPLICATE AND DAMAGED PACKETS"
-+.PP
-+\fBping\fR will report duplicate and damaged packets.
-+Duplicate packets should never occur, and seem to be caused by
-+inappropriate link-level retransmissions.
-+Duplicates may occur in many situations and are rarely (if ever) a
-+good sign, although the presence of low levels of duplicates may not
-+always be cause for alarm.
-+.PP
-+Damaged packets are obviously serious cause for alarm and often
-+indicate broken hardware somewhere in the
-+\fBping\fR packet's path (in the network or in the hosts).
-+.SH "TRYING DIFFERENT DATA PATTERNS"
-+.PP
-+The (inter)network layer should never treat packets differently depending
-+on the data contained in the data portion.
-+Unfortunately, data-dependent problems have been known to sneak into
-+networks and remain undetected for long periods of time.
-+In many cases the particular pattern that will have problems is something
-+that doesn't have sufficient ``transitions'', such as all ones or all
-+zeros, or a pattern right at the edge, such as almost all zeros.
-+It isn't necessarily enough to specify a data pattern of all zeros (for
-+example) on the command line because the pattern that is of interest is
-+at the data link level, and the relationship between what you type and
-+what the controllers transmit can be complicated.
-+.PP
-+This means that if you have a data-dependent problem you will probably
-+have to do a lot of testing to find it.
-+If you are lucky, you may manage to find a file that either can't be sent
-+across your network or that takes much longer to transfer than other
-+similar length files.
-+You can then examine this file for repeated patterns that you can test
-+using the \fB-p\fR option of \fBping\fR.
-+.SH "TTL DETAILS"
-+.PP
-+The TTL value of an IP packet represents the maximum number of IP routers
-+that the packet can go through before being thrown away.
-+In current practice you can expect each router in the Internet to decrement
-+the TTL field by exactly one.
-+.PP
-+The TCP/IP specification states that the TTL field for TCP
-+packets should be set to 60, but many systems use smaller values
-+(4.3 BSD uses 30, 4.2 used 15).
-+.PP
-+The maximum possible value of this field is 255, and most Unix systems set
-+the TTL field of ICMP ECHO_REQUEST packets to 255.
-+This is why you will find you can ``ping'' some hosts, but not reach them
-+with
-+\fBtelnet\fR(1)
-+or
-+\fBftp\fR(1).
-+.PP
-+In normal operation ping prints the TTL value from the packet it receives.
-+When a remote system receives a ping packet, it can do one of three things
-+with the TTL field in its response:
-+.TP 0.2i
-+\(bu
-+Not change it; this is what Berkeley Unix systems did before the
-+4.3BSD Tahoe release. In this case the TTL value in the received packet
-+will be 255 minus the number of routers in the round-trip path.
-+.TP 0.2i
-+\(bu
-+Set it to 255; this is what current Berkeley Unix systems do.
-+In this case the TTL value in the received packet will be 255 minus the
-+number of routers in the path \fBfrom\fR
-+the remote system \fBto\fR the \fBping\fRing host.
-+.TP 0.2i
-+\(bu
-+Set it to some other value. Some machines use the same value for
-+ICMP packets that they use for TCP packets, for example either 30 or 60.
-+Others may use completely wild values.
-+.SH "BUGS"
-+.TP 0.2i
-+\(bu
-+Many Hosts and Gateways ignore the RECORD_ROUTE option.
-+.TP 0.2i
-+\(bu
-+The maximum IP header length is too small for options like
-+RECORD_ROUTE to be completely useful.
-+There's not much that can be done about this, however.
-+.TP 0.2i
-+\(bu
-+Flood pinging is not recommended in general, and flood pinging the
-+broadcast address should only be done under very controlled conditions.
-+.SH "SEE ALSO"
-+.PP
-+\fBnetstat\fR(1),
-+\fBifconfig\fR(8).
-+.SH "HISTORY"
-+.PP
-+The \fBping\fR command appeared in 4.3BSD.
-+.PP
-+The version described here is its descendant specific to Linux.
-+.SH "SECURITY"
-+.PP
-+\fBping\fR requires CAP_NET_RAW capability
-+to be executed 1) if the program is used for non-echo queries
-+(See \fB-N\fR option), or 2) if kernel does not
-+support non-raw ICMP sockets, or 3) if the user is not allowed
-+to create an ICMP echo socket.  The program may be used as
-+set-uid root.
-+.SH "AVAILABILITY"
-+.PP
-+\fBping\fR is part of \fIiputils\fR package
-+and the latest versions are  available in source form at
-+http://www.skbuff.net/iputils/iputils-current.tar.bz2.
-diff -Naur iputils-s20150815.orig/doc/rarpd.8 iputils-s20150815/doc/rarpd.8
---- iputils-s20150815.orig/doc/rarpd.8	1970-01-01 00:00:00.000000000 +0000
-+++ iputils-s20150815/doc/rarpd.8	2015-08-24 00:27:12.994324803 +0000
-@@ -0,0 +1,84 @@
-+.\" This manpage has been automatically generated by docbook2man 
-+.\" from a DocBook document.  This tool can be found at:
-+.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
-+.\" Please send any bug reports, improvements, comments, patches, 
-+.\" etc. to Steve Cheng <steve@ggi-project.org>.
-+.TH "RARPD" "8" "24 August 2015" "iputils-140519" "System Manager's Manual: iputils"
-+.SH NAME
-+rarpd \- answer RARP REQUESTs
-+.SH SYNOPSIS
-+
-+\fBarping\fR [\fB-aAvde\fR] [\fB-b \fIbootdir\fB\fR] [\fB\fIinterface\fB\fR]
-+
-+.SH "DESCRIPTION"
-+.PP
-+Listens
-+RARP
-+requests from clients. Provided MAC address of client
-+is found in \fI/etc/ethers\fR database and
-+obtained host name is resolvable to an IP address appropriate
-+for attached network, \fBrarpd\fR answers to client with RARPD
-+reply carrying an IP address.
-+.PP
-+To allow multiple boot servers on the network \fBrarpd\fR
-+optionally checks for presence Sun-like bootable image in TFTP directory.
-+It should have form \fBHexadecimal_IP.ARCH\fR, f.e. to load
-+sparc 193.233.7.98 \fIC1E90762.SUN4M\fR is linked to
-+an image appropriate for SUM4M in directory \fI/etc/tftpboot\fR.
-+.SH "WARNING"
-+.PP
-+This facility is deeply obsoleted by
-+BOOTP
-+and later
-+DHCP protocols.
-+However, some clients really still need this to boot.
-+.SH "OPTIONS"
-+.TP
-+\fB-a\fR
-+Listen on all the interfaces. Currently it is an internal
-+option, its function is overridden with \fIinterface\fR
-+argument. It should not be used.
-+.TP
-+\fB-A\fR
-+Listen not only RARP but also ARP messages, some rare clients
-+use ARP by some unknown reason.
-+.TP
-+\fB-v\fR
-+Be verbose.
-+.TP
-+\fB-d\fR
-+Debug mode. Do not go to background.
-+.TP
-+\fB-e\fR
-+Do not check for presence of a boot image, reply if MAC address
-+resolves to a valid IP address using \fI/etc/ethers\fR
-+database and DNS. 
-+.TP
-+\fB-b \fIbootdir\fB\fR
-+TFTP boot directory. Default is \fI/etc/tftpboot\fR
-+.SH "SEE ALSO"
-+.PP
-+\fBarping\fR(8),
-+\fBtftpd\fR(8).
-+.SH "AUTHOR"
-+.PP
-+\fBrarpd\fR was written by
-+Alexey Kuznetsov
-+<kuznet@ms2.inr.ac.ru>.
-+It is now maintained by
-+YOSHIFUJI Hideaki
-+<yoshfuji@skbuff.net>.
-+.SH "SECURITY"
-+.PP
-+\fBrarpd\fR requires CAP_NET_RAW capability
-+to listen and send RARP and ARP packets. It also needs CAP_NET_ADMIN
-+to give to kernel hint for ARP resolution; this is not strictly required,
-+but some (most of, to be more exact) clients are so badly broken that
-+are not able to answer ARP before they are finally booted. This is
-+not wonderful taking into account that clients using RARPD in 2002
-+are all unsupported relic creatures of 90's and even earlier.
-+.SH "AVAILABILITY"
-+.PP
-+\fBrarpd\fR is part of \fIiputils\fR package
-+and the latest versions are  available in source form at
-+http://www.skbuff.net/iputils/iputils-current.tar.bz2.
-diff -Naur iputils-s20150815.orig/doc/rdisc.8 iputils-s20150815/doc/rdisc.8
---- iputils-s20150815.orig/doc/rdisc.8	1970-01-01 00:00:00.000000000 +0000
-+++ iputils-s20150815/doc/rdisc.8	2015-08-24 00:27:13.124315607 +0000
-@@ -0,0 +1,122 @@
-+.\" This manpage has been automatically generated by docbook2man 
-+.\" from a DocBook document.  This tool can be found at:
-+.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
-+.\" Please send any bug reports, improvements, comments, patches, 
-+.\" etc. to Steve Cheng <steve@ggi-project.org>.
-+.TH "RDISC" "8" "24 August 2015" "iputils-140519" "System Manager's Manual: iputils"
-+.SH NAME
-+rdisc \- network router discovery daemon
-+.SH SYNOPSIS
-+
-+\fBrdisc\fR [\fB-abdfrstvV\fR] [\fB-p \fIpreference\fB\fR] [\fB-T \fImax_interval\fB\fR] [\fB\fIsend_address\fB\fR] [\fB\fIreceive_address\fB\fR]
-+
-+.SH "DESCRIPTION"
-+.PP
-+\fBrdisc\fR implements client side of the ICMP router discover protocol.
-+\fBrdisc\fR is invoked at boot time to populate the network
-+routing tables with default routes. 
-+.PP
-+\fBrdisc\fR listens on the ALL_HOSTS (224.0.0.1) multicast address
-+(or \fIreceive_address\fR provided it is given) 
-+for ROUTER_ADVERTISE messages from routers. The received
-+messages are handled by first ignoring those listed router addresses
-+with which the host does not share a network. Among the remaining addresses
-+the ones with the highest preference are selected as default routers
-+and a default route is entered in the kernel routing table
-+for each one of them.
-+.PP
-+Optionally, \fBrdisc\fR can avoid waiting for routers to announce 
-+themselves by sending out a few ROUTER_SOLICITATION messages
-+to the ALL_ROUTERS (224.0.0.2) multicast address 
-+(or \fIsend_address\fR provided it is given) 
-+when it is started.
-+.PP
-+A timer is associated with each router address and the address will
-+no longer be considered for inclusion in the the routing tables if the 
-+timer expires before a new 
-+\fBadvertise\fR message is received from the router.
-+The address will also be excluded from consideration if the host receives an 
-+\fBadvertise\fR
-+message with the preference being maximally negative.
-+.PP
-+Server side of router discovery protocol is supported by Cisco IOS
-+and by any more or less complete UNIX routing daemon, f.e \fBgated\fR.
-+Or, \fBrdisc\fR can act as responder, if compiled with -DRDISC_SERVER.
-+.SH "OPTIONS"
-+.TP
-+\fB-a\fR
-+Accept all routers independently of the preference they have in their 
-+\fBadvertise\fR messages.
-+Normally \fBrdisc\fR only accepts (and enters in the kernel routing
-+tables) the router or routers with the highest preference.
-+.TP
-+\fB-b\fR
-+Opposite to \fB-a\fR, i.e. install only router with the best
-+preference value. It is default behaviour.
-+.TP
-+\fB-d\fR
-+Send debugging messages to syslog.
-+.TP
-+\fB-f\fR
-+Run \fBrdisc\fR forever even if no routers are found.
-+Normally \fBrdisc\fR gives up if it has not received any 
-+\fBadvertise\fR message after after soliciting three times,
-+in which case it exits with a non-zero exit code.
-+If \fB-f\fR is not specified in the first form then 
-+\fB-s\fR must be specified.
-+.TP
-+\fB-r\fR
-+Responder mode, available only if compiled with -DRDISC_SERVER.
-+.TP
-+\fB-s\fR
-+Send three \fBsolicitation\fR messages initially to quickly discover
-+the routers when the system is booted.
-+When \fB-s\fR is specified \fBrdisc\fR
-+exits with a non-zero exit code if it can not find any routers.
-+This can be overridden with the \fB-f\fR option.
-+.TP
-+\fB-p \fIpreference\fB\fR
-+Set preference in advertisement.
-+Available only with -r option.
-+.TP
-+\fB-T \fImax_interval\fB\fR
-+Set maximum advertisement interval in seconds.  Default is 600 secs.
-+Available only with -r option.
-+.TP
-+\fB-t\fR
-+Test mode. Do not go to background.
-+.TP
-+\fB-v\fR
-+Be verbose i.e. send lots of debugging messages to syslog.
-+.TP
-+\fB-V\fR
-+Print version and exit.
-+.SH "HISTORY"
-+.PP
-+This program was developed by Sun Microsystems (see copyright
-+notice in source file). It was ported to Linux by
-+Alexey Kuznetsov
-+<kuznet@ms2.inr.ac.ru>.
-+It is now maintained by
-+YOSHIFUJI Hideaki
-+<yoshfuji@skbuff.net>.
-+.SH "SEE ALSO"
-+.PP
-+\fBicmp\fR(7),
-+\fBinet\fR(7),
-+\fBping\fR(8).
-+.SH "REFERENCES"
-+.PP
-+Deering, S.E.,ed "ICMP Router Discovery Messages",
-+RFC1256, Network Information Center, SRI International,
-+Menlo Park, Calif., September 1991.
-+.SH "SECURITY"
-+.PP
-+\fBrdisc\fR requires CAP_NET_RAW to listen
-+and send ICMP messages and capability CAP_NET_ADMIN
-+to update routing tables. 
-+.SH "AVAILABILITY"
-+.PP
-+\fBrdisc\fR is part of \fIiputils\fR package
-+and the latest versions are  available in source form at
-+http://www.skbuff.net/iputils/iputils-current.tar.bz2.
-diff -Naur iputils-s20150815.orig/doc/tftpd.8 iputils-s20150815/doc/tftpd.8
---- iputils-s20150815.orig/doc/tftpd.8	1970-01-01 00:00:00.000000000 +0000
-+++ iputils-s20150815/doc/tftpd.8	2015-08-24 00:27:13.260972607 +0000
-@@ -0,0 +1,85 @@
-+.\" This manpage has been automatically generated by docbook2man 
-+.\" from a DocBook document.  This tool can be found at:
-+.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
-+.\" Please send any bug reports, improvements, comments, patches, 
-+.\" etc. to Steve Cheng <steve@ggi-project.org>.
-+.TH "TFTPD" "8" "24 August 2015" "iputils-140519" "System Manager's Manual: iputils"
-+.SH NAME
-+tftpd \- Trivial File Transfer Protocol server
-+.SH SYNOPSIS
-+
-+\fBtftpd\fR \fB\fIdirectory\fB\fR
-+
-+.SH "DESCRIPTION"
-+.PP
-+\fBtftpd\fR is a server which supports the DARPA
-+Trivial File Transfer Protocol
-+(RFC1350).
-+The TFTP server is started
-+by \fBinetd\fR(8).
-+.PP
-+\fIdirectory\fR is required argument; if it is not given
-+\fBtftpd\fR aborts. This path is prepended to any file name requested
-+via TFTP protocol, effectively chrooting \fBtftpd\fR to this directory.
-+File names are validated not to escape out of this directory, however
-+administrator may configure such escape using symbolic links.
-+.PP
-+It is in difference of variants of \fBtftpd\fR usually distributed
-+with unix-like systems, which take a list of directories and match
-+file names to start from one of given prefixes or to some random
-+default, when no arguments were given. There are two reasons not to
-+behave in this way: first, it is inconvenient, clients are not expected
-+to know something about layout of filesystem on server host.
-+And second, TFTP protocol is not a tool for browsing of server's filesystem,
-+it is just an agent allowing to boot dumb clients. 
-+.PP
-+In the case when \fBtftpd\fR is used together with
-+\fBrarpd\fR(8),
-+tftp directories in these services should coincide and it is expected
-+that each client booted via TFTP has boot image corresponding
-+its IP address with an architecture suffix following Sun Microsystems
-+conventions. See 
-+\fBrarpd\fR(8)
-+for more details.
-+.SH "SECURITY"
-+.PP
-+TFTP protocol does not provide any authentication.
-+Due to this capital flaw \fBtftpd\fR is not able to restrict
-+access to files and will allow only publically readable
-+files to be accessed. Files may be written only if they already
-+exist and are publically writable.
-+.PP
-+Impact is evident, directory exported via TFTP \fBmust not\fR
-+contain sensitive information of any kind, everyone is allowed
-+to read it as soon as a client is allowed. Boot images do not contain
-+such information as rule, however you should think twice before
-+publishing f.e. Cisco IOS config files via TFTP, they contain
-+\fBunencrypted\fR passwords and may contain some information
-+about the network, which you were not going to make public.
-+.PP
-+The \fBtftpd\fR server should be executed by \fBinetd\fR
-+with dropped root privileges, namely with a user ID giving minimal
-+access to files published in tftp directory. If it is executed
-+as superuser occasionally, \fBtftpd\fR drops its UID and GID
-+to 65534, which is most likely not the thing which you expect.
-+However, this is not very essential; remember, only files accessible
-+for everyone can be read or written via TFTP.
-+.SH "SEE ALSO"
-+.PP
-+\fBrarpd\fR(8),
-+\fBtftp\fR(1),
-+\fBinetd\fR(8).
-+.SH "HISTORY"
-+.PP
-+The \fBtftpd\fR command appeared in 4.2BSD. The source in iputils
-+is cleaned up both syntactically (ANSIized) and semantically (UDP socket IO).
-+.PP
-+It is distributed with iputils mostly as good demo of an interesting feature
-+(MSG_CONFIRM) allowing to boot long images by dumb clients
-+not answering ARP requests until they are finally booted.
-+However, this is full functional and can be used in production.
-+.SH "AVAILABILITY"
-+.PP
-+\fBtftpd\fR is part of \fIiputils\fR package
-+and the latest versions are  available in source form at
-+http://www.skbuff.net/iputils/iputils-current.tar.bz2.
-diff -Naur iputils-s20150815.orig/doc/tracepath.8 iputils-s20150815/doc/tracepath.8
---- iputils-s20150815.orig/doc/tracepath.8	1970-01-01 00:00:00.000000000 +0000
-+++ iputils-s20150815/doc/tracepath.8	2015-08-24 00:27:13.394296509 +0000
-@@ -0,0 +1,104 @@
-+.\" This manpage has been automatically generated by docbook2man 
-+.\" from a DocBook document.  This tool can be found at:
-+.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
-+.\" Please send any bug reports, improvements, comments, patches, 
-+.\" etc. to Steve Cheng <steve@ggi-project.org>.
-+.TH "TRACEPATH" "8" "24 August 2015" "iputils-140519" "System Manager's Manual: iputils"
-+.SH NAME
-+tracepath, tracepath6 \- traces path to a network host discovering MTU along this path
-+.SH SYNOPSIS
-+
-+\fBtracepath\fR [\fB-n\fR] [\fB-b\fR] [\fB-l \fIpktlen\fB\fR] [\fB-m \fImax_hops\fB\fR] [\fB-p \fIport\fB\fR] \fB\fIdestination\fB\fR
-+
-+.SH "DESCRIPTION"
-+.PP
-+It traces path to \fIdestination\fR discovering MTU along this path.
-+It uses UDP port \fIport\fR or some random port.
-+It is similar to \fBtraceroute\fR, only does not require superuser
-+privileges and has no fancy options.
-+.PP
-+\fBtracepath6\fR is good replacement for \fBtraceroute6\fR
-+and classic example of application of Linux error queues.
-+The situation with IPv4 is worse, because commercial
-+IP routers do not return enough information in ICMP error messages.
-+Probably, it will change, when they will be updated.
-+For now it uses Van Jacobson's trick, sweeping a range
-+of UDP ports to maintain trace history.
-+.SH "OPTIONS"
-+.TP
-+\fB-n\fR
-+Print primarily IP addresses numerically.
-+.TP
-+\fB-b\fR
-+Print both of host names and IP addresses.
-+.TP
-+\fB-l\fR
-+Sets the initial packet length to \fIpktlen\fR instead of
-+65535 for \fBtracepath\fR or 128000 for \fBtracepath6\fR.
-+.TP
-+\fB-m\fR
-+Set maximum hops (or maximum TTLs) to \fImax_hops\fR
-+instead of 30.
-+.TP
-+\fB-p\fR
-+Sets the initial destination port to use.
-+.SH "OUTPUT"
-+.PP
-+
-+.nf
-+root@mops:~ # tracepath6 3ffe:2400:0:109::2
-+ 1?: [LOCALHOST]                              pmtu 1500
-+ 1:  dust.inr.ac.ru                   0.411ms
-+ 2:  dust.inr.ac.ru        asymm  1   0.390ms pmtu 1480
-+ 2:  3ffe:2400:0:109::2               463.514ms reached
-+     Resume: pmtu 1480 hops 2 back 2
-+.fi
-+.PP
-+The first column shows TTL of the probe, followed by colon.
-+Usually value of TTL is obtained from reply from network,
-+but sometimes reply does not contain necessary information and
-+we have to guess it. In this case the number is followed by ?.
-+.PP
-+The second column shows the network hop, which replied to the probe.
-+It is either address of router or word [LOCALHOST], if
-+the probe was not sent to the network.
-+.PP
-+The rest of line shows miscellaneous information about path to
-+the correspinding network hop. As rule it contains value of RTT.
-+Additionally, it can show Path MTU, when it changes.
-+If the path is asymmetric
-+or the probe finishes before it reach prescribed hop, difference
-+between number of hops in forward and backward direction is shown
-+following keyword async. This information is not reliable.
-+F.e. the third line shows asymmetry of 1, it is because the first probe
-+with TTL of 2 was rejected at the first hop due to Path MTU Discovery.
-+.PP
-+The last line summarizes information about all the path to the destination,
-+it shows detected Path MTU, amount of hops to the destination and our
-+guess about amount of hops from the destination to us, which can be
-+different when the path is asymmetric.
-+.SH "SEE ALSO"
-+.PP
-+\fBtraceroute\fR(8),
-+\fBtraceroute6\fR(8),
-+\fBping\fR(8).
-+.SH "AUTHOR"
-+.PP
-+\fBtracepath\fR was written by
-+Alexey Kuznetsov
-+<kuznet@ms2.inr.ac.ru>.
-+.SH "SECURITY"
-+.PP
-+No security issues.
-+.PP
-+This lapidary deserves to be elaborated.
-+\fBtracepath\fR is not a privileged program, unlike
-+\fBtraceroute\fR, \fBping\fR and other beasts of this kind.
-+\fBtracepath\fR may be executed by everyone who has some access
-+to network, enough to send UDP datagrams to investigated destination
-+using given port.
-+.SH "AVAILABILITY"
-+.PP
-+\fBtracepath\fR is part of \fIiputils\fR package
-+and the latest versions are  available in source form at
-+http://www.skbuff.net/iputils/iputils-current.tar.bz2.
-diff -Naur iputils-s20150815.orig/doc/traceroute6.8 iputils-s20150815/doc/traceroute6.8
---- iputils-s20150815.orig/doc/traceroute6.8	1970-01-01 00:00:00.000000000 +0000
-+++ iputils-s20150815/doc/traceroute6.8	2015-08-24 00:27:13.527620409 +0000
-@@ -0,0 +1,42 @@
-+.\" This manpage has been automatically generated by docbook2man 
-+.\" from a DocBook document.  This tool can be found at:
-+.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
-+.\" Please send any bug reports, improvements, comments, patches, 
-+.\" etc. to Steve Cheng <steve@ggi-project.org>.
-+.TH "TRACEROUTE6" "8" "24 August 2015" "iputils-140519" "System Manager's Manual: iputils"
-+.SH NAME
-+traceroute6 \- traces path to a network host
-+.SH SYNOPSIS
-+
-+\fBtraceroute6\fR [\fB-dnrvV\fR] [\fB-i \fIinterface\fB\fR] [\fB-m \fImax_ttl\fB\fR] [\fB-p \fIport\fB\fR] [\fB-q \fImax_probes\fB\fR] [\fB-s \fIsource\fB\fR] [\fB-w \fIwait time\fB\fR] \fB\fIdestination\fB\fR [\fB\fIsize\fB\fR]
-+
-+.SH "DESCRIPTION"
-+.PP
-+Description can be found in 
-+\fBtraceroute\fR(8),
-+all the references to IP replaced to IPv6. It is needless to copy
-+the description from there.
-+.SH "SEE ALSO"
-+.PP
-+\fBtraceroute\fR(8),
-+\fBtracepath\fR(8),
-+\fBping\fR(8).
-+.SH "HISTORY"
-+.PP
-+This program has long history. Author of \fBtraceroute\fR
-+is Van Jacobson and it first appeared in 1988. This clone is
-+based on a port of \fBtraceroute\fR to IPv6 published
-+in NRL IPv6 distribution in 1996. In turn, it was ported
-+to Linux by Pedro Roque. After this it was kept in sync by    
-+Alexey Kuznetsov
-+<kuznet@ms2.inr.ac.ru>. And eventually entered
-+\fBiputils\fR package.
-+.SH "SECURITY"
-+.PP
-+\fBtracepath6\fR requires CAP_NET_RAW capability
-+to be executed. It is safe to be used as set-uid root.
-+.SH "AVAILABILITY"
-+.PP
-+\fBtraceroute6\fR is part of \fIiputils\fR package
-+and the latest versions are  available in source form at
-+http://www.skbuff.net/iputils/iputils-current.tar.bz2.
Index: tches/make-3.82-fixes-1.patch
===================================================================
--- patches/make-3.82-fixes-1.patch	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,331 +1,0 @@
-Submitted By:            William Harrington at <kb0iic at cross-lfs dot org>
-Date:                    2013-08-01
-Initial Package Version: 3.82
-Upstream Status:         Fixed Upstream
-Origin:                  Upstream
-Description:             Several bug fixes from upstream git
-
-diff -Naur make-3.82.orig/expand.c make-3.82/expand.c
---- make-3.82.orig/expand.c	2010-07-13 01:20:39.000000000 +0000
-+++ make-3.82/expand.c	2013-08-01 20:44:22.773645293 +0000
-@@ -197,7 +197,7 @@
- {
-   struct variable *v;
-   const char *p, *p1;
--  char *abuf = NULL;
-+  char *save;
-   char *o;
-   unsigned int line_offset;
- 
-@@ -212,16 +212,11 @@
-       return (variable_buffer);
-     }
- 
--  /* If we want a subset of the string, allocate a temporary buffer for it.
--     Most of the functions we use here don't work with length limits.  */
--  if (length > 0 && string[length] != '\0')
--    {
--      abuf = xmalloc(length+1);
--      memcpy(abuf, string, length);
--      abuf[length] = '\0';
--      string = abuf;
--    }
--  p = string;
-+  /* We need a copy of STRING: due to eval, it's possible that it will get
-+     freed as we process it (it might be the value of a variable that's reset
-+     for example).  Also having a nil-terminated string is handy.  */
-+  save = length < 0 ? xstrdup (string) : xstrndup (string, length);
-+  p = save;
- 
-   while (1)
-     {
-@@ -411,8 +406,7 @@
-       ++p;
-     }
- 
--  if (abuf)
--    free (abuf);
-+  free (save);
- 
-   variable_buffer_output (o, "", 1);
-   return (variable_buffer + line_offset);
-diff -Naur make-3.82.orig/function.c make-3.82/function.c
---- make-3.82.orig/function.c	2010-07-13 01:20:39.000000000 +0000
-+++ make-3.82/function.c	2013-08-01 20:45:09.100176320 +0000
-@@ -706,7 +706,7 @@
-   const char *word_iterator = argv[0];
-   char buf[20];
- 
--  while (find_next_token (&word_iterator, (unsigned int *) 0) != 0)
-+  while (find_next_token (&word_iterator, NULL) != 0)
-     ++i;
- 
-   sprintf (buf, "%d", i);
-@@ -1133,21 +1133,14 @@
- 
-   /* Find the maximum number of words we'll have.  */
-   t = argv[0];
--  wordi = 1;
--  while (*t != '\0')
-+  wordi = 0;
-+  while ((p = find_next_token (&t, NULL)) != 0)
-     {
--      char c = *(t++);
--
--      if (! isspace ((unsigned char)c))
--        continue;
--
-+      ++t;
-       ++wordi;
--
--      while (isspace ((unsigned char)*t))
--        ++t;
-     }
- 
--  words = xmalloc (wordi * sizeof (char *));
-+  words = xmalloc ((wordi == 0 ? 1 : wordi) * sizeof (char *));
- 
-   /* Now assign pointers to each string in the array.  */
-   t = argv[0];
-diff -Naur make-3.82.orig/job.c make-3.82/job.c
---- make-3.82.orig/job.c	2010-07-24 08:27:50.000000000 +0000
-+++ make-3.82/job.c	2013-08-01 20:44:54.400222908 +0000
-@@ -29,6 +29,15 @@
- 
- #include <string.h>
- 
-+#if defined(__linux__) /* defined (HAVE_LINUX_BINFMTS_H) && defined (HAVE_SYS_USER_H) */
-+#include <sys/user.h>
-+#include <unistd.h>
-+#ifndef PAGE_SIZE
-+#define PAGE_SIZE sysconf(_SC_PAGE_SIZE)
-+#endif
-+#include <linux/binfmts.h>
-+#endif
-+
- /* Default shell to use.  */
- #ifdef WINDOWS32
- #include <windows.h>
-@@ -2791,6 +2800,15 @@
-        argument list.  */
- 
-     unsigned int shell_len = strlen (shell);
-+#ifdef MAX_ARG_STRLEN
-+    static char eval_line[] = "eval\\ \\\"set\\ x\\;\\ shift\\;\\ ";
-+#define ARG_NUMBER_DIGITS 5
-+#define EVAL_LEN (sizeof(eval_line)-1 + shell_len + 4 \
-+                 + (7 + ARG_NUMBER_DIGITS) * 2 * line_len / (MAX_ARG_STRLEN - 2))
-+#else
-+#define EVAL_LEN 0
-+#endif
-+    char *args_ptr;
-     unsigned int line_len = strlen (line);
-     unsigned int sflags_len = strlen (shellflags);
-     char *command_ptr = NULL; /* used for batch_mode_shell mode */
-@@ -2866,7 +2884,7 @@
-       }
- 
-     new_line = alloca (shell_len + 1 + sflags_len + 1
--                             + (line_len*2) + 1);
-+                             + (line_len*2) + 1 + EVAL_LEN);
-     ap = new_line;
-     memcpy (ap, shell, shell_len);
-     ap += shell_len;
-@@ -2875,6 +2893,30 @@
-     ap += sflags_len;
-     *(ap++) = ' ';
-     command_ptr = ap;
-+
-+#if !defined (WINDOWS32) && defined (MAX_ARG_STRLEN)
-+    if (unixy_shell && line_len > MAX_ARG_STRLEN)
-+      {
-+	unsigned j;
-+	memcpy (ap, eval_line, sizeof (eval_line) - 1);
-+	ap += sizeof (eval_line) - 1;
-+	for (j = 1; j <= 2 * line_len / (MAX_ARG_STRLEN - 2); j++)
-+	  ap += sprintf (ap, "\\$\\{%u\\}", j);
-+	*ap++ = '\\';
-+	*ap++ = '"';
-+	*ap++ = ' ';
-+	/* Copy only the first word of SHELL to $0.  */
-+	for (p = shell; *p != '\0'; ++p)
-+	  {
-+	    if (isspace ((unsigned char)*p))
-+	      break;
-+	    *ap++ = *p;
-+	  }
-+	*ap++ = ' ';
-+      }
-+#endif
-+    args_ptr = ap;
-+
-     for (p = line; *p != '\0'; ++p)
-       {
- 	if (restp != NULL && *p == '\n')
-@@ -2922,6 +2964,14 @@
-           }
- #endif
- 	*ap++ = *p;
-+
-+#if !defined (WINDOWS32) && defined (MAX_ARG_STRLEN)
-+	if (unixy_shell && line_len > MAX_ARG_STRLEN && (ap - args_ptr > MAX_ARG_STRLEN - 2))
-+	  {
-+	    *ap++ = ' ';
-+	    args_ptr = ap;
-+	  }
-+#endif
-       }
-     if (ap == new_line + shell_len + sflags_len + 2)
-       /* Line was empty.  */
-diff -Naur make-3.82.orig/main.c make-3.82/main.c
---- make-3.82.orig/main.c	2010-07-19 07:10:53.000000000 +0000
-+++ make-3.82/main.c	2013-08-01 20:45:20.540147980 +0000
-@@ -1138,7 +1138,7 @@
-      a macro and some compilers (MSVC) don't like conditionals in macros.  */
-   {
-     const char *features = "target-specific order-only second-expansion"
--                           " else-if shortest-stem undefine"
-+                           " else-if shortest-stem undefine oneshell"
- #ifndef NO_ARCHIVES
-                            " archives"
- #endif
-@@ -2093,7 +2093,7 @@
-             const char *pv = define_makeflags (1, 1);
-             char *p = alloca (sizeof ("MAKEFLAGS=") + strlen (pv) + 1);
-             sprintf (p, "MAKEFLAGS=%s", pv);
--            putenv (p);
-+            putenv (allocated_variable_expand (p));
-           }
- 
- 	  if (ISDB (DB_BASIC))
-diff -Naur make-3.82.orig/read.c make-3.82/read.c
---- make-3.82.orig/read.c	2010-07-13 01:20:42.000000000 +0000
-+++ make-3.82/read.c	2013-08-01 20:44:39.690263962 +0000
-@@ -2904,6 +2904,7 @@
-       const char *name;
-       const char **nlist = 0;
-       char *tildep = 0;
-+      int globme = 1;
- #ifndef NO_ARCHIVES
-       char *arname = 0;
-       char *memname = 0;
-@@ -3028,7 +3029,7 @@
-             {
-               /* This looks like the first element in an open archive group.
-                  A valid group MUST have ')' as the last character.  */
--              const char *e = p + nlen;
-+              const char *e = p;
-               do
-                 {
-                   e = next_token (e);
-@@ -3084,19 +3085,19 @@
-          Go to the next item in the string.  */
-       if (flags & PARSEFS_NOGLOB)
-         {
--          NEWELT (concat (2, prefix, tp));
-+          NEWELT (concat (2, prefix, tmpbuf));
-           continue;
-         }
- 
-       /* If we get here we know we're doing glob expansion.
-          TP is a string in tmpbuf.  NLEN is no longer used.
-          We may need to do more work: after this NAME will be set.  */
--      name = tp;
-+      name = tmpbuf;
- 
-       /* Expand tilde if applicable.  */
--      if (tp[0] == '~')
-+      if (tmpbuf[0] == '~')
- 	{
--	  tildep = tilde_expand (tp);
-+	  tildep = tilde_expand (tmpbuf);
- 	  if (tildep != 0)
-             name = tildep;
- 	}
-@@ -3112,32 +3113,40 @@
- 	}
- #endif /* !NO_ARCHIVES */
- 
--      switch (glob (name, GLOB_NOSORT|GLOB_ALTDIRFUNC, NULL, &gl))
--	{
--	case GLOB_NOSPACE:
--	  fatal (NILF, _("virtual memory exhausted"));
--
--	case 0:
--          /* Success.  */
--          i = gl.gl_pathc;
--          nlist = (const char **)gl.gl_pathv;
--          break;
--
--        case GLOB_NOMATCH:
--          /* If we want only existing items, skip this one.  */
--          if (flags & PARSEFS_EXISTS)
--            {
--              i = 0;
--              break;
--            }
--          /* FALLTHROUGH */
--
--	default:
--          /* By default keep this name.  */
-+      /* glob() is expensive: don't call it unless we need to.  */
-+      if (!(flags & PARSEFS_EXISTS) && strpbrk (name, "?*[") == NULL)
-+        {
-+          globme = 0;
-           i = 1;
-           nlist = &name;
--          break;
--	}
-+        }
-+      else
-+        switch (glob (name, GLOB_NOSORT|GLOB_ALTDIRFUNC, NULL, &gl))
-+          {
-+          case GLOB_NOSPACE:
-+            fatal (NILF, _("virtual memory exhausted"));
-+
-+          case 0:
-+            /* Success.  */
-+            i = gl.gl_pathc;
-+            nlist = (const char **)gl.gl_pathv;
-+            break;
-+
-+          case GLOB_NOMATCH:
-+            /* If we want only existing items, skip this one.  */
-+            if (flags & PARSEFS_EXISTS)
-+              {
-+                i = 0;
-+                break;
-+              }
-+            /* FALLTHROUGH */
-+
-+          default:
-+            /* By default keep this name.  */
-+            i = 1;
-+            nlist = &name;
-+            break;
-+          }
- 
-       /* For each matched element, add it to the list.  */
-       while (i-- > 0)
-@@ -3152,7 +3161,10 @@
-             else
-               {
-                 /* We got a chain of items.  Attach them.  */
--                (*newp)->next = found;
-+                if (*newp)
-+                  (*newp)->next = found;
-+                else
-+                  *newp = found;
- 
-                 /* Find and set the new end.  Massage names if necessary.  */
-                 while (1)
-@@ -3174,7 +3186,8 @@
- #endif /* !NO_ARCHIVES */
-           NEWELT (concat (2, prefix, nlist[i]));
- 
--      globfree (&gl);
-+      if (globme)
-+        globfree (&gl);
- 
- #ifndef NO_ARCHIVES
-       if (arname)
Index: tches/mpfr-3.1.5-fixes-1.patch
===================================================================
--- patches/mpfr-3.1.5-fixes-1.patch	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,149 +1,0 @@
-Submitted By: William Harrington (kb0iic at cross-lfs dot org)
-Date: 2017-05-10
-Initial Package Version: 3.1.5
-Origin: Upstream
-Upstream Status: Applied
-Description: Contains all upstream patches of mpfr current to patch level 2.
-
-diff -Naur mpfr-3.1.5.orig/PATCHES mpfr-3.1.5/PATCHES
---- mpfr-3.1.5.orig/PATCHES	2016-09-27 07:58:15.000000000 +0000
-+++ mpfr-3.1.5/PATCHES	2017-05-10 23:18:31.760630521 +0000
-@@ -0,0 +1,2 @@
-+strtofr
-+vasprintf
-diff -Naur mpfr-3.1.5.orig/VERSION mpfr-3.1.5/VERSION
---- mpfr-3.1.5.orig/VERSION	2016-09-27 07:58:14.000000000 +0000
-+++ mpfr-3.1.5/VERSION	2017-05-10 23:18:31.767631412 +0000
-@@ -1 +1 @@
--3.1.5
-+3.1.5-p2
-diff -Naur mpfr-3.1.5.orig/src/mpfr.h mpfr-3.1.5/src/mpfr.h
---- mpfr-3.1.5.orig/src/mpfr.h	2016-09-27 07:58:15.000000000 +0000
-+++ mpfr-3.1.5/src/mpfr.h	2017-05-10 23:18:31.782633324 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 5
--#define MPFR_VERSION_STRING "3.1.5"
-+#define MPFR_VERSION_STRING "3.1.5-p2"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naur mpfr-3.1.5.orig/src/strtofr.c mpfr-3.1.5/src/strtofr.c
---- mpfr-3.1.5.orig/src/strtofr.c	2016-09-27 07:58:15.000000000 +0000
-+++ mpfr-3.1.5/src/strtofr.c	2017-05-10 23:18:31.795634980 +0000
-@@ -743,11 +743,14 @@
-          of the pstr_size most significant digits of pstr->mant, with
-          equality in case exact is non-zero. */
- 
--      /* test if rounding is possible, and if so exit the loop */
--      if (exact || mpfr_can_round_raw (result, ysize,
--                                       (pstr->negative) ? -1 : 1,
--                                       ysize_bits - err - 1,
--                                       MPFR_RNDN, rnd, MPFR_PREC(x)))
-+      /* test if rounding is possible, and if so exit the loop.
-+         Note: we also need to be able to determine the correct ternary value,
-+         thus we use the MPFR_PREC(x) + (rnd == MPFR_RNDN) trick.
-+         For example if result = xxx...xxx111...111 and rnd = RNDN,
-+         then we know the correct rounding is xxx...xx(x+1), but we cannot know
-+         the correct ternary value. */
-+      if (exact || mpfr_round_p (result, ysize, ysize_bits - err - 1,
-+                                 MPFR_PREC(x) + (rnd == MPFR_RNDN)))
-         break;
- 
-     next_loop:
-diff -Naur mpfr-3.1.5.orig/src/vasprintf.c mpfr-3.1.5/src/vasprintf.c
---- mpfr-3.1.5.orig/src/vasprintf.c	2016-09-27 07:58:15.000000000 +0000
-+++ mpfr-3.1.5/src/vasprintf.c	2017-05-10 23:18:31.741628100 +0000
-@@ -1593,7 +1593,7 @@
-         }
-       else if (spec.spec == 'f' || spec.spec == 'F')
-         {
--          if (spec.prec == -1)
-+          if (spec.prec < 0)
-             spec.prec = 6;
-           if (regular_fg (np, p, spec, NULL) == -1)
-             goto error;
-diff -Naur mpfr-3.1.5.orig/src/version.c mpfr-3.1.5/src/version.c
---- mpfr-3.1.5.orig/src/version.c	2016-09-27 07:58:15.000000000 +0000
-+++ mpfr-3.1.5/src/version.c	2017-05-10 23:18:31.806636381 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.5";
-+  return "3.1.5-p2";
- }
-diff -Naur mpfr-3.1.5.orig/tests/tsprintf.c mpfr-3.1.5/tests/tsprintf.c
---- mpfr-3.1.5.orig/tests/tsprintf.c	2016-09-27 07:58:14.000000000 +0000
-+++ mpfr-3.1.5/tests/tsprintf.c	2017-05-10 23:18:31.754629756 +0000
-@@ -1251,6 +1251,25 @@
-   check_emin_aux (MPFR_EMIN_MIN);
- }
- 
-+static void
-+test20161214 (void)
-+{
-+  mpfr_t x;
-+  char buf[32];
-+  const char s[] = "0x0.fffffffffffff8p+1024";
-+  int r;
-+
-+  mpfr_init2 (x, 64);
-+  mpfr_set_str (x, s, 16, MPFR_RNDN);
-+  r = mpfr_snprintf (buf, 32, "%.*RDf", -2, x);
-+  MPFR_ASSERTN(r == 316);
-+  r = mpfr_snprintf (buf, 32, "%.*RDf", INT_MIN + 1, x);
-+  MPFR_ASSERTN(r == 316);
-+  r = mpfr_snprintf (buf, 32, "%.*RDf", INT_MIN, x);
-+  MPFR_ASSERTN(r == 316);
-+  mpfr_clear (x);
-+}
-+
- int
- main (int argc, char **argv)
- {
-@@ -1271,6 +1290,7 @@
-   mixed ();
-   check_emax ();
-   check_emin ();
-+  test20161214 ();
- 
- #if defined(HAVE_LOCALE_H) && defined(HAVE_SETLOCALE)
- #if MPFR_LCONV_DPTS
-diff -Naur mpfr-3.1.5.orig/tests/tstrtofr.c mpfr-3.1.5/tests/tstrtofr.c
---- mpfr-3.1.5.orig/tests/tstrtofr.c	2016-09-27 07:58:14.000000000 +0000
-+++ mpfr-3.1.5/tests/tstrtofr.c	2017-05-10 23:18:31.811637019 +0000
-@@ -1191,6 +1191,24 @@
-   mpfr_clears (e, x1, x2, (mpfr_ptr) 0);
- }
- 
-+/* Note: the number is 5^47/2^9. */
-+static void
-+bug20161217 (void)
-+{
-+  mpfr_t fp, z;
-+  static const char * num = "0.1387778780781445675529539585113525390625e31";
-+  int inex;
-+
-+  mpfr_init2 (fp, 110);
-+  mpfr_init2 (z, 110);
-+  inex = mpfr_strtofr (fp, num, NULL, 10, MPFR_RNDN);
-+  MPFR_ASSERTN(inex == 0);
-+  mpfr_set_str_binary (z, "10001100001000010011110110011101101001010000001011011110010001010100010100100110111101000010001011001100001101E-9");
-+  MPFR_ASSERTN(mpfr_equal_p (fp, z));
-+  mpfr_clear (fp);
-+  mpfr_clear (z);
-+}
-+
- int
- main (int argc, char *argv[])
- {
-@@ -1205,6 +1223,7 @@
-   test20100310 ();
-   bug20120814 ();
-   bug20120829 ();
-+  bug20161217 ();
- 
-   tests_end_mpfr ();
-   return 0;
Index: tches/ncurses-6.0-bash_fix-1.patch
===================================================================
--- patches/ncurses-6.0-bash_fix-1.patch	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,22 +1,0 @@
-Submitted by: Jim Gifford (patches at jg555 dot com)
-Date: 2007-02-15
-Initial Package Version: 5.6
-Upstream Status: Sent
-Origin: Jim Gifford
-Description: Fixes Ncurses to utilize a buggy version of Bash
-Comment: Renamed for Ncurses 6.0 Upgrade
-
-diff -Naur ncurses-5.6.orig/include/MKhashsize.sh ncurses-5.6/include/MKhashsize.sh
---- ncurses-5.6.orig/include/MKhashsize.sh	2006-10-21 17:45:39.000000000 -0700
-+++ ncurses-5.6/include/MKhashsize.sh	2007-02-15 07:16:46.000000000 -0800
-@@ -35,7 +35,7 @@
- echo " */"
- 
- CAPS="${1-Caps}"
--TABSIZE=`grep -v '^[ #]' $CAPS | grep -v "^$" | grep -v "^capalias"| grep -v "^infoalias" | wc -l`
-+TABSIZE=$(grep -v '^[ #]' $CAPS | grep -v "^$" | grep -v "^capalias"| grep -v "^infoalias" | wc -l)
- 
- echo ""
- echo "#define CAPTABSIZE	${TABSIZE}"
-
-
Index: tches/perl-5.26.0-Configure_multilib-1.patch
===================================================================
--- patches/perl-5.26.0-Configure_multilib-1.patch	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,48 +1,0 @@
-Submitted By: William Harrington <kb0iic at cross-lfs dot org>
-Date: 2017-06-09
-Initial Package Version: 5.12.0
-Origin: Cross-LFS
-Upstream Status: Not Applied - Internal to CLFS
-Description: This patch allows perl to be installed in /usr/lib32
-             or /usr/lib64 instead of /usr/lib.
-
-Comments: Renamed for 5.26.0
-
-diff -Naur perl-5.20.0.orig/Configure perl-5.20.0/Configure
---- perl-5.20.0.orig/Configure	2014-05-26 13:34:18.000000000 +0000
-+++ perl-5.20.0/Configure	2014-05-30 01:43:45.621522372 +0000
-@@ -1359,6 +1359,7 @@
- glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib"
- test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth"
- test -f /shlib/libc.so     && glibpth="/shlib $glibpth"
-+test -d /usr/lib32         && glibpth="$glibpth /lib32 /usr/lib32 /usr/local/lib32"
- test -d /usr/lib64         && glibpth="$glibpth /lib64 /usr/lib64 /usr/local/lib64"
- 
- : Private path used by Configure to find libraries.  Its value
-@@ -6500,6 +6501,8 @@
- : The default "style" setting is made in installstyle.U
- case "$installstyle" in
- *lib/perl5*) set dflt privlib lib/$package/$version ;;
-+*lib32/perl5*) set dflt privlib lib32/$package/$version ;;
-+*lib64/perl5*) set dflt privlib lib64/$package/$version ;;
- *)	 set dflt privlib lib/$version ;;
- esac
- eval $prefixit
-@@ -6748,6 +6751,8 @@
- case "$sitelib" in
- '') case "$installstyle" in
- 	*lib/perl5*) dflt=$siteprefix/lib/$package/site_$prog/$version ;;
-+	*lib32/perl5*) dflt=$witeprefix/lib32/$package/site_$prog/$version ;;
-+	*lib64/perl5*) dflt=$siteprefix/lib64/$package/site_$prog/$version ;;
- 	*)	 dflt=$siteprefix/lib/site_$prog/$version ;;
- 	esac
- 	;;
-@@ -7166,6 +7171,8 @@
- 		prog=`echo $package | $sed 's/-*[0-9.]*$//'`
- 		case "$installstyle" in
- 		*lib/perl5*) dflt=$vendorprefix/lib/$package/vendor_$prog/$version ;;
-+		*lib32/perl5*) dflt=$vendorprefix/lib32/$package/vendor_$prog/$version ;;
-+		*lib64/perl5*) dflt=$vendorprefix/lib64/$package/vendor_$prog/$version ;;
- 		*)	     dflt=$vendorprefix/lib/vendor_$prog/$version ;;
- 		esac
- 		;;
Index: tches/powerpc-utils_1.1.3-fixes-2.patch
===================================================================
--- patches/powerpc-utils_1.1.3-fixes-2.patch	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,963 +1,0 @@
-Submitted By: Ken Moffat <ken@linuxfromscratch.org>
-Date: 2005-11-23
-Initial Package Version: 1.1.3
-Upstream Status: Package is maintained by debian, this cherry-picks
-Origin: From debian 1.1.3-18.diff, edited
-Description: Makes it work on New World, fixes compile error, updated to
- allow -m32 to be passed via EXTRACFLAGS in multilib.
-
- Some of the debian powerpc-utils_1.1.3-18.diff, but only the parts relevant
-to nvsetenv and nvsetvol - the remainder may be useful on an Old World Mac,
-but they are no use on New World.  The -D_GNU_SOURCE apparently helps on
-powerpc64.  I've also removed bogus messages advising you to update your
-headers when IOC_NVRAM_SYNC isn't defined : it hasn't existed for a long
-time.  Finally, I ran the nvsetenv.sgml through docbook2txt -man to get a
-proper man page, because most people won't have docbook utils installed. 
-
-diff -Nuar pmac-utils.orig/Makefile pmac-utils/Makefile
---- pmac-utils.orig/Makefile	1998-07-21 14:22:28.000000000 +0100
-+++ pmac-utils/Makefile	2005-11-17 15:16:52.000000000 +0000
-@@ -22,8 +22,8 @@
- 
- SGMLMAN	= sgml2txt -man
- CC	= gcc -Wall -Wstrict-prototypes
--CFLAGS	= -O2 -fsigned-char 
--LDFLAGS = -s
-+CFLAGS	= $(EXTRACFLAGS) -O2 -fsigned-char -D_GNU_SOURCE
-+LDFLAGS =
- INSTALL	= /usr/bin/install -c
- SOUND_INC = -I.
- 
-@@ -42,8 +42,12 @@
- mousemode:
- 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $@.c
- 
--nvsetenv:
-+nvsetenv: nvsetenv.c nwnvsetenv.c
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $@.c nwnvsetenv.c
-+
-+nvsetvol:
- 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $@.c
-+ 
- 
- nvvideo:
- 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $@.c
-diff -Nuar pmac-utils.orig/nvsetenv.8 pmac-utils/nvsetenv.8
---- pmac-utils.orig/nvsetenv.8	1970-01-01 01:00:00.000000000 +0100
-+++ pmac-utils/nvsetenv.8	2005-11-17 20:39:47.000000000 +0000
-@@ -0,0 +1,256 @@
-+.if n .ds Q \&"
-+.if t .ds Q ``
-+.if n .ds U \&"
-+.if t .ds U ''
-+.TH "NVSETENV" 8 
-+.tr \&
-+.nr bi 0
-+.nr ll 0
-+.nr el 0
-+.de DS
-+..
-+.de DE
-+..
-+.de Pp
-+.ie \\n(ll>0 \{\
-+.ie \\n(bi=1 \{\
-+.nr bi 0
-+.if \\n(t\\n(ll=0 \{.IP \\(bu\}
-+.if \\n(t\\n(ll=1 \{.IP \\n+(e\\n(el.\}
-+.\}
-+.el .sp 
-+.\}
-+.el \{\
-+.ie \\nh=1 \{\
-+.LP
-+.nr h 0
-+.\}
-+.el .PP 
-+.\}
-+..
-+.SH NAME
-+
-+.Pp
-+\fBnvsetenv\fP - change/view Open Firmware environment variables 
-+.Pp
-+.SH SYNOPSIS
-+
-+.Pp
-+\fBnvsetenv 
-+\f(CR[\fP\fIvariable\fP \f(CR[\fP\fIvalue\fP\f(CR\fB]]\fP\fP\fP
-+.Pp
-+.SH DESCRIPTION
-+
-+.Pp
-+\fBnvsetenv\fP is a program to adjust or view the Open Firmware (OF)
-+boot parameters stored in non-volatile (battery-powered) RAM.
-+\fBnvsetenv\fP will show the current values of all OF's environment
-+variables when no parameters are given.
-+.Pp
-+.SH OPTIONS
-+
-+.Pp
-+.nr ll +1
-+.nr t\n(ll 2
-+.if \n(ll>1 .RS
-+.IP "\fIvariable\fP"
-+.nr bi 1
-+.Pp
-+nvsetenv will show current value of an OF's
-+variable, if no value is given
-+.IP "\fIvariable value\fP"
-+.nr bi 1
-+.Pp
-+nvsetenv will set \fIvariable\fP to
-+\fIvalue\fP
-+.if \n(ll>1 .RE
-+.nr ll -1
-+.Pp
-+.SH EXAMPLES
-+
-+.Pp
-+This example will set the boot device to the first SCSI disk on the
-+internal SCSI bus, using /vmlinux as boot image, trying to
-+use the third partition as root partition.
-+.DS
-+.sp 
-+.ft RR
-+.nf
-+        > nvsetenv boot-device  \&"scsi-int/sd@0:0\&"
-+        > nvsetenv boot-file    \&" /vmlinux root=/dev/sda3\&"
-+.DE
-+.fi 
-+.ec
-+.ft P
-+.sp
-+.Pp
-+Alternatives boot devices are: 
-+.DS
-+.sp 
-+.ft RR
-+.nf
-+        scsi/sd@1:0             SCSI disk at ID 1
-+        ata/ata-disk@0:0        Internal IDE disk
-+.DE
-+.fi 
-+.ec
-+.ft P
-+.sp
-+.Pp
-+You can also boot from a floppy, you need a XCOFF-format kernel image
-+(in this example: vmlinux.coff), copied to a HFS format high-density
-+(1.44Mb) floppy.
-+.DS
-+.sp 
-+.ft RR
-+.nf
-+        > nvsetenv boot-device  \&"fd:vmlinux.coff\&"
-+        > nvsetenv boot-file    \&" root=/dev/sda3\&"
-+.DE
-+.fi 
-+.ec
-+.ft P
-+.sp
-+
-+To return to MacOS, do:
-+.DS
-+.sp 
-+.ft RR
-+.nf
-+        > nvsetenv boot-device  \&"/AAPL,ROM\&"
-+.DE
-+.fi 
-+.ec
-+.ft P
-+.sp
-+.Pp
-+Valid values for \&"input-devices\&" are:
-+.DS
-+.sp 
-+.ft RR
-+.nf
-+        ttya                    Modem serial port
-+        ttyb                    Printer serial port
-+        kbd                     Keyboard
-+        enet                    Ethernet interface
-+.DE
-+.fi 
-+.ec
-+.ft P
-+.sp
-+.Pp
-+Valid values for \&"output-devices\&" are (machine and/or OF dependent):
-+.DS
-+.sp 
-+.ft RR
-+.nf
-+        screen                  Screen display (newer machines)
-+        /chaos/control          Screen display (7500, 7600 and 8500)
-+        /bandit/ATY,264GT-B     Screen display (6500)
-+.DE
-+.fi 
-+.ec
-+.ft P
-+.sp
-+.Pp
-+OF is not designed to wait for your hard disk to spin up
-+(remember MacOS boots from ROM).
-+Use the following setting to have OF retry to boot from your disk 
-+until is has spun up:
-+.DS
-+.sp 
-+.ft RR
-+.nf
-+        > nvsetenv boot-command \&"begin ['] boot catch 1000 ms cr again\&"
-+.DE
-+.fi 
-+.ec
-+.ft P
-+.sp
-+.Pp
-+You only have to append an \&"S\&" to the \&"boot-file\&" variable to boot
-+Linux in single user mode.
-+.Pp
-+You can use install your own nvramrc patch using the following command:
-+.DS
-+.sp 
-+.ft RR
-+.nf
-+        > nvsetenv nvramrc \&"`cat file.patch`\&"
-+.DE
-+.fi 
-+.ec
-+.ft P
-+.sp
-+
-+(please note the backticks!), or: 
-+.DS
-+.sp 
-+.ft RR
-+.nf
-+        > nvsetenv nvramrc \&"$(cat file.patch)\&"
-+.DE
-+.fi 
-+.ec
-+.ft P
-+.sp
-+.Pp
-+.SH FILES
-+
-+.Pp
-+.nr ll +1
-+.nr t\n(ll 2
-+.if \n(ll>1 .RS
-+.IP "\fI/dev/nvram\fP"
-+.nr bi 1
-+.Pp
-+character device with major number 10
-+and minor number 144
-+.IP "\fI/proc/cpuinfo\fP"
-+.nr bi 1
-+.Pp
-+to identify New/Old-World machines
-+.if \n(ll>1 .RE
-+.nr ll -1
-+.Pp
-+.SH SEE ALSO
-+
-+.Pp
-+macos(8)
-+.Pp
-+.SH AUTHORS
-+
-+.Pp
-+.DS
-+.sp 
-+.ft RR
-+.nf
-+Paul Mackerras <paulus@cs.anu.edu.au> (program)
-+.DE
-+.fi 
-+.ec
-+.ft P
-+.sp
-+
-+.DS
-+.sp 
-+.ft RR
-+.nf
-+Richard van Hees <R.M.vanHees@phys.uu.nl> (documentation)
-+.DE
-+.fi 
-+.ec
-+.ft P
-+.sp
-+
-+.DS
-+.sp 
-+.ft RR
-+.nf
-+Klaus Halfmann  <halfmann@libra.de> (NewWorld code)
-+.DE
-+.fi 
-+.ec
-+.ft P
-+.sp
-+.Pp
-diff -Nuar pmac-utils.orig/nvsetenv.c pmac-utils/nvsetenv.c
---- pmac-utils.orig/nvsetenv.c	1997-04-28 14:29:05.000000000 +0100
-+++ pmac-utils/nvsetenv.c	2005-11-17 14:57:57.000000000 +0000
-@@ -1,15 +1,32 @@
-+/*	nvsetnv.c
-+
-+	used to set the Envenrioment variables in power macs NVram.
-+	Decides via /proc/cpuinfo which type of machine is used.
-+
-+		Copyright (C) 1996-1998 by Paul Mackerras.
-+	nwcode: Copyright (C) 2000	by Klaus Halfmann
-+
-+	see README for details
-+*/
-+
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
- #include <unistd.h>
- #include <fcntl.h>
-+#include <sys/ioctl.h>
-+#include <asm/nvram.h>
-+#ifndef IOC_NVRAM_SYNC
-+#define IOC_NVRAM_SYNC _IO('p', 0x43)
-+#endif
- 
--#define NVSTART	0x1800
--#define NVSIZE	0x800
-+#define NVSTART		0x1800 	// Start of the NVRam OF partition
-+#define NVSIZE		0x800	// Size of of the NVRam
- #define MXSTRING        128
- #define N_NVVARS	(int)(sizeof(nvvars) / sizeof(nvvars[0]))
-+#define NVMAGIC		0x1275
- 
--static int nvfd, nvstr_used;
-+static int  nvstr_used;
- static char nvstrbuf[NVSIZE];
- 
- struct nvram {
-@@ -24,12 +41,13 @@
-     unsigned long  vals[1];
- };
- 
--union {
--    struct nvram nv;
--    char c[NVSIZE];
--    unsigned short s[NVSIZE/2];
--} nvbuf;
-+typedef union {
-+    struct nvram 	nv;
-+    char 		c[NVSIZE];
-+    unsigned short 	s[NVSIZE/2];
-+} nvbuftype;
- 
-+nvbuftype nvbuf;
- 
- enum nvtype {
-     boolean,
-@@ -70,16 +88,21 @@
-     {"boot-command", string},
- };
- 
-+	// Calculated number of variables
-+#define N_NVVARS	(int)(sizeof(nvvars) / sizeof(nvvars[0]))
-+
- union nvval {
--    unsigned long word_val;
--    char *str_val;
-+    unsigned long 	word_val;
-+    char 		*str_val;
- } nvvals[32];
- 
--int
--nvcsum( void )
-+extern int checkNewWorld(void); 		// from nwnvsetenv
-+extern int nvNew(int ac, char** av, int nfd); 	// from nwnvsetenv
-+
-+int nvcsum( void )
- {
--    int i;
--    unsigned c;
-+    int 	i;
-+    unsigned	c;
-     
-     c = 0;
-     for (i = 0; i < NVSIZE/2; ++i)
-@@ -89,28 +112,29 @@
-     return c & 0xffff;
- }
- 
--void
--nvload( void )
-+static void nvload( int nvfd )
- {
-     int s;
- 
-     if (lseek(nvfd, NVSTART, 0) < 0
- 	|| read(nvfd, &nvbuf, NVSIZE) != NVSIZE) {
--	perror("Error reading /dev/nvram");
-+	perror("Error reading nvram device");
- 	exit(EXIT_FAILURE);
-     }
-+    if (nvbuf.nv.magic != NVMAGIC)
-+	(void) fprintf(stderr, "Warning: Bad magic number %x\n",
-+			 nvbuf.nv.magic);
-     s = nvcsum();
-     if (s != 0xffff)
-        (void) fprintf(stderr, "Warning: checksum error (%x) on nvram\n", 
- 		      s ^ 0xffff);
- }
- 
--void
--nvstore(void)
-+static void nvstore(int nvfd)
- {
-     if (lseek(nvfd, NVSTART, 0) < 0
- 	|| write(nvfd, &nvbuf, NVSIZE) != NVSIZE) {
--	perror("Error writing /dev/nvram");
-+	perror("Error writing nvram device");
- 	exit(EXIT_FAILURE);
-     }
- }
-@@ -145,8 +169,7 @@
-     }
- }
- 
--void
--nvpack( void )
-+void nvpack( void )
- {
-     int     i, vi;
-     size_t  off, len;
-@@ -184,7 +207,7 @@
-     nvbuf.nv.cksum = (unsigned short int) (~nvcsum());
- }
- 
--void
-+static void
- print_var(int i, int indent)
- {
-     char *p;
-@@ -207,8 +230,7 @@
-     (void) printf("\n");
- }
- 
--void
--parse_val(int i, char *str)
-+void parse_val(int i, char *str)
- {
-     char *endp;
- 
-@@ -238,12 +260,38 @@
-     }
- }
- 
--int 
--main(int ac, char **av)
-+
-+void nvOld(int ac, char** av, int i, int nvfd)
-+{
-+    nvload(nvfd);
-+    nvunpack();
-+
-+    switch (ac) {
-+    case 1:
-+	for (i = 0; i < N_NVVARS; ++i) {
-+	    (void) printf("%-16s", nvvars[i].name);
-+	    print_var(i, 16);
-+	}
-+	break;
-+
-+    case 2:
-+	print_var(i, 0);
-+	break;
-+	
-+    case 3:
-+	parse_val(i, av[2]);
-+	nvpack();
-+	nvstore(nvfd);
-+	break;
-+    }
-+}
-+
-+int main(int ac, char **av)
- {
--    int i = 0, l, print;
-+    int i = 0, l, print, nvfd, newWorld;
- 
-     l = (int) strlen(av[0]);
-+    // print when no value is set OR we are aclled as <xxx>printenv
-     print = (int) (ac <= 2 || 
- 		   (l > 8 && strcmp(&av[0][l-8], "printenv") == 0));
-     if (print != 0 && ac > 2) {
-@@ -255,7 +303,9 @@
- 	exit(EXIT_FAILURE);
-     }
- 
--    if (ac >= 2) {
-+    newWorld = checkNewWorld();
-+    
-+    if (!newWorld && ac >= 2) {
- 	for (i = 0; i < N_NVVARS; ++i)
- 	    if (strcmp(av[1], nvvars[i].name) == 0)
- 		break;
-@@ -266,33 +316,21 @@
- 	}
-     }
- 
--    nvfd = open("/dev/nvram", ac <= 2 ? O_RDONLY: O_RDWR);
-+    nvfd = open("/dev/misc/nvram", ac <= 2 ? O_RDONLY: O_RDWR);
-     if (nvfd < 0) {
--	perror("Couldn't open /dev/nvram");
-+      nvfd = open("/dev/nvram", ac <= 2 ? O_RDONLY: O_RDWR);
-+      if (nvfd < 0) {
-+	perror("Couldn't open nvram device");
- 	exit(EXIT_FAILURE);
--    }
--    nvload();
--    nvunpack();
--
--    switch (ac) {
--    case 1:
--	for (i = 0; i < N_NVVARS; ++i) {
--	    (void) printf("%-16s", nvvars[i].name);
--	    print_var(i, 16);
--	}
--	break;
--
--    case 2:
--	print_var(i, 0);
--	break;
--	
--    case 3:
--	parse_val(i, av[2]);
--	nvpack();
--	nvstore();
--	break;
-+      }
-     }
- 
-+    if (newWorld)
-+    	nvNew(ac, av, nvfd);
-+    else
-+    	nvOld(ac, av, i, nvfd);
-+    
-+    (void) ioctl(nvfd, IOC_NVRAM_SYNC);
-     (void) close(nvfd);
-     exit(EXIT_SUCCESS);
- }
-diff -Nuar pmac-utils.orig/nvsetvol.8 pmac-utils/nvsetvol.8
---- pmac-utils.orig/nvsetvol.8	1970-01-01 01:00:00.000000000 +0100
-+++ pmac-utils/nvsetvol.8	2005-11-17 21:37:20.000000000 +0000
-@@ -0,0 +1,27 @@
-+.TH NVSETVOL 8 "16th February 2003"
-+
-+.SH NAME
-+nvsetvol \- tool for changing startup volume of PowerMac machines
-+
-+.SH SYNOPSIS
-+.B nvsetvol
-+[
-+.B volume
-+]
-+
-+.SH DESCRIPTION
-+.B nvsetvol
-+queries and sets the base volume of a PowerMac machine.  With no options,
-+.B nvsetvol
-+displays the current volume; with a numerical argument, it sets the volume.
-+The
-+.B volume
-+argument should be a number from 0 to 255.  0 will turn off the annoying
-+startup chime.
-+
-+.SH AUTHOR
-+.B nvsetvol
-+was written by Matteo Frigo <athena@fftw.org>.
-+
-+This manual page was written by Daniel Jacobowitz <dan@debian.org> for the
-+Debian GNU/Linux distribution.
-diff -Nuar pmac-utils.orig/nvsetvol.c pmac-utils/nvsetvol.c
---- pmac-utils.orig/nvsetvol.c	1970-01-01 01:00:00.000000000 +0100
-+++ pmac-utils/nvsetvol.c	2005-11-17 21:43:16.000000000 +0000
-@@ -0,0 +1,110 @@
-+/* set volume of the startup chime in the PowerMac nvram. 
-+
-+   Written by Matteo Frigo <athena@fftw.org>.
-+   $Id: nvsetvol.c,v 1.1 2003/01/11 11:26:30 athena Exp $
-+
-+   This program is in the public domain.
-+*/
-+
-+/* The volume is stored as a byte at address 8 in the parameter ram. */
-+
-+#include <string.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <unistd.h>
-+#include <fcntl.h>
-+#include <sys/ioctl.h>
-+#include <asm/nvram.h>
-+#ifndef IOC_NVRAM_SYNC
-+#define IOC_NVRAM_SYNC _IO('p', 0x43)
-+#endif
-+
-+typedef struct {
-+     unsigned char sig;
-+     unsigned char cksum;
-+     unsigned short len;
-+     char name[12];
-+} header;
-+
-+void die(const char *s) __attribute__((noreturn));
-+void die(const char *s)
-+{
-+     perror(s);
-+     exit(1);
-+}
-+
-+void seek_pram(int fd, int offset)
-+{
-+     if (lseek(fd, offset, SEEK_SET) < 0)
-+	  die("lseek");
-+}
-+
-+// MSch: only works for newworld - oldworld have XPRAM at offset 0x1300 fixed. 
-+
-+int find_pram(int fd, int *size)
-+{
-+     header buf;
-+     int offset = 0;
-+     int rc = 0;
-+     while((rc = read(fd, &buf, sizeof(header))) == sizeof(header)) {
-+	  int sz = buf.len * 16;
-+	  // what's the sig in char?
-+	  // if (buf.sig == 0x1275) fprintf(stderr, "sig at offset %d rc %d buf.len %d buf.name %s \n", offset, rc, buf.len, buf.name);
-+	  // if (buf.sig == 0x5a) fprintf(stderr, "sig at offset %x rc %d buf.len %x buf.name %s \n", offset, rc, buf.len, buf.name);
-+	  // if (sz) fprintf(stderr, "offset %x rc %d sig %x buf.len %x buf.name %s \n", offset, rc, buf.sig, buf.len, buf.name);
-+	  if (!strncmp(buf.name, "APL,MacOS75", 11)) {
-+	       *size = sz - sizeof(header);
-+	       // fprintf(stderr, "XPRAM offset %x size %x\n", offset + sizeof(header), *size); 
-+	       return offset + sizeof(header);
-+	  }
-+	  if (sz)
-+	    offset += sz;
-+          else
-+            offset += sizeof(header);
-+	  seek_pram(fd, offset);
-+     }
-+     // no Core99 style PRAM found - just assume hard coded values as set in kernel:
-+     // XPRAM 0x1300
-+     // NR    0x1400
-+     // OF    0x1800
-+     // TODO: use ioctl to get PRAM offset
-+     // fprintf(stderr, "no NW PRAM found, assuming OW XPRAM offset 0x1300 size 0x100\n");
-+     *size = 0x100;
-+     return (0x1300);
-+     die("no PRAM found");
-+}
-+
-+#define VOLADDR 8
-+
-+int main(int argc, char *argv[])
-+{
-+     int fd, offset, size;
-+     char *buf;
-+
-+     fd = open("/dev/nvram", O_RDWR);
-+     if (fd < 0) die("can't open /dev/nvram");
-+     
-+     offset = find_pram(fd, &size);
-+     buf = malloc(size);
-+     if (!buf) die("can't malloc()");
-+
-+     seek_pram(fd, offset);
-+     if (read(fd, buf, size) != size)
-+	  die("error reading /dev/nvram");
-+
-+     printf("current volume is %d\n", (unsigned char) buf[VOLADDR]);
-+     
-+     if (argc > 1) {
-+	  buf[VOLADDR] = atoi(argv[1]);
-+
-+	  seek_pram(fd, offset);
-+	  if (write(fd, buf, size) != size)
-+	       die("error writing /dev/nvram");
-+	  printf("new volume is %d\n", (unsigned char) buf[VOLADDR]);
-+     }
-+     ioctl(fd, IOC_NVRAM_SYNC);
-+     close(fd);
-+     return 0;
-+}
-diff -Nuar pmac-utils.orig/nwnvsetenv.c pmac-utils/nwnvsetenv.c
---- pmac-utils.orig/nwnvsetenv.c	1970-01-01 01:00:00.000000000 +0100
-+++ pmac-utils/nwnvsetenv.c	2005-11-17 21:37:27.000000000 +0000
-@@ -0,0 +1,261 @@
-+/*	nwnvsetnv.c
-+
-+	used to set the Envenrioment variables in power macs NVram.
-+	This is for the NewWorld nvram only
-+
-+	nwcode: Copyright (C) 2000	by Klaus Halfmann
-+
-+	see README for details
-+*/
-+#include <stdio.h>
-+#include <stdlib.h>
-+
-+#define __USE_GNU	// need strnlen
-+
-+#include <string.h>
-+#include <unistd.h>
-+#include <fcntl.h>
-+
-+// #define MXSTRING        128:
-+// #define N_NVVARS	(int)(sizeof(nvvars) / sizeof(nvvars[0]))
-+// #define NVMAGIC		0x1275
-+
-+/* CHRP NVRAM header */
-+typedef struct {
-+  unsigned char		signature;
-+  unsigned char		cksum;
-+  unsigned short	len;
-+  char			name[12];
-+  // unsigned char data[0];
-+} chrp_header;
-+
-+/* Check in proc/cpuinfo if this is a new world machine */
-+
-+int checkNewWorld(void)
-+{
-+    FILE* cpuf = fopen("/proc/cpuinfo","r");
-+    char  buf[256]; // "pmac-generation    : NewWolrd|OldWorld 
-+    int	  result = 0, found = 0;
-+
-+    if (!cpuf) {
-+	perror("Couldn't open /proc/cpuinfo");
-+	exit(EXIT_FAILURE);
-+    }
-+
-+    while (NULL != fgets(buf, 255, cpuf))
-+    {
-+	if (!strncmp(buf, "pmac-generation" ,15))
-+	{
-+	    char* index = strchr(buf, ':') + 2;
-+	    if (!index) // ???
-+		continue;
-+	    result = !strncmp(index,"NewWorld",8);
-+	    found = 1;
-+	    break;
-+	}
-+    }
-+    fclose(cpuf);
-+
-+    /* Some kernels don't have pmac-generation ( <= 2.2.15 and earlier 2.3.x ) */
-+    /* Look for AAPL in /proc/device-tree/compatible instead. */
-+    if (!found) {
-+	cpuf = fopen("/proc/device-tree/compatible", "r");
-+	if(!cpuf)
-+	    return 0;
-+	
-+	fgets(buf, 255, cpuf);
-+	fclose(cpuf);
-+	if (strncmp(buf, "AAPL", 4) != 0)
-+	    result = 1;
-+    }
-+
-+    return result; // assume OldWorld
-+}
-+
-+/* seek NVRAM until common (OF) part 
-+   return the lenght of the part in case of sucess,
-+   	  0 otherwise.
-+   chrph is set to the value of the "coommon" blocek eventually found
-+   *nvstart is set to the seekpoint where common block starts.
-+*/
-+   
-+int nvscan(int nvfd, chrp_header* chrph, int* nvstart)
-+{
-+    int		start = 0;
-+    
-+    while (read(nvfd, chrph, sizeof(chrp_header)) == sizeof(chrp_header))
-+    {
-+	int size = chrph->len * 0x10 - sizeof(chrp_header);    	
-+	if (!strncmp(chrph->name, "common", 7))
-+	{
-+	    *nvstart = start;
-+	    return size; // seeked upto start
-+	}
-+	if (lseek(nvfd, size, SEEK_CUR) < 0)
-+	   break;
-+	start += size + sizeof(chrp_header);
-+    }
-+    fprintf(stderr,"No common Block found\n");
-+    exit(EXIT_FAILURE);
-+}
-+
-+static char* nvload( int nvfd , int nvsize)
-+{
-+    char* nvbuf = malloc(nvsize);
-+
-+    if (!nvbuf) {
-+	perror("Error allocating buffer");
-+	exit(EXIT_FAILURE);
-+    }
-+    if (read(nvfd, nvbuf, nvsize) != nvsize) {
-+	perror("Error reading /dev/nvram");
-+	exit(EXIT_FAILURE);
-+    }
-+    return nvbuf;
-+}
-+
-+static void
-+print_vars(char* nvbuf, int nvsize)
-+{
-+    int i = 0;
-+
-+    while (i < nvsize)
-+    {
-+ 	int size = strnlen(nvbuf, nvsize);
-+	if (size == 0)
-+	    break;
-+	printf("%s\n",nvbuf);
-+	nvbuf += (size + 1);	// count 0-byte, too
-+    }
-+}
-+
-+/* move memory around to insert the value.
-+ *
-+ * @param nvbufend 	byte AFTER the end of the buffer
-+ * @param varsize 	length of the variable name
-+ * @param buf		byte where varaible NAME starts
-+ * @param newval	new value to replace old one
-+ * @param foundsize 	lenght of varible + '=' + value
-+ * @param equalpos 	position relative to buf where '=' was found
-+ */
-+static void 
-+insert_val (char* nvbufend, int varsize,   char* buf, 
-+	    char* newval,   int foundsize, int equalpos)
-+{
-+    int 	oldlen 	= foundsize - equalpos -1; // account for the '='
-+    int		newlen 	= strlen(newval);
-+    char* 	valpos 	= buf + varsize + 1;
-+    int 	delta 	= newlen - oldlen;
-+
-+    if (delta > 0) // expand mem
-+	memmove(valpos + newlen,
-+		valpos + oldlen, (nvbufend - valpos - newlen));
-+    else if (delta < 0) // shrink mem
-+    {
-+	memmove(valpos + newlen, 
-+		valpos + oldlen, (nvbufend - valpos - oldlen));
-+	memset (nvbufend + delta, 0, -delta );
-+    }
-+    strncpy(valpos, newval, newlen);
-+}
-+
-+/* return position where variable is found,
-+ * newval may be null.
-+ */
-+
-+static char* set_var(char* nvbuf, int nvsize, char* varname, char* newval)
-+{
-+    int i =0;
-+    int varsize = strlen(varname);
-+    int equalpos;
-+    while (i < nvsize)
-+    {
-+	char* buf = &nvbuf[i];
-+ 	int foundsize = strnlen(buf, nvsize -i);
-+	if (foundsize == 0)
-+	    break;
-+	equalpos = (int) (strchr(buf, '=') - buf);
-+	if (equalpos == varsize &&
-+	    !strncmp(buf, varname, equalpos))
-+	{
-+	    if (newval)	// set the value 
-+		insert_val(nvbuf + nvsize, varsize, buf, 
-+			   newval, foundsize, equalpos);
-+	    return buf;
-+	}
-+	i += foundsize + 1;	// count 0-byte, too
-+    }
-+    return NULL;
-+}
-+
-+static void
-+print_var(char* nvbuf, int nvsize, char* varname)
-+{
-+    char* buf = set_var(nvbuf, nvsize, varname, NULL);
-+    if (buf)
-+	printf("%s\n",buf);
-+}
-+
-+/* This fucntion is not used here, it is left
-+   her for the curious */
-+
-+unsigned short chrp_checksum(chrp_header* hdr, char* nvbuf, int nvsize)
-+{
-+    unsigned char* 	ptr = (unsigned char*) &hdr->len;
-+    unsigned char* 	end = ptr + sizeof(chrp_header);
-+    unsigned short 	sum = hdr->signature;
-+	// this in fact skips the checksum
-+    for (; ptr < end; ptr++)
-+	sum += *ptr;
-+    while (sum > 0xFF)
-+	sum = (sum & 0xFF) + (sum>>8);
-+    return sum;
-+}                                                                                                 
-+
-+static void
-+nvstore(int nvfd, chrp_header* chrph, char* nvbuf, int nvstart, int nvsize)
-+{
-+    // mmh, the checksum is calculated for the header only
-+    // since we did not modify the header we can just ignore it.
-+    ssize_t written;
-+    ssize_t seek =  nvstart + sizeof(chrp_header);
-+    written = lseek(nvfd, seek, SEEK_SET);
-+    if (written != seek)
-+    {
-+    	fprintf(stderr,"Error seeking /dev/nvram\n");
-+	exit(EXIT_FAILURE);
-+    }
-+    written = write(nvfd, nvbuf, nvsize);
-+    if (written != nvsize)
-+    {
-+    	fprintf(stderr,"Error writing /dev/nvram %x %x\n", nvsize, seek);
-+	exit(EXIT_FAILURE);
-+    }
-+}
-+
-+/* print / set the New World NVRAM */
-+
-+void nvNew(int ac, char** av, int nvfd)
-+{
-+    int 		nvsize, nvstart;
-+    chrp_header		chrph;
-+    char*		nvbuf;
-+
-+    nvsize = nvscan(nvfd, &chrph, &nvstart);
-+    nvbuf  = nvload(nvfd, nvsize);
-+
-+    switch (ac) {
-+    case 1:
-+	print_vars(nvbuf, nvsize);
-+	break;
-+
-+    case 2:
-+	print_var(nvbuf, nvsize, av[1]);
-+	break;
-+	
-+    case 3:
-+	set_var(nvbuf, nvsize, av[1], av[2]);
-+	nvstore(nvfd, &chrph, nvbuf, nvstart, nvsize);
-+	break;
-+    }
-+}
Index: tches/readline-7.0-branch_update-1.patch
===================================================================
--- patches/readline-7.0-branch_update-1.patch	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,96 +1,0 @@
-Submitted By: William Harrington (kb0iic at cross-lfs dot org)
-Date: 05-04-2017
-Initial Package Version: 7.0
-Origin: Upstream
-Upstream Status: Applied
-Description: Contains all upstream patches up to 7.0-003
-
-diff -Naur readline-7.0.orig/history.c readline-7.0/history.c
---- readline-7.0.orig/history.c	2015-12-28 18:50:31.000000000 +0000
-+++ readline-7.0/history.c	2017-05-04 22:19:51.586694240 +0000
-@@ -57,6 +57,8 @@
- /* How big to make the_history when we first allocate it. */
- #define DEFAULT_HISTORY_INITIAL_SIZE	502
- 
-+#define MAX_HISTORY_INITIAL_SIZE	8192
-+
- /* The number of slots to increase the_history by. */
- #define DEFAULT_HISTORY_GROW_SIZE 50
- 
-@@ -277,6 +279,7 @@
-      const char *string;
- {
-   HIST_ENTRY *temp;
-+  int new_length;
- 
-   if (history_stifled && (history_length == history_max_entries))
-     {
-@@ -293,13 +296,9 @@
- 
-       /* Copy the rest of the entries, moving down one slot.  Copy includes
- 	 trailing NULL.  */
--#if 0
--      for (i = 0; i < history_length; i++)
--	the_history[i] = the_history[i + 1];
--#else
-       memmove (the_history, the_history + 1, history_length * sizeof (HIST_ENTRY *));
--#endif
- 
-+      new_length = history_length;
-       history_base++;
-     }
-   else
-@@ -307,11 +306,13 @@
-       if (history_size == 0)
- 	{
- 	  if (history_stifled && history_max_entries > 0)
--	    history_size = history_max_entries + 2;
-+	    history_size = (history_max_entries > MAX_HISTORY_INITIAL_SIZE)
-+				? MAX_HISTORY_INITIAL_SIZE
-+				: history_max_entries + 2;
- 	  else
- 	    history_size = DEFAULT_HISTORY_INITIAL_SIZE;
- 	  the_history = (HIST_ENTRY **)xmalloc (history_size * sizeof (HIST_ENTRY *));
--	  history_length = 1;
-+	  new_length = 1;
- 	}
-       else
- 	{
-@@ -321,14 +322,15 @@
- 	      the_history = (HIST_ENTRY **)
- 		xrealloc (the_history, history_size * sizeof (HIST_ENTRY *));
- 	    }
--	  history_length++;
-+	  new_length = history_length + 1;
- 	}
-     }
- 
-   temp = alloc_history_entry ((char *)string, hist_inittime ());
- 
--  the_history[history_length] = (HIST_ENTRY *)NULL;
--  the_history[history_length - 1] = temp;
-+  the_history[new_length] = (HIST_ENTRY *)NULL;
-+  the_history[new_length - 1] = temp;
-+  history_length = new_length;
- }
- 
- /* Change the time stamp of the most recent history entry to STRING. */
-diff -Naur readline-7.0.orig/input.c readline-7.0/input.c
---- readline-7.0.orig/input.c	2016-08-30 14:21:47.000000000 +0000
-+++ readline-7.0/input.c	2017-05-04 22:19:51.587694257 +0000
-@@ -513,6 +513,7 @@
-       result = 0;
- #if defined (HAVE_PSELECT)
-       sigemptyset (&empty_set);
-+      sigprocmask (SIG_BLOCK, (sigset_t *)NULL, &empty_set);
-       FD_ZERO (&readfds);
-       FD_SET (fileno (stream), &readfds);
-       result = pselect (fileno (stream) + 1, &readfds, NULL, NULL, NULL, &empty_set);
-diff -Naur readline-7.0.orig/patchlevel readline-7.0/patchlevel
---- readline-7.0.orig/patchlevel	2015-10-02 11:25:03.000000000 +0000
-+++ readline-7.0/patchlevel	2017-05-04 22:19:51.587694257 +0000
-@@ -1,3 +1,3 @@
- # Do not edit -- exists only for use by patch
- 
--0
-+3
Index: tches/silo-1.4.14-fixes-3.patch
===================================================================
--- patches/silo-1.4.14-fixes-3.patch	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,1223 +1,0 @@
-Submitted By: William Harrington <kb0iic at gmail dot com>
-Date: 2012-09-01
-Initial Package Version: 1.4.14
-Upstream Status: Unknown
-Origin: git clone https://kernel.googlesource.com/pub/scm/linux/kernel/git/davem/silo
-Description:  Fixes for current silo.1.4.14 not yet released.
-
-diff -Naur silo-1.4.14.orig/Rules.make silo-1.4.14/Rules.make
---- silo-1.4.14.orig/Rules.make	2008-06-12 16:39:12.000000000 +0000
-+++ silo-1.4.14/Rules.make	2012-09-01 19:14:27.000000000 +0000
-@@ -1,4 +1,4 @@
--VERSION=1.4.14
-+VERSION=1.4.14_git20120901
- IMGVERSION=0.99
- SHELL=/bin/bash
- RM=rm -f
-@@ -18,8 +18,8 @@
- 		> /dev/null 2>&1; then echo "y"; else echo "n"; fi;)
- 
- CFLAGS = -Os -Wall -I. -I../include -fomit-frame-pointer \
--	-fno-strict-aliasing -DSMALL_RELOC=$(SMALL_RELOC) \
--	-DLARGE_RELOC=$(LARGE_RELOC)
-+	-fno-strict-aliasing -U_FORTIFY_SOURCE \
-+        -DSMALL_RELOC=$(SMALL_RELOC) -DLARGE_RELOC=$(LARGE_RELOC)
- 
- ifeq ($(call cc-option-yn, -fno-stack-protector),y)
- CFLAGS += -fno-stack-protector
-diff -Naur silo-1.4.14.orig/common/.gitignore silo-1.4.14/common/.gitignore
---- silo-1.4.14.orig/common/.gitignore	1970-01-01 00:00:00.000000000 +0000
-+++ silo-1.4.14/common/.gitignore	2012-09-01 19:05:11.000000000 +0000
-@@ -0,0 +1,4 @@
-+#
-+# Generated files
-+#
-+bin2h
-diff -Naur silo-1.4.14.orig/common/divdi3.S silo-1.4.14/common/divdi3.S
---- silo-1.4.14.orig/common/divdi3.S	2008-06-12 16:39:12.000000000 +0000
-+++ silo-1.4.14/common/divdi3.S	2012-09-01 19:06:01.000000000 +0000
-@@ -20,6 +20,8 @@
- 	.data
- 	.align 8
- 	.globl	__clz_tab
-+        .register %g2,#scratch
-+        .register %g3,#scratch
- __clz_tab:
- 	.byte	0,1,2,2,3,3,3,3,4,4,4,4,4,4,4,4,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
- 	.byte	6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6
-diff -Naur silo-1.4.14.orig/common/malloc.c silo-1.4.14/common/malloc.c
---- silo-1.4.14.orig/common/malloc.c	2008-06-12 16:39:12.000000000 +0000
-+++ silo-1.4.14/common/malloc.c	2012-09-01 19:05:11.000000000 +0000
-@@ -18,6 +18,8 @@
-    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-    USA.  */
- 
-+#include <stringops.h>
-+
- #ifndef MALLOC_BASE
- extern unsigned long _start;
- static char *malloc_ptr = ((char *)&_start) + 0x30000;
-@@ -27,6 +29,12 @@
- 
- static char *last_alloc = 0;
- 
-+static char *align_ptr_to(char *ptr, unsigned long align)
-+{
-+    return (char *) ((((unsigned long) ptr) + (align - 1UL)) &
-+		     ~(align - 1UL));
-+}
-+
- void *malloc (int size)
- {
-     char *caddr;
-@@ -34,10 +42,51 @@
-     caddr = malloc_ptr;
-     malloc_ptr += size;
-     last_alloc = caddr;
--    malloc_ptr = (char *) ((((unsigned long) malloc_ptr) + 7) & (~7));
-+    malloc_ptr = align_ptr_to(malloc_ptr, 8UL);
-     return caddr;
- }
- 
-+void *calloc (int nmemb, int memb_size)
-+{
-+    char *ret;
-+    int size;
-+
-+    if (!nmemb || !memb_size)
-+        return (void *) 0;
-+
-+    size = nmemb * memb_size;
-+    ret = malloc(size);
-+
-+    if (ret)
-+        memset(ret, 0, size);
-+
-+    return ret;
-+}
-+
-+int posix_memalign(void **memptr, unsigned long alignment, unsigned long size)
-+{
-+    char *caddr;
-+
-+    if (alignment & (alignment - 1UL))
-+        return -1;
-+    if (alignment & (sizeof(void *) - 1UL))
-+        return -1;
-+
-+    if (size == 0) {
-+      *memptr = (void *) 0;
-+      return 0;
-+    }
-+
-+    caddr = align_ptr_to(malloc_ptr, alignment);
-+    malloc_ptr = (caddr + size);
-+    last_alloc = caddr;
-+    malloc_ptr = align_ptr_to(malloc_ptr, 8UL);
-+
-+    *memptr = caddr;
-+
-+    return 0;
-+}
-+
- void free (void *m)
- {
-     if (m == last_alloc)
-diff -Naur silo-1.4.14.orig/common/printf.c silo-1.4.14/common/printf.c
---- silo-1.4.14.orig/common/printf.c	2008-06-12 16:39:12.000000000 +0000
-+++ silo-1.4.14/common/printf.c	2012-09-01 19:05:11.000000000 +0000
-@@ -21,6 +21,7 @@
-    USA.  */
- 
- #include "promlib.h"
-+#include <stringops.h>
- 
- /*
-  * This part is rewritten by Igor Timkin <ivt@msu.su>. Than I
-@@ -147,3 +148,91 @@
-     vprintf (fmt, x1);
-     va_end (x1);
- }
-+
-+static int sprintn (char *str, long long n, int b)
-+{
-+    static char prbuf[33];
-+    register char *cp;
-+    int count = 0;
-+
-+    if (b == 10 && n < 0) {
-+	memset (str + count, '-', 1);
-+	count++;
-+	n = -n;
-+    }
-+    cp = prbuf;
-+    do
-+	*cp++ = "0123456789ABCDEF"[(unsigned int) (((unsigned long)n) % b)];
-+    while ((n = ((unsigned long long)n) / b & 0x0FFFFFFFFFFFFFFFULL));
-+    do {
-+	memset (str + count, *--cp, 1);
-+	count++;
-+    } while (cp > prbuf);
-+
-+    return count;
-+}
-+
-+int vsprintf (char *str, char *fmt, va_list adx)
-+{
-+    register int c;
-+    char *s;
-+    int count = 0;
-+
-+    for (;;) {
-+	while ((c = *fmt++) != '%') {
-+	    memset (str + count, c, 1);
-+	    if (c == '\0') {
-+		return count;
-+	    }
-+	}
-+	c = *fmt++;
-+	if (c == 'd' || c == 'o' || c == 'x' || c == 'X') {
-+	    count += sprintn (str + count, (long long) va_arg (adx, unsigned),
-+			     c == 'o' ? 8 : (c == 'd' ? 10 : 16));
-+	} else if (c == 'c') {
-+	    memset (str + count, va_arg (adx, unsigned), 1);
-+	    count++;
-+	} else if (c == 's') {
-+	    if ((s = va_arg (adx, char *)) == NULL)
-+		s = (char *)"(null)";
-+	    while ((c = *s++)) {
-+		memset (str + count, c, 1);
-+		count++;
-+	    }
-+	} else if (c == 'l' || c == 'O') {
-+	    count += sprintn (str + count, (long long) va_arg (adx, long), c == 'l' ? 10 : 8);
-+	} else if (c == 'L') {
-+	    int hex = 0;
-+	    if (*fmt == 'x') {
-+		fmt++;
-+		hex = 1;
-+	    }
-+	    count += sprintn (str + count, (long long) va_arg (adx, long long), hex ? 16 : 10);
-+	} else {
-+	    /* This is basically what libc's printf does */
-+	    memset (str + count, '%', 1);
-+	    count++;
-+	    memset (str + count, c, 1);
-+	    count++;
-+	}
-+    }
-+
-+    return count;
-+}
-+
-+/*
-+ * Scaled down version of C Library sprintf.
-+ * Only %c %s %d (==%u) %o %x %X %l %O are recognized.
-+ */
-+
-+int sprintf (char *s, char *format, ...)
-+{
-+    va_list arg;
-+    int done;
-+
-+    va_start (arg, format);
-+    done = vsprintf (s, format, arg);
-+    va_end (arg);
-+
-+    return done;
-+}
-diff -Naur silo-1.4.14.orig/common/udivdi3.S silo-1.4.14/common/udivdi3.S
---- silo-1.4.14.orig/common/udivdi3.S	2008-06-12 16:39:12.000000000 +0000
-+++ silo-1.4.14/common/udivdi3.S	2012-09-01 19:09:16.000000000 +0000
-@@ -20,6 +20,8 @@
- 	.text
- 	.align 4
- 	.globl __udivdi3
-+        .register %g2,#scratch
-+        .register %g3,#scratch
- __udivdi3:
- 	save %sp,-104,%sp
- 	mov %i3,%o3
-diff -Naur silo-1.4.14.orig/first/.gitignore silo-1.4.14/first/.gitignore
---- silo-1.4.14.orig/first/.gitignore	1970-01-01 00:00:00.000000000 +0000
-+++ silo-1.4.14/first/.gitignore	2012-09-01 19:05:11.000000000 +0000
-@@ -0,0 +1,16 @@
-+#
-+# Generated files
-+#
-+fd
-+fd.b
-+fd.h
-+first
-+first.b
-+first.h
-+generic
-+generic.b
-+generic.h
-+ieee32.b
-+ultra
-+ultra.b
-+ultra.h
-diff -Naur silo-1.4.14.orig/first-isofs/.gitignore silo-1.4.14/first-isofs/.gitignore
---- silo-1.4.14.orig/first-isofs/.gitignore	1970-01-01 00:00:00.000000000 +0000
-+++ silo-1.4.14/first-isofs/.gitignore	2012-09-01 19:05:11.000000000 +0000
-@@ -0,0 +1,5 @@
-+#
-+# Generated files
-+#
-+isofs
-+isofs.b
-diff -Naur silo-1.4.14.orig/include/ext2fs/ext2fs.h silo-1.4.14/include/ext2fs/ext2fs.h
---- silo-1.4.14.orig/include/ext2fs/ext2fs.h	2008-06-12 16:39:12.000000000 +0000
-+++ silo-1.4.14/include/ext2fs/ext2fs.h	2012-09-01 19:05:11.000000000 +0000
-@@ -39,7 +39,7 @@
-  */
- #define EXT2_LIB_CURRENT_REV	0
- 
--#ifdef HAVE_SYS_TYPES_H
-+#if defined(HAVE_SYS_TYPES_H)
- #include <sys/types.h>
- #endif
- 
-diff -Naur silo-1.4.14.orig/include/silo.h silo-1.4.14/include/silo.h
---- silo-1.4.14.orig/include/silo.h	2008-06-12 16:39:12.000000000 +0000
-+++ silo-1.4.14/include/silo.h	2012-09-01 19:05:11.000000000 +0000
-@@ -87,6 +87,8 @@
- void silo_disk_close(void);
- /* printf.c */
- int vprintf (char *, va_list);
-+int vsprintf (char *str, char *fmt, va_list adx);
-+int sprintf (char *s, char *format, ...);
- int putchar (int);
- /* malloc.c */
- void *malloc (int);
-@@ -123,6 +125,7 @@
- int decompress (char *, char *, unsigned char (*)(void), void (*)(void));
- /* main.c */
- extern enum arch architecture;
-+extern int sun4v_cpu;
- /* timer.c */
- int init_timer ();
- void close_timer ();
-diff -Naur silo-1.4.14.orig/include/stringops.h silo-1.4.14/include/stringops.h
---- silo-1.4.14.orig/include/stringops.h	2008-06-12 16:39:12.000000000 +0000
-+++ silo-1.4.14/include/stringops.h	2012-09-01 19:05:11.000000000 +0000
-@@ -2,14 +2,13 @@
- #define __STRINGOPS_H
- 
- #include <silo.h>
-+#include <stddef.h>
- 
- /* common */
- #ifndef __SIZE_TYPE__
- #define __SIZE_TYPE__ long unsigned int
- #endif
--#ifndef _LINUX_TYPES_H
- typedef __SIZE_TYPE__ size_t;
--#endif
- 
- /* stringops1.c */
- char *strcpy(char *, const char *);
-diff -Naur silo-1.4.14.orig/second/.gitignore silo-1.4.14/second/.gitignore
---- silo-1.4.14.orig/second/.gitignore	1970-01-01 00:00:00.000000000 +0000
-+++ silo-1.4.14/second/.gitignore	2012-09-01 19:05:11.000000000 +0000
-@@ -0,0 +1,12 @@
-+#
-+# Generated files
-+#
-+second
-+second.b
-+second.b2
-+second2
-+silotftp
-+silotftp.b
-+silotftp.b2
-+silotftp2
-+util
-diff -Naur silo-1.4.14.orig/second/Makefile silo-1.4.14/second/Makefile
---- silo-1.4.14.orig/second/Makefile	2008-06-12 16:39:12.000000000 +0000
-+++ silo-1.4.14/second/Makefile	2012-09-01 19:05:11.000000000 +0000
-@@ -58,13 +58,13 @@
- 	$(AR) rc $@ $(FS_OBJS)
- 
- second: $(OBJS) mark.o
--	$(LD) $(LDFLAGS_SMALL) -Bstatic -o second $(OBJS) -lext2fs mark.o
--	$(LD) $(LDFLAGS_LARGE) -Bstatic -o second2 $(OBJS) -lext2fs mark.o
-+	$(LD) $(LDFLAGS_SMALL) -Bstatic -o second $(OBJS) mark.o `$(CC) -print-libgcc-file-name`
-+	$(LD) $(LDFLAGS_LARGE) -Bstatic -o second2 $(OBJS) mark.o `$(CC) -print-libgcc-file-name`
- 	$(NM) second | grep -v '*ABS*' | sort > second.map
- 
- silotftp: $(OBJSNET) mark.o
--	$(LD) $(LDFLAGS_SMALL) -Bstatic -o silotftp $(OBJSNET) -lext2fs mark.o
--	$(LD) $(LDFLAGS_LARGE) -Bstatic -o silotftp2 $(OBJSNET) -lext2fs mark.o
-+	$(LD) $(LDFLAGS_SMALL) -Bstatic -o silotftp $(OBJSNET) mark.o `$(CC) -print-libgcc-file-name`
-+	$(LD) $(LDFLAGS_LARGE) -Bstatic -o silotftp2 $(OBJSNET) mark.o `$(CC) -print-libgcc-file-name`
- 	$(NM) silotftp | grep -v '*ABS*' | sort > silotftp.map
- 
- second.l: second
-diff -Naur silo-1.4.14.orig/second/file.c silo-1.4.14/second/file.c
---- silo-1.4.14.orig/second/file.c	2008-06-12 16:39:12.000000000 +0000
-+++ silo-1.4.14/second/file.c	2012-09-01 19:05:11.000000000 +0000
-@@ -19,6 +19,7 @@
-    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-    USA.  */
- 
-+#include <sys/types.h>
- #include <silo.h>
- #include <file.h>
- #include <stringops.h>
-diff -Naur silo-1.4.14.orig/second/fs/ext2.c silo-1.4.14/second/fs/ext2.c
---- silo-1.4.14.orig/second/fs/ext2.c	2008-06-12 16:39:12.000000000 +0000
-+++ silo-1.4.14/second/fs/ext2.c	2012-09-01 19:05:11.000000000 +0000
-@@ -3,6 +3,7 @@
-    Copyright (C) 1996 Maurizio Plaza
-    		 1996,1997,1999 Jakub Jelinek
- 		 2001 Ben Collins
-+		 2012 David S. Miller
-    
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-@@ -27,118 +28,654 @@
- static ino_t inode = 0;
- struct fs_ops ext2_fs_ops;
- 
--void com_err (const char *a, long i, const char *fmt,...)
-+#define EXT2_SUPER_MAGIC	0xEF53
-+
-+static __u32 ext2_to_cpu_32(__u32 v)
- {
--    printf ((char *) fmt);
-+	const __u8 *p = (const __u8 *) &v;
-+
-+	return ((__u32)p[3] << 24 |
-+		(__u32)p[2] << 16 |
-+		(__u32)p[1] <<  8 |
-+		(__u32)p[0]);
- }
- 
--static void ext2fs_error (int errcode)
-+static __u16 ext2_to_cpu_16(__u16 v)
- {
--#if 0
--    int i;
--    for (i = 0; i < sizeof (ext2errors) / sizeof (ext2errors[0]); i++)
--    	if (ext2errors[i].errnum == errcode) {
--    	    printf ("%s", ext2errors [i].desc);
--    	    return;
--    	}
--#endif
--    printf ("Unknown ext2 error: %d", errcode);
-+	const __u8 *p = (const __u8 *) &v;
-+
-+	return ((__u16)p[1] << 8) | ((__u16)p[0]);
- }
- 
--static int open_ext2 (char *device)
-+struct silo_ext2_state {
-+	struct ext2_super_block	*super;
-+
-+	void			*scratch_block[4];
-+	__u32			scratch_block_blk[4];
-+
-+	__u32			inode_size;
-+	__u32			block_size;
-+	__u32			addr_per_block;
-+	__u32			addr_per_block_bits;
-+	__u32			desc_per_block;
-+	__u32			desc_per_block_bits;
-+};
-+static struct silo_ext2_state *sstate;
-+
-+static __u32 ext2_inode_size(struct silo_ext2_state *s)
- {
--    int retval;
-+	__u32 rev = ext2_to_cpu_32(s->super->s_rev_level);
- 
--    retval = ext2fs_open (device, EXT2_FLAG_DIRTY, 0, 0, silo_io_manager, &fs);
--    if (retval == EXT2_ET_BAD_MAGIC)
--        return 0;
--    if (retval) {
--        printf ("\n");
--        ext2fs_error (retval);
--        printf ("\n");
--	return 0;
--    }
--    root = EXT2_ROOT_INO;
--    return 1;
-+	if (rev == 0)
-+		return 128;
-+
-+	return ext2_to_cpu_16(s->super->s_inode_size);
- }
- 
--static int dump_block_ext2 (ext2_filsys fs, blk_t *blocknr,
--			    int blockcnt, void *private)
-+static __u32 ext2_block_size(struct silo_ext2_state *s)
- {
--    return dump_block(blocknr, blockcnt);
-+	__u32 x = ext2_to_cpu_32(s->super->s_log_block_size);
-+
-+	x += 1;
-+
-+	return ((__u32) 1 << x) * 512;
- }
- 
--static int dump_ext2 (void)
-+static void read_scratch_block(struct silo_ext2_state *s, __u32 block, int N)
- {
--    if (ext2fs_block_iterate (fs, inode, 0, 0, dump_block_ext2, 0))
-+	if (s->scratch_block_blk[N] == block)
-+		return;
-+	io_channel_read_blk(fs->io, block, 1, s->scratch_block[N]);
-+	s->scratch_block_blk[N] = block;
-+}
-+
-+static void read_data(struct silo_ext2_state *s, __u32 block, __u32 off, __u32 len, void *buf)
-+{
-+	read_scratch_block(s, block, 0);
-+	memcpy(buf, s->scratch_block[0] + off, len);
-+}
-+
-+static int has_extents(struct ext2_inode *ip)
-+{
-+	if (ext2_to_cpu_32(ip->i_flags) & 0x80000)
-+		return 1;
- 	return 0;
-+}
-+
-+#define EXT4_EXT_MAGIC		0xf30a
-+
-+struct ext4_extent_header {
-+	__u16	eh_magic;
-+	__u16	eh_entries;
-+	__u16	eh_max;
-+	__u16	eh_depth;
-+	__u32	eh_generation;
-+};
-+
-+struct ext4_extent_idx {
-+	__u32	ei_block;
-+	__u32	ei_leaf_lo;
-+	__u16	ei_leaf_hi;
-+	__u16	ei_unused;
-+};
-+
-+struct ext4_extent {
-+	__u32	ee_block;
-+	__u16	ee_len;
-+	__u16	ee_start_hi;
-+	__u32	ee_start_lo;
-+};
-+
-+static struct ext4_extent_header *search_leaf(struct silo_ext2_state *s,
-+					      struct ext2_inode *ip,
-+					      unsigned long long file_block)
-+{
-+	struct ext4_extent_header *ehp;
-+
-+	ehp = (struct ext4_extent_header *) &ip->i_block[0];
-+	for (;;) {
-+		unsigned long long ext_block, hi, lo;
-+		struct ext4_extent_idx *idxp;
-+		int i;
-+
-+		idxp = (struct ext4_extent_idx *) (ehp + 1);
-+
-+		if (ext2_to_cpu_16(ehp->eh_magic) != EXT4_EXT_MAGIC)
-+			return (struct ext4_extent_header *) 0;
-+
-+		if (ehp->eh_depth == ext2_to_cpu_16(0))
-+			return ehp;
-+
-+		for (i = 0; i < ext2_to_cpu_16(ehp->eh_entries); i++, idxp++)
-+			if (file_block < ext2_to_cpu_32(idxp->ei_block))
-+				break;
-+
-+		if (i == 0)
-+			return (struct ext4_extent_header *) 0;
-+
-+		idxp -= 1;
-+
-+		hi = ((unsigned long long)ext2_to_cpu_16(idxp->ei_leaf_hi)) << 32;
-+		lo = ext2_to_cpu_32(idxp->ei_leaf_lo);
-+		ext_block = hi | lo;
-+
-+		read_scratch_block(s, ext_block, 0);
-+		ehp = (struct ext4_extent_header *) s->scratch_block[0];
-+	}
-+}
-+
-+#define BLOCK_MAP_ERROR (~0ULL)
-+
-+static int block_to_path(struct silo_ext2_state *s, struct ext2_inode *ip,
-+			 int offsets[4], long file_block)
-+{
-+	int ptrs_bits = s->addr_per_block_bits;
-+	int ptrs = s->addr_per_block;
-+	const long direct_blocks = EXT2_NDIR_BLOCKS,
-+		indirect_blocks = ptrs,
-+		double_blocks = (1 << (ptrs_bits * 2));
-+	int n = 0;
-+
-+	if (file_block < 0) {
-+		printf("EXT2: Illegal file block %ld\n", file_block);
-+	} else if (file_block < direct_blocks) {
-+		offsets[n++] = file_block;
-+	} else if ((file_block -= direct_blocks) < indirect_blocks) {
-+		offsets[n++] = EXT2_IND_BLOCK;
-+		offsets[n++] = file_block;
-+	} else if ((file_block -= indirect_blocks) < double_blocks) {
-+		offsets[n++] = EXT2_DIND_BLOCK;
-+		offsets[n++] = file_block >> ptrs_bits;
-+		offsets[n++] = file_block & (ptrs - 1);
-+	} else if (((file_block -= double_blocks) >> (ptrs_bits * 2)) < ptrs) {
-+		offsets[n++] = EXT2_TIND_BLOCK;
-+		offsets[n++] = file_block >> (ptrs_bits * 2);
-+		offsets[n++] = (file_block >> ptrs_bits) & (ptrs - 1);
-+		offsets[n++] = file_block & (ptrs - 1);
-+	} else {
-+		printf("EXT2: File block %ld is too big\n", file_block);
-+	}
-+
-+	return n;
-+}
-+
-+static unsigned long long resolve_path(struct silo_ext2_state *s,
-+				       struct ext2_inode *ip,
-+				       int *offsets, int depth)
-+{
-+	__u32 *p = ip->i_block + *offsets;
-+
-+	while (--depth) {
-+		__u32 block = ext2_to_cpu_32(*p);
-+
-+		read_scratch_block(s, block, depth);
-+		p = (__u32 *) s->scratch_block[depth] + *++offsets;
-+	}
-+
-+	return ext2_to_cpu_32(*p);
-+}
-+
-+static unsigned long long resolve_extent(struct silo_ext2_state *s,
-+					 struct ext4_extent_header *ehp,
-+					 unsigned long long file_block)
-+{
-+	unsigned long long hi, lo;
-+	struct ext4_extent *ep;
-+	int i;
-+
-+	ep = (struct ext4_extent *) (ehp + 1);
-+
-+	for (i = 0; i < ext2_to_cpu_16(ehp->eh_entries); i++, ep++)
-+		if (file_block < ext2_to_cpu_32(ep->ee_block))
-+			break;
-+
-+	if (i == 0)
-+		return BLOCK_MAP_ERROR;
-+
-+	ep -= 1;
-+	file_block -= ext2_to_cpu_32(ep->ee_block);
-+	if (file_block >= ext2_to_cpu_16(ep->ee_len))
-+		return BLOCK_MAP_ERROR;
- 
--    return dump_finish ();
-+	hi = ((unsigned long long)ext2_to_cpu_16(ep->ee_start_hi)) << 32;
-+	lo = ext2_to_cpu_32(ep->ee_start_lo);
-+
-+	return (hi | lo) + file_block;
- }
- 
--static int ls_ext2_proc(struct ext2_dir_entry *dirent, int offset,
--			int blocksize, char *buf, void *private)
-+static unsigned long long file_to_disk_block(struct silo_ext2_state *s,
-+					     struct ext2_inode *ip,
-+					     unsigned long long file_block)
- {
--    struct ext2_inode ino;
--    int sl = 0, name_len = dirent->name_len & 0xFF;
--    char name[256], symlink[256];
-+	if (has_extents(ip)) {
-+		struct ext4_extent_header *ehp = search_leaf(s, ip, file_block);
- 
--    strncpy(name, dirent->name, name_len);
--    name[name_len] = 0;
-+		if (ehp)
-+			return resolve_extent(s, ehp, file_block);
- 
--    if (ext2fs_read_inode(fs, dirent->inode, &ino))
--	strcpy (name, "--- error ---");
-+		printf("EXT2: Extent leaf search for block %d failed\n",
-+		       (int) file_block);
- 
--    if (LINUX_S_ISLNK (ino.i_mode)) {
--	sl = 1;
--	if (ext2fs_inode_data_blocks(fs, &ino)) {
--	    if (io_channel_read_blk(fs->io, ino.i_block[0], 1, symlink))
--		ino.i_size = 0;
-+		return BLOCK_MAP_ERROR;
- 	} else {
--	    strncpy (symlink, (char *)&(ino.i_block[0]),ino.i_size);
-+		int depth, offsets[4];
-+
-+		depth = block_to_path(s, ip, offsets, file_block);
-+		if (depth)
-+			return resolve_path(s, ip, offsets, depth);
-+
-+		printf("EXT2: block --> path on block %d failed\n",
-+		       (int) file_block);
-+
-+		return BLOCK_MAP_ERROR;
-+	}
-+}
-+
-+static void read_file(struct silo_ext2_state *s, struct ext2_inode *ip,
-+		      __u32 off, __u32 len, void *buf)
-+{
-+	unsigned long long disk_block;
-+
-+	disk_block = file_to_disk_block(s, ip, off / s->block_size);
-+
-+	read_scratch_block(s, disk_block, 0);
-+	memcpy(buf, s->scratch_block[0] + (off % s->block_size), len);
-+}
-+
-+static void read_group(struct silo_ext2_state *s, __u32 grp_no,
-+		       struct ext2_group_desc *grp)
-+{
-+	__u32 first = ext2_to_cpu_32(s->super->s_first_data_block);
-+	__u32 blk, offset;
-+
-+	blk = first + 1 + (grp_no >> s->desc_per_block_bits);
-+	offset = (grp_no & (s->desc_per_block - 1)) * sizeof(*grp);
-+
-+	read_data(s, blk, offset, sizeof(*grp), grp);
-+}
-+
-+static void read_inode(struct silo_ext2_state *s, __u32 ino, struct ext2_inode *ip)
-+{
-+	__u32 grp_no, blk_no, inode_in_block, ipg, ipb;
-+	struct ext2_super_block *sb = s->super;
-+	struct ext2_group_desc gd;
-+
-+	ipg = ext2_to_cpu_32(sb->s_inodes_per_group);
-+
-+	grp_no = (ino - 1) / ipg;
-+	read_group(s, grp_no, &gd);
-+
-+	blk_no = (ino - 1) % ipg;
-+	inode_in_block = blk_no;
-+
-+	ipb = s->block_size / s->inode_size;
-+	blk_no /= ipb;
-+	inode_in_block %= ipb;
-+
-+	read_data(s,
-+		  ext2_to_cpu_32(gd.bg_inode_table) + blk_no,
-+		  inode_in_block * s->inode_size,
-+		  sizeof(struct ext2_inode), ip);
-+}
-+
-+static int calc_ilog2(__u32 n)
-+{
-+	int i = 0;
-+
-+	while ((n >>= 1) != 0)
-+		i++;
-+
-+	return i;
-+}
-+
-+static int open_ext2(char *device)
-+{
-+	struct silo_ext2_state *s = malloc(sizeof(*s));
-+	struct ext2_super_block *sb;
-+	int err, i;
-+
-+	if (!s) {
-+		printf("Cannot allocate silo_ext2_state\n");
-+		return 0;
-+	}
-+	memset(s, 0, sizeof(*s));
-+
-+	fs = malloc(sizeof(*fs));
-+	if (!fs) {
-+		printf("Cannot allocate ext2_filsys\n");
-+		goto out_free_s;
-+	}
-+	memset(fs, 0, sizeof(*fs));
-+	err = silo_io_manager->open(device, 0, &fs->io);
-+	if (err) {
-+		printf("I/O manager open failed (err=%d)\n", err);
-+		goto out_free_fs;
-+	}
-+	fs->io->app_data = fs;
-+
-+	sb = s->super = malloc(1024);
-+	if (!sb) {
-+		printf("Cannot allocate ext2 super block\n");
-+		goto out_free_fs;
-+	}
-+
-+	io_channel_set_blksize(fs->io, 1024);
-+	err = io_channel_read_blk(fs->io, 1, -1024, sb);
-+
-+	if (ext2_to_cpu_16(sb->s_magic) != EXT2_SUPER_MAGIC) {
-+		printf("EXT2 superblock magic is wrong\n");
-+		goto out_free_super;
-+	}
-+
-+	s->inode_size = ext2_inode_size(s);
-+	s->block_size = ext2_block_size(s);
-+
-+	io_channel_set_blksize(fs->io, s->block_size);
-+
-+	s->addr_per_block = s->block_size / sizeof(__u32);
-+	s->addr_per_block_bits = calc_ilog2(s->addr_per_block);
-+	s->desc_per_block = s->block_size / sizeof(struct ext2_group_desc);
-+	s->desc_per_block_bits = calc_ilog2(s->desc_per_block);
-+
-+	s->scratch_block[0] = malloc(s->block_size * 4);
-+	if (!s->scratch_block[0]) {
-+		printf("Cannot allocate ext2 scratch blocks\n");
-+		goto out_free_super;
-+	}
-+	for (i = 1; i < 4; i++)
-+		s->scratch_block[i] =
-+			s->scratch_block[i - 1] + s->block_size;
-+	for (i = 0; i < 4; i++)
-+		s->scratch_block_blk[i] = ~(__u32)0;
-+
-+	root = EXT2_ROOT_INO;
-+
-+	sstate = s;
-+
-+	return 1;
-+
-+out_free_super:
-+	free(s->super);
-+
-+out_free_fs:
-+	free(fs);
-+	fs = NULL;
-+
-+out_free_s:
-+	free(s);
-+	return 0;
-+}
-+
-+void close_ext2 (void)
-+{
-+	struct silo_ext2_state *s = sstate;
-+
-+	if (s) {
-+		free(s->scratch_block[0]);
-+		free(s->super);
-+		free(s);
-+
-+		sstate = (struct silo_ext2_state *) 0;
- 	}
--	symlink[ino.i_size] = 0;
--    }
-+}
-+
-+static int dump_ext2 (void)
-+{
-+	struct silo_ext2_state *s = sstate;
-+	struct ext2_inode ei;
-+	long file_offset;
-+	int sz, blk_sz;
-+	int blk_cnt;
-+
-+	read_inode(s, inode, &ei);
-+
-+	sz = ext2_to_cpu_32(ei.i_size);
-+	blk_sz = s->block_size;
-+
-+	blk_cnt = 0;
-+	for (file_offset = 0; file_offset < sz; file_offset += blk_sz) {
-+		blk_t disk_block;
-+
-+		disk_block = file_to_disk_block(s, &ei,
-+						file_offset / blk_sz);
-+		if (disk_block == BLOCK_MAP_ERROR)
-+			return 0;
-+
-+		if (disk_block)
-+			dump_block(&disk_block, blk_cnt);
-+
-+		blk_cnt++;
-+	}
-+
-+	return dump_finish ();
-+}
-+
-+static char *read_symlink(struct silo_ext2_state *s, struct ext2_inode *ip, char *namebuf)
-+{
-+	__u32 isize = ext2_to_cpu_32(ip->i_size);
-+
-+	if (isize <= 60)
-+		return (char *) &ip->i_block[0];
-+
-+	read_data(s, ext2_to_cpu_32(ip->i_block[0]), 0, isize, namebuf);
-+
-+	return namebuf;
-+}
-+
-+static int is_symlink(__u16 mode)
-+{
-+	if ((mode & 0xf000) == 0xa000)
-+		return 1;
-+	return 0;
-+}
-+
-+typedef int (*dir_callback_t)(struct silo_ext2_state *, struct ext2_dir_entry_2 *, void *);
-+
-+static int ls_callback(struct silo_ext2_state *s, struct ext2_dir_entry_2 *dirent, void *priv_data)
-+{
-+	struct ext2_inode e_ino;
-+	char *sym = (char *) 0;
-+	char symlink_buf[256];
-+
-+	read_inode(s, ext2_to_cpu_32(dirent->inode), &e_ino);
-+
-+	if (is_symlink(ext2_to_cpu_16(e_ino.i_mode)))
-+		sym = read_symlink(s, &e_ino, symlink_buf);
-+
-+	register_silo_inode(ext2_to_cpu_32(e_ino.i_mtime),
-+			    ext2_to_cpu_32(e_ino.i_size),
-+			    ext2_to_cpu_16(e_ino.i_mode),
-+			    ext2_to_cpu_16(e_ino.i_uid),
-+			    ext2_to_cpu_16(e_ino.i_gid),
-+			    dirent->name, sym);
-+	return 0;
-+}
-+
-+static void iterate_dir(struct silo_ext2_state *s, __u32 ino, dir_callback_t cb, void *cb_arg)
-+{
-+	struct ext2_dir_entry_2 e;
-+	struct ext2_inode ei;
-+	__u32 off, size;
- 
--    register_silo_inode(ino.i_mtime, ino.i_size, ino.i_mode, ino.i_uid,
--			ino.i_gid, name, sl ? symlink : NULL);
-+	read_inode(s, ino, &ei);
-+	size = ext2_to_cpu_32(ei.i_size);
- 
--    return 0;
-+	for (off = 0; off < size; ) {
-+		read_file(s, &ei, off, 8, &e);
-+
-+		if (ext2_to_cpu_16(e.rec_len) == 0)
-+			break;
-+
-+		if (ext2_to_cpu_32(e.inode) == 0 ||
-+		    e.name_len == 0) {
-+			off += ext2_to_cpu_16(e.rec_len);
-+			continue;
-+		}
-+
-+		read_file(s, &ei, off + 8, e.name_len, &e.name[0]);
-+		e.name[e.name_len] = 0;
-+
-+		if (cb(s, &e, cb_arg))
-+			break;
-+
-+		off += ext2_to_cpu_16(e.rec_len);
-+	}
- }
- 
- static int ls_ext2 (void)
- {
--    return ext2fs_dir_iterate (fs, inode, DIRENT_FLAG_INCLUDE_EMPTY,
--				 0, ls_ext2_proc, NULL);
-+	struct silo_ext2_state *s = sstate;
-+
-+	iterate_dir(s, inode, ls_callback, 0);
-+
-+	return 0;
-+}
-+
-+static int ino_size_ext2 (void)
-+{
-+	struct silo_ext2_state *s = sstate;
-+	struct ext2_inode ei = { };
-+
-+	read_inode(s, inode, &ei);
-+
-+	return ext2_to_cpu_32(ei.i_size);
-+}
-+
-+struct namei_cb_arg {
-+	const char	*name;
-+	int		len;
-+	ino_t		*ino;
-+	int		found;
-+};
-+
-+static int lookup_cb(struct silo_ext2_state *s, struct ext2_dir_entry_2 *dirent, void *priv_data)
-+{
-+	struct namei_cb_arg *p = priv_data;
-+
-+	if (p->len != dirent->name_len)
-+		return 0;
-+	if (strncmp(p->name, dirent->name, p->len))
-+		return 0;
-+	p->found = 1;
-+	*p->ino = ext2_to_cpu_32(dirent->inode);
-+	return 1;
- }
- 
--static int ino_size_ext2 (void) {
--    struct ext2_inode ei;
--    int retval;
-+static int do_lookup(struct silo_ext2_state *s, __u32 dir_ino, const char *name,
-+		     int namelen, ino_t *ret_ino)
-+{
-+	struct namei_cb_arg arg;
-+
-+	arg.name = name;
-+	arg.len = namelen;
-+	arg.ino = ret_ino;
-+	arg.found = 0;
-+
-+	iterate_dir(s, dir_ino, lookup_cb, &arg);
- 
--    if ((retval = ext2fs_read_inode (fs, inode, &ei))) {
--	printf ("\n");
--	ext2fs_error (retval);
--	printf ("\n");
-+	return arg.found ? 0 : -1;
-+}
-+
-+static int open_namei(struct silo_ext2_state *s, const char *name,
-+		      int namelen, ino_t root, ino_t base, ino_t *ret_ino);
-+
-+static int follow_link(struct silo_ext2_state *s, ino_t root, ino_t dir,
-+		       ino_t inode, ino_t *res_inode)
-+{
-+	struct ext2_inode ei = { };
-+	char symlink_buf[256];
-+	char *sym;
-+
-+	read_inode(s, inode, &ei);
-+	if (!is_symlink(ext2_to_cpu_16(ei.i_mode))) {
-+		*res_inode = inode;
-+		return 0;
-+	}
-+	sym = read_symlink(s, &ei, symlink_buf);
-+	return open_namei(s, sym, ext2_to_cpu_32(ei.i_size), root, dir, res_inode);
-+}
-+
-+static int dir_namei(struct silo_ext2_state *s, ino_t root, ino_t dir,
-+		     const char *pathname, int pathlen,
-+		     const char **name, int *namelen,
-+		     ino_t *res_inode)
-+{
-+	const char *thisname;
-+	int len, retval;
-+	ino_t inode;
-+	char c;
-+
-+	if ((c = *pathname) == '/') {
-+		dir = root;
-+		pathname++;
-+		pathlen--;
-+	}
-+	while (1) {
-+		thisname = pathname;
-+		for (len = 0; --pathlen >= 0; len++) {
-+			c = *pathname++;
-+			if (c == '/')
-+				break;
-+		}
-+		if (pathlen < 0)
-+			break;
-+		retval = do_lookup(s, dir, thisname, len, &inode);
-+		if (retval)
-+			return retval;
-+		retval = follow_link(s, root, dir, inode, &dir);
-+		if (retval)
-+			return retval;
-+	}
-+	*name = thisname;
-+	*namelen = len;
-+	*res_inode = dir;
- 	return 0;
--    }
--    return ei.i_size;
- }
- 
--static int namei_follow_ext2 (const char *filename) {
--    int ret = ext2fs_namei_follow (fs, root, root, filename, &inode);
-+static int open_namei(struct silo_ext2_state *s, const char *name,
-+		      int namelen, ino_t root, ino_t base, ino_t *ret_ino)
-+{
-+	const char *base_name;
-+	ino_t dir_ino, inode;
-+	int ret;
-+
-+	ret = dir_namei(s, root, base, name, namelen,
-+			&base_name, &namelen, &dir_ino);
-+	if (ret)
-+		return ret;
-+
-+	if (!namelen) {
-+		*ret_ino = dir_ino;
-+		return 0;
-+	}
- 
--    ext2_fs_ops.have_inode = (inode) ? 1 : 0;
-+	ret = do_lookup(s, dir_ino, base_name, namelen, &inode);
-+	if (ret)
-+		return ret;
-+
-+	ret = follow_link(s, root, dir_ino, inode, &inode);
-+	if (ret)
-+		return ret;
- 
--    return ret;
-+	*ret_ino = inode;
-+	return 0;
- }
- 
--static void print_error_ext2 (int error_val) {
--    ext2fs_error (error_val);
-+static int namei_follow_ext2 (const char *filename)
-+{
-+	int ret;
-+
-+	ret = open_namei(sstate, filename, strlen(filename),
-+			 root, root, &inode);
-+
-+	ext2_fs_ops.have_inode = inode ? 1 : 0;
-+
-+	return ret;
- }
- 
--void close_ext2 (void) {
--    ext2fs_close(fs);
-+static void print_error_ext2 (int error_val)
-+{
-+	printf("error: %d", error_val);
- }
- 
- struct fs_ops ext2_fs_ops = {
-@@ -152,14 +689,3 @@
-     .namei_follow	= namei_follow_ext2,
-     .have_inode		= 0,
- };
--
--/* These are silly stubs to satisfy libext2fs symbols */
--unsigned long time(void)
--{
--        return 0;
--}
--
--void *realloc(void *p, int size)
--{
--        return NULL;
--}
-diff -Naur silo-1.4.14.orig/second/ls.c silo-1.4.14/second/ls.c
---- silo-1.4.14.orig/second/ls.c	2008-06-12 16:39:12.000000000 +0000
-+++ silo-1.4.14/second/ls.c	2012-09-01 19:05:11.000000000 +0000
-@@ -18,6 +18,7 @@
-    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-    USA.  */
- 
-+#include <sys/types.h>
- #include <silo.h>
- #include <stringops.h>
- 
-diff -Naur silo-1.4.14.orig/second/main.c silo-1.4.14/second/main.c
---- silo-1.4.14.orig/second/main.c	2008-06-12 16:39:12.000000000 +0000
-+++ silo-1.4.14/second/main.c	2012-09-01 19:05:11.000000000 +0000
-@@ -25,8 +25,7 @@
- /* TODO: This file is a good candidate for rewrite from scratch.  */
- 
- #include <silo.h>
--#include <asm/page.h>
--#include <linux/elf.h>
-+#include <elf.h>
- #include <stringops.h>
- 
- #ifndef NULL
-@@ -65,6 +64,7 @@
-     CMD_LS
- } load_cmd;
- enum arch architecture;
-+int sun4v_cpu;
- static int timer_status = 0;
- static char *initrd_start;
- static int initrd_size;
-diff -Naur silo-1.4.14.orig/second/misc.c silo-1.4.14/second/misc.c
---- silo-1.4.14.orig/second/misc.c	2008-06-12 16:39:12.000000000 +0000
-+++ silo-1.4.14/second/misc.c	2012-09-01 19:05:11.000000000 +0000
-@@ -501,7 +501,7 @@
-         if ((i = prom_searchsiblings(i, "MicroSPARC-IIep")) != 0) {
-             return sun4p;
-         }
--        return sun4u;
-+	buffer[4] = 'u';
-     }
-     i = prom_getproperty (prom_root_node, "compatability", buffer, 8);
- 
-@@ -517,8 +517,10 @@
- 	return sun4d;
-     case 'e':
- 	return sun4e;
--    case 'u':
-     case 'v':
-+	sun4v_cpu = 1;
-+	/* FALLTHRU */
-+    case 'u':
- 	return sun4u;
-     default:
-     	for(i = 0; i < NUM_SUN_MACHINES; i++)
-diff -Naur silo-1.4.14.orig/second/muldi3.S silo-1.4.14/second/muldi3.S
---- silo-1.4.14.orig/second/muldi3.S	2008-06-12 16:39:12.000000000 +0000
-+++ silo-1.4.14/second/muldi3.S	2012-09-01 19:11:45.000000000 +0000
-@@ -20,6 +20,8 @@
- 	.text
- 	.align 4
- 	.globl __muldi3
-+        .register %g2,#scratch
-+        .register %g3,#scratch
- __muldi3:
- 	save  %sp, -104, %sp
- 	wr  %g0, %i1, %y
-diff -Naur silo-1.4.14.orig/second/timer.c silo-1.4.14/second/timer.c
---- silo-1.4.14.orig/second/timer.c	2008-06-12 16:39:12.000000000 +0000
-+++ silo-1.4.14/second/timer.c	2012-09-01 19:05:11.000000000 +0000
-@@ -156,7 +156,7 @@
-     }
-     if (!foundcpu || !clock_frequency)
-         clock_frequency = prom_getint(prom_root_node, "clock-frequency") / 100;
--    if (notimer) {
-+    if (notimer && !sun4v_cpu) {
-         sun4u_notimer = 1;
-         __asm__ __volatile__ ("\t"
-         	"rd	%%tick_cmpr, %%g1\n\t"
-diff -Naur silo-1.4.14.orig/silo/.gitignore silo-1.4.14/silo/.gitignore
---- silo-1.4.14.orig/silo/.gitignore	1970-01-01 00:00:00.000000000 +0000
-+++ silo-1.4.14/silo/.gitignore	2012-09-01 19:05:11.000000000 +0000
-@@ -0,0 +1,6 @@
-+#
-+# Generated files
-+#
-+floppy.h
-+silo
-+silocheck
-diff -Naur silo-1.4.14.orig/tilo/.gitignore silo-1.4.14/tilo/.gitignore
---- silo-1.4.14.orig/tilo/.gitignore	1970-01-01 00:00:00.000000000 +0000
-+++ silo-1.4.14/tilo/.gitignore	2012-09-01 19:05:11.000000000 +0000
-@@ -0,0 +1,10 @@
-+#
-+# Generated files
-+#
-+b.h
-+b.out
-+b2.h
-+b2.out
-+boot
-+boot2
-+maketilo
Index: tches/sysvinit-2.88dsf-tools_updates-1.patch
===================================================================
--- patches/sysvinit-2.88dsf-tools_updates-1.patch	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,82 +1,0 @@
-diff -Naur sysvinit-2.88dsf.orig/src/Makefile sysvinit-2.88dsf/src/Makefile
---- sysvinit-2.88dsf.orig/src/Makefile	2010-04-11 05:30:27.000000000 -0400
-+++ sysvinit-2.88dsf/src/Makefile	2014-04-14 17:00:32.000000000 -0400
-@@ -16,27 +16,20 @@
- # For some known distributions we do not build all programs, otherwise we do.
- BIN	=
- SBIN	= init halt shutdown runlevel killall5 fstab-decode
--USRBIN	= last mesg
- 
--MAN1	= last.1 lastb.1 mesg.1
- MAN5	= initscript.5 inittab.5
- MAN8	= halt.8 init.8 killall5.8 pidof.8 poweroff.8 reboot.8 runlevel.8
- MAN8	+= shutdown.8 telinit.8 fstab-decode.8
- 
- ifeq ($(DISTRO),)
--BIN	+= mountpoint
--SBIN	+= sulogin bootlogd
--USRBIN	+= utmpdump wall
--MAN1	+= utmpdump.1 mountpoint.1 wall.1
--MAN8	+= sulogin.8 bootlogd.8
-+SBIN	+= bootlogd
-+MAN8	+= bootlogd.8
- endif
- 
- ifeq ($(DISTRO),Debian)
- CPPFLAGS+= -DACCTON_OFF
--BIN	+= mountpoint
--SBIN	+= sulogin bootlogd
--MAN1	+= mountpoint.1
--MAN8	+= sulogin.8 bootlogd.8
-+SBIN	+= bootlogd
-+MAN8	+= bootlogd.8
- endif
- 
- ifeq ($(DISTRO),Owl)
-@@ -46,11 +39,8 @@
- 
- ifeq ($(DISTRO),SuSE)
- CPPFLAGS+= -DUSE_SYSFS -DSANE_TIO -DSIGINT_ONLYONCE -DUSE_ONELINE
--BIN	+= mountpoint
--SBIN	+= sulogin
--USRBIN	+= utmpdump
--MAN1	+= utmpdump.1 mountpoint.1
--MAN8	+= sulogin.8
-+SBIN	+=
-+MAN8	+=
- endif
- 
- ID		= $(shell id -u)
-@@ -78,7 +68,7 @@
- endif
- 
- # Additional libs for GNU libc.
--ifneq ($(wildcard /usr/lib*/libcrypt.a),)
-+ifneq ($(wildcard /tools/lib*/libcrypt.a),)
-   SULOGINLIBS	+= -lcrypt
- endif
- 
-@@ -96,11 +86,8 @@
- 
- last:		last.o oldutmp.h
- 
--mesg:		mesg.o
- 
--mountpoint:	mountpoint.o
- 
--utmpdump:	utmpdump.o
- 
- runlevel:	runlevel.o
- 
-diff -Naur sysvinit-2.88dsf.orig/src/paths.h sysvinit-2.88dsf/src/paths.h
---- sysvinit-2.88dsf.orig/src/paths.h	2010-04-11 05:30:27.000000000 -0400
-+++ sysvinit-2.88dsf/src/paths.h	2014-04-14 17:00:36.000000000 -0400
-@@ -26,7 +26,7 @@
- #define CONSOLE		"/dev/console"		/* Logical system console */
- #define SECURETTY	"/etc/securetty"	/* List of root terminals */
- #define SDALLOW		"/etc/shutdown.allow"	/* Users allowed to shutdown */
--#define INITTAB		"/etc/inittab"		/* Location of inittab */
-+#define INITTAB		"/tools/etc/inittab"		/* Location of inittab */
- #define INIT		"/sbin/init"		/* Location of init itself. */
- #define NOLOGIN		"/etc/nologin"		/* Stop user logging in. */
- #define FASTBOOT	"/fastboot"		/* Enable fast boot. */
Index: tches/vim-8.0-branch_update-1.patch
===================================================================
--- patches/vim-8.0-branch_update-1.patch	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,19484 +1,0 @@
-Submitted By: William Harrington (kb0iic at cross-lfs dot org)
-Date: 2017-05-15
-Initial Package Version: 8.0
-Origin: Upstream
-Upstream Status: Applied
-Description: Contains all upstream patches up to 8.0.0597.
-
-diff -Naur vim80.orig/.hg_archival.txt vim80/.hg_archival.txt
---- vim80.orig/.hg_archival.txt	1970-01-01 00:00:00.000000000 +0000
-+++ vim80/.hg_archival.txt	2017-05-15 23:29:16.898774340 +0000
-@@ -0,0 +1,6 @@
-+repo: 770908d1cb47c04be0aef5c173b17ab8be6b6476
-+node: 30e43349a78a37fadb27580b7cd63abb9f1c042b
-+branch: default
-+latesttag: v8.0.0597
-+latesttagdistance: 1
-+changessincelatesttag: 1
-diff -Naur vim80.orig/.hgtags vim80/.hgtags
---- vim80.orig/.hgtags	1970-01-01 00:00:00.000000000 +0000
-+++ vim80/.hgtags	2017-05-15 23:29:16.926774729 +0000
-@@ -0,0 +1,16407 @@
-+004eb98eb3c30714cb6a24ec3e810275080a8413 v7-1-117
-+006e9c8a6a8ad354a5cb6adcce6ebfceddeb20ee v7-0079
-+010397e1770eec8ff399cfc3bbd79f853849ffc1 v7-0160
-+0137e7c3d31b09f1c1e494405f3f99f6423b74cd v7-0196
-+0139403c8eb088d58773f7e76dc2a025719a8e8c v7-3-135
-+01583c79d5f4d3f29d4c33dd10dd29efd349cad0 v7-0d03
-+01762f635babb0fecb3a9f04549a54e86f67cf8b v7-1-047
-+01a0da54773eb2af0215762629db5c6eed01ba06 v7-1-138
-+021f9d0f60a1700989e2deeab78da32837c1041b v7-2-079
-+028158b1362b55a23cc6d8d086976c4dfd6e094a v7-0090
-+033e7b49356c11b2d9cc45dec6dc3d695d7ef95a v7-3-083
-+0358abf2b5d4ab5981a5a1dd651ecf63d40ffbfb v7-1-315
-+03714c67a82b8557cb8ee0789cbced75d804d949 v7-2-134
-+039ce9407934bd97142aab06c5d1869d8e2ba3c7 v7-0-032
-+03b3684919e3299ff560609c0c5f577822f64614 v7-0084
-+03c191181749e422b375fbb8cd0763dede7d9beb v7-2-313
-+03c4ceec6bec956646c07390aa09052cf5f0468f v7-0-054
-+03d49a7c83196a406cbd12f4898fc988731af927 v7-3-010
-+03ec0f2b9a403b1cbc494eac6c038076ece0b37c v7-1-242
-+04265ffbda1f9b14729bc5d85069ff0711ce3744 v7-1-210
-+044d5e9b1292f694e73ae929eeceaa9685fa0580 v7-2-194
-+04613e770ec0bd536f04c0fb6d80b76e1af1d6e4 v7-2-189
-+048f26eb43a348e49fc4f9deaca03779c2de595e v7-1-082
-+04943f31135747da59cbed2b39fb109dd2796426 v7-0-165
-+04fc2a0e98ed7af6ee11a2025d6a0c877114c039 v7-2-057
-+057029bf347002408541ec73da1373ae64002a3f v7-2-338
-+05952d133506353938f50f0b22b0097b6cdf0afd v7-2-095
-+05b48b16b627b63ee0f6dda7d7f07704c3d2fe64 v7-1-198
-+05c8ff7f128406d2d6052abbf5b92635d3cb0284 v7-2-162
-+05dc93b9c61f63c1691849fe7407c9472a7f6288 v7-0208
-+0606065af0a02f79b43b4a89383b04c21e2f0be3 v7-3-111
-+062104a823df0f5a225b327b00a3766e41e4610f v7-2-201
-+06234af3a8b7df68bfaf0efa87edfed2d743f6c7 v7-0106
-+06317850ad3acd03765fc0f8002f17417773d906 v7-2-045
-+066778e39c2ae6bbf23708d98e1a7a7e53a9a6d0 v7-1-232
-+0670d0df210a891f82d38c38f1b3b256dd1a5f8d v7-2-017
-+0691866e6cc92996f4fbc881e134248571ae7c82 v7-1-180
-+06959e7212e521904f3b7d75bac5005b9f44bde3 v7-0-077
-+06aa43dde5610dff598940ccde1dd25a617a1a52 v7-3-006
-+06bc859d1a32de8763e310669d0c008b3945af1c v7-0049
-+06e0f7482cef3412ecb4b0b62b65b1e7c4ed92b2 v7-1-052
-+071166147fc55311bb86bc9367aca005c4a1447c v7-2-299
-+0713c530729ba6d2bdc9fdb4fd400f46b16c37be v7-1-169
-+073f98f45a447a137c2e2d74f936a9e26179ce1b v7-0-035
-+077c15286de8e37250ed1337a448c740c86ee740 v7-2-293
-+07d199fe02ed46fff935b2daa4efc979eacaab4c v7-0209
-+07de57cbcb25d63bf515b67de654dd89004888fa v7-2-327
-+08012a1ff8d4b4f5736a47440a907ec6e5e1610d v7-0137
-+0836531167ab2f1cd48382b093c3080c3bc47786 v7-2-059
-+0868e4e53fb2e9f9bd469fae0323a1df43be476b v7-1-029
-+0887e8a13e5f33db2f832a52654a0d1fa82f322f v7-3-109
-+09cc86b6665358a20d9faf54ce8eec45ca4fc5de v7-2-387
-+09d0e83c29b805f127c6756231bb4adfb1b2974c v7-0-130
-+09f00d57222b6d8de104660ea3f9c6bb42b9d31a v7-2-172
-+09fcdfde9afca8990c086e60fe5e122cb258cadc v7-0-046
-+0a1d45e2d8e30fc0aef25d5fd7505840d1e0e836 v7-2-258
-+0a60be12e47e322c4dbae7b083321c60f599c0b8 v7-0125
-+0a80dc6d78048478d4e7f0f99f573c947d5d95c0 v7-1-131
-+0a908b65de1dbebbde1aacfd50aa41ef09e6865e v7-2b-012
-+0a9371c70540d0d42c79a1d76e590fa2ccb978b3 v7-0220
-+0b056c1350dd2ff28249130194d9a2be7b606a86 v7-0-193
-+0b1b7560c456a32ad921e3985b90008ef1f82a91 v7-0174
-+0b211ebefd4e6ee52ae81a75938b4ee61ca15770 v7-0-071
-+0b42546f036bb3ff8023b6015a5acf032a2ae1f1 v7-2-076
-+0b4a515b125474db496caa0be22a28e8bd99c88e v7-3-132
-+0b796e045c429253e9ce8825ad05aad2474553bd v7-2b-000
-+0c0a2b25d10aaaf556344d7404d12aba81632cf4 v7-0-015
-+0c381fb7846cda92fbdb327bbfe4ab1f73a86d8d v7-0214
-+0c39ff7a90a81c62f2718f71bf0a4d636a8ac69c v7-3-127
-+0c4a465bd7419d51017354b70ead01c18b589e9d v7-2b-029
-+0c61c201ba76d7235913010395e065991ac059b9 v7-1-196
-+0c6c64edcbe0481659fdd91f6312296e7c1bb303 v7-2-052
-+0c7d6d01e0582b54f34ab66852116d559c39550c v7-3-101
-+0d0bf7598dcb63fdb5be9300f407e043102ab895 v7-1-256
-+0d31f8a78ab35b256359b6ae53c80cecce59d44c v7-0-143
-+0d6554dfc71e5e58866ef0118ed05007a4c59672 v7-0061
-+0dbc46d14443418020e3868a08877a365ced11e1 v7-2b-028
-+0de47f0d731e32af52784171986734b735ac626f v7-3-051
-+0e3bd80a3f74a99241a4857685912dc8efeb9bdf v7-1-286
-+0e3e208b4b901f22beecc85c5781170f3c4e5351 v7-0-104
-+0e3e601e66cf233986924652f7801dc8d2568a84 v7-1-288
-+0e45a0c50acaa31dd4052c57053bb86afd4e711e v7-2-154
-+0e4631bf94411717193870a5ad7d62945d06cadc v7-2-377
-+0e4c64dfc61141a68b83b5204a160b5c01986279 v7-2-125
-+0e4fa55d20e025a70e3e6b82abc58333902c45db v7-2-040
-+0e57be57fa49a0d2c0b7f17b7cb137b4260b79d6 v7-0-207
-+0e5eb96dc18ce7986eadf32bb700e503da52ae47 v7-1-142
-+0e6b369b9760459289b84a9c2e07478c063cd386 v7-1-126
-+0e902b8f511f0442ee2b28314d6e085e3e00798e v7-0051
-+0eef0f62181190700a01129a88f693503ae94947 v7-2a-006
-+0ef5b70c3eaf694c9e9b85aed3f80af53e6fd9cf v7-0045
-+0ef9cebc4f5d1c00554543918fea2a0b7539b922 v7-0031
-+0f109c56b521834af0d9492b21d0ef1ead5b01ef v7-2-014
-+0f3f3090491faea043fa144780d1287e011390ac v7-1-205
-+0f552ca271c27681ed126261ce49e52ef144175e v7-2-393
-+0f9f4761ad9cafbf1e72de338aa3fc59f1dd693d v7-0216
-+1002128c68dbe2f69466b1b2cb354b00eec2980b v7-1-109
-+103dea6545430092db1851d1b712a742af1a74f2 v7-3-017
-+10a1b67c0885aabdac7c76a96169cd9e36414428 v7-1-068
-+10ce04af8c5b26e55cd2157408883d9ed79b9a3d v7-3-021
-+10d7ebdbe8a3a9787360b21a9836c6bae6a6a7a2 v7-0-169
-+11155435487064d64efb296f7c2966baae8d27e3 v7-2-402
-+111e109dad1301c7699d18e5689f1842f4b67e6c v7-0b01
-+11472bbcdb6e2effe1c248d09b4d7089fa7a26d2 v7-2-183
-+11a74d2cab9dbe41af2ed5d08b18fbdac14f6e43 v7-2-147
-+11c004cc1a4df89b9246a96106db6c6f0260b7d8 v7-0-241
-+11c6bda3b53abb2c98ed9221ba89880eeef7514f v7-2-268
-+125e80798a85dbead9a91815cabd1d0aed63f455 v7-0021
-+1287e2bbeb405c10201d4caa6b2dab284f84efbf v7-2-207
-+12aba62fa7c6812ec46eb3be6759d82a4a651a93 v7-2-422
-+12f9cd68b9c3aaf3659d9219551a5822cf798857 v7-1-257
-+131dbd3d2a4bba5d1514c2842952ca7b77b6902e v7-2a-019
-+1324b7b755f3b5570ce9aa7fb27c075c89a1d2df v7-1-322
-+134c7695af324bd4118f52b9235aeff7e374a425 v7-2-121
-+1378bc45ebe5754c0d3ec64d37810eaad3a544f3 v7-2-348
-+144ad7f25f6741815c8297fe77965f93ee359c2a v7-0-118
-+15130d4dfea14898029686b72536f54197a73062 v7-2-117
-+15146eaa0e9c6dd6802cf70a2da3b220992eda1e v7-0-001
-+15154710ed57eab29f7e4b848eafe63ea2dfdf85 v7-1-140
-+151a805b2ddc219d4a968154a43daefbb2e41fe1 v7-1-081
-+152883db0edf63f35e8459dcc5862ef3f4b48c9e v7-1-321
-+152e526245217fedd07f0480e08ea59b0075a8b0 v7-1-001
-+15674e198164c10b08e138f4c18b58e76306d9be v7-2-389
-+158a68529622f90d0b0f1f5596f55cc5ce06c9ee v7-2-060
-+159d87361e4b0d99c3863b3c82b7121a474cdf1f v7-1-168
-+15e847397be75c6b0590505a9e201c793d070eee v7-2-205
-+165c628aa9fc3cca34ccf63dc8ab953745d4e228 v7-0108
-+169533a9699fa7d3fd67b57ad99d04076d060831 v7-0g02
-+17526daaf79dbf2004c78311abdad05e6e3070dc v7-2b-021
-+1780e6046802498a3c4d0ddc7b99f1bd9ac75f31 v7-0-157
-+17a83c0532e83e9f4cd89f03dcbf206662d25b1f v7-1-062
-+17b9587ff6d5beef34d98043ca5f3111e5d29e4d v7-0-202
-+17b96d8dcc5c8356e10135f5735d6de2fa5da3e8 v7-2-038
-+17c88d44ace9bc9e76485811ffa459b5c15a6bb7 v7-1-234
-+18061514324fefb37ea7a7e7783985004ea0874d v7-3-084
-+183c3187b20dbc6ecc74958e9ba141f0d4f72d23 v7-0-205
-+184a6091124e80e1c9f66ed0908deab552ca369c v7-1-220
-+184d2020d8f12823a2f2cb96335a68ac1bda3270 v7-1a-001
-+18ee39301b822de39caf5fa023107ddf508b42e0 v7-2a
-+18f024844150562a9e56522edcad3fc1d5c257e4 v7-0086
-+19106f131c872dc79bb409ffe8b5e35ebe885c1b v7-0188
-+196d564759eb256f62e7fb7ec4561c1e2d533726 v7-2-072
-+198a695ca8e7273641991bcf346085bbce70d740 v7-1b-001
-+198ea7a9c633089ef2638513d05611a9d1b6e39c v7-1-182
-+19ed3bfbe488a730858d0d26b433029b85e231cd v7-0-159
-+19ef2bbf569cba64ae5125d5b1f3f205efc25e89 v7-1-263
-+1a00e831244b1e509286ea35a586c6c43dcdaaaa v7-2-202
-+1a040c25c44485c85e838a7530051f6d4f9793a2 v7-2-123
-+1a0d346695fa3525a08a27174fbdf016afdbb9a9 v7-3-085
-+1a44839049aefb0722d43a87d7ed1708c9c94b18 v7-0229
-+1a511b7b69ebdf866088b9e765dc42543cd76d0a v7-0-212
-+1a85f952cdfe4716be162e308fbccb0117489915 v7-0195
-+1a8b518bb993e00f546c4cef8bae9b51f91fe0d7 v7-2-198
-+1aba098d6abc680214b3b31c954abd53ddc772ef v7-0-039
-+1b55bbf5c58077e54b83307bbe715e131c57b750 v7-1-219
-+1b7cac059babfb3365c0a44c0537c7aa9b286a71 v7-0172
-+1baac9d06c83400c474e6484dc20229187d27a64 v7-3-024
-+1bb06e6512a2fc961eaf9a8e7a749247c408e7f6 v7-2-358
-+1bc46149d9195d9134d526ef524242ede65c2457 v7-1-167
-+1bdb13b8e947b85e612afec3a1b5e09c29c30551 v7-2-039
-+1c00ea3641a8a1e58e70cd51ab831003bdb41d50 v7-3-005
-+1c1cbdc42f75d8fa0ca5a799b5e843e9aa2c098c v7-0077
-+1c4ec9ed71caf24dbec13f6d3d4adbb48bce9436 v7-3-056
-+1c586ee8dd452d305bebf633d5b8c78ba1ab170d v7-0183
-+1c597397f0061fd2c750c65c961a31f70dd6747f v7-1-269
-+1c64bf25bbcd49a83cc08dd60a6c3e5785266790 v7-2-247
-+1c7a66d820e4dc9b0a9f696ed6e7a59cd9a20e19 v7-2-360
-+1c85355293f92cd8bb41eaf6ce8a8be1d77302f1 v7-2-062
-+1ccc1ace9e5b6c1223ba191ce20729a49f13970e v7-3-050
-+1cdd2661f34c2aa93ae2f0317194d29d3a43f5be v7-0d01
-+1d0ef79659afec337c26655216a1debbd1c74497 v7-0-002
-+1d12208efb3732d6f520b05a47283208f12e3856 v7-0-209
-+1d4c67f8470981d280aaf1d2a25877a00ec5d240 v7-1-084
-+1d6d99daf4dcba733e5517045f70e53c185aa895 v7-1-165
-+1d7f46148bf4ec36a42e959cece1f9f6199a87a7 v7-2b-006
-+1da25369227bead09cf603ebfa93ebe1d206c871 v7-2-345
-+1dd4e0ccd822156b87516f9cd5a6a004d0d85a11 v7-1-278
-+1ddec6983d9ebdb4f7a748cc171199cc8ad3d1e0 v7-2-036
-+1de53700b1d9f26a420a319d9c44ba0c43950035 v7-0-127
-+1df41c98fc2e9a230ab9d05be84f4c91e4078619 v7-0-239
-+1dfe9032bd92ef7ab7bf0baf0f0c1f61da68bce6 v7-0-131
-+1e25b58fbf7babbbe054e118617a49790f532fd4 v7-2-024
-+1e52efdc900cab1dd64f6a987bbe5117fa1f9748 v7-2-270
-+1ee00a062acbd04360de8b754e834f7ef6025328 v7-2-246
-+1f099ff4f6fb2b0731bb38e279d0c692ee05df8d v7-1-129
-+1f3902f3eb5c20e7872c42cdee9c91e2b25d3f47 v7-0038
-+1f3b1021f002ac9703c1de0e80703b8067546a41 v7-0e05
-+1f53050b38688e127c4ea67251ab2730002541bd v7-2-294
-+1f90fab89ce32126849aa28d2918bae96603f3bd v7-2-069
-+1f929f3ca8066b3170c7a58c414837d47bef707e v7-0c03
-+1f93fbcb4e0cf1dcd8682242f40aa5f2906c42ac v7-1-201
-+1f9e2c8e642a29d93b9c32062c785f4c38883e0c v7-1-034
-+1fbbe04a950f9ed82b53ddf67d8e034224fc98ad v7-2-286
-+1fc8d918d9fc076304ef0dbaad897e8e5b6ba4ab v7-2-093
-+200b706675a56daad05f8b0d60991825c45b6e2d v7-1-183
-+20308f30826db09e99d531214eaaf03ea8b13d15 v7-0-162
-+205a26fab11655d086ce185525193d16f37d60b5 v7-1-203
-+20b2e52ca96255a8d99ed9504e90a960266c4d21 v7-2-009
-+20b4b6a2a212584f182a2d69a37512bf9094d85e v7-1-279
-+20b52d44daafbd65b01db735c4d5597ccb9e386d v7-1-130
-+20c18291deb21dcc69b6ceb3c11c309a92396fb4 v7-2-302
-+20d9fc2f13a4132d6344fb6457040b02720774cf v7-2-403
-+215d6b2a1816a5eaf5f5d2cb7cb1b22d24adbdab v7-1-159
-+217c9aa4c3ba6ea559ec5675871d6d89313363e8 v7-2-114
-+21b11491a33fee3cd77dcfcc2448382f060543f2 v7-1-156
-+21c3634c211345ea79e90c4927513e7dc1381617 v7-0134
-+21ce954cbdcac9dea2aa826ff40adc2fb2184600 v7-0-201
-+220a9309067dfc6e7e8301b392c3499054666396 v7-1-266
-+2244be18d9e9ce602a12e7529614c25ca8cef1ee v7-0162
-+22886f3d882d231a528dcc012c23e54180c8248c v7-1-040
-+232a4740aa0ed615c52b289a111b51171e74a78f v7-0-005
-+2392a6da4aa430f896451d97da8c49ed3fcdb9cb v7-0186
-+23aeaff961412f06544babde36a80a6c22be0fd9 v7-1-307
-+23d23246742e7d301d09f0cb03533226b64043b4 v7-0-219
-+23d366df193868572eacd04e1a32bc2283a30e56 v7-2-335
-+23f82b5d2814be7ca4dee000226bd67dc6cd02cf v7-0c10
-+24100651daa9d7140d33f298c987c9d42bd919bf v7-2-411
-+2430fc9a18d1270a5ad7b5f7acac3e19aa8908fb v7-1-306
-+2448f4c8afc65a91130fa0237c253e6698481c64 v7-0-055
-+24b7b3cc4eec4387713a615519489fa5a34b253d v7-1-251
-+24eb7921b8f004c8c462297cf53afad8f5578243 v7-2-367
-+251307ebe1dbacd972e35e923f7360d12733f2b7 v7-1-049
-+25154b22dc967b158645be9cb87017f548ee5446 v7-0-198
-+2548cf0a5f625110a5cd42ee5566c2709c2c34f0 v7-0-011
-+25bc02d83cf438d5794ce106edad2959e2f89454 v7-1-292
-+25dd5036f2b0b5e68492c49f15eaa228aa957f69 v7-0092
-+2651e7d07cd631af64818f5d3cf5dbb199fa6f64 v7-0-140
-+266f9d9f5109421afcbc8169896b484ff7a19a8d v7-3-061
-+26876d0f15e9294aa4fcbfc43260a5f2a703e313 v7-2-256
-+26b0b2f606d2953068951dca673d963b7c5cccb7 v7-1-122
-+26cbd39f22513d82cc43d2b1badefcea8db1c546 v7-1-103
-+26d879bcab3aa016ccaf77cfd3a9aa5085d4776e v7-1-284
-+26fb122355d4d6b04850f7608f1d82da8dbc51c7 v7-3-107
-+26ff011aec2dbc96736396430403d572d4f111d5 v7-0-172
-+27060fe297d0ce872dfa3bc20416f7189b9fbc59 v7-2-273
-+2750661e93d556868d97f49fae32a1f470bca107 v7-1-253
-+27621abffed24f1e2849ea616f91f0a99747608f v7-3-099
-+276244befa5b2a34893ba581818df14cd7e4504e v7-1-189
-+2775dcd056031e0a7314da9a9e0b2cebbb089525 v7-2-426
-+27782797c331b8800c12ad17c5d05adab5e92edb v7-1-107
-+2787b8483e6498f536e66ac134a073246ab6f5e4 v7-0-125
-+279380a812add1307a2a20c444f2334b7a45106d v7-2-412
-+27d8fe1c096407ddca428c52f62d002dfed7879f v7-2-090
-+2832243e801ec537589809059f65efb3b8a57f93 v7-2-399
-+28398206597f975583c9f8f212d336fc9f67953f v7-3-089
-+28558ab31051fc1870ac690c0b576ca9365021f5 v7-1-202
-+28641f0ed9deb579934416e6161260d4d218f394 v7-2-211
-+288fb648badba86a0bdce6dbcecb55eb386263ab v7-2-128
-+289b19a6f2edb5b46df57195d5fae41dfe963290 v7-0103
-+28d0c20ad8a09dd63fa34768eac4be3cf96ed239 v7-2-051
-+28e9eb0f2d849e7e32d70b4e1f06dad812288578 v7-2-077
-+2928a6b338c3f434723520a12fa378895d4b24cf v7-2-187
-+2930fd8e7d9f1514448261365b787501dbd9a0b7 v7-0171
-+293621502c4daa122ae601398d854857bb732a83 v7-0010
-+2951f28a9bd3b08c5be9bc9b3745f062b95635b8 v7-1-192
-+2981ad79c362bff0c21d3ff0d68be57213bca837 v7-0-025
-+29bf49bad20d3b1ad35af5cf21d91c4aa486d4a5 v7-0-068
-+29c09fa57168acd665a85ed5a210b48b60d0b5e2 v7-1-211
-+2a11407a5a8f4efccc04dfde8a61e40ec5eb9fc5 v7-2-066
-+2a256978a64649b75d424eec6e703f99f7f28636 v7-1-003
-+2a8bf2ba504f422d53dac30da8b58d76e54b4428 v7-3-003
-+2a9d26c95a2a9b2f1a279e04de22ee4c7298552c v7-3-077
-+2ab007070fc86d20596dfbded70d0f986c084304 v7-1-113
-+2ae2dd2591fae798e4212e9b2c47281eca0c8483 v7-1-055
-+2b273c71a14b7d0e64b6ae9bdcf60ef7e4d45aa8 v7-2-415
-+2b475ed86e6491b20046d5c34fec8ea86988dade v7-3-074
-+2b4debdc8d2c73d1fc37b750010e3a4098b035af v7-0035
-+2b913f7eb9d2b411f9ef2c0fa44f313b7382bd89 v7-0039
-+2bd29808d1f640f027ab7a4a4f2b5b6a0e6c8e38 v7-2-429
-+2bd96108392ec08b6c384893939968d94bab4dbb v7-2-351
-+2bebfa810a66caed9562541776d92f73a71de7f1 v7-0-091
-+2bfc2b7033147de9689cf2d651bd8ef36fdac68b v7-0078
-+2c1ffe8953ee85cf04d4db5c03ab711c1c6c015a v7-0080
-+2c4ca49319a689ad9caa4429cd90bceda4e210a3 v7-1-271
-+2c5e70e2858fa46c7b80b022f217103b8c90e9e9 v7-3-016
-+2c885fab04e31a34d91e4375d2d0397cadb818ce v7-0e06
-+2cdbc91795ca0d15343fe954ae2af71f830f9656 v7-3-007
-+2cdccc96d730501ce4e509e7efe4f8fd3f2b2e29 v7-1-150
-+2ced59eaf1e5c67060fe124902407a8bf77a1a78 v7-0-233
-+2d0f22897a4d1f71600540e64a5cbf80a178e46a v7-0-173
-+2d9eebf2c48f0bd3b51e8ba085b97da871cd4184 v7-3-126
-+2df7e2d753061b54b9120ae4b34d4bf050cf17f5 v7-1-246
-+2e1e9b708941e1cfc2c0540196719f78e1ab18f5 v7-0-023
-+2e42153b37f171ed28293fa12e4f538070bf8619 v7-2-021
-+2e915ea7110f0dc0507a733e4330ec6cc91e53ff v7-2-266
-+2f016b638c0ca912d89f352f6b9b83231cf9e83b v7-1-312
-+2f57d93bdbf64461c4eaeaacdba26548a2abb9cf v7-3-030
-+2f6e519726f19c2f6cb58e9cd75e827eaafa0ab3 v7-2-346
-+2f70b8f1f1e32dca34db07fedf9cbb56ff97007f v7-1-076
-+2f9308b31181f36bf605ee060fa763a28deacb03 v7-2b-030
-+2fa8cb05b861d49dec0501a2531eec39e1d0a688 v7-0218
-+2fb204616c9b4e4df95f1560899d02e5bb739678 v7-0-079
-+2fcd444c4bd37f916da718bf5bbe9535d2667331 v7-0057
-+300fac7c5a2bafb002ee97d52da19bae8a344d51 v7-0059
-+302a6aa7aca2ee9cf24958c2277a90fcfc01c939 v7-1-061
-+30534c76776ab088a4142f9e15faa23d86efe020 v7-2-078
-+306fc545fe2cd5d77953811fccec0d5c4bf7744e v7-0-066
-+3112fcc8923830fd9060c76d1ec9c75c59487d59 v7-2-371
-+31208ed42de95ba5738675cb78bd0f66c34ed785 v7-0-065
-+313ec58cdc49a69c4386a4aa18fb9bcd01155feb v7-0-206
-+316dad0565b8943c978c8c58b212f3c4469b1cf7 v7-0-103
-+31757405c0c5408f9c83dba9d83ea74b2bd680d5 v7-3-134
-+31bff9be0a7730f36e7de4792fec0688f2fc7076 v7-0g04
-+31df87b80e562b6a83b97e2610f539afc94bc440 v7-2-278
-+32c1b275ba6419fc014ffba3d2e55eca1ef06d4c v7-0-196
-+32e19278c1ad1be6f92fc6cbcefb7e23ddf928cb v7-0-105
-+32f48534fa0fa9b8e6833850fcbd77cd002ce8e0 v7-1-187
-+3328b87305efcc6a8db6923c31cbf78a05983eff v7-1-077
-+3372616fe1f1def653875bedaa8c059c399197ac v7-1-144
-+3376d79d40f2d2c8e09cf8a3c07e15fc2424ecb3 v7-0-148
-+33792c36e3aadc7f313785705f39d7ea6e214319 v7-1-018
-+339999b511a0d529f09219a5d61b810fc75261ef v7-0148
-+33a2652c13268ca53bb9ce0cfb7232655864c373 v7-0-231
-+33d28f1c4d1dad3d4ce7f768c57820a8203c3e51 v7-2-006
-+342cf2a9f5cce4f70e6a974253b20c8e309de7ef v7-1-145
-+342d2b3a072a6cbc3cff898a663c4889317b32a9 v7-0-208
-+3479f9aacaf57d583abb468cfe393eead386f15a v7-2b-008
-+34f62bcce014d9c0b275002a1001cd1582ffa121 v7-3-123
-+351bf13db8071317d7add1e55a50ae284ff53a4f v7-2-334
-+354ea37841d13e0d9bb5ae995a09fb28beaa0d13 v7-0-022
-+35abb70264158760c724bd0290c6c441afec4fa0 v7-2-033
-+35cef95a6b7646d045b97bd4a54bb90000b5a753 v7-0168
-+35edf814f2230c2bfdf403073fdcf89094c8216a v7-3-100
-+35effbd07a25d1df122e795165d26ceb65510c3a v7-2-421
-+35f3b20de2dd2c821675c61a11f4b227d31e9cdd v7-1-102
-+36071a92cb764412276e067fed099164b0170436 v7-0167
-+36275e20d997b91a357433debf8fbac0885768a0 v7-1-051
-+3686831cf3da094c66ca4d2ab2c671d3d2e2d497 v7-0166
-+3709cf52b9b56befb1c7a98e5f58cf39d16cf953 v7-0119
-+371201c6b4c1538b593b5dc72f36c79a1f2644de v7-1-327
-+378e33d47ab09cbb564a2aa6e975659a7f742a67 v7-2-250
-+3796d11fde3c141d30cc3446038c20bf280c4b5f v7-1-267
-+37d62d968182826522e378b31b76cf0a8c7a3cb7 v7-3-058
-+389c8abd59258ba5ebc164dc7158a025bfa893a2 v7-0048
-+38d7bf77e55068a5157faac7d871f2f3a66cbfad v7-0226
-+38de872507e1c6440c9252a7bad077ae8c1bd488 v7-1-280
-+396a9b65abe6a8fd08a6c232b443d541717cad0e v7-1-121
-+39aaf0cc59e83148991c7482fa82d2bc29129d3a v7-0-150
-+39d115408c71e1bf72439d5a92d98c8e551a5750 v7-0-186
-+39ebe9e88854b766c569529a96dac3b67aba0e65 v7-0165
-+3a6ba07b3b9fa89e94e002d44f57f5378eb59f08 v7-1-302
-+3a779b47f235a62d799147b25445b01866f7c0dd v7-0223
-+3acbcd0d3fd3d81ce94a40af4510fcc2e7870a82 v7-1-317
-+3adc6dd2d122c76a211d88769227e447e4f8f821 v7-3-136
-+3ae106044109e65b5bce1ea8938e0658729349ed v7-1-008
-+3af28ecf9e56315a8617b2c58da078b6df989f2c v7-2-122
-+3af484dca921e30a0bb1e4975a4fb214c3911f94 v7-2-150
-+3b1d692e5a2c3053fa066d202ffc0b51779d2c71 v7-0040
-+3b226f4693dc8dd1fb8886221335c39a64bb1fa9 v7-1-207
-+3b241fd8d7c09d7a93694a0abcdc283dcd6b4675 v7-2-441
-+3b48421dbde112f3a6dae67a651a9f114d85c874 v7-1-301
-+3b705e71c7b07ba1309d08a8b370ae8ad3fc17cd v7-0124
-+3ba373b54370d830e3fda93eee83e3f0b1ea2a0b v7-0008
-+3bfd2e1e2609c8470c5b4f75184b66e5a4d8faef v7-1-053
-+3c17132458a1538d3f1d6ab00544df8069bd983d v7-1-208
-+3c17f4d2196f2f280de13a417652529c417548ff v7-0-028
-+3c251a30c8cc44946e5871a7073d88ce195874cd v7-1-325
-+3c6417b7e6efed4cb13673383489efb47399a902 v7-2b-027
-+3c838658fc357dc48e457bdbc1f5a63ae5a73d19 v7-2-257
-+3cd88bdcd97d7d0a3e2f5a00a6627f00970ce5b9 v7-0-045
-+3cdf2a653e005387c4deeceb7281d62fffd34687 v7-2-391
-+3d698caa5dfc7b11c8a6ada5f57e75c7a6a117dc v7-1-064
-+3d842a9e2baefc023d9e4f163ea138b9e29931e8 v7-0-051
-+3dc6072e0a25f24ad5d888af77d858036a9185f1 v7-0-083
-+3dd986bfef63bd08894294a0828a1bca737320e1 v7-2-181
-+3dfff6a80088c921b391d493c6c1231e4e64a656 v7-2-217
-+3e0f9984e98e8f020260ff015cc994ccc34059a9 v7-1-111
-+3e7d17e425b0f58513002797b3310e722757893f v7-0044
-+3ea3dcbf2cd6e5ddb9d827c60ce999b2e4a5e755 v7-3-108
-+3eb34a777f49f7f656b32c8db829fd0b153abe23 v7-2-220
-+3ee6db0a746e990164e288fed6344e519a5bd1d2 v7-0083
-+3ee896333e3eebba8a5e10e04649f1bd20e98770 v7-1-290
-+3f1b2e6496debe5ee3068d1916ea15926d5a0f99 v7-2-252
-+3f44e9abe4ec65f797cbd12f1d46bd08eb48c2ef v7-0015
-+3f661e42f262e7839e2f04c50a447c53f6c4214c v7-2-228
-+3f8cf4c668c30ec99289b5683f4fd36a1df602fa v7-0-115
-+3fc0f57ecb91686b33630dcac973ab9d7db31c6e v7-0001
-+3ffdc64af1e53617586ad0cf14e039cb6f1cad34 v7-0120
-+404aac550f357223e7bab3656343827f641d9f74 v7-0017
-+40a0699b6c62f93e58ae233fcdfd395bbc1bc80f v7-0046
-+40a8e388692b53d36104e9c9b6ed351c01707308 v7-2-241
-+40aa7ae37901ce256da18bcc84dc5ee21f83829a v7-1-149
-+40f2a904bffbbe8fb600089d1b04f1115a2a4a71 v7-1-115
-+4102fb4ea78127b1a95b2df3274a55d9bfba68c2 v7-0002
-+410fa1a31baff929c7876be744142723c1573c75 v7-0023
-+417c04135ca2ec03b6357404b62761ca9453cdba v7-3-137
-+417c4d78a09c07162879dfb79e25e672e6e9218d v7-1-043
-+41ab6b381572fcef699480ffb759d3c4543f0dd0 v7-0-128
-+41d8447a84570ca22fe07277a2f8e9db694f66f0 v7-2-236
-+41f9fd58cf132788bde73ab1954cb987521e3bd2 v7-0019
-+421a77b136c2bec5d2056a799e2fa8021178beda v7-2-002
-+4238b697bfff46433c49d60cc20b43761ab3c128 v7-1-097
-+4256f76f72668271d9d986cc3736eb188b4400a4 v7-0-080
-+4269a0673478b966f8d0e08b5681ea0cf2acd68d v7-2-432
-+42ac369bd824634488b569ec5516fc435b700be8 v7-2-070
-+42cafbf4b6e81160c26fc99148eb333aab5d2f96 v7-3-110
-+430793c2a2315e1d0ed2de460071eb83a4f9c97f v7-2-319
-+430f555d7d152cfa5b7dc43b8b8b0dfa0d520520 v7-2-195
-+431ebc9412a816440aaed887a3d318deb08c6407 v7-2-418
-+43243f7ce351aecf1f41932a9d02d6723fe49e34 v7-3-128
-+4353593fc2c07753d40f71998688985cf96689d3 v7-1-244
-+437fb19625c9e24e2157563cf0a55aeb432b2990 v7-1-275
-+439f44b874a731461a187dc720edc0c663ab47b2 v7-2-291
-+43a60ac87145f10d827e08b02c8241b359697740 v7-2-263
-+43bf0bcf2110ffd8d42f0ea9b1469b1024def86c v7-0115
-+43d337097e4ceffd268685809aa1e8e0f2a2dbec v7-2-223
-+441f938ea9e90e07a05e55fef17ab22d2607f5f3 v7-0192
-+4483ee552619492639c69f4345d6554b7bcbef2b v7-2-355
-+44c01fae1181944162c94bfba919ac9867ceec40 v7-2-160
-+44fe912b5a1b3961c7bdfbd2a8277d38eeed1e77 v7-2-145
-+451bed7e9572b45d2bc98bb5c6680e7bdf4a3fc3 v7-2-321
-+4541e06d4fb9dd8b69a7ab43653c72022f95151f v7-1-323
-+4549e0e7fbb661089184c7b0ba1888cb6564ef2c v7-3-076
-+454d71a434176e2d1ce0c2a7d47bfe2583a5069c v7-1-037
-+456ae41254c975189c55a6ad28b1255936c847fb v7-2-159
-+4577899b8ff1548f3f03e6516715087c9aa15e6e v7-2c-003
-+45898756e0598f357776ae5aa05d717a7017e0cc v7-1-105
-+4589d1792c036e15d1f9e72c0252fb243aa6d5e4 v7-2-094
-+45ba31f9ba0cad526601d1d15d4e05180967133f v7-1-127
-+45bae37de0373ed58d6f4ed8721d594ae322782d v7-1-031
-+45d9e2f80fe18c663346a2e88409bf2476e874cd v7-2-061
-+45fe7cf4a89e3963ed9c0d6a34600dcff8de3f9f v7-0-176
-+463e25d28b334622df784faea456a98ddbc0b5ce v7-1
-+464da5b48d277d1052e3c211000717947fa13da6 v7-3-130
-+469c42f90fda78344dd4b33e7c0dd0860b777939 v7-1-030
-+46d39f2eff86c940486c2da466283d7526b98c9e v7-0027
-+476336a5ae9588c4a13721b5ec1cd792fa44ea2c v7-2-404
-+4772a5e3f9fa652baa1cb6d5295d60daeef6ef0b v7-0138
-+47a0dcad7216bfe602a2ee241df60bfc41c04979 v7-3-120
-+4842e7421b5207294cc90f7e2d2d18c24e65753c v7-2b-024
-+4845822f6a6c21860e0a1b4627996d745d455da2 v7-1-213
-+484987f8e04c44e19e1ef2f3f6864b4c6fe61f1c v7-2-118
-+4869457735a9133c39202f797a6694301c41abc5 v7-2-290
-+48775ea99f249b75872e9f0268c5bda8cb8af8da v7-0-007
-+48b22e2eb1ed7782c4dfb90051b64d6614fc6d3b v7-1-185
-+48c9c2bf59afb140dfae3f4b7182ca410e72cb25 v7-0060
-+49b5a7f186aae9fdd9b633037e8da484c61c55bf v7-1-002
-+4a317df1696281eaee0e54b5c1636186290863a3 v7-1-298
-+4a4287c09953fff6a65f7324c5f223f7359c46f2 v7-2-390
-+4a4b16c67c62174b3b66848a32f4e5554b9cf6c0 v7-0-183
-+4a6554fb0483f5cab10876ff0d9a0e92a9787119 v7-0-161
-+4a7320e53f32e1f6d60c498d870e6c4b8c7acc35 v7-0126
-+4a79d6d376f0897e3a899ccb104a324a94bb846c v7-0c02
-+4aa4510d548c9fff9d8317977e3801a68fe2aaba v7-2-341
-+4ac0c84d1c5038d0f6171c68d9c58ef0fefd4226 v7-3-079
-+4ac1dce8dd5e8d8e97e3e7b921f3ada9db2fe2de v7-0012
-+4b8583e82cb8875d14ff928db281aea8145d0b0d v7-0201
-+4b9fef49d7ff02cf781d26d5b85a0a03c8784fd8 v7-0095
-+4bac29d27e2f4c2779ecb72a5e78cd4a65cb455e v7-0
-+4bac7ed34007ad41b7870888c739c1b4a129cfc3 v7-2-368
-+4bc81d4dc6be1c45e41f1b083ad7fc07c58d840c v7-0-142
-+4be6da0fa3d9978434273d3abc021d7e68455864 v7-2-400
-+4c02214d1465ac2b014a9a1096927ad04eb710e8 v7-2-200
-+4c41f0da2a2e35b42334d091130440d1b1479e7b v7-2-324
-+4c70a10ce2bb6d83a4cbf3e3baab19d1752f2230 v7-1-042
-+4c7cf05f60b5885e1a5caadb787cc6e290d7ee34 v7-2-110
-+4c8008ab94d8da38529991004a56e65547faed15 v7-2-431
-+4c8b90b7a94a123db784dea518f3c9a3bdfe85c4 v7-0-221
-+4ca6669af2cdc06f39d77bfef82663e5bbdedd56 v7-2-046
-+4ce0a7e4c6b3a305419590c746d2a11040fb2b92 v7-1-036
-+4d53c2a2af94cf7a657d85e27f891b2d53b698c3 v7-0054
-+4dccbe792a5e00c40a6e5b4f9e74d20b5aed2c50 v7-1-057
-+4dd75cfd946f31e81eaa4b03ec81ef141c562137 v7-1-071
-+4e22214f84640bdfbad591ec2da5eef9bc328dc5 v7-2-409
-+4e581f1b08dac0b7f9345bd51b03a5fdbdd49ddc v7-1-281
-+4ec11bb387a559fb6168fdae70e7d0ad78e15c3a v7-2-372
-+4ec4c53046b5be6700810b9b92996a0cfb4ed52a v7-0-021
-+4ee809acd1ab9c2fadee72e0fae32de57040447b v7-1-124
-+4f1130893a1c135b1200f6857bd0ebfb143350e1 v7-1-320
-+4f1b94b51e99370161ceb5a923573772ca068582 v7-0b02
-+4f3857aa17853ab6c36005520ae723af92f50b9e v7-2-264
-+4fb859cd9ba955957ad712ea390e87cffec6a540 v7-0-072
-+4fe8e1a7758ea8170eaa4b1abf11cc9682437cbe v7-0102
-+501b107b335af7ffcffea060c38f4b34dafe4101 v7-2-012
-+5027d3220e2adb2f2f54e85f469a7b4302a010da v7-1-308
-+5044d9d784ed2958022fd3446910567a4b84dacc v7-0-154
-+509230ed2036945be2d9db7e1ecded3c59518c2d v7-0g05
-+5098908178cdede4656e3f96f2df2847573e6ed9 v7-2-050
-+50a93218720458be104f03ce1be00bcc8b898eb9 v7-0-228
-+50e0337c25cae29dd3e63b333d4bfb68cc9b3740 v7-1-239
-+50f5ac5b90dedfc7f88a67d7a435014e07c298ca v7-1-094
-+5117153003bdb002aa3e68d3b90a98a973d38078 v7-0e
-+513866ffe6af0bcc09e7275c0e9130170de66acb v7-0200
-+513d037fad505a5169add3116ae459bd1adac381 v7-0154
-+5232b9862f238a2a109f15527825e5cac1668a04 v7-2-000
-+5232b9862f238a2a109f15527825e5cac1668a04 v7-2-080
-+529c6a431ff5d5612bfba4424c023dcf073c2cc1 v7-0-056
-+52c87a746f4ab8397933a53388389aba6a16bdd3 v7-0181
-+52d17d53b555c45b0b9f4ddaf3551bc8ad5623ce v7-0d05
-+52e76e2b5b65eae81c4ea93d290194763d7edcd7 v7-0140
-+53175322ef40dd7f50dc4153e6e6fb530a4b2b29 v7-0070
-+5332dd13733cd57e814b7e21cb577f6ad0c15408 v7-0094
-+537cb92935b690665a72f2b31dead8d9b322dcb1 v7-0-223
-+538cd3220874d9a98abc7219e7be6666e49f853b v7-3-011
-+539d9b8f418aeeeac3d0da1932e1cdbe709456a1 v7-1-265
-+53b2bedccfdf5ab8cbff6c3fb1f6f83ac7112b85 v7-1-091
-+53b47a10825a20cd7684046146393a641d89972f v7-2-163
-+53d475dff0e363bfeb31d6d171337cb19c309098 v7-2-374
-+53fd0a213cff86b7185c5391cef34c1265f8b8f5 v7-0-237
-+54a6b47d473e64d7ae5212f00b8b125c721d2c41 v7-1-160
-+54d5eb36689f1a409d13cd6ff9b06d68a30b0d48 v7-2-092
-+553c97222cc0d0adb7beecd6f73be1c512f2f37c v7-2b-005
-+55e117ed68724567167ed25bfb5a320585f1bb5c v7-1-075
-+563bd9a63fdcb08d55b6f6087cc8ededd31b891d v7-2-010
-+56609cdae088c4d5b38ac94a95a07f1520b56fcc v7-0-059
-+56695f1182f01d75843d0433484c94c1eade71de v7-0-238
-+56b638f2029e728f1fb20382a7184a8e4ebdce9f v7-3-018
-+56ecdb792c3353d9fc587a515fa4991e69363dd5 v7-3-036
-+56fb4ab9f62f19b9812d483aa76f8b53104db26e v7-1-225
-+575dacb554d8b134356fae0135383d5e2231113f v7-0096
-+58059676e24a6fbbc686faf84c612cfa8c25485d v7-0-134
-+5858c00d0f2c47b395e3c63cc809ee667f8c02a4 v7-0-122
-+5898cc36322e7f1dc371e89dfb5e2ffc3c6c6e3e v7-1-309
-+58a14bafc1f08b9712732a26a44c2a93e34e6ae2 v7-1-209
-+58cad056e60844274b103ff3fdb56d7a6749b121 v7-2a-00
-+58f47e17ba1565ec9c538c7f216cb9ea66e58a63 v7-3-122
-+594f25e4a8065bcb865784556adf556004bddb24 v7-0144
-+5950b03fc906f434d5a1b899bcee8ff839b05a34 v7-2-020
-+59edc8429da0ca92da8913823f56b219e3a99051 v7-2-065
-+59fd8376545beba122700d5a481793f29ff0a69e v7-0058
-+5a1d8468d1fad7189c8c781149f034dbb4208b39 v7-0-224
-+5a1d8468d1fad7189c8c781149f034dbb4208b39 v7-0-225
-+5a1fe35a6eafb1c994955a34d8152996d53838e3 v7-3-092
-+5a7384b9ca6691ee880dd4e01dddcba5dcac4f6d v7-2-031
-+5a7843c57316c63d1118b6a5c2f42d330e57183b v7-0e02
-+5a84b6388a5589d6f3b53a1aa6f8fcc369989a0e v7-2-369
-+5a97d0c03b593699d6e0bb2ea49073dca03153f8 v7-2-397
-+5abd3e3c0085de46b37ac9bcee90be8160dccafe v7-2-363
-+5b101ff9d4c43c566e7adfb0a7c0978d2150d741 v7-0203
-+5b154df6fcd89b4d24d34da63626cc01d9b5c0c2 v7-3-033
-+5b43a3a9454ad69432d5cc82b70d59ec6c92a45a v7-2-003
-+5ba8e25f7fc159a684a965ea9e6626f62b76997c v7-1-188
-+5bbc2d6658adb0dd3c67dd80c59f3a7ade3ba3d6 v7-2a-013
-+5bedef935ce38062e866c72aec633d38d95dfbf2 v7-2-357
-+5c3844ad7d5677953eac88ec4ee317b298812bce v7-2a-017
-+5c4b2fc4f067cd04bed4fd0a13bdec7d26036d26 v7-3-049
-+5c6a3e894d43ed024662462cf5c6f77feb743132 v7-2-288
-+5c6fa259c9236cfacc66dfeade89414479b5aa58 v7-2-328
-+5d1ca05fa8ffd87bf59d26121e6cff5f91e9afd4 v7-2-199
-+5d25cdc3c3f31d4893f646d5e7b94435ef59aa5e v7-2b-003
-+5d2f6d04c82f900b01c18a7bcf2287a42cf09ffb v7-2-253
-+5d5a41a95347bf4a1382babc697a1f940a83e43c v7-0-227
-+5d5cad78a8380735abb8ca0e7d3ffb11e9eb98e6 v7-2-300
-+5d84650b569c7800de8012d91660441bda95e5c0 v7-2-108
-+5df74a812b7b20bd7e33634453c645be0eb8a2c4 v7-3-012
-+5e0c164fc1c25fdfcef07fc03c6634216e6ac066 v7-2-277
-+5e168526af25c0a59c55dd009e10a63d2f156114 v7-0-033
-+5e225f973b5d22208869bfbf151c5fd03b5a3451 v7-2-089
-+5e75d07bfe75fc81e0dac043b6bc0ba417736b17 v7-1-293
-+5ea1f7516c2cb92422abed07129357a0d5a6a787 v7-2-165
-+5eb1ac6f92ad40da9bbb585f5ff8fe003e85122c v7-1b
-+5ed9395c1864269b18ffad462291eb37c92792f0 v7-2-235
-+5ef53a1677ee9c831d7a18ee44d1041f182a82b2 v7-1-099
-+5f0c7aae4da272c73cfc625f35dc050897b6afe7 v7-1-330
-+5f33b64a6694dbc2c167b86c56488ddeeb7f46c5 v7-0107
-+5fafc42c22d246e4dcef5c09d70b757e0d374b2c v7-2-053
-+5fbc411a611de301397bf4f8edf494fe07bcf6f8 v7-3-042
-+5fd44cf99b6ddccdadcf70ff8351999e4bf5dc38 v7-2-398
-+605f5c2f77bace46037afea6841f7876af85a4b4 v7-2-182
-+607cff4bc0cbd7ddf84007a20bf3e6bb01e70694 v7-0088
-+60d21d224d251c448ef76b1b9df087497c06adf4 v7-1-038
-+613517f0b72a1600d58abeb8c44df9b3de1ac997 v7-2-284
-+61709607f5e26dc1d4cf420a25292ccc857d3575 v7-1-228
-+619b90abfdc95e3b1d0981a8995b942c6a7c3c29 v7-2-032
-+61b50044616bc626b27630b3c9f03322db0ec609 v7-1-090
-+61d080cb268e21cc2275da3a0ff2b2081d97ff51 v7-2-086
-+61e5d40135d0d90f5d1689c469958bb7a37e074f v7-0-139
-+62716fd61fe94fb9e7f39294dfa9dba4aa06fbf8 v7-1-204
-+630eca9496e07d9a778fe87d087832816a01a850 v7-2a-010
-+631143ac4a01c32e465380ba2ab7f82949f20d75 v7-0007
-+63157185aea525b39b1238df3ffbf4ec0fea10b1 v7-2-442
-+63369d73b551cb0b72202c29dfdf59aa6049a333 v7-2-161
-+63613d8d7e4dff96ba2f34be50fa4b002f56cff6 v7-2-354
-+63bf37c1e7a2c323b368df6e926b026139ec3144 v7-2-401
-+6412b0befebc17db58a1e8acbef86d3a3e4f742c v7-2a-007
-+649d340f34d3ccb1c96efa9522a65803575d901c v7-2-067
-+64be6e0b070a5f5f58eddedc8b57dc0356642cd5 v7-0-004
-+64dd70f176c92013bc7efd0f3c50083fe4ca0972 v7-1-021
-+64e2b75e16158d89c4a600bb97a62a4616632884 v7-0-141
-+64ed4359d9570e345dc109b51138c36ac8769614 v7-1-221
-+6510d834609f78327cf78465d6849601bfe39108 v7-2-380
-+652d074e0264f453cbf76df0ce041b5032504085 v7-0-048
-+656853d9c014add434086291b7af40ad828f126a v7-0-111
-+656b4c052203990d56ca731d2e3ca39ebd9bd775 v7-2-029
-+656ca7102064d711eed5cc678b4a5cf03b5d9c05 v7-2-026
-+656e652c6579a812d9f48a0e5e4d8ee47ebc1a35 v7-3-068
-+65c332f15dbf3376ed5aeea423e8f1584a65ff29 v7-2-083
-+65e0c2e3a3521c9782728f307ced58a5740d87ac v7-0-166
-+65fa3b16f040f5320bad34c324f230099bfd8f0c v7-0222
-+6605dca2960f5c597f981c60cd3009e98b173883 v7-2-178
-+66080ac5dab745208cfd8f385faea24ed68be68c v7-0130
-+66263e241ce35e11faf9b33ef6e2d509e1ada4eb v7-0176
-+6632670ff6fc2bd4dbe01001086874b9f75b0929 v7-0-053
-+66475621f0bfacb601f38c15625c15c2a478e672 v7-0147
-+6675076019ae7e7444c526b342c91ae2ef6cfaac v7-0d
-+66b1822ba176a2f7d7e2878b2907af6d86e5b5c8 v7-2-326
-+66ddf49935fb8979def275bcf7c56acdfac7ef6d v7-1-015
-+66e40876590bca973973b6aae208a14cb428c266 v7-1-007
-+680834cb19eb2dfdc88aded4bfb36518ca4caa60 v7-2-022
-+684ea86baabb6ead7b673d20de6f4b5b27a3335d v7-2-101
-+68f00510705229a9b8653612b806dbbcccd5aebf v7-2a-001
-+694e8715dce6af134be79c99e97f90786088078f v7-1-316
-+6974b167d75eabdf70005f666e3dd0e82e47be4e v7-1-056
-+697dec8ec5e723ae32e12229d3ca111fe7f4ba92 v7-0-037
-+69bcc0c891d706d3383f013e9e5f8876b6c76d4f v7-1-158
-+69e8006af73433fa27ecf32b695919bd665be1c6 v7-0212
-+6a2e4860134bf0e4b5edf382627809dc6cec309c v7-3-091
-+6a80537ac7aa6d4c9011edf4db84a6aea85d2911 v7-3-041
-+6a85219723b98ddd686d1a80c481a545bcb535d8 v7-3-027
-+6aea606c9e911f768a5e6c9626581721f460f756 v7-2-068
-+6b5d641bcdd45e53c24e0b4e0b6085a696e336a8 v7-2-395
-+6b89fd4ffcc698278ecc582280c79916a425498b v7-0-008
-+6ba0265d1f1b70b8a4a2b3337b18ded763f58f09 v7-2-295
-+6bb1fa855dc91259d295a1beeb4144aa51b3cab6 v7-0e03
-+6c05b5e5c1be4ee9b8f96334b7fba7afa832524e v7-3-032
-+6c3c2e464a9628bcbfe21317b8fd90ae27076735 v7-2-392
-+6c4da3e24371945408401d6330a930d44cb5d716 v7-0-232
-+6c62b9b939bd8f3df4ec59b2c2d72bbbecc723d8 v7-0093
-+6c7719f94811d10db3f86578e5286e5da2fd8514 v7-2-170
-+6cc8a093e4a9b14df444effaef7274d2318d00d1 v7-3-115
-+6d421b3c485b2da5a04529c6b71041031d41b80c v7-1-046
-+6d80dbca8501a4152908713778ce03e0f45b93f3 v7-3-118
-+6d95d8976b00540c053d11fff36e20556d125152 v7-1-200
-+6ddd55ac6ce50b94713303278888da04d21f489f v7-2-249
-+6df4e719ce4eb637d6db90febd0d1eb48bf8e96a v7-1-112
-+6e03ee418b50de776b583358fe2ba20bbaf043ad v7-0-137
-+6e9c10c63e25ce9212c5d629c9fdb60b67e6658a v7-2-216
-+6ed4a82fcfc6f1c354906dfaa5e13a192b3246a9 v7-2-175
-+6edf4a4f6cac62dd123f7d1017a7624c9f48e71c v7-0110
-+6ee9d7fa5df6d00c892f7e93a63435de5c50e083 v7-3-057
-+6f12c4eae4f69d1379427e8b0cee82769f75c35d v7-2-153
-+6f4740f72d3d2018bfb19d4c8d8064e3682fd883 v7-3-090
-+6f8b578776ab0204bf16f669383aefb0661610f0 v7-0131
-+6fdbaf2bba0459270702479d6c4cd04f4f6bc034 v7-1-098
-+7002404b17b15ea37887cb1dd5b5b95883cdd27f v7-3-054
-+7015ddf8105575fcf48eac35b14c61a24fc38d7f v7-2b-018
-+7033303ea0c065c16d5fc31d485c949f7949c10b v7-0089
-+70661384379a0dd305576f64554608a396b0821f v7-2-056
-+70a5e723eea2c648aa82f7c8f28a2a5dd5429132 v7-2-213
-+70c67b1bb1f1aeddc1dea55438e11ae6f9ca3d14 v7-2-329
-+710b52d02c4a0649d5b20c38e3394a2e248be9f5 v7-1-237
-+710da9abc3c1191eec6633477eea663fada04939 v7-2-317
-+71219f47ccd9551fc7d090e73afb83cc395232d8 v7-3-025
-+717e759932cb94af9ee8dc9e93f33b67f292e8c1 v7-1-217
-+71bd485d8fa572ac15207c5c1059b2ad0ae685fc v7-1-166
-+71db8539b8c487eef0df17f2069d96fea1911cf1 v7-1-268
-+71eaeb69efe49baf0f63c6e9cebde1aade638ccf v7-2-007
-+7209e03df1005fc037c029799b068f545b60433d v7-2-075
-+720a59d79bcd3d606bb9837492295d0c52835500 v7-2-168
-+721ebb602db0fd2a5a9cded8e0830800d734469a v7-0-135
-+727ab557c58a3257743a8b7589d91e21975b54ea v7-0-102
-+7281a86ae640e65e5eff6d6b565be20032f736b3 v7-1-016
-+72ef7987368de4715599707a85f74a8e6d029c9c v7-2-139
-+730697e82c43a8bc8b5975bea39fd180fb62a4be v7-2-091
-+7317e0e2775877fa0b817e20d29de9eba1a4f95d v7-2-254
-+732c7ae5743ec2d22423a8bb631e2d3c5fb8e549 v7-0180
-+73354c21f1e40dc792e5829152992e76f7a607ee v7-0066
-+734d5bdae499eb2fa3f818e843efd9727e7f69f3 v7-2-041
-+7387540b6e52e3faad6c78182de9d1354ac9e6b4 v7-1-297
-+73995e7c06e668b3eafc366b3c959d32f6bc00e7 v7-1-174
-+73c0eeeee0b789738812c1cf821de3f86e1fee53 v7-0-174
-+73c5752b957d49da8312ef87383a7368c78df74c v7-1-295
-+73d947c20291fd857fba24ddf4725b9b831188eb v7-3-038
-+73dd10c18ec4eb2cc0857417fb8cc20f63dd42e1 v7-3-060
-+73f10d8124f48510e0ad1468ee9e29c010009621 v7-0136
-+7472c565592a373abca2ea571e229b4bcbfd7b15 v7-0117
-+74e9d19831c2357d7b998f484ebc609dbc08c5e4 v7-0081
-+7557b6ea0fb14ba4e97f5a8a04438db30cf902bb v7-0030
-+758822790b43d2fc184878c3a50a12d71dda794e v7-3-031
-+75a69023117c516ca184ed479727f105af12cc39 v7-2-221
-+75a89c7c204e0f478f480598cc3f2a8c45dee8b3 v7-3-059
-+75ab683fdb50e83cb9037454f5dd8d602e08e4c1 v7-1-233
-+75b3f9cc19da44ef65c962deb7a6049c305f49d4 v7-2-283
-+75c88515e0db5fd6f88a05634d9abd22795aacbd v7-1-214
-+75dbeedddaa9b0e0784c4d23d71de713a533c5b4 v7-2b-016
-+75f5889a5d8e8272fd17a104ef148776f9133aa8 v7-1-260
-+763272b18e4ffe717ebb58827315badc09824e86 v7-3-098
-+76406c9cbbaa1ab6a8f6ca7f079c3ba8cf06e2ca v7-1-176
-+7644c80ca87b75a7dd85a7b4089e74bf5c503f3c v7-0-089
-+766918de9e3a76816ebdee3b90cdb1f9f76bca6a v7-3-004
-+76985a406456362dbdb4e7e4bef67656b84de965 v7-1-240
-+76a42a81f68505f7b99af53a919e3cc7895096b6 v7-1-087
-+76c2b2dd25c9c6945489a1c636f7e375ef1f40d0 v7-1-033
-+77310929a1f94745e3d49f0cf1a6908785d3cfb0 v7-1-151
-+777d5460622d4a9aac084695524d0c85b39f4174 v7-0-164
-+7781fcd2b74f26a37da0d1186a1c44d904a8f11f v7-2-011
-+77f3dd990b12aa963aa0a63f0db50f6443f3f41d v7-3-119
-+77f8a648d2e6c765329ee6544bd8716835bda3bb v7-0-062
-+78b9d5dce950b348235ee667f8573c6592920088 v7-2-420
-+78e032bb32605c1437e30f7ec3215ad4c0772dd5 v7-2-303
-+799c1db62b42a7c9d504c45ed313910c2e3d169b v7-1-164
-+79a23c19108a8b1eb9d1b97d5844fabee6525e23 v7-1-079
-+79b395ba0ea5e2bc7d27ace528d84d47aa1f5a66 v7-2-311
-+79b8d69a4588b93516410e519bb9459242f46d81 v7-2-340
-+79bba9e6af2b6588349ac2b3e9fb722d6ecbdc85 v7-1-224
-+79d111ea8ef64e7bab0a5e27b7d5903f10e45a43 v7-2-425
-+7a4ad3fb109d42f37f82664390f128dc9b7e44bd v7-2-188
-+7aee5e68548a7cd13c74e67439f8c3b8ae6327be v7-2-417
-+7b0e89b77216baf928145ce14741650806004c31 v7-2-365
-+7b258a166daa98eb01237988ec954895a2e6ff0e v7-2-018
-+7b44c70ee8ab87d5265ebec758a6f5ea9d5cfa75 v7-3-104
-+7b875bfb39b871d5d40525d579e30358bab6be1a v7-2-434
-+7bc38b35f1e87c1749f157ef91b6cab86bfd9561 v7-0-026
-+7bcd81b96e2abb28ffb000145c917bd05e88e5c5 v7-2-267
-+7c28790fa8b4054bdde6d358a9132581de76df62 v7-0-009
-+7c2e6ba1d702579761d7ddc4020797bbc97805e3 v7-3-008
-+7c3302e07dd7cf0d746776234ed4e9cb376d3611 v7-2-023
-+7c46737918cb0adc9a51849b75b1c03da7bd77f3 v7-3-117
-+7caa503b63a9b193f3b9e016a0a466ff8065f2f0 v7-2-225
-+7d121c69f540272878af6fafdf658443360a698b v7-2-383
-+7d127d580b6d2d86853fc0a322323cdee2eca343 v7-1-318
-+7d2641e6af75b3cfb4dc29e7c88812dee6c003ae v7-2-261
-+7d29124f77f5e794008c746c69a0f79da0cd966a v7-0-133
-+7df2d171ef1c1284e10a4c53fb079d02e6d7b028 v7-0-163
-+7e0c8a18c915a4c7dccf01be813488e27d03fdc5 v7-2-275
-+7e5284f58094dd557b1502e1536c78846a59049c v7-1-134
-+7e6d264ec0a270beb9692df71fedb210c1896640 v7-0141
-+7e7da11555d27f62984297f3e1debc8242baf995 v7-1-080
-+7f01e52cc97aca6eff92948b67876e800eb67fc3 v7-0-171
-+7f2d3b3c15a2ffbd259c2ee99966124c2c2087ee v7-0122
-+7f788cd2741586586a34b41627a1c978fa465666 v7-0020
-+7fd70926e2e1c299ecd9dff6ddfb51ef71f7f08b v7-0055
-+7fe13e0f5dce15cd16dd61c898e63899a9aff561 v7-0175
-+7ff9f75f9c59f7b600ada6ac4b3234398df5f38f v7-2-245
-+801d5544828215bf644cbc6ababfc66beec6cb2d v7-1-195
-+802898d3afd12da41c305c495b121e41ed880659 v7-2-214
-+80b9076e9e177bbcb455eef9928283077ed1c861 v7-1-310
-+80e5b1da667656a146cad7a749ac9fd2afb659bb v7-2-231
-+81059e8b657d911c9876f557975f34624988624f v7-2b-015
-+811f29447aea27adaf1f54879ddf0fbd05a1e094 v7-1-270
-+813a407a63af8773c585b0baae4d22296503ac03 v7-2-271
-+8173ec1e9f1f746657dd598b6e876b11c99e1049 v7-0034
-+819d952a0a5cc810c52b34e8df400f83eb3353ce v7-2-142
-+81cf1b6e0a2d59192534f884135108f788a20b91 v7-0-147
-+81fe2ccc1207699c377b42f1d8ca426a70177afd v7-0179
-+823e9ddf23f77858f1b866fadf3e4ec5ae5d55b8 v7-2-141
-+826f00fef9e338c7afebef68658716bb0aab62f4 v7-1-096
-+8272535dee77ded630f57073b428e89673f1ee45 v7-2-035
-+82885ffcad10aaf6d11170dc45d2721ee222c37c v7-2-310
-+82add1e7c154fbbd5926df49fd4afe768e6007db v7-1-013
-+82b2594be40863fef91c163200db2f56b2e4e52b v7-0-155
-+82ca8ff21fd7181e16dcc58863d0d251b9228374 v7-0-175
-+82f866f19e91a19ae44e7dbe5eb8747e98acfd85 v7-2-269
-+8389197c91f3ecaaf28b776e69b9336eb08828d3 v7-2-133
-+83a006f81bac04bf9b975347bf8d6bddc7996eb6 v7-0199
-+83a126db2895ba22f2fff13b488f028ff83bec28 v7-2-027
-+83eda510dbc07b4fe4db5b5f324680f60c307fff v7-0-222
-+843bfffb04c739ec456e5c5f612c6d025f2a6188 v7-1-058
-+8464d084fa7475830cdc53529cd20f7334c81232 v7-3-095
-+8531f7ee366297c58506f9a3130f45c350ce1fe5 v7-0-218
-+8562c6804861cd26020e1a004edb1c1b218af9f2 v7-2-388
-+85a99ba3eb5ab45127c996c4e7b4dea2e7a76c54 v7-2-233
-+85ad197907065fd92f29bf3dcc190779a20aba46 v7-2-396
-+85da0376313011aa957a9132df2686c9aba079d0 v7-2-333
-+86079b930b3e8735933c9349e44184761bbf56b0 v7-1-010
-+862863033fddf5f0bb2f18988b79bbe0d289ba45 v7-0158
-+86289e90a4bbb818e9cf8bae6e57f7b91b9671cc v7-0-123
-+862d920800b1a8a5ebca3e7db5dbe431982f7d0d v7-3-103
-+8647018a15f3e4e89c706b6290ab0151565f394a v7-0-178
-+869c92bcfb697875d5580fdf3a13eacd5648c5f3 v7-0085
-+86ce35c9750f60054f48c1bfb80507345b862d8f v7-0231
-+86d71ae0c85a546d4a00b53481b540a4ade2c9bd v7-0042
-+871231399cf547112a50a9f93497d40d01b66d51 v7-1-118
-+87401adbf5fcbc6fb8edf329290c445528266bc5 v7-1-067
-+87a777aea8993a49e61394e7a84847e91b014090 v7-1-005
-+87ac4be389523f44914899c37180d22b60757ffa v7-0128
-+87b6a6a065ab60f6ca4ed094c2afafe16e0b590e v7-2-171
-+87b9f21264a79be4ecfd14f69da0577f9d41f260 v7-1-247
-+88095f75d63b5a486f603cf28801df0118ed1218 v7-3-015
-+880ece6b24762edd52b414aa1f005478707a3179 v7-1-101
-+882b2fa49a2a888a8231f3cf2428b91439decb93 v7-0-014
-+888c0645d64f3a844b22525387981f17317d8502 v7-1-069
-+88c0c6c9eadab09b029312433f246f65e216a1f0 v7-1-184
-+88c68e59d39cee12c580f1df72a5759e58574978 v7-1-088
-+89189f7aaad9c28435aa5cbd4db359ae54d0769e v7-2-312
-+89300f5e013c7d217d5f891113a57705cdeb017c v7-2-414
-+8978513bb5e31d3f20c941e5141d228ca95a6f58 v7-2-100
-+89d1e8ed6c1d6d9a672880fc73df97486b2d5966 v7-2-227
-+89dc68c0ab6fd676ade26cca39e16b81896a5069 v7-2-386
-+8a0a8f10b43e02d44ff26d608cd80fb61ce4773d v7-2-356
-+8a2092b558c2fc11605dded24c4c5a817ca92ac9 v7-2-443
-+8a22a90c964a168cf3d93f5ff8d5c531a4327ea6 v7-1-229
-+8a5a95f7ef2a7dfeb585d0392489fb57ea4c5af9 v7-0185
-+8a6982d59d8ef4afa5c178d772bd2943665f0146 v7-0224
-+8a6c67218fccfc536fdf829075e99549fb8247dd v7-1-173
-+8aa3cd045aefc5d324d820f2239ca1f533e9632f v7-2-379
-+8aa94f8080bdeb8908de30bbcf62945dabba1aa3 v7-3-022
-+8abc0abf8cbd09abaab555fbbaedbbc231d42b41 v7-1-248
-+8ac6392acb0a87a779340f949e280bafcc49f55b v7-1-136
-+8ae24f338cab86cb35fd495ddc3cbe2101ae1558 v7-0217
-+8ae4de2d02af315b1c0abc2230c3ccd5a31f1013 v7-2-384
-+8b2e9257cc116bf30b755aeb37a742ac83f5da42 v7-1-152
-+8b84fe17e147219e6ff181f6bd7e809e5116588c v7-0159
-+8bebcabccc2c430f05c5d85f8532adccb18a6136 v7-0e01
-+8c229eb52e347be77c76c1c2c96f717cbfdba4c5 v7-0099
-+8c25f10d49e7186c9785a0f01612166f20a29298 v7-0028
-+8c60f65311fa6358488f671adc226950c18a993d v7-0052
-+8c8d07318d8d0b1bcfbd395ae7aeec6813725b33 v7-0-086
-+8c9396275bfaf3ba6c759c26fef07c0b687a8abb v7-1-277
-+8ca3c9ad0bee0c265345decd180d971197e36194 v7-2-366
-+8cd72985156286e77ac5d271a13cfb569b29ed76 v7-0g
-+8d09c1eed8a57bb2df53fb1f1747137e5a3489f5 v7-1-074
-+8d1db3e3ac5f3f33dcf5f68ea132502082e787db v7-2-262
-+8d2b705a5a51d2a6756f16dee861dae4ea97101a v7-0113
-+8d34af900baedf0db9a3e57bbf48eeee75068e06 v7-0072
-+8d74df00f7daa4e79bf7fc56164369781408e1be v7-1-262
-+8d8dc7e07999acbfd89d0b646d72fab69e06bef0 v7-1-230
-+8dc36a64ae8b36d124bc0767ccadba3daea943ec v7-1-294
-+8dd456c1e283bf8c85e9ff38994fdfc6dd009ff5 v7-0c13
-+8e2d14a3e7d2860527d39f0b662beade84db9d23 v7-2-352
-+8e42199f51218e2a14a946ee50c1e8d8ef38205c v7-1-054
-+8e5830943bff21c0a2aa18399d18c8269ed9d3f7 v7-0e04
-+8eec9649b7a2ea1a441723ce7a4e8637c294ffbb v7-0064
-+8ef9da918a98e7f8fecb4d88914e4691a8da88b8 v7-2-413
-+8f72e3512b437d2390860bf9fb6605b778cb0346 v7-2-381
-+8fa8d7964cf116fa98895d029808a0d5e1cf201b v7-0073
-+8fafff87aedbcc1a7c71e29a9369056e5c08e84e v7-0-075
-+8fd2e00c44ae10bd9e8a8f5c12db47378314457a v7-0-112
-+8fdc1210333357780019fa8dbabc34f07d545775 v7-3-035
-+8ff7fd162d3cf15129e377401e49f8210d62aee6 v7-0016
-+903088c7a7c61b7f30d35c8a184d90b7af4a44e6 v7-0193
-+9032e466829601e6c56046813d0a9a00946a1d10 v7-0189
-+903fcd726d9058a0b0c14a85cadf31aae3ad27a2 v7-2-359
-+906b37d2f9c3a85fc9c67a29005ad1538e60efcc v7-0056
-+907cf09fbb32d7b189d3372f3c4f1220f198a9d1 v7-2-385
-+9090f866cd57a7febdb2e0679bf0a5e86951e314 v7-0197
-+90ee46d7f4927c095141dd4afa92400f2fe4c697 v7-0164
-+912b18745defca4b03d5738fc7ae6c76d701f2f7 v7-1-143
-+91e7d4a7b3b0e20b6f5bf9468ad17625e745d640 v7-0178
-+91fff9db214e21eeaacd20da86b22629ba6d92cf v7-2-297
-+920a993902e8332e3fd539a54997278364fdbcf3 v7-0062
-+92168cfd558c53f1fb0d8014559f16be0a795171 v7-2-167fix
-+9230c45fdde65ac15a42c39d851c68b248fd6836 v7-2-226
-+92809ecb9a476994296e51001486b3934561fc87 v7-2-292
-+92f3089a7b10dc9e8f5f3c69ab1e490d52ad2f0a v7-0-082
-+932fe018ad166a9f8e4b6b0ae91d562cab7c37db v7-0-168
-+932ff0c0f57bb90d48470b70cc728058e0c56e3e v7-2-173
-+932ff0c0f57bb90d48470b70cc728058e0c56e3e v7-2-176
-+9364d114ed8d089f3a42c910442957d33e5480cc v7-0204
-+9368159253f847f95c6c1f39a894e26fa3c954e8 v7-2b-007
-+93ffa40b532038ad22824047b15c6edec3b6af5a v7-1-155
-+94164a5b0626984b565ae6421c64bfd6d993e162 v7-0-043
-+94694351f592a56f8a379510eb6992ed0dbee821 v7-3-029
-+946f0cbdd535d6fb8915ccc87b837edb15287663 v7-0074
-+94f44da44d2e0874a562918005789418793bb507 v7-2-339
-+951641b8784de5175cadf9fdbc361db2b6b45060 v7-3-102
-+954947a70580c6c5d94bd110f974bdf103dd6fd0 v7-2-166
-+95723058b8ff365843508cfa47a3bc2ecb1b0cf8 v7-0-229
-+9577a28005e10fab0a0cada6c41b96c9a3e1bfe9 v7-2-446
-+95b507e6c9e75d5b4c114a63a98b4bc36c643eea v7-0-145
-+95b659982b7c17ff93304a37f43be8dc508e20dd v7-2-375
-+95dac6af3b3a8f50af24432b7e355ea44ec69f95 v7-0232
-+95dd473d2d28a088822c73309c3dee597c96facd v7-2-044
-+96276cc11d8e68ee320e0f61e20406dcb7a0b995 v7-2-240
-+96445585f1d9d1abbc74d9c24efbf0408b2cbb12 v7-2-151
-+9656552c468d29773423dcd62a323aceee0b6c55 v7-1-072
-+96580558098272cca6f93085d79aa7164c7abf41 v7-0-215
-+966289a3dd7ea565980bb03abc9b52d88378f96c v7-2-316
-+97a73b6f28925dea4310c00225cc6210af00468a v7-2-113
-+98a2a6e6b966668c810986b6ddd4820bc09db426 v7-2-353
-+98a88a884610aa911950623d7cce8d067feda66c v7-0230
-+98cc757f7e3dbff20ade108b82582d7a7d88ed33 v7-2-376
-+98cdf5c477ec3c3ce8851a517ca3021aeda6573a v7-2-298
-+98d1c149be76b44332bdb72e986bfc8b0f9f21d3 v7-0-160
-+98ef5b0fe07610170bd68aac5ba6e739410c913c v7-0-029
-+9913ff5706164031d5f847bc0980cc61eeed3974 v7-2-119
-+992d5c69d5e917b03abcee24d2fbed8348e21c23 v7-0-132
-+9947133ce85b86df83b86f476c09c0454c47a310 v7-1-078
-+994ea4e6f0238f12a5516eb75f7a6d7ce86362e6 v7-0-094
-+995536cad50e5c08be60c2d82c7b32a63db1e434 v7-1-218
-+99a9e42e5688aeecaeaa4642d17be0ca54ab5945 v7-1-095
-+99b225e0dbc1989ecae75200aaf0e5329e6bedac v7-2-430
-+99ccc8932b6c450cbcdcf86de05dbd5129a370fe v7-0-180
-+9a10e4d195b342292cb8ce0d368afafac146abf9 v7-0076
-+9a3b65713280ebf8750989758b4b2d42f757ca9b v7-0-216
-+9ab23f1e137fd5b0e35c1604ffb95979713f83e4 v7-0c12
-+9adbd26f7fee884be78276fb400ee77d333cf335 v7-0-116
-+9aec644c45dcc33b3f3571ba0035e7f85430eef6 v7-0-121
-+9b78bb3794ba4dba44ab3eab9ab2984797e839d6 v7-2-350
-+9b7d8fd5dc68074119d5a609210fc1ba924e9d7a v7-1-148
-+9bc164a2c8143f6019d0b13a2aee4be89da3a9fe v7-2-204
-+9be44c669f4c67406132ede84d1d2951eac7d63c v7-1-172
-+9be87deaeb527ef18daf09d6c75b21d1d7a65d78 v7-0009
-+9c510840e896fc3776ec7694fe90e18808036fad v7-2-439
-+9c5a9e4356f8ef42ea2c177568b63bfbb1779bb0 v7-2a-003
-+9c970d8681f46de0b13ff16d67c2327a19f33626 v7-1-226
-+9cbe94fd5c8f1ca388ccd2be94f17caa33ef093d v7-2-314
-+9d6a886aceb23fcaf8f64f9cf1ebf3f83d14b2da v7-2-242
-+9d74e2f433c0370cb458c83d12b05f72226df489 v7-2c-001
-+9dbb57025f2542dad344102c571c06da6b840b34 v7-1-139
-+9dc77520c6d3ee0c3e689bc3e6d635cde80909ff v7-0-013
-+9dd62cb57ed5845c9c2294b6002a29702ef043fb v7-1-319
-+9e0174515abb6667a9e74e6fefc74ad50d7821d2 v7-1-291
-+9e084588b706867fae28f93f67d163635a79ae51 v7-0-188
-+9e1cefec84dde22d62c1bd2dd0ceb4e072470981 v7-2c-002
-+9e265d9089fd4afcc03a4ac7c1ccbd754c8ef6f5 v7-2-436
-+9e359e5759f628fd0ff90172d533636440b464e6 v7-0177
-+9e554211caf55e33249908747d9259ac77f10b72 v7-2-301
-+9edb5759494281d90ae0f312b2ac32c30f51ca50 v7-2-260
-+9edc96495747bd354e68dfd76b6ca525d39e715c v7-2-206
-+9f184758f277b816c95fd946cd2d63578d296578 v7-0-010
-+9f279ebda75194c26ba5c917f68a7102348215b6 v7-0f01
-+9f345c48220b7a503fde0367df20e576fd46b04a v7-0c
-+9f8fd6a14cfc84953deae7d00287a1949c0f0eff v7-2-004
-+9fb5bb1ea79b5ba402e51051d79a3476ffce3c35 v7-1-044
-+9fbb40a1228a4d8a5f26d1dff8e2ab4e3bd870fe v7-1-282
-+a03f7551baccc60bedef5ef6a9f92ccdfe69a9a3 v7-3-081
-+a041f68d05909431f0a525eace55307214c33d43 v7-3-114
-+a0451524244d6387ea49cfda296f6550a2a9aebd v7-0082
-+a07007166d518f51749cc9e145afeb023638a415 v7-0-044
-+a0a98a0f12816722b1792141edb3625dd72eb5bb v7-1-326
-+a0b03b7e9168b7f7fd61b1563ffdd6d09ca54260 v7-3-028
-+a0c01df852e1d183c879ee114b35b2b5b0d06746 v7-1-300
-+a0c70314350fde9e0948e598fe57dddc6192468e v7-2a-012
-+a1059cda45f226497278c53752d5c07d21cda09d v7-0142
-+a112fdce9ebd6d538c70602550e94f29a2fc60fc v7-0-200
-+a11e2070c964de1cfb9fdf3ce339ec75b7a983cd v7-0-203
-+a135270b75498b76b5bacbd1e381059283c5e383 v7-1-206
-+a13e4b242735dd0b3285b7f36fccda195ba1d5f5 v7-0-243
-+a14db0b78c590d4bb8e1a190b80fbf3dfff89560 v7-3-121
-+a157c4786b79ae94758574d5ecb4a8f4959de5e6 v7-0-073
-+a16af0072ea82b2dcd265d050b349850cf8f28b6 v7-2-410
-+a1c1f001b99dd591d9082db95de70e2bf8f9e8de v7-0-129
-+a1c5a6cb26756450d2b7065999de140c2fb6ca74 v7-0112
-+a209672376fd537735f6ab55ce926cb80fa56ca0 v7-0f
-+a2271decbce54d46f62e7cc9a0c4e3ea3ae9080d v7-3-065
-+a27c581d2618b9bab1c7105fba966af40e23d57a v7-2-016
-+a285f0cd8a462ff5cb17053fd457646f9d33573d v7-2b-022
-+a2b128f7d705ef08ae91a8616cbaf40883827cdc v7-0c11
-+a33e606ceea66c946219da3899de9566fb0cad35 v7-1-024
-+a3552c04f4e193d981013fa4c077e49d729abb6f v7-2-251
-+a36d21d4a87596abd8775c322fced6a539385ab3 v7-0-204
-+a3a4be6bdcdd0f43aea2aa09288e8f515a2c2f05 v7-2-308
-+a420bba0d851093bb949070895a9dcf4c25e6c4f v7-0184
-+a4365075d05c40606c2ace3340e9484a6b045f32 v7-1-093
-+a509e3ba61f6e541dc8772a0f9de0c38999fd610 v7-0100
-+a53e7d3fd741c68a30085fd9b22d260aec93396b v7-3-086
-+a565175274f6efd9d4f725dcdee1b6e049258d3c v7-0-184
-+a58806285f2086c1591272962d0b5709a63a74fd v7-2-152
-+a5b3a7fb6a5a0f1857b8d0eec380aa7a0f780729 v7-1-154
-+a5beb9fb4da85dfc21dbb68af0fd6aec616dd1dc v7-0-024
-+a5e1d6526ac7c92fcad2ae100b1d43ae238067b0 v7-2-103
-+a5fcf36ef5129596fc281d76369077ad01323b3f v7-0127
-+a5fd859f69f1b5c70de7d0439150f2c681d0d915 v7-1-020
-+a66a49322b6bc2a82c6cc3e8092db7d502f64c4b v7-1-073
-+a66c405786754105eaa63f3264c94ce134bd275f v7-2-105
-+a6776e2c9f014491c7476c3a12b2b7f108e1b6f2 v7-1-222
-+a686fd6c8beb2c41110e0a65f6a403f0ccaef83d v7-0065
-+a711f7a6852db37b1687044ce8a96b6f48e9855b v7-0067
-+a73a117542b8b5ec22eb3c61e45ad888d3d76b51 v7-1-171
-+a75120dc3e2691218f3144bbc24369283d74eb53 v7-2-190
-+a7c4842a0be340d06de659940f9396f969bdae77 v7-2-212
-+a81bc802c17ce7002b08d2e327136e3ac4d11d5a v7-0011
-+a83f48a17efb871266ffbcb3b6c9cd5a62408410 v7-1-274
-+a8752f2805d69f51f1f6370eee8c7e2c89c57db4 v7-2-037
-+a881e15f44d8b5888733fc98c39984c2fe6316ef v7-2b-011
-+a8aae2e1d2ae6c22551400d451e4ecaccceffcd9 v7-2-049
-+a8bcc7553263bb7a12eec8813270ed34242dcdfd v7-0-190
-+a8caf7dd853dd5f5ea2bbc671467ab2f78989f44 v7-0205
-+a954a30e407394f51218ead2a7d832e022fd2378 v7-2-115
-+a9e353f7fcc48a2b603ead42451ea8e89ee7b9d0 v7-1-285
-+a9e90b3356b62da552b62eb62b8dff78438f2dc8 v7-0036
-+a9f561ffbc53a7097873cce7e8a8e1615ac0c38a v7-2-243
-+a9f814054152b658c1b90aadf0f75428e1130cd3 v7-2-074
-+a9ffa7c7db7757ae7c1ba0e7d3b990bafaefb558 v7-0-097
-+aa6caa23a4b834360b82d3d078d1d17f33d673b7 v7-0152
-+aa7c51f81f46cc5379386ac622a5ba44aae1c4dc v7-1-227
-+aab202d244b6bb286a62508a432222d26d5d215e v7-2-394
-+abff2f6a3ad7790f86e055519dcb851a06fe78c0 v7-0-036
-+ac0458d9b9dde727d1bf11e9e9221edc20b623a3 v7-3-026
-+ac04f392ba48436bc1b90d3d8b8d384fef4f8135 v7-3-073
-+ac33b7c03fac7bf435346233114939fec2e187e6 v7-0018
-+ac6d15d91466b34e4ff31765d1d1e1733f02ffc9 v7-2a-014
-+acc572c5660c90020f42c9f31c1d2c776c5dce47 v7-2-097
-+acfe86afd651f1abcfb6eb38ad0101e61a27c65f v7-0135
-+ad8f5bdc727441118cf45678b031d04d1a77aae0 v7-2-001
-+ada3271481ceab448c69588c5cf837c2dbc91987 v7-2-289
-+adf6a9dcadeda32a2a339069336ebed7fe6d53da v7-0-038
-+ae2251be41f935706f7e634a832ff5ff8a91d023 v7-2-185
-+ae22c450546cfc001c90ca17999318e053838c30 v7-2-433
-+ae7e29b64923da886325215a1a5b20bd60e4cbc0 v7-1-194
-+aeac63ad9430d81a0dfdc21080f1f05cdc633baf v7-2-048
-+af7afd2bb4c235544fc9da6b34898ea93d477d77 v7-0-078
-+af98ef7f5a39aadfe18dd44df9afeedbb0665778 v7-0-003
-+afad99b3612ca54f3668c232e8d3ef235d74c9a2 v7-1-028
-+afb64d9f5b8ee1eb6e787e1d34ef8b80f15d4749 v7-2-013
-+afb740b5dfabffdc759d3428254c944bd4badeab v7-2-191
-+afbe4a4c884ceacc349264075afe26e93bc75f07 v7-2-208
-+afc60a6339a68f659addfbbb849e249964c9107c v7-0104
-+afcf9db31561c7fe2b62b346aca751bf7bb31bc3 v7-2-336
-+b00bc2bf23eb62a1883318c6565d3fe0d1b4e30e v7-1-119
-+b00d5f429a4b2f0a23710200cdf2a672ed9d5501 v7-0-108
-+b04bb35fcd4b7edeeb8e175955a2909a86dad118 v7-0-240
-+b0605f2f9786c14e943a0ab440c16b444f2a9cac v7-3-113
-+b090b216a832197c70f60ead52026a53ecb0cdd8 v7-1-009
-+b0dabd584b8f89ac32af9758c221e948016e2b0e v7-1-175
-+b0f8f28a67c23c9e9b6b8087b373d6fb2add726a v7-1-197
-+b1706a94f9f9638cc0ecb624dd7519cc9beb6ca1 v7-2-405
-+b1b09b68d7069755425a2c1849f517f3f9e760d9 v7-2-279
-+b1e87b7f5db64eb40fafb0e9bcbb0c39fa2bac63 v7-0133
-+b209c3f94ab7ca3ff559d255c395fa013fee31a3 v7-2-073
-+b254cfdd740542f5778d787845134db3c7584335 v7-3-071
-+b2789846ed3978ec3dd9a91b6e1ef2f4d054431b v7-3-069
-+b2a7d143abe2f572e713acda4a67ebce76511bc8 v7-3-072
-+b2cfe84c96ccbf87a7c765442f0e32c62fa112a9 v7-3-044
-+b2dcb84570675cbdb4fea2d017bcd093b3f34be3 v7-0-070
-+b2e037ed7e33b48a1feb69174850acc393254864 v7-2b-020
-+b2f4319efde1edbabcd900a63db8998bfc117152 v7-2-084
-+b31702c473ae10db32dcedae94af25228d6c920c v7-0-049
-+b34d985598f68b97fe1bdf1d34bf689ea1b8355d v7-2-130
-+b4791bb4fbff451efa3ffdabd4e26a668eda2283 v7-1-108
-+b4b1b5324380cad36827cc211a2f92fb165d9777 v7-1-026
-+b4d11ddb7303ebc28f6a40fea28f003287e77352 v7-0-187
-+b4d92472f168c90d60359f6a592d6461686c2db9 v7-1-085
-+b515624f6d7dc7597b0b01c5cb03076e4daf3347 v7-0-234
-+b54d2f702d41f4fbb8bb3d33e52faf94568b2170 v7-2-127
-+b57babddb32b2df9f04b636154a26c51f78d73a2 v7-2-281
-+b57f2617965fd682c6284a706a999b58f00bdc3c v7-3-014
-+b5ad00887b816469ab8f7733643380a690c1322f v7-2-111
-+b5c1cb6f8d565b4fa5b714660e8a0d7f8d8f7a5e v7-2-174
-+b60a569eb708bc6563cc1104335cf56bb38ea901 v7-2b-010
-+b61422c4dc7a81d340e33e0ddb8ce8cf0f94aec4 v7-2-025
-+b62965091b8d258aaa26871ccf80ff9b4037168e v7-1-254
-+b63792dadc23ed5ff4e0e9e8c7acc24d9c61e779 v7-1-120
-+b63fe7400eb30f9c7b98199a21ed0bdc583aef62 v7-1-135
-+b6627f01c67dd0bcdc2f24d56d0a9342cb5dacda v7-0-151
-+b6632d553df3c8d25e419d62cbbbd1d8aa5d2489 v7-0182
-+b686fb4898d1fd8579e5bf61f36c2a08fee85a20 v7-1-025
-+b6ffc2045211c67d42d806af38dae64626aba605 v7-2b-026
-+b76637e5ace1cd75c1894c44e132ea1e4fdc1a9f v7-1-289
-+b77f790d53f6b57604b1ad5113da4ab08b4ca918 v7-0-236
-+b7c22e34316251f32fa1034d11a3eba1829c2b92 v7-2-043
-+b7c89e3e19f703c0ebccecc10ee044367a65ea20 v7-2a-011
-+b803b277688037509ad1b6d30466721396d8967f v7-3-062
-+b8744d1982d1fe26fc41d62b6e84fd315dd6c941 v7-2-407
-+b88f0420148e5e65c2f71f47ed2324fd83b3bd2b v7-2-155
-+b8ab4ba6b11018e468362bbadf077654f9cb4be3 v7-2-304
-+b8c880d61acb8d5e08ae0cb558ece76d96d12341 v7-0-185
-+b8ebbfa519b990d6b892dcf943576761e714c2c3 v7-1-050
-+b8ed23ef6ff15604ead321f758ecc624a9d35c2c v7-0-042
-+b9202c4cf847ac1898b4af225494197671111785 v7-2-124
-+b93a3fc3897b3e16e96b80e35dbd72aabf9cf37d v7-3-078
-+b9897545378516c8afe3140b7172d838f33e5b29 v7-2b-009
-+b99303b1483f26763f0c4b6c9d244763ad32d476 v7-2-309
-+b9975513fe244047a60acc818edd8de94935cc28 v7-0169
-+ba2ac6b5bfb9679edffd08edef9cd0db1237ea12 v7-2-259
-+ba32a005373a78e0b07972880704e2183f578f86 v7-0-136
-+ba51f75bd4b514d5c4d48e57c6018c955434b936 v7-0221
-+ba9375e24d4937d863ab87d28e6b7c1ed42b3960 v7-0-050
-+baa5f81197c865fd8847f6af95fb1d48cea6aa65 v7-3-043
-+babbc735b80efd1ef23f35dcc77c5f5cc9e68fea start
-+bac7c3fce15019af25562f5c19b099c55487a6e7 v7-1-133
-+bacdeee78827acbae22a7626a93318ee1919c883 v7-1-014
-+bae8347a9ae1131d95a7af1d751fa47df5d3baec v7-2a-015
-+bb3661a2eccc165bd5d2a87a8d4696f89431a459 v7-3-116
-+bb4797166e4c610516eaa16865682ab14411ecb5 v7-2-064
-+bb7a0b90100aae1f77748f6f38aec95520825c3e v7-1-023
-+bbf0ba46e51d5a4e58b872b840c5dc3e1ca44234 v7-2-116
-+bc3f88ca060d25cad633a20548ca38cc529fa0ca v7-3-045
-+bc68103ea3f6a13d26598bfc1958a57eae377a92 v7-0-040
-+bc7ec0f1f7f35c3b58b3e32bd2ba1b87501b17d9 v7-0170
-+bc95c6c4bac13d4a0f8a4bd6ec10f495d3fa5eea v7-0191
-+bca50c9e1374c176a63f9baf0ed7fcb34ea16967 v7-1-147
-+bce687811199a7866c7728b09f00406ac1294745 v7-2-287
-+bce7c73fd56da29730fff999a1fa4b0edea3285c v7-1-157
-+bd7e26d05a3fc8e010566ad8f8aea9c31ddf55c8 v7-0-034
-+bd94e22dd3db36f07fd31b2e282f25ccc7335f58 v7-1-163
-+bdbaeab157e6f88d82056df6b927acb5b342ae01 v7-1-272
-+bdbdec22a225553f5d78db019e13cdfe92b9cb5b v7-0161
-+bdcfe793d49fa832470953794583b4bb74ab9fb6 v7-1-104
-+bddda5d8caa1c6bf174c5e202d3b08a51dbd54a7 v7-2-210
-+bde3b38593f9d07da76cdf37ea574fc9d80aa43e v7-0-052
-+bdfbf8ef447a4fabef09ee9d28eedcf0e6b99e57 v7-1-249
-+be0f21f63d2c9651429a6ec9e97b8e6e9d0d102a v7-0091
-+be1d64f82db26bf7892605332aea6126d6343e47 v7-2-325
-+be8e2719caa6c7194ce4713206da6f1f8db694ca v7-0-138
-+be9fbf8b0cdb6a42c07a8be94e9fba866cff00c8 v7-0-146
-+bec979a53f47ff6866d390eff6c4ddd4d5ce8a8b v7-2-307
-+bf5ba8a0cdee590c0841391f9a8b65c456ed06bb v7-0129
-+bf63a31b77017d78197bc0155c0ec59e31559df3 v7-0-210
-+bf7803d0f5b9d0a9cb16636b9490d723623c57e8 v7-0-019
-+bf9579ab26e59cda4bdebcd934c43b6fbded60ce v7-3-019
-+bfade53bcafb7b6d297f23ce3ba9e6a72dcb7949 v7-3-087
-+bfd69bfb41491b83ac7a4b948c649eaec251c54d v7-3-046
-+bfd8935d62009b625c37dc373404b67d0019d7f1 v7-0087
-+bffbbb566d6b1004cfe26df89e102c465bed4312 v7-0-192
-+c00efaa0af249c086557487d172edd6a1cfc0706 v7-3-053
-+c050d5bbe79b6a0bd83fb5dc0c13c350492c7c4a v7-2-063
-+c06c658691e20f22ae95d4cf117057c7d0736308 v7-0-087
-+c0bb3c1dd44695b4eda074afd1a7394d2b7e4552 v7-1-132
-+c11845a465ae63ea7f9942484988dd4e441c891f v7-2-370
-+c12f39141bbc7c031b51352896a78324ad27398c v7-0053
-+c1709e3f8536100dc87defb9f788f895b4e73578 v7-2-140
-+c17a42da3920c34a75c17fe8696d2f04bf683f24 v7-2-428
-+c17ba3fb433e7cddfdbf2244b777550970493b0a v7-1-106
-+c19f6b8d0393dd28a2673da19e8acef59d371f65 v7-1-304
-+c1b61096e3d0e4383db1ef01a5dc2f3ebd5eb0fc v7-0-074
-+c1f67ce5740adaa7e1e164d706f204252711d5df v7-2-382
-+c21975c58b4497d08a2fa30601723537ab1f03ec v7-0123
-+c22ded254d0591df640c3ee0ea3dd0a490fa2396 v7-2-071
-+c2cae213194d26214a9132c1ec7cddbdafd18175 v7-0e07
-+c3242ae88ef1d4cb6eea51fdf96670cae48fc64a v7-2-081
-+c3242ae88ef1d4cb6eea51fdf96670cae48fc64a v7-2-082
-+c37ed44f014fdcb211ba3decf81d1f3ec94a210b v7-0-153
-+c38cdd201cec8e9a774b7256a5eadf2d7194aa0e v7-1-059
-+c3b5d3fe94046702944964c32eea7522ecf92c4c v7-3-020
-+c3ba2dcc4cf4b96ddd1e3df9beacd1e11abe7868 v7-0-214
-+c3bd0a84e11ad1caf53402dbebc39ea8b01fc832 v7-0-167
-+c3e225bc213a1a91a278fdcb3c5fc003ae886f02 v7-2a-009
-+c3f63ed316b621743f44a5ab6b9a5438b88feded v7-0227
-+c44058ba78bc108e98fc15a14756716c3d3241fb v7-1-141
-+c474f5691c0c6461414e65601a97e817e976099a v7-2-164
-+c4d200412ae9b66732f2c9be98273802a0acdb95 v7-0121
-+c4d5f3d8ad71c4d30397ca0101a89925f1666df8 v7-2-099
-+c50c82c5e230a9ef1cb570be0a57d3dc9e295993 v7-0069
-+c50ed526966abc52d825a36d5114bebc21f850b2 v7-0-220
-+c51a4f9936751df0e9bbdc454727bced532da3c5 v7-2-255
-+c524f99c79251a7b614776a5d064ba40c8d4d5cc v7-0022
-+c544a3507e839f3ad4db6e1d7dd7474ed0167b96 v7-1-066
-+c5871806d7e6c121c80030dde025a96c0ddec820 v7-0-057
-+c58b9479e304ff055b0404d9d73a51da4e9bf7e5 v7-2-315
-+c5a806b29372c033c3b616083c86159a8719635c v7-2-306
-+c5b05f6de1adf8bf800da0bcdfa04a262e0e8329 v7-0047
-+c5cafb21c45b5e1e16c006056dd5b8f5ad91145d v7-0-096
-+c5d5e0f3403f65e77307d1bcb5d71acc73cbc90a v7-0-120
-+c5e1b4b9016ff900a005057fd1a055c70b812414 v7-2-047
-+c60d231453cfd59c8b313a894027cecc0a4315ec v7-2-424
-+c6296b0ad9eae4122e31dd3b4f363e073f388a38 v7-0151
-+c649cc22da98e2eee72352917030fc6068883317 v7-1-060
-+c669f3280f595ba6133a94d8ceb3ed3ef6c2a4ad v7-1-324
-+c6b06a4a8f928b1868a3d48d95293730262a041e v7-2b-023
-+c6fe65c000d27b9ddb0cbdffe43cf188b7a51f2e v7-3-037
-+c7537662746d8bae8bcdf8502a23a573a54d3855 v7-2-186
-+c7654c4db8fd57c397bdfd3b3142632a4e761f32 v7-1-153
-+c773cb978acfd216004c871e883d2b31cd4cc0bf v7-0116
-+c78d973dce9e0456b96725f55b853ecbe4ebda96 v7-0211
-+c7905d03c72e74540d91b1ebf3fc9cfffc2ba699 v7-1-273
-+c7c53db66b5521d2deed3b889fbfb13030868942 v7-2b-019
-+c82bb7ade452d18a121a6b0b8ff654dfad30532a v7-1-137
-+c845dcf7fafa91d8cb370f690c16748758b20332 v7-1-110
-+c8568bc2db390972c94374a031bbd195c4403ffd v7-1-311
-+c87ce0b2ee2a14d3daf3902bdd4163a002ec7a22 v7-1-190
-+c87f38b71d27d9e420e5947d4e99eba9e3eb2e19 v7-1-070
-+c89903e16772bebee28ec935f7459c8c83bdf05e v7-1-223
-+c8b6b7e1005daebc2d72c578d70b455f42b5bd16 v7-0150
-+c8b87fa14d277702b7ca6b9ba18470c3d64ad83f v7-2-179
-+c8c47cc9dab1eb6976b9c214c58e65beb3a45e97 v7-2b-025
-+c8cae82dee305d003f809d91025ed21582785597 v7-0-061
-+c8f343a465a271cec752fce3efdf5fa8476d3c96 v7-2-180
-+c94bbf85eb160aa9eabe33b13b267c1446019eaa v7-0-213
-+c9b7b1e711d194070184c9c198fbe8126701d1ee v7-0-235
-+c9ddc2338f41c43a30044dbdca1775b919f80707 v7-0-058
-+ca4883686f934bb338dfe3a2fd7d6d3995c3e0e2 v7-0-088
-+ca501ab2fdb3a4477a6b8e469c1a4d8f1859d92a v7-1-170
-+ca5b52e99385825f0083c4b122ebfb50c2653039 v7-1-255
-+ca82de29ac1903bb1295c04da5624cf295b6447c v7-0g01
-+caa550fe445725dea9531b9fe9f0d0f88961baf7 v7-0-191
-+cab25717c6a69a7d9ebd010153fd9be9529fb49a v7-1b-002
-+cb49fa8c71963b7b69529dfc2abd00b791119fd6 v7-0-126
-+cb6487d683f2260fc0b47b5e95f78a297360b1fa v7-1-216
-+cb7043482eca744ad9ba1eb11f08cc2906b6bd3c v7-0-149
-+cb94c42c0e1a1e00f643be8a96939e42c3afff81 v7-2-445
-+cba9c4003cb554f909fdb6426b8870bef24b3edf v7-2-085
-+cbc9c335ddb17f9b0e9d281e1c5d97a20ed4fd94 v7-0-119
-+cbe70f2e756d80015f6f0057e13a882ee7567276 v7-1-259
-+cc03a79fdbb9315956fc22887483a15b414278ea v7-0-197
-+cc4fe241baa3596ae9cd27ce65ad25077bfb2e71 v7-1-236
-+ccbd8177e1f439fc23ef56be942ab0253d5dcc26 v7-2-132
-+ccc9eda1cfcf918fbd1933bca9db01e246d5ef12 v7-2-138
-+cd3689efd90a5934dcf2e4e232d97939737414c3 v7-0173
-+cd3f52531f6c8f16e89e97f335f974fa25f4b498 v7-3-124
-+cd6175cc27d9c8b4d4f4dadc7c38f6c490f3fa62 v7-1-235
-+cd7eb2a18060734504ff974065d6a7adfc903b34 v7-1-041
-+cd9471bd8e9eb1d2c59d00a7d18dc07dd97fcea6 v7-0-047
-+cda8f3aceb85c72c94498120fa171939b83cc8a3 v7-2-120
-+cdd82acd75b449784a574058387449096667e56f v7-1-125
-+cdf37c8f46163497e0d7fabf9655be37b692fd1a v7-2-008
-+cdfc3897c8950aa84c84c1a05158afd32ba71d06 v7-2-222
-+ce2181d14aa08a59250267dbec36bba362eeb908 v7-0139
-+ce6bc4bf2b87f2303bf47fe64ebdd470711973d0 v7-2-244
-+ceaf71b15d813665b3b02036a619bc967db90d8f v7-1-177
-+cec8b867838bc2a5b5f5bb0146010060639fea90 v7-0-114
-+cf080795d202ac2ef02d282f4aec111b2ec126b7 v7-2-135
-+cf0979c30cafc4fbe239ebb9de3c427a265207a3 v7-2-144
-+cf4d73a8924e715fb5fc7db94af9a7e67d7643dc v7-0-095
-+cf83dacfa25fb1fd8d4929ff2abe871c72ad94a8 v7-0105
-+cf8f86128f4c428af72c116cc53d92ad7c1e40e9 v7-2-435
-+cfcc1421f5e431d3984c3e9ef3f360ceafaef76f v7-2-146
-+cfccbe492612c69ee77d6cca4adb690794e5feac v7-2-126
-+d065616e083680035f38a54409e857ebc2202db3 v7-1-146
-+d06a461924a3f92575d81c2d1c0c3a74cd0a2929 v7-2-322
-+d0cf8c843186301d546870c2661cfa3e8526b3e4 v7-1-100
-+d166fe2bfe7438b1539cdedf1810dc91a1cae01e v7-2a-005
-+d20d37ef86c8844da2c9c45b2d9fc8b6a2dc3f78 v7-3-129
-+d225695aa7945c27e1eed207e3e683b16824ea87 v7-2-282
-+d23a400b718419e039eaf4f8ce23517144d41faa v7-2-019
-+d2612392202f9b87c122b7233b0bbc67c9edc004 v7-1-004
-+d2796c60ca6f11e05cbe080114a3cfc6006488c7 v7-0032
-+d2a4f08396fe8c01ebca988db5eb95b7c3f9db8b v7-0f05
-+d3571ca62cd6a9138b0aaa4673b09dec78e540e1 v7-2-323
-+d38420e2fafe99d58b915213b73f8d1b8c7848d5 v7-1a
-+d3bbb5dd3913b6425ffebd18b232fcc2d1907046 v7-0f02
-+d3cff90680f3f985c21e34e03607a5808ed4dcbe v7-0-144
-+d433f43849ba1dd0006dbc4d794cda3502fc24af v7-2-332
-+d4b1aca2e3a97415460ba21ec81eba2218cc0be1 v7-1-128
-+d4bc24e6a28144ebb16f143efb72ffdd98bbe0fc v7-0-156
-+d4ea645c77489da3d5f0f0f48a14bb63793e1505 v7-0041
-+d4f3db33d782da9d33b2715fbd14f5acac280ce0 v7-0037
-+d51bf80e8fc9b1048c93bd26e308af7c250ef629 v7-1-045
-+d5681bd2661b3e75b506a7d6ffe8bd053e04608b v7-3-013
-+d5867fd6b2b72d8095795f4db9aea88035e49e5c v7-2-330
-+d5892839ed90bb1a8f9f1b3ce88bcc205e7617cc v7-0156
-+d5ec1b42ceb06062f03d828acca852a4ccfbc7a4 v7-0111
-+d607b48414b79e7cacccb66391683b23cf1b2cbb v7-0-099
-+d608343d25e6ce4b1e6435720c48762501b0fc7e v7-2-197
-+d66394147eea6cd5b304fd2b78e5dde46fbb1b02 v7-2-136
-+d6a69271cb9a787af6b3a05b01275c9694a144c0 v7-0194
-+d6d6ca94371317962df5d92c9b879f7602d3e234 v7-0098
-+d6f0d3db1c641e451f9cb0d0697f1b18939d6cf7 v7-2-087
-+d75027183cf4b44b2a92333e57b9bc3fe2b2f5dd v7-0-230
-+d763e7d7e938d8dd3887b7279b44e3a857285d38 v7-0-189
-+d766b2ba2fc6d5b6211cd10d90236dfa8479d617 v7-2b-002
-+d7860ee7eb7ef5c27d45c4569107376d3cbdbdef v7-0207
-+d7ce3adb8dda9d7acf8aef39cda0b936ce3f3d15 v7-2-362
-+d7e33248b9c80fb5c1af5880d6c6a4eb507de990 v7-0206
-+d87865573d809129e6d25071cffe8ab451ea2db2 v7-0-041
-+d88bdbabfbc6539ce6cb149a3e8b025740a7f351 v7-2-109
-+d8983769c9ddbffc13ab427a5e44693070d7788a v7-2-361
-+d8af28dbfb80aa6c6248000b011bc9df6f8f337a v7-0-152
-+d8b9701a3b7bb58e3f7f2c72145a0dfa33501f31 v7-2-193
-+d8dbf7d55c5e9ac3e345eb1b2b86986be3582fdd v7-0-018
-+d8e7b6762aaaa48f6bb72b1c51d535119e79c379 v7-2-096
-+d8f905020502b0f35d810f27b4d5d28689bb7764 v7-0b
-+d9030055c432b20797f883c956f094416e00c622 v7-0033
-+d92358c7d6216ff56093067384eb7d96ae47696d v7-2-238
-+d92ac5a199fe88f1630678f81e0b47d5f3f1a921 v7-2-196
-+d92bab35a16720d2b4e3a2b836fd68df0ee00aca v7-2-234
-+d94c322508140c4cc0d36364d994f475aa84f8d0 v7-3-075
-+d95676480093879730aed5ba678e3e8305977a4e v7-0-067
-+d97518d6b3257b4ab48aace82f9197bd099ff758 v7-0063
-+d976f4da2a4d56ed9b59c61f6971ec0cb18c84db v7-1-264
-+d982226b7aaaff40647eaa5ad05e01538e90065b v7-3-023
-+d9cc61139d12c315d790d79890402ef957be00ff v7-0146
-+da0991871b02a5ba7bce7d3c1180d01d50d7646e v7-1-017
-+da1d62fe5379f77a2a165e40bf4bcad0466c60cb v7-1-063
-+da9142bd190a5ee0e45536ae4c2913be5bdb02b6 v7-0149
-+daa1e34570ff649af9d7b64a447cc6d2c0b60e38 v7-0-093
-+dabcabce3f9d67ee2cd22246ea16769513982910 v7-2-419
-+dac5006b4443f99681d2068d0af065bec10d7a99 v7-1-162
-+dae4cd29a0b7d899201c2e6a10f0441e7173bcfd v7-2-347
-+db3ca1048f7f800fec81696d29ff8a7a3027a64d v7-2-320
-+db44f7b81373a02990aa6030b85024478b7d82bf v7-0f03
-+db83098657947521e0e797662c135516a4a300ea v7-1-123
-+dbd226be80b18c494f4438045d34b65530dcc198 v7-1-027
-+dbef8434a2ea19482b3ba72b428c57dafaad29a4 v7-1-329
-+dbf53ece2e23fd6e8652c531ce7976f54ae85635 v7-0029
-+dc8197342755fda6ca4d6619dac228406867a7ce v7-0d04
-+dc81a4fc63185c72c940e8ade45b5e1534523351 v7-2-143
-+dc8a5699253b833ec796460f9ac877d02ab7b165 v7-2-406
-+dc8ee74574f80c7eabc90ff7a3973f882993cab5 v7-2-444
-+dc948c8dfd1550972011e38d59b9a8ade5a000c4 v7-1-019
-+dd9db57ee7ce46bdc86cd787fb58907f20c0a973 v7-0118
-+ddafd2ba3a863054041f2f71248f0ea91fc3b1d2 v7-0-117
-+dde812fb22478c1fbd34d935ec466b2cd9869da4 v7-2-437
-+ddfb6f3f3b2be6e5397db2601f392c45f4a05b84 v7-0-012
-+de0e7ca61893d31a4a5ad8e129691650e31477c9 v7-2-427
-+de8224965034eaf748c4205cc2a61e097b4aef90 v7-0-063
-+decce137e7beaa2edbfb4783d1cac714c7d84d14 v7-0-098
-+df6967461cef05aa96ff708863d380e9d15f3bb7 v7-1-065
-+df6b12c84b2359415cd987c016f5de135c680100 v7-3-047
-+df7ceb64b0c65cc5ea525f7df25ecdbba80b0208 v7-2-137
-+dfcff6590aba6d93a69b414759b164c255fda08f v7-1-238
-+dfd5dcc73daa3934ff1f47d6d53207de2f9034ed v7-3-067
-+dfdaac31aa5df021b444bc2ba64307709d863c63 v7-2-230
-+dfdaac31aa5df021b444bc2ba64307709d863c63 v7-2-232
-+e038754d419a3ab5ec25d014513bf8773cb9459c v7-2-408
-+e03cb9499b83f972c2bdef503b1faa15481da81e v7-2-015
-+e06e177de52ae555685a6126213dff168048fcc6 v7-1-305
-+e0e0d1ae601197ad22eaad3b721407a2d0cd6294 v7-2-318
-+e1070b3b03e9b1490157dce8db81b026460aea35 v7-0-081
-+e10d3c07344929c21377722bd3c66d3c54ef582e v7-2-423
-+e12f574898a9b21e39af38cd57e50ca87ccdea81 v7-2-272
-+e1336150cfcf7e64f66563629accb1cc84fea036 v7-1-089
-+e14d0a530351fe26450893977197e81e9e9ae5f2 v7-0-177
-+e180933b876a74ded043348c0cff4fb209d4d92c v7-0219
-+e19ecdb13f34ca1ccb3dd3c382a08423c385e847 v7-3-080
-+e1c7d0ea5dacf4184cf49c3d05d6ce77d944a367 v7-2a-002
-+e1d77e652cb7f9e84072f16b3ac6dcbb73a1fd81 v7-2a-018
-+e1efa991c2b6992bf361cb432895749fc6b1109e v7-0-106
-+e212d1a40ca9638a4b306013d54417dfcbe9d8ab v7-1-243
-+e2680bc6a18024d68ce8100e21d4d307dd647aec v7-1-011
-+e2d7622d70894e506f9c722bc8ce145521d098b7 v7-2-106
-+e2f5c1597829256cfd784681163c232bf907f1c9 v7-1-092
-+e319a4fe6e32e0297f1be2c1a8c763f7f7b26cd7 v7-2-378
-+e351146e7974acd49f2e9aab749f31670b2c6044 v7-1-116
-+e44523d45bf5e276817b7f1f8987f2a8ed3132b7 v7-3-125
-+e44efb3af0d58fc58a392e58c604bee91bc52e2e v7-0-060
-+e4fa26ce87694c7d810796d41d0f03981e500d1d v7-0187
-+e5145ff9c9b0dd7b29154c2ffd220988737c99f7 v7-2-285
-+e5602d92da8ccb4822917b2df3e6099344bb4ed4 v7-2-177
-+e625dad74346d76132cbcf6ddf98b95d2c8fbfe5 v7-0-113
-+e6372ac3ebe536aee65848e52e58fc817697b98e v7-3-063
-+e641c7a27c470de82019d313a158a9894e0befc1 v7-1-181
-+e649c78407e600ab28819574efd7d2d67f066171 v7-0202
-+e65e50609469f1c5d98ab7396803fb697a78bc17 v7-2-219
-+e68d8541494dc36b5778d9eda2814014201b0335 v7-0228
-+e697bd3c3876c27addb414ae170d741aa1eb1917 v7-0075
-+e6a8d55a1626baa2e38837b0e7a4a6bc65783623 v7-1-178
-+e6aed39f12648124b0b4e23c669cab6ceda2ea1e v7-0-158
-+e6bd96f2d7b81a8963c9c8dcfd9e2b3f08a9f0e4 v7-0-017
-+e6d25347de2cc7f7632cb0cbe5adef45d9712aca v7-0-182
-+e70aad5761b59933a1f69a8756457fdb3a9aad40 v7-0-069
-+e70c0d863e0cb2b26f16acd17ead7ed267faef53 v7-1-022
-+e72e30c69d582a55cf3c4836aa274a006a457fe3 v7-1-261
-+e73f2978bd4061868337a25ff09c3c84b54dd2da v7-0f04
-+e753954c86e2ce32648d9b12c3c135c22748f75f v7-2-237
-+e7633eb32cfd9cd631a73f4d412272506261b427 v7-2-098
-+e76a088056dd38e02a99daec0741aad6f32a24f8 v7-0-242
-+e77e3c11f5076d6eae8a67bd2f531f72d33eed7e v7-2-331
-+e7904492cb75b7a69964c331945b261cd4232a7f v7-0071
-+e7f6ca5594cf9c6a3902458e0635bec7a7c40d87 v7-2-149
-+e8450dbf6f031f2727798a7d955e83dda7ba0288 v7-1-086
-+e856f9cc2aee46628ecb83351489d4f41d66c6c6 v7-3-064
-+e88950f0d4f699846875e45dd3887cbdf92bc3b9 v7-0-084
-+e905716f6a3aaba3c0ba1d18093d4f4f09550524 v7-0-090
-+e943e5502fc9cc439294de385dc564226b7311a1 v7-0050
-+e9624acb93a750d835c361c08bf3e78f587f6510 v7-2-028
-+e965cf54d887eb9bc20b6668d83541992cc4e8a7 v7-2-157
-+e97a97d6a0eb98b21bd068283f192e0a2f2b1a89 v7-2a-004
-+e980e93d2ac2c7838acfd45fbf2de06939c929bf v7-1-186
-+e9c9f37be3066d64d7d87d1b314b2913d0d751f6 v7-2-416
-+e9d018b58830d50906a81e1b1ddbb3e2bdd9126a v7-2-107
-+e9ddb2181f063b67b3075844b4aa7359db5750be v7-0155
-+e9e3355861ba8785dba619e2358a239a9443a580 v7-2-342
-+ea15087a42cd21520e628faa3c53385246c04743 v7-0-085
-+ea1a2950ed16f441f66ba319615d47f1ac67402c v7-1-191
-+ea399ac2c1b963b068beed88bfaff7620d345333 v7-3-138
-+ea9f418ed072f45fc1cb04e455379e3db1c0f182 v7-1-215
-+eac2556d46208785a173d44b4efff339a7e2fab8 v7-2-215
-+eaecfa88c2469471804768932f823f5b264dd0b9 v7-2-148
-+eb0504d00480ca6a7758bfa35d64a09b3d389fca v7-1-250
-+eb1ce51c1cb0dc7825570f7cf30b0e2c3e9749c1 v7-2-129
-+eb27e3e2df706466ccf9bd00e407d2d3419a81e7 v7-2-265
-+eb4ee2010aae8f4361054eb367a7b13dcfd738c2 v7-0-107
-+eb531146be0ec6cce1187568cc841718df44a296 v7-0114
-+eb57516376d4b43889fe43594048f183af15c31e v7-1-032
-+eb6fc577c96c2b5e322ca3760fa4e9c043ba5a8c v7-2a-008
-+eb800128bd894e9b2c661627d2a302344162987c v7-0-092
-+eb9cbad50fa34fad2b422758d6d814059aa89f94 v7-1-313
-+ebe059f69b9e46ada2c6e02b3979e31d1b11c906 v7-1-296
-+ec5ed41eea2f1d83df5a2507ab2f469fadbbfbfa v7-2b-001
-+ec7a570696ac0e50147e2419d8b269ccfb75f25e v7-0-199
-+ecc637a844592d48cec38bd795a17ecf6e0253ec v7-1-114
-+ecee28dd16d25024fe584cfb8cd0923f1184398f v7-0213
-+ed44c1c436d3d61a94062c7a781b77dabeb8ebbe v7-0-100
-+ed7fefbef738386c39248b501556bdea80d0f8b4 v7-1-276
-+edb3bc186e97a3392b3aac634526a4f4f84f4011 v7-0-020
-+ee41e031dfe14ebe50c289158213f05eca869bb1 v7-1-179
-+ee50cd1a303271c6be6cf6121f50c0abb8772dbb v7-3-088
-+ee9d2d24ea9bd0a7d500f1c37cbea802d8d1d88c v7-1-231
-+eef96cfdbbbebe5aa61b420d3eea31c3c5b6d719 v7-1-314
-+ef0fe6201b843f699b3ed7483e52eb3348ae5b11 v7-0-006
-+ef2890033e88391e92eba7d1ade8a43e9e200abc v7-2-337
-+ef3a3ec8940cb0c55d35d2e5fe924a09d6815f2c v7-3-070
-+ef6b11bee7d06a843474888d0bbd67d14dd2065d v7-0-181
-+ef7fdb3c6927725abb07731a46ab78404ad4c7e8 v7-3-105
-+ef886129f0c0be912c7b6c21e695bd9980d31210 v7-2-088
-+efd0ce477ae789445312ebb08a0f78b835dd6f5b v7-0-194
-+f012c4ed8c38499ed2901d139f4409e2edfe51da v7-0132
-+f016c3708ae32436ab545762a1bfb8ebd31af975 v7-3-106
-+f018c759e4ed5e1a851c1353c118883efab6a155 v7-2-274
-+f04e890524be4a82ade7526f62a967390d3f1cf1 v7-0153
-+f08390485cd365abce88ade8987e56bd267cf3e4 v7-0210
-+f099adbff8871627d897979b432d74ad1623369e v7-0-031
-+f0b3b9ac2147350b1d1fd762cfda0b3073b0bca3 v7-1-161
-+f0c598082dff6f0332c9af602b5b4996bce01ff7 v7-2-104
-+f0cfff4dcc2f7cad78ce86aae0f4cbd3371ce46d v7-1-283
-+f0d6b2bb1093eb12925cea635cd58de0594c422a v7-1-245
-+f10fe14748e260eb0d8bfe375cadbbaa0e5ceeca v7-2-055
-+f12d38ee49de595d11efb50674bccfe0417c7063 v7-1-006
-+f138491673309c018ffede08cd4858c3bf318dba v7-2-169
-+f13a0227fb8844e591b6526e4393c8f93dadda29 v7-2-305
-+f14cbd913415ac4d6a9968dce20a20291f8c0d05 v7-0097
-+f14f7aab518707c29a8ffb75a4e8217de58dda91 v7-1-212
-+f1d1214744679d401e17e9ba97ecbb6255696ed0 v7-1-287
-+f1d2a58883b96144abcd5b44dbdd190a67b3eb79 v7-0024
-+f1d46f94824128251d1212cfaef0b1bfea4dc71b v7-0163
-+f234c87ac7e9807004cdc559cf68aa5e04850f5e v7-2-248
-+f26d0c74a329cceeed80a7985f5efb5662064283 v7-1-039
-+f2927225367a3ac3fbe86d6d03ebb7a526072ed9 v7-3-039
-+f299f0bf32d76986d5596d279bc0733cebe1942b v7-0-211
-+f2d46e4a859d0f12f12fbf332c40a717dd07df14 v7-0068
-+f30c8ac7741c82503bf897fcebc68f199e5b0998 v7-0225
-+f339305875fa7cd21cb4d42619f5b9789a027eb2 v7-2-229
-+f3669fbc9a31512a0b81fe7f647b935243a76520 v7-0-109
-+f38283ce871c19cb82b1c4d364fbc3a242c057bd v7-3-131
-+f38b7359dafd1f168a15698412d266c17a16520e v7-2-102
-+f398e0cc5b7a032f327aa2f33b71c3bb6a22d46b v7-2-349
-+f3abb6aec8c83ada21d56b8be4ffc6be55ce39ba v7-1-048
-+f3d3545d6bf6405662476b40e019044b880d8f81 v7-2-058
-+f3d7fa7dcf634b669a7d7859bcc39796300346e0 v7-1-035
-+f40f1a8520ffaa57ae73a720c179780025aacd64 v7-0c01
-+f41b6108e46b7cb3794b2a3680f2ce91b402fb21 v7-2a-016
-+f41fa84cd738b945ab34271a92f44e0d1445dda2 v7-0g03
-+f455396f3c3fb524ff1082cfe2cd7731f67877b0 v7-0043
-+f49d72bf9c5c425dfb8bb94c6bac975716e3023c v7-0-124
-+f4a775df722b13250c2b9e6f1154c31ffd9b211f v7-0145
-+f4c7b5da017adf78554a240587384823e58ba80c v7-1-012
-+f4f8014d516e9b9620311aa2bb7a5a2d5749f451 v7-2c-000
-+f529edb9bab3de35ca7451e4d45cc90e9f7aaf81 v7-0025
-+f54dab7cebabe6aa275dd6a379b42a15c365af0a v7-2-280
-+f55897d6921d622ac2649e4c94ddb38d121c2832 v7-0026
-+f5bd6753cdc40733c903090cef1cff033942dcf7 v7-2-440
-+f607f15ab091b6a51b0546db6a6d42adfa599c3d v7-0143
-+f628d19361d9812a1266baec9f76d60c798f92d5 v7-0-195
-+f637471a3607a43bab09a2b61913201a5100e636 v7-2-192
-+f66abfa335bb76d20f2a375f148fb7705bfde287 v7-0-170
-+f6c72dd1962a46aec26c7caac6f1c3789321e91f v7-0-030
-+f713fc55bf7b9a5cbb9ae3628547a78f4e44bcc9 v7-0109
-+f765f9c139de3555cd181bd4fa8de50d4aaf41c8 v7-2-158
-+f798c90439866d3d29eb0fa460d51e4de26f27d8 v7-2-224
-+f79bb032002565143e3392cca0540216e7f93e28 v7-1-241
-+f815aad6c05549bfa36f193dc57b1f03d646bb79 v7-2-343
-+f84061aa57e4498f15155a4a30da40ea07be84e0 v7-2-030
-+f85fe1a05c2ae4c03994c9ea2eb87da590bb3214 v7-3-133
-+f88008797313e07112b8c4e549dc2217747fed98 v7-0-101
-+f892bda292a89e7592ccee5fc0e296659066d7c5 v7-0198
-+f896a7dfd47d15f11ac663f132fa2c5aba91c829 v7-3-052
-+f8f35d8208e6c242026dcedd8300b82f415fc59b v7-0-179
-+f921368d43c3f0b9b32f52f881e7e58242489bb4 v7-3-093
-+f927ca2cedb40441abcd9cf5e18cbde2863761b4 v7-0-226
-+f92bb184582321910573561c941167ca46b9850f v7-0101
-+f9366d458bd09b73aa46cb202c7c6329e608bf0e v7-0-217
-+f959cda54600f8d014cf3a3c69285c598985d828 v7-0-027
-+f987220caa57c4d13b64fcfd24cb4bc6a156bb00 v7-3-094
-+f9bd6784f393aa771d497611b75a8623c20a8269 v7-3-009
-+f9c55e12835e88f072c46b20ac9dac25a46ca839 v7-2-218
-+f9eaf0a9872df3ef8610d3fae404231447954d5e v7-0157
-+f9f6e35c9f00ee6ee518069ff2bf0f93b635b8af v7-2-005
-+fa07532e69c6eec9a6860ef1362f1d8187b8244a v7-1-193
-+fa5dee44df3fd23f96090d225dc11dbc4de7bf20 v7-3-034
-+fa7e62dd58d779149c96570bc8943f1a1b035e3b v7-2-364
-+fa9ee618000f51e5da6c951f24c9bab78f2bb428 v7-0-110
-+fae6fb779a6be78f2609dac4fddb8da508735dc9 v7-3-048
-+faf4b09c396e8572e84eab84eeb60ea0f3785529 v7-3-097
-+fb1222c880fc037f9b76580423c5a57c74acba28 v7-2-344
-+fb60c9f35517660092b161abc1e4aa17a7d0ac05 v7-3-040
-+fbecb12e37f5b1523aa8e6ecc07ea6c07ed65270 v7-2-131
-+fc0c566b91075643f259863d171bb253703698bf v7-0-064
-+fc2ee817dc9861774c31bbe768cddcaca4690e4e v7-1-328
-+fc42d9cc7ad054a21ac8bab2584732ebb191e5a6 v7-1-258
-+fc89a4f98a8b2e51dcdd380a7eede9dbc5cd1282 v7-2-184
-+fc8bf5d4051a1c13085db00c902092215ac9852b v7-2b-017
-+fcb916bed51a5ae096a9f5f5f697a909b2062040 v7-3-055
-+fcea35e2a41fdc928cb92784a4405b4fd220f560 v7-3-112
-+fcf44bf1218f63d94e1807c05f470a4eb87e61a3 v7-2-209
-+fd1b3406fd1cbe1e7250c95f7b30604d7e46b2d1 v7-0d02
-+fd24e02210c9c05b4035ebc717f25ad64d20470a v7-2-276
-+fd3346e3ccc02a11f0c2fa9c2c7351b3cead3941 v7-3-082
-+fd68db1a72b5f05cc5e586ffe89a10ec6930005d v7-1-199
-+fd8864aeb52aa72333573d62f0a9913b0d3e8c8d v7-2-373
-+fddea6c03deefda18c971466e0688d196a62fd6c v7-2b-004
-+fde086181841aa124af8a38b5c0bba132de3ea94 v7-3-002
-+fe26299d6f7015c324bef3829e9ecdf7d08526df v7-2-239
-+fe3ec5ea62f76a623c95a2a4bcc0d396c83488bf v7-1-303
-+fe4ebbec775a55ba5d9bec6070d8d87dc28138f9 v7-2b-014
-+fe52f9888eaaafda72e6f37610327206383ff6a6 v7-2-034
-+fe7db192c7cc7ef3d8cdc6bbd8680833338fd7fe v7-1-299
-+fea3207b800d97b802892d8edabd1d688817249a v7-3-096
-+feb9b421585385b226b4adb98e10f33972068846 v7-2-042
-+febddd8d11b0f8f48e3d3297628fcbfd9f427b19 v7-2-112
-+fef4bd7afb263aa411f12ff13dd1d12c88ad992e v7-2-438
-+ff3a304b4ac2f672e8cc3c60795f0c79c5b191b1 v7-3-066
-+ff5a4a71a761f859af81821d340ac609d9309083 v7-2-156
-+ff77f541d69df4e538f7db4879eb194378c04458 v7-1-252
-+ff9ecf14efe3e2373f2b28fc3e32db4fe19e5ee1 v7-2-203
-+ffa17de19445569ea573550eef332323d83e70bd v7-0-016
-+fff7028d50c8a44a6285ab23b451d975764b8bd5 v7-2-296
-+62e8d93241cd15962f895da4788f21b514238b14 v7-3-142
-+632f43801ddb568f872599499fdcfd9522f8c13f v7-3-143
-+322a5c8d392bd47ceebd24cd21dacf70409fcc91 v7-3-144
-+329a9676040c3182f78e2014322125f8839b5cb6 v7-3-145
-+2bd574a2ef1c0ad487a0673a5867b09cd332d176 v7-3-146
-+55fe8407514f5387ad872a338d77f64a2ad4b5f5 v7-3-147
-+d67916de812ad684718c02e3ff93455ce577be81 v7-3-148
-+7f937a04cdbafd7d179b200f75e988408f8caf3c v7-3-149
-+6146c9859f6558d618e950fe702c11e41ca21105 v7-3-150
-+f169a51f7eadf9a07ed95161143e6209387a4f34 v7-3-151
-+0f7f66682a5563c76ab47e9976fd590d9423a013 v7-3-152
-+d0cae598360945a425859bf8acf22923c29501f4 v7-3-153
-+d72d709f0e18c309069e42d3d7865d68db9e89d7 v7-3-154
-+5747cd65d62b613d5060254849ed4bc1e1e5d714 v7-3-155
-+7fb8cdb9cb25e1409abe45bba959f5f27608d713 v7-3-156
-+9a98d8562637d4c90439125a14224a3403d8bee3 v7-3-157
-+b5f774f159274af375455f32d628881c027417d1 v7-3-158
-+415c55534d901aa4617bf584462faf0c7198e07e v7-3-159
-+c5e47b752f07a95534bbfa83f031a58af67054cb v7-3-160
-+25672ad7f377341ff1de9a0773d8cfcad1d37883 v7-3-161
-+18ad854f5dcd0ba1700c73b03677dbc88b9844c3 v7-3-162
-+e8f012b00187c5a957def85bb3c6f0430f20fed5 v7-3-163
-+cdefcbb70e8cdc1f7185f1023d3a4660d30a074b v7-3-164
-+e92a4b9b4484d1c07d930719ab1370fcaf94d3c5 v7-3-165
-+5ddb68c2a845ad7941d1ae7533a81c12b106dffc v7-3-166
-+0a0d7961b4fe83151b03d98ee904ea7038f64123 v7-3-167
-+930b171ce3fc9dbca3f9da6bf883faa725593c67 v7-3-168
-+5f45bacf31efef21f9b60543504d1832ded3e098 v7-3-169
-+64c3402df964791a7b8c925905423f83af83e930 v7-3-170
-+1bd8af13fb434e4c99bb756052556f4d56cde200 v7-3-171
-+ee48b3da9d53a487f3636df34cace6400d13f32c v7-3-172
-+133d089f247eb7156a6e8c49e0526f41cc082c3c v7-3-173
-+820f12659c50890dbda80e7280086ae1176d1378 v7-3-174
-+537e0102c0f9cc2c0656c298ed1534ef30176eb8 v7-3-175
-+94f42ae4e4e66483fb6cc7305c61820b004c6182 v7-3-176
-+66f2d62271fe77d4acdda5808bd0d3a45be3149c v7-3-177
-+ac639ca9f58f7c71551c19090473395d81a021b6 v7-3-178
-+11e62fb6f8154537f92be5f278c31e737247f781 v7-3-179
-+ed47d18b39c6a672ad4f0caa2f2c3ee897e784a7 v7-3-180
-+5381eb5b1eb9c39797c435ad904bfcb71f1efb01 v7-3-181
-+21346361ce6c7e9afca2e475ceb62f6244197919 v7-3-182
-+e4403440e192d082af7dc8fe3e1a12d24f0e259c v7-3-183
-+b941cc96926a26b62d59f759a021ddb5b51823ed v7-3-184
-+9c8dffc62a41a143230f76376f9a3abf46ff3536 v7-3-185
-+3d1a3aa0240c7a9acdf3feb77b664798e3703463 v7-3-186
-+8bd38abda3149cce7043da86e6093dbebecf63df v7-3-187
-+f2e1c3a90a3bda6ce8977187b365745efd4e5c35 v7-3-188
-+71e1da07e1414740d1d0eed47a346cb3292a9e2e v7-3-189
-+30b7cde2194064040cb7d7e6485a5712b2fc9b40 v7-3-190
-+107b03fdf1ad831e2697c22a04bd3eeaca08c291 v7-3-191
-+8470ac4679c17b69aefb06989c6e8a267761988a v7-3-192
-+e1c5f69de95b99112fae28c23ce6427ca251e50f v7-3-193
-+664c1adcb909aca654c4fe9200364cc741068803 v7-3-194
-+8dbea5adc937ecddf8ca336856cd487e1b118b1a v7-3-195
-+d641f141f9376b3ecf2146e5d68c38bf0227c970 v7-3-196
-+45c536fe48db330c4ee8f1056befe702d9d19cfe v7-3-197
-+b0190e93e601f9061a797689a1eb95a86805f769 v7-3-198
-+c76efe33a3c1db5767cfa4f4bb433466cba6e351 v7-3-199
-+41b17dd070295783af37698b1229a7052ab0549c v7-3-200
-+78859ef2982bbc75dcfbc551e3d8a0ec5c9126eb v7-3-201
-+f80e67bd627114cf7f16098ec4ed7d878816a46b v7-3-202
-+ce1dce2af2a34aec196b7fbe29cf8c653b6ec6de v7-3-203
-+e6ce47f06836721108394f0b921af076606cf715 v7-3-204
-+8d8bd6307b1aa51fe2f592ce45d32abf0f6666d8 v7-3-205
-+46544d3ae7ecb245a2646ae5005a3d67ca380f88 v7-3-206
-+d1445b72ddb7d8b4a44393756b00d21c81212db1 v7-3-207
-+205adc87d579512482c27f309c73d5fe8f612ff3 v7-3-208
-+82cd9f1e8d6b21ef4d59f27b39f041d5cddec19d v7-3-209
-+eeb1ac4f66d1d69c0c75f1028655a81890cf65c2 v7-3-210
-+c7d942260772003e21039f9891775b479311b40e v7-3-211
-+6bbdb9c7a425b0bd90d5823eba9475b850a409fd v7-3-212
-+493897f8bf9057aa0fee4c18d269558d32053cc7 v7-3-213
-+d84a564f28c9e64c3c2a1689af0e0851bc7e5027 v7-3-214
-+b7523ef31e23f1a40cc3950b6ec75b39ad7f762d v7-3-215
-+eb6c704607025d89a0a5d3fd2769a694ac47e0af v7-3-216
-+15705b520c298738588a9a3b8d724c6d86d4cb8c v7-3-217
-+cf89a1d3a0ddd21fe6b734fd72346468b808836f v7-3-218
-+acda456c788ae1b0b45b8c67a93edcccde594819 v7-3-219
-+fe9c7da98b5e2f92e4212e948e98f2d44bf06320 v7-3-220
-+fd4224d9ee09801ed1ad9341a72c4683e291bb76 v7-3-221
-+c3b4b1c89d8ed62a2624bf9404fc79f60223bd81 v7-3-222
-+4e21fd3cfc3084db66f65aef132cb6c5e076cb96 v7-3-223
-+69e0783ed0ef40f72ebeba41f8c98c9992f368c7 v7-3-224
-+c249d9aa60f759286f54781829c1e3da8680c4a7 v7-3-225
-+8477b2cc2b81603408b3fb1a84cd65afb2aadc65 v7-3-226
-+b65a26a2aa095c739e90edb7b980154476529d35 v7-3-227
-+c6df8554b39d009ed146baa48c0cfb351aa8379a v7-3-228
-+07647a0545c9f0fad4e1e84062e0572a07d94659 v7-3-229
-+70c8f54e7efbd7b59bbe6764d0fbfa1f1602273f v7-3-230
-+455a4c85d04d04c732367f915d82c5b3c9a65b50 v7-3-231
-+b67d3a44262a97e7b3ae212fcffb36926b5f53f4 v7-3-232
-+69b90e43b728ec28939b0a536de32f818b7ee756 v7-3-233
-+7653420fdc454be197d59e420a1672909fac7b82 v7-3-234
-+441d364773dc53264b5f26042f8fc6f8b77c8044 v7-3-235
-+c1733ef5b6e87dde521d0d85a1e5e62259854ac1 v7-3-236
-+e3bb93df6c34da672244bce5695c1426da139614 v7-3-237
-+f2c108f44f415c7cfe92862e791a01cc542ac378 v7-3-238
-+0bef86c5c985218a9448fa16d935b913e67af8d5 v7-3-239
-+bf283e37792b4b557a2b9081e4fdb0e10acb9655 v7-3-240
-+0a650db0265381b540df8ca6bd716c4b2d47dfc9 v7-3-241
-+3d96ddbeb3b0003de29b736f63b76675909f133c v7-3-242
-+512ddd87f1a817749c8362bd043682a7bbd87014 v7-3-243
-+be6b6509636242cd7e6fab9a4b8772e97fc9a0db v7-3-244
-+52512eddb876f64399e98d12643233a87c9f2823 v7-3-245
-+3f1a4ed36d1b520a1ad5aa6cbf50d68bc8b9c7a5 v7-3-246
-+7fe2c092913e84e6717782da1f1a220069eebbe7 v7-3-247
-+57a7998e0fa8854a7a8c3946df1d4c9b1ee220e5 v7-3-248
-+9f71f5a526aff4f1e0eefe1068d9534aee427afa v7-3-249
-+f909f4f0f38c71594266b3595d31ce04d4ebe3ec v7-3-250
-+fe6ad3fd85322b394824a5c495a78061a747b074 v7-3-251
-+0b4289bcf8364854dd5f94c42d0252504103e5b9 v7-3-252
-+c21429d7768cd4b834a086dd47881d01bca74e8c v7-3-253
-+1eb805225de7750c03af7b0f7ac2f5dd18d032be v7-3-254
-+aa998de9f9592426c17396b60c5db9170a234024 v7-3-255
-+c296c225736e4489706c62c95752a0c4788be1d3 v7-3-256
-+1fad9c73d77a0030586704cccab1b1a7aba8b58b v7-3-257
-+bdc3335bd72eea207b28fcf8af90a73c855c8847 v7-3-258
-+59130cd78dfc73bd04f22d201b8f7c0772d98e79 v7-3-259
-+cb4682b959098e486977eb4b5969c9eb07d2798e v7-3-260
-+410d42e3d4da09284394456186143d595e9b2efc v7-3-261
-+847733973bfdd716bfafc364a4102e76f88e7fe8 v7-3-262
-+a56259157c935b4e78e9f5f4dfb1436e3461eefb v7-3-263
-+aa40bddeea9a44c6c6b4ffa32c1ef373df437a16 v7-3-264
-+eff686fb8de66a26367f5e6430d34729f1a0e336 v7-3-265
-+25be7c9dda549e4cfa1eb57937dc2b38b3d1e997 v7-3-266
-+ad404f2a4bfa5374e97f29335f41b7ef34cd6bfa v7-3-267
-+ee17ee712512451a54046d6bcd3ddb9f70cb5cdf v7-3-268
-+7f4f5ca70dbde4e31c2de494b982bfb9bd71ed75 v7-3-269
-+b9182da84c7eeda221e5219ef4361cca201b3b41 v7-3-270
-+32a52f06f33b9e2d4817330099b410c1fcf64db2 v7-3-271
-+02f5abca10aee570d5a9cf00928ffaa663daba66 v7-3-272
-+7d4e5e31d8c10c767cdf774a2b13aedd2f95f096 v7-3-273
-+1bb6776fa8c445e0b3f9dd2ed14fdf2a56f5873e v7-3-274
-+125c7bf52271461dfbf46cc33317eadc67aaf742 v7-3-275
-+37a54a85413eae68932233e64a0ab88c99c9d811 v7-3-276
-+e5b17a5f651696ad4c523a21822692115d371250 v7-3-277
-+6622f28b7e87a93de6f1520945d1c5d2a1fc0dab v7-3-278
-+342b176089678e86cde3e1afac4aaaa1e5153f99 v7-3-279
-+58bba69b3371d9ff02b27fe24f044e229c8aa99a v7-3-280
-+45ead8a0bedeade57c320d72e9f710a703e61cf0 v7-3-281
-+92167bb91c95410a0550ff8c94370307bb7d9d80 v7-3-282
-+47b6d37b60122f45eb147106b8da1322c1cdbc60 v7-3-283
-+27d43855b72312500e6fc2122e167a579a1f35f2 v7-3-284
-+6018c815e1205e7db9328fe6ed91b26b514465f3 v7-3-285
-+3f822e54765c54a1112a953e3c37bb60185fd51c v7-3-286
-+07bc2ccfe5559035e785f22851365b3a31dec67e v7-3-287
-+e4f3fa1a474e677dce486ea07ee31270f92b2b4a v7-3-288
-+44ffd0a8abcdba441216514cb711649eb1169876 v7-3-289
-+df33dba4e553f8fa27ba467042f16315c613a00d v7-3-290
-+e8ee4b4ebf41abb199ea9a9e9cc38f9b0c2f7192 v7-3-291
-+b6af1c5dd22f08db2b9e52ae763f193ba82965ad v7-3-292
-+6cd0d6413a2e03687aca8138b2843f1f2aac5b84 v7-3-293
-+dbd73fe939cf772a8b07c19230e5ee60aa0cfcc7 v7-3-294
-+0d8494c051131b6470fe8af67646e235bc63fcf7 v7-3-295
-+c19c15a9e9bf2914b25748c0544936e84a5c77c0 v7-3-296
-+22550986c713ce5f37f069f0c8f99a54dc4a421b v7-3-297
-+43b1d031e3028248abcbd5099841d3aafda7f68d v7-3-298
-+eb4972982bfea006ead5b461f319744d5ecd58f5 v7-3-299
-+2665b456ee59652c7b590dff0fa522ce337e0f16 v7-3-300
-+4a70971530899e32058207cae683a69e7b8f85dc v7-3-301
-+61b2f26623104f75850b1568bf61663597fe7fb0 v7-3-302
-+d832d642f520d426f111b35102450617922547d3 v7-3-303
-+b3a523ced6bd1173e4c17611559c173094830d43 v7-3-304
-+0e06c025f66ffdfea20c8b73a995d23448b8dbfb v7-3-305
-+0787bb5f387b79842d5c9353ae3541a992d1b9f1 v7-3-306
-+880b7dd69331d1fefaf2d8735b118b39d546280c v7-3-307
-+61c5e1527bd857e724f8396c89d0687126390675 v7-3-308
-+6eae1b42c6684f3fcdb4d6cdbfb7dc1942d9b364 v7-3-309
-+51ce22ba89d11505e18aa585fbd7dcbb22097f9a v7-3-310
-+2cbde6bcc6238f41506f87bf31ff7d90f632345a v7-3-311
-+0ed06069aaf32dbb2aa3827b23280b0028954ce7 v7-3-312
-+dc60200a16b21c3e4157708bb825ea61b9e5bdc1 v7-3-313
-+6ab1b45cc95ed56105b2130dc9938bb8344ff903 v7-3-314
-+3ecf9e91d88acdb5eaaf93cc15a18914b60e0eb3 v7-3-315
-+33c140e4664d102c34ec3ec5a17318f75cf475d7 v7-3-316
-+92a181a1cec3fec52cde1b3d71f628a3a2dc53c6 v7-3-317
-+d68f20a86a3ec75d927955be5d31983b6c37eb1d v7-3-318
-+dc7f2f9759208aa07bf136deca661fd080a1ee68 v7-3-319
-+738ea87c196431c452bd499c5a9849597ac938de v7-3-320
-+fc0804089b2945bfe683f9bc9ee0238b8c64a46e v7-3-321
-+38a7fd9043474dfb464c338ffd7f393361f5a6c1 v7-3-322
-+3bdb646fc8a46ee5a5fe474dccdce098680d24d6 v7-3-323
-+f04619f1fc1663f4ab05798c410e4fa35a9dd863 v7-3-324
-+8aca621c00910556d4f52bd650d6841d6059d6ec v7-3-325
-+d3758064ff9946d23aeccc9d2340686766647b84 v7-3-326
-+9028c70adafd109ab294102f74dfb5005a20bbfb v7-3-327
-+5b53cea62e5d1be2a1a36ce685c15f99bb8a41ba v7-3-328
-+ec901ddc84d5c66c5d0c1dcca093584598487f9f v7-3-329
-+abb03be99d661455fd3790cd25355459448fa432 v7-3-330
-+4b8c614c1c914ce5d712368a75dbfea9b7e44e17 v7-3-331
-+0ecfe54a273f6bc440684aca4ebe5926a2dfc6e2 v7-3-332
-+992b24149a9ee0d6f417e40a7462891a9f62ec6a v7-3-333
-+fdc72363229865cc6fd2da9db66f1d6e683b87c0 v7-3-334
-+dc3f90a73fb375092ea9d870ae48ff31b31a56ab v7-3-335
-+52526aec4afb220a1271e9a645194c42d3b2a538 v7-3-336
-+176bfa951339a0a36366cbc8def41ae75f5034e0 v7-3-337
-+7919a3d7333b99cece7d1a2657c89c18de78bf82 v7-3-338
-+b5a2b4c0c1cac1758990ea449bc1c552522f39a9 v7-3-339
-+49b08c9b9f5b72d930a1c02f00aa4128dc58532d v7-3-340
-+6963603ec6dc2b47da9a7e951b2d0b3e024535eb v7-3-341
-+314d9368069ec0458631ca150c202e7f724ad6d3 v7-3-342
-+98a05814f1b466c87611b810eeafe8e7d9c581b6 v7-3-343
-+7ba2f171cdaca18571b5e73dece426411c4f124a v7-3-344
-+35f098371af699aa7e614a6397a068119b54cabf v7-3-345
-+af76a61a7f79ccd3bcf64e15c73f2a3ea0eb77da v7-3-346
-+72528c5eb87ea315a7c1a48f7734d1717c28820f v7-3-347
-+4d4a328f199e4020457b4bf8f077622966bb3563 v7-3-348
-+075acc2dccaa621998ccb1d671a987090367d485 v7-3-349
-+07956eab189c0c776b79bc42235833d234480559 v7-3-350
-+ff69efc4bc55d83b5f2bb68aeede1d921e8f1036 v7-3-351
-+ca65249eb34bc62e82d54f74e14271be7f7f8a44 v7-3-352
-+12bb368fef2c8c5478f0f8905aac381a56a75fe0 v7-3-353
-+6672b1645306ceab4348caaffec40990dc319b98 v7-3-354
-+d2f70593afeb432611cdb0ea2a0600c2869a20e0 v7-3-355
-+c349a670716ab5e5f01b8121f3b7f07560ce0b8a v7-3-356
-+e618700297e83c0d51efbb77a849ce5f0b19b507 v7-3-357
-+97a52300ef2b496b6c8e2487973f134d9e0afba8 v7-3-358
-+b7f0f23bf90603f83854fd1aece09fcc64876a29 v7-3-359
-+28480c9006e6e6936aae05de1f3ca3eaf4d2f267 v7-3-360
-+e42252611e74c1df2063955d6086f59fb3e3247d v7-3-361
-+074ddc768feadcb3164973c7f7be8bf78dbdd56e v7-3-362
-+c025592d7b1dd658955b9a6d2d159c04e83c31e0 v7-3-363
-+b0bbaf1020f08fa6dbeb059e251127e27fab9ecc v7-3-364
-+54ef99c39139cad53db24bcdc18470394d76b40f v7-3-365
-+436b42f3cba1896b65ad32e791d131a7c3978738 v7-3-366
-+972bd3fca5562b8752ae18313e8cb3e6fac207c5 v7-3-367
-+4e9c5338f44c24d511a989b5ea50850a2b9110b6 v7-3-368
-+0df9718c45b68c0aaa40934bb54b3217b0c24495 v7-3-369
-+3801e4811b0ecd56667fe89172ed37a84047307d v7-3-370
-+e757e1127d210632cc920d9a0d2d2a3b89be7ffe v7-3-371
-+6ff80dd02b51e9bd6d3c1b0167b81e295b0b4881 v7-3-372
-+a1d2f741d45c8731450db862e89eb4a650796fe9 v7-3-373
-+0a9d7cf90f94945578b83883e2ade369ecfbfc6d v7-3-374
-+767bb493e7d31273edc45f4cb6602784f639f516 v7-3-375
-+1d7434010de186b02fd6a5c8eef3e28108a4a251 v7-3-376
-+cd145cc2f2c918b9fd77dc177f69805c77e31e41 v7-3-377
-+a7517e84d9b8191092ff849e520558d61be01f71 v7-3-378
-+0f193ef0f4298ed632b5e9dc88c7efefe093728b v7-3-379
-+534b3ef1cf1440a9e22c2efc7f2673017024f124 v7-3-380
-+6cc788692b2e8e043a3d7fff4e1efa2601ad39c7 v7-3-381
-+2260435283f2ba0ac8d0b35e216b297605ef81db v7-3-382
-+f8d2ef4512f8d78c00a7aff24fb8f99aced6f2d6 v7-3-383
-+e958eeffa0a7d0ed2021f2f4b61ed9e5daf3d9a5 v7-3-384
-+910eb66c97684b3c0511789e7655dce2c7ba254a v7-3-385
-+1cedbee50ca65fc96eca2d360ddf886b3e7ad74f v7-3-386
-+ac16c62282ac0e961afa44b556fe850dd6c8e1aa v7-3-387
-+683fab13904c115b4e1f8b9ecb902d192501245d v7-3-388
-+c97c3272d7a67a2980ddc291f12f09c36568c54c v7-3-389
-+48252b5fd17042ae95c6736073ba3c5b12820f2c v7-3-390
-+819322e0e93e50c04fa79163f9b88085cbe7db8d v7-3-391
-+c4898d6d73a2ffa55fc91f79f8e110260eda29cb v7-3-392
-+e0248b732a5cf0c4e6d61253564f3f855d11a755 v7-3-393
-+927c7377cf49bbbf87d12863c2a2d462c9cf97a7 v7-3-394
-+80c529a5650f1d70342f18c681b69d7897495006 v7-3-395
-+2f075595590f498f1a9cfc42dfce24cd0d980e96 v7-3-396
-+75217982ea460e7bdfdd2517d8d4e4f0d0ebaef4 v7-3-397
-+9eb7fdfb5e63ad98f6feb81b03566fbdc5ebd895 v7-3-398
-+ce6afdc00290520fb2d9677b44a0cbb70bc401e6 v7-3-399
-+320cc46d0eb022bfb24d1b636050becc83ac0014 v7-3-400
-+1251e1ce94610b265d3c1f636d379a0504cf2ae5 v7-3-401
-+4eda43e1fce06ef32d0a79721fa0a6850a72b4dc v7-3-402
-+5850b58276918de8edf19ece0bd258e179967af8 v7-3-403
-+8b928bc814a8d502f25a06ddfa66b0474b89a73f v7-3-404
-+c75a8d2404bd4f1297aafbb10ab1ae68ba678249 v7-3-405
-+fbb23bd517f8614f512cd81b253519cbf4548863 v7-3-406
-+55cebc7e5de078ef323a94ad79319c0ab33b09ef v7-3-407
-+1fec3c62f6e8065c2f7ea7422213e78b50032de6 v7-3-408
-+7b59c2c032ca8a15425afb1b519c809abfd572f0 v7-3-409
-+5cf2a671d8ebdf46590b8fe349ad2b6f84eed868 v7-3-410
-+8066fb7e356481b52019a52696072594d2590d4f v7-3-411
-+aaee6093302281b70798ae4dc599145b95891908 v7-3-412
-+821c8be2e9d604282481f50f7c5a1a210b9b1696 v7-3-413
-+c7861dd3b593a2011ae46dbe43d78f44cdf2d99f v7-3-414
-+e7e4dbac7ded5e048e289c7fd92c40e29f775758 v7-3-415
-+5c5ca538693fbfd3a574998693094b48f19ec12e v7-3-416
-+5c5ca538693fbfd3a574998693094b48f19ec12e v7-3-416
-+22a626604672b37914ae929b0d5e11e3efb0d79f v7-3-416
-+63d3541d07339c65d602bac2bbc72d755b416ad8 v7-3-417
-+4500a0ad2e0a24f54e5c4b4a3266456cd5ccb2eb v7-3-418
-+f4574729f6df749668df181a9dc09030f37de2ad v7-3-419
-+ded8f5add04c9477c47098a66991f971324787f2 v7-3-420
-+076003f52582c2ec0b4851df539edf512945778c v7-3-421
-+60f6df978a413952e37d03b85a50ca858456b53b v7-3-422
-+b7811ab264bf31e0049e7a9b689a399ead6cbda6 v7-3-423
-+2e4539dc2de7da0aed83286304d1afeb0a4cdb3d v7-3-424
-+7b17a38eb223b4b56327f019267c1156121f5c0f v7-3-425
-+c70c005f61fb08ca032b4eab533908cfc6e6f40a v7-3-426
-+45467d77047df9134a7694367bf97344441b1b3c v7-3-427
-+d473f39aeadf6d022e520968db17257b42b52b61 v7-3-428
-+c9366ca36f6feb95bd8e01dbed9973a404f5391e v7-3-429
-+a9f8dd20a49f9b8296a6ef6d9e17e3446c0974eb v7-3-430
-+a27fac494e709a3cb78399f5dbc5d807a1dc7a46 v7-3-431
-+81201fb337a58a58cbac43c2b89025c681361df7 v7-3-432
-+8a731d7f0664b13176afb640ed0325949836962d v7-3-433
-+636c2b1cdc8b6cc5279ac7d5986da1085484b98a v7-3-434
-+afbf45d854965f9e557497ab9d4d9aca87e220fd v7-3-435
-+2a6eb75275d94b864eba6d6135de650a903a4a7e v7-3-436
-+539613ce999d3a938c602a6b6eb230fd0d77a1d1 v7-3-437
-+bb67cd961fc3011d367357c215a0603dcc46ea40 v7-3-438
-+dec4338a7da22b02e7c7cc65668d35db264d3400 v7-3-439
-+e3cbb11f3555d5dbb1cbd3daac4a958a9e1f01ea v7-3-440
-+af4ed13ca541f034e3241f2eda1abdb3b45d1770 v7-3-441
-+198ec1fff71a44a35aa7a59b4952583a82a296fa v7-3-442
-+de050fcc24cfb56a7dc07dd283cc1132d774e7b7 v7-3-443
-+72146e7f47fa647f19fe419f4c8602897880eed5 v7-3-444
-+397e7e49bb0b831f7260d3ad70f6b07175c44a0c v7-3-445
-+20ca2e05ae20ece942490182691ed45746f64cb6 v7-3-446
-+6a03b0ea2e12d748c1e4199e3f428ee080760939 v7-3-447
-+756d712b3118b896b57ddb4f4c071135bc031607 v7-3-448
-+9ccdc4a69d8ff7aab8abf89f9a3cc9dad12249dd v7-3-449
-+3479ac596f6c4b38849d2e5235ad590378605eb8 v7-3-450
-+045fdc5b6056a18579f28b40a4914f4a7cb8d4a3 v7-3-451
-+f1cde9cf023e15cd1bc26ae720d6380fa5ceac7d v7-3-452
-+791baa7b35e1b6244cdecd4a2feed933f78fd84f v7-3-453
-+1632640a24b42a9193eeb8f6e8150afaeee5ee35 v7-3-454
-+e6392f2aed4c13170664b4ec13dd2d8b3ce968aa v7-3-455
-+07fd030f89be62aa11c4ea1a188ee2d8f4348677 v7-3-456
-+4a2744311b3f3c8207189dee4ef405959a2e2446 v7-3-457
-+da670fb71d30a1eefb07b19256f8c0d677807550 v7-3-458
-+cb2ae92ce106de532c53f8a16a82bc2bf6edacd2 v7-3-459
-+981c7ad9dd48cac1b4030b97c2f0dc0b8fe82337 v7-3-460
-+de60f6fa3d8d77442a39ec13efef89f6ca76af03 v7-3-461
-+70eff6af1158f9dc99118ba73e81f456015c3ebd v7-3-462
-+8e0fe5a723adfb45c44978083db7aeac11e6d72b v7-3-463
-+43259e4542c76e950fecc86114c43065064d1b34 v7-3-464
-+d1096a4e96bdd5bfc0ce2f1aaddcbff1475c69ad v7-3-465
-+df9c7798b5e2c022310cd12e199c9de8d866aa39 v7-3-466
-+276d58e9265cfee76c04bc5450681090900a16f4 v7-3-467
-+38a1357304234dcea96f96019abf0f3e5ae290ab v7-3-468
-+e61c3b09ae86a8a448ad2d028df6fa6b9778666b v7-3-469
-+636e4db6e2075bd22640cfc8229af62059f8ffe0 v7-3-470
-+3465a9e7758850684d18a9bb11ac033efdcd1755 v7-3-471
-+8332129d9ae8f11f8ecb9f016e5292c6582bbb4e v7-3-472
-+7f1bce9c9b79d4ebbf798d6122612934d55d70d9 v7-3-473
-+7613c9ab083f3e9262be5a21fe086921b757da4c v7-3-474
-+36160830a5e8d0e3b4174aa7d98363623468b77c v7-3-475
-+fb2c5a51dac7f1dbce6a0f35808927ac206c7f47 v7-3-476
-+62dc0d69ab11d5b5a67c6139a0dd3e2618d2c2a1 v7-3-477
-+754db405921292fc57dbdaa85e62af333dce5912 v7-3-478
-+3db4282d5e6bb74a5c1094f35a81472d5a98f313 v7-3-479
-+b35844f3eb49bb84101fdb276e3e69b0b8f7813f v7-3-480
-+8e21ac7f2d6e9f269b057939dda58d3a31beb894 v7-3-481
-+3229335d0c4e6cd7e91e6e61d791d7dff7d3082d v7-3-482
-+19040069b8bf1818db44396a150acb54f47c3a96 v7-3-483
-+00fa605e7d7ba7d522c627a93de6e2f5017d2884 v7-3-484
-+94374e0b6267d8983a73a22166888c2282ee793d v7-3-485
-+08a37c57af479b54fa327bedc0ef31c42dd96f63 v7-3-486
-+21219ffc97903684349f1fcc843eb61838877874 v7-3-487
-+8691bdcdbf66733c7ec1ef8161da1d4ef49dce66 v7-3-488
-+c1a6e1745cb521f863e63670e6c22c1c682ab4b1 v7-3-489
-+b067b8b81be9c2839df75824da2e88da24b07b54 v7-3-490
-+e070b34fe35e6e8c40ec31a08196dd81353db4e5 v7-3-491
-+214c7ec1c8f995664d5684da8cbeaaa86850468f v7-3-492
-+bf5960ec253293b7240f59a7682f2e862dacd205 v7-3-493
-+5240610f277823478983e3f04abfbed4e85141cf v7-3-494
-+27f6a22ff88eea07f24163fe470b7335f3c1b32b v7-3-495
-+3daba355b0c15ef66a9d2810ae7c7cc534dccf62 v7-3-496
-+e34c620007be9fd805556c43fe848de521f3b64c v7-3-497
-+b1a42d2522fb4ff627a0c381e994e2a598f7bbbb v7-3-498
-+4a2cb025b6417b00f2ced076eb79739e03acd7d4 v7-3-499
-+b36640b2f671c006fe26b573fd42347227efbfa8 v7-3-500
-+d7b335626ddc7a61667cb3e23ecadfe399b676fb v7-3-501
-+1d1cce57421c78884cff2d3234d3759bc858d6fb v7-3-502
-+65d036fd449e488303e78d2c6679a736551c39a6 v7-3-503
-+17bfcb054cb770ac685acaa349165f210bdd36ca v7-3-504
-+fe7bf24804e195209bef4cd008f0bac7eec7fc60 v7-3-505
-+982f84487daf102f1203977a09f2c6c76d1ed3d5 v7-3-506
-+f9a865d97614940f817b76642282d966781296e5 v7-3-507
-+2722f11ddc998ac7c578c68c0248b58468179418 v7-3-508
-+8101253704f6504bed3f0209e9a6fcae3966c6e7 v7-3-509
-+53786601213cd9f86db8714f7b0e077b05e2704f v7-3-510
-+b782e2f9e6892116ae5d068249b5198bbe0042c6 v7-3-511
-+454646820185cbe13e1f2e4f7533b984d3b07b18 v7-3-512
-+75037f9bc97ad76bca58dbbc0ddac69cc7f5d9ac v7-3-513
-+7e4428115d2cea86fcfa980097c98c11380ae196 v7-3-514
-+6c318419e3310fb9658ee6ead6b4ea33def8cb6d v7-3-515
-+02440d1fcc9aa953ebb7c0719405ccf2525f2777 v7-3-516
-+9a1dba1f969ac4cb2477626cd79a7a6b0bea1894 v7-3-517
-+ec4ab9d832b0f5308c861423d99253fa496b3a3b v7-3-518
-+ebec52bc2800b8e51e522425fdca5c252e6d4f8e v7-3-519
-+7bafe52b6245761a242321352daca224e6b9df78 v7-3-520
-+b14842cf382bd3f99ca090c985609c6dead5f9e0 v7-3-521
-+e4899d2ff5d8e552ace52b7eafe02b2c5dcdb409 v7-3-522
-+d8ce4a2eb44e3e3d56db5e26d9982aeb48d7814b v7-3-523
-+ae1641c4fbcc8c25d27802d6048cb0767c4021d1 v7-3-524
-+ac2e00f917df566b81b9e33891b102cba5b390e0 v7-3-525
-+257c2878e0fcabd5504dcfed910287374405440a v7-3-526
-+a17918b76ca1296f63db0e81dea0e37b8b880150 v7-3-527
-+fa17c8646feb4719639150f1c301ce6c1557afb7 v7-3-528
-+d83218a156dd8258a5f2f3ae019c56f3e8851d48 v7-3-529
-+81d5f3a3e27fff9188ae34c41b939fc88c9837de v7-3-530
-+c44f0f7424b98d321d90994198374628911623ce v7-3-531
-+9755d151c7492a5f1d0e77a2d3c9e414f20f3b4e v7-3-532
-+74d51b51f3e69df7d3295255ee10391b3409055b v7-3-533
-+65f905eb14cd373e205ff4c8a53027514e96d819 v7-3-534
-+f52d2ea0f81c20e6f026d74cec66b135d5470d2d v7-3-535
-+a8897fd5d074d7baaba692013521304b13beb784 v7-3-536
-+96715c3a905faa1bbdc50b16b0f57671b4758e0c v7-3-537
-+bbf1fbbe4ab45442f8876790004805503e25f563 v7-3-538
-+7a710cf51d73cb3c3c76fcea34ee706443800c54 v7-3-539
-+af083cb521bcb69aae315654a3873c488dc58c43 v7-3-540
-+5c1aaf9b4b1bc2d14d627fe22d414f3a2525c50b v7-3-541
-+8d1b63e6d3173625324f4adfe733efc8091f9422 v7-3-542
-+ce7bd50bafa74f4da979f27c4e5fa9a47e69d739 v7-3-543
-+09d0bda69df0c5eb505a02e37a978e92fbc89332 v7-3-544
-+e7ff3251dfa157284a48c5322783499d079e3eb0 v7-3-545
-+0a364618c0e59fa777f526c99bee608bb5cf55ce v7-3-546
-+4f4db5d661c4fae42f2d917c09549d58a2f4d05f v7-3-547
-+8625e38066dbf6a4d5e2563fbe191c3910681d2e v7-3-548
-+c0c935956ac3b7c706043e5c7c0ba840636fb10f v7-3-549
-+297771eff080ed3bcfb2ade57c2dcab34bac5de8 v7-3-550
-+e83c5dcea112a44f9a7b06042b52798e32d96541 v7-3-551
-+443c50cd3e8811b58a4ca131ab21abd18aea9489 v7-3-552
-+583e46e4a56c40fa1a7336be85eaec93f6800edf v7-3-553
-+a967a979c37f458bd4d164afb8a6192a5b4a6fde v7-3-554
-+8fb7bd9dfb2b26b43725c90e042d2089762466a6 v7-3-555
-+b8924014a03991b79947d735a894e2c2e8f94980 v7-3-556
-+a220dd97b5c7218558eaea27d301af2ed4f9ec2d v7-3-557
-+34724dc5172bb81a9e670c5bd23edbe6a124fd28 v7-3-558
-+74adc9f7e15b8c088abd04de35615cad6c83a811 v7-3-559
-+0abd38ba64557c4a6d62575aaa3fc7ab6482d747 v7-3-560
-+a1de7928a7aba45240c85a2bc8d70adadc49e4dc v7-3-561
-+b2763055bdf26e1f11bf8cfb0601fefbefb34e0d v7-3-562
-+02c86cdcf9a23f092400c7631e5906cb9053703b v7-3-563
-+683de93060968ed4e9dfb7992910c75f479471ec v7-3-564
-+5f811338b1186e1aef683d03fa05a8026d30e9f1 v7-3-565
-+18c6b1752d0baab043792d3f6267ec393f7a11e1 v7-3-566
-+f90bb88c261582fef85c16009f19168b38debd74 v7-3-567
-+3b5f541269e2d9e57b82ea1ec89c6747e2003434 v7-3-568
-+c052f3b79b9948e7072580e7db42f90c92eb40af v7-3-569
-+4f1c511e71f851c4f1c14e950f95ebd6967c6ed1 v7-3-570
-+43fd3896fab7be5ad01deed2960d37d91ba65691 v7-3-571
-+3ae387af405f46e200fdf9bc204d0a251864abb9 v7-3-572
-+802b1a1b275f5c8f95724d50d53642f221621d79 v7-3-573
-+3ac005f02cf015b3aa246482c6331bd61c08d91a v7-3-574
-+79ae10bd056520fb6367247804af22e52d2de8b8 v7-3-575
-+7e3fedfc3d08d020e3ce047ec1a1cfd195af9ed7 v7-3-576
-+286ba0251c0aff1a664a481846c1f4107fae0c11 v7-3-577
-+0e9b2622c94a8edf906d6c44831c1cded7184d13 v7-3-578
-+80ed6aa7b9eb18058a0b105af2ecd7b213891be2 v7-3-579
-+f02b6ad168ae82ead0286b64627762ab2343ee96 v7-3-580
-+96249a1803e28e6173faed53f8687334aa63360c v7-3-581
-+d383bc2ba8112103389a44c2c747eaa1016da935 v7-3-582
-+a69b1d711ff9d8b227acff694c53310cf237933f v7-3-583
-+2d107086903af80afee524549e57d3ba016b3f12 v7-3-584
-+d258a0c5c38a6a604b983b6499a0f02bc061c816 v7-3-585
-+8393a16069fb5f7b22ab766167b698e4dc129911 v7-3-586
-+a34fb0a077c9c26946727a25222e0a99dc08db0d v7-3-587
-+e92cc285632dc29d932061970e43b53cdbb3460d v7-3-588
-+e82937b753a8ca6705bf55dbf258f077746ec428 v7-3-589
-+bdf7f3e4c763f2a038c397af8eb6b8950e58db6b v7-3-590
-+e5b925ae56e36e86eb2ff059aa28d6a2dd332845 v7-3-591
-+0e06193d4bd7be03924dd9c6251a64c6c6adf78d v7-3-592
-+46896c29edd74418c665af7c1ed685aa52a41e1a v7-3-593
-+5e7b500dbb7e9e964457d300b536aeba9771af6c v7-3-594
-+928e7cef8836d13d4f2a17234e127b928ee63ff4 v7-3-595
-+5aad2c444a00a2309e6e373b6bcb5441669ba126 v7-3-596
-+b9aa7fb4a9281b87a651251f799e049409634757 v7-3-597
-+f0747581607924c30530687fa88ebaa57602eb5f v7-3-598
-+b06578f1390fea339a2d9d18e12758ec1dbcc279 v7-3-599
-+8f98038a0bf34310a8224a569eacd539b7b8b649 v7-3-600
-+c1780b4cb9955fc113c3c993c18c139e06425ef5 v7-3-601
-+5cacdf56c94b6fa1992f7e9c07c95bfe52bcccec v7-3-602
-+085f14642fe828b1cbae5706ca87f2932cebeb75 v7-3-603
-+acd91c9741a6d0185b7c63db412888de4f904118 v7-3-604
-+4873d9c4ad3b7214d3ea8af9712a87ff69948380 v7-3-605
-+c612d154bcdd642e4097ae88526a81ed7868c184 v7-3-606
-+002f2c5de317aaedb93bd2e506a295efe2d552ce v7-3-607
-+d47e6222d1cde1caf08fa63104375f5750c25d90 v7-3-608
-+d29aa05b7e311bc05491521f4059ca2b625c5550 v7-3-609
-+9f48a54329975434d73ddfc19e33c343653d5c73 v7-3-610
-+e13f2f3568e1e21fbd223a1c0627605e2b670c53 v7-3-611
-+2b4b6185054ff05fb6ee3ab1bcde47409bf2ebe0 v7-3-612
-+c03b6363492b26c02b4f8a725a91849a1a5cf548 v7-3-613
-+2bb51730ef4bb0824658f7507edad165e194dd45 v7-3-614
-+169ccc471a8a947c046b7ff41023b9045beb3496 v7-3-615
-+baba6286c91e63dd42039206e3e0990fb0ac346f v7-3-616
-+73db39ca1877a07008310a2ec98a2220e50c52f1 v7-3-617
-+0b1cb3f839c48daaccbb3abcbd5f1c394c57cb10 v7-3-618
-+27ecf0c87bd20140d9e85d4fd581332e0916191e v7-3-619
-+a6ebae140d89f35876628cde44f0e7ee5a0ae1d2 v7-3-620
-+ac13ea2b098d98e62408ec2d88026f690f68f940 v7-3-621
-+52247eb615118965bb6a949307e9abfd378cd088 v7-3-622
-+a46a101bfddd4fcf30759f3847fa1e18546907f4 v7-3-623
-+06749e351b1c030acf50cf8c469f8973aff4a96a v7-3-624
-+f43ffd820a46bf47b3e55b56d3e5334302383757 v7-3-625
-+956b1ed19282518e0287891d4e7b2b8a3f850402 v7-3-626
-+dc65e6429d2c1b79719455d7303f3f95c5897965 v7-3-627
-+1ed93878d6e224d46a7c125a82e52338b9bf0f6b v7-3-628
-+7de7ef01288db1abc944293a28aac13ddd87879e v7-3-629
-+3416ac23d0758528919aaffbe02cecc6420b8aac v7-3-630
-+99f076ca8d846d553aefd7e626ca938bcf93f259 v7-3-631
-+44038a9777aaf0e6502e0eb57b8f7ccf31798ec4 v7-3-632
-+ad5fbf3596e0a8ad15c260c5b529efc5ac689e13 v7-3-633
-+b7eea24095073d55ac3c59664466b78a0525bebc v7-3-634
-+f7f68f83fc335379bc9e3371c5118b8f81c8d5bc v7-3-635
-+616bc1ad4f12be0ef37fe67d2f6ed7535f20e515 v7-3-636
-+3b62d8f36cdf709d4e0575d63486ebe57ce7150c v7-3-637
-+c0256c4bd91ed7b806aab002e4a45e440dd00343 v7-3-638
-+1ec385a8faf4002fa300caf370ef2ac380d9702a v7-3-639
-+c2c3577021ed4e354853d330e5fc60691d8750c5 v7-3-640
-+c068389057c9a89fa351678b5f5776278971dabe v7-3-641
-+79ac6744237ce5076a6d2e2b21198dfddc2cc9dd v7-3-642
-+fdac34e3afa5f0dea26dba5e96932e3b9a0be50a v7-3-643
-+fb7c028dcac7555fee78096813e3846d157cc91b v7-3-644
-+1810ee914648ef3e16a8cf866299a32c4a9a00cb v7-3-645
-+e70485d3f81df4d72cb40d6fa4ad4218cf1e8392 v7-3-646
-+29fe4e5c1db17a62b16a95fdda84f08cd05c27b5 v7-3-647
-+76c099d45772a233982c39a29510d89eaa4d5a1c v7-3-648
-+063765c3cebbd6040dc091b8c1ba28739fef9118 v7-3-649
-+a638ae0f1b0cc41d8d753d79503238f11215f3ea v7-3-650
-+ece544e85821a6118da55dad1538ea4c3625bd1c v7-3-651
-+5edf3c51aa93110e57fcd0428c30e5bed149df34 v7-3-652
-+fd0c7452fa51118d8f6557b34b4cc96e830ef6c7 v7-3-653
-+73557eda70271b49015265b7147562b63a7a094d v7-3-654
-+0d3238b54963c4b1358a1f33221f75e067c1613f v7-3-655
-+a2f61b2b8e770bb8d233ce50c8c7508508578a8b v7-3-656
-+3958b0e672d676a310d756bff1b9c629a7b0142f v7-3-657
-+15cdcb8ddcfb848c929cc37e239d5da8fe48a8d9 v7-3-658
-+e75da4a3225d48e59ee321411134cf9999348b7d v7-3-659
-+8fdadfccd184b7de73811a3a18dc8815b7eb3434 v7-3-660
-+5e909c379a1e87491bfa95ba1a37b39d0725933b v7-3-661
-+87afa95a2992a31b1937def0e1db4a193b0ab32f v7-3-662
-+2a200527131fac8f50487790ec201badbccdaf0e v7-3-663
-+f86619764a1e0338ef9e14c653a5909847304b8b v7-3-664
-+35939e1e25ff5a3862b83248f8039971c81936d0 v7-3-665
-+1e22adc6176ec07f52102f383a9c3c414d43f9c2 v7-3-666
-+cd36c0fed43e63a94d6e87b5c5c0b4d95628da27 v7-3-667
-+dde6d0216a08a5554f3c351e519134c386d14232 v7-3-668
-+2b3b7b48370848149c8b831b2b7aee9b7f4f88bb v7-3-669
-+2bf8c00741f7f07d9b58596764236a92eaeca862 v7-3-670
-+530f5a9030315f984e096794938c61f9d3562e22 v7-3-671
-+fd6ef931aa77239804860b74ed2362b29c1a6d4a v7-3-672
-+ca1c025079b11c98363e11576d903af756a593fc v7-3-673
-+4da6003f0f0eee0f3908f8627af6d13a94c10cc6 v7-3-674
-+9963f7a9b41b555a0660288dd94df44b6dee7c2e v7-3-675
-+5309996ddcedd7e2dcc8c46624348405290b8940 v7-3-676
-+8115f449a574bc146f75449161f1757aaa5bbb66 v7-3-677
-+de253f606048a2862a338190b071e5e3c7de7a41 v7-3-678
-+dd0f25ede9a8322b5b638961835cc4743cd479a2 v7-3-679
-+52acec46b75ecf24d044982d4cc067ef7890e7d6 v7-3-680
-+a2fe24ec6a0d06d0af286b9fee9e307c33f27cca v7-3-681
-+8eb5b61161b4c56b378ec829e360204102d22db4 v7-3-682
-+0f5ee262963528ddccfa1f54b83696f939d21b53 v7-3-683
-+1cc37b8cfaa1c670e442e2f9444feeb1820228bc v7-3-684
-+34aa94a421b7a03a71013ddbb92937dbaf83b1aa v7-3-685
-+ba9c9d0c4ff4cf56c3c5d2dec2da71decbbe9f6a v7-3-686
-+0545dab1517f8ce2b8319c02572e4bb357567034 v7-3-687
-+2696da84d37093da0dea419878e4241385eb515b v7-3-688
-+3c072c1cb87372f3ebd345463abbc451e80143e2 v7-3-689
-+caa0ca9ad06cb515b7e6d2e4410e03802b58e167 v7-3-690
-+7f10daa706bb6ed0c39f1d2905cd78368a98d19f v7-3-691
-+337a4368fd2b68b9822b94e595d77b4d6773bfa4 v7-3-692
-+fd96b3cc88ed71d4c4d24c6ac67c9d3a68ae6e6b v7-3-693
-+8235ccf121bb241f8105d0ba6e1c92e9f8b04555 v7-3-694
-+cd6c420e31d6843fa1231e1cf7a3d9eff0ad4e07 v7-3-695
-+447c688b82eb4a5eb7cd0e16521094b77160fd0f v7-3-696
-+7c72b5f7ada1f4a028315aa50f8739e0e83c2e74 v7-3-697
-+b5b892472ecb1a10cce1709e41700b264b6485d2 v7-3-698
-+4ffb6f9b58e0b51923fe6a71e6af158b6e3f7864 v7-3-699
-+c656847932d33b5d68394ae1ea3153dbdba4d3ff v7-3-700
-+48af8656094539f8f71dc51e0a6aa14d48ddffd0 v7-3-701
-+916b5c11a13e9978c85f9742546e70d614116883 v7-3-702
-+f69321485951a3c9bd0e9e7484a1901b94cae726 v7-3-703
-+be8ad9c9b973a4d87b9bcfee2b6a8de1f6d3e071 v7-3-704
-+0aa74f2f50a8333fd5544f5d4b383132be41704c v7-3-705
-+d0ae72c2f5f94e2483ab0979eec652b1289679a8 v7-3-706
-+d24d309c365fc5c6a9324a6183d7b927d9f5132f v7-3-707
-+64427849c1582299f2af389c6225eead529f0329 v7-3-708
-+fb7dec372910b61478abdd7f79871724153ebfdd v7-3-709
-+906eb5c0ef129b6876fa9c6c5a13e44807f7a503 v7-3-710
-+2a7b2943be22c27edb3c0334423c1b17275f18fb v7-3-711
-+557ef119999ea687ccb84eddca295755c24989da v7-3-712
-+f15769bce0b811fc840fd455035270288e8d744d v7-3-713
-+9ea14f097855e0929f86c86d405725717efb044d v7-3-714
-+4f0ddf4137eeb08753f2593a32b42a1dcb1e6f4c v7-3-715
-+eb268db98f321b93f5e7552920b6389f9dddfd3f v7-3-716
-+6a76846b84eb0fe1220f8cfa19b1161145932d4d v7-3-717
-+18e95db59826aa9379e6e3ada5d3540cbae1e596 v7-3-718
-+e6d8b44065bc05741effbc0635c21506032d97b4 v7-3-719
-+9e119e0ade5d804f174a3b67ad5e0d0e7449739f v7-3-720
-+b23f583e132e88ec98f2b449b7216642ba64a8a8 v7-3-721
-+de6968039340db04ec65164a3450a40773488e00 v7-3-722
-+ee138f29259e02f62fe8181073e7a063523e50b8 v7-3-723
-+6e5acfdf7a5a2b3fa27a529881af77c1e1b1c0f7 v7-3-724
-+f4aa43d952f5bacc752951c80495fd20c72ba90c v7-3-725
-+5049eacbff0e9688af99eb67a408cae5919ff52c v7-3-726
-+d3c291efdb0b9f5cd286013b789eb1c91ae868ca v7-3-727
-+233666f859339f425684af70dd008354776259af v7-3-728
-+d08f05285dd102d8f071ee42869416d25dd4e72d v7-3-729
-+37a4cacd20511ead4cf1a8ecb235276bc448fddf v7-3-730
-+778ff2e87806133faa8fcfefbd41cad2b601bdb6 v7-3-731
-+fa8bf69d3866eaf31e6c8fed74862feea11a40b0 v7-3-732
-+509e55bd4a3feeb651ea173cefcbd933f723d8b6 v7-3-733
-+fc8b4a06af9db05af800b1304599afd3e1229980 v7-3-734
-+d3158bf4dee9270477defcde85949ce58fa350e5 v7-3-735
-+b1536bbbda104edb11b0f5772e433d2b5388905e v7-3-736
-+1773d5aa6437b0f88029a192cdde2c510faf517d v7-3-737
-+eccae034465b9a44aa2389039ba06b25dc6ae7dc v7-3-738
-+e2d36f345a7f1131e085336e7b471f718fad6c9d v7-3-739
-+2c12cd5c1381dd9691af5e7d3e1fe1f54c929ee1 v7-3-740
-+6e1fe64cf4404d899232a880552cf52998934656 v7-3-741
-+4d1753f3e85c7fb6d9cde1a8aa9ded8d11cdcd01 v7-3-742
-+67e3b2753a6ef97a94084b85f87873c309fea3d6 v7-3-743
-+26c8b3b49f743ca163a63463da08cc3822322bc2 v7-3-744
-+aab4b29520e79134e33f2c641f1d960de2dcdc1e v7-3-745
-+4934eb2e22dc0bc03fd5d4f95706a69a1ddffb94 v7-3-746
-+cd59ba19985a3b3bd66dffdcf59b00427f844818 v7-3-747
-+56bb88c68f985365b0545a0370be59fcd97a4178 v7-3-748
-+3e22fe67fa6935d1156738a34e50bffdf62006c9 v7-3-749
-+5c36fe9f19a529fb6064b37b8e47e82cdeeb7ca8 v7-3-750
-+d149f18b289fdf19363214e7805a0637307bd264 v7-3-751
-+ed936effb1f374004db15f092b8c8ab87631fdd4 v7-3-752
-+c83cd3d01128204d6926550cbe1064daaf8dee8c v7-3-753
-+beceb0a18c79b5b1bda4822b34cb2d62b2967d27 v7-3-754
-+d9b4cf53be2edbb872cc489aea32a4441b39eaf9 v7-3-755
-+706c87d16d40ecdf9c6fba45bc47b911d8e140cc v7-3-756
-+65ef7c96d65fb2fbf660797608809f0ac5d0c4b7 v7-3-757
-+9eb0d30510f7b02aa5f55f400bfab08d847ab447 v7-3-758
-+25ea15fdfa5c7d5894a06814fe9411b75050ebff v7-3-759
-+8e54a32bcd56226647cfd3d8c5e142e3a98c0ca7 v7-3-760
-+6834d6aeae099d6bfdff5151aa2174cafc22647f v7-3-761
-+699f8d8f096d4627f97e8d3bcf64b8634a484c26 v7-3-762
-+b6148e4a9c397b5dd1716cdac2f96730bd0f353d v7-3-763
-+b29e55d0ef01c506ec48c0c5782e669bb1d80f14 v7-3-764
-+915fb3d2dd8ffc322a5cc9e294d9bb7dfa8c5a83 v7-3-765
-+b5103b7d9e1284ef9ffbc7d1170d9105c0769c4d v7-3-766
-+be1cffa1e477c4a96bb54a3097d3369b23f32825 v7-3-767
-+9ea81cd9b1f50054629547ce2eccfac1fa00d096 v7-3-768
-+d179a8eff9d7b0adc561f4a4dcfb0b7612c1f301 v7-3-769
-+da7a7ba36ed2a51f28e4d3f7e1fd550303e3ece8 v7-3-770
-+3bd2c055319e086665af5e449498a4d5bf40f25e v7-3-771
-+d828cab6964f4249db54bff6df0fe02d0f290387 v7-3-772
-+3db9aee957f7eea6729e5bfd294e3a24d41c79e4 v7-3-773
-+a8f5876e498125f4916c5f7168823885c27dad8c v7-3-774
-+a6e60677aea727622dde15d1306c61588b805500 v7-3-775
-+80b041b994d156360992666110964e74f7473d3e v7-3-776
-+9a1a4c486e6bb367c639c29c6120d5fb1fadcc38 v7-3-777
-+562bbee33aa4f9896cb23ed6de8fbf60cac323e0 v7-3-778
-+2067ed78d37c331685ef8f293d6a23c372ca4b78 v7-3-779
-+42edc5dac33c92876d93f00f8ab8c1f6bb25d3fc v7-3-780
-+29f29e86602e4a7f83d4572d2fe75b9b0de2752f v7-3-781
-+0de969850c0687d2018e025f31e5cef9e9ce1444 v7-3-782
-+a80af62d5e3b3614ff9e058f42647c99bffe7481 v7-3-783
-+fbadf0f6987790d98c3b3fd935fea0494743830a v7-3-784
-+be4baed0c933e1f1543ea175e2e36551ff6caa18 v7-3-785
-+8b3e88bab70215a18768fca5a90c6f07ac1aa5eb v7-3-786
-+e1b98967a985f4d1ad889c8e69b822d9126411ab v7-3-787
-+386fc822dd002958fdade4329845013cbfaa3dab v7-3-788
-+43c15135926fb95fa82b01424677a9c37f4d0e46 v7-3-789
-+8819ea6dcb72dcf61fd0d20f8ea1904a7546917f v7-3-790
-+16e8a09e8ab08d2226dc84b12b7e434bda6b4fa9 v7-3-791
-+7061704c2014e4563efa032672264a47b4b7b0d9 v7-3-792
-+fdbded463fdcc861630b3ea61b9654374847231a v7-3-793
-+9867f92c9b9fb082ee6daca816f859b53ed8e58b v7-3-794
-+17a312ba38a0b606cfd64d82ed2ebc844828085f v7-3-795
-+2c12c4e2fae8db60fbdf58b34c8b73eacdc32665 v7-3-796
-+0cbea05f19c73c01dbd0f04378a65ab7de6719e7 v7-3-797
-+cdaa688e3dddc442c1d39780b6ac0b5ac98c253e v7-3-798
-+5e9730de25e9b4fc2abe14b8d6b0968a9e59983a v7-3-799
-+c0cc0e0620dd935956a472e5b23369d1d78f5fb9 v7-3-800
-+48b54c590dc83b705f2e19f9aea1e9a69fe09720 v7-3-801
-+cd5145d2408bb52217417af654f5664af269e19e v7-3-802
-+77fa4dee43fcd1c0bacad9dc85b3deb39e0ba487 v7-3-803
-+2eb4b9ed2d42312eff32e845336aab748f7fe311 v7-3-804
-+dc30c01f995623e65ee6651a46b12ff062df8860 v7-3-805
-+f7e3f87ac9928df0079741258a3c6034ecc48806 v7-3-806
-+1efc30385c417bb413f5199253edca2795f9da0e v7-3-807
-+3b2a771abb39f670269b0ee9c4041bf02c2d5b84 v7-3-808
-+918d7df425afb77261428968ae646efb95b15224 v7-3-809
-+8904ccd5ee85ff326a05530c02cc90e1260f768a v7-3-810
-+ad21448af931b3923d9b76e4efdcf0e966c9d199 v7-3-811
-+4584e59860b8db6fc5870f0b8f0425f540ea90a7 v7-3-812
-+4e6e012af15028dde0f55bd9bc676bbb14e481ff v7-3-813
-+d5b1d6177b374bbecfbd5c75fbce28e148eeecea v7-3-814
-+448a6e7cf32e14a4adcbc4066743e2f058f7e1c0 v7-3-815
-+2b340e5c5baaf66015f3367208d9bf22ce1dfc8e v7-3-816
-+01fa9313d4b560997234b94b2408e6bf64808afc v7-3-817
-+ad7b6062a7f4041b736d45c5f045671d60eb782f v7-3-818
-+36fd800b8c6c527c75bfe285d0ed0c3bc1cf45f7 v7-3-819
-+688da4d486a019afa3565ffc553af6ee1a4e67d8 v7-3-820
-+4936ee89b4bcfaa33f74114bd07f20af382af14d v7-3-821
-+2f7883063b19039840a4a73fa227f6f42b9e3281 v7-3-822
-+db401e5e4c5d868b7848486c84521f047dc04b01 v7-3-823
-+f5ef9b9c18cd9345eca783fb0c6d4ed50e215cb8 v7-3-824
-+6b1f3fc893cdb6d0a4fff5997cc8ff083940e727 v7-3-825
-+646cb6b6ff2372c26cb9dc9ef1a0f8d562204950 v7-3-826
-+5e17a12a3b1438a7ce044db02d9916ef36e404a9 v7-3-827
-+13170a796134824375a42e77af4ff012ceed2b5a v7-3-828
-+7728d626ae038dedbf3347508238ef3ab4216a9e v7-3-829
-+454d35a4339251adf125de78a8a98d99105533eb v7-3-830
-+cb185366f5c84852a7221ed6d9b274a7239ad06d v7-3-831
-+670e576a58d19c2033877d26b4338873d8a7db12 v7-3-832
-+b971097606032c6fceb961fd559121d5bd74a260 v7-3-833
-+3ac9d7d8274e669d10178c4d95eac55080ee0ea5 v7-3-834
-+d356b5ce84ceac41b036136807ebe887208fb6f0 v7-3-835
-+ff193256398a81a520b44c67d661eee36c64ee95 v7-3-836
-+14698f63de8db5b034939aa66b7076ab76bcd529 v7-3-837
-+1c819b05529cbbc39982513271499e0217382124 v7-3-838
-+2030aca407edf6c865114f459bf2d5d79adea390 v7-3-839
-+1778d51fcbc37e819c305b860f98c949915d35eb v7-3-840
-+b40e6a47ee53789e91b57c04d9ee7328fa9237d5 v7-3-841
-+78321dcaa8e263cdf408f7880530b7aea7401a49 v7-3-842
-+f4960ddda07ce46a098d9106ac1b22fd0f6d0f0a v7-3-843
-+eccc0e8a82fb632efdfa600db3f65f4ed3dff01b v7-3-844
-+171234e02b1e74a2482003d56e7110d37fb4a62b v7-3-845
-+b06bb07d906be3be689f90399effd2b3b2ac2ee3 v7-3-846
-+4dd43d6b3df705a513be75db8a1b50a83f72088d v7-3-847
-+e49b80f267dc3cde78de78026368dec3a20520f2 v7-3-848
-+dc77c2a14a05810bda7e53373d76b7f41341f44d v7-3-849
-+07fef68eb0188adb3d750b92b78059cf41fc8c7c v7-3-850
-+dd669f296568a7525e02ab54b615bde20d37c466 v7-3-851
-+3fd805ca2a6a6ef231f111c6a7b3cd512abaf537 v7-3-852
-+eea32254940fb4cd61339650e10a808f4e702e62 v7-3-853
-+14cdb6e4d5b88aaaf7e33eaee87efec5b1c1ebf5 v7-3-854
-+6604853dd8227c7983dc1b10f804f6aa4b28578f v7-3-855
-+fb533fb6c015f40a3b1301c0c876c35665b0d6ef v7-3-856
-+4905e038b1057e133d0e72c48cf88580cdedf26b v7-3-857
-+0a3fab86f34d6bab27e0be69db4f39ffb664557a v7-3-858
-+ecf21be84def6033137d168e0a66500c29aeffec v7-3-859
-+6ce32844727d8d04e8dc91310d0a4118d81aa161 v7-3-860
-+6fe728bf165e9b6974ef47e86d98b0eb14ce21f3 v7-3-861
-+dd4f3ceb5d86f8367d4cfd6fdc898e493c6d0aad v7-3-862
-+5c0652f455c9f2ae72790a782fe5b5fd1a0e857c v7-3-863
-+a82ef37d38c09523bab204253b52e177dbbc0581 v7-3-864
-+94342b0605fb9111b7fd4a45a8bbc72992c4c255 v7-3-865
-+90d72df431e54d677f03171cbe558434029c027e v7-3-866
-+0fcb050fd79d84ed190452e6387e42d320678fec v7-3-867
-+b31989e2b05832d432557a32ed8901dce237dec2 v7-3-868
-+23ce9a61bdc2a35892ec4e4fa22e8964d60dc6cd v7-3-869
-+26e59a39fdd965ffe83bd654b705540551c8e0c8 v7-3-870
-+d52c45b35fb0c3b77bbace6cec3deda8100fbb7a v7-3-871
-+edd0bc1f26bd019cfd328a0dc2c9a854607e4a41 v7-3-872
-+7faeece39228fde0ac5c26a362a223d0dbe9bba5 v7-3-873
-+4d0b39bcec207130e483ffa66b6f51f999d8e95b v7-3-874
-+beab15a2ef147b880bf7b5add269142b9af58317 v7-3-875
-+787df0fc6539ff7886e9fabc85ea403096577440 v7-3-876
-+96f478b812b14fb1a5710450a1174baa55c73409 v7-3-877
-+97a5ce76cb7d5f635876bbddf35b421c0c76690c v7-3-878
-+79176b78969cf5d182b378ffb8e341e22f18775b v7-3-879
-+9945fe0536a32496fe4842524199b5c24bb8b0d0 v7-3-880
-+d8acfc49d94e485f839d8e2534d302b91a98bf9d v7-3-881
-+8653c39b85ea93e052bb0cbda571e7298451eebe v7-3-882
-+76aa34cef80f5d22bbbcf60278c833fdadd70131 v7-3-883
-+22adc26aaa9f701267bd1ee4636592859ee2dc70 v7-3-884
-+c5eab656ec51dc2d40ef6e39194c74af868a4b5e v7-3-885
-+902d6ab377ee2f011279b3aaebeb05d0f5c2bf80 v7-3-886
-+015e53d9978721bbb9283a999c668c98ad2554a9 v7-3-887
-+b0b253898cf9ff8f5fbacf69de76b5640b1b6a55 v7-3-888
-+cb0c694517a08f1f8f548f0771e874537a390dd4 v7-3-889
-+89bdd6d575101291c66f9e701c456ee71085d147 v7-3-890
-+1dc160bf2488fb1332250edaefcc9f1e320c8e57 v7-3-891
-+6c2e8074ea2588f710adc669e7a15041f6e80adc v7-3-892
-+dc3efb6d5a0821c79f939db8e3b77a714292195c v7-3-893
-+52e946d654e0fe978609e0a23dde3c8998f2ce24 v7-3-894
-+11007e80829ca9d72813a9c60a2eded80a0c1855 v7-3-895
-+af3a3680fc75f090e896d902f0b4c7a710c41d41 v7-3-896
-+5aa74a2f8f9de4a6c10bdebbef910d6750f2a980 v7-3-897
-+aca1886102bdf19f755dc5eb1ac379f1f0680f6d v7-3-898
-+bb3cfdb626077d9236447f40ee725b9a5d78216b v7-3-899
-+b53fa3b431934de82d3bee329643bbe0856f651b v7-3-900
-+790238e5a46c70f45232c0a54d0c73a6ca1d37dd v7-3-901
-+b01e3cff92530f6c317e0cf2c0ba0fb4f97df883 v7-3-902
-+166b3df562ead7b4f85a494fb8a6eef40affdf85 v7-3-903
-+bdab73bf24a8b361a42ffcf429c0aa705d4594e0 v7-3-904
-+8e1d1da398b378cf03c0910979cf475ddb2df7e3 v7-3-905
-+ff1f3e42df08b2ebc39e3b1f2c80f4751bf16dbc v7-3-906
-+9f3da1dea7c0944837e8d5a080eb59a24f6c9dd7 v7-3-907
-+4281875776fb2c3127d08a03c3600b58353c9796 v7-3-908
-+b79f3c3a584c701e93acd1881a934c931634c39f v7-3-909
-+d8d9c591c50fec51b64c12bd2f42d3550bd31d7d v7-3-910
-+f1eab4f77a6fe4b77508d86a68a6681195806607 v7-3-911
-+62eadd7de409641de83ce61e1eb311e9116e06fa v7-3-912
-+0d3573091d42d4797f10cff1c4139557d384f899 v7-3-913
-+9f642ac84df9303d34d0214da2ade28f78ecfb6c v7-3-914
-+d8053e6bf72a555ed34201c6edb55a23b4fc9965 v7-3-915
-+f39af34195702c5587eff88dec51b40e327f418d v7-3-916
-+3887b02953cec045611021e0adcd512b3d127692 v7-3-917
-+6a8ffaf0585660badbb817f6a2f1cb583c9f1447 v7-3-918
-+12636b8248163628e7c8df68210dc17932440157 v7-3-919
-+923277a9cce4316d6b4cb3c6571dab538a6b0108 v7-3-920
-+97474f967eec7f24f09d20dbac65ec9bb660bb2e v7-3-921
-+1d56e5dfa08e68c9ef0645cabf076e401799e3bd v7-3-922
-+6ecb80dc6521837e28bc58d27539767d6947037d v7-3-923
-+7eaccdaa530431c15fb0e0803e5495074e883bb9 v7-3-924
-+04736b4030ecfa2c9e8d6046ea533718dc5d8ff0 v7-3-925
-+c80838526eebf3374fc42febcf40cd911cc1523c v7-3-926
-+d67e292af6f9d259d0893c8062f3896a8aac000f v7-3-927
-+6d45e6f974159e816a4300877296e9a0760ad113 v7-3-928
-+94aa0d30a3ea6291daf7e6207810ec5282cc97a4 v7-3-929
-+d85196defe0da017ff6d547e36bcf40aecba9661 v7-3-930
-+fe0c7437ae8b0e05b57990549e1ddc71e456f18e v7-3-931
-+b7f2d97ae2b7442c46c48ef36d9e33c3ddd34db7 v7-3-932
-+c9820396afb971035e722ddce2058d5db2f0fc64 v7-3-933
-+000bb500208d54e17de26bd5cc5a18fae8d1729c v7-3-934
-+c42e130ebf36515e574d89efbe98fe380ec7c694 v7-3-935
-+e7361b2d8136f6468daedf1bec7390d77c5c5bb1 v7-3-936
-+8ec7323f417d998685afc26bbb4e466eb0204352 v7-3-937
-+a2f03b41dca7024da5e702d016ae52fe7f51594c v7-3-938
-+48a22f36ff45659594ca865f502fe95691b2e332 v7-3-939
-+e2db42528a5bf380bc7e92e41afc807b27f01c12 v7-3-940
-+da71e66dc1d4300cd792f0da77a5afd99d634c6c v7-3-941
-+358c10968c7fcb2599356b419473a3fd46edcb69 v7-3-942
-+736b8e18a3bced7e498a6b81e7189d78cf4671e0 v7-3-943
-+71fa86c8fd4a1af0a27a880ea15e3a7b97334453 v7-3-944
-+80eea7a9d6b9c2e7e8ceb18d6a090387f7e1e9f5 v7-3-945
-+11376842075637114ee3714ccbc2e0e8a432a4ac v7-3-946
-+a84f21892563be88839b4026bafba77f9e9a1fec v7-3-947
-+a6f0544df95e5f783861d3c67d84bc5a28a315da v7-3-948
-+cfd76908da252e03f46ea15cde44a3664e895fb0 v7-3-949
-+d4816e7c33289b9c8aec739850133484c5c3e8fa v7-3-950
-+907b1f035ee7cc61fec1463db85a9eaba4717120 v7-3-951
-+2a166caf8709876053f9b32f4f88590a4fbc6899 v7-3-952
-+7b789d337820088f09f6a8fb488efd418f702133 v7-3-953
-+1afdb7d21c14e15a1239d406205563dd702d7d24 v7-3-954
-+fa90ebf2c8f36d98ef27b2668ac1e1c11db75bbe v7-3-955
-+0bbacb6a83bd678266a0a864e47f4e03927103fd v7-3-956
-+c16602758d847665ed50138a562f1513ca5dedc8 v7-3-957
-+58b74ab7f29df09e54bf76ac84697f04b9f4c163 v7-3-958
-+ef6b11bb183da058edf52c86ce705726ccf72600 v7-3-959
-+e67522c4f56646bd6ef91ad63b152bcec96b2e05 v7-3-960
-+d5177d5ece0c539680390448c8ce8d05a6d61201 v7-3-961
-+0a94ac379769762200c427995551fa4325ec8f28 v7-3-962
-+7eafa576528e6921f337da5c1e3e2d0a9617993a v7-3-963
-+7d81f4e967285d14c9e9901328d2c66911a9a2f2 v7-3-964
-+8a3ca4adb5d8046f87aabcf30a2b7aefb8b9d46c v7-3-965
-+9b800f0a757fcbedc2c6a1851353c3e5044d39b2 v7-3-966
-+20e30e31bd86390590e288516670b81caec6188c v7-3-967
-+dfbe53a54c790d63f8788c13a6a2d18198825605 v7-3-968
-+137f9d41f50894cd25e5b47764af817dd84037cd v7-3-969
-+ccecb03e5e8ba41db171a5535047f9a30b5d391d v7-3-970
-+8d6bb2338a583af5eb85589949065cfe46c42bd4 v7-3-971
-+ba53304245f033b6cf2f6088c09f45dc0d98c47c v7-3-972
-+09e1e574a52d38522a35af8741b3f8ce92336398 v7-3-973
-+92fec4b83be56a65ed81f25885717f6db7639854 v7-3-974
-+44b89b025cdfb6a7371a036ef1b2dd93670b2a15 v7-3-975
-+015a8fabf90072ae0eadee5c013f7db00f83977c v7-3-976
-+21e13403140aec6f32a8f9b49dac02c37945ab11 v7-3-977
-+fe8a0a6a1c2a2ca51c92275a9010999106505ed8 v7-3-978
-+a63361b9097952faa9c9eba2caebef09b9f8b62b v7-3-979
-+c83656c9745a005df1aa7d6985787048a1884734 v7-3-980
-+4ff8fa416a0dd64046e0471933d09f7f19a4ea0f v7-3-981
-+dde1cf311be6edf32243f03fd8436bdf9798de93 v7-3-982
-+ab5154170c3dfc0dd769243e1da53a865e1f69d7 v7-3-983
-+94c5441984cc47971ac49435d184c13cd6d3014b v7-3-984
-+0c940b6f282836186f428d201760c6f6b9b52fc6 v7-3-985
-+3cc2dca142a0aed29befbe6d2944ed580d728545 v7-3-986
-+032c9f916f257ed59f7c55a6c8113791d3def365 v7-3-987
-+035fb0d5e7ce67eaff19a6cadb37b57c0c25a36b v7-3-988
-+cd005ab15ef3fce8f551c81ea10c93889f42d09d v7-3-989
-+9a1d78f828261181232734378f73d648148a42bc v7-3-990
-+8fe768bc1234fc817db3cda61ae9e9dabf4ae958 v7-3-991
-+89ea7593fc0cb9ec66cc04619217447715289a78 v7-3-992
-+dff1542e64f95a3fe10ea24f4007206d53880087 v7-3-993
-+f74611bfb1b77eb2ad42b6d74b3e3657cf3f0725 v7-3-994
-+6d517f6e5f0b031cdb386878d8d428f7f2cfc2a1 v7-3-995
-+ebd94eabfd8013a605d8efc7df64a970531fd5a8 v7-3-996
-+ef02f32d8e53a7b3d7327ac79359a18070e4a101 v7-3-997
-+47e6dec5ce3cbc8e833480b8300132d4bf5f035e v7-3-998
-+e6e60d9da892296ad770b26a22f98bb72c4e1b7d v7-3-999
-+d037b9cbdaaa0af2b383c93acd0fd87e8eb2b8f1 v7-3-1000
-+9dbbddb2ed10936c20048ad28a2dcb9fdb6cdd79 v7-3-1001
-+b498224f5b417bc436c9b967978628703191c0d9 v7-3-1002
-+ce94a870b59bbaad92399eb782edc33a855e0b93 v7-3-1003
-+cadb57fbb78165c81fe4718a355b5f73c641bb62 v7-3-1004
-+90e9917d4114461c5f7258c04e61de1dff2e1a74 v7-3-1005
-+9a2183bd829502597d52f22a1c27fec8399298fd v7-3-1006
-+fba9c0f86f77942d47a5505b065e01a733e7f111 v7-3-1007
-+8cb14f59a3275cb183f031e2aa1e29e230635d6f v7-3-1008
-+57393dc4b811a1283a77c759a09bc52ba78acb8d v7-3-1009
-+36ddcf4cecbc96b9854af6956f371dea205a6890 v7-3-1010
-+55bcaa1d2749f9dc22187bea848b002220cfe960 v7-3-1011
-+432a6b8c7d933dee8faf25a342e857fa0a538eea v7-3-1012
-+1be43c095affe8e945751a5cb4e21210f31c02ab v7-3-1013
-+6a2005efa02b4ae30fa4867db1463fd4a3689843 v7-3-1014
-+45f97c34953728cfe859cfe5212c241fab1da20f v7-3-1015
-+5cc98a5898cf9ff0841c78acfe1056ae075a217a v7-3-1016
-+532c2e850256cced37b8864ee7042ef8240f135a v7-3-1017
-+80170d61a85cc03d66228c16c80cd8a4898a971e v7-3-1018
-+08ac4698095359c3a888b34074548435e9775973 v7-3-1019
-+f7944ce459ac77416617e0b2f8a91a9c8cb385b6 v7-3-1020
-+fc997f05cbc7b566df765c79452a541afaadccb8 v7-3-1021
-+849180347ac359fd52b92d70b545800126178eab v7-3-1022
-+f0c37f5cf4eabb04044ccab4031cc4056c5a47a2 v7-3-1023
-+7b835b2969af137f979b633977d59e13cc0960df v7-3-1024
-+b2946c06d1b6d4e9d38fad1d4281e2d4db3523f3 v7-3-1025
-+888c12c899e552deb33b2e1e8ea3c8141352c3ce v7-3-1026
-+04086e29756318d7a7cfe3d35fd38ccf550ac366 v7-3-1027
-+4d81fdda8f35cf764744161118aeaec948b9fc90 v7-3-1028
-+e7016af0cbf92a5562c01e95f2cec306b6465783 v7-3-1029
-+d1f3c77159f9b69f229ee0f70fd98464b2546920 v7-3-1030
-+96c1a785009768720fcb16add8b9daf1290ce56d v7-3-1031
-+f262fb02889d46743226a78363250e2e1ed7426b v7-3-1032
-+b2a8e3a66f8cc73c3942ef5cb9c0519df86203cd v7-3-1033
-+37e444aeb33b2adf359f8736807f18ff5dc11019 v7-3-1034
-+626e9ccb7c48b3fa7ff6d2ca5efe91bff39135dc v7-3-1035
-+b22bff1a6af81dd78f8e9ff0bcded471ab858245 v7-3-1036
-+7a2be4a39423e4763ca164dc77fcfd4b27f91a8e v7-3-1037
-+6a73ac422c67d7ad4642ae9194cf9d4c832021d2 v7-3-1038
-+321cfbef943199e8e967f6354877ca8fc07e4551 v7-3-1039
-+b9f87487d93597f69f09ecab8cdca11bef6c09d0 v7-3-1040
-+63c9b681c3dba1cfcd2df48085de2453c43855af v7-3-1041
-+fa39483a1363d533f9c7897d476bf0ebd1b8f44b v7-3-1042
-+1e8952a5a726ddc1458ff40270cd5da16be3f272 v7-3-1043
-+0cf552b325b55d417079ad28dff4e27afec5a2ca v7-3-1044
-+29b2be2bba0d369fef85af7aa3196f8b84cce35c v7-3-1045
-+00eecb2f8e3e9664ff00682d278a2b1e19cc4b09 v7-3-1046
-+89bec74fd7936cc425b42f9e882f1f3864b1c95d v7-3-1047
-+19d406a8509d9755b05af7d5ea521925b01f0d76 v7-3-1048
-+074491a83571596acb6aac6d371140e8f99fbc24 v7-3-1049
-+38276cfe40b2069f94b159cc14b4ade47257c836 v7-3-1050
-+70600448f9e7f3bff3b8b0c2f2733662bac08ea8 v7-3-1051
-+12421d8a45d5597828b8343c31faa79f77d9c512 v7-3-1052
-+49f0fcd9762ce5057e4ac22417105b3ce43a35f3 v7-3-1053
-+219b2fcad60d27febcaf7251a91be331484b2c98 v7-3-1054
-+5679b8ddd8cc0eb004cbb61babb336c3af398c92 v7-3-1055
-+21a99611149b0f1c200e001ec26b8b07c6e28c45 v7-3-1056
-+90beab957ba9ebeac150bc5a56cf6ad90f53336d v7-3-1057
-+66e615ce7f61948a2a4a8615d703a42d56763490 v7-3-1058
-+548b889fe3cfbf06ab50de373df5e65f52cb249c v7-3-1059
-+cb5c1e37ad4d4811e5fe178f14c523b178da81ec v7-3-1060
-+18ba89e06fab93e8cdf7ca8dfbb34b66ff9d61d1 v7-3-1061
-+e4e48d4ee0409509d56f7d654b77a35133283bc7 v7-3-1062
-+4157fef7b95074cac55977127964adfa883ec030 v7-3-1063
-+3857d399ab41ee8af64c5307c27da64b01e0a233 v7-3-1064
-+07c534fe9b6cdbfecfd100b7e01f894d6708de1b v7-3-1065
-+4c46e1487c634997f4701d8e68ba9ab019f85227 v7-3-1066
-+52a4f66ae1f5695426de21877b2954d11ad8a4f4 v7-3-1067
-+59e6c2bd68e38244d2133fc8d76bfc9c7b082d9f v7-3-1068
-+6ec3dada4ad3c7e2551191e598cfb6d37bedac36 v7-3-1069
-+c316a30a889217be4158fba900c85d9d44ad3a1b v7-3-1070
-+857f6c53f1172ed836d44f105f6832973369bef5 v7-3-1071
-+9f502d8d5165a79b361ad6048e84c278e1397f88 v7-3-1072
-+f10f63aaec5c08e6f3b1b3abdef6ce3eef1cff6f v7-3-1073
-+b943fd24c351141113dba360bd1d1f02b38813f5 v7-3-1074
-+779ca415f8e142ab5ca74f95c8f732d1f00fb7dc v7-3-1075
-+93b7ed814bec8a9a0b43138be7500b948d48eb92 v7-3-1076
-+80b0081824fa3084d0e12f0b21f6e504b4e5e076 v7-3-1077
-+0dce3d812e7acc74c39b3d87d8bb5b3a4dbee878 v7-3-1078
-+bce2051173f01564805158ff669255359953fcad v7-3-1079
-+7a35419393c36edcb710602edba31d5096d357d0 v7-3-1080
-+9e7ef781d494694a36e056631dbd2c4357ab1090 v7-3-1081
-+2d15582e132f62aa37e5eea5e837b3824f148dd2 v7-3-1082
-+b3c59716e7001ab5127c259c9fd3552de0d36d53 v7-3-1083
-+05d57d7c2d5578f1d794151be9cbb5aef89d821e v7-3-1084
-+811a4c9b51d808cbd54dd0bab606d7cc1cc2e412 v7-3-1085
-+c1622ff9ed8d984604a47ad0805d3fc528452bde v7-3-1086
-+4d92b873acefb69e112fd73b642bfdf7979f1355 v7-3-1087
-+2f51ee8825dbeb31713e635fd8d77ef77742ad64 v7-3-1088
-+79522bb1712556183073b148e085d302967d7260 v7-3-1089
-+8db697ae406a8ceb05f9fb8b45a70980904f230a v7-3-1090
-+371cc0c44097772ac13e0e3cb59350c6be52257a v7-3-1091
-+9d97a0c045ef5c86652c7fae4d4cd5752bcb42d6 v7-3-1092
-+08fbb1ce1bc56e3884c5d35106df31a9cae1f954 v7-3-1093
-+efc4fb311d5d45f6320b9d17ed47d24748335bcb v7-3-1094
-+ed4e689bbea1c45a8aeb808b526dfd052470ef20 v7-3-1095
-+2db0050523719e39f17f4bd855310bf5688155f5 v7-3-1096
-+0c25fa1dfd97721cd4c92f4e7a9a524a24f3f43e v7-3-1097
-+26f2dbea7443f719c854c7a1fc35dbacdd129307 v7-3-1098
-+542af01979be709a4763eb8b9cc1cbcfaf584838 v7-3-1099
-+bf917ee1fad22f643d7ef1a919b233f07fc1fb3c v7-3-1100
-+761e42cc79c2560af55ebec0ec1060f547e64577 v7-3-1101
-+1c5da99d1b708b7af2928e7bc0d9d57935872958 v7-3-1102
-+832bf8136d86dd17489d962cd2d7316d7edf5087 v7-3-1103
-+fc4d7f02ea3ac731a9717438c72aba098b117e8e v7-3-1104
-+a804309e7327f0ece015aace3c855e7987f0ac3d v7-3-1105
-+ec72bb4a0fc2e7f0d517cb12f784770cea9cc19c v7-3-1106
-+bd6bef0bd0fbeb79b440e429f5e077169388198c v7-3-1107
-+3534e9b4fa42b392399d66d08a1dcdd230accba5 v7-3-1108
-+450e13fe16211217f32bc57c3827f439540398bf v7-3-1109
-+3849c811cc0bccbe09a559e2be5fec7e810510cc v7-3-1110
-+43de4ebbe7ad009199987337b864240ba19bfec6 v7-3-1111
-+749e2b2755d59eedd6fd28e7d9ec47523b722be7 v7-3-1112
-+0798b096bab3efde994f0b50d6776ac72ca0f41c v7-3-1113
-+532c31f9e92fd44526d02d26c503a15c1c1c78c2 v7-3-1114
-+3f2319a953b3c2fc8cbe9ae9225080a5b30a638a v7-3-1115
-+66a9e8fa6f45ddd8dec5b98c193abc576330e4d4 v7-3-1116
-+97560c16ca99a1341f31d88ed9f508d777647b5c v7-3-1117
-+6a706ca7a889d27ecd6b671e31dbe28ab6b66f28 v7-3-1118
-+a62695305e031260557ff0cde6eca1db5ab9e3e9 v7-3-1119
-+d1376091d18b5a742ada87bf825d20e99ccbef19 v7-3-1120
-+4b9503f0c7d3d75d772c2c0dbe19616da2480749 v7-3-1121
-+7793e737ec8723a18d4c5468b33a895249ba4f02 v7-3-1122
-+77ecab3bb2078fe525602172b35c2031c819ade3 v7-3-1123
-+be1e4acb30cab46ab439e45b9b6871a7aff23800 v7-3-1124
-+96f3348f9f119a996ae8826ef4d5a06c3f7e677f v7-3-1125
-+b25a1b2e3175902e49a69e8d9ccc5c1cc43fbe3f v7-3-1126
-+532a9855bd30d28cc14848ce5136658a273bc999 v7-3-1127
-+47906f888725760ac704668b71057629e266e486 v7-3-1128
-+f824cb97eb922975cdc1025f3c2c62f1bdbcfdd6 v7-3-1129
-+ec24ff78a79c1851d8003780035d6c55f98dcceb v7-3-1130
-+82e6588762e4aee5b0f0cd51d5c124ebfec6424d v7-3-1131
-+b20dbf3a5370543ffaa1d6fc337df1969843477e v7-3-1132
-+03375ccf28a27ed72f6cf347383aaacbd1a51e4d v7-3-1133
-+531e598651fc6a7c28bc808d82c09ddc1759bf4f v7-3-1134
-+e4bc21965079eb6948d8e22ad96d145659852707 v7-3-1135
-+343d09006056ff408f08850317b8e8caf056f5fe v7-3-1136
-+c02c7df9bdc91ae08ef626d4a8262fed47285c41 v7-3-1137
-+47222d8b1e94c962f9daf6c2ff3f6c6ddcb71613 v7-3-1138
-+3b5a023a45434e825b8dbeed551cf7f4578243f6 v7-3-1139
-+7fde662e1db24077abbe26e6d78c286928f5c9b6 v7-3-1140
-+10673b3531ebcc18467d04bb806036cbee1b8e2b v7-3-1141
-+65cef998f860b3745880622cba74135bfa249ae2 v7-3-1142
-+66e849c4558aca6c522026882159b41994d0c0c1 v7-3-1143
-+8360a59aa04b8668e377a66d1fc46e9e52b35110 v7-3-1144
-+a30e3762957d61966152040315d160f860433576 v7-3-1145
-+e3f9e33fb28c367aac7b2270b6fd304fd755b6d4 v7-3-1146
-+3cd3cc1e91193a0b45e6aff1373cd4802e595a16 v7-3-1147
-+220bdea4f57919c290d92b1f6c83a7252cd660b6 v7-3-1148
-+66803af09906a828b9f41d7ae0f7a379137eaf99 v7-3-1149
-+3dbd251777de232c168d87650acda5fec408146c v7-3-1150
-+4d7e3df04256790855f7a6dc289f32ffc04da133 v7-3-1151
-+9909e44879b9f80679fd05af19a423b2673b2301 v7-3-1152
-+bc3f4804cf470cec5773d8842743efb760f69102 v7-3-1153
-+6419ee8098c80f0418081c73b790b09c61f13c3a v7-3-1154
-+bf1e6326df1104cabc04b8490f9456dbda901fd2 v7-3-1155
-+8c4324e6f4779ee316361511ff783f6344750be9 v7-3-1156
-+2f1ee97f5f23a5f9e1c572ed4afb50fb79ce7a35 v7-3-1157
-+46077370bc605815f5e41cbfc925120a913acbaa v7-3-1158
-+208a6c04e6b8221c1f5187391d86c5b57e61445b v7-3-1159
-+60301d4d16827a961019d72a78e811f41326c680 v7-3-1160
-+ff393592644960783e9a1c7c7959a8cbb0954673 v7-3-1161
-+b8eabb6a96871321bec8526fa04ba1ff1a96780e v7-3-1162
-+70b1178dec7919120632cdeee6056e38108356a7 v7-3-1163
-+4db0bf9f1b44d1f0d42a1863732dfaef73c9971d v7-3-1164
-+05b8436873d48055cbd24f043548092755d77be7 v7-3-1165
-+d59ff2114733a526847ea38d093897f496f73ffc v7-3-1166
-+81dedcd648216d6b3fc6b967368fef23d8ee1154 v7-3-1167
-+ed47632fd1498d50e31ab5b30aac403de3db2496 v7-3-1168
-+a83fb2bd8c8ea8865f460f7d82d8ebff8202cced v7-3-1169
-+14c2e63caec65cca0d315e82f90b5e1d84430487 v7-3-1170
-+fc7f985df53745d157182585b01ee5dadb722a62 v7-3-1171
-+96e154e825a7441274a615e7d7fdbe68e5534ee9 v7-3-1172
-+b584d361e7461c79728585f16f408984b0234fdd v7-3-1173
-+52850ef928f85755f005267c1f02fe9e9f898c99 v7-3-1174
-+84a8d1ba81c393dcc3a45eb3b20fb6ac5f18df7b v7-3-1175
-+e48cabe984537b06cfa945926844c4af96799331 v7-3-1176
-+e79a20f07daa91051435208887cc31b245555046 v7-3-1177
-+c4d4f0fc12b9b8665d6859680155797be960c36f v7-3-1178
-+d84833983de7708de27774e3f01e7ffc8c03eec6 v7-3-1179
-+04b8912a9c85e72728a2cd6a4f8e6aee82525b31 v7-3-1180
-+b7bb20390111b75616eb66558aa9517901eb0144 v7-3-1181
-+fa98c2b030ed5ac8d8c8139405d20ad6c611c065 v7-3-1182
-+044d23a64c177549b4b5e3183642f3a5b286d14f v7-3-1183
-+9e36c6b1ebf4554a24bd879965f348b81ad5ca6a v7-3-1184
-+6d935f45c489b346f06aef5b1bdd87cb98b8400b v7-3-1185
-+7b8991e084f9bea2dde9ceef7a245254d656b6f9 v7-3-1186
-+fefd8d33a7ea43f86d6e5a2ab30440140ada14f6 v7-3-1187
-+6f7ed9b799a3db282f0fc076d8232752716a4e00 v7-3-1188
-+dc78a26f6f64bb1330b9027559ce0c8fe54ba1de v7-3-1189
-+25d64a4edc0b0f3f17330a7b12f3c1ca141ccfb3 v7-3-1190
-+4c42efb4c0982d305ec9ee99bb3bddfaeec2cf87 v7-3-1191
-+07b9c48a30e973833ee70d38633934f6fc2177d8 v7-3-1192
-+8b46c37c4b843039e5a543be98978e79ff6f3d31 v7-3-1193
-+91136a41f83f3716e7ccb4f2402216ea215a4acf v7-3-1194
-+4837fd61be52d420c69fcde0621cd5ecc298d2b6 v7-3-1195
-+56fbf60e94766a202ee71749eea19a862695c92f v7-3-1196
-+2fc1f3346bfb3229f35455101a5944e6785a02af v7-3-1197
-+517fa1a34c7cf1c8fb04d43976ad6c381f48cebd v7-3-1198
-+be2973afe77045bd749c63c46ea02f61efa55862 v7-3-1199
-+2945fe016b936c9e3a89db48692495c83f1843a1 v7-3-1200
-+d8f65e6238fa2bac706f1a4868e8d38ad71ded64 v7-3-1201
-+1707ddb6f5aed99b69fff8a66dc3eb8ab40d7f46 v7-3-1202
-+ba328b4a990ee460cc907ec59aabee8d872b7768 v7-3-1203
-+0792cc5133ce1f37ad9e1d49804100b28d0a391b v7-3-1204
-+d02448031708fca0df590f46f850e33acc9f9651 v7-3-1205
-+8dd2769ab75c07d88feb49d1dd489a1282854217 v7-3-1206
-+6ae32a64e153d7275058d965e0c1c12d106bc7de v7-3-1207
-+784e342ddcaeb260ffaab5f0dd30ec5db832842e v7-3-1208
-+afb00cc8caacb8969705ffae0316bb9c01156e7f v7-3-1209
-+7155782d94fb88e47e252b159dd677c31a3f14e8 v7-3-1210
-+1cf02fbe6281c8efe63f866470b6c44d5835125c v7-3-1211
-+81e623ff2e554695c372b7b06bd826c6298bb8b5 v7-3-1212
-+ae05437a744a3b6f87d6f3304a19e5256849bb1c v7-3-1213
-+bcb84438bb5bf27101b25ffb2c2267ab6ff0e946 v7-3-1214
-+8bbd0ff486b3cfa711e0a7f305b4a0241bd5dd52 v7-3-1215
-+b89aa3374b7fe64968421f4e20cf22cd3e95713b v7-3-1216
-+613651492c1905f62cbbcbfc616d7935234badab v7-3-1217
-+d10ede931224a9818a98a58bd9382f77728ced1b v7-3-1218
-+eb5c3508cd7da14f8d3337ca4dfabe4122ded20c v7-3-1219
-+ba7db05e1482457a36b19ed608f820275fafb9f7 v7-3-1220
-+9f7b92f232d31450fd04ecec3e89b027c0f28b02 v7-3-1221
-+07831d280e90a87ab9f42a9c96775ef2bc0cdedf v7-3-1222
-+5cd32322154c1c5970194eb5300eec2ddb8ccc30 v7-3-1223
-+0a379dea13c97df4ec2ba1487dd50c1e8ba0c912 v7-3-1224
-+27b008d5b7ac5fab02c6934b87f258bc4715aed6 v7-3-1225
-+b34d719b13cd9dd44485600e5cd939814b9b065f v7-3-1226
-+5cee875f30961cf1adadf386b7e2764ea8aeeb64 v7-3-1227
-+620d9b59d4ed9deaac614c707c71257907b1dd21 v7-3-1228
-+b6e693e1f9461e5020e4cafa1c6e1de24776e11b v7-3-1229
-+f5c822e5a0eba6f490d0be9f6892de929295be87 v7-3-1230
-+537bbfff0c5c0bc2307a85133f59f07b00c55e41 v7-3-1231
-+a594ce86b5eade96cb84415b3b027abe611c2238 v7-3-1232
-+4ed713442c51625160cd0bca612d9a3417e4ba14 v7-3-1233
-+f4969f8f66e974584e8e7815d0a262c5dca79638 v7-3-1234
-+9ae0fe46777674504e0f372e68cfb8e0be81b2ee v7-3-1235
-+39980afcf54aafdb9255424adf5808af45ab2242 v7-3-1236
-+5b2c8f3b390632e1e57a3839f040146f6798a969 v7-3-1237
-+048c69ebe8eecb218320030d9ea41fe4f6290848 v7-3-1238
-+e130cc3d17af412971143b8420d6e7b1cbd13ff2 v7-3-1239
-+bc9125136c69a4feecb4b68912fa04380f42b77f v7-3-1240
-+c8747604696795a300f6ff05091813d691f9a488 v7-3-1241
-+b4a2eaf28b51327b4e56b4eacf4b5d72a52560f6 v7-3-1242
-+8a7d3a73adabaad5e9fe079acf6431982145c7d1 v7-3-1243
-+b4a71dbdb78790ca423103ad5deb71b1df9b5b04 v7-3-1244
-+43329b2b5b79ed2e1017869ee2e0b1caeaf2f0f6 v7-3-1245
-+a1b41dabc682ed8f8770a12c2d3a227eb348885b v7-3-1246
-+f451d60ab8ec56d02a7b5f2d5c16187566279886 v7-3-1247
-+3717d569027d8ec8b62e42e33f91333ac22ce6ba v7-3-1248
-+b614332f7df2f6f471bb4bd93767becd7844b90c v7-3-1249
-+6aecf486bb347ac6885afe36d62ddbbf2457f898 v7-3-1250
-+788f4802967766b7f3d6dce83cc027baef422f4a v7-3-1251
-+875a0aeb301c3fb2be8a79f2d82e324d80caf4f3 v7-3-1252
-+d6a7dea44a8667d834e463b8658cf85ea938112d v7-3-1253
-+5eff37e92f03771aee77a3688d79a73e5b6107e9 v7-3-1254
-+f8d307ebd74a4097f7083ea8117be0433f00c7ce v7-3-1255
-+322441058afca6a8aa52d34eda9fa307608354d3 v7-3-1256
-+5751284311f37399cb7a66d99fe317de4ae86ea9 v7-3-1257
-+c9e2ccc53f2e119e247da7fc9111b6b9c9385d93 v7-3-1258
-+7ab94cb688bebd694109442be4dd6edb6ebe3c85 v7-3-1259
-+7aa4e0822dec0840770d9f41052a772a887cd213 v7-3-1260
-+1cf89d38aa7628b55f1a45a5325adc83abe85dc2 v7-3-1261
-+5e0b6a9282df8b9435da372cad77482f1f5b20aa v7-3-1262
-+a02575cd564ade1019ea89db07c1c1d0c4b5418c v7-3-1263
-+558c815e1a38d7ac2fc61c4155aabf8e81a14034 v7-3-1264
-+53c1b30632df47993bc00947078dd31a226c9a97 v7-3-1265
-+bbe4bd64c68c64afaa6636e8c3e9a9a6241e91cb v7-3-1266
-+cabdcfe72dc398fd67bbbe02cff5e11e4dc2506e v7-3-1267
-+72fcf674e545eb87bb4ea996df56e4eb7c04f6cc v7-3-1268
-+350239b0e9eb063d9f84dfa4bc7a2b47d78e9afb v7-3-1269
-+35b6fc57a2868b235284d914820da0815e62d54b v7-3-1270
-+034abed357a1a2fabe624ed59ea49ebdec09d790 v7-3-1271
-+a00cd1839ac4f3467e1e51e619b4c65ce4e0ee81 v7-3-1272
-+30910831e5b0f0eb28a8eea7412f5ec9f3533ab2 v7-3-1273
-+761cef8f5d1d42e315fb85765ee90857981fec06 v7-3-1274
-+8875401008da99a39878478a293f833f68481ffc v7-3-1275
-+d2f9f67924e77ec3d90164dd6ff2e50c5107faf0 v7-3-1276
-+6a7ae677d6a1f116b685fa0f892052e20003eaad v7-3-1277
-+cf52d2a8c05cd037c049abef0f58fd918146f3bb v7-3-1278
-+cca600e6092839efeb3795db863916959921bb0e v7-3-1279
-+1cacf785299e771ca463c493c8c870e395c09cd0 v7-3-1280
-+19ed30f7cef76224ef39ceadefb64387eb986342 v7-3-1281
-+22ac43fb6d30ad1097d0c7e8937b28efcb162137 v7-3-1282
-+d6ceddc0be86e46a5a9a696e36c54b9d133f2203 v7-3-1283
-+7b20dc8041645778eeb2f7823a4c1c647f735d24 v7-3-1284
-+14e7a115d54d2c095f31ccda2d04fbcf775dacde v7-3-1285
-+6ddc1785c4ff3779c18f5c313da591a052388b2d v7-3-1286
-+34c629c3b4bab5fc755e83869d929f8cb322bfcd v7-3-1287
-+8b7baf39a345aecf00a6116b5da211b51c6e3457 v7-3-1288
-+1ed945570d47e9a60694ed1ef3a5b208243657e9 v7-3-1289
-+08d4c11cdaed2c5d95e2c0be3b0df91d01f52b84 v7-3-1290
-+a6ddcab6a240d22f965c4961bb93ddfea6a74c73 v7-3-1291
-+cad8d29b0bc0356a49a455296e5e79eb6f38139d v7-3-1292
-+18b43970fb7a796ab740e65baa4ff2ba46f929a8 v7-3-1293
-+11d0c6df1d7bdc399b34a8cc70f354d6ee908661 v7-3-1294
-+93cccad6a26b439728bf3c155ed5532001a2f2ab v7-3-1295
-+c3a82208e143e4cd4a3b9d9b1716eb9d876bf462 v7-3-1296
-+cb0a5c9c0f9bcc6c5a18ed97762206309d3e334c v7-3-1297
-+dafd77a15d44cced4e405a9fcfe67fc48a02004a v7-3-1298
-+f063be86b6323f396e6d3a7be73e860e636eb51d v7-3-1299
-+56bc3698f8c6ac275a9a05b64ae056de619d226b v7-3-1300
-+6cabac58f26fe9d8b608542d9fdbfed3fc437c90 v7-3-1301
-+5569d11ef585033ef40e4402cd6a52453e4d13d9 v7-3-1302
-+6e611380b4cf586f210de94d92a4f158b6900a5f v7-3-1303
-+46d6318d5b965b77278ea252b25209468214dd2d v7-3-1304
-+6f24376028af97c93b426cdbd46379795be7cdfd v7-3-1305
-+71859e71b1f902c28b8842bc7092dd155b8c7f88 v7-3-1306
-+3dafc80e781b8d5ed12d6107a2c804067aeafd90 v7-3-1307
-+71e066e10a4789eeb9553aa08f9ca8e7eec96532 v7-3-1308
-+a686295448918b7066bc52e3fd9748e6702c2219 v7-3-1309
-+b49784c49d537fabe083cc3f8cc460629bb6957f v7-3-1310
-+28e6f5f889683fe161b7bc260bd02b742157fc5b v7-3-1311
-+80bab8b1a30db72b7eda880b0442ab0b0f4a1611 v7-3-1312
-+afbc9dd67cea81e73d64f7ecce47dfcd35d48865 v7-3-1313
-+29e57603bf6f3a2e3c178a63d332ed4d2eccfa82 v7-3-1314
-+6ec6b7ff2d43842d04a8d653356d0ff3850707c0 v7-4a
-+0ddba00c204d855c0b3da30cb338d9bdb0ded847 v7-4a-001
-+d0288faf3086e6ccd5046edc91f1baf21bf1babf v7-4a-002
-+b5abda4e7c4b8b04cb823c160c47097448823ba8 v7-4a-003
-+f72d49c406c48293e30d774303493e4c8d120bfb v7-4a-004
-+7a6ce0c426fec6051523bb00e050b826fa664beb v7-4a-005
-+6b6e1786c7dfb2d1190373dfddc3cd33e5346e18 v7-4a-006
-+c624928fbc49408ab932e5c79f5f79e53327d700 v7-4a-007
-+b3bd43ef012d975cafb7b2a4c41fb78486ee4cc0 v7-4a-008
-+467efeee8f9e2060891bc718e6aeffaf79eab43b v7-4a-009
-+a4e08386a6aa29c5e58302f1650fa2ad3f03b76b v7-4a-010
-+ce587b26b8d6bec140af41712bb99c4c73c3bf99 v7-4a-011
-+fca6ba0d2d66d38da8ae023e73944a69662c0d66 v7-4a-012
-+42d592dbbec3706429e3f3f75c9c394db6b9c1bd v7-4a-013
-+08eb573821869727e5951e6586207dfbe5fd982c v7-4a-014
-+7a1b782ec64ac55052755ed72ff023093b246d96 v7-4a-015
-+4104bed69ea561a105c3db590aa6c75be2a24836 v7-4a-016
-+4cbff53717d4920cb64d417c7a603b45519138f1 v7-4a-017
-+c6dd0c545e5ca25e0b45fc1dbd7d1cb20642830e v7-4a-018
-+bea5eb942011c09a6a8805e6b21079375462a710 v7-4a-019
-+fa76be660fa914de79e3856caea8261cc7ab6c5b v7-4a-020
-+fc6f4a653265f9e6b3dfa82faf067329dd5044a2 v7-4a-021
-+c28202427d71b4460122754884bb548f084c3d7a v7-4a-022
-+45b2278e6f461689d068f138428e9f3fdb01615c v7-4a-023
-+ba9a11fe25637103e1a77fefbbaed4ac2ff182f9 v7-4a-024
-+1b89e3f916c59fbdfdbd31e4d8af8b22274275b2 v7-4a-025
-+b3ff17862b4c9d06411bd3c854cfceb77d5b97b6 v7-4a-026
-+8edba3805d787f50b51d7fd59899c5361c09a348 v7-4a-027
-+7aca84c0cd37ab4eceab8897e0297e2e318b8fff v7-4a-028
-+2b58913e19a5a40d169f2aa1ef9530a78c375d2e v7-4a-029
-+bc4fb031746594e4e84b36e64389e78454617a86 v7-4a-030
-+839ebe7c1b2fb8150714fc48ec597d2e1f1c7557 v7-4a-031
-+2741b46e96bfe6c06a5e9704bcad649655f7b50f v7-4a-032
-+fa024ce48542356206bf86bdc9286ecf0510ad49 v7-4a-033
-+947edb6335d1e196c27e2e7e0e0a5ed8f6b78498 v7-4a-034
-+4ceacc1b00548c0b21c0dc2628608515899df721 v7-4a-035
-+9982ec574beb1866536f0e8a0ace3073faa3bb97 v7-4a-036
-+91d478da863e0779c482c790cc96b14188f3ecaf v7-4a-037
-+8f983df0299fb4f1c7359eb3b844ee93e8f7e8fb v7-4a-038
-+a08fa2919f2b39be0416109d87a42fbb5880ac76 v7-4a-039
-+1261caf9bc5193d304140647c08ca5b52120ce52 v7-4a-040
-+74d2f3188cd0aaa0d3d7cd3df001d88b04f77f5c v7-4a-041
-+1899acc5aebd40f625b9fed7bc4c1b5f67e5bc3f v7-4a-042
-+6fa64615c8d38ecf464702b102538c09fe250813 v7-4a-043
-+647596ab1ae2f4b36bfc20293adf4b3a43372818 v7-4a-044
-+da95a7f1d5a8413ae719188cec5b706b99db4a91 v7-4a-045
-+f0361e297d9ceb533a17530647b4482c3990df3c v7-4a-046
-+8c6615a30951fb9f2d2b218e55626f5dfa3fa24e v7-4a-047
-+09c88160095d98a0b1403e9230c76e8adbb75d59 v7-4b-000
-+47a09a572ea670d0498983eaa6ded5ab4f12fd15 v7-4b-001
-+2e63b6c763f7af2ef11f751d3047847652dddfe0 v7-4b-002
-+ea876fe914833a69018c54d6927dbbdb42ce6ecc v7-4b-003
-+3c6e2b89875f39c8417021aa369695ec1ba762df v7-4b-004
-+e63e4b4be9236c2d811b5ec7bdd79e387ec8bac9 v7-4b-005
-+6b7ab6a4f31a54bceb4e7d6f0f9404b5a37bdad3 v7-4b-006
-+b882d4b14e00af23444fd630aae3ac32214dd097 v7-4b-007
-+3059c799fcd997ea60a63ed10a2a09d73e3ed3cf v7-4b-008
-+cd971e951b0626c253059d8e25859032560920a6 v7-4b-009
-+585b623a1aa3baea87a1584e6064612b2183d312 v7-4b-010
-+7d1f89b2710305a00e6adac35a1fa6edd47982ba v7-4b-011
-+25f67b62afd8c58b6c661961cc762f00ee89e562 v7-4b-012
-+1ed6fd19c36051da73f9987777002b331853f5ea v7-4b-013
-+3ddec3d25bd178d4f90114bce9ce889f3889e6d2 v7-4b-014
-+d96f16667cc48d89c380fae29d86286b20040d5b v7-4b-015
-+ba37e955913e85700677b89a720c6e5fc8d23cc3 v7-4b-016
-+8c42772f05438e9f06200bca731cf301097be8ea v7-4b-017
-+7ed1ec814dafe8109a2f34302174267d31bbc924 v7-4b-018
-+74a211a0d3a3135dd67329cd981f5100f5e4d064 v7-4b-019
-+46cf49cc9289920704999a971f397eee1efdb3fc v7-4b-020
-+059c8a4b103f6971276435127c7ad970a81b0b2c v7-4b-021
-+d5d6b78cff090e87d52924179e44131b5ba7436d v7-4b-022
-+359743c1f59af353454dd80a26d9f8c20ae6ee8e v7-4
-+3e9107b86b68d83bfa94e43afffbf17623afe55e v7-4-001
-+e29f11399ccec9215cc8cfab1f9307dea0567d70 v7-4-002
-+560a6a2329503d483db019a88cacc3307e5c30b7 v7-4-003
-+f6247eaf4e1d556f782321890d725663f74babe6 v7-4-004
-+3640cf4c0d4b6e5687bb7a31678fab70c88ed94b v7-4-005
-+2374a05efe20287d55bd824689a41becc7662505 v7-4-006
-+4fe1dfc7014e57b4beb5a01c9e94357265d19a92 v7-4-007
-+b04bdb2c5fce70a278d26c477debb65a388da0ca v7-4-008
-+8b5d80861c5e0403ea9f54ddddce2752a463c8a5 v7-4-009
-+bb358cc41d920983629ace62bcf26decbf06cab4 v7-4-010
-+54e66395831c1a58b4a9804e7884e505842157e8 v7-4-011
-+8e28c23e482c5b3c8296d8022271822886793456 v7-4-012
-+07737d3aa81725672796cbc9a010d63414ab6fea v7-4-013
-+9801d06e7b4ccdcd02cf40bee34eaaada0ca0409 v7-4-014
-+a7478f9f2551e95bff138cd658f7a86ced804ab1 v7-4-015
-+8d5cd0ec3e7183a289f9bac41d3981307cdc1fac v7-4-016
-+c47c8cd5fe5c014c141d9fb3fa8935b268436a4e v7-4-017
-+460d5be9395ef3e05f4b1397ea98a5b54d825fc5 v7-4-018
-+d5eb32dc231cd870c562e7b0be96fa994b505d9f v7-4-019
-+c1ae5baa41f47bbf96be81e0158707a88af48b34 v7-4-020
-+c514693882b9f1c7be2e76a0307926df799da3ea v7-4-021
-+965044860b7f4884657fcaa042853238c7b13e69 v7-4-022
-+09361f13580b075b6e87707c47165e8d45ee98a5 v7-4-023
-+00d61a47df66cad21b80c6a683164e8d19180045 v7-4-024
-+9085d32d7424963013650805452ede5dad22211c v7-4-025
-+6bbb2ae990c92f6858b86c047e16dd12183d4273 v7-4-026
-+73cc7272de5e0173b9578f715c4794a8b3803bce v7-4-027
-+923738744a60e5e0bd2d9990758a2169106807ca v7-4-028
-+2d3fbc68b3a84ad2bf4d58c77244043328e3fb81 v7-4-029
-+0978e99043d2a9faedb1a3bad75b59121c270bde v7-4-030
-+b21b5dcdca2197fc86b9bde77bd6777f0e2d5175 v7-4-031
-+71e92a1cb37db719d6406858a50ca3bdfc9881fb v7-4-032
-+91f6a28e010d49ae73c13c85dbb8b14c9e5edb36 v7-4-033
-+22dfcd1494e4f7ea8ddc96e8dd895482e77e3b5a v7-4-034
-+5481f188dcbb7143596f2d470c7d674bf36efe64 v7-4-035
-+90e2f0729a0df249931a2dbe5f4310ba6c91cab4 v7-4-036
-+c3d379c2a115b957d82eaa5f2215b688f36a22da v7-4-037
-+6daa78b6b99a2ec07d20336db47c9f8165098062 v7-4-038
-+4dfba3df303c51fe31efd1255338e9fcbedc5401 v7-4-039
-+8336fd924e057d8c797043430325379d9a3ae37b v7-4-040
-+408f2a1a953feef25a2c5c96352c82674655e797 v7-4-041
-+70915ede509a737ac78c421f43c4447c9682ba41 v7-4-042
-+6d11572e2c8b1117b90adf588ff1467b185c1b57 v7-4-043
-+c0e3990aed3f179ef006e6de1458e9818c9ab896 v7-4-044
-+8ced827b2e8ba49f9ae0da2033670fee83e7b55b v7-4-045
-+68056d414f09fccb39219d7fde77fa06769ffa3b v7-4-046
-+c21b2f52f1dd003d860e3b574602ed3fdc2b4f1c v7-4-047
-+31c9acfeda8f1b84d51a480c1efbb56f384e76b1 v7-4-048
-+15c1b8a20da6d650ee3ed0e73c2e3832093b60dd v7-4-049
-+eb33cadafcabfc9cb3fc0741e169e84cafec11f8 v7-4-050
-+e7a2f217a385e6aebfddc4d29182924ac017d262 v7-4-051
-+b9c1c1f4cda9b82a2e703feec441d865b4722d56 v7-4-052
-+733193bf24c3a80883c60964922c7cdc83662eb2 v7-4-053
-+7b760cda2bbf086ba975fd5a4bdc6190a0f08caf v7-4-054
-+38a755adc58063894c6695d702cc37f4910bad14 v7-4-055
-+8d83c219fc7b2ec8685ab9e0dd7d3067b7f9d1e9 v7-4-056
-+3109053ce4e3d17ca6ecab06c0ea0f38581d2f41 v7-4-057
-+fa8447ec582378ca8d2c0245bd4ac195876abf2b v7-4-058
-+2a72805a3038285c35f47dc0327a57cdabbdf09d v7-4-059
-+46ca8fcee5257cc036ac928d91b2a490cf47a956 v7-4-060
-+739074bdceb85d16b9e70791d91a59c2b846ed8d v7-4-061
-+d59a0b8e5584c6e093990abb1b1e640aff7620bd v7-4-062
-+9cedb4dfd4c830783ac65128dbbb118da2e3c638 v7-4-063
-+d062239654688774d38e60ac42cec8ae1fd0f14b v7-4-064
-+7f341db39d5bee0a9259a14a65e19bc9efa65417 v7-4-065
-+38b948f534e4646bf879cb4d30151474e093d139 v7-4-066
-+86bf09a1b6d0275131caf7ffc51598608e7242de v7-4-067
-+efa40be729c2c94c1d8d0bf95000c4a7d2976dbc v7-4-068
-+878ed73c70706d68bc7175343e4deb24b11963c2 v7-4-069
-+e6f3f66028d448bb49ee2336cee60b13ced7cea9 v7-4-070
-+faf7e86203b5d5c98bdd30dd92524e5062b2412a v7-4-071
-+d563839a9be0be6e85d93e366b4f7ffe705d8e3b v7-4-072
-+d0595545e98a3b7b6fe1a96ab0106d8afd63c31e v7-4-073
-+9818311eeca0d76641879e95143f314e7295cc26 v7-4-074
-+829aa8c8449d85d0de3a29ac8ce647ec706efd02 v7-4-075
-+8f0c264db1e76a65499f0846d961907d7ecade9e v7-4-076
-+53bc55e58fefee7a83a7a56fc7f05e0a4d36dd47 v7-4-077
-+5c3064feddd7c9bfef18d8067172335f101122c5 v7-4-078
-+6ae816249627b34aee618b49c4169b7ca1f54ff3 v7-4-079
-+c5166fa1046462d73891f0b395d6619e7ce96c82 v7-4-080
-+42927712b3d997bdba9d8ff5a1199fe4652c5899 v7-4-081
-+9c777e2c702487bd0b5c48a22edc17c98b87e070 v7-4-082
-+6367a766027d3b60caff43c35d8d3597ad90f6c6 v7-4-083
-+a56f60cf683455bea96daf077458158041e4d6ba v7-4-084
-+70c3289803b3129f34ffc327b113dcf152222a56 v7-4-085
-+60a5b7b82016da631dd7acc6121913d02c5677f8 v7-4-086
-+9334c994be7bb5e16a1f9c6b67e1c4342a6a386c v7-4-087
-+853a76c7fdedefbc1dfdc2a4896d37a3806500e2 v7-4-088
-+6707c44cec61d76026d5dcdd6573fb41cb89d0bd v7-4-089
-+31217cc48e7d8c9aca703688d3d04d8edbc85bba v7-4-090
-+9502d1caf90bf56f0125c99b7d17ba70944ebd85 v7-4-091
-+1b4cb2c6b285265da4ffbe242af35a73e1b118e6 v7-4-092
-+33f3e277ceab43179c74093f68196bd370199dbc v7-4-093
-+68b5f8abca93dd035ba180aa673a5bbf035b89db v7-4-094
-+acbe5414cb7f302f548bc1cbdc1ddb029dbf9094 v7-4-095
-+645358801356c7b1c53a1d3b1543781a669a7733 v7-4-096
-+93c8296281dd64e513d52db9f745965926df5cab v7-4-097
-+79a8bac614c0c565617b404764f28675687ad442 v7-4-098
-+8451f643a13eaf22e35a45e6bdd47c8d5b24c222 v7-4-099
-+5ad60cd88339c6217fbea8cf4f92dae04ac1c71d v7-4-100
-+ec5d11403c1952b2ed192f28afb6261d0867bb20 v7-4-101
-+9417f4de27a2a6acfa6b1660ac6ef2b5692e4554 v7-4-102
-+4db151014f93b7512919e452e6b3f4184758db7b v7-4-103
-+dd7d1a86b311c11e9c03b7ca95c7b62206bbc7ab v7-4-104
-+eed95874f30e9d9dad577f2361f2dfed93c5db4d v7-4-105
-+de9a01851ebd1ce1d225b40c182b6f1e105863a7 v7-4-106
-+064e2a080e2e158177acc017c318bc953fb7535b v7-4-107
-+fa31c5b82424373885d2fa55b4f8531ac21baacd v7-4-108
-+1cdf517067743dc33ebb9c7af8844abd9d9c7863 v7-4-109
-+6e54d1b3408ca745341b0b219c588c265fa52494 v7-4-110
-+3fbda56bb2008e2459951f3ad0258ff0500ba07c v7-4-111
-+af8217e4ed7e28b797c628f067ebfd4433c07326 v7-4-112
-+0e21e2a38ec6df5c4fe37d639906f56f9f445b96 v7-4-113
-+6db758f82227989426560c19fdd234b154b54419 v7-4-114
-+e35c69ad482370b2685bf1360a63fb27ce8b3819 v7-4-115
-+40aff213baff00d43ea8c1b6a9734ccad63a3921 v7-4-116
-+805ad8488dc88a575b841589f36c278aaead4e52 v7-4-117
-+62c720661f81c17348636956c1158639d59e1e9f v7-4-118
-+2f99966971b0556bc302ec809712f5ba3f030028 v7-4-119
-+ca0e43bbf8f9e409130d5d1ce29621edbcdff92a v7-4-120
-+4bf53c1ef37a5023e06f3c6b4f1c24857b4f52a6 v7-4-121
-+270c62fe685ae943de64e1a4ab295dae6f4ccabe v7-4-122
-+32e50f85d2c7a56c600a2c36107e56fa9f2952cb v7-4-123
-+9faba192ea90a32ee137aa42f5027b098931ddb2 v7-4-124
-+45ef9d2096e82d6a56a58606b6811620a61cb1ba v7-4-125
-+b14554844756422a39c72e62b8c2391c2d5a2e17 v7-4-126
-+6f5a7d3943007afc6bc03c445380776e18787f0c v7-4-127
-+4b92012f6b18f56664c268200fb54f1316495dc5 v7-4-128
-+1e28c0fad344549665c60c62374e6f511e5aec76 v7-4-129
-+cf722c09236098ae585840d62eca68dbf8065247 v7-4-130
-+4b23119cb58473ab70cf1a1204d4d3fad83881ec v7-4-131
-+1b09d6792520cbe1c94c20f6c833ad57316e75bb v7-4-132
-+6a28a9cf51537b81da7e9ec3f70fea55e393b345 v7-4-133
-+0defb460a0ebbc954b0f22267cb06e9d210be43a v7-4-134
-+1aeb7f4d6527369cf5f9101813ce8f10caf7a869 v7-4-135
-+3881cd916014605875de128226b83a24d18afe46 v7-4-136
-+6fdb1d6646b6b256623edb05f9dd770eeacaeb05 v7-4-137
-+6eb60041548ce42748cd8d7d49bdbf9dd164c967 v7-4-138
-+c8c80c9d2e2237fedeadfb1c6856c53c7a5e90d2 v7-4-139
-+505cf1943dc238c2383dcbc37a93fbb136e1f08b v7-4-140
-+2ca470c6096e3ec7cbbedeb1d0281056b088812b v7-4-141
-+735b70faac4a54ca9d8ebc2303ba28d5d18017e2 v7-4-142
-+d11f223f4c753889fa8f974f295c2a0a451c653c v7-4-143
-+bcf25cc08236c2adc27a4d7d556e11e8ea6ddce2 v7-4-144
-+1098b7b6e147cdd324ac665340540922c2cdceb3 v7-4-145
-+ec93f50f1d93c4c279606117a9f3eb37301b051a v7-4-146
-+d289f2167d702c87493d1934db863df29676e261 v7-4-147
-+8507bf8874d816a79411bc74df71fa58b557b71d v7-4-148
-+b43363a7b4c71a7a4e20dc21f4906f4595785983 v7-4-149
-+15960ebc2ee8539a1f15f660d43df1a502c34829 v7-4-150
-+ec02e1474bc2bbfd73349e7fedf62ae45f941ad9 v7-4-151
-+2ace11abcfb59f6e88c3a40aa1d849d335cfd993 v7-4-152
-+30e300c0b2c1c069d953afb258dba39c50772463 v7-4-153
-+71837ace77dfdd6c01e0a334314a7c6c713a095c v7-4-154
-+fa53233519c693591ce60f9270cf259c07d6cc26 v7-4-155
-+05a5cb0d6b37eb7806eb902a72d8b00dde48bc1c v7-4-156
-+be61f315eafe5cbadbd00bf7275e004fe09779db v7-4-157
-+d59544f3022ba0a35af174d1085a321de6d3b9b4 v7-4-158
-+a95a151402be5155cd89f8758e2e09ca95473ad1 v7-4-159
-+f29febf858be9c7df896cc86ea89c3da8823b4fb v7-4-160
-+91f3908748c29b0e8e759ac4cdafc95e536eab9a v7-4-161
-+477665b4105fa80e3655981790e55fc9babfeed5 v7-4-162
-+7db84aadd37aaf9d59f8f15dd6783a4e28dcb63c v7-4-163
-+a01819fb6e2b5c270dac492ab2fe923ea9301651 v7-4-164
-+c82339d8fdae0d43d51cde5216c979a5c9415bc4 v7-4-165
-+5d03c374712128077ac4c342aad02120ed98df70 v7-4-166
-+22387c8eec43ea8b1b704cad49c8f7187e2fd579 v7-4-167
-+e61a2b709f693eea9108d475b9bab5ed10ac675d v7-4-168
-+4e3a9dd25d428e7c08ed401afc244972e27e08e6 v7-4-169
-+8122eab8fcdbbdaac62dfbf7c6458cb3e6f46b04 v7-4-170
-+beb037a6c2708f539d50840637f70eed0811d93c v7-4-171
-+391e10afccf6879dcfab8b28cb1587a13eb835c0 v7-4-172
-+233ad7b960d0fbeb224b383918113b25c74ebe35 v7-4-173
-+f2c8d86c460d75fec17a0527a2fe93ac7220693e v7-4-174
-+6b69d8dde19e32909f4ee3a6337e6a2ecfbb6f72 v7-4-175
-+ae228baaec2c5eda4cd948382c2bab498d1a34cc v7-4-176
-+df3b0b70d8c1d29817597f45d19bb72755f86bd1 v7-4-177
-+647e6bb15aa3f864eaf447fe77e3e3ae7e37b134 v7-4-178
-+d1c8c1d6403485ff0135f0cf5c1ef07272a07173 v7-4-179
-+b1b8b097539a001043d1f0aac4663d6ee358dee8 v7-4-180
-+cb5683bcde03796baa7e845fd9a2fcaec3383538 v7-4-181
-+708a6a5905217736a2a231e36ced82f9535c4954 v7-4-182
-+1e2bfe4f3e903110f27cb6231f6642e721808837 v7-4-183
-+9ac2fc63501d3eff92446c03b2822b30b169db5a v7-4-184
-+b06e58f8dd3037f7f17145968d08432423ac8665 v7-4-185
-+4d12112c5efae071aecbeed1a7196f18950457b3 v7-4-186
-+a1c07956171a133583df42627d3498f935e59988 v7-4-187
-+136f05449f29388e9023f7934d6344bf4ca61d0f v7-4-188
-+0a9990bbd94a7dbdf20ca3f897cdf364c356d228 v7-4-189
-+6050f52d7cd8d6f79ed5ee8ef3efff332aca4932 v7-4-190
-+40f18a1c1592c8b4047f6f2a413557f48a99c55f v7-4-191
-+04c4ef8c0a1b757494500e46400552b135135e94 v7-4-192
-+a8650e2a0b5a5936f7d503429180df47df2aa775 v7-4-193
-+767103b5bcb05171fc1be0d6f480e0aa39aff731 v7-4-194
-+c2e88a40d530b7999cd29218555515bcd282d661 v7-4-195
-+1ed6acdbfef55e6e80aea55c8bc52d05f8458bbd v7-4-196
-+47a673b20e493db91844999f74aa3724808ac624 v7-4-197
-+705f398ce6f58016fae80c945a570721fc989117 v7-4-198
-+54b1a90c937380195fad6a52408aa3b4eed6d8d1 v7-4-199
-+0559091e6f09b5b96619513639ac14578a019612 v7-4-200
-+06e5f65c34d8136c3a9d2219429b7eca35cb3a21 v7-4-201
-+22d7af9ff3e5e2b93fdbe8603df2f15155a5976b v7-4-202
-+fb24b025c7cf07db79a559a3091db42e02c1af86 v7-4-203
-+f5120cbf16b9a9c6e0fbb599a6524e05ecf11393 v7-4-204
-+0ace3a24c2a0153f0aaf9b619d3958e7f486705f v7-4-205
-+7e826028d3999b6125b4741d45b22a2d0a520679 v7-4-206
-+2aa909427e44cd3aac7def024b66e41d0c9d0e0d v7-4-207
-+9b5541e276aa56fd72c3bbba85a17ef023c54ba8 v7-4-208
-+bb402c49379de97fcd475fbbbbdc5ed41e5dff07 v7-4-209
-+420fd9cb86d51a92c4307a746557e81914c6d6c4 v7-4-210
-+e90bef2240c8d187da6e8d8fa5007ec5afc12284 v7-4-211
-+50dbef5e774af6a998d1798569566429c38378b1 v7-4-212
-+e25a04c1c515e6eb32197291472f89bcadfabf89 v7-4-213
-+fe02fdfbdec077d0dc501bca0c65c51e56e1bd11 v7-4-214
-+f069a3a0f84451aa498c6c22d8f922d1e695e96d v7-4-215
-+bf1775553d3bf561e289bbf367d014915d09eaad v7-4-216
-+2f225a17c26b26eab87cfb89142fc0f95726ee92 v7-4-217
-+ddc3f32a4b2191f829206322d46f0e9c7e365e22 v7-4-218
-+37af1e6e91bb1e8ceb89d3ba1c49a04ffd889880 v7-4-219
-+1e272e318daaba51ec932be83a2481987a133429 v7-4-220
-+a548aae15b3a27a56d814900049785c29c01a37a v7-4-221
-+9123b4d3ef05c7434b6f6cd011b63f63a9a4a539 v7-4-222
-+4b78922d557c324de6b6a75515fb658235fa782c v7-4-223
-+092b8f61021b91024b127de3983d1afb74b64996 v7-4-224
-+eeb150c07647b3691d2696a3a4cdb96f6db5a63e v7-4-225
-+b650f2db8f9604124c0ddfb14af0c04bd4ae0580 v7-4-226
-+b0a9df477096e4abe938f998476e84e77db42e0b v7-4-227
-+3ee5808a293c7436e34a696a09ed29ce38750d9a v7-4-228
-+839cca5ec18d560e3714065e54ed38b6e812aaf7 v7-4-229
-+57ecd7a8c0f052296b41b916eb1ae7f2a9a48b27 v7-4-230
-+0a295a3c9e473512ad3b006a0fb752ad43d19094 v7-4-231
-+845608965bd9d0b2755997a7be812746885ff105 v7-4-232
-+22a1d5762ba3a75984e89dcc47a65498f63a6c2c v7-4-233
-+d2286df8719d6e99c743e3bf6ac14d1f9debc84d v7-4-234
-+5ab2946f7ce560985830fbc3c453bb0f7a01f385 v7-4-235
-+a44087db72386d080e9da870d751daf498004be8 v7-4-236
-+71b165a378ad580818f6d497ecf0f8ad054a9683 v7-4-237
-+410ef4f1a3d2f4a6ecad9aaa87dae645d1578a19 v7-4-238
-+98bfec9ea7608f312129475d4ca0ae6d1c6c232e v7-4-239
-+8d1ba0a23588932d22ad37cbd87ae3bbd4bfeff8 v7-4-240
-+a63d0cd691dc925283815d17d62f4e948d723a59 v7-4-241
-+f084024c0ddbba46aabfafa2996c3f7d13080ab6 v7-4-242
-+9f8fa56f1906f4f634cd602a7a2b4f8631faf526 v7-4-243
-+da17c7de616e3829e4f59923ffa138a067928d9e v7-4-244
-+80421d934ebde183ce545ab8d9eb3a4c2065c169 v7-4-245
-+2cbac5608217cdce725a0f04d397d4466a3322fe v7-4-246
-+76863b4b48a3684905527dcc688e5a8c4c5e23d9 v7-4-247
-+e5f1f2ea0b4a4834791924880f78272ef52eb087 v7-4-248
-+0b9a66ea49f435536745be0e0a6154be7b607249 v7-4-249
-+a8f3f45896288bd7e0a27e0c28c3cc3457ccc507 v7-4-250
-+29eb4c2a33ac701bfcd4d2e2bed7864eba876e0e v7-4-251
-+a43a8262e1ceffc393625c53a1ffed9e6bcaba62 v7-4-252
-+4901a36479f200b2e6700ad91c26911d92deb886 v7-4-253
-+251acc686ca41e4bccb037ef44cd7b486774d580 v7-4-254
-+5595506b985a198abae41ab0150ee50b8bf1686c v7-4-255
-+afb542ea210cb9fc5fa8c5359bb4814370024b80 v7-4-256
-+17903ded5e9a9d49ca73b324657b944f2954d4fd v7-4-257
-+e8ffd1e6c8dc62c604d34e879791404bd15cab33 v7-4-258
-+e4cd5bb75029d2c1208f3e31ebde4e03b16e8123 v7-4-259
-+6bc874e4789a0f912b4fd6b23afecf19d80b1605 v7-4-260
-+43c6cd07c8defd8505acbe479c6970764c08e6f9 v7-4-261
-+0ea551fa607dc443b97c2fba97dc0c9cb0bcf303 v7-4-262
-+af1bb39774f41c28eabd24d80cffc775695bc124 v7-4-263
-+00acac0af680c2d8c82db5258474b121a5908926 v7-4-264
-+8ec9d2196bee0c5108f2d2c196a660a7f4e5f29f v7-4-265
-+8f84e906d454a95d3167678a745dde9de442b604 v7-4-266
-+75f222d67cea335efbe0274de6340dba174c1e7e v7-4-267
-+1a5ed2626b26a982e307a206572121a557adf709 v7-4-268
-+81c26975e8f9dc7435353581346542409403f296 v7-4-269
-+c519c446c5488bfd48c93a03efae4ae3e0c1f162 v7-4-270
-+88b0571de4327ba5127a483493bd7d46e6a9850e v7-4-271
-+00228400629e28384f7f52556c3c119ba0d0a44d v7-4-272
-+747afb6a6de437131d9674e6b2bcc73d74863a89 v7-4-273
-+1ee3fc5b40ae94c2a7fc5a62bca38d4f730f9bb2 v7-4-274
-+8a3117a4887c1e12a1165c9719491f96753787d6 v7-4-275
-+a6b59ee633a355095e6473ec5e2a7d9088bfb853 v7-4-276
-+373204662d82e894b27ee76bc3319bc62c91f6ae v7-4-277
-+b4ce0e1fb5a67d7d6b0bca8eaa3edc2e94a085d8 v7-4-278
-+8e9db1f27a0063df023cc05a760fce73255dad24 v7-4-279
-+daf7e98675cf395e1ef96f8040567affb2782a11 v7-4-280
-+24c90f1fec859b54cf2b854b98c4c9e614c46061 v7-4-281
-+6d0a1132dd71c7f55f7ed53fe99e97c79bfd05a4 v7-4-282
-+aa99d04fa7e288a8580e3a5d4a9d6433a1572b48 v7-4-283
-+3c35ca9666e88a8024af6dab585b8e79ab295f83 v7-4-284
-+5cb1828fd0056de3c166e71fbafc67a74c57d7b1 v7-4-285
-+be19015ef43cc17825929206790696c2e716035d v7-4-286
-+66fe4908b649ba18426af6f69e8ccb01b487dcbd v7-4-287
-+7965cb6a435ae1ea331c7c2f8740d3d4c3625f3b v7-4-288
-+99374096a76b96d1128f5e6aa1fa92b4ba70fee9 v7-4-289
-+b871734bf54ea185dbd2cc759d86dbfbe21cde26 v7-4-290
-+b5972833add9de714f4651e26fd9ea63ec4a880c v7-4-291
-+60cdaa05a6ad31cef55eb6b3dc1f57ecac6fcf79 v7-4-292
-+10fc95f48546f438648b8357062e93c9c2c0a377 v7-4-293
-+fdea5ea9afd139ea59dee6bdb3f1675b8b882bdf v7-4-294
-+662ae48e7e246a63d38c9f3165b15b62252edaee v7-4-295
-+53b87d790574b6d19034fb3390987c22fb928c58 v7-4-296
-+81f5a056b2a582c8109da10cc538dc16a326a34d v7-4-297
-+156f891d520e93eab5d3ce02784660fb13a3b0d3 v7-4-298
-+daebf8ce66089c0c179fb436ceba359ef8d593d5 v7-4-299
-+1157079ca5f167bcf8746dfc52ea5a85e6c87a30 v7-4-300
-+8cb42aa3c4957a543e5dffe307475dbab969612f v7-4-301
-+df141c80ea3a1ffcbf82d05c1314675231fcfa75 v7-4-302
-+463ef551e9f62b63ac3f85f1f297b668b14bcd09 v7-4-303
-+fed2e0967f8133ba9a44b0701f151c8d88c4896a v7-4-304
-+63e7cc62402dffb180b40c04c63ceeb5f53957d7 v7-4-305
-+05e1d8afcc5e375bf708ccc9810e2fd1a5a8a3cf v7-4-306
-+06c10522d321d98874546b2a4d3b0ae145386f2e v7-4-307
-+e3d2b8d83bb30c428a051f50791e454fcbc080af v7-4-308
-+88a6e9f33822d33b6c32db578750c6c178c63f50 v7-4-309
-+ccac0aa34eeaf46dad4b831461a532fc3fe71096 v7-4-310
-+f6f7543043246107075f0d3739c471d51b7226da v7-4-311
-+66eead134d6800fd4cf2d5d4b135d300c933f09a v7-4-312
-+332a5c2b2956d9b18d85268a724d01deea27ec83 v7-4-313
-+4d7af1962d6ce61df65fdc5c86544a61951f9517 v7-4-314
-+646616b6ff4defcc7bef0b198b540f6d965a8126 v7-4-315
-+0fc665889e8f0af532cb4e3be2f0ff0421bf2fbc v7-4-316
-+8ffcb546d782121dfc9d88c7edc6f62421efce89 v7-4-317
-+5c47dacf397c1c65d2dfc237b3ff395c66ec3d4d v7-4-318
-+a076237d1c3849535681e82946a9041ed5525d7f v7-4-319
-+f7bc601823e5c81e2ca412506a42eff9fd790ace v7-4-320
-+c052937aae8ca5082f308b8ff0712c7eccdd30c8 v7-4-321
-+fd96c55d683d76ece4ba01490d9796c13c988cdc v7-4-322
-+238f5027830cad22e17a970483af9b160869cdf3 v7-4-323
-+c476e0ac8b406693c3877baffa0e97ff25e59b06 v7-4-324
-+1f288d2475488c3f44c7248e99019e2612580716 v7-4-325
-+1dbcb23ae7a8b68ddbc28b4feb794c4c1db12395 v7-4-326
-+99d8f2d72dcd4b850de81998cc9b1120c8165762 v7-4-327
-+01d9ffdd6e6ffb39faf946e13ec63bd7dc31e162 v7-4-328
-+018df65085f8990c1407442f8c783d4cee72a479 v7-4-329
-+f9fa2e506b9f07549cd91074835c5c553db7b3a7 v7-4-330
-+6d984caa0409fd284722c44cb09a0a2b5360bd4f v7-4-331
-+8fed02d53b45848b0fff60de13d06858963cfb17 v7-4-332
-+8ae50e3ef8bf733c0869c01b5132d02feffc0955 v7-4-333
-+03d260a8ea0c0c67f424c387dbe2af5754e5e589 v7-4-334
-+8ad2ecd116021ad5c945426e8bb80d741392b780 v7-4-335
-+a42ba1e5099290a86cac1a9ac490c49e82e4c2cf v7-4-336
-+0206ac84ff5fdce6d893c470e0909d2aed547a24 v7-4-337
-+ef83b423ebf7de11c1063c795dd2186a9b59b90f v7-4-338
-+fd7110d0c3bf4fea3cfa3d16da6c2a945d327c27 v7-4-339
-+03f95f5e311b84653df70fb3c08a9d92cf21b8f0 v7-4-340
-+adc4a84f72eb44dae657af713922a6e2c1f64ae3 v7-4-341
-+8dcc6f142460b2d5eee119a174d441d46d95cd99 v7-4-342
-+539ce56d8f35fe2deb5c4f57335e1adf97ae4e74 v7-4-343
-+ce284c205558d103326a4c3f22f181774690b3eb v7-4-344
-+ea2c5dfee1b04d216ebf992c5f46ecbdfee2854a v7-4-345
-+3248c6e40aee01a7254d111dd846c6ec7889a804 v7-4-346
-+a162d41f10e1c3c8673d86d8b0c58fdaf1bddeaf v7-4-347
-+0b7586868f6da0372af7510650240e22dc1e6e64 v7-4-348
-+79950dae1d7de8fc2cb0f8ddd087d403e2b9ce8e v7-4-349
-+ad005d0114c1d2d83490787ef7ea2a3c6e5e7b9e v7-4-350
-+f9ec944e4474c649faad642797ffd798a7102549 v7-4-351
-+b4962cf3a1c06a1f60f1d750df8fcf7035b00b99 v7-4-352
-+d42a1d3b74d40f580359dbd139d2d0dfa7235252 v7-4-353
-+5deaa4e9812d4b4ae59d8a3e70bf19983e07e6da v7-4-354
-+9a4efda75b5ef0f496d6a29c0a4dfcc7c03412f9 v7-4-355
-+34465a179ce21c827cab4c65a75e6b490600a96f v7-4-356
-+4eedfc4911a1db9c4874689f6c652be0094838f2 v7-4-357
-+771b97ba3b4768c77f2070423a93152d6977f012 v7-4-358
-+182c7b987283a567121e9c43d831779d1c88645f v7-4-359
-+761687c6808f4c9c80d33a919a6bb506dfe9f674 v7-4-360
-+a97e5b9dbc26800830e46cf3c1aa6efbfe258097 v7-4-361
-+7fa2bed947fde3514a700c96861a537d816d6fd4 v7-4-362
-+ff3816167b73fde35017d364b1a820014cd42e76 v7-4-363
-+7b324826757595b21b0410a7b6f00227d73c655f v7-4-364
-+4625fa27ba6f5b06294675b7f0d1bf8ae8f249fb v7-4-365
-+ad775b58706587b6acfb0bb2c732e184efe4f778 v7-4-366
-+bdbe2037066df6a463346be1768a56d98001fb36 v7-4-367
-+021e16be3c026c9f883b2aba0b48469ecbae5d88 v7-4-368
-+72ee0db83788638c36bbcb076cabc2ba6c8cd4e7 v7-4-369
-+50575818a97fa4777e52272f5ffc769179d76a8d v7-4-370
-+d44f298c43c74555f4ea21b710d377133f948d61 v7-4-371
-+a122efb555c4f08405051369310451a627ed524b v7-4-372
-+353330c512a9488cf5c1a3f8b8a57fa8cdd83a7a v7-4-373
-+f59c4bf0ac3b525f703cafba9a9cb0aeb3cc7745 v7-4-374
-+5a5492d676ab1e8334aa86ec552e7e33ee8828e1 v7-4-375
-+c3bb76e5b2355c57d7f89997aa9e125e46afdea1 v7-4-376
-+255561411d7ae4b3c713bfb2e2f13c5f08ce0c61 v7-4-377
-+75ae211df37d789c54f660ccddddd0e370aa67ae v7-4-378
-+16cfdf28be40ccbefaeb80ec574a098362a36a34 v7-4-379
-+7cfbad4a78bf306e5aaf84dc9c29b48e7d77c1ef v7-4-380
-+0a3d958e346ee051667d3e541273b78fb1dfed9a v7-4-381
-+dbd7dc1ea2e6bd0fc3c9ec7faec76382412d0129 v7-4-382
-+2f02675bc4b051fff7be63f5107f659045a010e1 v7-4-383
-+6f88e2dafbf637f573372bb7d8957fe4f2fd0843 v7-4-384
-+6e24b97dde6930a62ade6bee725babf4a39bb0a4 v7-4-385
-+09af7cb358f0bafd4b7437ff580f4cd7e15b74a1 v7-4-386
-+975d96776111914f69c8a0b98ef7db3bbb83cd10 v7-4-387
-+76e7fb736c0e9d06b97ff95ee8baad1fb09d420b v7-4-388
-+3d206df5c8284f7d5f4a987ae9c7a508f289f008 v7-4-389
-+d3a674f6c7370f70d6b66dcefb9e36d22d73c7b7 v7-4-390
-+f051e50a6a5feb0f0c6d209440d9d305b82f5836 v7-4-391
-+589fd07888abc8a1208616c56b21898d3352fc5b v7-4-392
-+1bff71d202621d97acc4ef21ce9f47b78f68bda3 v7-4-393
-+d594c15521377493d5e23b03e4dbf5108df69acd v7-4-394
-+65b0974c5bebf5d6b56e9abc90d86759d1c4f6d7 v7-4-395
-+7766142fc7d3e90c2e15a9c606efcd97331edef8 v7-4-396
-+8d361608fe86c534e51e4c7e583375642d34b7a4 v7-4-397
-+f62b2e76dd809dc57cad9d0fd8f04a4f3a7193e9 v7-4-398
-+18ac55444b37bcae8ea090f7b3abf4826c679bc3 v7-4-399
-+50a658bf4cff030cbe6a97a53bb838b5976c2e1a v7-4-400
-+ab71bb81b84e9a1cdf030b172f61d779ccda975c v7-4-401
-+3aa37ad2c4ed4d4f979e7c7e7d5d88586c6b74ba v7-4-402
-+86fb698a38d5c10f59928e57da94ce5b3e124a40 v7-4-403
-+0242c27e40e1ce913ec2b6540371d5ea5fceeac9 v7-4-404
-+4c25af735304ff17a27bb3ce21e7f7d3b304ff88 v7-4-405
-+1134bba900c17abcecdc414c6e30da22c17d32a5 v7-4-406
-+3f92ef156c664fb8fea1f036a4a4c87af487ba6b v7-4-407
-+cb3218a69c2f0949bbff5bcf9beeccc83ef2ef59 v7-4-408
-+de35e123e63c326be4a576f8e678ed9e63ed1f48 v7-4-409
-+2fd550c75256cc1ecf06a4afc6a856b305cf7a8a v7-4-410
-+d4e0c197e97968050596f4c441552383e31db63b v7-4-411
-+4c845a1600d28db8edabd211e6d7a9cd03883ea6 v7-4-412
-+121613e72e397db495f5e9b640b249aead5a61c1 v7-4-413
-+67edf731a2403a8023440184872159ddc073093c v7-4-414
-+20dbceb6f4713ccd01be45dc531abc269fbb7579 v7-4-415
-+735bd597a8ffcb00edff68b34a26573b8f3cad9a v7-4-416
-+e60327caf9095d5ec067a5ab47bf4a69c0f58580 v7-4-417
-+00f58478e38b68faf783d8fe70c1439fe9dd732d v7-4-418
-+0a42938f449cf306a429db373106d5e29d8d4312 v7-4-419
-+93aa0340130912c69d4093fc626a3cbb0cc7ad68 v7-4-420
-+3ee39fe2df7d60d6376b3429383c5c5e3f9bb3fe v7-4-421
-+69da1498ce89dd093935c0e5013e1df8060a4e80 v7-4-422
-+96a4fa8e530c12137af235a9aaad57d578f9eebd v7-4-423
-+85a1802ae810f0e840f8b5d8f2827b4199b39750 v7-4-424
-+2e804ebb3ee8cd59451f8f1c1be2f09ebce0d77a v7-4-425
-+7ab9a9cf2859ae4b7c00c4fff016fd5a0869450e v7-4-426
-+fca35aa9380a9e3acecc78f85e05f26436e87ae1 v7-4-427
-+1fe61f6d52079f44f61b3e03cf9b0c300f2890d9 v7-4-428
-+e98e415ea3b8c743a5ab04ad9f498ab1b11ae8cf v7-4-429
-+f4e9c65a18d4a5753747f327ed55c10f05d8d91c v7-4-430
-+5672a06e4bd84cae4194ff0584d487448bad8c38 v7-4-431
-+59cd2b16f71846dec2e842491e509385beeda5e9 v7-4-432
-+dd3dac42cb9b5f95ad16d5e08220b0c7adf4b024 v7-4-433
-+4176c48c7dd51d0fcdb7403cbfb489a75b0d819d v7-4-434
-+b98af9af378eebe674052aa9a1b1956ad3f96487 v7-4-435
-+52fa8300ce205a8f3c45b3b1874564b7768630ea v7-4-436
-+8515b42f939cdf3a59fa6120e989d9f8fe6f4571 v7-4-437
-+db3b8fe8330ea2afabd6c4856be5c76ef86d4728 v7-4-438
-+07b28e96af8bace1af65bac661f22716781103fd v7-4-439
-+1f578cd9a65779d2597e0135a5916db621d65734 v7-4-440
-+e754b23b7d1c3825dc2c6028867d631520a8cdca v7-4-441
-+8c3c067b4ae3cc02ce4411042df05f97df5bc316 v7-4-442
-+f1ba154c3a12d06cd0f40edbfc675103eb2dd7ad v7-4-443
-+d4cc9f48d5a40382e3e3d52dfe6e948745ee13b4 v7-4-444
-+1138726736fbdb92aa5259ca4b76573b8f4b3f79 v7-4-445
-+63121fdd093ff71081725d5495337ea45d38daab v7-4-446
-+0d2c821cdc2505879823a551baeeb8d3c61ce758 v7-4-447
-+2fd96725b0632cd9183581ce13d7b2cbd734d8d4 v7-4-448
-+cb5480096f1b9e8f44e9d742fa190a90d77e1c54 v7-4-449
-+7c9abc70ffc187f9bb60d968cb7e3cc5ed6d4231 v7-4-450
-+ac6cfdc02695b31b07e9beb60fd704f74f4d4c81 v7-4-451
-+78aad99db7627a19574d10415780ded69936d7d7 v7-4-452
-+c72eb8499a9d3f618de3528287d1de62025fdda4 v7-4-453
-+0cdff7c268559f8f34eae073a013ece71b62b9e3 v7-4-454
-+ebc72764fa1e74758ae1ef9d3f49301f80fc3aa4 v7-4-455
-+54194bd6ed607aa0cec07d8a27d4794573eabba9 v7-4-456
-+96761b6789f61a8dee1551b7cea98e669fb90fb3 v7-4-457
-+fe1827921d50cb59ac680ea13e3f9103cd9db660 v7-4-458
-+7816c24ff8907c9f24a9e35992a4d5f3cc9dbc7e v7-4-459
-+d5eba03293a6193a1b462822800641b820252ce3 v7-4-460
-+4eba2bdb26f2be61bfdb1f635c0ed65f4bc35b0b v7-4-461
-+c0d93d67572b2d4161d0c5a5ab09477d6447ff49 v7-4-462
-+6f80b9a773db0f3c69156f8768c8b6cfa4ad6785 v7-4-463
-+74c65620c985f680eb1d7c1110f259cc37779ffa v7-4-464
-+452e8b2a0ab39fb0cc037382cc4842a6d6b2a3f2 v7-4-465
-+521c49b6de9d6352331dd8ff63286f6673014616 v7-4-466
-+0a4efa3d20197cdf0bfe93080abc7cd197878e9a v7-4-467
-+4f7f236d773d21e46ffa6c38d8df110d11413dca v7-4-468
-+a6f5a4ac4d4666282179339abe696d7689f8681b v7-4-469
-+9d5b8b015e5f32b84e0d74f21481b0cea2b84975 v7-4-470
-+3005da486a71dc1171b3c8fe075701ea5e4b5668 v7-4-471
-+af998690a8841d4df95cea0bed4246f2ba98e247 v7-4-472
-+1cdd5804b538d578d71c9d85fddf8805cb200663 v7-4-473
-+7f2472960aa114ee650fbac399b4561f1d43251b v7-4-474
-+0446fa17bd95cdb37cd0c14ada32818b43577597 v7-4-475
-+4c29b75cae193c039f44ad438f772f8af19d2bb3 v7-4-476
-+f21a2f67bdbb7bb7c5c2352186757c3fd2471ce2 v7-4-477
-+fcb898dea2bc8b6e89172cb48ef26c56cb79cfdd v7-4-478
-+e0f2ed0efb49d1d01b978f8a7f0db5cc8813cb1b v7-4-479
-+e3149e2b415260e7a3d8c9d51ee56d185e6bb1d7 v7-4-480
-+15e88e3750e3b1458b0d38c2f16ed784e51a4f3b v7-4-481
-+488bb7c4ace08fc93dd5405e7146cc82e32bebf1 v7-4-482
-+3eb160c5b3a195855cbe21309e6b9b375de63803 v7-4-483
-+76526e7100b0c61d9cfbe79edc855f6798363627 v7-4-484
-+7844d92941fdc10653ff5a6925346a02bb7f5404 v7-4-485
-+b8caf7045e3d838849cde86f3eb0142e50482276 v7-4-486
-+1f9577e9ef1b22cf701b58d418a4ce00071405ed v7-4-487
-+3ec6e0ef4a67cb6030466bcd4d5d9f2fdd4f70b0 v7-4-488
-+31c78e59080674530e5a2d2c00c343a5cab76dd0 v7-4-489
-+df92c2b2a1795c8b0a43f2faf3a50b4b4a359773 v7-4-490
-+5f54e1995751392b4cfa48d8b49f9fcf195bb239 v7-4-491
-+5e998fc610d5b23ea55ef64c8f5291522ff3b4a5 v7-4-492
-+a0daa5feaccbbed4b8d6db9c18f76ebe116c8e37 v7-4-493
-+85d8cde3b432ae627382e1f2222aa8368f5837b8 v7-4-494
-+0079791cbbeaaad9ff4391097c2f7896114d6022 v7-4-495
-+112c80234ce3815b2c7d1c27ad21aa885d2776f3 v7-4-496
-+adfbffe1e642d8779872ced560c13f3e62a39819 v7-4-497
-+24ee7a7a26b1ec8169bbb4656a99b3499e971b50 v7-4-498
-+65e72747fecab7c43c72a1562e4fef6b530e2db7 v7-4-499
-+fd4dc6581b0ee754af50afefcacc1e241a3f591c v7-4-500
-+0ed561752653050472279f14ec75144844b42bf8 v7-4-501
-+7b28dc1d756e11bd7e25a19ffe272ac605613a40 v7-4-502
-+094a87e76155fcbb43f7070eb605c2944192a7ff v7-4-503
-+edfa81ea17117e6db410db58cb2a26789aff50b5 v7-4-504
-+9bc6ce142cc385bb3d516ac5c2429dbaa3b32886 v7-4-505
-+79a667b879e70b81e21735997f5ce62372e37886 v7-4-506
-+5b2ff413125bf62b31d34efe1c816ebc05d8d7c2 v7-4-507
-+65df2fba429b6eba6b25e1fa9422342c73afc64c v7-4-508
-+60659773c73bc34f16340dba6f96f02f4664c7e7 v7-4-509
-+05850b74218baa3daa2f5a8c40e14d07e9371825 v7-4-510
-+7623d953d3bc2973e7a40f5a28c8f2d7d16f7891 v7-4-511
-+9f9058aeba0d41d264c1ec1ef6ee4cee5aaa8ab6 v7-4-512
-+6ad9facba57daad4c68b8d1cb3a8efe12d6ae4a9 v7-4-513
-+e6c5ff35500d907cad9bfa1f6babdc08a4a90aa0 v7-4-514
-+387e636805243f4ade8da63fa7c115dec64aa56e v7-4-515
-+81c9b19ee0fb867a8364f73bdcc865676220cb0b v7-4-516
-+93560d4bca68e9086539c273c4e3f7e792fc1739 v7-4-517
-+383cb9ddb56115f95933c5b994e0cec64ee578a5 v7-4-518
-+27a36d1013a6dcf699ea9b2ade80d74329257dbd v7-4-519
-+392dad030b8dd123f95a2e3624727607f542b4ed v7-4-520
-+39274bfbfba5ead4d25f5abc41c0692b27e60473 v7-4-521
-+870480df8275c1647530a23cbf778d888e1dc824 v7-4-522
-+9c9c70625444b29324a1e446eb23bb0c73547cab v7-4-523
-+762ab69c2d138af49de407022cb7e363024f6a16 v7-4-524
-+2587209317b75d073c352c61f1e6cd9f8c26d7f5 v7-4-525
-+230b52b9d35ec12f6a83368b3479dfb85158bcf9 v7-4-526
-+2bb019eb60ca1d16e62e95bef16475756965022f v7-4-527
-+5f49ac8426dfddcc6725fae872b642976e468c8a v7-4-528
-+72d5a533ec87c13e87e80273a1817b5ba19d313b v7-4-529
-+5a76e36f07b160b44b4f4e637decbc914a243e6c v7-4-530
-+2c0cddd0df8c8ca0c08027e7866f697ffd20d6fb v7-4-531
-+7f48abe500e13554d14f5efae736da871a89ebae v7-4-532
-+18953e121be6993e8e87a7d6fd49321ecfc2dcab v7-4-533
-+ee28ddfc7b7c66b7c2a87ed95dd1d4cae7902a75 v7-4-534
-+83c5fd1b55bc6b2b49b4653cc98985b8dd3fc728 v7-4-535
-+d51d47bd77c2f042f9893d9c528a5f2fe75eb872 v7-4-536
-+01c668384bcc7fd0f8572a8de2dfc3b2ead7eff0 v7-4-537
-+3421b24e419c935f3914a4bf7eb6d3b1de3d618f v7-4-538
-+77fe94082f5396c2e40f732b30c9d76984969694 v7-4-539
-+93aca8cdd7b8cc1d9e921e243c7c2b6c7fd5f730 v7-4-540
-+9fbb9c60ab41765a0d9f02b0b6d48cabe7270f0e v7-4-541
-+de877dab1c3163a95ac8e7d3d6c3083a64e3c093 v7-4-542
-+f673842874b6aa9fdbf3f3d9fafc67fe4debcbf6 v7-4-543
-+89143424f604cd610f7e709ac683dc28a473e078 v7-4-544
-+d2239abd3edb1e3672916c15ea8df6a01d1b86c6 v7-4-545
-+84190359b9799b0ecb4d9e8e421471e14f659616 v7-4-546
-+19726451aabea7e3640c56703846991c35e59e98 v7-4-547
-+26a20ce3532c5e3f47f12facc28a5477fedc9e31 v7-4-548
-+1fd9f1d43660f9645d8dabfd14131371aa2f529f v7-4-549
-+7cda721eadb04f555a912b220c9047f504480bc6 v7-4-550
-+eb0fb921e197c7b1294e1142479c982d1770eaa0 v7-4-551
-+c8d6dbdd11563d39c42f16a80f9c74bc68155f7a v7-4-552
-+e13f8073c9f9b8f2e80f32cf0c13073304a3f967 v7-4-553
-+7e4c22ecc679455fdf3e1eec6681d13d998bebe2 v7-4-554
-+c124393788693271b446ba24b55dca407e765bbe v7-4-555
-+a35752526cd050f35306bac3dc04ac4a34a9f309 v7-4-556
-+fcd5a3207100a1f75d96ead301249c60b4f23d79 v7-4-557
-+48111d5fd8a8b133b32fa92137a56ae910915370 v7-4-558
-+29f5cfca338897412e3a7c819085c1fe36da2135 v7-4-559
-+86aacd619ac0ab9b6b6519cf132367b744adf8f0 v7-4-560
-+82c6a3bddb23c7343fefc271b33960a20506ead5 v7-4-561
-+b5df99582638f6f6cad794b7049453d7ff2c70b2 v7-4-562
-+9dc52b404c1b3f32d36df2841c4c8eddea6e4407 v7-4-563
-+9657929ee56251b52885cd0660941b0aab2af3ba v7-4-564
-+22f95a018b13dc9d8a3246d990a1ea0b5b3a264d v7-4-565
-+a88d4dc02bf438ff9e6ee119be8188e342ea459e v7-4-566
-+0b245c8dbd19755e08b5248110a537a74ddb92c4 v7-4-567
-+747cbac7047bf8d003ff0672b25b60e0236fdb1b v7-4-568
-+ccb6962585f1ea5e7f872d79e59565e7a95234db v7-4-569
-+816c584ff1740cd118d5a35fbea98ed28ed2e2e2 v7-4-570
-+97b2ff29ae3a213b5c72bd8ea3aa2442ef355e08 v7-4-571
-+cba15023c40371ed51ee0ed50fbdf23d6860f0ba v7-4-572
-+8cfbc34ae4aa2b91b5b012b2e8dfe86327b449c9 v7-4-573
-+45ff9dd354eaff958c0ba646134e1f5cd6e9186f v7-4-574
-+fe0f33ac63af3c16a9920fe08bd3582aa0f02f50 v7-4-575
-+749fc929da45d07efc5352dd8a0c00f8ed9f2163 v7-4-576
-+bcf9d3a6007fff06d0521339f93dc870e5231eaa v7-4-577
-+b7b3afcae90e5b8e9f57ec3b172fed14f6912579 v7-4-578
-+134a7d55f9fa170c8c4591328eb550e70b756616 v7-4-579
-+a5a6f1467b1ea73697b3265d8f12805bd998c81e v7-4-580
-+e1874a4524f8c97efed78e215fd5ff91f3569351 v7-4-581
-+dfd593d81818468ad60cad4fc66c561299f8d969 v7-4-582
-+f2978794e801bfe8a587865492302cc0a16783cc v7-4-583
-+79b3d83592c5ad63ce0c8d276d15f570e95dd941 v7-4-584
-+1d3139ae6ce67d69ce8bc221bfc67dc1b47e95d9 v7-4-585
-+667cb2eb17a52d9ac28a1b6f686935814e769ecd v7-4-586
-+70793fedd25a509568abbd4026565675e830b1ca v7-4-587
-+a03e143b93587cf29c91121acdf66f6e5dc6e470 v7-4-588
-+8ff2d1b611bfeb17b594262cbf9313f819b4483a v7-4-589
-+5b8d26b85437ffa91cd586fa138aba80bba897a9 v7-4-590
-+7b8e3be930f39af3cdc1fe969a6de16f2d91e5d2 v7-4-591
-+005a6b65086666ed56531e4c8a531a3ee0cea638 v7-4-592
-+bdc8e71633e45ebe5f1b59e4328fcf22a5866cb7 v7-4-593
-+f9d02ce2f745f75003ff570b2a596c755ccc86ba v7-4-594
-+d83436d119871584ddb012ecf0aa4d01030f65ee v7-4-595
-+6da912e32896c57227a0f297aa1d3312a653cf0a v7-4-596
-+c124a8f34ed1cf510d384b384db6f34be5d61a3e v7-4-597
-+b01ca71f93b293ba93489bc2320c12caf61bf289 v7-4-598
-+1ef8ce97fc40b59d7218d7300685d40df63a407c v7-4-599
-+436d6c9e57f2f6def73e86891cbf72a0328aa9bd v7-4-600
-+2561531decf15c1a02f62a1b96ff778e12a5dcbc v7-4-601
-+4e31d9f7c896a346b2346fc4ff005b8b255172c9 v7-4-602
-+0c8738124a7b9d6d1d3e18124ad97310e9618c92 v7-4-603
-+f625b6302d048df7d9f9e738b773f91dd4bbd58e v7-4-604
-+c1ed973fb58faa650dcd4d25a98c669edb8ca0d4 v7-4-605
-+22f164bd7e8ea7de1e4c2a41020dde971112b862 v7-4-606
-+52b89a52ffd4f2a925b42be1aa8041bc0c0dff31 v7-4-607
-+6b86d256fd3360a5a0a8f89c3efeda4e961153c0 v7-4-608
-+38add5a3d617109be3be5e4c0d0b7a32ab2a2e00 v7-4-609
-+d6473d6501fd0d1c9113590bf29a4195bf4337bb v7-4-610
-+7fa1a7359a56531ec52ba527b3c1c1a7c8b9464c v7-4-611
-+75238dbe85432f4980aee44b25921880b3122f64 v7-4-612
-+ffba266e064d1b951bfc9531adc664aab60cded1 v7-4-613
-+a7e485b683d8df14c3fe0833c7b4928098914aa0 v7-4-614
-+7092ec5d5ef1f6f399d7e6b36c2cdd73bc1b3ac3 v7-4-615
-+a287b0e9e87b238bd72b5340cd8fa37807de7525 v7-4-616
-+05202d6ba0ef2b1430519fda8bdb59576b1b01a8 v7-4-617
-+d129b939a19065a0a5302077d2a9737ed2dc0bf0 v7-4-618
-+9ac723b9f54dfbf2c1d05a26a129e94af6a1d72c v7-4-619
-+1ffe91b5e51408d9f68ed8651bb3a85f68365ad1 v7-4-620
-+f884a1140a0a143ad21b08166e2b72dd131b78c2 v7-4-621
-+599112d00aa96072d75b1d6a5bcd7123d055daa5 v7-4-622
-+3cca9b0cc1a0d31ac6c6a0b69544dee96ff280b4 v7-4-623
-+f8f2a61e538d4094e29db47954516d572b2dcca4 v7-4-624
-+4b1e3b3aa78abcdab840189d766f54ebdb2712fe v7-4-625
-+68e0e6bb8250f9b595b517e7061e83796a4b3ec0 v7-4-626
-+c77ef1bf9623d0c7ebd7e011e6ce7a3a12b0bf41 v7-4-627
-+6eecaf5a18ca95f0ff06dc2ac88015e6bb6f70ac v7-4-628
-+f28c171348fbfe055c86a354b4d235e2786215d9 v7-4-629
-+a5ba0921efcb7d48a9ad5939f66953a43ddf359b v7-4-630
-+86f00f7678eb312cb88b25da2df648f9c9199b5c v7-4-631
-+cd7b5bbe49525c716f2b7eba4353b1f496134944 v7-4-632
-+03688be95994f55e68cce333a92b673ff31dda9c v7-4-633
-+290631797b76d126b51b83f04bce6218f0ed2dac v7-4-634
-+a871b5070d59ef9ed1934b2951ef896b2c71b444 v7-4-635
-+578c16fbab6684cf2c690f78089f755f041568b3 v7-4-636
-+a532340f39406fa50e8db45f769468bdeff1e982 v7-4-637
-+199ce895e1629df83ef97d62ca70d38b7400adad v7-4-638
-+43f444efe6a2de86f459e9dc164429a8d81c70e7 v7-4-639
-+34774748534375073253c4a683d0d3d8944494db v7-4-640
-+e527af42e10868b90efc63e8b6356ea6bdd52dd4 v7-4-641
-+75444015837a668050df729741711bd0a057d700 v7-4-642
-+050e6df85f99bf9e7a3cda67ef01b7c881ea0571 v7-4-643
-+a12d422ed16ca15ab8a05ebee4c1b49efc2c6c50 v7-4-644
-+342568f82d828caa08ac46f2e022aa51098f7de0 v7-4-645
-+ceda6d8af44749011c7fd65e96678fdb247777b1 v7-4-646
-+4f9c3e62d4d4d3f50536c6baece990483969d597 v7-4-647
-+0a859da6714bb2b34f4e7cc71c89d2b0724c60de v7-4-648
-+8bee881c3ca5d72008268db5dde8e2940226f6bd v7-4-649
-+7026d6f3367fca47d664a1b1ef1b302f5c0edc45 v7-4-650
-+2c7f279d419caab2b6329e0415322ebf4fa3f312 v7-4-651
-+6c94cedccda4569141ddf71005a4087b8df833dc v7-4-652
-+41d50eba0c0f472b9d4399e01989679ad893ed2f v7-4-653
-+6f1e4b7942c328173b1cb2b322314e028669a866 v7-4-654
-+950e24f26ef8cc460c66238efce9104eaf424f79 v7-4-655
-+056809de0b298e7f32a76ace0575088a639f3b24 v7-4-656
-+9fda0c52db0b0aa8819370d6061c8af61a8a13a8 v7-4-657
-+9f74286c4404346bb69d10575eb5ac82cb635add v7-4-658
-+5a12a68613670ddb7d3be0c693738400c61ef24b v7-4-659
-+476a12a96bb1e5ccc71b1c1010d529deca271617 v7-4-660
-+21719d38d2ff265c7f55230df8529780280f2cf9 v7-4-661
-+24e0b6dd52e1b259559f142e8c04aa0a74128146 v7-4-662
-+77172f5bac73b69838da5b9161ef5574cf3b7189 v7-4-663
-+27d9a4d8c1689123939b6c3114e8e60c9656f507 v7-4-664
-+80abb7288d39c917b875f6788246356f8f1da645 v7-4-665
-+781104cb0d069389b2db31a7553118f44e4f24c1 v7-4-666
-+fd495ad521dc55f76636b7dde74f59739512fa45 v7-4-667
-+c52bb45c675242c167626ad303fbc8fb8ecaf844 v7-4-668
-+97cc4ee3e095ce4e7178c41a39bac864ba6d2c7d v7-4-669
-+c4cb95fb4c585d81adc794421f16f62a30f0fc30 v7-4-670
-+8faab3792a924c58b592170980fc74244d7cf402 v7-4-671
-+6529590f6c436594c3ba177c61efd9b42b3cbc08 v7-4-672
-+67e7a819c8115a149d2e780fa1fa7d9fa96a6c02 v7-4-673
-+f26c1d294156c092290595897694627867809199 v7-4-674
-+d879db7c2f56d8c16d997c4b37cee38036d7a721 v7-4-675
-+692bc2c52002dcc3a6c0e809057d46792e70db29 v7-4-676
-+c8ff693e9ebc074137d0566868561b13dc11fe0c v7-4-677
-+b225e8fed8cc0e320527922e6abf1c7b8c6b83b6 v7-4-678
-+43a07fa781552a64fe3e9be1bb504f8bac146a24 v7-4-679
-+c939d19bd86edd083bd690e2b6e1315877b098d7 v7-4-680
-+dc96dd80aef84bbdf0537fbf9c9f5ab63a7ab649 v7-4-681
-+f242cf1f98975b4840e5f4644c3c3e84d08d96eb v7-4-682
-+6f55637de261d7e407502bd4d62557ec64aad2f9 v7-4-683
-+7347229a646a04740b534994dde47f9e4918fd04 v7-4-684
-+eefee03a37fe758ef9509dd0b95af2c104ea1617 v7-4-685
-+bc62d1988bf20c5f5446769a5e82528d14feb7c7 v7-4-686
-+7c5a0c69e1acb4624cf1b61edc7e4af0b769909c v7-4-687
-+e25417c299bb9fe39f76d50ceed799d9b0cbb954 v7-4-688
-+7d40186f767a68cb5b7cc47b05745efe96b080e4 v7-4-689
-+5f6077b1073840149ab9e7fb1f0afe225edaab45 v7-4-690
-+f6021786b7755e586b366e0de0581354d4907210 v7-4-691
-+9a07975061edaee1d985953fb5fcf96923a0b35f v7-4-692
-+f012247e8ec87225de6727adb4f56d3da5ee05e8 v7-4-693
-+cdddbd63bcfe74508af6c3a5a522032871244662 v7-4-694
-+7f9a158cf1d93f133353727fe6de72906902a76c v7-4-695
-+4c4c8a53347b463804ad889f0b154ee0f884928f v7-4-696
-+57e81ce74c066995b3caf0c4bd06ba280fcfebf9 v7-4-697
-+f5b26298175342f7bf3cb1e2603a4136c7071d81 v7-4-698
-+c1aa837853ea140e1ba5b0eaeb4ae3f424e2e325 v7-4-699
-+b85fcd9b858d1f9b5dd04f652d692fa1afeb841d v7-4-700
-+b019669eee536e8d9a19dc0c2fc8d3ab46607f12 v7-4-701
-+203888fa7192572d8bc96ee115825311c867fc47 v7-4-702
-+e026e4f106a535956854f5847dbc555a8474d899 v7-4-703
-+ec46a5ca1b5169c35c416f8baa3d196cf2daeece v7-4-704
-+d118a2c541d57499f7b75a10a0a9b61a86ad7cfb v7-4-705
-+fbcf54fc3a778036870bf6c804443d14ee079434 v7-4-706
-+63b2bc619d5a91d89c4f4c6ee438b6c8d59ac267 v7-4-707
-+eb4b705a5d6a82f14dbf90022d8993c5db29033c v7-4-708
-+c0bc9b60fb8aa73ec12e2c40852b0708bdc7fff8 v7-4-709
-+a8962f0e0d349d2568799216739c4f50111e744c v7-4-710
-+64a32aca791911f33d8efd1cfa5368ae26113b8c v7-4-711
-+f2a751a9ee727831e3f057f359ceab6ddc4ea183 v7-4-712
-+56e121fd109b2fcd19121b3d3295f9dca75f8aac v7-4-713
-+de90405940be26a9315d54840c539b9391d16565 v7-4-714
-+5caf46fd6e246bec8a1286ab77faa598d567d988 v7-4-715
-+874c953aca495c7b087a0d345cad1fb9d92a9539 v7-4-716
-+1805e45ce4d67e0d326fbe952b87bd4086123844 v7-4-717
-+e1d59836eecc0567709affcd971f47bb911e830a v7-4-718
-+adb3699fa30c39c39d7a659259fdbc99c4318277 v7-4-719
-+56a735cff1a082a79e16f51d1bda7847ba02a1ab v7-4-720
-+45d3208c875400a62f47c57ee208a667faf6643b v7-4-721
-+47ebd4065059b6836f02338ae951c020f16afb0c v7-4-722
-+8accadbf0cbd9eaa80173c9df96f84c123da036a v7-4-723
-+81cb471657e0354e8abcc013fea4569a38ce9b17 v7-4-724
-+399216850e36de4c7826e2b02a9a0cca10ea54c4 v7-4-725
-+932370264f0f67bc4d05bc8d34421d5dd83d0f75 v7-4-726
-+cc3f3d35c54903e5f10bc3a0c66a6207a29acece v7-4-727
-+ea0468670fbe9afd348ae39f53c2522601c19c14 v7-4-728
-+f0e7dc5e7282179e6fccba3a11cfb9e2e17300a8 v7-4-729
-+cd47def2214a1a68780729a0033c4cbde8529461 v7-4-730
-+5f24d6d5133386cdc5e4dcf781e4e49d78d75483 v7-4-731
-+cd7a7975f92cc43405307baa7b980b249c2c0ff1 v7-4-732
-+095b538d58a673521eb4dbe0b819c63538ceef0c v7-4-733
-+bf3e6012dfbd3b404ae1d0e41ff90a9628380062 v7-4-734
-+734c89ddf7b37a2860b376d14404d7e1ca56a228 v7-4-735
-+70fdcdaf96a65db5fd2ef5d87ffa213f2397cb9b v7-4-736
-+1ccf9612841097ca6310564e713779bb1d2d1e91 v7-4-737
-+8730db0c187bee6127daebab4467fafc65198f25 v7-4-738
-+541abe8d5f557fbb7fcdb4844d20b1b0634ea72c v7-4-739
-+0229cfffc5605b0cdbd87803aeb6d76053c14abb v7-4-740
-+0f1cc87630d8b91ea91825d53b64f48a759b58a1 v7-4-741
-+50cdebea094fced0f3d05f5fbf93f47f71d6a715 v7-4-742
-+ac13f3533571f689231f0d9d0b0672601eee9cad v7-4-743
-+18ec2c5a5ce7af451d37617062309f2b3960f73c v7-4-744
-+f4e5704c5c43ca62a642c84bcec3f1f17a41fff6 v7-4-745
-+b782813c73a61e98d881b481af7fb671585e404b v7-4-746
-+d1a87b307a5033bdb3e79cad32fca3db3ae43224 v7-4-747
-+566e193323cebc0beb02fc2bdda1b8209f30eb62 v7-4-748
-+e73d5ac8b16b59f5d26195308ab1822e3ddee5e4 v7-4-749
-+809e3aa59c6f4c4ecff866b9c0d66bc765289604 v7-4-750
-+db53fd1a7d5c6898bd86bfe203aac8b8d89d9307 v7-4-751
-+c9a5d51c9161826fb57da3b6c8e5fcb03c45e1cf v7-4-752
-+8ebcd7f1ff5b64764b747831c5b903bf1c721774 v7-4-753
-+9798a98a1583fec87694567028d969a5abdd7695 v7-4-754
-+66ab6ec256d159860a004b29ea4e6074740e5ea4 v7-4-755
-+64ff14cbb665a696a4e7eb66c47a9ffaec1d57bd v7-4-756
-+a89cff862dda7668be7915bb9ca2d52c2f752aa5 v7-4-757
-+4ece46045a5aa6167aef99fb4ea7c02f4e74e9d1 v7-4-758
-+02466bf84babd8917e717390906aa0ed20c3700b v7-4-759
-+bcc0909b379e89c7b45ac1eb9be4018bfe0577c9 v7-4-760
-+7bd926109eea40d1366ac604b9b29b2c4ba84935 v7-4-761
-+ce209c5103a3dd3656076a926f8cf19be3019048 v7-4-762
-+2b7e36955265a2fc5bed4edf0faead3ae19218f5 v7-4-763
-+9d41289b55126e08bcea87daf0ed5f1699524b57 v7-4-764
-+f9876721bedc4f794d425bd015e4b0a65cb4d703 v7-4-765
-+31a14cb3a8e35da6f2bfeca5ced12e6420895a17 v7-4-766
-+63ac0cdf3b2822cc114dd201c4b5ef59d6395e86 v7-4-767
-+d3a23af4bba127e0cc240bb967484781e646f412 v7-4-768
-+cfd9a2befd67b56c5a618ee21affa88ed05c34ca v7-4-769
-+2ce6b77a49de5b997f4b2264b3582983058438c9 v7-4-770
-+dd923806ae3bebc810b87a0dd38e48aa30a50da1 v7-4-771
-+d973e23c3bf81e4126c6ff3450d2847b1c4a89ee v7-4-772
-+5b1eefbf9a532f32a66fa13abbd671488aaafd5c v7-4-773
-+676906c337681c90de19aa2ed71bffff5893f9c9 v7-4-774
-+e09a7ff8804653c1b784a41fc38e185e5f8ec1f7 v7-4-775
-+94b17958585153641ad1e813fa144cad57c7170f v7-4-776
-+228dc3f3f7114887bf5c870c75446681fa3a2bee v7-4-777
-+dd094497f9fa237f3b1d7e673146d8128e3ee2d0 v7-4-778
-+1f78058351a6fcf079783b1f28b5b77d7d98e4d8 v7-4-779
-+9a13e3910e3d45c768a1e3d87a15a62b4cee439c v7-4-780
-+30c9301f33ed76d0b76b9e22362f5e78e26786da v7-4-781
-+58d9f967ae1a4dc16be4ca92f921976fbc3225ed v7-4-782
-+e55929fca0cf6078c2c9791a7fcbd3a8b96884d4 v7-4-783
-+f587f685701094fc9a90ec6b8b946b4a6abc013f v7-4-784
-+62ba356c2d4e5836c86908d2ec65e53a6e335f27 v7-4-785
-+4db70c94226b522a0beb6d54ae0a992bd47405ae v7-4-786
-+c31bd9ca75d237eee7a3cfe92e464fc58b2d534b v7-4-787
-+ca0990adc2e3b10fe06a066144976adc8a769576 v7-4-788
-+b63f09edb493ab555e0ed78f1b045e365fd1f9c8 v7-4-789
-+d37e168dee2030187d77492b0a88c2467c87bf26 v7-4-790
-+957a3bb312fa105b9476ae029742eeb4b5f9b490 v7-4-791
-+1efa7c2b9368b7d550a382dbe8b5502bb14416d1 v7-4-792
-+1e621b31948bed78579a3312a907be76263f1204 v7-4-793
-+98d1d53edc668ec036ea39d9ac6392263d0268f1 v7-4-794
-+a958ac497a8103f18065b7ae04c0a98c4c82edc6 v7-4-795
-+d19e79d29bf99fe0483339e2793c7b81b3e55ed5 v7-4-796
-+87cb71d54e8ae31700862bea78ceb89b50741161 v7-4-797
-+c2b132add309bd2fca3b19432a2ceb0fcf6d237b v7-4-798
-+4bf9538ff25e208503d313ef99e661124394fbd2 v7-4-799
-+86d43639de31ba99947cf9bfe0a3fd171ca7019e v7-4-800
-+20ed78fab428bee80800fe3492f5f589571352f6 v7-4-801
-+417201526af3e5cca3f3b4a4bf3aac736521c803 v7-4-802
-+e859731ea1cd074cc1e2d12c6047978cd6c1947c v7-4-803
-+7b35ee02b3c57a872f63550e80668f3b4dcf3e61 v7-4-804
-+7b5f9313f40b71a1e4047cd4cec10af303341a69 v7-4-805
-+b10995a2f7c3ff95a915e81ff595707d7b323f27 v7-4-806
-+a25618cbc68afd94422ce0f86993ec14ca533fc7 v7-4-807
-+f77d1f32c357890b723afadd2c83cd38314f08f0 v7-4-808
-+c7d12c7eb2b67f23de39f8a2394f018a00e37671 v7-4-809
-+a07c3f9cd6166c82d715e699dcdca5241ba5c8cf v7-4-810
-+1661dd8df5922d5e50a59de1fe95d96e2f9bfa0b v7-4-811
-+c0a23e04c929b9eb6cf996d202e5ec51d0120528 v7-4-812
-+814f1f569e4a2648097f63160e9b8762fef54c93 v7-4-813
-+dcc108222d704bbf6ac21cac3ad3b7324b2e45f1 v7-4-814
-+fc099c55a36a2a6abacbb0542d94a4e9ebd40cfb v7-4-815
-+cdd862e0f896d9ce315c12f002d362791d2b17ab v7-4-816
-+dc1b678f0e4e484db118bcab780def3798a87c3e v7-4-817
-+27f8247d261963e59c2a2598c3cb03514557d305 v7-4-818
-+bc269cf15ccd91867532970df2b493d3b1ad9d83 v7-4-819
-+bb44542231dc741cde6733a4c425fe0622027874 v7-4-820
-+5ea5bd9c18d212c63d6be727d4945cdb243026b4 v7-4-821
-+286fd54c7ae38a47e80c4e0bacd9748fe2914883 v7-4-822
-+6cde6404ff7c3aaf90a1d5b0b0d68f1ff9a1ff8e v7-4-823
-+962b3ae252a98b0ee205a2297c19b2417dd9717a v7-4-824
-+0dbbdcf13e03bf40a177d267944430aea3985fa7 v7-4-825
-+db0328a2fa2a67e43cd7eeca0f95d1b96bcd6bbb v7-4-826
-+47680d36e4846e9093ff6edcc96bf3ba8c69ac86 v7-4-827
-+5a1d8468d1fad7189c8c781149f034dbb4208b39 v7-0-225
-+2ec8266fa254f9f90fd302df275d2813ae08a8e6 v7-0-225
-+3ae106044109e65b5bce1ea8938e0658729349ed v7-1-008
-+042fa969dab175d414d611425d8a61424bacf75f v7-1-008
-+5232b9862f238a2a109f15527825e5cac1668a04 v7-2-080
-+12cecc379574aba2231cbba54c4eaeef3432db69 v7-2-080
-+c3242ae88ef1d4cb6eea51fdf96670cae48fc64a v7-2-082
-+be7491f23e9d8818821de61d9ce53cb1cb1c7dc9 v7-2-082
-+720a59d79bcd3d606bb9837492295d0c52835500 v7-2-168
-+ad41c6afaa7b0b512cd97dd07a93cc0504508227 v7-2-168
-+932ff0c0f57bb90d48470b70cc728058e0c56e3e v7-2-176
-+e8eeeff19eae568f4642cb9f368a1aec6c749a61 v7-2-176
-+dfdaac31aa5df021b444bc2ba64307709d863c63 v7-2-232
-+5bd06a91c65c06847fb0d618c71736d7c73e95d2 v7-2-232
-+9e265d9089fd4afcc03a4ac7c1ccbd754c8ef6f5 v7-2-436
-+e12b9d992389cc770eb72e16932313cd0905190f v7-2-436
-+dde812fb22478c1fbd34d935ec466b2cd9869da4 v7-2-437
-+ecb9c2b70b0f6e9918e75bf4e1ac887748a2313a v7-2-437
-+fef4bd7afb263aa411f12ff13dd1d12c88ad992e v7-2-438
-+d44112feb8153ffaa6ab8ec6442c5c4af0951728 v7-2-438
-+9c510840e896fc3776ec7694fe90e18808036fad v7-2-439
-+ea7c2d89b76bf42eb0da3459e8813104d76bca02 v7-2-439
-+f5bd6753cdc40733c903090cef1cff033942dcf7 v7-2-440
-+cd6e6876308e4e0fb621431646ebeec4b49a2504 v7-2-440
-+3b241fd8d7c09d7a93694a0abcdc283dcd6b4675 v7-2-441
-+f838615313cd5832efa624526a7575668fb40da9 v7-2-441
-+63157185aea525b39b1238df3ffbf4ec0fea10b1 v7-2-442
-+b0ebf9d121ff99eb2e1697a35dca528e7ecb8f4c v7-2-442
-+8a2092b558c2fc11605dded24c4c5a817ca92ac9 v7-2-443
-+0c1e413c32f1f3f8e28ebf8a030cedeeb664cd46 v7-2-443
-+9577a28005e10fab0a0cada6c41b96c9a3e1bfe9 v7-2-446
-+b619655b31db9469f6fe41932daff7a566079097 v7-2-446
-+632f43801ddb568f872599499fdcfd9522f8c13f v7-3-143
-+afb476746692322523f167c218803317b87623e3 v7-3-143
-+20dbceb6f4713ccd01be45dc531abc269fbb7579 v7-4-415
-+353442863d8558dc89d35ef349b60ebb2e38de0e v7-4-415
-+92168cfd558c53f1fb0d8014559f16be0a795171 v7-2-167
-+92168cfd558c53f1fb0d8014559f16be0a795171 v7-2-167fix
-+0000000000000000000000000000000000000000 v7-2-167fix
-+babbc735b80efd1ef23f35dcc77c5f5cc9e68fea start
-+0000000000000000000000000000000000000000 start
-+f03c3fae0a99dd626469bdb66c0d7b9406e93a83 v7-0-076
-+5232b9862f238a2a109f15527825e5cac1668a04 v7-2
-+ee53a39d58960b8726c53c76bef8d16159ed2b10 v7-3
-+f0915ae869cf7f143b7bb1a8c24b581f5e3a0909 v7-3-001
-+2e72d84e89654b8a9445f11804ac22fa27616357 v7-3-139
-+96a7b564c2f39bd3f35658e5c3b2e2e6516926ee v7-3-140
-+0d201adaf9c5561dc4308c610364c3e4bfc0c234 v7-3-141
-+3fc0f57ecb91686b33630dcac973ab9d7db31c6e v7.0001
-+3fc0f57ecb91686b33630dcac973ab9d7db31c6e v7-0001
-+0000000000000000000000000000000000000000 v7-0001
-+4102fb4ea78127b1a95b2df3274a55d9bfba68c2 v7.0002
-+4102fb4ea78127b1a95b2df3274a55d9bfba68c2 v7-0002
-+0000000000000000000000000000000000000000 v7-0002
-+631143ac4a01c32e465380ba2ab7f82949f20d75 v7.0007
-+631143ac4a01c32e465380ba2ab7f82949f20d75 v7-0007
-+0000000000000000000000000000000000000000 v7-0007
-+3ba373b54370d830e3fda93eee83e3f0b1ea2a0b v7.0008
-+3ba373b54370d830e3fda93eee83e3f0b1ea2a0b v7-0008
-+0000000000000000000000000000000000000000 v7-0008
-+9be87deaeb527ef18daf09d6c75b21d1d7a65d78 v7.0009
-+9be87deaeb527ef18daf09d6c75b21d1d7a65d78 v7-0009
-+0000000000000000000000000000000000000000 v7-0009
-+293621502c4daa122ae601398d854857bb732a83 v7.0010
-+293621502c4daa122ae601398d854857bb732a83 v7-0010
-+0000000000000000000000000000000000000000 v7-0010
-+a81bc802c17ce7002b08d2e327136e3ac4d11d5a v7.0011
-+a81bc802c17ce7002b08d2e327136e3ac4d11d5a v7-0011
-+0000000000000000000000000000000000000000 v7-0011
-+4ac1dce8dd5e8d8e97e3e7b921f3ada9db2fe2de v7.0012
-+4ac1dce8dd5e8d8e97e3e7b921f3ada9db2fe2de v7-0012
-+0000000000000000000000000000000000000000 v7-0012
-+3f44e9abe4ec65f797cbd12f1d46bd08eb48c2ef v7.0015
-+3f44e9abe4ec65f797cbd12f1d46bd08eb48c2ef v7-0015
-+0000000000000000000000000000000000000000 v7-0015
-+8ff7fd162d3cf15129e377401e49f8210d62aee6 v7.0016
-+8ff7fd162d3cf15129e377401e49f8210d62aee6 v7-0016
-+0000000000000000000000000000000000000000 v7-0016
-+404aac550f357223e7bab3656343827f641d9f74 v7.0017
-+404aac550f357223e7bab3656343827f641d9f74 v7-0017
-+0000000000000000000000000000000000000000 v7-0017
-+ac33b7c03fac7bf435346233114939fec2e187e6 v7.0018
-+ac33b7c03fac7bf435346233114939fec2e187e6 v7-0018
-+0000000000000000000000000000000000000000 v7-0018
-+41f9fd58cf132788bde73ab1954cb987521e3bd2 v7.0019
-+41f9fd58cf132788bde73ab1954cb987521e3bd2 v7-0019
-+0000000000000000000000000000000000000000 v7-0019
-+7f788cd2741586586a34b41627a1c978fa465666 v7.0020
-+7f788cd2741586586a34b41627a1c978fa465666 v7-0020
-+0000000000000000000000000000000000000000 v7-0020
-+125e80798a85dbead9a91815cabd1d0aed63f455 v7.0021
-+125e80798a85dbead9a91815cabd1d0aed63f455 v7-0021
-+0000000000000000000000000000000000000000 v7-0021
-+c524f99c79251a7b614776a5d064ba40c8d4d5cc v7.0022
-+c524f99c79251a7b614776a5d064ba40c8d4d5cc v7-0022
-+0000000000000000000000000000000000000000 v7-0022
-+410fa1a31baff929c7876be744142723c1573c75 v7.0023
-+410fa1a31baff929c7876be744142723c1573c75 v7-0023
-+0000000000000000000000000000000000000000 v7-0023
-+f1d2a58883b96144abcd5b44dbdd190a67b3eb79 v7.0024
-+f1d2a58883b96144abcd5b44dbdd190a67b3eb79 v7-0024
-+0000000000000000000000000000000000000000 v7-0024
-+f529edb9bab3de35ca7451e4d45cc90e9f7aaf81 v7.0025
-+f529edb9bab3de35ca7451e4d45cc90e9f7aaf81 v7-0025
-+0000000000000000000000000000000000000000 v7-0025
-+f55897d6921d622ac2649e4c94ddb38d121c2832 v7.0026
-+f55897d6921d622ac2649e4c94ddb38d121c2832 v7-0026
-+0000000000000000000000000000000000000000 v7-0026
-+46d39f2eff86c940486c2da466283d7526b98c9e v7.0027
-+46d39f2eff86c940486c2da466283d7526b98c9e v7-0027
-+0000000000000000000000000000000000000000 v7-0027
-+8c25f10d49e7186c9785a0f01612166f20a29298 v7.0028
-+8c25f10d49e7186c9785a0f01612166f20a29298 v7-0028
-+0000000000000000000000000000000000000000 v7-0028
-+dbf53ece2e23fd6e8652c531ce7976f54ae85635 v7.0029
-+dbf53ece2e23fd6e8652c531ce7976f54ae85635 v7-0029
-+0000000000000000000000000000000000000000 v7-0029
-+7557b6ea0fb14ba4e97f5a8a04438db30cf902bb v7.0030
-+7557b6ea0fb14ba4e97f5a8a04438db30cf902bb v7-0030
-+0000000000000000000000000000000000000000 v7-0030
-+0ef9cebc4f5d1c00554543918fea2a0b7539b922 v7.0031
-+0ef9cebc4f5d1c00554543918fea2a0b7539b922 v7-0031
-+0000000000000000000000000000000000000000 v7-0031
-+d2796c60ca6f11e05cbe080114a3cfc6006488c7 v7.0032
-+d2796c60ca6f11e05cbe080114a3cfc6006488c7 v7-0032
-+0000000000000000000000000000000000000000 v7-0032
-+d9030055c432b20797f883c956f094416e00c622 v7.0033
-+d9030055c432b20797f883c956f094416e00c622 v7-0033
-+0000000000000000000000000000000000000000 v7-0033
-+8173ec1e9f1f746657dd598b6e876b11c99e1049 v7.0034
-+8173ec1e9f1f746657dd598b6e876b11c99e1049 v7-0034
-+0000000000000000000000000000000000000000 v7-0034
-+2b4debdc8d2c73d1fc37b750010e3a4098b035af v7.0035
-+2b4debdc8d2c73d1fc37b750010e3a4098b035af v7-0035
-+0000000000000000000000000000000000000000 v7-0035
-+a9e90b3356b62da552b62eb62b8dff78438f2dc8 v7.0036
-+a9e90b3356b62da552b62eb62b8dff78438f2dc8 v7-0036
-+0000000000000000000000000000000000000000 v7-0036
-+d4f3db33d782da9d33b2715fbd14f5acac280ce0 v7.0037
-+d4f3db33d782da9d33b2715fbd14f5acac280ce0 v7-0037
-+0000000000000000000000000000000000000000 v7-0037
-+1f3902f3eb5c20e7872c42cdee9c91e2b25d3f47 v7.0038
-+1f3902f3eb5c20e7872c42cdee9c91e2b25d3f47 v7-0038
-+0000000000000000000000000000000000000000 v7-0038
-+2b913f7eb9d2b411f9ef2c0fa44f313b7382bd89 v7.0039
-+2b913f7eb9d2b411f9ef2c0fa44f313b7382bd89 v7-0039
-+0000000000000000000000000000000000000000 v7-0039
-+3b1d692e5a2c3053fa066d202ffc0b51779d2c71 v7.0040
-+3b1d692e5a2c3053fa066d202ffc0b51779d2c71 v7-0040
-+0000000000000000000000000000000000000000 v7-0040
-+d4ea645c77489da3d5f0f0f48a14bb63793e1505 v7.0041
-+d4ea645c77489da3d5f0f0f48a14bb63793e1505 v7-0041
-+0000000000000000000000000000000000000000 v7-0041
-+86d71ae0c85a546d4a00b53481b540a4ade2c9bd v7.0042
-+86d71ae0c85a546d4a00b53481b540a4ade2c9bd v7-0042
-+0000000000000000000000000000000000000000 v7-0042
-+f455396f3c3fb524ff1082cfe2cd7731f67877b0 v7.0043
-+f455396f3c3fb524ff1082cfe2cd7731f67877b0 v7-0043
-+0000000000000000000000000000000000000000 v7-0043
-+3e7d17e425b0f58513002797b3310e722757893f v7.0044
-+3e7d17e425b0f58513002797b3310e722757893f v7-0044
-+0000000000000000000000000000000000000000 v7-0044
-+0ef5b70c3eaf694c9e9b85aed3f80af53e6fd9cf v7.0045
-+0ef5b70c3eaf694c9e9b85aed3f80af53e6fd9cf v7-0045
-+0000000000000000000000000000000000000000 v7-0045
-+40a0699b6c62f93e58ae233fcdfd395bbc1bc80f v7.0046
-+40a0699b6c62f93e58ae233fcdfd395bbc1bc80f v7-0046
-+0000000000000000000000000000000000000000 v7-0046
-+c5b05f6de1adf8bf800da0bcdfa04a262e0e8329 v7.0047
-+c5b05f6de1adf8bf800da0bcdfa04a262e0e8329 v7-0047
-+0000000000000000000000000000000000000000 v7-0047
-+389c8abd59258ba5ebc164dc7158a025bfa893a2 v7.0048
-+389c8abd59258ba5ebc164dc7158a025bfa893a2 v7-0048
-+0000000000000000000000000000000000000000 v7-0048
-+06bc859d1a32de8763e310669d0c008b3945af1c v7.0049
-+06bc859d1a32de8763e310669d0c008b3945af1c v7-0049
-+0000000000000000000000000000000000000000 v7-0049
-+e943e5502fc9cc439294de385dc564226b7311a1 v7.0050
-+e943e5502fc9cc439294de385dc564226b7311a1 v7-0050
-+0000000000000000000000000000000000000000 v7-0050
-+0e902b8f511f0442ee2b28314d6e085e3e00798e v7.0051
-+0e902b8f511f0442ee2b28314d6e085e3e00798e v7-0051
-+0000000000000000000000000000000000000000 v7-0051
-+8c60f65311fa6358488f671adc226950c18a993d v7.0052
-+8c60f65311fa6358488f671adc226950c18a993d v7-0052
-+0000000000000000000000000000000000000000 v7-0052
-+c12f39141bbc7c031b51352896a78324ad27398c v7.0053
-+c12f39141bbc7c031b51352896a78324ad27398c v7-0053
-+0000000000000000000000000000000000000000 v7-0053
-+4d53c2a2af94cf7a657d85e27f891b2d53b698c3 v7.0054
-+4d53c2a2af94cf7a657d85e27f891b2d53b698c3 v7-0054
-+0000000000000000000000000000000000000000 v7-0054
-+7fd70926e2e1c299ecd9dff6ddfb51ef71f7f08b v7.0055
-+7fd70926e2e1c299ecd9dff6ddfb51ef71f7f08b v7-0055
-+0000000000000000000000000000000000000000 v7-0055
-+906b37d2f9c3a85fc9c67a29005ad1538e60efcc v7.0056
-+906b37d2f9c3a85fc9c67a29005ad1538e60efcc v7-0056
-+0000000000000000000000000000000000000000 v7-0056
-+2fcd444c4bd37f916da718bf5bbe9535d2667331 v7.0057
-+2fcd444c4bd37f916da718bf5bbe9535d2667331 v7-0057
-+0000000000000000000000000000000000000000 v7-0057
-+59fd8376545beba122700d5a481793f29ff0a69e v7.0058
-+59fd8376545beba122700d5a481793f29ff0a69e v7-0058
-+0000000000000000000000000000000000000000 v7-0058
-+300fac7c5a2bafb002ee97d52da19bae8a344d51 v7.0059
-+300fac7c5a2bafb002ee97d52da19bae8a344d51 v7-0059
-+0000000000000000000000000000000000000000 v7-0059
-+48c9c2bf59afb140dfae3f4b7182ca410e72cb25 v7.0060
-+48c9c2bf59afb140dfae3f4b7182ca410e72cb25 v7-0060
-+0000000000000000000000000000000000000000 v7-0060
-+0d6554dfc71e5e58866ef0118ed05007a4c59672 v7.0061
-+0d6554dfc71e5e58866ef0118ed05007a4c59672 v7-0061
-+0000000000000000000000000000000000000000 v7-0061
-+920a993902e8332e3fd539a54997278364fdbcf3 v7.0062
-+920a993902e8332e3fd539a54997278364fdbcf3 v7-0062
-+0000000000000000000000000000000000000000 v7-0062
-+d97518d6b3257b4ab48aace82f9197bd099ff758 v7.0063
-+d97518d6b3257b4ab48aace82f9197bd099ff758 v7-0063
-+0000000000000000000000000000000000000000 v7-0063
-+8eec9649b7a2ea1a441723ce7a4e8637c294ffbb v7.0064
-+8eec9649b7a2ea1a441723ce7a4e8637c294ffbb v7-0064
-+0000000000000000000000000000000000000000 v7-0064
-+a686fd6c8beb2c41110e0a65f6a403f0ccaef83d v7.0065
-+a686fd6c8beb2c41110e0a65f6a403f0ccaef83d v7-0065
-+0000000000000000000000000000000000000000 v7-0065
-+73354c21f1e40dc792e5829152992e76f7a607ee v7.0066
-+73354c21f1e40dc792e5829152992e76f7a607ee v7-0066
-+0000000000000000000000000000000000000000 v7-0066
-+a711f7a6852db37b1687044ce8a96b6f48e9855b v7.0067
-+a711f7a6852db37b1687044ce8a96b6f48e9855b v7-0067
-+0000000000000000000000000000000000000000 v7-0067
-+f2d46e4a859d0f12f12fbf332c40a717dd07df14 v7.0068
-+f2d46e4a859d0f12f12fbf332c40a717dd07df14 v7-0068
-+0000000000000000000000000000000000000000 v7-0068
-+c50c82c5e230a9ef1cb570be0a57d3dc9e295993 v7.0069
-+c50c82c5e230a9ef1cb570be0a57d3dc9e295993 v7-0069
-+0000000000000000000000000000000000000000 v7-0069
-+53175322ef40dd7f50dc4153e6e6fb530a4b2b29 v7.0070
-+53175322ef40dd7f50dc4153e6e6fb530a4b2b29 v7-0070
-+0000000000000000000000000000000000000000 v7-0070
-+e7904492cb75b7a69964c331945b261cd4232a7f v7.0071
-+e7904492cb75b7a69964c331945b261cd4232a7f v7-0071
-+0000000000000000000000000000000000000000 v7-0071
-+8d34af900baedf0db9a3e57bbf48eeee75068e06 v7.0072
-+8d34af900baedf0db9a3e57bbf48eeee75068e06 v7-0072
-+0000000000000000000000000000000000000000 v7-0072
-+8fa8d7964cf116fa98895d029808a0d5e1cf201b v7.0073
-+8fa8d7964cf116fa98895d029808a0d5e1cf201b v7-0073
-+0000000000000000000000000000000000000000 v7-0073
-+946f0cbdd535d6fb8915ccc87b837edb15287663 v7.0074
-+946f0cbdd535d6fb8915ccc87b837edb15287663 v7-0074
-+0000000000000000000000000000000000000000 v7-0074
-+e697bd3c3876c27addb414ae170d741aa1eb1917 v7.0075
-+e697bd3c3876c27addb414ae170d741aa1eb1917 v7-0075
-+0000000000000000000000000000000000000000 v7-0075
-+9a10e4d195b342292cb8ce0d368afafac146abf9 v7.0076
-+9a10e4d195b342292cb8ce0d368afafac146abf9 v7-0076
-+0000000000000000000000000000000000000000 v7-0076
-+1c1cbdc42f75d8fa0ca5a799b5e843e9aa2c098c v7.0077
-+1c1cbdc42f75d8fa0ca5a799b5e843e9aa2c098c v7-0077
-+0000000000000000000000000000000000000000 v7-0077
-+2bfc2b7033147de9689cf2d651bd8ef36fdac68b v7.0078
-+2bfc2b7033147de9689cf2d651bd8ef36fdac68b v7-0078
-+0000000000000000000000000000000000000000 v7-0078
-+006e9c8a6a8ad354a5cb6adcce6ebfceddeb20ee v7.0079
-+006e9c8a6a8ad354a5cb6adcce6ebfceddeb20ee v7-0079
-+0000000000000000000000000000000000000000 v7-0079
-+2c1ffe8953ee85cf04d4db5c03ab711c1c6c015a v7.0080
-+2c1ffe8953ee85cf04d4db5c03ab711c1c6c015a v7-0080
-+0000000000000000000000000000000000000000 v7-0080
-+74e9d19831c2357d7b998f484ebc609dbc08c5e4 v7.0081
-+74e9d19831c2357d7b998f484ebc609dbc08c5e4 v7-0081
-+0000000000000000000000000000000000000000 v7-0081
-+a0451524244d6387ea49cfda296f6550a2a9aebd v7.0082
-+a0451524244d6387ea49cfda296f6550a2a9aebd v7-0082
-+0000000000000000000000000000000000000000 v7-0082
-+3ee6db0a746e990164e288fed6344e519a5bd1d2 v7.0083
-+3ee6db0a746e990164e288fed6344e519a5bd1d2 v7-0083
-+0000000000000000000000000000000000000000 v7-0083
-+03b3684919e3299ff560609c0c5f577822f64614 v7.0084
-+03b3684919e3299ff560609c0c5f577822f64614 v7-0084
-+0000000000000000000000000000000000000000 v7-0084
-+869c92bcfb697875d5580fdf3a13eacd5648c5f3 v7.0085
-+869c92bcfb697875d5580fdf3a13eacd5648c5f3 v7-0085
-+0000000000000000000000000000000000000000 v7-0085
-+18f024844150562a9e56522edcad3fc1d5c257e4 v7.0086
-+18f024844150562a9e56522edcad3fc1d5c257e4 v7-0086
-+0000000000000000000000000000000000000000 v7-0086
-+bfd8935d62009b625c37dc373404b67d0019d7f1 v7.0087
-+bfd8935d62009b625c37dc373404b67d0019d7f1 v7-0087
-+0000000000000000000000000000000000000000 v7-0087
-+607cff4bc0cbd7ddf84007a20bf3e6bb01e70694 v7.0088
-+607cff4bc0cbd7ddf84007a20bf3e6bb01e70694 v7-0088
-+0000000000000000000000000000000000000000 v7-0088
-+7033303ea0c065c16d5fc31d485c949f7949c10b v7.0089
-+7033303ea0c065c16d5fc31d485c949f7949c10b v7-0089
-+0000000000000000000000000000000000000000 v7-0089
-+028158b1362b55a23cc6d8d086976c4dfd6e094a v7.0090
-+028158b1362b55a23cc6d8d086976c4dfd6e094a v7-0090
-+0000000000000000000000000000000000000000 v7-0090
-+be0f21f63d2c9651429a6ec9e97b8e6e9d0d102a v7.0091
-+be0f21f63d2c9651429a6ec9e97b8e6e9d0d102a v7-0091
-+0000000000000000000000000000000000000000 v7-0091
-+25dd5036f2b0b5e68492c49f15eaa228aa957f69 v7.0092
-+25dd5036f2b0b5e68492c49f15eaa228aa957f69 v7-0092
-+0000000000000000000000000000000000000000 v7-0092
-+6c62b9b939bd8f3df4ec59b2c2d72bbbecc723d8 v7.0093
-+6c62b9b939bd8f3df4ec59b2c2d72bbbecc723d8 v7-0093
-+0000000000000000000000000000000000000000 v7-0093
-+5332dd13733cd57e814b7e21cb577f6ad0c15408 v7.0094
-+5332dd13733cd57e814b7e21cb577f6ad0c15408 v7-0094
-+0000000000000000000000000000000000000000 v7-0094
-+4b9fef49d7ff02cf781d26d5b85a0a03c8784fd8 v7.0095
-+4b9fef49d7ff02cf781d26d5b85a0a03c8784fd8 v7-0095
-+0000000000000000000000000000000000000000 v7-0095
-+575dacb554d8b134356fae0135383d5e2231113f v7.0096
-+575dacb554d8b134356fae0135383d5e2231113f v7-0096
-+0000000000000000000000000000000000000000 v7-0096
-+f14cbd913415ac4d6a9968dce20a20291f8c0d05 v7.0097
-+f14cbd913415ac4d6a9968dce20a20291f8c0d05 v7-0097
-+0000000000000000000000000000000000000000 v7-0097
-+d6d6ca94371317962df5d92c9b879f7602d3e234 v7.0098
-+d6d6ca94371317962df5d92c9b879f7602d3e234 v7-0098
-+0000000000000000000000000000000000000000 v7-0098
-+8c229eb52e347be77c76c1c2c96f717cbfdba4c5 v7.0099
-+8c229eb52e347be77c76c1c2c96f717cbfdba4c5 v7-0099
-+0000000000000000000000000000000000000000 v7-0099
-+a509e3ba61f6e541dc8772a0f9de0c38999fd610 v7.0100
-+a509e3ba61f6e541dc8772a0f9de0c38999fd610 v7-0100
-+0000000000000000000000000000000000000000 v7-0100
-+f92bb184582321910573561c941167ca46b9850f v7.0101
-+f92bb184582321910573561c941167ca46b9850f v7-0101
-+0000000000000000000000000000000000000000 v7-0101
-+4fe8e1a7758ea8170eaa4b1abf11cc9682437cbe v7.0102
-+4fe8e1a7758ea8170eaa4b1abf11cc9682437cbe v7-0102
-+0000000000000000000000000000000000000000 v7-0102
-+289b19a6f2edb5b46df57195d5fae41dfe963290 v7.0103
-+289b19a6f2edb5b46df57195d5fae41dfe963290 v7-0103
-+0000000000000000000000000000000000000000 v7-0103
-+afc60a6339a68f659addfbbb849e249964c9107c v7.0104
-+afc60a6339a68f659addfbbb849e249964c9107c v7-0104
-+0000000000000000000000000000000000000000 v7-0104
-+cf83dacfa25fb1fd8d4929ff2abe871c72ad94a8 v7.0105
-+cf83dacfa25fb1fd8d4929ff2abe871c72ad94a8 v7-0105
-+0000000000000000000000000000000000000000 v7-0105
-+06234af3a8b7df68bfaf0efa87edfed2d743f6c7 v7.0106
-+06234af3a8b7df68bfaf0efa87edfed2d743f6c7 v7-0106
-+0000000000000000000000000000000000000000 v7-0106
-+5f33b64a6694dbc2c167b86c56488ddeeb7f46c5 v7.0107
-+5f33b64a6694dbc2c167b86c56488ddeeb7f46c5 v7-0107
-+0000000000000000000000000000000000000000 v7-0107
-+165c628aa9fc3cca34ccf63dc8ab953745d4e228 v7.0108
-+165c628aa9fc3cca34ccf63dc8ab953745d4e228 v7-0108
-+0000000000000000000000000000000000000000 v7-0108
-+f713fc55bf7b9a5cbb9ae3628547a78f4e44bcc9 v7.0109
-+f713fc55bf7b9a5cbb9ae3628547a78f4e44bcc9 v7-0109
-+0000000000000000000000000000000000000000 v7-0109
-+6edf4a4f6cac62dd123f7d1017a7624c9f48e71c v7.0110
-+6edf4a4f6cac62dd123f7d1017a7624c9f48e71c v7-0110
-+0000000000000000000000000000000000000000 v7-0110
-+d5ec1b42ceb06062f03d828acca852a4ccfbc7a4 v7.0111
-+d5ec1b42ceb06062f03d828acca852a4ccfbc7a4 v7-0111
-+0000000000000000000000000000000000000000 v7-0111
-+a1c5a6cb26756450d2b7065999de140c2fb6ca74 v7.0112
-+a1c5a6cb26756450d2b7065999de140c2fb6ca74 v7-0112
-+0000000000000000000000000000000000000000 v7-0112
-+8d2b705a5a51d2a6756f16dee861dae4ea97101a v7.0113
-+8d2b705a5a51d2a6756f16dee861dae4ea97101a v7-0113
-+0000000000000000000000000000000000000000 v7-0113
-+eb531146be0ec6cce1187568cc841718df44a296 v7.0114
-+eb531146be0ec6cce1187568cc841718df44a296 v7-0114
-+0000000000000000000000000000000000000000 v7-0114
-+43bf0bcf2110ffd8d42f0ea9b1469b1024def86c v7.0115
-+43bf0bcf2110ffd8d42f0ea9b1469b1024def86c v7-0115
-+0000000000000000000000000000000000000000 v7-0115
-+c773cb978acfd216004c871e883d2b31cd4cc0bf v7.0116
-+c773cb978acfd216004c871e883d2b31cd4cc0bf v7-0116
-+0000000000000000000000000000000000000000 v7-0116
-+7472c565592a373abca2ea571e229b4bcbfd7b15 v7.0117
-+7472c565592a373abca2ea571e229b4bcbfd7b15 v7-0117
-+0000000000000000000000000000000000000000 v7-0117
-+dd9db57ee7ce46bdc86cd787fb58907f20c0a973 v7.0118
-+dd9db57ee7ce46bdc86cd787fb58907f20c0a973 v7-0118
-+0000000000000000000000000000000000000000 v7-0118
-+3709cf52b9b56befb1c7a98e5f58cf39d16cf953 v7.0119
-+3709cf52b9b56befb1c7a98e5f58cf39d16cf953 v7-0119
-+0000000000000000000000000000000000000000 v7-0119
-+3ffdc64af1e53617586ad0cf14e039cb6f1cad34 v7.0120
-+3ffdc64af1e53617586ad0cf14e039cb6f1cad34 v7-0120
-+0000000000000000000000000000000000000000 v7-0120
-+c4d200412ae9b66732f2c9be98273802a0acdb95 v7.0121
-+c4d200412ae9b66732f2c9be98273802a0acdb95 v7-0121
-+0000000000000000000000000000000000000000 v7-0121
-+7f2d3b3c15a2ffbd259c2ee99966124c2c2087ee v7.0122
-+7f2d3b3c15a2ffbd259c2ee99966124c2c2087ee v7-0122
-+0000000000000000000000000000000000000000 v7-0122
-+c21975c58b4497d08a2fa30601723537ab1f03ec v7.0123
-+c21975c58b4497d08a2fa30601723537ab1f03ec v7-0123
-+0000000000000000000000000000000000000000 v7-0123
-+3b705e71c7b07ba1309d08a8b370ae8ad3fc17cd v7.0124
-+3b705e71c7b07ba1309d08a8b370ae8ad3fc17cd v7-0124
-+0000000000000000000000000000000000000000 v7-0124
-+0a60be12e47e322c4dbae7b083321c60f599c0b8 v7.0125
-+0a60be12e47e322c4dbae7b083321c60f599c0b8 v7-0125
-+0000000000000000000000000000000000000000 v7-0125
-+4a7320e53f32e1f6d60c498d870e6c4b8c7acc35 v7.0126
-+4a7320e53f32e1f6d60c498d870e6c4b8c7acc35 v7-0126
-+0000000000000000000000000000000000000000 v7-0126
-+a5fcf36ef5129596fc281d76369077ad01323b3f v7.0127
-+a5fcf36ef5129596fc281d76369077ad01323b3f v7-0127
-+0000000000000000000000000000000000000000 v7-0127
-+87ac4be389523f44914899c37180d22b60757ffa v7.0128
-+87ac4be389523f44914899c37180d22b60757ffa v7-0128
-+0000000000000000000000000000000000000000 v7-0128
-+bf5ba8a0cdee590c0841391f9a8b65c456ed06bb v7.0129
-+bf5ba8a0cdee590c0841391f9a8b65c456ed06bb v7-0129
-+0000000000000000000000000000000000000000 v7-0129
-+66080ac5dab745208cfd8f385faea24ed68be68c v7.0130
-+66080ac5dab745208cfd8f385faea24ed68be68c v7-0130
-+0000000000000000000000000000000000000000 v7-0130
-+6f8b578776ab0204bf16f669383aefb0661610f0 v7.0131
-+6f8b578776ab0204bf16f669383aefb0661610f0 v7-0131
-+0000000000000000000000000000000000000000 v7-0131
-+f012c4ed8c38499ed2901d139f4409e2edfe51da v7.0132
-+f012c4ed8c38499ed2901d139f4409e2edfe51da v7-0132
-+0000000000000000000000000000000000000000 v7-0132
-+b1e87b7f5db64eb40fafb0e9bcbb0c39fa2bac63 v7.0133
-+b1e87b7f5db64eb40fafb0e9bcbb0c39fa2bac63 v7-0133
-+0000000000000000000000000000000000000000 v7-0133
-+21c3634c211345ea79e90c4927513e7dc1381617 v7.0134
-+21c3634c211345ea79e90c4927513e7dc1381617 v7-0134
-+0000000000000000000000000000000000000000 v7-0134
-+acfe86afd651f1abcfb6eb38ad0101e61a27c65f v7.0135
-+acfe86afd651f1abcfb6eb38ad0101e61a27c65f v7-0135
-+0000000000000000000000000000000000000000 v7-0135
-+73f10d8124f48510e0ad1468ee9e29c010009621 v7.0136
-+73f10d8124f48510e0ad1468ee9e29c010009621 v7-0136
-+0000000000000000000000000000000000000000 v7-0136
-+08012a1ff8d4b4f5736a47440a907ec6e5e1610d v7.0137
-+08012a1ff8d4b4f5736a47440a907ec6e5e1610d v7-0137
-+0000000000000000000000000000000000000000 v7-0137
-+4772a5e3f9fa652baa1cb6d5295d60daeef6ef0b v7.0138
-+4772a5e3f9fa652baa1cb6d5295d60daeef6ef0b v7-0138
-+0000000000000000000000000000000000000000 v7-0138
-+ce2181d14aa08a59250267dbec36bba362eeb908 v7.0139
-+ce2181d14aa08a59250267dbec36bba362eeb908 v7-0139
-+0000000000000000000000000000000000000000 v7-0139
-+52e76e2b5b65eae81c4ea93d290194763d7edcd7 v7.0140
-+52e76e2b5b65eae81c4ea93d290194763d7edcd7 v7-0140
-+0000000000000000000000000000000000000000 v7-0140
-+7e6d264ec0a270beb9692df71fedb210c1896640 v7.0141
-+7e6d264ec0a270beb9692df71fedb210c1896640 v7-0141
-+0000000000000000000000000000000000000000 v7-0141
-+a1059cda45f226497278c53752d5c07d21cda09d v7.0142
-+a1059cda45f226497278c53752d5c07d21cda09d v7-0142
-+0000000000000000000000000000000000000000 v7-0142
-+f607f15ab091b6a51b0546db6a6d42adfa599c3d v7.0143
-+f607f15ab091b6a51b0546db6a6d42adfa599c3d v7-0143
-+0000000000000000000000000000000000000000 v7-0143
-+594f25e4a8065bcb865784556adf556004bddb24 v7.0144
-+594f25e4a8065bcb865784556adf556004bddb24 v7-0144
-+0000000000000000000000000000000000000000 v7-0144
-+f4a775df722b13250c2b9e6f1154c31ffd9b211f v7.0145
-+f4a775df722b13250c2b9e6f1154c31ffd9b211f v7-0145
-+0000000000000000000000000000000000000000 v7-0145
-+d9cc61139d12c315d790d79890402ef957be00ff v7.0146
-+d9cc61139d12c315d790d79890402ef957be00ff v7-0146
-+0000000000000000000000000000000000000000 v7-0146
-+66475621f0bfacb601f38c15625c15c2a478e672 v7.0147
-+66475621f0bfacb601f38c15625c15c2a478e672 v7-0147
-+0000000000000000000000000000000000000000 v7-0147
-+339999b511a0d529f09219a5d61b810fc75261ef v7.0148
-+339999b511a0d529f09219a5d61b810fc75261ef v7-0148
-+0000000000000000000000000000000000000000 v7-0148
-+da9142bd190a5ee0e45536ae4c2913be5bdb02b6 v7.0149
-+da9142bd190a5ee0e45536ae4c2913be5bdb02b6 v7-0149
-+0000000000000000000000000000000000000000 v7-0149
-+c8b6b7e1005daebc2d72c578d70b455f42b5bd16 v7.0150
-+c8b6b7e1005daebc2d72c578d70b455f42b5bd16 v7-0150
-+0000000000000000000000000000000000000000 v7-0150
-+c6296b0ad9eae4122e31dd3b4f363e073f388a38 v7.0151
-+c6296b0ad9eae4122e31dd3b4f363e073f388a38 v7-0151
-+0000000000000000000000000000000000000000 v7-0151
-+aa6caa23a4b834360b82d3d078d1d17f33d673b7 v7.0152
-+aa6caa23a4b834360b82d3d078d1d17f33d673b7 v7-0152
-+0000000000000000000000000000000000000000 v7-0152
-+f04e890524be4a82ade7526f62a967390d3f1cf1 v7.0153
-+f04e890524be4a82ade7526f62a967390d3f1cf1 v7-0153
-+0000000000000000000000000000000000000000 v7-0153
-+513d037fad505a5169add3116ae459bd1adac381 v7.0154
-+513d037fad505a5169add3116ae459bd1adac381 v7-0154
-+0000000000000000000000000000000000000000 v7-0154
-+e9ddb2181f063b67b3075844b4aa7359db5750be v7.0155
-+e9ddb2181f063b67b3075844b4aa7359db5750be v7-0155
-+0000000000000000000000000000000000000000 v7-0155
-+d5892839ed90bb1a8f9f1b3ce88bcc205e7617cc v7.0156
-+d5892839ed90bb1a8f9f1b3ce88bcc205e7617cc v7-0156
-+0000000000000000000000000000000000000000 v7-0156
-+f9eaf0a9872df3ef8610d3fae404231447954d5e v7.0157
-+f9eaf0a9872df3ef8610d3fae404231447954d5e v7-0157
-+0000000000000000000000000000000000000000 v7-0157
-+862863033fddf5f0bb2f18988b79bbe0d289ba45 v7.0158
-+862863033fddf5f0bb2f18988b79bbe0d289ba45 v7-0158
-+0000000000000000000000000000000000000000 v7-0158
-+8b84fe17e147219e6ff181f6bd7e809e5116588c v7.0159
-+8b84fe17e147219e6ff181f6bd7e809e5116588c v7-0159
-+0000000000000000000000000000000000000000 v7-0159
-+010397e1770eec8ff399cfc3bbd79f853849ffc1 v7.0160
-+010397e1770eec8ff399cfc3bbd79f853849ffc1 v7-0160
-+0000000000000000000000000000000000000000 v7-0160
-+bdbdec22a225553f5d78db019e13cdfe92b9cb5b v7.0161
-+bdbdec22a225553f5d78db019e13cdfe92b9cb5b v7-0161
-+0000000000000000000000000000000000000000 v7-0161
-+2244be18d9e9ce602a12e7529614c25ca8cef1ee v7.0162
-+2244be18d9e9ce602a12e7529614c25ca8cef1ee v7-0162
-+0000000000000000000000000000000000000000 v7-0162
-+f1d46f94824128251d1212cfaef0b1bfea4dc71b v7.0163
-+f1d46f94824128251d1212cfaef0b1bfea4dc71b v7-0163
-+0000000000000000000000000000000000000000 v7-0163
-+90ee46d7f4927c095141dd4afa92400f2fe4c697 v7.0164
-+90ee46d7f4927c095141dd4afa92400f2fe4c697 v7-0164
-+0000000000000000000000000000000000000000 v7-0164
-+39ebe9e88854b766c569529a96dac3b67aba0e65 v7.0165
-+39ebe9e88854b766c569529a96dac3b67aba0e65 v7-0165
-+0000000000000000000000000000000000000000 v7-0165
-+3686831cf3da094c66ca4d2ab2c671d3d2e2d497 v7.0166
-+3686831cf3da094c66ca4d2ab2c671d3d2e2d497 v7-0166
-+0000000000000000000000000000000000000000 v7-0166
-+36071a92cb764412276e067fed099164b0170436 v7.0167
-+36071a92cb764412276e067fed099164b0170436 v7-0167
-+0000000000000000000000000000000000000000 v7-0167
-+35cef95a6b7646d045b97bd4a54bb90000b5a753 v7.0168
-+35cef95a6b7646d045b97bd4a54bb90000b5a753 v7-0168
-+0000000000000000000000000000000000000000 v7-0168
-+b9975513fe244047a60acc818edd8de94935cc28 v7.0169
-+b9975513fe244047a60acc818edd8de94935cc28 v7-0169
-+0000000000000000000000000000000000000000 v7-0169
-+bc7ec0f1f7f35c3b58b3e32bd2ba1b87501b17d9 v7.0170
-+bc7ec0f1f7f35c3b58b3e32bd2ba1b87501b17d9 v7-0170
-+0000000000000000000000000000000000000000 v7-0170
-+2930fd8e7d9f1514448261365b787501dbd9a0b7 v7.0171
-+2930fd8e7d9f1514448261365b787501dbd9a0b7 v7-0171
-+0000000000000000000000000000000000000000 v7-0171
-+1b7cac059babfb3365c0a44c0537c7aa9b286a71 v7.0172
-+1b7cac059babfb3365c0a44c0537c7aa9b286a71 v7-0172
-+0000000000000000000000000000000000000000 v7-0172
-+cd3689efd90a5934dcf2e4e232d97939737414c3 v7.0173
-+cd3689efd90a5934dcf2e4e232d97939737414c3 v7-0173
-+0000000000000000000000000000000000000000 v7-0173
-+0b1b7560c456a32ad921e3985b90008ef1f82a91 v7.0174
-+0b1b7560c456a32ad921e3985b90008ef1f82a91 v7-0174
-+0000000000000000000000000000000000000000 v7-0174
-+7fe13e0f5dce15cd16dd61c898e63899a9aff561 v7.0175
-+7fe13e0f5dce15cd16dd61c898e63899a9aff561 v7-0175
-+0000000000000000000000000000000000000000 v7-0175
-+66263e241ce35e11faf9b33ef6e2d509e1ada4eb v7.0176
-+66263e241ce35e11faf9b33ef6e2d509e1ada4eb v7-0176
-+0000000000000000000000000000000000000000 v7-0176
-+9e359e5759f628fd0ff90172d533636440b464e6 v7.0177
-+9e359e5759f628fd0ff90172d533636440b464e6 v7-0177
-+0000000000000000000000000000000000000000 v7-0177
-+91e7d4a7b3b0e20b6f5bf9468ad17625e745d640 v7.0178
-+91e7d4a7b3b0e20b6f5bf9468ad17625e745d640 v7-0178
-+0000000000000000000000000000000000000000 v7-0178
-+81fe2ccc1207699c377b42f1d8ca426a70177afd v7.0179
-+81fe2ccc1207699c377b42f1d8ca426a70177afd v7-0179
-+0000000000000000000000000000000000000000 v7-0179
-+732c7ae5743ec2d22423a8bb631e2d3c5fb8e549 v7.0180
-+732c7ae5743ec2d22423a8bb631e2d3c5fb8e549 v7-0180
-+0000000000000000000000000000000000000000 v7-0180
-+52c87a746f4ab8397933a53388389aba6a16bdd3 v7.0181
-+52c87a746f4ab8397933a53388389aba6a16bdd3 v7-0181
-+0000000000000000000000000000000000000000 v7-0181
-+b6632d553df3c8d25e419d62cbbbd1d8aa5d2489 v7.0182
-+b6632d553df3c8d25e419d62cbbbd1d8aa5d2489 v7-0182
-+0000000000000000000000000000000000000000 v7-0182
-+1c586ee8dd452d305bebf633d5b8c78ba1ab170d v7.0183
-+1c586ee8dd452d305bebf633d5b8c78ba1ab170d v7-0183
-+0000000000000000000000000000000000000000 v7-0183
-+a420bba0d851093bb949070895a9dcf4c25e6c4f v7.0184
-+a420bba0d851093bb949070895a9dcf4c25e6c4f v7-0184
-+0000000000000000000000000000000000000000 v7-0184
-+8a5a95f7ef2a7dfeb585d0392489fb57ea4c5af9 v7.0185
-+8a5a95f7ef2a7dfeb585d0392489fb57ea4c5af9 v7-0185
-+0000000000000000000000000000000000000000 v7-0185
-+2392a6da4aa430f896451d97da8c49ed3fcdb9cb v7.0186
-+2392a6da4aa430f896451d97da8c49ed3fcdb9cb v7-0186
-+0000000000000000000000000000000000000000 v7-0186
-+e4fa26ce87694c7d810796d41d0f03981e500d1d v7.0187
-+e4fa26ce87694c7d810796d41d0f03981e500d1d v7-0187
-+0000000000000000000000000000000000000000 v7-0187
-+19106f131c872dc79bb409ffe8b5e35ebe885c1b v7.0188
-+19106f131c872dc79bb409ffe8b5e35ebe885c1b v7-0188
-+0000000000000000000000000000000000000000 v7-0188
-+9032e466829601e6c56046813d0a9a00946a1d10 v7.0189
-+9032e466829601e6c56046813d0a9a00946a1d10 v7-0189
-+0000000000000000000000000000000000000000 v7-0189
-+bc95c6c4bac13d4a0f8a4bd6ec10f495d3fa5eea v7.0191
-+bc95c6c4bac13d4a0f8a4bd6ec10f495d3fa5eea v7-0191
-+0000000000000000000000000000000000000000 v7-0191
-+441f938ea9e90e07a05e55fef17ab22d2607f5f3 v7.0192
-+441f938ea9e90e07a05e55fef17ab22d2607f5f3 v7-0192
-+0000000000000000000000000000000000000000 v7-0192
-+903088c7a7c61b7f30d35c8a184d90b7af4a44e6 v7.0193
-+903088c7a7c61b7f30d35c8a184d90b7af4a44e6 v7-0193
-+0000000000000000000000000000000000000000 v7-0193
-+d6a69271cb9a787af6b3a05b01275c9694a144c0 v7.0194
-+d6a69271cb9a787af6b3a05b01275c9694a144c0 v7-0194
-+0000000000000000000000000000000000000000 v7-0194
-+1a85f952cdfe4716be162e308fbccb0117489915 v7.0195
-+1a85f952cdfe4716be162e308fbccb0117489915 v7-0195
-+0000000000000000000000000000000000000000 v7-0195
-+0137e7c3d31b09f1c1e494405f3f99f6423b74cd v7.0196
-+0137e7c3d31b09f1c1e494405f3f99f6423b74cd v7-0196
-+0000000000000000000000000000000000000000 v7-0196
-+9090f866cd57a7febdb2e0679bf0a5e86951e314 v7.0197
-+9090f866cd57a7febdb2e0679bf0a5e86951e314 v7-0197
-+0000000000000000000000000000000000000000 v7-0197
-+f892bda292a89e7592ccee5fc0e296659066d7c5 v7.0198
-+f892bda292a89e7592ccee5fc0e296659066d7c5 v7-0198
-+0000000000000000000000000000000000000000 v7-0198
-+83a006f81bac04bf9b975347bf8d6bddc7996eb6 v7.0199
-+83a006f81bac04bf9b975347bf8d6bddc7996eb6 v7-0199
-+0000000000000000000000000000000000000000 v7-0199
-+513866ffe6af0bcc09e7275c0e9130170de66acb v7.0200
-+513866ffe6af0bcc09e7275c0e9130170de66acb v7-0200
-+0000000000000000000000000000000000000000 v7-0200
-+4b8583e82cb8875d14ff928db281aea8145d0b0d v7.0201
-+4b8583e82cb8875d14ff928db281aea8145d0b0d v7-0201
-+0000000000000000000000000000000000000000 v7-0201
-+e649c78407e600ab28819574efd7d2d67f066171 v7.0202
-+e649c78407e600ab28819574efd7d2d67f066171 v7-0202
-+0000000000000000000000000000000000000000 v7-0202
-+5b101ff9d4c43c566e7adfb0a7c0978d2150d741 v7.0203
-+5b101ff9d4c43c566e7adfb0a7c0978d2150d741 v7-0203
-+0000000000000000000000000000000000000000 v7-0203
-+9364d114ed8d089f3a42c910442957d33e5480cc v7.0204
-+9364d114ed8d089f3a42c910442957d33e5480cc v7-0204
-+0000000000000000000000000000000000000000 v7-0204
-+a8caf7dd853dd5f5ea2bbc671467ab2f78989f44 v7.0205
-+a8caf7dd853dd5f5ea2bbc671467ab2f78989f44 v7-0205
-+0000000000000000000000000000000000000000 v7-0205
-+d7e33248b9c80fb5c1af5880d6c6a4eb507de990 v7.0206
-+d7e33248b9c80fb5c1af5880d6c6a4eb507de990 v7-0206
-+0000000000000000000000000000000000000000 v7-0206
-+d7860ee7eb7ef5c27d45c4569107376d3cbdbdef v7.0207
-+d7860ee7eb7ef5c27d45c4569107376d3cbdbdef v7-0207
-+0000000000000000000000000000000000000000 v7-0207
-+05dc93b9c61f63c1691849fe7407c9472a7f6288 v7.0208
-+05dc93b9c61f63c1691849fe7407c9472a7f6288 v7-0208
-+0000000000000000000000000000000000000000 v7-0208
-+07d199fe02ed46fff935b2daa4efc979eacaab4c v7.0209
-+07d199fe02ed46fff935b2daa4efc979eacaab4c v7-0209
-+0000000000000000000000000000000000000000 v7-0209
-+f08390485cd365abce88ade8987e56bd267cf3e4 v7.0210
-+f08390485cd365abce88ade8987e56bd267cf3e4 v7-0210
-+0000000000000000000000000000000000000000 v7-0210
-+c78d973dce9e0456b96725f55b853ecbe4ebda96 v7.0211
-+c78d973dce9e0456b96725f55b853ecbe4ebda96 v7-0211
-+0000000000000000000000000000000000000000 v7-0211
-+69e8006af73433fa27ecf32b695919bd665be1c6 v7.0212
-+69e8006af73433fa27ecf32b695919bd665be1c6 v7-0212
-+0000000000000000000000000000000000000000 v7-0212
-+ecee28dd16d25024fe584cfb8cd0923f1184398f v7.0213
-+ecee28dd16d25024fe584cfb8cd0923f1184398f v7-0213
-+0000000000000000000000000000000000000000 v7-0213
-+0c381fb7846cda92fbdb327bbfe4ab1f73a86d8d v7.0214
-+0c381fb7846cda92fbdb327bbfe4ab1f73a86d8d v7-0214
-+0000000000000000000000000000000000000000 v7-0214
-+0f9f4761ad9cafbf1e72de338aa3fc59f1dd693d v7.0216
-+0f9f4761ad9cafbf1e72de338aa3fc59f1dd693d v7-0216
-+0000000000000000000000000000000000000000 v7-0216
-+8ae24f338cab86cb35fd495ddc3cbe2101ae1558 v7.0217
-+8ae24f338cab86cb35fd495ddc3cbe2101ae1558 v7-0217
-+0000000000000000000000000000000000000000 v7-0217
-+2fa8cb05b861d49dec0501a2531eec39e1d0a688 v7.0218
-+2fa8cb05b861d49dec0501a2531eec39e1d0a688 v7-0218
-+0000000000000000000000000000000000000000 v7-0218
-+e180933b876a74ded043348c0cff4fb209d4d92c v7.0219
-+e180933b876a74ded043348c0cff4fb209d4d92c v7-0219
-+0000000000000000000000000000000000000000 v7-0219
-+0a9371c70540d0d42c79a1d76e590fa2ccb978b3 v7.0220
-+0a9371c70540d0d42c79a1d76e590fa2ccb978b3 v7-0220
-+0000000000000000000000000000000000000000 v7-0220
-+ba51f75bd4b514d5c4d48e57c6018c955434b936 v7.0221
-+ba51f75bd4b514d5c4d48e57c6018c955434b936 v7-0221
-+0000000000000000000000000000000000000000 v7-0221
-+65fa3b16f040f5320bad34c324f230099bfd8f0c v7.0222
-+65fa3b16f040f5320bad34c324f230099bfd8f0c v7-0222
-+0000000000000000000000000000000000000000 v7-0222
-+3a779b47f235a62d799147b25445b01866f7c0dd v7.0223
-+3a779b47f235a62d799147b25445b01866f7c0dd v7-0223
-+0000000000000000000000000000000000000000 v7-0223
-+8a6982d59d8ef4afa5c178d772bd2943665f0146 v7.0224
-+8a6982d59d8ef4afa5c178d772bd2943665f0146 v7-0224
-+0000000000000000000000000000000000000000 v7-0224
-+f30c8ac7741c82503bf897fcebc68f199e5b0998 v7.0225
-+f30c8ac7741c82503bf897fcebc68f199e5b0998 v7-0225
-+0000000000000000000000000000000000000000 v7-0225
-+38d7bf77e55068a5157faac7d871f2f3a66cbfad v7.0226
-+38d7bf77e55068a5157faac7d871f2f3a66cbfad v7-0226
-+0000000000000000000000000000000000000000 v7-0226
-+c3f63ed316b621743f44a5ab6b9a5438b88feded v7.0227
-+c3f63ed316b621743f44a5ab6b9a5438b88feded v7-0227
-+0000000000000000000000000000000000000000 v7-0227
-+e68d8541494dc36b5778d9eda2814014201b0335 v7.0228
-+e68d8541494dc36b5778d9eda2814014201b0335 v7-0228
-+0000000000000000000000000000000000000000 v7-0228
-+1a44839049aefb0722d43a87d7ed1708c9c94b18 v7.0229
-+1a44839049aefb0722d43a87d7ed1708c9c94b18 v7-0229
-+0000000000000000000000000000000000000000 v7-0229
-+98a88a884610aa911950623d7cce8d067feda66c v7.0230
-+98a88a884610aa911950623d7cce8d067feda66c v7-0230
-+0000000000000000000000000000000000000000 v7-0230
-+86ce35c9750f60054f48c1bfb80507345b862d8f v7.0231
-+86ce35c9750f60054f48c1bfb80507345b862d8f v7-0231
-+0000000000000000000000000000000000000000 v7-0231
-+95dac6af3b3a8f50af24432b7e355ea44ec69f95 v7.0232
-+95dac6af3b3a8f50af24432b7e355ea44ec69f95 v7-0232
-+0000000000000000000000000000000000000000 v7-0232
-+d8f905020502b0f35d810f27b4d5d28689bb7764 v7.0b
-+d8f905020502b0f35d810f27b4d5d28689bb7764 v7-0b
-+0000000000000000000000000000000000000000 v7-0b
-+111e109dad1301c7699d18e5689f1842f4b67e6c v7.0b01
-+111e109dad1301c7699d18e5689f1842f4b67e6c v7-0b01
-+0000000000000000000000000000000000000000 v7-0b01
-+4f1b94b51e99370161ceb5a923573772ca068582 v7.0b02
-+4f1b94b51e99370161ceb5a923573772ca068582 v7-0b02
-+0000000000000000000000000000000000000000 v7-0b02
-+9f345c48220b7a503fde0367df20e576fd46b04a v7.0c
-+9f345c48220b7a503fde0367df20e576fd46b04a v7-0c
-+0000000000000000000000000000000000000000 v7-0c
-+f40f1a8520ffaa57ae73a720c179780025aacd64 v7.0c01
-+f40f1a8520ffaa57ae73a720c179780025aacd64 v7-0c01
-+0000000000000000000000000000000000000000 v7-0c01
-+4a79d6d376f0897e3a899ccb104a324a94bb846c v7.0c02
-+4a79d6d376f0897e3a899ccb104a324a94bb846c v7-0c02
-+0000000000000000000000000000000000000000 v7-0c02
-+1f929f3ca8066b3170c7a58c414837d47bef707e v7.0c03
-+1f929f3ca8066b3170c7a58c414837d47bef707e v7-0c03
-+0000000000000000000000000000000000000000 v7-0c03
-+23f82b5d2814be7ca4dee000226bd67dc6cd02cf v7.0c10
-+23f82b5d2814be7ca4dee000226bd67dc6cd02cf v7-0c10
-+0000000000000000000000000000000000000000 v7-0c10
-+a2b128f7d705ef08ae91a8616cbaf40883827cdc v7.0c11
-+a2b128f7d705ef08ae91a8616cbaf40883827cdc v7-0c11
-+0000000000000000000000000000000000000000 v7-0c11
-+9ab23f1e137fd5b0e35c1604ffb95979713f83e4 v7.0c12
-+9ab23f1e137fd5b0e35c1604ffb95979713f83e4 v7-0c12
-+0000000000000000000000000000000000000000 v7-0c12
-+8dd456c1e283bf8c85e9ff38994fdfc6dd009ff5 v7.0c13
-+8dd456c1e283bf8c85e9ff38994fdfc6dd009ff5 v7-0c13
-+0000000000000000000000000000000000000000 v7-0c13
-+6675076019ae7e7444c526b342c91ae2ef6cfaac v7.0d
-+6675076019ae7e7444c526b342c91ae2ef6cfaac v7-0d
-+0000000000000000000000000000000000000000 v7-0d
-+1cdd2661f34c2aa93ae2f0317194d29d3a43f5be v7.0d01
-+1cdd2661f34c2aa93ae2f0317194d29d3a43f5be v7-0d01
-+0000000000000000000000000000000000000000 v7-0d01
-+fd1b3406fd1cbe1e7250c95f7b30604d7e46b2d1 v7.0d02
-+fd1b3406fd1cbe1e7250c95f7b30604d7e46b2d1 v7-0d02
-+0000000000000000000000000000000000000000 v7-0d02
-+01583c79d5f4d3f29d4c33dd10dd29efd349cad0 v7.0d03
-+01583c79d5f4d3f29d4c33dd10dd29efd349cad0 v7-0d03
-+0000000000000000000000000000000000000000 v7-0d03
-+dc8197342755fda6ca4d6619dac228406867a7ce v7.0d04
-+dc8197342755fda6ca4d6619dac228406867a7ce v7-0d04
-+0000000000000000000000000000000000000000 v7-0d04
-+52d17d53b555c45b0b9f4ddaf3551bc8ad5623ce v7.0d05
-+52d17d53b555c45b0b9f4ddaf3551bc8ad5623ce v7-0d05
-+0000000000000000000000000000000000000000 v7-0d05
-+5117153003bdb002aa3e68d3b90a98a973d38078 v7.0e
-+5117153003bdb002aa3e68d3b90a98a973d38078 v7-0e
-+0000000000000000000000000000000000000000 v7-0e
-+8bebcabccc2c430f05c5d85f8532adccb18a6136 v7.0e01
-+8bebcabccc2c430f05c5d85f8532adccb18a6136 v7-0e01
-+0000000000000000000000000000000000000000 v7-0e01
-+5a7843c57316c63d1118b6a5c2f42d330e57183b v7.0e02
-+5a7843c57316c63d1118b6a5c2f42d330e57183b v7-0e02
-+0000000000000000000000000000000000000000 v7-0e02
-+6bb1fa855dc91259d295a1beeb4144aa51b3cab6 v7.0e03
-+6bb1fa855dc91259d295a1beeb4144aa51b3cab6 v7-0e03
-+0000000000000000000000000000000000000000 v7-0e03
-+8e5830943bff21c0a2aa18399d18c8269ed9d3f7 v7.0e04
-+8e5830943bff21c0a2aa18399d18c8269ed9d3f7 v7-0e04
-+0000000000000000000000000000000000000000 v7-0e04
-+1f3b1021f002ac9703c1de0e80703b8067546a41 v7.0e05
-+1f3b1021f002ac9703c1de0e80703b8067546a41 v7-0e05
-+0000000000000000000000000000000000000000 v7-0e05
-+2c885fab04e31a34d91e4375d2d0397cadb818ce v7.0e06
-+2c885fab04e31a34d91e4375d2d0397cadb818ce v7-0e06
-+0000000000000000000000000000000000000000 v7-0e06
-+c2cae213194d26214a9132c1ec7cddbdafd18175 v7.0e07
-+c2cae213194d26214a9132c1ec7cddbdafd18175 v7-0e07
-+0000000000000000000000000000000000000000 v7-0e07
-+a209672376fd537735f6ab55ce926cb80fa56ca0 v7.0f
-+a209672376fd537735f6ab55ce926cb80fa56ca0 v7-0f
-+0000000000000000000000000000000000000000 v7-0f
-+9f279ebda75194c26ba5c917f68a7102348215b6 v7.0f01
-+9f279ebda75194c26ba5c917f68a7102348215b6 v7-0f01
-+0000000000000000000000000000000000000000 v7-0f01
-+d3bbb5dd3913b6425ffebd18b232fcc2d1907046 v7.0f02
-+d3bbb5dd3913b6425ffebd18b232fcc2d1907046 v7-0f02
-+0000000000000000000000000000000000000000 v7-0f02
-+db44f7b81373a02990aa6030b85024478b7d82bf v7.0f03
-+db44f7b81373a02990aa6030b85024478b7d82bf v7-0f03
-+0000000000000000000000000000000000000000 v7-0f03
-+e73f2978bd4061868337a25ff09c3c84b54dd2da v7.0f04
-+e73f2978bd4061868337a25ff09c3c84b54dd2da v7-0f04
-+0000000000000000000000000000000000000000 v7-0f04
-+d2a4f08396fe8c01ebca988db5eb95b7c3f9db8b v7.0f05
-+d2a4f08396fe8c01ebca988db5eb95b7c3f9db8b v7-0f05
-+0000000000000000000000000000000000000000 v7-0f05
-+8cd72985156286e77ac5d271a13cfb569b29ed76 v7.0g
-+8cd72985156286e77ac5d271a13cfb569b29ed76 v7-0g
-+0000000000000000000000000000000000000000 v7-0g
-+ca82de29ac1903bb1295c04da5624cf295b6447c v7.0g01
-+ca82de29ac1903bb1295c04da5624cf295b6447c v7-0g01
-+0000000000000000000000000000000000000000 v7-0g01
-+169533a9699fa7d3fd67b57ad99d04076d060831 v7.0g02
-+169533a9699fa7d3fd67b57ad99d04076d060831 v7-0g02
-+0000000000000000000000000000000000000000 v7-0g02
-+f41fa84cd738b945ab34271a92f44e0d1445dda2 v7.0g03
-+f41fa84cd738b945ab34271a92f44e0d1445dda2 v7-0g03
-+0000000000000000000000000000000000000000 v7-0g03
-+31bff9be0a7730f36e7de4792fec0688f2fc7076 v7.0g04
-+31bff9be0a7730f36e7de4792fec0688f2fc7076 v7-0g04
-+0000000000000000000000000000000000000000 v7-0g04
-+509230ed2036945be2d9db7e1ecded3c59518c2d v7.0g05
-+509230ed2036945be2d9db7e1ecded3c59518c2d v7-0g05
-+0000000000000000000000000000000000000000 v7-0g05
-+4bac29d27e2f4c2779ecb72a5e78cd4a65cb455e v7.0
-+4bac29d27e2f4c2779ecb72a5e78cd4a65cb455e v7-0
-+0000000000000000000000000000000000000000 v7-0
-+15146eaa0e9c6dd6802cf70a2da3b220992eda1e v7.0.001
-+15146eaa0e9c6dd6802cf70a2da3b220992eda1e v7-0-001
-+0000000000000000000000000000000000000000 v7-0-001
-+1d0ef79659afec337c26655216a1debbd1c74497 v7.0.002
-+1d0ef79659afec337c26655216a1debbd1c74497 v7-0-002
-+0000000000000000000000000000000000000000 v7-0-002
-+af98ef7f5a39aadfe18dd44df9afeedbb0665778 v7.0.003
-+af98ef7f5a39aadfe18dd44df9afeedbb0665778 v7-0-003
-+0000000000000000000000000000000000000000 v7-0-003
-+64be6e0b070a5f5f58eddedc8b57dc0356642cd5 v7.0.004
-+64be6e0b070a5f5f58eddedc8b57dc0356642cd5 v7-0-004
-+0000000000000000000000000000000000000000 v7-0-004
-+232a4740aa0ed615c52b289a111b51171e74a78f v7.0.005
-+232a4740aa0ed615c52b289a111b51171e74a78f v7-0-005
-+0000000000000000000000000000000000000000 v7-0-005
-+ef0fe6201b843f699b3ed7483e52eb3348ae5b11 v7.0.006
-+ef0fe6201b843f699b3ed7483e52eb3348ae5b11 v7-0-006
-+0000000000000000000000000000000000000000 v7-0-006
-+48775ea99f249b75872e9f0268c5bda8cb8af8da v7.0.007
-+48775ea99f249b75872e9f0268c5bda8cb8af8da v7-0-007
-+0000000000000000000000000000000000000000 v7-0-007
-+6b89fd4ffcc698278ecc582280c79916a425498b v7.0.008
-+6b89fd4ffcc698278ecc582280c79916a425498b v7-0-008
-+0000000000000000000000000000000000000000 v7-0-008
-+7c28790fa8b4054bdde6d358a9132581de76df62 v7.0.009
-+7c28790fa8b4054bdde6d358a9132581de76df62 v7-0-009
-+0000000000000000000000000000000000000000 v7-0-009
-+9f184758f277b816c95fd946cd2d63578d296578 v7.0.010
-+9f184758f277b816c95fd946cd2d63578d296578 v7-0-010
-+0000000000000000000000000000000000000000 v7-0-010
-+2548cf0a5f625110a5cd42ee5566c2709c2c34f0 v7.0.011
-+2548cf0a5f625110a5cd42ee5566c2709c2c34f0 v7-0-011
-+0000000000000000000000000000000000000000 v7-0-011
-+ddfb6f3f3b2be6e5397db2601f392c45f4a05b84 v7.0.012
-+ddfb6f3f3b2be6e5397db2601f392c45f4a05b84 v7-0-012
-+0000000000000000000000000000000000000000 v7-0-012
-+9dc77520c6d3ee0c3e689bc3e6d635cde80909ff v7.0.013
-+9dc77520c6d3ee0c3e689bc3e6d635cde80909ff v7-0-013
-+0000000000000000000000000000000000000000 v7-0-013
-+882b2fa49a2a888a8231f3cf2428b91439decb93 v7.0.014
-+882b2fa49a2a888a8231f3cf2428b91439decb93 v7-0-014
-+0000000000000000000000000000000000000000 v7-0-014
-+0c0a2b25d10aaaf556344d7404d12aba81632cf4 v7.0.015
-+0c0a2b25d10aaaf556344d7404d12aba81632cf4 v7-0-015
-+0000000000000000000000000000000000000000 v7-0-015
-+ffa17de19445569ea573550eef332323d83e70bd v7.0.016
-+ffa17de19445569ea573550eef332323d83e70bd v7-0-016
-+0000000000000000000000000000000000000000 v7-0-016
-+e6bd96f2d7b81a8963c9c8dcfd9e2b3f08a9f0e4 v7.0.017
-+e6bd96f2d7b81a8963c9c8dcfd9e2b3f08a9f0e4 v7-0-017
-+0000000000000000000000000000000000000000 v7-0-017
-+d8dbf7d55c5e9ac3e345eb1b2b86986be3582fdd v7.0.018
-+d8dbf7d55c5e9ac3e345eb1b2b86986be3582fdd v7-0-018
-+0000000000000000000000000000000000000000 v7-0-018
-+bf7803d0f5b9d0a9cb16636b9490d723623c57e8 v7.0.019
-+bf7803d0f5b9d0a9cb16636b9490d723623c57e8 v7-0-019
-+0000000000000000000000000000000000000000 v7-0-019
-+edb3bc186e97a3392b3aac634526a4f4f84f4011 v7.0.020
-+edb3bc186e97a3392b3aac634526a4f4f84f4011 v7-0-020
-+0000000000000000000000000000000000000000 v7-0-020
-+4ec4c53046b5be6700810b9b92996a0cfb4ed52a v7.0.021
-+4ec4c53046b5be6700810b9b92996a0cfb4ed52a v7-0-021
-+0000000000000000000000000000000000000000 v7-0-021
-+354ea37841d13e0d9bb5ae995a09fb28beaa0d13 v7.0.022
-+354ea37841d13e0d9bb5ae995a09fb28beaa0d13 v7-0-022
-+0000000000000000000000000000000000000000 v7-0-022
-+2e1e9b708941e1cfc2c0540196719f78e1ab18f5 v7.0.023
-+2e1e9b708941e1cfc2c0540196719f78e1ab18f5 v7-0-023
-+0000000000000000000000000000000000000000 v7-0-023
-+a5beb9fb4da85dfc21dbb68af0fd6aec616dd1dc v7.0.024
-+a5beb9fb4da85dfc21dbb68af0fd6aec616dd1dc v7-0-024
-+0000000000000000000000000000000000000000 v7-0-024
-+2981ad79c362bff0c21d3ff0d68be57213bca837 v7.0.025
-+2981ad79c362bff0c21d3ff0d68be57213bca837 v7-0-025
-+0000000000000000000000000000000000000000 v7-0-025
-+7bc38b35f1e87c1749f157ef91b6cab86bfd9561 v7.0.026
-+7bc38b35f1e87c1749f157ef91b6cab86bfd9561 v7-0-026
-+0000000000000000000000000000000000000000 v7-0-026
-+f959cda54600f8d014cf3a3c69285c598985d828 v7.0.027
-+f959cda54600f8d014cf3a3c69285c598985d828 v7-0-027
-+0000000000000000000000000000000000000000 v7-0-027
-+3c17f4d2196f2f280de13a417652529c417548ff v7.0.028
-+3c17f4d2196f2f280de13a417652529c417548ff v7-0-028
-+0000000000000000000000000000000000000000 v7-0-028
-+98ef5b0fe07610170bd68aac5ba6e739410c913c v7.0.029
-+98ef5b0fe07610170bd68aac5ba6e739410c913c v7-0-029
-+0000000000000000000000000000000000000000 v7-0-029
-+f6c72dd1962a46aec26c7caac6f1c3789321e91f v7.0.030
-+f6c72dd1962a46aec26c7caac6f1c3789321e91f v7-0-030
-+0000000000000000000000000000000000000000 v7-0-030
-+f099adbff8871627d897979b432d74ad1623369e v7.0.031
-+f099adbff8871627d897979b432d74ad1623369e v7-0-031
-+0000000000000000000000000000000000000000 v7-0-031
-+039ce9407934bd97142aab06c5d1869d8e2ba3c7 v7.0.032
-+039ce9407934bd97142aab06c5d1869d8e2ba3c7 v7-0-032
-+0000000000000000000000000000000000000000 v7-0-032
-+5e168526af25c0a59c55dd009e10a63d2f156114 v7.0.033
-+5e168526af25c0a59c55dd009e10a63d2f156114 v7-0-033
-+0000000000000000000000000000000000000000 v7-0-033
-+bd7e26d05a3fc8e010566ad8f8aea9c31ddf55c8 v7.0.034
-+bd7e26d05a3fc8e010566ad8f8aea9c31ddf55c8 v7-0-034
-+0000000000000000000000000000000000000000 v7-0-034
-+073f98f45a447a137c2e2d74f936a9e26179ce1b v7.0.035
-+073f98f45a447a137c2e2d74f936a9e26179ce1b v7-0-035
-+0000000000000000000000000000000000000000 v7-0-035
-+abff2f6a3ad7790f86e055519dcb851a06fe78c0 v7.0.036
-+abff2f6a3ad7790f86e055519dcb851a06fe78c0 v7-0-036
-+0000000000000000000000000000000000000000 v7-0-036
-+697dec8ec5e723ae32e12229d3ca111fe7f4ba92 v7.0.037
-+697dec8ec5e723ae32e12229d3ca111fe7f4ba92 v7-0-037
-+0000000000000000000000000000000000000000 v7-0-037
-+adf6a9dcadeda32a2a339069336ebed7fe6d53da v7.0.038
-+adf6a9dcadeda32a2a339069336ebed7fe6d53da v7-0-038
-+0000000000000000000000000000000000000000 v7-0-038
-+1aba098d6abc680214b3b31c954abd53ddc772ef v7.0.039
-+1aba098d6abc680214b3b31c954abd53ddc772ef v7-0-039
-+0000000000000000000000000000000000000000 v7-0-039
-+bc68103ea3f6a13d26598bfc1958a57eae377a92 v7.0.040
-+bc68103ea3f6a13d26598bfc1958a57eae377a92 v7-0-040
-+0000000000000000000000000000000000000000 v7-0-040
-+d87865573d809129e6d25071cffe8ab451ea2db2 v7.0.041
-+d87865573d809129e6d25071cffe8ab451ea2db2 v7-0-041
-+0000000000000000000000000000000000000000 v7-0-041
-+b8ed23ef6ff15604ead321f758ecc624a9d35c2c v7.0.042
-+b8ed23ef6ff15604ead321f758ecc624a9d35c2c v7-0-042
-+0000000000000000000000000000000000000000 v7-0-042
-+94164a5b0626984b565ae6421c64bfd6d993e162 v7.0.043
-+94164a5b0626984b565ae6421c64bfd6d993e162 v7-0-043
-+0000000000000000000000000000000000000000 v7-0-043
-+a07007166d518f51749cc9e145afeb023638a415 v7.0.044
-+a07007166d518f51749cc9e145afeb023638a415 v7-0-044
-+0000000000000000000000000000000000000000 v7-0-044
-+3cd88bdcd97d7d0a3e2f5a00a6627f00970ce5b9 v7.0.045
-+3cd88bdcd97d7d0a3e2f5a00a6627f00970ce5b9 v7-0-045
-+0000000000000000000000000000000000000000 v7-0-045
-+09fcdfde9afca8990c086e60fe5e122cb258cadc v7.0.046
-+09fcdfde9afca8990c086e60fe5e122cb258cadc v7-0-046
-+0000000000000000000000000000000000000000 v7-0-046
-+cd9471bd8e9eb1d2c59d00a7d18dc07dd97fcea6 v7.0.047
-+cd9471bd8e9eb1d2c59d00a7d18dc07dd97fcea6 v7-0-047
-+0000000000000000000000000000000000000000 v7-0-047
-+652d074e0264f453cbf76df0ce041b5032504085 v7.0.048
-+652d074e0264f453cbf76df0ce041b5032504085 v7-0-048
-+0000000000000000000000000000000000000000 v7-0-048
-+b31702c473ae10db32dcedae94af25228d6c920c v7.0.049
-+b31702c473ae10db32dcedae94af25228d6c920c v7-0-049
-+0000000000000000000000000000000000000000 v7-0-049
-+ba9375e24d4937d863ab87d28e6b7c1ed42b3960 v7.0.050
-+ba9375e24d4937d863ab87d28e6b7c1ed42b3960 v7-0-050
-+0000000000000000000000000000000000000000 v7-0-050
-+3d842a9e2baefc023d9e4f163ea138b9e29931e8 v7.0.051
-+3d842a9e2baefc023d9e4f163ea138b9e29931e8 v7-0-051
-+0000000000000000000000000000000000000000 v7-0-051
-+bde3b38593f9d07da76cdf37ea574fc9d80aa43e v7.0.052
-+bde3b38593f9d07da76cdf37ea574fc9d80aa43e v7-0-052
-+0000000000000000000000000000000000000000 v7-0-052
-+6632670ff6fc2bd4dbe01001086874b9f75b0929 v7.0.053
-+6632670ff6fc2bd4dbe01001086874b9f75b0929 v7-0-053
-+0000000000000000000000000000000000000000 v7-0-053
-+03c4ceec6bec956646c07390aa09052cf5f0468f v7.0.054
-+03c4ceec6bec956646c07390aa09052cf5f0468f v7-0-054
-+0000000000000000000000000000000000000000 v7-0-054
-+2448f4c8afc65a91130fa0237c253e6698481c64 v7.0.055
-+2448f4c8afc65a91130fa0237c253e6698481c64 v7-0-055
-+0000000000000000000000000000000000000000 v7-0-055
-+529c6a431ff5d5612bfba4424c023dcf073c2cc1 v7.0.056
-+529c6a431ff5d5612bfba4424c023dcf073c2cc1 v7-0-056
-+0000000000000000000000000000000000000000 v7-0-056
-+c5871806d7e6c121c80030dde025a96c0ddec820 v7.0.057
-+c5871806d7e6c121c80030dde025a96c0ddec820 v7-0-057
-+0000000000000000000000000000000000000000 v7-0-057
-+c9ddc2338f41c43a30044dbdca1775b919f80707 v7.0.058
-+c9ddc2338f41c43a30044dbdca1775b919f80707 v7-0-058
-+0000000000000000000000000000000000000000 v7-0-058
-+56609cdae088c4d5b38ac94a95a07f1520b56fcc v7.0.059
-+56609cdae088c4d5b38ac94a95a07f1520b56fcc v7-0-059
-+0000000000000000000000000000000000000000 v7-0-059
-+e44efb3af0d58fc58a392e58c604bee91bc52e2e v7.0.060
-+e44efb3af0d58fc58a392e58c604bee91bc52e2e v7-0-060
-+0000000000000000000000000000000000000000 v7-0-060
-+c8cae82dee305d003f809d91025ed21582785597 v7.0.061
-+c8cae82dee305d003f809d91025ed21582785597 v7-0-061
-+0000000000000000000000000000000000000000 v7-0-061
-+77f8a648d2e6c765329ee6544bd8716835bda3bb v7.0.062
-+77f8a648d2e6c765329ee6544bd8716835bda3bb v7-0-062
-+0000000000000000000000000000000000000000 v7-0-062
-+de8224965034eaf748c4205cc2a61e097b4aef90 v7.0.063
-+de8224965034eaf748c4205cc2a61e097b4aef90 v7-0-063
-+0000000000000000000000000000000000000000 v7-0-063
-+fc0c566b91075643f259863d171bb253703698bf v7.0.064
-+fc0c566b91075643f259863d171bb253703698bf v7-0-064
-+0000000000000000000000000000000000000000 v7-0-064
-+31208ed42de95ba5738675cb78bd0f66c34ed785 v7.0.065
-+31208ed42de95ba5738675cb78bd0f66c34ed785 v7-0-065
-+0000000000000000000000000000000000000000 v7-0-065
-+306fc545fe2cd5d77953811fccec0d5c4bf7744e v7.0.066
-+306fc545fe2cd5d77953811fccec0d5c4bf7744e v7-0-066
-+0000000000000000000000000000000000000000 v7-0-066
-+d95676480093879730aed5ba678e3e8305977a4e v7.0.067
-+d95676480093879730aed5ba678e3e8305977a4e v7-0-067
-+0000000000000000000000000000000000000000 v7-0-067
-+29bf49bad20d3b1ad35af5cf21d91c4aa486d4a5 v7.0.068
-+29bf49bad20d3b1ad35af5cf21d91c4aa486d4a5 v7-0-068
-+0000000000000000000000000000000000000000 v7-0-068
-+e70aad5761b59933a1f69a8756457fdb3a9aad40 v7.0.069
-+e70aad5761b59933a1f69a8756457fdb3a9aad40 v7-0-069
-+0000000000000000000000000000000000000000 v7-0-069
-+b2dcb84570675cbdb4fea2d017bcd093b3f34be3 v7.0.070
-+b2dcb84570675cbdb4fea2d017bcd093b3f34be3 v7-0-070
-+0000000000000000000000000000000000000000 v7-0-070
-+0b211ebefd4e6ee52ae81a75938b4ee61ca15770 v7.0.071
-+0b211ebefd4e6ee52ae81a75938b4ee61ca15770 v7-0-071
-+0000000000000000000000000000000000000000 v7-0-071
-+4fb859cd9ba955957ad712ea390e87cffec6a540 v7.0.072
-+4fb859cd9ba955957ad712ea390e87cffec6a540 v7-0-072
-+0000000000000000000000000000000000000000 v7-0-072
-+a157c4786b79ae94758574d5ecb4a8f4959de5e6 v7.0.073
-+a157c4786b79ae94758574d5ecb4a8f4959de5e6 v7-0-073
-+0000000000000000000000000000000000000000 v7-0-073
-+c1b61096e3d0e4383db1ef01a5dc2f3ebd5eb0fc v7.0.074
-+c1b61096e3d0e4383db1ef01a5dc2f3ebd5eb0fc v7-0-074
-+0000000000000000000000000000000000000000 v7-0-074
-+8fafff87aedbcc1a7c71e29a9369056e5c08e84e v7.0.075
-+8fafff87aedbcc1a7c71e29a9369056e5c08e84e v7-0-075
-+0000000000000000000000000000000000000000 v7-0-075
-+f03c3fae0a99dd626469bdb66c0d7b9406e93a83 v7.0.076
-+f03c3fae0a99dd626469bdb66c0d7b9406e93a83 v7-0-076
-+0000000000000000000000000000000000000000 v7-0-076
-+06959e7212e521904f3b7d75bac5005b9f44bde3 v7.0.077
-+06959e7212e521904f3b7d75bac5005b9f44bde3 v7-0-077
-+0000000000000000000000000000000000000000 v7-0-077
-+af7afd2bb4c235544fc9da6b34898ea93d477d77 v7.0.078
-+af7afd2bb4c235544fc9da6b34898ea93d477d77 v7-0-078
-+0000000000000000000000000000000000000000 v7-0-078
-+2fb204616c9b4e4df95f1560899d02e5bb739678 v7.0.079
-+2fb204616c9b4e4df95f1560899d02e5bb739678 v7-0-079
-+0000000000000000000000000000000000000000 v7-0-079
-+4256f76f72668271d9d986cc3736eb188b4400a4 v7.0.080
-+4256f76f72668271d9d986cc3736eb188b4400a4 v7-0-080
-+0000000000000000000000000000000000000000 v7-0-080
-+e1070b3b03e9b1490157dce8db81b026460aea35 v7.0.081
-+e1070b3b03e9b1490157dce8db81b026460aea35 v7-0-081
-+0000000000000000000000000000000000000000 v7-0-081
-+92f3089a7b10dc9e8f5f3c69ab1e490d52ad2f0a v7.0.082
-+92f3089a7b10dc9e8f5f3c69ab1e490d52ad2f0a v7-0-082
-+0000000000000000000000000000000000000000 v7-0-082
-+3dc6072e0a25f24ad5d888af77d858036a9185f1 v7.0.083
-+3dc6072e0a25f24ad5d888af77d858036a9185f1 v7-0-083
-+0000000000000000000000000000000000000000 v7-0-083
-+e88950f0d4f699846875e45dd3887cbdf92bc3b9 v7.0.084
-+e88950f0d4f699846875e45dd3887cbdf92bc3b9 v7-0-084
-+0000000000000000000000000000000000000000 v7-0-084
-+ea15087a42cd21520e628faa3c53385246c04743 v7.0.085
-+ea15087a42cd21520e628faa3c53385246c04743 v7-0-085
-+0000000000000000000000000000000000000000 v7-0-085
-+8c8d07318d8d0b1bcfbd395ae7aeec6813725b33 v7.0.086
-+8c8d07318d8d0b1bcfbd395ae7aeec6813725b33 v7-0-086
-+0000000000000000000000000000000000000000 v7-0-086
-+c06c658691e20f22ae95d4cf117057c7d0736308 v7.0.087
-+c06c658691e20f22ae95d4cf117057c7d0736308 v7-0-087
-+0000000000000000000000000000000000000000 v7-0-087
-+ca4883686f934bb338dfe3a2fd7d6d3995c3e0e2 v7.0.088
-+ca4883686f934bb338dfe3a2fd7d6d3995c3e0e2 v7-0-088
-+0000000000000000000000000000000000000000 v7-0-088
-+7644c80ca87b75a7dd85a7b4089e74bf5c503f3c v7.0.089
-+7644c80ca87b75a7dd85a7b4089e74bf5c503f3c v7-0-089
-+0000000000000000000000000000000000000000 v7-0-089
-+e905716f6a3aaba3c0ba1d18093d4f4f09550524 v7.0.090
-+e905716f6a3aaba3c0ba1d18093d4f4f09550524 v7-0-090
-+0000000000000000000000000000000000000000 v7-0-090
-+2bebfa810a66caed9562541776d92f73a71de7f1 v7.0.091
-+2bebfa810a66caed9562541776d92f73a71de7f1 v7-0-091
-+0000000000000000000000000000000000000000 v7-0-091
-+eb800128bd894e9b2c661627d2a302344162987c v7.0.092
-+eb800128bd894e9b2c661627d2a302344162987c v7-0-092
-+0000000000000000000000000000000000000000 v7-0-092
-+daa1e34570ff649af9d7b64a447cc6d2c0b60e38 v7.0.093
-+daa1e34570ff649af9d7b64a447cc6d2c0b60e38 v7-0-093
-+0000000000000000000000000000000000000000 v7-0-093
-+994ea4e6f0238f12a5516eb75f7a6d7ce86362e6 v7.0.094
-+994ea4e6f0238f12a5516eb75f7a6d7ce86362e6 v7-0-094
-+0000000000000000000000000000000000000000 v7-0-094
-+cf4d73a8924e715fb5fc7db94af9a7e67d7643dc v7.0.095
-+cf4d73a8924e715fb5fc7db94af9a7e67d7643dc v7-0-095
-+0000000000000000000000000000000000000000 v7-0-095
-+c5cafb21c45b5e1e16c006056dd5b8f5ad91145d v7.0.096
-+c5cafb21c45b5e1e16c006056dd5b8f5ad91145d v7-0-096
-+0000000000000000000000000000000000000000 v7-0-096
-+a9ffa7c7db7757ae7c1ba0e7d3b990bafaefb558 v7.0.097
-+a9ffa7c7db7757ae7c1ba0e7d3b990bafaefb558 v7-0-097
-+0000000000000000000000000000000000000000 v7-0-097
-+decce137e7beaa2edbfb4783d1cac714c7d84d14 v7.0.098
-+decce137e7beaa2edbfb4783d1cac714c7d84d14 v7-0-098
-+0000000000000000000000000000000000000000 v7-0-098
-+d607b48414b79e7cacccb66391683b23cf1b2cbb v7.0.099
-+d607b48414b79e7cacccb66391683b23cf1b2cbb v7-0-099
-+0000000000000000000000000000000000000000 v7-0-099
-+ed44c1c436d3d61a94062c7a781b77dabeb8ebbe v7.0.100
-+ed44c1c436d3d61a94062c7a781b77dabeb8ebbe v7-0-100
-+0000000000000000000000000000000000000000 v7-0-100
-+f88008797313e07112b8c4e549dc2217747fed98 v7.0.101
-+f88008797313e07112b8c4e549dc2217747fed98 v7-0-101
-+0000000000000000000000000000000000000000 v7-0-101
-+727ab557c58a3257743a8b7589d91e21975b54ea v7.0.102
-+727ab557c58a3257743a8b7589d91e21975b54ea v7-0-102
-+0000000000000000000000000000000000000000 v7-0-102
-+316dad0565b8943c978c8c58b212f3c4469b1cf7 v7.0.103
-+316dad0565b8943c978c8c58b212f3c4469b1cf7 v7-0-103
-+0000000000000000000000000000000000000000 v7-0-103
-+0e3e208b4b901f22beecc85c5781170f3c4e5351 v7.0.104
-+0e3e208b4b901f22beecc85c5781170f3c4e5351 v7-0-104
-+0000000000000000000000000000000000000000 v7-0-104
-+32e19278c1ad1be6f92fc6cbcefb7e23ddf928cb v7.0.105
-+32e19278c1ad1be6f92fc6cbcefb7e23ddf928cb v7-0-105
-+0000000000000000000000000000000000000000 v7-0-105
-+e1efa991c2b6992bf361cb432895749fc6b1109e v7.0.106
-+e1efa991c2b6992bf361cb432895749fc6b1109e v7-0-106
-+0000000000000000000000000000000000000000 v7-0-106
-+eb4ee2010aae8f4361054eb367a7b13dcfd738c2 v7.0.107
-+eb4ee2010aae8f4361054eb367a7b13dcfd738c2 v7-0-107
-+0000000000000000000000000000000000000000 v7-0-107
-+b00d5f429a4b2f0a23710200cdf2a672ed9d5501 v7.0.108
-+b00d5f429a4b2f0a23710200cdf2a672ed9d5501 v7-0-108
-+0000000000000000000000000000000000000000 v7-0-108
-+f3669fbc9a31512a0b81fe7f647b935243a76520 v7.0.109
-+f3669fbc9a31512a0b81fe7f647b935243a76520 v7-0-109
-+0000000000000000000000000000000000000000 v7-0-109
-+fa9ee618000f51e5da6c951f24c9bab78f2bb428 v7.0.110
-+fa9ee618000f51e5da6c951f24c9bab78f2bb428 v7-0-110
-+0000000000000000000000000000000000000000 v7-0-110
-+656853d9c014add434086291b7af40ad828f126a v7.0.111
-+656853d9c014add434086291b7af40ad828f126a v7-0-111
-+0000000000000000000000000000000000000000 v7-0-111
-+8fd2e00c44ae10bd9e8a8f5c12db47378314457a v7.0.112
-+8fd2e00c44ae10bd9e8a8f5c12db47378314457a v7-0-112
-+0000000000000000000000000000000000000000 v7-0-112
-+e625dad74346d76132cbcf6ddf98b95d2c8fbfe5 v7.0.113
-+e625dad74346d76132cbcf6ddf98b95d2c8fbfe5 v7-0-113
-+0000000000000000000000000000000000000000 v7-0-113
-+cec8b867838bc2a5b5f5bb0146010060639fea90 v7.0.114
-+cec8b867838bc2a5b5f5bb0146010060639fea90 v7-0-114
-+0000000000000000000000000000000000000000 v7-0-114
-+3f8cf4c668c30ec99289b5683f4fd36a1df602fa v7.0.115
-+3f8cf4c668c30ec99289b5683f4fd36a1df602fa v7-0-115
-+0000000000000000000000000000000000000000 v7-0-115
-+9adbd26f7fee884be78276fb400ee77d333cf335 v7.0.116
-+9adbd26f7fee884be78276fb400ee77d333cf335 v7-0-116
-+0000000000000000000000000000000000000000 v7-0-116
-+ddafd2ba3a863054041f2f71248f0ea91fc3b1d2 v7.0.117
-+ddafd2ba3a863054041f2f71248f0ea91fc3b1d2 v7-0-117
-+0000000000000000000000000000000000000000 v7-0-117
-+144ad7f25f6741815c8297fe77965f93ee359c2a v7.0.118
-+144ad7f25f6741815c8297fe77965f93ee359c2a v7-0-118
-+0000000000000000000000000000000000000000 v7-0-118
-+cbc9c335ddb17f9b0e9d281e1c5d97a20ed4fd94 v7.0.119
-+cbc9c335ddb17f9b0e9d281e1c5d97a20ed4fd94 v7-0-119
-+0000000000000000000000000000000000000000 v7-0-119
-+c5d5e0f3403f65e77307d1bcb5d71acc73cbc90a v7.0.120
-+c5d5e0f3403f65e77307d1bcb5d71acc73cbc90a v7-0-120
-+0000000000000000000000000000000000000000 v7-0-120
-+9aec644c45dcc33b3f3571ba0035e7f85430eef6 v7.0.121
-+9aec644c45dcc33b3f3571ba0035e7f85430eef6 v7-0-121
-+0000000000000000000000000000000000000000 v7-0-121
-+5858c00d0f2c47b395e3c63cc809ee667f8c02a4 v7.0.122
-+5858c00d0f2c47b395e3c63cc809ee667f8c02a4 v7-0-122
-+0000000000000000000000000000000000000000 v7-0-122
-+86289e90a4bbb818e9cf8bae6e57f7b91b9671cc v7.0.123
-+86289e90a4bbb818e9cf8bae6e57f7b91b9671cc v7-0-123
-+0000000000000000000000000000000000000000 v7-0-123
-+f49d72bf9c5c425dfb8bb94c6bac975716e3023c v7.0.124
-+f49d72bf9c5c425dfb8bb94c6bac975716e3023c v7-0-124
-+0000000000000000000000000000000000000000 v7-0-124
-+2787b8483e6498f536e66ac134a073246ab6f5e4 v7.0.125
-+2787b8483e6498f536e66ac134a073246ab6f5e4 v7-0-125
-+0000000000000000000000000000000000000000 v7-0-125
-+cb49fa8c71963b7b69529dfc2abd00b791119fd6 v7.0.126
-+cb49fa8c71963b7b69529dfc2abd00b791119fd6 v7-0-126
-+0000000000000000000000000000000000000000 v7-0-126
-+1de53700b1d9f26a420a319d9c44ba0c43950035 v7.0.127
-+1de53700b1d9f26a420a319d9c44ba0c43950035 v7-0-127
-+0000000000000000000000000000000000000000 v7-0-127
-+41ab6b381572fcef699480ffb759d3c4543f0dd0 v7.0.128
-+41ab6b381572fcef699480ffb759d3c4543f0dd0 v7-0-128
-+0000000000000000000000000000000000000000 v7-0-128
-+a1c1f001b99dd591d9082db95de70e2bf8f9e8de v7.0.129
-+a1c1f001b99dd591d9082db95de70e2bf8f9e8de v7-0-129
-+0000000000000000000000000000000000000000 v7-0-129
-+09d0e83c29b805f127c6756231bb4adfb1b2974c v7.0.130
-+09d0e83c29b805f127c6756231bb4adfb1b2974c v7-0-130
-+0000000000000000000000000000000000000000 v7-0-130
-+1dfe9032bd92ef7ab7bf0baf0f0c1f61da68bce6 v7.0.131
-+1dfe9032bd92ef7ab7bf0baf0f0c1f61da68bce6 v7-0-131
-+0000000000000000000000000000000000000000 v7-0-131
-+992d5c69d5e917b03abcee24d2fbed8348e21c23 v7.0.132
-+992d5c69d5e917b03abcee24d2fbed8348e21c23 v7-0-132
-+0000000000000000000000000000000000000000 v7-0-132
-+7d29124f77f5e794008c746c69a0f79da0cd966a v7.0.133
-+7d29124f77f5e794008c746c69a0f79da0cd966a v7-0-133
-+0000000000000000000000000000000000000000 v7-0-133
-+58059676e24a6fbbc686faf84c612cfa8c25485d v7.0.134
-+58059676e24a6fbbc686faf84c612cfa8c25485d v7-0-134
-+0000000000000000000000000000000000000000 v7-0-134
-+721ebb602db0fd2a5a9cded8e0830800d734469a v7.0.135
-+721ebb602db0fd2a5a9cded8e0830800d734469a v7-0-135
-+0000000000000000000000000000000000000000 v7-0-135
-+ba32a005373a78e0b07972880704e2183f578f86 v7.0.136
-+ba32a005373a78e0b07972880704e2183f578f86 v7-0-136
-+0000000000000000000000000000000000000000 v7-0-136
-+6e03ee418b50de776b583358fe2ba20bbaf043ad v7.0.137
-+6e03ee418b50de776b583358fe2ba20bbaf043ad v7-0-137
-+0000000000000000000000000000000000000000 v7-0-137
-+be8e2719caa6c7194ce4713206da6f1f8db694ca v7.0.138
-+be8e2719caa6c7194ce4713206da6f1f8db694ca v7-0-138
-+0000000000000000000000000000000000000000 v7-0-138
-+61e5d40135d0d90f5d1689c469958bb7a37e074f v7.0.139
-+61e5d40135d0d90f5d1689c469958bb7a37e074f v7-0-139
-+0000000000000000000000000000000000000000 v7-0-139
-+2651e7d07cd631af64818f5d3cf5dbb199fa6f64 v7.0.140
-+2651e7d07cd631af64818f5d3cf5dbb199fa6f64 v7-0-140
-+0000000000000000000000000000000000000000 v7-0-140
-+64e2b75e16158d89c4a600bb97a62a4616632884 v7.0.141
-+64e2b75e16158d89c4a600bb97a62a4616632884 v7-0-141
-+0000000000000000000000000000000000000000 v7-0-141
-+4bc81d4dc6be1c45e41f1b083ad7fc07c58d840c v7.0.142
-+4bc81d4dc6be1c45e41f1b083ad7fc07c58d840c v7-0-142
-+0000000000000000000000000000000000000000 v7-0-142
-+0d31f8a78ab35b256359b6ae53c80cecce59d44c v7.0.143
-+0d31f8a78ab35b256359b6ae53c80cecce59d44c v7-0-143
-+0000000000000000000000000000000000000000 v7-0-143
-+d3cff90680f3f985c21e34e03607a5808ed4dcbe v7.0.144
-+d3cff90680f3f985c21e34e03607a5808ed4dcbe v7-0-144
-+0000000000000000000000000000000000000000 v7-0-144
-+95b507e6c9e75d5b4c114a63a98b4bc36c643eea v7.0.145
-+95b507e6c9e75d5b4c114a63a98b4bc36c643eea v7-0-145
-+0000000000000000000000000000000000000000 v7-0-145
-+be9fbf8b0cdb6a42c07a8be94e9fba866cff00c8 v7.0.146
-+be9fbf8b0cdb6a42c07a8be94e9fba866cff00c8 v7-0-146
-+0000000000000000000000000000000000000000 v7-0-146
-+81cf1b6e0a2d59192534f884135108f788a20b91 v7.0.147
-+81cf1b6e0a2d59192534f884135108f788a20b91 v7-0-147
-+0000000000000000000000000000000000000000 v7-0-147
-+3376d79d40f2d2c8e09cf8a3c07e15fc2424ecb3 v7.0.148
-+3376d79d40f2d2c8e09cf8a3c07e15fc2424ecb3 v7-0-148
-+0000000000000000000000000000000000000000 v7-0-148
-+cb7043482eca744ad9ba1eb11f08cc2906b6bd3c v7.0.149
-+cb7043482eca744ad9ba1eb11f08cc2906b6bd3c v7-0-149
-+0000000000000000000000000000000000000000 v7-0-149
-+39aaf0cc59e83148991c7482fa82d2bc29129d3a v7.0.150
-+39aaf0cc59e83148991c7482fa82d2bc29129d3a v7-0-150
-+0000000000000000000000000000000000000000 v7-0-150
-+b6627f01c67dd0bcdc2f24d56d0a9342cb5dacda v7.0.151
-+b6627f01c67dd0bcdc2f24d56d0a9342cb5dacda v7-0-151
-+0000000000000000000000000000000000000000 v7-0-151
-+d8af28dbfb80aa6c6248000b011bc9df6f8f337a v7.0.152
-+d8af28dbfb80aa6c6248000b011bc9df6f8f337a v7-0-152
-+0000000000000000000000000000000000000000 v7-0-152
-+c37ed44f014fdcb211ba3decf81d1f3ec94a210b v7.0.153
-+c37ed44f014fdcb211ba3decf81d1f3ec94a210b v7-0-153
-+0000000000000000000000000000000000000000 v7-0-153
-+5044d9d784ed2958022fd3446910567a4b84dacc v7.0.154
-+5044d9d784ed2958022fd3446910567a4b84dacc v7-0-154
-+0000000000000000000000000000000000000000 v7-0-154
-+82b2594be40863fef91c163200db2f56b2e4e52b v7.0.155
-+82b2594be40863fef91c163200db2f56b2e4e52b v7-0-155
-+0000000000000000000000000000000000000000 v7-0-155
-+d4bc24e6a28144ebb16f143efb72ffdd98bbe0fc v7.0.156
-+d4bc24e6a28144ebb16f143efb72ffdd98bbe0fc v7-0-156
-+0000000000000000000000000000000000000000 v7-0-156
-+1780e6046802498a3c4d0ddc7b99f1bd9ac75f31 v7.0.157
-+1780e6046802498a3c4d0ddc7b99f1bd9ac75f31 v7-0-157
-+0000000000000000000000000000000000000000 v7-0-157
-+e6aed39f12648124b0b4e23c669cab6ceda2ea1e v7.0.158
-+e6aed39f12648124b0b4e23c669cab6ceda2ea1e v7-0-158
-+0000000000000000000000000000000000000000 v7-0-158
-+19ed3bfbe488a730858d0d26b433029b85e231cd v7.0.159
-+19ed3bfbe488a730858d0d26b433029b85e231cd v7-0-159
-+0000000000000000000000000000000000000000 v7-0-159
-+98d1c149be76b44332bdb72e986bfc8b0f9f21d3 v7.0.160
-+98d1c149be76b44332bdb72e986bfc8b0f9f21d3 v7-0-160
-+0000000000000000000000000000000000000000 v7-0-160
-+4a6554fb0483f5cab10876ff0d9a0e92a9787119 v7.0.161
-+4a6554fb0483f5cab10876ff0d9a0e92a9787119 v7-0-161
-+0000000000000000000000000000000000000000 v7-0-161
-+20308f30826db09e99d531214eaaf03ea8b13d15 v7.0.162
-+20308f30826db09e99d531214eaaf03ea8b13d15 v7-0-162
-+0000000000000000000000000000000000000000 v7-0-162
-+7df2d171ef1c1284e10a4c53fb079d02e6d7b028 v7.0.163
-+7df2d171ef1c1284e10a4c53fb079d02e6d7b028 v7-0-163
-+0000000000000000000000000000000000000000 v7-0-163
-+777d5460622d4a9aac084695524d0c85b39f4174 v7.0.164
-+777d5460622d4a9aac084695524d0c85b39f4174 v7-0-164
-+0000000000000000000000000000000000000000 v7-0-164
-+04943f31135747da59cbed2b39fb109dd2796426 v7.0.165
-+04943f31135747da59cbed2b39fb109dd2796426 v7-0-165
-+0000000000000000000000000000000000000000 v7-0-165
-+65e0c2e3a3521c9782728f307ced58a5740d87ac v7.0.166
-+65e0c2e3a3521c9782728f307ced58a5740d87ac v7-0-166
-+0000000000000000000000000000000000000000 v7-0-166
-+c3bd0a84e11ad1caf53402dbebc39ea8b01fc832 v7.0.167
-+c3bd0a84e11ad1caf53402dbebc39ea8b01fc832 v7-0-167
-+0000000000000000000000000000000000000000 v7-0-167
-+932fe018ad166a9f8e4b6b0ae91d562cab7c37db v7.0.168
-+932fe018ad166a9f8e4b6b0ae91d562cab7c37db v7-0-168
-+0000000000000000000000000000000000000000 v7-0-168
-+10d7ebdbe8a3a9787360b21a9836c6bae6a6a7a2 v7.0.169
-+10d7ebdbe8a3a9787360b21a9836c6bae6a6a7a2 v7-0-169
-+0000000000000000000000000000000000000000 v7-0-169
-+f66abfa335bb76d20f2a375f148fb7705bfde287 v7.0.170
-+f66abfa335bb76d20f2a375f148fb7705bfde287 v7-0-170
-+0000000000000000000000000000000000000000 v7-0-170
-+7f01e52cc97aca6eff92948b67876e800eb67fc3 v7.0.171
-+7f01e52cc97aca6eff92948b67876e800eb67fc3 v7-0-171
-+0000000000000000000000000000000000000000 v7-0-171
-+26ff011aec2dbc96736396430403d572d4f111d5 v7.0.172
-+26ff011aec2dbc96736396430403d572d4f111d5 v7-0-172
-+0000000000000000000000000000000000000000 v7-0-172
-+2d0f22897a4d1f71600540e64a5cbf80a178e46a v7.0.173
-+2d0f22897a4d1f71600540e64a5cbf80a178e46a v7-0-173
-+0000000000000000000000000000000000000000 v7-0-173
-+73c0eeeee0b789738812c1cf821de3f86e1fee53 v7.0.174
-+73c0eeeee0b789738812c1cf821de3f86e1fee53 v7-0-174
-+0000000000000000000000000000000000000000 v7-0-174
-+82ca8ff21fd7181e16dcc58863d0d251b9228374 v7.0.175
-+82ca8ff21fd7181e16dcc58863d0d251b9228374 v7-0-175
-+0000000000000000000000000000000000000000 v7-0-175
-+45fe7cf4a89e3963ed9c0d6a34600dcff8de3f9f v7.0.176
-+45fe7cf4a89e3963ed9c0d6a34600dcff8de3f9f v7-0-176
-+0000000000000000000000000000000000000000 v7-0-176
-+e14d0a530351fe26450893977197e81e9e9ae5f2 v7.0.177
-+e14d0a530351fe26450893977197e81e9e9ae5f2 v7-0-177
-+0000000000000000000000000000000000000000 v7-0-177
-+8647018a15f3e4e89c706b6290ab0151565f394a v7.0.178
-+8647018a15f3e4e89c706b6290ab0151565f394a v7-0-178
-+0000000000000000000000000000000000000000 v7-0-178
-+f8f35d8208e6c242026dcedd8300b82f415fc59b v7.0.179
-+f8f35d8208e6c242026dcedd8300b82f415fc59b v7-0-179
-+0000000000000000000000000000000000000000 v7-0-179
-+99ccc8932b6c450cbcdcf86de05dbd5129a370fe v7.0.180
-+99ccc8932b6c450cbcdcf86de05dbd5129a370fe v7-0-180
-+0000000000000000000000000000000000000000 v7-0-180
-+ef6b11bee7d06a843474888d0bbd67d14dd2065d v7.0.181
-+ef6b11bee7d06a843474888d0bbd67d14dd2065d v7-0-181
-+0000000000000000000000000000000000000000 v7-0-181
-+e6d25347de2cc7f7632cb0cbe5adef45d9712aca v7.0.182
-+e6d25347de2cc7f7632cb0cbe5adef45d9712aca v7-0-182
-+0000000000000000000000000000000000000000 v7-0-182
-+4a4b16c67c62174b3b66848a32f4e5554b9cf6c0 v7.0.183
-+4a4b16c67c62174b3b66848a32f4e5554b9cf6c0 v7-0-183
-+0000000000000000000000000000000000000000 v7-0-183
-+a565175274f6efd9d4f725dcdee1b6e049258d3c v7.0.184
-+a565175274f6efd9d4f725dcdee1b6e049258d3c v7-0-184
-+0000000000000000000000000000000000000000 v7-0-184
-+b8c880d61acb8d5e08ae0cb558ece76d96d12341 v7.0.185
-+b8c880d61acb8d5e08ae0cb558ece76d96d12341 v7-0-185
-+0000000000000000000000000000000000000000 v7-0-185
-+39d115408c71e1bf72439d5a92d98c8e551a5750 v7.0.186
-+39d115408c71e1bf72439d5a92d98c8e551a5750 v7-0-186
-+0000000000000000000000000000000000000000 v7-0-186
-+b4d11ddb7303ebc28f6a40fea28f003287e77352 v7.0.187
-+b4d11ddb7303ebc28f6a40fea28f003287e77352 v7-0-187
-+0000000000000000000000000000000000000000 v7-0-187
-+9e084588b706867fae28f93f67d163635a79ae51 v7.0.188
-+9e084588b706867fae28f93f67d163635a79ae51 v7-0-188
-+0000000000000000000000000000000000000000 v7-0-188
-+d763e7d7e938d8dd3887b7279b44e3a857285d38 v7.0.189
-+d763e7d7e938d8dd3887b7279b44e3a857285d38 v7-0-189
-+0000000000000000000000000000000000000000 v7-0-189
-+a8bcc7553263bb7a12eec8813270ed34242dcdfd v7.0.190
-+a8bcc7553263bb7a12eec8813270ed34242dcdfd v7-0-190
-+0000000000000000000000000000000000000000 v7-0-190
-+caa550fe445725dea9531b9fe9f0d0f88961baf7 v7.0.191
-+caa550fe445725dea9531b9fe9f0d0f88961baf7 v7-0-191
-+0000000000000000000000000000000000000000 v7-0-191
-+bffbbb566d6b1004cfe26df89e102c465bed4312 v7.0.192
-+bffbbb566d6b1004cfe26df89e102c465bed4312 v7-0-192
-+0000000000000000000000000000000000000000 v7-0-192
-+0b056c1350dd2ff28249130194d9a2be7b606a86 v7.0.193
-+0b056c1350dd2ff28249130194d9a2be7b606a86 v7-0-193
-+0000000000000000000000000000000000000000 v7-0-193
-+efd0ce477ae789445312ebb08a0f78b835dd6f5b v7.0.194
-+efd0ce477ae789445312ebb08a0f78b835dd6f5b v7-0-194
-+0000000000000000000000000000000000000000 v7-0-194
-+f628d19361d9812a1266baec9f76d60c798f92d5 v7.0.195
-+f628d19361d9812a1266baec9f76d60c798f92d5 v7-0-195
-+0000000000000000000000000000000000000000 v7-0-195
-+32c1b275ba6419fc014ffba3d2e55eca1ef06d4c v7.0.196
-+32c1b275ba6419fc014ffba3d2e55eca1ef06d4c v7-0-196
-+0000000000000000000000000000000000000000 v7-0-196
-+cc03a79fdbb9315956fc22887483a15b414278ea v7.0.197
-+cc03a79fdbb9315956fc22887483a15b414278ea v7-0-197
-+0000000000000000000000000000000000000000 v7-0-197
-+25154b22dc967b158645be9cb87017f548ee5446 v7.0.198
-+25154b22dc967b158645be9cb87017f548ee5446 v7-0-198
-+0000000000000000000000000000000000000000 v7-0-198
-+ec7a570696ac0e50147e2419d8b269ccfb75f25e v7.0.199
-+ec7a570696ac0e50147e2419d8b269ccfb75f25e v7-0-199
-+0000000000000000000000000000000000000000 v7-0-199
-+a112fdce9ebd6d538c70602550e94f29a2fc60fc v7.0.200
-+a112fdce9ebd6d538c70602550e94f29a2fc60fc v7-0-200
-+0000000000000000000000000000000000000000 v7-0-200
-+21ce954cbdcac9dea2aa826ff40adc2fb2184600 v7.0.201
-+21ce954cbdcac9dea2aa826ff40adc2fb2184600 v7-0-201
-+0000000000000000000000000000000000000000 v7-0-201
-+17b9587ff6d5beef34d98043ca5f3111e5d29e4d v7.0.202
-+17b9587ff6d5beef34d98043ca5f3111e5d29e4d v7-0-202
-+0000000000000000000000000000000000000000 v7-0-202
-+a11e2070c964de1cfb9fdf3ce339ec75b7a983cd v7.0.203
-+a11e2070c964de1cfb9fdf3ce339ec75b7a983cd v7-0-203
-+0000000000000000000000000000000000000000 v7-0-203
-+a36d21d4a87596abd8775c322fced6a539385ab3 v7.0.204
-+a36d21d4a87596abd8775c322fced6a539385ab3 v7-0-204
-+0000000000000000000000000000000000000000 v7-0-204
-+183c3187b20dbc6ecc74958e9ba141f0d4f72d23 v7.0.205
-+183c3187b20dbc6ecc74958e9ba141f0d4f72d23 v7-0-205
-+0000000000000000000000000000000000000000 v7-0-205
-+313ec58cdc49a69c4386a4aa18fb9bcd01155feb v7.0.206
-+313ec58cdc49a69c4386a4aa18fb9bcd01155feb v7-0-206
-+0000000000000000000000000000000000000000 v7-0-206
-+0e57be57fa49a0d2c0b7f17b7cb137b4260b79d6 v7.0.207
-+0e57be57fa49a0d2c0b7f17b7cb137b4260b79d6 v7-0-207
-+0000000000000000000000000000000000000000 v7-0-207
-+342d2b3a072a6cbc3cff898a663c4889317b32a9 v7.0.208
-+342d2b3a072a6cbc3cff898a663c4889317b32a9 v7-0-208
-+0000000000000000000000000000000000000000 v7-0-208
-+1d12208efb3732d6f520b05a47283208f12e3856 v7.0.209
-+1d12208efb3732d6f520b05a47283208f12e3856 v7-0-209
-+0000000000000000000000000000000000000000 v7-0-209
-+bf63a31b77017d78197bc0155c0ec59e31559df3 v7.0.210
-+bf63a31b77017d78197bc0155c0ec59e31559df3 v7-0-210
-+0000000000000000000000000000000000000000 v7-0-210
-+f299f0bf32d76986d5596d279bc0733cebe1942b v7.0.211
-+f299f0bf32d76986d5596d279bc0733cebe1942b v7-0-211
-+0000000000000000000000000000000000000000 v7-0-211
-+1a511b7b69ebdf866088b9e765dc42543cd76d0a v7.0.212
-+1a511b7b69ebdf866088b9e765dc42543cd76d0a v7-0-212
-+0000000000000000000000000000000000000000 v7-0-212
-+c94bbf85eb160aa9eabe33b13b267c1446019eaa v7.0.213
-+c94bbf85eb160aa9eabe33b13b267c1446019eaa v7-0-213
-+0000000000000000000000000000000000000000 v7-0-213
-+c3ba2dcc4cf4b96ddd1e3df9beacd1e11abe7868 v7.0.214
-+c3ba2dcc4cf4b96ddd1e3df9beacd1e11abe7868 v7-0-214
-+0000000000000000000000000000000000000000 v7-0-214
-+96580558098272cca6f93085d79aa7164c7abf41 v7.0.215
-+96580558098272cca6f93085d79aa7164c7abf41 v7-0-215
-+0000000000000000000000000000000000000000 v7-0-215
-+9a3b65713280ebf8750989758b4b2d42f757ca9b v7.0.216
-+9a3b65713280ebf8750989758b4b2d42f757ca9b v7-0-216
-+0000000000000000000000000000000000000000 v7-0-216
-+f9366d458bd09b73aa46cb202c7c6329e608bf0e v7.0.217
-+f9366d458bd09b73aa46cb202c7c6329e608bf0e v7-0-217
-+0000000000000000000000000000000000000000 v7-0-217
-+8531f7ee366297c58506f9a3130f45c350ce1fe5 v7.0.218
-+8531f7ee366297c58506f9a3130f45c350ce1fe5 v7-0-218
-+0000000000000000000000000000000000000000 v7-0-218
-+23d23246742e7d301d09f0cb03533226b64043b4 v7.0.219
-+23d23246742e7d301d09f0cb03533226b64043b4 v7-0-219
-+0000000000000000000000000000000000000000 v7-0-219
-+c50ed526966abc52d825a36d5114bebc21f850b2 v7.0.220
-+c50ed526966abc52d825a36d5114bebc21f850b2 v7-0-220
-+0000000000000000000000000000000000000000 v7-0-220
-+4c8b90b7a94a123db784dea518f3c9a3bdfe85c4 v7.0.221
-+4c8b90b7a94a123db784dea518f3c9a3bdfe85c4 v7-0-221
-+0000000000000000000000000000000000000000 v7-0-221
-+83eda510dbc07b4fe4db5b5f324680f60c307fff v7.0.222
-+83eda510dbc07b4fe4db5b5f324680f60c307fff v7-0-222
-+0000000000000000000000000000000000000000 v7-0-222
-+537cb92935b690665a72f2b31dead8d9b322dcb1 v7.0.223
-+537cb92935b690665a72f2b31dead8d9b322dcb1 v7-0-223
-+0000000000000000000000000000000000000000 v7-0-223
-+5a1d8468d1fad7189c8c781149f034dbb4208b39 v7.0.224
-+5a1d8468d1fad7189c8c781149f034dbb4208b39 v7-0-224
-+0000000000000000000000000000000000000000 v7-0-224
-+2ec8266fa254f9f90fd302df275d2813ae08a8e6 v7.0.225
-+2ec8266fa254f9f90fd302df275d2813ae08a8e6 v7-0-225
-+0000000000000000000000000000000000000000 v7-0-225
-+f927ca2cedb40441abcd9cf5e18cbde2863761b4 v7.0.226
-+f927ca2cedb40441abcd9cf5e18cbde2863761b4 v7-0-226
-+0000000000000000000000000000000000000000 v7-0-226
-+5d5a41a95347bf4a1382babc697a1f940a83e43c v7.0.227
-+5d5a41a95347bf4a1382babc697a1f940a83e43c v7-0-227
-+0000000000000000000000000000000000000000 v7-0-227
-+50a93218720458be104f03ce1be00bcc8b898eb9 v7.0.228
-+50a93218720458be104f03ce1be00bcc8b898eb9 v7-0-228
-+0000000000000000000000000000000000000000 v7-0-228
-+95723058b8ff365843508cfa47a3bc2ecb1b0cf8 v7.0.229
-+95723058b8ff365843508cfa47a3bc2ecb1b0cf8 v7-0-229
-+0000000000000000000000000000000000000000 v7-0-229
-+d75027183cf4b44b2a92333e57b9bc3fe2b2f5dd v7.0.230
-+d75027183cf4b44b2a92333e57b9bc3fe2b2f5dd v7-0-230
-+0000000000000000000000000000000000000000 v7-0-230
-+33a2652c13268ca53bb9ce0cfb7232655864c373 v7.0.231
-+33a2652c13268ca53bb9ce0cfb7232655864c373 v7-0-231
-+0000000000000000000000000000000000000000 v7-0-231
-+6c4da3e24371945408401d6330a930d44cb5d716 v7.0.232
-+6c4da3e24371945408401d6330a930d44cb5d716 v7-0-232
-+0000000000000000000000000000000000000000 v7-0-232
-+2ced59eaf1e5c67060fe124902407a8bf77a1a78 v7.0.233
-+2ced59eaf1e5c67060fe124902407a8bf77a1a78 v7-0-233
-+0000000000000000000000000000000000000000 v7-0-233
-+b515624f6d7dc7597b0b01c5cb03076e4daf3347 v7.0.234
-+b515624f6d7dc7597b0b01c5cb03076e4daf3347 v7-0-234
-+0000000000000000000000000000000000000000 v7-0-234
-+c9b7b1e711d194070184c9c198fbe8126701d1ee v7.0.235
-+c9b7b1e711d194070184c9c198fbe8126701d1ee v7-0-235
-+0000000000000000000000000000000000000000 v7-0-235
-+b77f790d53f6b57604b1ad5113da4ab08b4ca918 v7.0.236
-+b77f790d53f6b57604b1ad5113da4ab08b4ca918 v7-0-236
-+0000000000000000000000000000000000000000 v7-0-236
-+53fd0a213cff86b7185c5391cef34c1265f8b8f5 v7.0.237
-+53fd0a213cff86b7185c5391cef34c1265f8b8f5 v7-0-237
-+0000000000000000000000000000000000000000 v7-0-237
-+56695f1182f01d75843d0433484c94c1eade71de v7.0.238
-+56695f1182f01d75843d0433484c94c1eade71de v7-0-238
-+0000000000000000000000000000000000000000 v7-0-238
-+1df41c98fc2e9a230ab9d05be84f4c91e4078619 v7.0.239
-+1df41c98fc2e9a230ab9d05be84f4c91e4078619 v7-0-239
-+0000000000000000000000000000000000000000 v7-0-239
-+b04bb35fcd4b7edeeb8e175955a2909a86dad118 v7.0.240
-+b04bb35fcd4b7edeeb8e175955a2909a86dad118 v7-0-240
-+0000000000000000000000000000000000000000 v7-0-240
-+11c004cc1a4df89b9246a96106db6c6f0260b7d8 v7.0.241
-+11c004cc1a4df89b9246a96106db6c6f0260b7d8 v7-0-241
-+0000000000000000000000000000000000000000 v7-0-241
-+e76a088056dd38e02a99daec0741aad6f32a24f8 v7.0.242
-+e76a088056dd38e02a99daec0741aad6f32a24f8 v7-0-242
-+0000000000000000000000000000000000000000 v7-0-242
-+a13e4b242735dd0b3285b7f36fccda195ba1d5f5 v7.0.243
-+a13e4b242735dd0b3285b7f36fccda195ba1d5f5 v7-0-243
-+0000000000000000000000000000000000000000 v7-0-243
-+d38420e2fafe99d58b915213b73f8d1b8c7848d5 v7.1a
-+d38420e2fafe99d58b915213b73f8d1b8c7848d5 v7-1a
-+0000000000000000000000000000000000000000 v7-1a
-+184d2020d8f12823a2f2cb96335a68ac1bda3270 v7.1a.001
-+184d2020d8f12823a2f2cb96335a68ac1bda3270 v7-1a-001
-+0000000000000000000000000000000000000000 v7-1a-001
-+5eb1ac6f92ad40da9bbb585f5ff8fe003e85122c v7.1b
-+5eb1ac6f92ad40da9bbb585f5ff8fe003e85122c v7-1b
-+0000000000000000000000000000000000000000 v7-1b
-+198a695ca8e7273641991bcf346085bbce70d740 v7.1b.001
-+198a695ca8e7273641991bcf346085bbce70d740 v7-1b-001
-+0000000000000000000000000000000000000000 v7-1b-001
-+cab25717c6a69a7d9ebd010153fd9be9529fb49a v7.1b.002
-+cab25717c6a69a7d9ebd010153fd9be9529fb49a v7-1b-002
-+0000000000000000000000000000000000000000 v7-1b-002
-+463e25d28b334622df784faea456a98ddbc0b5ce v7.1
-+463e25d28b334622df784faea456a98ddbc0b5ce v7-1
-+0000000000000000000000000000000000000000 v7-1
-+152e526245217fedd07f0480e08ea59b0075a8b0 v7.1.001
-+152e526245217fedd07f0480e08ea59b0075a8b0 v7-1-001
-+0000000000000000000000000000000000000000 v7-1-001
-+49b5a7f186aae9fdd9b633037e8da484c61c55bf v7.1.002
-+49b5a7f186aae9fdd9b633037e8da484c61c55bf v7-1-002
-+0000000000000000000000000000000000000000 v7-1-002
-+2a256978a64649b75d424eec6e703f99f7f28636 v7.1.003
-+2a256978a64649b75d424eec6e703f99f7f28636 v7-1-003
-+0000000000000000000000000000000000000000 v7-1-003
-+d2612392202f9b87c122b7233b0bbc67c9edc004 v7.1.004
-+d2612392202f9b87c122b7233b0bbc67c9edc004 v7-1-004
-+0000000000000000000000000000000000000000 v7-1-004
-+87a777aea8993a49e61394e7a84847e91b014090 v7.1.005
-+87a777aea8993a49e61394e7a84847e91b014090 v7-1-005
-+0000000000000000000000000000000000000000 v7-1-005
-+f12d38ee49de595d11efb50674bccfe0417c7063 v7.1.006
-+f12d38ee49de595d11efb50674bccfe0417c7063 v7-1-006
-+0000000000000000000000000000000000000000 v7-1-006
-+66e40876590bca973973b6aae208a14cb428c266 v7.1.007
-+66e40876590bca973973b6aae208a14cb428c266 v7-1-007
-+0000000000000000000000000000000000000000 v7-1-007
-+042fa969dab175d414d611425d8a61424bacf75f v7.1.008
-+042fa969dab175d414d611425d8a61424bacf75f v7-1-008
-+0000000000000000000000000000000000000000 v7-1-008
-+b090b216a832197c70f60ead52026a53ecb0cdd8 v7.1.009
-+b090b216a832197c70f60ead52026a53ecb0cdd8 v7-1-009
-+0000000000000000000000000000000000000000 v7-1-009
-+86079b930b3e8735933c9349e44184761bbf56b0 v7.1.010
-+86079b930b3e8735933c9349e44184761bbf56b0 v7-1-010
-+0000000000000000000000000000000000000000 v7-1-010
-+e2680bc6a18024d68ce8100e21d4d307dd647aec v7.1.011
-+e2680bc6a18024d68ce8100e21d4d307dd647aec v7-1-011
-+0000000000000000000000000000000000000000 v7-1-011
-+f4c7b5da017adf78554a240587384823e58ba80c v7.1.012
-+f4c7b5da017adf78554a240587384823e58ba80c v7-1-012
-+0000000000000000000000000000000000000000 v7-1-012
-+82add1e7c154fbbd5926df49fd4afe768e6007db v7.1.013
-+82add1e7c154fbbd5926df49fd4afe768e6007db v7-1-013
-+0000000000000000000000000000000000000000 v7-1-013
-+bacdeee78827acbae22a7626a93318ee1919c883 v7.1.014
-+bacdeee78827acbae22a7626a93318ee1919c883 v7-1-014
-+0000000000000000000000000000000000000000 v7-1-014
-+66ddf49935fb8979def275bcf7c56acdfac7ef6d v7.1.015
-+66ddf49935fb8979def275bcf7c56acdfac7ef6d v7-1-015
-+0000000000000000000000000000000000000000 v7-1-015
-+7281a86ae640e65e5eff6d6b565be20032f736b3 v7.1.016
-+7281a86ae640e65e5eff6d6b565be20032f736b3 v7-1-016
-+0000000000000000000000000000000000000000 v7-1-016
-+da0991871b02a5ba7bce7d3c1180d01d50d7646e v7.1.017
-+da0991871b02a5ba7bce7d3c1180d01d50d7646e v7-1-017
-+0000000000000000000000000000000000000000 v7-1-017
-+33792c36e3aadc7f313785705f39d7ea6e214319 v7.1.018
-+33792c36e3aadc7f313785705f39d7ea6e214319 v7-1-018
-+0000000000000000000000000000000000000000 v7-1-018
-+dc948c8dfd1550972011e38d59b9a8ade5a000c4 v7.1.019
-+dc948c8dfd1550972011e38d59b9a8ade5a000c4 v7-1-019
-+0000000000000000000000000000000000000000 v7-1-019
-+a5fd859f69f1b5c70de7d0439150f2c681d0d915 v7.1.020
-+a5fd859f69f1b5c70de7d0439150f2c681d0d915 v7-1-020
-+0000000000000000000000000000000000000000 v7-1-020
-+64dd70f176c92013bc7efd0f3c50083fe4ca0972 v7.1.021
-+64dd70f176c92013bc7efd0f3c50083fe4ca0972 v7-1-021
-+0000000000000000000000000000000000000000 v7-1-021
-+e70c0d863e0cb2b26f16acd17ead7ed267faef53 v7.1.022
-+e70c0d863e0cb2b26f16acd17ead7ed267faef53 v7-1-022
-+0000000000000000000000000000000000000000 v7-1-022
-+bb7a0b90100aae1f77748f6f38aec95520825c3e v7.1.023
-+bb7a0b90100aae1f77748f6f38aec95520825c3e v7-1-023
-+0000000000000000000000000000000000000000 v7-1-023
-+a33e606ceea66c946219da3899de9566fb0cad35 v7.1.024
-+a33e606ceea66c946219da3899de9566fb0cad35 v7-1-024
-+0000000000000000000000000000000000000000 v7-1-024
-+b686fb4898d1fd8579e5bf61f36c2a08fee85a20 v7.1.025
-+b686fb4898d1fd8579e5bf61f36c2a08fee85a20 v7-1-025
-+0000000000000000000000000000000000000000 v7-1-025
-+b4b1b5324380cad36827cc211a2f92fb165d9777 v7.1.026
-+b4b1b5324380cad36827cc211a2f92fb165d9777 v7-1-026
-+0000000000000000000000000000000000000000 v7-1-026
-+dbd226be80b18c494f4438045d34b65530dcc198 v7.1.027
-+dbd226be80b18c494f4438045d34b65530dcc198 v7-1-027
-+0000000000000000000000000000000000000000 v7-1-027
-+afad99b3612ca54f3668c232e8d3ef235d74c9a2 v7.1.028
-+afad99b3612ca54f3668c232e8d3ef235d74c9a2 v7-1-028
-+0000000000000000000000000000000000000000 v7-1-028
-+0868e4e53fb2e9f9bd469fae0323a1df43be476b v7.1.029
-+0868e4e53fb2e9f9bd469fae0323a1df43be476b v7-1-029
-+0000000000000000000000000000000000000000 v7-1-029
-+469c42f90fda78344dd4b33e7c0dd0860b777939 v7.1.030
-+469c42f90fda78344dd4b33e7c0dd0860b777939 v7-1-030
-+0000000000000000000000000000000000000000 v7-1-030
-+45bae37de0373ed58d6f4ed8721d594ae322782d v7.1.031
-+45bae37de0373ed58d6f4ed8721d594ae322782d v7-1-031
-+0000000000000000000000000000000000000000 v7-1-031
-+eb57516376d4b43889fe43594048f183af15c31e v7.1.032
-+eb57516376d4b43889fe43594048f183af15c31e v7-1-032
-+0000000000000000000000000000000000000000 v7-1-032
-+76c2b2dd25c9c6945489a1c636f7e375ef1f40d0 v7.1.033
-+76c2b2dd25c9c6945489a1c636f7e375ef1f40d0 v7-1-033
-+0000000000000000000000000000000000000000 v7-1-033
-+1f9e2c8e642a29d93b9c32062c785f4c38883e0c v7.1.034
-+1f9e2c8e642a29d93b9c32062c785f4c38883e0c v7-1-034
-+0000000000000000000000000000000000000000 v7-1-034
-+f3d7fa7dcf634b669a7d7859bcc39796300346e0 v7.1.035
-+f3d7fa7dcf634b669a7d7859bcc39796300346e0 v7-1-035
-+0000000000000000000000000000000000000000 v7-1-035
-+4ce0a7e4c6b3a305419590c746d2a11040fb2b92 v7.1.036
-+4ce0a7e4c6b3a305419590c746d2a11040fb2b92 v7-1-036
-+0000000000000000000000000000000000000000 v7-1-036
-+454d71a434176e2d1ce0c2a7d47bfe2583a5069c v7.1.037
-+454d71a434176e2d1ce0c2a7d47bfe2583a5069c v7-1-037
-+0000000000000000000000000000000000000000 v7-1-037
-+60d21d224d251c448ef76b1b9df087497c06adf4 v7.1.038
-+60d21d224d251c448ef76b1b9df087497c06adf4 v7-1-038
-+0000000000000000000000000000000000000000 v7-1-038
-+f26d0c74a329cceeed80a7985f5efb5662064283 v7.1.039
-+f26d0c74a329cceeed80a7985f5efb5662064283 v7-1-039
-+0000000000000000000000000000000000000000 v7-1-039
-+22886f3d882d231a528dcc012c23e54180c8248c v7.1.040
-+22886f3d882d231a528dcc012c23e54180c8248c v7-1-040
-+0000000000000000000000000000000000000000 v7-1-040
-+cd7eb2a18060734504ff974065d6a7adfc903b34 v7.1.041
-+cd7eb2a18060734504ff974065d6a7adfc903b34 v7-1-041
-+0000000000000000000000000000000000000000 v7-1-041
-+4c70a10ce2bb6d83a4cbf3e3baab19d1752f2230 v7.1.042
-+4c70a10ce2bb6d83a4cbf3e3baab19d1752f2230 v7-1-042
-+0000000000000000000000000000000000000000 v7-1-042
-+417c4d78a09c07162879dfb79e25e672e6e9218d v7.1.043
-+417c4d78a09c07162879dfb79e25e672e6e9218d v7-1-043
-+0000000000000000000000000000000000000000 v7-1-043
-+9fb5bb1ea79b5ba402e51051d79a3476ffce3c35 v7.1.044
-+9fb5bb1ea79b5ba402e51051d79a3476ffce3c35 v7-1-044
-+0000000000000000000000000000000000000000 v7-1-044
-+d51bf80e8fc9b1048c93bd26e308af7c250ef629 v7.1.045
-+d51bf80e8fc9b1048c93bd26e308af7c250ef629 v7-1-045
-+0000000000000000000000000000000000000000 v7-1-045
-+6d421b3c485b2da5a04529c6b71041031d41b80c v7.1.046
-+6d421b3c485b2da5a04529c6b71041031d41b80c v7-1-046
-+0000000000000000000000000000000000000000 v7-1-046
-+01762f635babb0fecb3a9f04549a54e86f67cf8b v7.1.047
-+01762f635babb0fecb3a9f04549a54e86f67cf8b v7-1-047
-+0000000000000000000000000000000000000000 v7-1-047
-+f3abb6aec8c83ada21d56b8be4ffc6be55ce39ba v7.1.048
-+f3abb6aec8c83ada21d56b8be4ffc6be55ce39ba v7-1-048
-+0000000000000000000000000000000000000000 v7-1-048
-+251307ebe1dbacd972e35e923f7360d12733f2b7 v7.1.049
-+251307ebe1dbacd972e35e923f7360d12733f2b7 v7-1-049
-+0000000000000000000000000000000000000000 v7-1-049
-+b8ebbfa519b990d6b892dcf943576761e714c2c3 v7.1.050
-+b8ebbfa519b990d6b892dcf943576761e714c2c3 v7-1-050
-+0000000000000000000000000000000000000000 v7-1-050
-+36275e20d997b91a357433debf8fbac0885768a0 v7.1.051
-+36275e20d997b91a357433debf8fbac0885768a0 v7-1-051
-+0000000000000000000000000000000000000000 v7-1-051
-+06e0f7482cef3412ecb4b0b62b65b1e7c4ed92b2 v7.1.052
-+06e0f7482cef3412ecb4b0b62b65b1e7c4ed92b2 v7-1-052
-+0000000000000000000000000000000000000000 v7-1-052
-+3bfd2e1e2609c8470c5b4f75184b66e5a4d8faef v7.1.053
-+3bfd2e1e2609c8470c5b4f75184b66e5a4d8faef v7-1-053
-+0000000000000000000000000000000000000000 v7-1-053
-+8e42199f51218e2a14a946ee50c1e8d8ef38205c v7.1.054
-+8e42199f51218e2a14a946ee50c1e8d8ef38205c v7-1-054
-+0000000000000000000000000000000000000000 v7-1-054
-+2ae2dd2591fae798e4212e9b2c47281eca0c8483 v7.1.055
-+2ae2dd2591fae798e4212e9b2c47281eca0c8483 v7-1-055
-+0000000000000000000000000000000000000000 v7-1-055
-+6974b167d75eabdf70005f666e3dd0e82e47be4e v7.1.056
-+6974b167d75eabdf70005f666e3dd0e82e47be4e v7-1-056
-+0000000000000000000000000000000000000000 v7-1-056
-+4dccbe792a5e00c40a6e5b4f9e74d20b5aed2c50 v7.1.057
-+4dccbe792a5e00c40a6e5b4f9e74d20b5aed2c50 v7-1-057
-+0000000000000000000000000000000000000000 v7-1-057
-+843bfffb04c739ec456e5c5f612c6d025f2a6188 v7.1.058
-+843bfffb04c739ec456e5c5f612c6d025f2a6188 v7-1-058
-+0000000000000000000000000000000000000000 v7-1-058
-+c38cdd201cec8e9a774b7256a5eadf2d7194aa0e v7.1.059
-+c38cdd201cec8e9a774b7256a5eadf2d7194aa0e v7-1-059
-+0000000000000000000000000000000000000000 v7-1-059
-+c649cc22da98e2eee72352917030fc6068883317 v7.1.060
-+c649cc22da98e2eee72352917030fc6068883317 v7-1-060
-+0000000000000000000000000000000000000000 v7-1-060
-+302a6aa7aca2ee9cf24958c2277a90fcfc01c939 v7.1.061
-+302a6aa7aca2ee9cf24958c2277a90fcfc01c939 v7-1-061
-+0000000000000000000000000000000000000000 v7-1-061
-+17a83c0532e83e9f4cd89f03dcbf206662d25b1f v7.1.062
-+17a83c0532e83e9f4cd89f03dcbf206662d25b1f v7-1-062
-+0000000000000000000000000000000000000000 v7-1-062
-+da1d62fe5379f77a2a165e40bf4bcad0466c60cb v7.1.063
-+da1d62fe5379f77a2a165e40bf4bcad0466c60cb v7-1-063
-+0000000000000000000000000000000000000000 v7-1-063
-+3d698caa5dfc7b11c8a6ada5f57e75c7a6a117dc v7.1.064
-+3d698caa5dfc7b11c8a6ada5f57e75c7a6a117dc v7-1-064
-+0000000000000000000000000000000000000000 v7-1-064
-+df6967461cef05aa96ff708863d380e9d15f3bb7 v7.1.065
-+df6967461cef05aa96ff708863d380e9d15f3bb7 v7-1-065
-+0000000000000000000000000000000000000000 v7-1-065
-+c544a3507e839f3ad4db6e1d7dd7474ed0167b96 v7.1.066
-+c544a3507e839f3ad4db6e1d7dd7474ed0167b96 v7-1-066
-+0000000000000000000000000000000000000000 v7-1-066
-+87401adbf5fcbc6fb8edf329290c445528266bc5 v7.1.067
-+87401adbf5fcbc6fb8edf329290c445528266bc5 v7-1-067
-+0000000000000000000000000000000000000000 v7-1-067
-+10a1b67c0885aabdac7c76a96169cd9e36414428 v7.1.068
-+10a1b67c0885aabdac7c76a96169cd9e36414428 v7-1-068
-+0000000000000000000000000000000000000000 v7-1-068
-+888c0645d64f3a844b22525387981f17317d8502 v7.1.069
-+888c0645d64f3a844b22525387981f17317d8502 v7-1-069
-+0000000000000000000000000000000000000000 v7-1-069
-+c87f38b71d27d9e420e5947d4e99eba9e3eb2e19 v7.1.070
-+c87f38b71d27d9e420e5947d4e99eba9e3eb2e19 v7-1-070
-+0000000000000000000000000000000000000000 v7-1-070
-+4dd75cfd946f31e81eaa4b03ec81ef141c562137 v7.1.071
-+4dd75cfd946f31e81eaa4b03ec81ef141c562137 v7-1-071
-+0000000000000000000000000000000000000000 v7-1-071
-+9656552c468d29773423dcd62a323aceee0b6c55 v7.1.072
-+9656552c468d29773423dcd62a323aceee0b6c55 v7-1-072
-+0000000000000000000000000000000000000000 v7-1-072
-+a66a49322b6bc2a82c6cc3e8092db7d502f64c4b v7.1.073
-+a66a49322b6bc2a82c6cc3e8092db7d502f64c4b v7-1-073
-+0000000000000000000000000000000000000000 v7-1-073
-+8d09c1eed8a57bb2df53fb1f1747137e5a3489f5 v7.1.074
-+8d09c1eed8a57bb2df53fb1f1747137e5a3489f5 v7-1-074
-+0000000000000000000000000000000000000000 v7-1-074
-+55e117ed68724567167ed25bfb5a320585f1bb5c v7.1.075
-+55e117ed68724567167ed25bfb5a320585f1bb5c v7-1-075
-+0000000000000000000000000000000000000000 v7-1-075
-+2f70b8f1f1e32dca34db07fedf9cbb56ff97007f v7.1.076
-+2f70b8f1f1e32dca34db07fedf9cbb56ff97007f v7-1-076
-+0000000000000000000000000000000000000000 v7-1-076
-+3328b87305efcc6a8db6923c31cbf78a05983eff v7.1.077
-+3328b87305efcc6a8db6923c31cbf78a05983eff v7-1-077
-+0000000000000000000000000000000000000000 v7-1-077
-+9947133ce85b86df83b86f476c09c0454c47a310 v7.1.078
-+9947133ce85b86df83b86f476c09c0454c47a310 v7-1-078
-+0000000000000000000000000000000000000000 v7-1-078
-+79a23c19108a8b1eb9d1b97d5844fabee6525e23 v7.1.079
-+79a23c19108a8b1eb9d1b97d5844fabee6525e23 v7-1-079
-+0000000000000000000000000000000000000000 v7-1-079
-+7e7da11555d27f62984297f3e1debc8242baf995 v7.1.080
-+7e7da11555d27f62984297f3e1debc8242baf995 v7-1-080
-+0000000000000000000000000000000000000000 v7-1-080
-+151a805b2ddc219d4a968154a43daefbb2e41fe1 v7.1.081
-+151a805b2ddc219d4a968154a43daefbb2e41fe1 v7-1-081
-+0000000000000000000000000000000000000000 v7-1-081
-+048f26eb43a348e49fc4f9deaca03779c2de595e v7.1.082
-+048f26eb43a348e49fc4f9deaca03779c2de595e v7-1-082
-+0000000000000000000000000000000000000000 v7-1-082
-+1d4c67f8470981d280aaf1d2a25877a00ec5d240 v7.1.084
-+1d4c67f8470981d280aaf1d2a25877a00ec5d240 v7-1-084
-+0000000000000000000000000000000000000000 v7-1-084
-+b4d92472f168c90d60359f6a592d6461686c2db9 v7.1.085
-+b4d92472f168c90d60359f6a592d6461686c2db9 v7-1-085
-+0000000000000000000000000000000000000000 v7-1-085
-+e8450dbf6f031f2727798a7d955e83dda7ba0288 v7.1.086
-+e8450dbf6f031f2727798a7d955e83dda7ba0288 v7-1-086
-+0000000000000000000000000000000000000000 v7-1-086
-+76a42a81f68505f7b99af53a919e3cc7895096b6 v7.1.087
-+76a42a81f68505f7b99af53a919e3cc7895096b6 v7-1-087
-+0000000000000000000000000000000000000000 v7-1-087
-+88c68e59d39cee12c580f1df72a5759e58574978 v7.1.088
-+88c68e59d39cee12c580f1df72a5759e58574978 v7-1-088
-+0000000000000000000000000000000000000000 v7-1-088
-+e1336150cfcf7e64f66563629accb1cc84fea036 v7.1.089
-+e1336150cfcf7e64f66563629accb1cc84fea036 v7-1-089
-+0000000000000000000000000000000000000000 v7-1-089
-+61b50044616bc626b27630b3c9f03322db0ec609 v7.1.090
-+61b50044616bc626b27630b3c9f03322db0ec609 v7-1-090
-+0000000000000000000000000000000000000000 v7-1-090
-+53b2bedccfdf5ab8cbff6c3fb1f6f83ac7112b85 v7.1.091
-+53b2bedccfdf5ab8cbff6c3fb1f6f83ac7112b85 v7-1-091
-+0000000000000000000000000000000000000000 v7-1-091
-+e2f5c1597829256cfd784681163c232bf907f1c9 v7.1.092
-+e2f5c1597829256cfd784681163c232bf907f1c9 v7-1-092
-+0000000000000000000000000000000000000000 v7-1-092
-+a4365075d05c40606c2ace3340e9484a6b045f32 v7.1.093
-+a4365075d05c40606c2ace3340e9484a6b045f32 v7-1-093
-+0000000000000000000000000000000000000000 v7-1-093
-+50f5ac5b90dedfc7f88a67d7a435014e07c298ca v7.1.094
-+50f5ac5b90dedfc7f88a67d7a435014e07c298ca v7-1-094
-+0000000000000000000000000000000000000000 v7-1-094
-+99a9e42e5688aeecaeaa4642d17be0ca54ab5945 v7.1.095
-+99a9e42e5688aeecaeaa4642d17be0ca54ab5945 v7-1-095
-+0000000000000000000000000000000000000000 v7-1-095
-+826f00fef9e338c7afebef68658716bb0aab62f4 v7.1.096
-+826f00fef9e338c7afebef68658716bb0aab62f4 v7-1-096
-+0000000000000000000000000000000000000000 v7-1-096
-+4238b697bfff46433c49d60cc20b43761ab3c128 v7.1.097
-+4238b697bfff46433c49d60cc20b43761ab3c128 v7-1-097
-+0000000000000000000000000000000000000000 v7-1-097
-+6fdbaf2bba0459270702479d6c4cd04f4f6bc034 v7.1.098
-+6fdbaf2bba0459270702479d6c4cd04f4f6bc034 v7-1-098
-+0000000000000000000000000000000000000000 v7-1-098
-+5ef53a1677ee9c831d7a18ee44d1041f182a82b2 v7.1.099
-+5ef53a1677ee9c831d7a18ee44d1041f182a82b2 v7-1-099
-+0000000000000000000000000000000000000000 v7-1-099
-+d0cf8c843186301d546870c2661cfa3e8526b3e4 v7.1.100
-+d0cf8c843186301d546870c2661cfa3e8526b3e4 v7-1-100
-+0000000000000000000000000000000000000000 v7-1-100
-+880ece6b24762edd52b414aa1f005478707a3179 v7.1.101
-+880ece6b24762edd52b414aa1f005478707a3179 v7-1-101
-+0000000000000000000000000000000000000000 v7-1-101
-+35f3b20de2dd2c821675c61a11f4b227d31e9cdd v7.1.102
-+35f3b20de2dd2c821675c61a11f4b227d31e9cdd v7-1-102
-+0000000000000000000000000000000000000000 v7-1-102
-+26cbd39f22513d82cc43d2b1badefcea8db1c546 v7.1.103
-+26cbd39f22513d82cc43d2b1badefcea8db1c546 v7-1-103
-+0000000000000000000000000000000000000000 v7-1-103
-+bdcfe793d49fa832470953794583b4bb74ab9fb6 v7.1.104
-+bdcfe793d49fa832470953794583b4bb74ab9fb6 v7-1-104
-+0000000000000000000000000000000000000000 v7-1-104
-+45898756e0598f357776ae5aa05d717a7017e0cc v7.1.105
-+45898756e0598f357776ae5aa05d717a7017e0cc v7-1-105
-+0000000000000000000000000000000000000000 v7-1-105
-+c17ba3fb433e7cddfdbf2244b777550970493b0a v7.1.106
-+c17ba3fb433e7cddfdbf2244b777550970493b0a v7-1-106
-+0000000000000000000000000000000000000000 v7-1-106
-+27782797c331b8800c12ad17c5d05adab5e92edb v7.1.107
-+27782797c331b8800c12ad17c5d05adab5e92edb v7-1-107
-+0000000000000000000000000000000000000000 v7-1-107
-+b4791bb4fbff451efa3ffdabd4e26a668eda2283 v7.1.108
-+b4791bb4fbff451efa3ffdabd4e26a668eda2283 v7-1-108
-+0000000000000000000000000000000000000000 v7-1-108
-+1002128c68dbe2f69466b1b2cb354b00eec2980b v7.1.109
-+1002128c68dbe2f69466b1b2cb354b00eec2980b v7-1-109
-+0000000000000000000000000000000000000000 v7-1-109
-+c845dcf7fafa91d8cb370f690c16748758b20332 v7.1.110
-+c845dcf7fafa91d8cb370f690c16748758b20332 v7-1-110
-+0000000000000000000000000000000000000000 v7-1-110
-+3e0f9984e98e8f020260ff015cc994ccc34059a9 v7.1.111
-+3e0f9984e98e8f020260ff015cc994ccc34059a9 v7-1-111
-+0000000000000000000000000000000000000000 v7-1-111
-+6df4e719ce4eb637d6db90febd0d1eb48bf8e96a v7.1.112
-+6df4e719ce4eb637d6db90febd0d1eb48bf8e96a v7-1-112
-+0000000000000000000000000000000000000000 v7-1-112
-+2ab007070fc86d20596dfbded70d0f986c084304 v7.1.113
-+2ab007070fc86d20596dfbded70d0f986c084304 v7-1-113
-+0000000000000000000000000000000000000000 v7-1-113
-+ecc637a844592d48cec38bd795a17ecf6e0253ec v7.1.114
-+ecc637a844592d48cec38bd795a17ecf6e0253ec v7-1-114
-+0000000000000000000000000000000000000000 v7-1-114
-+40f2a904bffbbe8fb600089d1b04f1115a2a4a71 v7.1.115
-+40f2a904bffbbe8fb600089d1b04f1115a2a4a71 v7-1-115
-+0000000000000000000000000000000000000000 v7-1-115
-+e351146e7974acd49f2e9aab749f31670b2c6044 v7.1.116
-+e351146e7974acd49f2e9aab749f31670b2c6044 v7-1-116
-+0000000000000000000000000000000000000000 v7-1-116
-+004eb98eb3c30714cb6a24ec3e810275080a8413 v7.1.117
-+004eb98eb3c30714cb6a24ec3e810275080a8413 v7-1-117
-+0000000000000000000000000000000000000000 v7-1-117
-+871231399cf547112a50a9f93497d40d01b66d51 v7.1.118
-+871231399cf547112a50a9f93497d40d01b66d51 v7-1-118
-+0000000000000000000000000000000000000000 v7-1-118
-+b00bc2bf23eb62a1883318c6565d3fe0d1b4e30e v7.1.119
-+b00bc2bf23eb62a1883318c6565d3fe0d1b4e30e v7-1-119
-+0000000000000000000000000000000000000000 v7-1-119
-+b63792dadc23ed5ff4e0e9e8c7acc24d9c61e779 v7.1.120
-+b63792dadc23ed5ff4e0e9e8c7acc24d9c61e779 v7-1-120
-+0000000000000000000000000000000000000000 v7-1-120
-+396a9b65abe6a8fd08a6c232b443d541717cad0e v7.1.121
-+396a9b65abe6a8fd08a6c232b443d541717cad0e v7-1-121
-+0000000000000000000000000000000000000000 v7-1-121
-+26b0b2f606d2953068951dca673d963b7c5cccb7 v7.1.122
-+26b0b2f606d2953068951dca673d963b7c5cccb7 v7-1-122
-+0000000000000000000000000000000000000000 v7-1-122
-+db83098657947521e0e797662c135516a4a300ea v7.1.123
-+db83098657947521e0e797662c135516a4a300ea v7-1-123
-+0000000000000000000000000000000000000000 v7-1-123
-+4ee809acd1ab9c2fadee72e0fae32de57040447b v7.1.124
-+4ee809acd1ab9c2fadee72e0fae32de57040447b v7-1-124
-+0000000000000000000000000000000000000000 v7-1-124
-+cdd82acd75b449784a574058387449096667e56f v7.1.125
-+cdd82acd75b449784a574058387449096667e56f v7-1-125
-+0000000000000000000000000000000000000000 v7-1-125
-+0e6b369b9760459289b84a9c2e07478c063cd386 v7.1.126
-+0e6b369b9760459289b84a9c2e07478c063cd386 v7-1-126
-+0000000000000000000000000000000000000000 v7-1-126
-+45ba31f9ba0cad526601d1d15d4e05180967133f v7.1.127
-+45ba31f9ba0cad526601d1d15d4e05180967133f v7-1-127
-+0000000000000000000000000000000000000000 v7-1-127
-+d4b1aca2e3a97415460ba21ec81eba2218cc0be1 v7.1.128
-+d4b1aca2e3a97415460ba21ec81eba2218cc0be1 v7-1-128
-+0000000000000000000000000000000000000000 v7-1-128
-+1f099ff4f6fb2b0731bb38e279d0c692ee05df8d v7.1.129
-+1f099ff4f6fb2b0731bb38e279d0c692ee05df8d v7-1-129
-+0000000000000000000000000000000000000000 v7-1-129
-+20b52d44daafbd65b01db735c4d5597ccb9e386d v7.1.130
-+20b52d44daafbd65b01db735c4d5597ccb9e386d v7-1-130
-+0000000000000000000000000000000000000000 v7-1-130
-+0a80dc6d78048478d4e7f0f99f573c947d5d95c0 v7.1.131
-+0a80dc6d78048478d4e7f0f99f573c947d5d95c0 v7-1-131
-+0000000000000000000000000000000000000000 v7-1-131
-+c0bb3c1dd44695b4eda074afd1a7394d2b7e4552 v7.1.132
-+c0bb3c1dd44695b4eda074afd1a7394d2b7e4552 v7-1-132
-+0000000000000000000000000000000000000000 v7-1-132
-+bac7c3fce15019af25562f5c19b099c55487a6e7 v7.1.133
-+bac7c3fce15019af25562f5c19b099c55487a6e7 v7-1-133
-+0000000000000000000000000000000000000000 v7-1-133
-+7e5284f58094dd557b1502e1536c78846a59049c v7.1.134
-+7e5284f58094dd557b1502e1536c78846a59049c v7-1-134
-+0000000000000000000000000000000000000000 v7-1-134
-+b63fe7400eb30f9c7b98199a21ed0bdc583aef62 v7.1.135
-+b63fe7400eb30f9c7b98199a21ed0bdc583aef62 v7-1-135
-+0000000000000000000000000000000000000000 v7-1-135
-+8ac6392acb0a87a779340f949e280bafcc49f55b v7.1.136
-+8ac6392acb0a87a779340f949e280bafcc49f55b v7-1-136
-+0000000000000000000000000000000000000000 v7-1-136
-+c82bb7ade452d18a121a6b0b8ff654dfad30532a v7.1.137
-+c82bb7ade452d18a121a6b0b8ff654dfad30532a v7-1-137
-+0000000000000000000000000000000000000000 v7-1-137
-+01a0da54773eb2af0215762629db5c6eed01ba06 v7.1.138
-+01a0da54773eb2af0215762629db5c6eed01ba06 v7-1-138
-+0000000000000000000000000000000000000000 v7-1-138
-+9dbb57025f2542dad344102c571c06da6b840b34 v7.1.139
-+9dbb57025f2542dad344102c571c06da6b840b34 v7-1-139
-+0000000000000000000000000000000000000000 v7-1-139
-+15154710ed57eab29f7e4b848eafe63ea2dfdf85 v7.1.140
-+15154710ed57eab29f7e4b848eafe63ea2dfdf85 v7-1-140
-+0000000000000000000000000000000000000000 v7-1-140
-+c44058ba78bc108e98fc15a14756716c3d3241fb v7.1.141
-+c44058ba78bc108e98fc15a14756716c3d3241fb v7-1-141
-+0000000000000000000000000000000000000000 v7-1-141
-+0e5eb96dc18ce7986eadf32bb700e503da52ae47 v7.1.142
-+0e5eb96dc18ce7986eadf32bb700e503da52ae47 v7-1-142
-+0000000000000000000000000000000000000000 v7-1-142
-+912b18745defca4b03d5738fc7ae6c76d701f2f7 v7.1.143
-+912b18745defca4b03d5738fc7ae6c76d701f2f7 v7-1-143
-+0000000000000000000000000000000000000000 v7-1-143
-+3372616fe1f1def653875bedaa8c059c399197ac v7.1.144
-+3372616fe1f1def653875bedaa8c059c399197ac v7-1-144
-+0000000000000000000000000000000000000000 v7-1-144
-+342cf2a9f5cce4f70e6a974253b20c8e309de7ef v7.1.145
-+342cf2a9f5cce4f70e6a974253b20c8e309de7ef v7-1-145
-+0000000000000000000000000000000000000000 v7-1-145
-+d065616e083680035f38a54409e857ebc2202db3 v7.1.146
-+d065616e083680035f38a54409e857ebc2202db3 v7-1-146
-+0000000000000000000000000000000000000000 v7-1-146
-+bca50c9e1374c176a63f9baf0ed7fcb34ea16967 v7.1.147
-+bca50c9e1374c176a63f9baf0ed7fcb34ea16967 v7-1-147
-+0000000000000000000000000000000000000000 v7-1-147
-+9b7d8fd5dc68074119d5a609210fc1ba924e9d7a v7.1.148
-+9b7d8fd5dc68074119d5a609210fc1ba924e9d7a v7-1-148
-+0000000000000000000000000000000000000000 v7-1-148
-+40aa7ae37901ce256da18bcc84dc5ee21f83829a v7.1.149
-+40aa7ae37901ce256da18bcc84dc5ee21f83829a v7-1-149
-+0000000000000000000000000000000000000000 v7-1-149
-+2cdccc96d730501ce4e509e7efe4f8fd3f2b2e29 v7.1.150
-+2cdccc96d730501ce4e509e7efe4f8fd3f2b2e29 v7-1-150
-+0000000000000000000000000000000000000000 v7-1-150
-+77310929a1f94745e3d49f0cf1a6908785d3cfb0 v7.1.151
-+77310929a1f94745e3d49f0cf1a6908785d3cfb0 v7-1-151
-+0000000000000000000000000000000000000000 v7-1-151
-+8b2e9257cc116bf30b755aeb37a742ac83f5da42 v7.1.152
-+8b2e9257cc116bf30b755aeb37a742ac83f5da42 v7-1-152
-+0000000000000000000000000000000000000000 v7-1-152
-+c7654c4db8fd57c397bdfd3b3142632a4e761f32 v7.1.153
-+c7654c4db8fd57c397bdfd3b3142632a4e761f32 v7-1-153
-+0000000000000000000000000000000000000000 v7-1-153
-+a5b3a7fb6a5a0f1857b8d0eec380aa7a0f780729 v7.1.154
-+a5b3a7fb6a5a0f1857b8d0eec380aa7a0f780729 v7-1-154
-+0000000000000000000000000000000000000000 v7-1-154
-+93ffa40b532038ad22824047b15c6edec3b6af5a v7.1.155
-+93ffa40b532038ad22824047b15c6edec3b6af5a v7-1-155
-+0000000000000000000000000000000000000000 v7-1-155
-+21b11491a33fee3cd77dcfcc2448382f060543f2 v7.1.156
-+21b11491a33fee3cd77dcfcc2448382f060543f2 v7-1-156
-+0000000000000000000000000000000000000000 v7-1-156
-+bce7c73fd56da29730fff999a1fa4b0edea3285c v7.1.157
-+bce7c73fd56da29730fff999a1fa4b0edea3285c v7-1-157
-+0000000000000000000000000000000000000000 v7-1-157
-+69bcc0c891d706d3383f013e9e5f8876b6c76d4f v7.1.158
-+69bcc0c891d706d3383f013e9e5f8876b6c76d4f v7-1-158
-+0000000000000000000000000000000000000000 v7-1-158
-+215d6b2a1816a5eaf5f5d2cb7cb1b22d24adbdab v7.1.159
-+215d6b2a1816a5eaf5f5d2cb7cb1b22d24adbdab v7-1-159
-+0000000000000000000000000000000000000000 v7-1-159
-+54a6b47d473e64d7ae5212f00b8b125c721d2c41 v7.1.160
-+54a6b47d473e64d7ae5212f00b8b125c721d2c41 v7-1-160
-+0000000000000000000000000000000000000000 v7-1-160
-+f0b3b9ac2147350b1d1fd762cfda0b3073b0bca3 v7.1.161
-+f0b3b9ac2147350b1d1fd762cfda0b3073b0bca3 v7-1-161
-+0000000000000000000000000000000000000000 v7-1-161
-+dac5006b4443f99681d2068d0af065bec10d7a99 v7.1.162
-+dac5006b4443f99681d2068d0af065bec10d7a99 v7-1-162
-+0000000000000000000000000000000000000000 v7-1-162
-+bd94e22dd3db36f07fd31b2e282f25ccc7335f58 v7.1.163
-+bd94e22dd3db36f07fd31b2e282f25ccc7335f58 v7-1-163
-+0000000000000000000000000000000000000000 v7-1-163
-+799c1db62b42a7c9d504c45ed313910c2e3d169b v7.1.164
-+799c1db62b42a7c9d504c45ed313910c2e3d169b v7-1-164
-+0000000000000000000000000000000000000000 v7-1-164
-+1d6d99daf4dcba733e5517045f70e53c185aa895 v7.1.165
-+1d6d99daf4dcba733e5517045f70e53c185aa895 v7-1-165
-+0000000000000000000000000000000000000000 v7-1-165
-+71bd485d8fa572ac15207c5c1059b2ad0ae685fc v7.1.166
-+71bd485d8fa572ac15207c5c1059b2ad0ae685fc v7-1-166
-+0000000000000000000000000000000000000000 v7-1-166
-+1bc46149d9195d9134d526ef524242ede65c2457 v7.1.167
-+1bc46149d9195d9134d526ef524242ede65c2457 v7-1-167
-+0000000000000000000000000000000000000000 v7-1-167
-+159d87361e4b0d99c3863b3c82b7121a474cdf1f v7.1.168
-+159d87361e4b0d99c3863b3c82b7121a474cdf1f v7-1-168
-+0000000000000000000000000000000000000000 v7-1-168
-+0713c530729ba6d2bdc9fdb4fd400f46b16c37be v7.1.169
-+0713c530729ba6d2bdc9fdb4fd400f46b16c37be v7-1-169
-+0000000000000000000000000000000000000000 v7-1-169
-+ca501ab2fdb3a4477a6b8e469c1a4d8f1859d92a v7.1.170
-+ca501ab2fdb3a4477a6b8e469c1a4d8f1859d92a v7-1-170
-+0000000000000000000000000000000000000000 v7-1-170
-+a73a117542b8b5ec22eb3c61e45ad888d3d76b51 v7.1.171
-+a73a117542b8b5ec22eb3c61e45ad888d3d76b51 v7-1-171
-+0000000000000000000000000000000000000000 v7-1-171
-+9be44c669f4c67406132ede84d1d2951eac7d63c v7.1.172
-+9be44c669f4c67406132ede84d1d2951eac7d63c v7-1-172
-+0000000000000000000000000000000000000000 v7-1-172
-+8a6c67218fccfc536fdf829075e99549fb8247dd v7.1.173
-+8a6c67218fccfc536fdf829075e99549fb8247dd v7-1-173
-+0000000000000000000000000000000000000000 v7-1-173
-+73995e7c06e668b3eafc366b3c959d32f6bc00e7 v7.1.174
-+73995e7c06e668b3eafc366b3c959d32f6bc00e7 v7-1-174
-+0000000000000000000000000000000000000000 v7-1-174
-+b0dabd584b8f89ac32af9758c221e948016e2b0e v7.1.175
-+b0dabd584b8f89ac32af9758c221e948016e2b0e v7-1-175
-+0000000000000000000000000000000000000000 v7-1-175
-+76406c9cbbaa1ab6a8f6ca7f079c3ba8cf06e2ca v7.1.176
-+76406c9cbbaa1ab6a8f6ca7f079c3ba8cf06e2ca v7-1-176
-+0000000000000000000000000000000000000000 v7-1-176
-+ceaf71b15d813665b3b02036a619bc967db90d8f v7.1.177
-+ceaf71b15d813665b3b02036a619bc967db90d8f v7-1-177
-+0000000000000000000000000000000000000000 v7-1-177
-+e6a8d55a1626baa2e38837b0e7a4a6bc65783623 v7.1.178
-+e6a8d55a1626baa2e38837b0e7a4a6bc65783623 v7-1-178
-+0000000000000000000000000000000000000000 v7-1-178
-+ee41e031dfe14ebe50c289158213f05eca869bb1 v7.1.179
-+ee41e031dfe14ebe50c289158213f05eca869bb1 v7-1-179
-+0000000000000000000000000000000000000000 v7-1-179
-+0691866e6cc92996f4fbc881e134248571ae7c82 v7.1.180
-+0691866e6cc92996f4fbc881e134248571ae7c82 v7-1-180
-+0000000000000000000000000000000000000000 v7-1-180
-+e641c7a27c470de82019d313a158a9894e0befc1 v7.1.181
-+e641c7a27c470de82019d313a158a9894e0befc1 v7-1-181
-+0000000000000000000000000000000000000000 v7-1-181
-+198ea7a9c633089ef2638513d05611a9d1b6e39c v7.1.182
-+198ea7a9c633089ef2638513d05611a9d1b6e39c v7-1-182
-+0000000000000000000000000000000000000000 v7-1-182
-+200b706675a56daad05f8b0d60991825c45b6e2d v7.1.183
-+200b706675a56daad05f8b0d60991825c45b6e2d v7-1-183
-+0000000000000000000000000000000000000000 v7-1-183
-+88c0c6c9eadab09b029312433f246f65e216a1f0 v7.1.184
-+88c0c6c9eadab09b029312433f246f65e216a1f0 v7-1-184
-+0000000000000000000000000000000000000000 v7-1-184
-+48b22e2eb1ed7782c4dfb90051b64d6614fc6d3b v7.1.185
-+48b22e2eb1ed7782c4dfb90051b64d6614fc6d3b v7-1-185
-+0000000000000000000000000000000000000000 v7-1-185
-+e980e93d2ac2c7838acfd45fbf2de06939c929bf v7.1.186
-+e980e93d2ac2c7838acfd45fbf2de06939c929bf v7-1-186
-+0000000000000000000000000000000000000000 v7-1-186
-+32f48534fa0fa9b8e6833850fcbd77cd002ce8e0 v7.1.187
-+32f48534fa0fa9b8e6833850fcbd77cd002ce8e0 v7-1-187
-+0000000000000000000000000000000000000000 v7-1-187
-+5ba8e25f7fc159a684a965ea9e6626f62b76997c v7.1.188
-+5ba8e25f7fc159a684a965ea9e6626f62b76997c v7-1-188
-+0000000000000000000000000000000000000000 v7-1-188
-+276244befa5b2a34893ba581818df14cd7e4504e v7.1.189
-+276244befa5b2a34893ba581818df14cd7e4504e v7-1-189
-+0000000000000000000000000000000000000000 v7-1-189
-+c87ce0b2ee2a14d3daf3902bdd4163a002ec7a22 v7.1.190
-+c87ce0b2ee2a14d3daf3902bdd4163a002ec7a22 v7-1-190
-+0000000000000000000000000000000000000000 v7-1-190
-+ea1a2950ed16f441f66ba319615d47f1ac67402c v7.1.191
-+ea1a2950ed16f441f66ba319615d47f1ac67402c v7-1-191
-+0000000000000000000000000000000000000000 v7-1-191
-+2951f28a9bd3b08c5be9bc9b3745f062b95635b8 v7.1.192
-+2951f28a9bd3b08c5be9bc9b3745f062b95635b8 v7-1-192
-+0000000000000000000000000000000000000000 v7-1-192
-+fa07532e69c6eec9a6860ef1362f1d8187b8244a v7.1.193
-+fa07532e69c6eec9a6860ef1362f1d8187b8244a v7-1-193
-+0000000000000000000000000000000000000000 v7-1-193
-+ae7e29b64923da886325215a1a5b20bd60e4cbc0 v7.1.194
-+ae7e29b64923da886325215a1a5b20bd60e4cbc0 v7-1-194
-+0000000000000000000000000000000000000000 v7-1-194
-+801d5544828215bf644cbc6ababfc66beec6cb2d v7.1.195
-+801d5544828215bf644cbc6ababfc66beec6cb2d v7-1-195
-+0000000000000000000000000000000000000000 v7-1-195
-+0c61c201ba76d7235913010395e065991ac059b9 v7.1.196
-+0c61c201ba76d7235913010395e065991ac059b9 v7-1-196
-+0000000000000000000000000000000000000000 v7-1-196
-+b0f8f28a67c23c9e9b6b8087b373d6fb2add726a v7.1.197
-+b0f8f28a67c23c9e9b6b8087b373d6fb2add726a v7-1-197
-+0000000000000000000000000000000000000000 v7-1-197
-+05b48b16b627b63ee0f6dda7d7f07704c3d2fe64 v7.1.198
-+05b48b16b627b63ee0f6dda7d7f07704c3d2fe64 v7-1-198
-+0000000000000000000000000000000000000000 v7-1-198
-+fd68db1a72b5f05cc5e586ffe89a10ec6930005d v7.1.199
-+fd68db1a72b5f05cc5e586ffe89a10ec6930005d v7-1-199
-+0000000000000000000000000000000000000000 v7-1-199
-+6d95d8976b00540c053d11fff36e20556d125152 v7.1.200
-+6d95d8976b00540c053d11fff36e20556d125152 v7-1-200
-+0000000000000000000000000000000000000000 v7-1-200
-+1f93fbcb4e0cf1dcd8682242f40aa5f2906c42ac v7.1.201
-+1f93fbcb4e0cf1dcd8682242f40aa5f2906c42ac v7-1-201
-+0000000000000000000000000000000000000000 v7-1-201
-+28558ab31051fc1870ac690c0b576ca9365021f5 v7.1.202
-+28558ab31051fc1870ac690c0b576ca9365021f5 v7-1-202
-+0000000000000000000000000000000000000000 v7-1-202
-+205a26fab11655d086ce185525193d16f37d60b5 v7.1.203
-+205a26fab11655d086ce185525193d16f37d60b5 v7-1-203
-+0000000000000000000000000000000000000000 v7-1-203
-+62716fd61fe94fb9e7f39294dfa9dba4aa06fbf8 v7.1.204
-+62716fd61fe94fb9e7f39294dfa9dba4aa06fbf8 v7-1-204
-+0000000000000000000000000000000000000000 v7-1-204
-+0f3f3090491faea043fa144780d1287e011390ac v7.1.205
-+0f3f3090491faea043fa144780d1287e011390ac v7-1-205
-+0000000000000000000000000000000000000000 v7-1-205
-+a135270b75498b76b5bacbd1e381059283c5e383 v7.1.206
-+a135270b75498b76b5bacbd1e381059283c5e383 v7-1-206
-+0000000000000000000000000000000000000000 v7-1-206
-+3b226f4693dc8dd1fb8886221335c39a64bb1fa9 v7.1.207
-+3b226f4693dc8dd1fb8886221335c39a64bb1fa9 v7-1-207
-+0000000000000000000000000000000000000000 v7-1-207
-+3c17132458a1538d3f1d6ab00544df8069bd983d v7.1.208
-+3c17132458a1538d3f1d6ab00544df8069bd983d v7-1-208
-+0000000000000000000000000000000000000000 v7-1-208
-+58a14bafc1f08b9712732a26a44c2a93e34e6ae2 v7.1.209
-+58a14bafc1f08b9712732a26a44c2a93e34e6ae2 v7-1-209
-+0000000000000000000000000000000000000000 v7-1-209
-+04265ffbda1f9b14729bc5d85069ff0711ce3744 v7.1.210
-+04265ffbda1f9b14729bc5d85069ff0711ce3744 v7-1-210
-+0000000000000000000000000000000000000000 v7-1-210
-+29c09fa57168acd665a85ed5a210b48b60d0b5e2 v7.1.211
-+29c09fa57168acd665a85ed5a210b48b60d0b5e2 v7-1-211
-+0000000000000000000000000000000000000000 v7-1-211
-+f14f7aab518707c29a8ffb75a4e8217de58dda91 v7.1.212
-+f14f7aab518707c29a8ffb75a4e8217de58dda91 v7-1-212
-+0000000000000000000000000000000000000000 v7-1-212
-+4845822f6a6c21860e0a1b4627996d745d455da2 v7.1.213
-+4845822f6a6c21860e0a1b4627996d745d455da2 v7-1-213
-+0000000000000000000000000000000000000000 v7-1-213
-+75c88515e0db5fd6f88a05634d9abd22795aacbd v7.1.214
-+75c88515e0db5fd6f88a05634d9abd22795aacbd v7-1-214
-+0000000000000000000000000000000000000000 v7-1-214
-+ea9f418ed072f45fc1cb04e455379e3db1c0f182 v7.1.215
-+ea9f418ed072f45fc1cb04e455379e3db1c0f182 v7-1-215
-+0000000000000000000000000000000000000000 v7-1-215
-+cb6487d683f2260fc0b47b5e95f78a297360b1fa v7.1.216
-+cb6487d683f2260fc0b47b5e95f78a297360b1fa v7-1-216
-+0000000000000000000000000000000000000000 v7-1-216
-+717e759932cb94af9ee8dc9e93f33b67f292e8c1 v7.1.217
-+717e759932cb94af9ee8dc9e93f33b67f292e8c1 v7-1-217
-+0000000000000000000000000000000000000000 v7-1-217
-+995536cad50e5c08be60c2d82c7b32a63db1e434 v7.1.218
-+995536cad50e5c08be60c2d82c7b32a63db1e434 v7-1-218
-+0000000000000000000000000000000000000000 v7-1-218
-+1b55bbf5c58077e54b83307bbe715e131c57b750 v7.1.219
-+1b55bbf5c58077e54b83307bbe715e131c57b750 v7-1-219
-+0000000000000000000000000000000000000000 v7-1-219
-+184a6091124e80e1c9f66ed0908deab552ca369c v7.1.220
-+184a6091124e80e1c9f66ed0908deab552ca369c v7-1-220
-+0000000000000000000000000000000000000000 v7-1-220
-+64ed4359d9570e345dc109b51138c36ac8769614 v7.1.221
-+64ed4359d9570e345dc109b51138c36ac8769614 v7-1-221
-+0000000000000000000000000000000000000000 v7-1-221
-+a6776e2c9f014491c7476c3a12b2b7f108e1b6f2 v7.1.222
-+a6776e2c9f014491c7476c3a12b2b7f108e1b6f2 v7-1-222
-+0000000000000000000000000000000000000000 v7-1-222
-+c89903e16772bebee28ec935f7459c8c83bdf05e v7.1.223
-+c89903e16772bebee28ec935f7459c8c83bdf05e v7-1-223
-+0000000000000000000000000000000000000000 v7-1-223
-+79bba9e6af2b6588349ac2b3e9fb722d6ecbdc85 v7.1.224
-+79bba9e6af2b6588349ac2b3e9fb722d6ecbdc85 v7-1-224
-+0000000000000000000000000000000000000000 v7-1-224
-+56fb4ab9f62f19b9812d483aa76f8b53104db26e v7.1.225
-+56fb4ab9f62f19b9812d483aa76f8b53104db26e v7-1-225
-+0000000000000000000000000000000000000000 v7-1-225
-+9c970d8681f46de0b13ff16d67c2327a19f33626 v7.1.226
-+9c970d8681f46de0b13ff16d67c2327a19f33626 v7-1-226
-+0000000000000000000000000000000000000000 v7-1-226
-+aa7c51f81f46cc5379386ac622a5ba44aae1c4dc v7.1.227
-+aa7c51f81f46cc5379386ac622a5ba44aae1c4dc v7-1-227
-+0000000000000000000000000000000000000000 v7-1-227
-+61709607f5e26dc1d4cf420a25292ccc857d3575 v7.1.228
-+61709607f5e26dc1d4cf420a25292ccc857d3575 v7-1-228
-+0000000000000000000000000000000000000000 v7-1-228
-+8a22a90c964a168cf3d93f5ff8d5c531a4327ea6 v7.1.229
-+8a22a90c964a168cf3d93f5ff8d5c531a4327ea6 v7-1-229
-+0000000000000000000000000000000000000000 v7-1-229
-+8d8dc7e07999acbfd89d0b646d72fab69e06bef0 v7.1.230
-+8d8dc7e07999acbfd89d0b646d72fab69e06bef0 v7-1-230
-+0000000000000000000000000000000000000000 v7-1-230
-+ee9d2d24ea9bd0a7d500f1c37cbea802d8d1d88c v7.1.231
-+ee9d2d24ea9bd0a7d500f1c37cbea802d8d1d88c v7-1-231
-+0000000000000000000000000000000000000000 v7-1-231
-+066778e39c2ae6bbf23708d98e1a7a7e53a9a6d0 v7.1.232
-+066778e39c2ae6bbf23708d98e1a7a7e53a9a6d0 v7-1-232
-+0000000000000000000000000000000000000000 v7-1-232
-+75ab683fdb50e83cb9037454f5dd8d602e08e4c1 v7.1.233
-+75ab683fdb50e83cb9037454f5dd8d602e08e4c1 v7-1-233
-+0000000000000000000000000000000000000000 v7-1-233
-+17c88d44ace9bc9e76485811ffa459b5c15a6bb7 v7.1.234
-+17c88d44ace9bc9e76485811ffa459b5c15a6bb7 v7-1-234
-+0000000000000000000000000000000000000000 v7-1-234
-+cd6175cc27d9c8b4d4f4dadc7c38f6c490f3fa62 v7.1.235
-+cd6175cc27d9c8b4d4f4dadc7c38f6c490f3fa62 v7-1-235
-+0000000000000000000000000000000000000000 v7-1-235
-+cc4fe241baa3596ae9cd27ce65ad25077bfb2e71 v7.1.236
-+cc4fe241baa3596ae9cd27ce65ad25077bfb2e71 v7-1-236
-+0000000000000000000000000000000000000000 v7-1-236
-+710b52d02c4a0649d5b20c38e3394a2e248be9f5 v7.1.237
-+710b52d02c4a0649d5b20c38e3394a2e248be9f5 v7-1-237
-+0000000000000000000000000000000000000000 v7-1-237
-+dfcff6590aba6d93a69b414759b164c255fda08f v7.1.238
-+dfcff6590aba6d93a69b414759b164c255fda08f v7-1-238
-+0000000000000000000000000000000000000000 v7-1-238
-+50e0337c25cae29dd3e63b333d4bfb68cc9b3740 v7.1.239
-+50e0337c25cae29dd3e63b333d4bfb68cc9b3740 v7-1-239
-+0000000000000000000000000000000000000000 v7-1-239
-+76985a406456362dbdb4e7e4bef67656b84de965 v7.1.240
-+76985a406456362dbdb4e7e4bef67656b84de965 v7-1-240
-+0000000000000000000000000000000000000000 v7-1-240
-+f79bb032002565143e3392cca0540216e7f93e28 v7.1.241
-+f79bb032002565143e3392cca0540216e7f93e28 v7-1-241
-+0000000000000000000000000000000000000000 v7-1-241
-+03ec0f2b9a403b1cbc494eac6c038076ece0b37c v7.1.242
-+03ec0f2b9a403b1cbc494eac6c038076ece0b37c v7-1-242
-+0000000000000000000000000000000000000000 v7-1-242
-+e212d1a40ca9638a4b306013d54417dfcbe9d8ab v7.1.243
-+e212d1a40ca9638a4b306013d54417dfcbe9d8ab v7-1-243
-+0000000000000000000000000000000000000000 v7-1-243
-+4353593fc2c07753d40f71998688985cf96689d3 v7.1.244
-+4353593fc2c07753d40f71998688985cf96689d3 v7-1-244
-+0000000000000000000000000000000000000000 v7-1-244
-+f0d6b2bb1093eb12925cea635cd58de0594c422a v7.1.245
-+f0d6b2bb1093eb12925cea635cd58de0594c422a v7-1-245
-+0000000000000000000000000000000000000000 v7-1-245
-+2df7e2d753061b54b9120ae4b34d4bf050cf17f5 v7.1.246
-+2df7e2d753061b54b9120ae4b34d4bf050cf17f5 v7-1-246
-+0000000000000000000000000000000000000000 v7-1-246
-+87b9f21264a79be4ecfd14f69da0577f9d41f260 v7.1.247
-+87b9f21264a79be4ecfd14f69da0577f9d41f260 v7-1-247
-+0000000000000000000000000000000000000000 v7-1-247
-+8abc0abf8cbd09abaab555fbbaedbbc231d42b41 v7.1.248
-+8abc0abf8cbd09abaab555fbbaedbbc231d42b41 v7-1-248
-+0000000000000000000000000000000000000000 v7-1-248
-+bdfbf8ef447a4fabef09ee9d28eedcf0e6b99e57 v7.1.249
-+bdfbf8ef447a4fabef09ee9d28eedcf0e6b99e57 v7-1-249
-+0000000000000000000000000000000000000000 v7-1-249
-+eb0504d00480ca6a7758bfa35d64a09b3d389fca v7.1.250
-+eb0504d00480ca6a7758bfa35d64a09b3d389fca v7-1-250
-+0000000000000000000000000000000000000000 v7-1-250
-+24b7b3cc4eec4387713a615519489fa5a34b253d v7.1.251
-+24b7b3cc4eec4387713a615519489fa5a34b253d v7-1-251
-+0000000000000000000000000000000000000000 v7-1-251
-+ff77f541d69df4e538f7db4879eb194378c04458 v7.1.252
-+ff77f541d69df4e538f7db4879eb194378c04458 v7-1-252
-+0000000000000000000000000000000000000000 v7-1-252
-+2750661e93d556868d97f49fae32a1f470bca107 v7.1.253
-+2750661e93d556868d97f49fae32a1f470bca107 v7-1-253
-+0000000000000000000000000000000000000000 v7-1-253
-+b62965091b8d258aaa26871ccf80ff9b4037168e v7.1.254
-+b62965091b8d258aaa26871ccf80ff9b4037168e v7-1-254
-+0000000000000000000000000000000000000000 v7-1-254
-+ca5b52e99385825f0083c4b122ebfb50c2653039 v7.1.255
-+ca5b52e99385825f0083c4b122ebfb50c2653039 v7-1-255
-+0000000000000000000000000000000000000000 v7-1-255
-+0d0bf7598dcb63fdb5be9300f407e043102ab895 v7.1.256
-+0d0bf7598dcb63fdb5be9300f407e043102ab895 v7-1-256
-+0000000000000000000000000000000000000000 v7-1-256
-+12f9cd68b9c3aaf3659d9219551a5822cf798857 v7.1.257
-+12f9cd68b9c3aaf3659d9219551a5822cf798857 v7-1-257
-+0000000000000000000000000000000000000000 v7-1-257
-+fc42d9cc7ad054a21ac8bab2584732ebb191e5a6 v7.1.258
-+fc42d9cc7ad054a21ac8bab2584732ebb191e5a6 v7-1-258
-+0000000000000000000000000000000000000000 v7-1-258
-+cbe70f2e756d80015f6f0057e13a882ee7567276 v7.1.259
-+cbe70f2e756d80015f6f0057e13a882ee7567276 v7-1-259
-+0000000000000000000000000000000000000000 v7-1-259
-+75f5889a5d8e8272fd17a104ef148776f9133aa8 v7.1.260
-+75f5889a5d8e8272fd17a104ef148776f9133aa8 v7-1-260
-+0000000000000000000000000000000000000000 v7-1-260
-+e72e30c69d582a55cf3c4836aa274a006a457fe3 v7.1.261
-+e72e30c69d582a55cf3c4836aa274a006a457fe3 v7-1-261
-+0000000000000000000000000000000000000000 v7-1-261
-+8d74df00f7daa4e79bf7fc56164369781408e1be v7.1.262
-+8d74df00f7daa4e79bf7fc56164369781408e1be v7-1-262
-+0000000000000000000000000000000000000000 v7-1-262
-+19ef2bbf569cba64ae5125d5b1f3f205efc25e89 v7.1.263
-+19ef2bbf569cba64ae5125d5b1f3f205efc25e89 v7-1-263
-+0000000000000000000000000000000000000000 v7-1-263
-+d976f4da2a4d56ed9b59c61f6971ec0cb18c84db v7.1.264
-+d976f4da2a4d56ed9b59c61f6971ec0cb18c84db v7-1-264
-+0000000000000000000000000000000000000000 v7-1-264
-+539d9b8f418aeeeac3d0da1932e1cdbe709456a1 v7.1.265
-+539d9b8f418aeeeac3d0da1932e1cdbe709456a1 v7-1-265
-+0000000000000000000000000000000000000000 v7-1-265
-+220a9309067dfc6e7e8301b392c3499054666396 v7.1.266
-+220a9309067dfc6e7e8301b392c3499054666396 v7-1-266
-+0000000000000000000000000000000000000000 v7-1-266
-+3796d11fde3c141d30cc3446038c20bf280c4b5f v7.1.267
-+3796d11fde3c141d30cc3446038c20bf280c4b5f v7-1-267
-+0000000000000000000000000000000000000000 v7-1-267
-+71db8539b8c487eef0df17f2069d96fea1911cf1 v7.1.268
-+71db8539b8c487eef0df17f2069d96fea1911cf1 v7-1-268
-+0000000000000000000000000000000000000000 v7-1-268
-+1c597397f0061fd2c750c65c961a31f70dd6747f v7.1.269
-+1c597397f0061fd2c750c65c961a31f70dd6747f v7-1-269
-+0000000000000000000000000000000000000000 v7-1-269
-+811f29447aea27adaf1f54879ddf0fbd05a1e094 v7.1.270
-+811f29447aea27adaf1f54879ddf0fbd05a1e094 v7-1-270
-+0000000000000000000000000000000000000000 v7-1-270
-+2c4ca49319a689ad9caa4429cd90bceda4e210a3 v7.1.271
-+2c4ca49319a689ad9caa4429cd90bceda4e210a3 v7-1-271
-+0000000000000000000000000000000000000000 v7-1-271
-+bdbaeab157e6f88d82056df6b927acb5b342ae01 v7.1.272
-+bdbaeab157e6f88d82056df6b927acb5b342ae01 v7-1-272
-+0000000000000000000000000000000000000000 v7-1-272
-+c7905d03c72e74540d91b1ebf3fc9cfffc2ba699 v7.1.273
-+c7905d03c72e74540d91b1ebf3fc9cfffc2ba699 v7-1-273
-+0000000000000000000000000000000000000000 v7-1-273
-+a83f48a17efb871266ffbcb3b6c9cd5a62408410 v7.1.274
-+a83f48a17efb871266ffbcb3b6c9cd5a62408410 v7-1-274
-+0000000000000000000000000000000000000000 v7-1-274
-+437fb19625c9e24e2157563cf0a55aeb432b2990 v7.1.275
-+437fb19625c9e24e2157563cf0a55aeb432b2990 v7-1-275
-+0000000000000000000000000000000000000000 v7-1-275
-+ed7fefbef738386c39248b501556bdea80d0f8b4 v7.1.276
-+ed7fefbef738386c39248b501556bdea80d0f8b4 v7-1-276
-+0000000000000000000000000000000000000000 v7-1-276
-+8c9396275bfaf3ba6c759c26fef07c0b687a8abb v7.1.277
-+8c9396275bfaf3ba6c759c26fef07c0b687a8abb v7-1-277
-+0000000000000000000000000000000000000000 v7-1-277
-+1dd4e0ccd822156b87516f9cd5a6a004d0d85a11 v7.1.278
-+1dd4e0ccd822156b87516f9cd5a6a004d0d85a11 v7-1-278
-+0000000000000000000000000000000000000000 v7-1-278
-+20b4b6a2a212584f182a2d69a37512bf9094d85e v7.1.279
-+20b4b6a2a212584f182a2d69a37512bf9094d85e v7-1-279
-+0000000000000000000000000000000000000000 v7-1-279
-+38de872507e1c6440c9252a7bad077ae8c1bd488 v7.1.280
-+38de872507e1c6440c9252a7bad077ae8c1bd488 v7-1-280
-+0000000000000000000000000000000000000000 v7-1-280
-+4e581f1b08dac0b7f9345bd51b03a5fdbdd49ddc v7.1.281
-+4e581f1b08dac0b7f9345bd51b03a5fdbdd49ddc v7-1-281
-+0000000000000000000000000000000000000000 v7-1-281
-+9fbb40a1228a4d8a5f26d1dff8e2ab4e3bd870fe v7.1.282
-+9fbb40a1228a4d8a5f26d1dff8e2ab4e3bd870fe v7-1-282
-+0000000000000000000000000000000000000000 v7-1-282
-+f0cfff4dcc2f7cad78ce86aae0f4cbd3371ce46d v7.1.283
-+f0cfff4dcc2f7cad78ce86aae0f4cbd3371ce46d v7-1-283
-+0000000000000000000000000000000000000000 v7-1-283
-+26d879bcab3aa016ccaf77cfd3a9aa5085d4776e v7.1.284
-+26d879bcab3aa016ccaf77cfd3a9aa5085d4776e v7-1-284
-+0000000000000000000000000000000000000000 v7-1-284
-+a9e353f7fcc48a2b603ead42451ea8e89ee7b9d0 v7.1.285
-+a9e353f7fcc48a2b603ead42451ea8e89ee7b9d0 v7-1-285
-+0000000000000000000000000000000000000000 v7-1-285
-+0e3bd80a3f74a99241a4857685912dc8efeb9bdf v7.1.286
-+0e3bd80a3f74a99241a4857685912dc8efeb9bdf v7-1-286
-+0000000000000000000000000000000000000000 v7-1-286
-+f1d1214744679d401e17e9ba97ecbb6255696ed0 v7.1.287
-+f1d1214744679d401e17e9ba97ecbb6255696ed0 v7-1-287
-+0000000000000000000000000000000000000000 v7-1-287
-+0e3e601e66cf233986924652f7801dc8d2568a84 v7.1.288
-+0e3e601e66cf233986924652f7801dc8d2568a84 v7-1-288
-+0000000000000000000000000000000000000000 v7-1-288
-+b76637e5ace1cd75c1894c44e132ea1e4fdc1a9f v7.1.289
-+b76637e5ace1cd75c1894c44e132ea1e4fdc1a9f v7-1-289
-+0000000000000000000000000000000000000000 v7-1-289
-+3ee896333e3eebba8a5e10e04649f1bd20e98770 v7.1.290
-+3ee896333e3eebba8a5e10e04649f1bd20e98770 v7-1-290
-+0000000000000000000000000000000000000000 v7-1-290
-+9e0174515abb6667a9e74e6fefc74ad50d7821d2 v7.1.291
-+9e0174515abb6667a9e74e6fefc74ad50d7821d2 v7-1-291
-+0000000000000000000000000000000000000000 v7-1-291
-+25bc02d83cf438d5794ce106edad2959e2f89454 v7.1.292
-+25bc02d83cf438d5794ce106edad2959e2f89454 v7-1-292
-+0000000000000000000000000000000000000000 v7-1-292
-+5e75d07bfe75fc81e0dac043b6bc0ba417736b17 v7.1.293
-+5e75d07bfe75fc81e0dac043b6bc0ba417736b17 v7-1-293
-+0000000000000000000000000000000000000000 v7-1-293
-+8dc36a64ae8b36d124bc0767ccadba3daea943ec v7.1.294
-+8dc36a64ae8b36d124bc0767ccadba3daea943ec v7-1-294
-+0000000000000000000000000000000000000000 v7-1-294
-+73c5752b957d49da8312ef87383a7368c78df74c v7.1.295
-+73c5752b957d49da8312ef87383a7368c78df74c v7-1-295
-+0000000000000000000000000000000000000000 v7-1-295
-+ebe059f69b9e46ada2c6e02b3979e31d1b11c906 v7.1.296
-+ebe059f69b9e46ada2c6e02b3979e31d1b11c906 v7-1-296
-+0000000000000000000000000000000000000000 v7-1-296
-+7387540b6e52e3faad6c78182de9d1354ac9e6b4 v7.1.297
-+7387540b6e52e3faad6c78182de9d1354ac9e6b4 v7-1-297
-+0000000000000000000000000000000000000000 v7-1-297
-+4a317df1696281eaee0e54b5c1636186290863a3 v7.1.298
-+4a317df1696281eaee0e54b5c1636186290863a3 v7-1-298
-+0000000000000000000000000000000000000000 v7-1-298
-+fe7db192c7cc7ef3d8cdc6bbd8680833338fd7fe v7.1.299
-+fe7db192c7cc7ef3d8cdc6bbd8680833338fd7fe v7-1-299
-+0000000000000000000000000000000000000000 v7-1-299
-+a0c01df852e1d183c879ee114b35b2b5b0d06746 v7.1.300
-+a0c01df852e1d183c879ee114b35b2b5b0d06746 v7-1-300
-+0000000000000000000000000000000000000000 v7-1-300
-+3b48421dbde112f3a6dae67a651a9f114d85c874 v7.1.301
-+3b48421dbde112f3a6dae67a651a9f114d85c874 v7-1-301
-+0000000000000000000000000000000000000000 v7-1-301
-+3a6ba07b3b9fa89e94e002d44f57f5378eb59f08 v7.1.302
-+3a6ba07b3b9fa89e94e002d44f57f5378eb59f08 v7-1-302
-+0000000000000000000000000000000000000000 v7-1-302
-+fe3ec5ea62f76a623c95a2a4bcc0d396c83488bf v7.1.303
-+fe3ec5ea62f76a623c95a2a4bcc0d396c83488bf v7-1-303
-+0000000000000000000000000000000000000000 v7-1-303
-+c19f6b8d0393dd28a2673da19e8acef59d371f65 v7.1.304
-+c19f6b8d0393dd28a2673da19e8acef59d371f65 v7-1-304
-+0000000000000000000000000000000000000000 v7-1-304
-+e06e177de52ae555685a6126213dff168048fcc6 v7.1.305
-+e06e177de52ae555685a6126213dff168048fcc6 v7-1-305
-+0000000000000000000000000000000000000000 v7-1-305
-+2430fc9a18d1270a5ad7b5f7acac3e19aa8908fb v7.1.306
-+2430fc9a18d1270a5ad7b5f7acac3e19aa8908fb v7-1-306
-+0000000000000000000000000000000000000000 v7-1-306
-+23aeaff961412f06544babde36a80a6c22be0fd9 v7.1.307
-+23aeaff961412f06544babde36a80a6c22be0fd9 v7-1-307
-+0000000000000000000000000000000000000000 v7-1-307
-+5027d3220e2adb2f2f54e85f469a7b4302a010da v7.1.308
-+5027d3220e2adb2f2f54e85f469a7b4302a010da v7-1-308
-+0000000000000000000000000000000000000000 v7-1-308
-+5898cc36322e7f1dc371e89dfb5e2ffc3c6c6e3e v7.1.309
-+5898cc36322e7f1dc371e89dfb5e2ffc3c6c6e3e v7-1-309
-+0000000000000000000000000000000000000000 v7-1-309
-+80b9076e9e177bbcb455eef9928283077ed1c861 v7.1.310
-+80b9076e9e177bbcb455eef9928283077ed1c861 v7-1-310
-+0000000000000000000000000000000000000000 v7-1-310
-+c8568bc2db390972c94374a031bbd195c4403ffd v7.1.311
-+c8568bc2db390972c94374a031bbd195c4403ffd v7-1-311
-+0000000000000000000000000000000000000000 v7-1-311
-+2f016b638c0ca912d89f352f6b9b83231cf9e83b v7.1.312
-+2f016b638c0ca912d89f352f6b9b83231cf9e83b v7-1-312
-+0000000000000000000000000000000000000000 v7-1-312
-+eb9cbad50fa34fad2b422758d6d814059aa89f94 v7.1.313
-+eb9cbad50fa34fad2b422758d6d814059aa89f94 v7-1-313
-+0000000000000000000000000000000000000000 v7-1-313
-+eef96cfdbbbebe5aa61b420d3eea31c3c5b6d719 v7.1.314
-+eef96cfdbbbebe5aa61b420d3eea31c3c5b6d719 v7-1-314
-+0000000000000000000000000000000000000000 v7-1-314
-+0358abf2b5d4ab5981a5a1dd651ecf63d40ffbfb v7.1.315
-+0358abf2b5d4ab5981a5a1dd651ecf63d40ffbfb v7-1-315
-+0000000000000000000000000000000000000000 v7-1-315
-+694e8715dce6af134be79c99e97f90786088078f v7.1.316
-+694e8715dce6af134be79c99e97f90786088078f v7-1-316
-+0000000000000000000000000000000000000000 v7-1-316
-+3acbcd0d3fd3d81ce94a40af4510fcc2e7870a82 v7.1.317
-+3acbcd0d3fd3d81ce94a40af4510fcc2e7870a82 v7-1-317
-+0000000000000000000000000000000000000000 v7-1-317
-+7d127d580b6d2d86853fc0a322323cdee2eca343 v7.1.318
-+7d127d580b6d2d86853fc0a322323cdee2eca343 v7-1-318
-+0000000000000000000000000000000000000000 v7-1-318
-+9dd62cb57ed5845c9c2294b6002a29702ef043fb v7.1.319
-+9dd62cb57ed5845c9c2294b6002a29702ef043fb v7-1-319
-+0000000000000000000000000000000000000000 v7-1-319
-+4f1130893a1c135b1200f6857bd0ebfb143350e1 v7.1.320
-+4f1130893a1c135b1200f6857bd0ebfb143350e1 v7-1-320
-+0000000000000000000000000000000000000000 v7-1-320
-+152883db0edf63f35e8459dcc5862ef3f4b48c9e v7.1.321
-+152883db0edf63f35e8459dcc5862ef3f4b48c9e v7-1-321
-+0000000000000000000000000000000000000000 v7-1-321
-+1324b7b755f3b5570ce9aa7fb27c075c89a1d2df v7.1.322
-+1324b7b755f3b5570ce9aa7fb27c075c89a1d2df v7-1-322
-+0000000000000000000000000000000000000000 v7-1-322
-+4541e06d4fb9dd8b69a7ab43653c72022f95151f v7.1.323
-+4541e06d4fb9dd8b69a7ab43653c72022f95151f v7-1-323
-+0000000000000000000000000000000000000000 v7-1-323
-+c669f3280f595ba6133a94d8ceb3ed3ef6c2a4ad v7.1.324
-+c669f3280f595ba6133a94d8ceb3ed3ef6c2a4ad v7-1-324
-+0000000000000000000000000000000000000000 v7-1-324
-+3c251a30c8cc44946e5871a7073d88ce195874cd v7.1.325
-+3c251a30c8cc44946e5871a7073d88ce195874cd v7-1-325
-+0000000000000000000000000000000000000000 v7-1-325
-+a0a98a0f12816722b1792141edb3625dd72eb5bb v7.1.326
-+a0a98a0f12816722b1792141edb3625dd72eb5bb v7-1-326
-+0000000000000000000000000000000000000000 v7-1-326
-+371201c6b4c1538b593b5dc72f36c79a1f2644de v7.1.327
-+371201c6b4c1538b593b5dc72f36c79a1f2644de v7-1-327
-+0000000000000000000000000000000000000000 v7-1-327
-+fc2ee817dc9861774c31bbe768cddcaca4690e4e v7.1.328
-+fc2ee817dc9861774c31bbe768cddcaca4690e4e v7-1-328
-+0000000000000000000000000000000000000000 v7-1-328
-+dbef8434a2ea19482b3ba72b428c57dafaad29a4 v7.1.329
-+dbef8434a2ea19482b3ba72b428c57dafaad29a4 v7-1-329
-+0000000000000000000000000000000000000000 v7-1-329
-+5f0c7aae4da272c73cfc625f35dc050897b6afe7 v7.1.330
-+5f0c7aae4da272c73cfc625f35dc050897b6afe7 v7-1-330
-+0000000000000000000000000000000000000000 v7-1-330
-+18ee39301b822de39caf5fa023107ddf508b42e0 v7.2a
-+18ee39301b822de39caf5fa023107ddf508b42e0 v7-2a
-+0000000000000000000000000000000000000000 v7-2a
-+58cad056e60844274b103ff3fdb56d7a6749b121 v7.2a.00
-+58cad056e60844274b103ff3fdb56d7a6749b121 v7-2a-00
-+0000000000000000000000000000000000000000 v7-2a-00
-+68f00510705229a9b8653612b806dbbcccd5aebf v7.2a.001
-+68f00510705229a9b8653612b806dbbcccd5aebf v7-2a-001
-+0000000000000000000000000000000000000000 v7-2a-001
-+e1c7d0ea5dacf4184cf49c3d05d6ce77d944a367 v7.2a.002
-+e1c7d0ea5dacf4184cf49c3d05d6ce77d944a367 v7-2a-002
-+0000000000000000000000000000000000000000 v7-2a-002
-+9c5a9e4356f8ef42ea2c177568b63bfbb1779bb0 v7.2a.003
-+9c5a9e4356f8ef42ea2c177568b63bfbb1779bb0 v7-2a-003
-+0000000000000000000000000000000000000000 v7-2a-003
-+e97a97d6a0eb98b21bd068283f192e0a2f2b1a89 v7.2a.004
-+e97a97d6a0eb98b21bd068283f192e0a2f2b1a89 v7-2a-004
-+0000000000000000000000000000000000000000 v7-2a-004
-+d166fe2bfe7438b1539cdedf1810dc91a1cae01e v7.2a.005
-+d166fe2bfe7438b1539cdedf1810dc91a1cae01e v7-2a-005
-+0000000000000000000000000000000000000000 v7-2a-005
-+0eef0f62181190700a01129a88f693503ae94947 v7.2a.006
-+0eef0f62181190700a01129a88f693503ae94947 v7-2a-006
-+0000000000000000000000000000000000000000 v7-2a-006
-+6412b0befebc17db58a1e8acbef86d3a3e4f742c v7.2a.007
-+6412b0befebc17db58a1e8acbef86d3a3e4f742c v7-2a-007
-+0000000000000000000000000000000000000000 v7-2a-007
-+eb6fc577c96c2b5e322ca3760fa4e9c043ba5a8c v7.2a.008
-+eb6fc577c96c2b5e322ca3760fa4e9c043ba5a8c v7-2a-008
-+0000000000000000000000000000000000000000 v7-2a-008
-+c3e225bc213a1a91a278fdcb3c5fc003ae886f02 v7.2a.009
-+c3e225bc213a1a91a278fdcb3c5fc003ae886f02 v7-2a-009
-+0000000000000000000000000000000000000000 v7-2a-009
-+630eca9496e07d9a778fe87d087832816a01a850 v7.2a.010
-+630eca9496e07d9a778fe87d087832816a01a850 v7-2a-010
-+0000000000000000000000000000000000000000 v7-2a-010
-+b7c89e3e19f703c0ebccecc10ee044367a65ea20 v7.2a.011
-+b7c89e3e19f703c0ebccecc10ee044367a65ea20 v7-2a-011
-+0000000000000000000000000000000000000000 v7-2a-011
-+a0c70314350fde9e0948e598fe57dddc6192468e v7.2a.012
-+a0c70314350fde9e0948e598fe57dddc6192468e v7-2a-012
-+0000000000000000000000000000000000000000 v7-2a-012
-+5bbc2d6658adb0dd3c67dd80c59f3a7ade3ba3d6 v7.2a.013
-+5bbc2d6658adb0dd3c67dd80c59f3a7ade3ba3d6 v7-2a-013
-+0000000000000000000000000000000000000000 v7-2a-013
-+ac6d15d91466b34e4ff31765d1d1e1733f02ffc9 v7.2a.014
-+ac6d15d91466b34e4ff31765d1d1e1733f02ffc9 v7-2a-014
-+0000000000000000000000000000000000000000 v7-2a-014
-+bae8347a9ae1131d95a7af1d751fa47df5d3baec v7.2a.015
-+bae8347a9ae1131d95a7af1d751fa47df5d3baec v7-2a-015
-+0000000000000000000000000000000000000000 v7-2a-015
-+f41b6108e46b7cb3794b2a3680f2ce91b402fb21 v7.2a.016
-+f41b6108e46b7cb3794b2a3680f2ce91b402fb21 v7-2a-016
-+0000000000000000000000000000000000000000 v7-2a-016
-+5c3844ad7d5677953eac88ec4ee317b298812bce v7.2a.017
-+5c3844ad7d5677953eac88ec4ee317b298812bce v7-2a-017
-+0000000000000000000000000000000000000000 v7-2a-017
-+e1d77e652cb7f9e84072f16b3ac6dcbb73a1fd81 v7.2a.018
-+e1d77e652cb7f9e84072f16b3ac6dcbb73a1fd81 v7-2a-018
-+0000000000000000000000000000000000000000 v7-2a-018
-+131dbd3d2a4bba5d1514c2842952ca7b77b6902e v7.2a.019
-+131dbd3d2a4bba5d1514c2842952ca7b77b6902e v7-2a-019
-+0000000000000000000000000000000000000000 v7-2a-019
-+0b796e045c429253e9ce8825ad05aad2474553bd v7.2b.000
-+0b796e045c429253e9ce8825ad05aad2474553bd v7-2b-000
-+0000000000000000000000000000000000000000 v7-2b-000
-+ec5ed41eea2f1d83df5a2507ab2f469fadbbfbfa v7.2b.001
-+ec5ed41eea2f1d83df5a2507ab2f469fadbbfbfa v7-2b-001
-+0000000000000000000000000000000000000000 v7-2b-001
-+d766b2ba2fc6d5b6211cd10d90236dfa8479d617 v7.2b.002
-+d766b2ba2fc6d5b6211cd10d90236dfa8479d617 v7-2b-002
-+0000000000000000000000000000000000000000 v7-2b-002
-+5d25cdc3c3f31d4893f646d5e7b94435ef59aa5e v7.2b.003
-+5d25cdc3c3f31d4893f646d5e7b94435ef59aa5e v7-2b-003
-+0000000000000000000000000000000000000000 v7-2b-003
-+fddea6c03deefda18c971466e0688d196a62fd6c v7.2b.004
-+fddea6c03deefda18c971466e0688d196a62fd6c v7-2b-004
-+0000000000000000000000000000000000000000 v7-2b-004
-+553c97222cc0d0adb7beecd6f73be1c512f2f37c v7.2b.005
-+553c97222cc0d0adb7beecd6f73be1c512f2f37c v7-2b-005
-+0000000000000000000000000000000000000000 v7-2b-005
-+1d7f46148bf4ec36a42e959cece1f9f6199a87a7 v7.2b.006
-+1d7f46148bf4ec36a42e959cece1f9f6199a87a7 v7-2b-006
-+0000000000000000000000000000000000000000 v7-2b-006
-+9368159253f847f95c6c1f39a894e26fa3c954e8 v7.2b.007
-+9368159253f847f95c6c1f39a894e26fa3c954e8 v7-2b-007
-+0000000000000000000000000000000000000000 v7-2b-007
-+3479f9aacaf57d583abb468cfe393eead386f15a v7.2b.008
-+3479f9aacaf57d583abb468cfe393eead386f15a v7-2b-008
-+0000000000000000000000000000000000000000 v7-2b-008
-+b9897545378516c8afe3140b7172d838f33e5b29 v7.2b.009
-+b9897545378516c8afe3140b7172d838f33e5b29 v7-2b-009
-+0000000000000000000000000000000000000000 v7-2b-009
-+b60a569eb708bc6563cc1104335cf56bb38ea901 v7.2b.010
-+b60a569eb708bc6563cc1104335cf56bb38ea901 v7-2b-010
-+0000000000000000000000000000000000000000 v7-2b-010
-+a881e15f44d8b5888733fc98c39984c2fe6316ef v7.2b.011
-+a881e15f44d8b5888733fc98c39984c2fe6316ef v7-2b-011
-+0000000000000000000000000000000000000000 v7-2b-011
-+0a908b65de1dbebbde1aacfd50aa41ef09e6865e v7.2b.012
-+0a908b65de1dbebbde1aacfd50aa41ef09e6865e v7-2b-012
-+0000000000000000000000000000000000000000 v7-2b-012
-+fe4ebbec775a55ba5d9bec6070d8d87dc28138f9 v7.2b.014
-+fe4ebbec775a55ba5d9bec6070d8d87dc28138f9 v7-2b-014
-+0000000000000000000000000000000000000000 v7-2b-014
-+81059e8b657d911c9876f557975f34624988624f v7.2b.015
-+81059e8b657d911c9876f557975f34624988624f v7-2b-015
-+0000000000000000000000000000000000000000 v7-2b-015
-+75dbeedddaa9b0e0784c4d23d71de713a533c5b4 v7.2b.016
-+75dbeedddaa9b0e0784c4d23d71de713a533c5b4 v7-2b-016
-+0000000000000000000000000000000000000000 v7-2b-016
-+fc8bf5d4051a1c13085db00c902092215ac9852b v7.2b.017
-+fc8bf5d4051a1c13085db00c902092215ac9852b v7-2b-017
-+0000000000000000000000000000000000000000 v7-2b-017
-+7015ddf8105575fcf48eac35b14c61a24fc38d7f v7.2b.018
-+7015ddf8105575fcf48eac35b14c61a24fc38d7f v7-2b-018
-+0000000000000000000000000000000000000000 v7-2b-018
-+c7c53db66b5521d2deed3b889fbfb13030868942 v7.2b.019
-+c7c53db66b5521d2deed3b889fbfb13030868942 v7-2b-019
-+0000000000000000000000000000000000000000 v7-2b-019
-+b2e037ed7e33b48a1feb69174850acc393254864 v7.2b.020
-+b2e037ed7e33b48a1feb69174850acc393254864 v7-2b-020
-+0000000000000000000000000000000000000000 v7-2b-020
-+17526daaf79dbf2004c78311abdad05e6e3070dc v7.2b.021
-+17526daaf79dbf2004c78311abdad05e6e3070dc v7-2b-021
-+0000000000000000000000000000000000000000 v7-2b-021
-+a285f0cd8a462ff5cb17053fd457646f9d33573d v7.2b.022
-+a285f0cd8a462ff5cb17053fd457646f9d33573d v7-2b-022
-+0000000000000000000000000000000000000000 v7-2b-022
-+c6b06a4a8f928b1868a3d48d95293730262a041e v7.2b.023
-+c6b06a4a8f928b1868a3d48d95293730262a041e v7-2b-023
-+0000000000000000000000000000000000000000 v7-2b-023
-+4842e7421b5207294cc90f7e2d2d18c24e65753c v7.2b.024
-+4842e7421b5207294cc90f7e2d2d18c24e65753c v7-2b-024
-+0000000000000000000000000000000000000000 v7-2b-024
-+c8c47cc9dab1eb6976b9c214c58e65beb3a45e97 v7.2b.025
-+c8c47cc9dab1eb6976b9c214c58e65beb3a45e97 v7-2b-025
-+0000000000000000000000000000000000000000 v7-2b-025
-+b6ffc2045211c67d42d806af38dae64626aba605 v7.2b.026
-+b6ffc2045211c67d42d806af38dae64626aba605 v7-2b-026
-+0000000000000000000000000000000000000000 v7-2b-026
-+3c6417b7e6efed4cb13673383489efb47399a902 v7.2b.027
-+3c6417b7e6efed4cb13673383489efb47399a902 v7-2b-027
-+0000000000000000000000000000000000000000 v7-2b-027
-+0dbc46d14443418020e3868a08877a365ced11e1 v7.2b.028
-+0dbc46d14443418020e3868a08877a365ced11e1 v7-2b-028
-+0000000000000000000000000000000000000000 v7-2b-028
-+0c4a465bd7419d51017354b70ead01c18b589e9d v7.2b.029
-+0c4a465bd7419d51017354b70ead01c18b589e9d v7-2b-029
-+0000000000000000000000000000000000000000 v7-2b-029
-+2f9308b31181f36bf605ee060fa763a28deacb03 v7.2b.030
-+2f9308b31181f36bf605ee060fa763a28deacb03 v7-2b-030
-+0000000000000000000000000000000000000000 v7-2b-030
-+f4f8014d516e9b9620311aa2bb7a5a2d5749f451 v7.2c.000
-+f4f8014d516e9b9620311aa2bb7a5a2d5749f451 v7-2c-000
-+0000000000000000000000000000000000000000 v7-2c-000
-+9d74e2f433c0370cb458c83d12b05f72226df489 v7.2c.001
-+9d74e2f433c0370cb458c83d12b05f72226df489 v7-2c-001
-+0000000000000000000000000000000000000000 v7-2c-001
-+9e1cefec84dde22d62c1bd2dd0ceb4e072470981 v7.2c.002
-+9e1cefec84dde22d62c1bd2dd0ceb4e072470981 v7-2c-002
-+0000000000000000000000000000000000000000 v7-2c-002
-+4577899b8ff1548f3f03e6516715087c9aa15e6e v7.2c.003
-+4577899b8ff1548f3f03e6516715087c9aa15e6e v7-2c-003
-+0000000000000000000000000000000000000000 v7-2c-003
-+5232b9862f238a2a109f15527825e5cac1668a04 v7.2
-+5232b9862f238a2a109f15527825e5cac1668a04 v7-2
-+0000000000000000000000000000000000000000 v7-2
-+5232b9862f238a2a109f15527825e5cac1668a04 v7.2.000
-+5232b9862f238a2a109f15527825e5cac1668a04 v7-2-000
-+0000000000000000000000000000000000000000 v7-2-000
-+ad8f5bdc727441118cf45678b031d04d1a77aae0 v7.2.001
-+ad8f5bdc727441118cf45678b031d04d1a77aae0 v7-2-001
-+0000000000000000000000000000000000000000 v7-2-001
-+421a77b136c2bec5d2056a799e2fa8021178beda v7.2.002
-+421a77b136c2bec5d2056a799e2fa8021178beda v7-2-002
-+0000000000000000000000000000000000000000 v7-2-002
-+5b43a3a9454ad69432d5cc82b70d59ec6c92a45a v7.2.003
-+5b43a3a9454ad69432d5cc82b70d59ec6c92a45a v7-2-003
-+0000000000000000000000000000000000000000 v7-2-003
-+9f8fd6a14cfc84953deae7d00287a1949c0f0eff v7.2.004
-+9f8fd6a14cfc84953deae7d00287a1949c0f0eff v7-2-004
-+0000000000000000000000000000000000000000 v7-2-004
-+f9f6e35c9f00ee6ee518069ff2bf0f93b635b8af v7.2.005
-+f9f6e35c9f00ee6ee518069ff2bf0f93b635b8af v7-2-005
-+0000000000000000000000000000000000000000 v7-2-005
-+33d28f1c4d1dad3d4ce7f768c57820a8203c3e51 v7.2.006
-+33d28f1c4d1dad3d4ce7f768c57820a8203c3e51 v7-2-006
-+0000000000000000000000000000000000000000 v7-2-006
-+71eaeb69efe49baf0f63c6e9cebde1aade638ccf v7.2.007
-+71eaeb69efe49baf0f63c6e9cebde1aade638ccf v7-2-007
-+0000000000000000000000000000000000000000 v7-2-007
-+cdf37c8f46163497e0d7fabf9655be37b692fd1a v7.2.008
-+cdf37c8f46163497e0d7fabf9655be37b692fd1a v7-2-008
-+0000000000000000000000000000000000000000 v7-2-008
-+20b2e52ca96255a8d99ed9504e90a960266c4d21 v7.2.009
-+20b2e52ca96255a8d99ed9504e90a960266c4d21 v7-2-009
-+0000000000000000000000000000000000000000 v7-2-009
-+563bd9a63fdcb08d55b6f6087cc8ededd31b891d v7.2.010
-+563bd9a63fdcb08d55b6f6087cc8ededd31b891d v7-2-010
-+0000000000000000000000000000000000000000 v7-2-010
-+7781fcd2b74f26a37da0d1186a1c44d904a8f11f v7.2.011
-+7781fcd2b74f26a37da0d1186a1c44d904a8f11f v7-2-011
-+0000000000000000000000000000000000000000 v7-2-011
-+501b107b335af7ffcffea060c38f4b34dafe4101 v7.2.012
-+501b107b335af7ffcffea060c38f4b34dafe4101 v7-2-012
-+0000000000000000000000000000000000000000 v7-2-012
-+afb64d9f5b8ee1eb6e787e1d34ef8b80f15d4749 v7.2.013
-+afb64d9f5b8ee1eb6e787e1d34ef8b80f15d4749 v7-2-013
-+0000000000000000000000000000000000000000 v7-2-013
-+0f109c56b521834af0d9492b21d0ef1ead5b01ef v7.2.014
-+0f109c56b521834af0d9492b21d0ef1ead5b01ef v7-2-014
-+0000000000000000000000000000000000000000 v7-2-014
-+e03cb9499b83f972c2bdef503b1faa15481da81e v7.2.015
-+e03cb9499b83f972c2bdef503b1faa15481da81e v7-2-015
-+0000000000000000000000000000000000000000 v7-2-015
-+a27c581d2618b9bab1c7105fba966af40e23d57a v7.2.016
-+a27c581d2618b9bab1c7105fba966af40e23d57a v7-2-016
-+0000000000000000000000000000000000000000 v7-2-016
-+0670d0df210a891f82d38c38f1b3b256dd1a5f8d v7.2.017
-+0670d0df210a891f82d38c38f1b3b256dd1a5f8d v7-2-017
-+0000000000000000000000000000000000000000 v7-2-017
-+7b258a166daa98eb01237988ec954895a2e6ff0e v7.2.018
-+7b258a166daa98eb01237988ec954895a2e6ff0e v7-2-018
-+0000000000000000000000000000000000000000 v7-2-018
-+d23a400b718419e039eaf4f8ce23517144d41faa v7.2.019
-+d23a400b718419e039eaf4f8ce23517144d41faa v7-2-019
-+0000000000000000000000000000000000000000 v7-2-019
-+5950b03fc906f434d5a1b899bcee8ff839b05a34 v7.2.020
-+5950b03fc906f434d5a1b899bcee8ff839b05a34 v7-2-020
-+0000000000000000000000000000000000000000 v7-2-020
-+2e42153b37f171ed28293fa12e4f538070bf8619 v7.2.021
-+2e42153b37f171ed28293fa12e4f538070bf8619 v7-2-021
-+0000000000000000000000000000000000000000 v7-2-021
-+680834cb19eb2dfdc88aded4bfb36518ca4caa60 v7.2.022
-+680834cb19eb2dfdc88aded4bfb36518ca4caa60 v7-2-022
-+0000000000000000000000000000000000000000 v7-2-022
-+7c3302e07dd7cf0d746776234ed4e9cb376d3611 v7.2.023
-+7c3302e07dd7cf0d746776234ed4e9cb376d3611 v7-2-023
-+0000000000000000000000000000000000000000 v7-2-023
-+1e25b58fbf7babbbe054e118617a49790f532fd4 v7.2.024
-+1e25b58fbf7babbbe054e118617a49790f532fd4 v7-2-024
-+0000000000000000000000000000000000000000 v7-2-024
-+b61422c4dc7a81d340e33e0ddb8ce8cf0f94aec4 v7.2.025
-+b61422c4dc7a81d340e33e0ddb8ce8cf0f94aec4 v7-2-025
-+0000000000000000000000000000000000000000 v7-2-025
-+656ca7102064d711eed5cc678b4a5cf03b5d9c05 v7.2.026
-+656ca7102064d711eed5cc678b4a5cf03b5d9c05 v7-2-026
-+0000000000000000000000000000000000000000 v7-2-026
-+83a126db2895ba22f2fff13b488f028ff83bec28 v7.2.027
-+83a126db2895ba22f2fff13b488f028ff83bec28 v7-2-027
-+0000000000000000000000000000000000000000 v7-2-027
-+e9624acb93a750d835c361c08bf3e78f587f6510 v7.2.028
-+e9624acb93a750d835c361c08bf3e78f587f6510 v7-2-028
-+0000000000000000000000000000000000000000 v7-2-028
-+656b4c052203990d56ca731d2e3ca39ebd9bd775 v7.2.029
-+656b4c052203990d56ca731d2e3ca39ebd9bd775 v7-2-029
-+0000000000000000000000000000000000000000 v7-2-029
-+f84061aa57e4498f15155a4a30da40ea07be84e0 v7.2.030
-+f84061aa57e4498f15155a4a30da40ea07be84e0 v7-2-030
-+0000000000000000000000000000000000000000 v7-2-030
-+5a7384b9ca6691ee880dd4e01dddcba5dcac4f6d v7.2.031
-+5a7384b9ca6691ee880dd4e01dddcba5dcac4f6d v7-2-031
-+0000000000000000000000000000000000000000 v7-2-031
-+619b90abfdc95e3b1d0981a8995b942c6a7c3c29 v7.2.032
-+619b90abfdc95e3b1d0981a8995b942c6a7c3c29 v7-2-032
-+0000000000000000000000000000000000000000 v7-2-032
-+35abb70264158760c724bd0290c6c441afec4fa0 v7.2.033
-+35abb70264158760c724bd0290c6c441afec4fa0 v7-2-033
-+0000000000000000000000000000000000000000 v7-2-033
-+fe52f9888eaaafda72e6f37610327206383ff6a6 v7.2.034
-+fe52f9888eaaafda72e6f37610327206383ff6a6 v7-2-034
-+0000000000000000000000000000000000000000 v7-2-034
-+8272535dee77ded630f57073b428e89673f1ee45 v7.2.035
-+8272535dee77ded630f57073b428e89673f1ee45 v7-2-035
-+0000000000000000000000000000000000000000 v7-2-035
-+1ddec6983d9ebdb4f7a748cc171199cc8ad3d1e0 v7.2.036
-+1ddec6983d9ebdb4f7a748cc171199cc8ad3d1e0 v7-2-036
-+0000000000000000000000000000000000000000 v7-2-036
-+a8752f2805d69f51f1f6370eee8c7e2c89c57db4 v7.2.037
-+a8752f2805d69f51f1f6370eee8c7e2c89c57db4 v7-2-037
-+0000000000000000000000000000000000000000 v7-2-037
-+17b96d8dcc5c8356e10135f5735d6de2fa5da3e8 v7.2.038
-+17b96d8dcc5c8356e10135f5735d6de2fa5da3e8 v7-2-038
-+0000000000000000000000000000000000000000 v7-2-038
-+1bdb13b8e947b85e612afec3a1b5e09c29c30551 v7.2.039
-+1bdb13b8e947b85e612afec3a1b5e09c29c30551 v7-2-039
-+0000000000000000000000000000000000000000 v7-2-039
-+0e4fa55d20e025a70e3e6b82abc58333902c45db v7.2.040
-+0e4fa55d20e025a70e3e6b82abc58333902c45db v7-2-040
-+0000000000000000000000000000000000000000 v7-2-040
-+734d5bdae499eb2fa3f818e843efd9727e7f69f3 v7.2.041
-+734d5bdae499eb2fa3f818e843efd9727e7f69f3 v7-2-041
-+0000000000000000000000000000000000000000 v7-2-041
-+feb9b421585385b226b4adb98e10f33972068846 v7.2.042
-+feb9b421585385b226b4adb98e10f33972068846 v7-2-042
-+0000000000000000000000000000000000000000 v7-2-042
-+b7c22e34316251f32fa1034d11a3eba1829c2b92 v7.2.043
-+b7c22e34316251f32fa1034d11a3eba1829c2b92 v7-2-043
-+0000000000000000000000000000000000000000 v7-2-043
-+95dd473d2d28a088822c73309c3dee597c96facd v7.2.044
-+95dd473d2d28a088822c73309c3dee597c96facd v7-2-044
-+0000000000000000000000000000000000000000 v7-2-044
-+06317850ad3acd03765fc0f8002f17417773d906 v7.2.045
-+06317850ad3acd03765fc0f8002f17417773d906 v7-2-045
-+0000000000000000000000000000000000000000 v7-2-045
-+4ca6669af2cdc06f39d77bfef82663e5bbdedd56 v7.2.046
-+4ca6669af2cdc06f39d77bfef82663e5bbdedd56 v7-2-046
-+0000000000000000000000000000000000000000 v7-2-046
-+c5e1b4b9016ff900a005057fd1a055c70b812414 v7.2.047
-+c5e1b4b9016ff900a005057fd1a055c70b812414 v7-2-047
-+0000000000000000000000000000000000000000 v7-2-047
-+aeac63ad9430d81a0dfdc21080f1f05cdc633baf v7.2.048
-+aeac63ad9430d81a0dfdc21080f1f05cdc633baf v7-2-048
-+0000000000000000000000000000000000000000 v7-2-048
-+a8aae2e1d2ae6c22551400d451e4ecaccceffcd9 v7.2.049
-+a8aae2e1d2ae6c22551400d451e4ecaccceffcd9 v7-2-049
-+0000000000000000000000000000000000000000 v7-2-049
-+5098908178cdede4656e3f96f2df2847573e6ed9 v7.2.050
-+5098908178cdede4656e3f96f2df2847573e6ed9 v7-2-050
-+0000000000000000000000000000000000000000 v7-2-050
-+28d0c20ad8a09dd63fa34768eac4be3cf96ed239 v7.2.051
-+28d0c20ad8a09dd63fa34768eac4be3cf96ed239 v7-2-051
-+0000000000000000000000000000000000000000 v7-2-051
-+0c6c64edcbe0481659fdd91f6312296e7c1bb303 v7.2.052
-+0c6c64edcbe0481659fdd91f6312296e7c1bb303 v7-2-052
-+0000000000000000000000000000000000000000 v7-2-052
-+5fafc42c22d246e4dcef5c09d70b757e0d374b2c v7.2.053
-+5fafc42c22d246e4dcef5c09d70b757e0d374b2c v7-2-053
-+0000000000000000000000000000000000000000 v7-2-053
-+f10fe14748e260eb0d8bfe375cadbbaa0e5ceeca v7.2.055
-+f10fe14748e260eb0d8bfe375cadbbaa0e5ceeca v7-2-055
-+0000000000000000000000000000000000000000 v7-2-055
-+70661384379a0dd305576f64554608a396b0821f v7.2.056
-+70661384379a0dd305576f64554608a396b0821f v7-2-056
-+0000000000000000000000000000000000000000 v7-2-056
-+04fc2a0e98ed7af6ee11a2025d6a0c877114c039 v7.2.057
-+04fc2a0e98ed7af6ee11a2025d6a0c877114c039 v7-2-057
-+0000000000000000000000000000000000000000 v7-2-057
-+f3d3545d6bf6405662476b40e019044b880d8f81 v7.2.058
-+f3d3545d6bf6405662476b40e019044b880d8f81 v7-2-058
-+0000000000000000000000000000000000000000 v7-2-058
-+0836531167ab2f1cd48382b093c3080c3bc47786 v7.2.059
-+0836531167ab2f1cd48382b093c3080c3bc47786 v7-2-059
-+0000000000000000000000000000000000000000 v7-2-059
-+158a68529622f90d0b0f1f5596f55cc5ce06c9ee v7.2.060
-+158a68529622f90d0b0f1f5596f55cc5ce06c9ee v7-2-060
-+0000000000000000000000000000000000000000 v7-2-060
-+45d9e2f80fe18c663346a2e88409bf2476e874cd v7.2.061
-+45d9e2f80fe18c663346a2e88409bf2476e874cd v7-2-061
-+0000000000000000000000000000000000000000 v7-2-061
-+1c85355293f92cd8bb41eaf6ce8a8be1d77302f1 v7.2.062
-+1c85355293f92cd8bb41eaf6ce8a8be1d77302f1 v7-2-062
-+0000000000000000000000000000000000000000 v7-2-062
-+c050d5bbe79b6a0bd83fb5dc0c13c350492c7c4a v7.2.063
-+c050d5bbe79b6a0bd83fb5dc0c13c350492c7c4a v7-2-063
-+0000000000000000000000000000000000000000 v7-2-063
-+bb4797166e4c610516eaa16865682ab14411ecb5 v7.2.064
-+bb4797166e4c610516eaa16865682ab14411ecb5 v7-2-064
-+0000000000000000000000000000000000000000 v7-2-064
-+59edc8429da0ca92da8913823f56b219e3a99051 v7.2.065
-+59edc8429da0ca92da8913823f56b219e3a99051 v7-2-065
-+0000000000000000000000000000000000000000 v7-2-065
-+2a11407a5a8f4efccc04dfde8a61e40ec5eb9fc5 v7.2.066
-+2a11407a5a8f4efccc04dfde8a61e40ec5eb9fc5 v7-2-066
-+0000000000000000000000000000000000000000 v7-2-066
-+649d340f34d3ccb1c96efa9522a65803575d901c v7.2.067
-+649d340f34d3ccb1c96efa9522a65803575d901c v7-2-067
-+0000000000000000000000000000000000000000 v7-2-067
-+6aea606c9e911f768a5e6c9626581721f460f756 v7.2.068
-+6aea606c9e911f768a5e6c9626581721f460f756 v7-2-068
-+0000000000000000000000000000000000000000 v7-2-068
-+1f90fab89ce32126849aa28d2918bae96603f3bd v7.2.069
-+1f90fab89ce32126849aa28d2918bae96603f3bd v7-2-069
-+0000000000000000000000000000000000000000 v7-2-069
-+42ac369bd824634488b569ec5516fc435b700be8 v7.2.070
-+42ac369bd824634488b569ec5516fc435b700be8 v7-2-070
-+0000000000000000000000000000000000000000 v7-2-070
-+c22ded254d0591df640c3ee0ea3dd0a490fa2396 v7.2.071
-+c22ded254d0591df640c3ee0ea3dd0a490fa2396 v7-2-071
-+0000000000000000000000000000000000000000 v7-2-071
-+196d564759eb256f62e7fb7ec4561c1e2d533726 v7.2.072
-+196d564759eb256f62e7fb7ec4561c1e2d533726 v7-2-072
-+0000000000000000000000000000000000000000 v7-2-072
-+b209c3f94ab7ca3ff559d255c395fa013fee31a3 v7.2.073
-+b209c3f94ab7ca3ff559d255c395fa013fee31a3 v7-2-073
-+0000000000000000000000000000000000000000 v7-2-073
-+a9f814054152b658c1b90aadf0f75428e1130cd3 v7.2.074
-+a9f814054152b658c1b90aadf0f75428e1130cd3 v7-2-074
-+0000000000000000000000000000000000000000 v7-2-074
-+7209e03df1005fc037c029799b068f545b60433d v7.2.075
-+7209e03df1005fc037c029799b068f545b60433d v7-2-075
-+0000000000000000000000000000000000000000 v7-2-075
-+0b42546f036bb3ff8023b6015a5acf032a2ae1f1 v7.2.076
-+0b42546f036bb3ff8023b6015a5acf032a2ae1f1 v7-2-076
-+0000000000000000000000000000000000000000 v7-2-076
-+28e9eb0f2d849e7e32d70b4e1f06dad812288578 v7.2.077
-+28e9eb0f2d849e7e32d70b4e1f06dad812288578 v7-2-077
-+0000000000000000000000000000000000000000 v7-2-077
-+30534c76776ab088a4142f9e15faa23d86efe020 v7.2.078
-+30534c76776ab088a4142f9e15faa23d86efe020 v7-2-078
-+0000000000000000000000000000000000000000 v7-2-078
-+021f9d0f60a1700989e2deeab78da32837c1041b v7.2.079
-+021f9d0f60a1700989e2deeab78da32837c1041b v7-2-079
-+0000000000000000000000000000000000000000 v7-2-079
-+12cecc379574aba2231cbba54c4eaeef3432db69 v7.2.080
-+12cecc379574aba2231cbba54c4eaeef3432db69 v7-2-080
-+0000000000000000000000000000000000000000 v7-2-080
-+c3242ae88ef1d4cb6eea51fdf96670cae48fc64a v7.2.081
-+c3242ae88ef1d4cb6eea51fdf96670cae48fc64a v7-2-081
-+0000000000000000000000000000000000000000 v7-2-081
-+be7491f23e9d8818821de61d9ce53cb1cb1c7dc9 v7.2.082
-+be7491f23e9d8818821de61d9ce53cb1cb1c7dc9 v7-2-082
-+0000000000000000000000000000000000000000 v7-2-082
-+65c332f15dbf3376ed5aeea423e8f1584a65ff29 v7.2.083
-+65c332f15dbf3376ed5aeea423e8f1584a65ff29 v7-2-083
-+0000000000000000000000000000000000000000 v7-2-083
-+b2f4319efde1edbabcd900a63db8998bfc117152 v7.2.084
-+b2f4319efde1edbabcd900a63db8998bfc117152 v7-2-084
-+0000000000000000000000000000000000000000 v7-2-084
-+cba9c4003cb554f909fdb6426b8870bef24b3edf v7.2.085
-+cba9c4003cb554f909fdb6426b8870bef24b3edf v7-2-085
-+0000000000000000000000000000000000000000 v7-2-085
-+61d080cb268e21cc2275da3a0ff2b2081d97ff51 v7.2.086
-+61d080cb268e21cc2275da3a0ff2b2081d97ff51 v7-2-086
-+0000000000000000000000000000000000000000 v7-2-086
-+d6f0d3db1c641e451f9cb0d0697f1b18939d6cf7 v7.2.087
-+d6f0d3db1c641e451f9cb0d0697f1b18939d6cf7 v7-2-087
-+0000000000000000000000000000000000000000 v7-2-087
-+ef886129f0c0be912c7b6c21e695bd9980d31210 v7.2.088
-+ef886129f0c0be912c7b6c21e695bd9980d31210 v7-2-088
-+0000000000000000000000000000000000000000 v7-2-088
-+5e225f973b5d22208869bfbf151c5fd03b5a3451 v7.2.089
-+5e225f973b5d22208869bfbf151c5fd03b5a3451 v7-2-089
-+0000000000000000000000000000000000000000 v7-2-089
-+27d8fe1c096407ddca428c52f62d002dfed7879f v7.2.090
-+27d8fe1c096407ddca428c52f62d002dfed7879f v7-2-090
-+0000000000000000000000000000000000000000 v7-2-090
-+730697e82c43a8bc8b5975bea39fd180fb62a4be v7.2.091
-+730697e82c43a8bc8b5975bea39fd180fb62a4be v7-2-091
-+0000000000000000000000000000000000000000 v7-2-091
-+54d5eb36689f1a409d13cd6ff9b06d68a30b0d48 v7.2.092
-+54d5eb36689f1a409d13cd6ff9b06d68a30b0d48 v7-2-092
-+0000000000000000000000000000000000000000 v7-2-092
-+1fc8d918d9fc076304ef0dbaad897e8e5b6ba4ab v7.2.093
-+1fc8d918d9fc076304ef0dbaad897e8e5b6ba4ab v7-2-093
-+0000000000000000000000000000000000000000 v7-2-093
-+4589d1792c036e15d1f9e72c0252fb243aa6d5e4 v7.2.094
-+4589d1792c036e15d1f9e72c0252fb243aa6d5e4 v7-2-094
-+0000000000000000000000000000000000000000 v7-2-094
-+05952d133506353938f50f0b22b0097b6cdf0afd v7.2.095
-+05952d133506353938f50f0b22b0097b6cdf0afd v7-2-095
-+0000000000000000000000000000000000000000 v7-2-095
-+d8e7b6762aaaa48f6bb72b1c51d535119e79c379 v7.2.096
-+d8e7b6762aaaa48f6bb72b1c51d535119e79c379 v7-2-096
-+0000000000000000000000000000000000000000 v7-2-096
-+acc572c5660c90020f42c9f31c1d2c776c5dce47 v7.2.097
-+acc572c5660c90020f42c9f31c1d2c776c5dce47 v7-2-097
-+0000000000000000000000000000000000000000 v7-2-097
-+e7633eb32cfd9cd631a73f4d412272506261b427 v7.2.098
-+e7633eb32cfd9cd631a73f4d412272506261b427 v7-2-098
-+0000000000000000000000000000000000000000 v7-2-098
-+c4d5f3d8ad71c4d30397ca0101a89925f1666df8 v7.2.099
-+c4d5f3d8ad71c4d30397ca0101a89925f1666df8 v7-2-099
-+0000000000000000000000000000000000000000 v7-2-099
-+8978513bb5e31d3f20c941e5141d228ca95a6f58 v7.2.100
-+8978513bb5e31d3f20c941e5141d228ca95a6f58 v7-2-100
-+0000000000000000000000000000000000000000 v7-2-100
-+684ea86baabb6ead7b673d20de6f4b5b27a3335d v7.2.101
-+684ea86baabb6ead7b673d20de6f4b5b27a3335d v7-2-101
-+0000000000000000000000000000000000000000 v7-2-101
-+f38b7359dafd1f168a15698412d266c17a16520e v7.2.102
-+f38b7359dafd1f168a15698412d266c17a16520e v7-2-102
-+0000000000000000000000000000000000000000 v7-2-102
-+a5e1d6526ac7c92fcad2ae100b1d43ae238067b0 v7.2.103
-+a5e1d6526ac7c92fcad2ae100b1d43ae238067b0 v7-2-103
-+0000000000000000000000000000000000000000 v7-2-103
-+f0c598082dff6f0332c9af602b5b4996bce01ff7 v7.2.104
-+f0c598082dff6f0332c9af602b5b4996bce01ff7 v7-2-104
-+0000000000000000000000000000000000000000 v7-2-104
-+a66c405786754105eaa63f3264c94ce134bd275f v7.2.105
-+a66c405786754105eaa63f3264c94ce134bd275f v7-2-105
-+0000000000000000000000000000000000000000 v7-2-105
-+e2d7622d70894e506f9c722bc8ce145521d098b7 v7.2.106
-+e2d7622d70894e506f9c722bc8ce145521d098b7 v7-2-106
-+0000000000000000000000000000000000000000 v7-2-106
-+e9d018b58830d50906a81e1b1ddbb3e2bdd9126a v7.2.107
-+e9d018b58830d50906a81e1b1ddbb3e2bdd9126a v7-2-107
-+0000000000000000000000000000000000000000 v7-2-107
-+5d84650b569c7800de8012d91660441bda95e5c0 v7.2.108
-+5d84650b569c7800de8012d91660441bda95e5c0 v7-2-108
-+0000000000000000000000000000000000000000 v7-2-108
-+d88bdbabfbc6539ce6cb149a3e8b025740a7f351 v7.2.109
-+d88bdbabfbc6539ce6cb149a3e8b025740a7f351 v7-2-109
-+0000000000000000000000000000000000000000 v7-2-109
-+4c7cf05f60b5885e1a5caadb787cc6e290d7ee34 v7.2.110
-+4c7cf05f60b5885e1a5caadb787cc6e290d7ee34 v7-2-110
-+0000000000000000000000000000000000000000 v7-2-110
-+b5ad00887b816469ab8f7733643380a690c1322f v7.2.111
-+b5ad00887b816469ab8f7733643380a690c1322f v7-2-111
-+0000000000000000000000000000000000000000 v7-2-111
-+febddd8d11b0f8f48e3d3297628fcbfd9f427b19 v7.2.112
-+febddd8d11b0f8f48e3d3297628fcbfd9f427b19 v7-2-112
-+0000000000000000000000000000000000000000 v7-2-112
-+97a73b6f28925dea4310c00225cc6210af00468a v7.2.113
-+97a73b6f28925dea4310c00225cc6210af00468a v7-2-113
-+0000000000000000000000000000000000000000 v7-2-113
-+217c9aa4c3ba6ea559ec5675871d6d89313363e8 v7.2.114
-+217c9aa4c3ba6ea559ec5675871d6d89313363e8 v7-2-114
-+0000000000000000000000000000000000000000 v7-2-114
-+a954a30e407394f51218ead2a7d832e022fd2378 v7.2.115
-+a954a30e407394f51218ead2a7d832e022fd2378 v7-2-115
-+0000000000000000000000000000000000000000 v7-2-115
-+bbf0ba46e51d5a4e58b872b840c5dc3e1ca44234 v7.2.116
-+bbf0ba46e51d5a4e58b872b840c5dc3e1ca44234 v7-2-116
-+0000000000000000000000000000000000000000 v7-2-116
-+15130d4dfea14898029686b72536f54197a73062 v7.2.117
-+15130d4dfea14898029686b72536f54197a73062 v7-2-117
-+0000000000000000000000000000000000000000 v7-2-117
-+484987f8e04c44e19e1ef2f3f6864b4c6fe61f1c v7.2.118
-+484987f8e04c44e19e1ef2f3f6864b4c6fe61f1c v7-2-118
-+0000000000000000000000000000000000000000 v7-2-118
-+9913ff5706164031d5f847bc0980cc61eeed3974 v7.2.119
-+9913ff5706164031d5f847bc0980cc61eeed3974 v7-2-119
-+0000000000000000000000000000000000000000 v7-2-119
-+cda8f3aceb85c72c94498120fa171939b83cc8a3 v7.2.120
-+cda8f3aceb85c72c94498120fa171939b83cc8a3 v7-2-120
-+0000000000000000000000000000000000000000 v7-2-120
-+134c7695af324bd4118f52b9235aeff7e374a425 v7.2.121
-+134c7695af324bd4118f52b9235aeff7e374a425 v7-2-121
-+0000000000000000000000000000000000000000 v7-2-121
-+3af28ecf9e56315a8617b2c58da078b6df989f2c v7.2.122
-+3af28ecf9e56315a8617b2c58da078b6df989f2c v7-2-122
-+0000000000000000000000000000000000000000 v7-2-122
-+1a040c25c44485c85e838a7530051f6d4f9793a2 v7.2.123
-+1a040c25c44485c85e838a7530051f6d4f9793a2 v7-2-123
-+0000000000000000000000000000000000000000 v7-2-123
-+b9202c4cf847ac1898b4af225494197671111785 v7.2.124
-+b9202c4cf847ac1898b4af225494197671111785 v7-2-124
-+0000000000000000000000000000000000000000 v7-2-124
-+0e4c64dfc61141a68b83b5204a160b5c01986279 v7.2.125
-+0e4c64dfc61141a68b83b5204a160b5c01986279 v7-2-125
-+0000000000000000000000000000000000000000 v7-2-125
-+cfccbe492612c69ee77d6cca4adb690794e5feac v7.2.126
-+cfccbe492612c69ee77d6cca4adb690794e5feac v7-2-126
-+0000000000000000000000000000000000000000 v7-2-126
-+b54d2f702d41f4fbb8bb3d33e52faf94568b2170 v7.2.127
-+b54d2f702d41f4fbb8bb3d33e52faf94568b2170 v7-2-127
-+0000000000000000000000000000000000000000 v7-2-127
-+288fb648badba86a0bdce6dbcecb55eb386263ab v7.2.128
-+288fb648badba86a0bdce6dbcecb55eb386263ab v7-2-128
-+0000000000000000000000000000000000000000 v7-2-128
-+eb1ce51c1cb0dc7825570f7cf30b0e2c3e9749c1 v7.2.129
-+eb1ce51c1cb0dc7825570f7cf30b0e2c3e9749c1 v7-2-129
-+0000000000000000000000000000000000000000 v7-2-129
-+b34d985598f68b97fe1bdf1d34bf689ea1b8355d v7.2.130
-+b34d985598f68b97fe1bdf1d34bf689ea1b8355d v7-2-130
-+0000000000000000000000000000000000000000 v7-2-130
-+fbecb12e37f5b1523aa8e6ecc07ea6c07ed65270 v7.2.131
-+fbecb12e37f5b1523aa8e6ecc07ea6c07ed65270 v7-2-131
-+0000000000000000000000000000000000000000 v7-2-131
-+ccbd8177e1f439fc23ef56be942ab0253d5dcc26 v7.2.132
-+ccbd8177e1f439fc23ef56be942ab0253d5dcc26 v7-2-132
-+0000000000000000000000000000000000000000 v7-2-132
-+8389197c91f3ecaaf28b776e69b9336eb08828d3 v7.2.133
-+8389197c91f3ecaaf28b776e69b9336eb08828d3 v7-2-133
-+0000000000000000000000000000000000000000 v7-2-133
-+03714c67a82b8557cb8ee0789cbced75d804d949 v7.2.134
-+03714c67a82b8557cb8ee0789cbced75d804d949 v7-2-134
-+0000000000000000000000000000000000000000 v7-2-134
-+cf080795d202ac2ef02d282f4aec111b2ec126b7 v7.2.135
-+cf080795d202ac2ef02d282f4aec111b2ec126b7 v7-2-135
-+0000000000000000000000000000000000000000 v7-2-135
-+d66394147eea6cd5b304fd2b78e5dde46fbb1b02 v7.2.136
-+d66394147eea6cd5b304fd2b78e5dde46fbb1b02 v7-2-136
-+0000000000000000000000000000000000000000 v7-2-136
-+df7ceb64b0c65cc5ea525f7df25ecdbba80b0208 v7.2.137
-+df7ceb64b0c65cc5ea525f7df25ecdbba80b0208 v7-2-137
-+0000000000000000000000000000000000000000 v7-2-137
-+ccc9eda1cfcf918fbd1933bca9db01e246d5ef12 v7.2.138
-+ccc9eda1cfcf918fbd1933bca9db01e246d5ef12 v7-2-138
-+0000000000000000000000000000000000000000 v7-2-138
-+72ef7987368de4715599707a85f74a8e6d029c9c v7.2.139
-+72ef7987368de4715599707a85f74a8e6d029c9c v7-2-139
-+0000000000000000000000000000000000000000 v7-2-139
-+c1709e3f8536100dc87defb9f788f895b4e73578 v7.2.140
-+c1709e3f8536100dc87defb9f788f895b4e73578 v7-2-140
-+0000000000000000000000000000000000000000 v7-2-140
-+823e9ddf23f77858f1b866fadf3e4ec5ae5d55b8 v7.2.141
-+823e9ddf23f77858f1b866fadf3e4ec5ae5d55b8 v7-2-141
-+0000000000000000000000000000000000000000 v7-2-141
-+819d952a0a5cc810c52b34e8df400f83eb3353ce v7.2.142
-+819d952a0a5cc810c52b34e8df400f83eb3353ce v7-2-142
-+0000000000000000000000000000000000000000 v7-2-142
-+dc81a4fc63185c72c940e8ade45b5e1534523351 v7.2.143
-+dc81a4fc63185c72c940e8ade45b5e1534523351 v7-2-143
-+0000000000000000000000000000000000000000 v7-2-143
-+cf0979c30cafc4fbe239ebb9de3c427a265207a3 v7.2.144
-+cf0979c30cafc4fbe239ebb9de3c427a265207a3 v7-2-144
-+0000000000000000000000000000000000000000 v7-2-144
-+44fe912b5a1b3961c7bdfbd2a8277d38eeed1e77 v7.2.145
-+44fe912b5a1b3961c7bdfbd2a8277d38eeed1e77 v7-2-145
-+0000000000000000000000000000000000000000 v7-2-145
-+cfcc1421f5e431d3984c3e9ef3f360ceafaef76f v7.2.146
-+cfcc1421f5e431d3984c3e9ef3f360ceafaef76f v7-2-146
-+0000000000000000000000000000000000000000 v7-2-146
-+11a74d2cab9dbe41af2ed5d08b18fbdac14f6e43 v7.2.147
-+11a74d2cab9dbe41af2ed5d08b18fbdac14f6e43 v7-2-147
-+0000000000000000000000000000000000000000 v7-2-147
-+eaecfa88c2469471804768932f823f5b264dd0b9 v7.2.148
-+eaecfa88c2469471804768932f823f5b264dd0b9 v7-2-148
-+0000000000000000000000000000000000000000 v7-2-148
-+e7f6ca5594cf9c6a3902458e0635bec7a7c40d87 v7.2.149
-+e7f6ca5594cf9c6a3902458e0635bec7a7c40d87 v7-2-149
-+0000000000000000000000000000000000000000 v7-2-149
-+3af484dca921e30a0bb1e4975a4fb214c3911f94 v7.2.150
-+3af484dca921e30a0bb1e4975a4fb214c3911f94 v7-2-150
-+0000000000000000000000000000000000000000 v7-2-150
-+96445585f1d9d1abbc74d9c24efbf0408b2cbb12 v7.2.151
-+96445585f1d9d1abbc74d9c24efbf0408b2cbb12 v7-2-151
-+0000000000000000000000000000000000000000 v7-2-151
-+a58806285f2086c1591272962d0b5709a63a74fd v7.2.152
-+a58806285f2086c1591272962d0b5709a63a74fd v7-2-152
-+0000000000000000000000000000000000000000 v7-2-152
-+6f12c4eae4f69d1379427e8b0cee82769f75c35d v7.2.153
-+6f12c4eae4f69d1379427e8b0cee82769f75c35d v7-2-153
-+0000000000000000000000000000000000000000 v7-2-153
-+0e45a0c50acaa31dd4052c57053bb86afd4e711e v7.2.154
-+0e45a0c50acaa31dd4052c57053bb86afd4e711e v7-2-154
-+0000000000000000000000000000000000000000 v7-2-154
-+b88f0420148e5e65c2f71f47ed2324fd83b3bd2b v7.2.155
-+b88f0420148e5e65c2f71f47ed2324fd83b3bd2b v7-2-155
-+0000000000000000000000000000000000000000 v7-2-155
-+ff5a4a71a761f859af81821d340ac609d9309083 v7.2.156
-+ff5a4a71a761f859af81821d340ac609d9309083 v7-2-156
-+0000000000000000000000000000000000000000 v7-2-156
-+e965cf54d887eb9bc20b6668d83541992cc4e8a7 v7.2.157
-+e965cf54d887eb9bc20b6668d83541992cc4e8a7 v7-2-157
-+0000000000000000000000000000000000000000 v7-2-157
-+f765f9c139de3555cd181bd4fa8de50d4aaf41c8 v7.2.158
-+f765f9c139de3555cd181bd4fa8de50d4aaf41c8 v7-2-158
-+0000000000000000000000000000000000000000 v7-2-158
-+456ae41254c975189c55a6ad28b1255936c847fb v7.2.159
-+456ae41254c975189c55a6ad28b1255936c847fb v7-2-159
-+0000000000000000000000000000000000000000 v7-2-159
-+44c01fae1181944162c94bfba919ac9867ceec40 v7.2.160
-+44c01fae1181944162c94bfba919ac9867ceec40 v7-2-160
-+0000000000000000000000000000000000000000 v7-2-160
-+63369d73b551cb0b72202c29dfdf59aa6049a333 v7.2.161
-+63369d73b551cb0b72202c29dfdf59aa6049a333 v7-2-161
-+0000000000000000000000000000000000000000 v7-2-161
-+05c8ff7f128406d2d6052abbf5b92635d3cb0284 v7.2.162
-+05c8ff7f128406d2d6052abbf5b92635d3cb0284 v7-2-162
-+0000000000000000000000000000000000000000 v7-2-162
-+53b47a10825a20cd7684046146393a641d89972f v7.2.163
-+53b47a10825a20cd7684046146393a641d89972f v7-2-163
-+0000000000000000000000000000000000000000 v7-2-163
-+c474f5691c0c6461414e65601a97e817e976099a v7.2.164
-+c474f5691c0c6461414e65601a97e817e976099a v7-2-164
-+0000000000000000000000000000000000000000 v7-2-164
-+5ea1f7516c2cb92422abed07129357a0d5a6a787 v7.2.165
-+5ea1f7516c2cb92422abed07129357a0d5a6a787 v7-2-165
-+0000000000000000000000000000000000000000 v7-2-165
-+954947a70580c6c5d94bd110f974bdf103dd6fd0 v7.2.166
-+954947a70580c6c5d94bd110f974bdf103dd6fd0 v7-2-166
-+0000000000000000000000000000000000000000 v7-2-166
-+92168cfd558c53f1fb0d8014559f16be0a795171 v7.2.167
-+92168cfd558c53f1fb0d8014559f16be0a795171 v7-2-167
-+0000000000000000000000000000000000000000 v7-2-167
-+ad41c6afaa7b0b512cd97dd07a93cc0504508227 v7.2.168
-+ad41c6afaa7b0b512cd97dd07a93cc0504508227 v7-2-168
-+0000000000000000000000000000000000000000 v7-2-168
-+f138491673309c018ffede08cd4858c3bf318dba v7.2.169
-+f138491673309c018ffede08cd4858c3bf318dba v7-2-169
-+0000000000000000000000000000000000000000 v7-2-169
-+6c7719f94811d10db3f86578e5286e5da2fd8514 v7.2.170
-+6c7719f94811d10db3f86578e5286e5da2fd8514 v7-2-170
-+0000000000000000000000000000000000000000 v7-2-170
-+87b6a6a065ab60f6ca4ed094c2afafe16e0b590e v7.2.171
-+87b6a6a065ab60f6ca4ed094c2afafe16e0b590e v7-2-171
-+0000000000000000000000000000000000000000 v7-2-171
-+09f00d57222b6d8de104660ea3f9c6bb42b9d31a v7.2.172
-+09f00d57222b6d8de104660ea3f9c6bb42b9d31a v7-2-172
-+0000000000000000000000000000000000000000 v7-2-172
-+932ff0c0f57bb90d48470b70cc728058e0c56e3e v7.2.173
-+932ff0c0f57bb90d48470b70cc728058e0c56e3e v7-2-173
-+0000000000000000000000000000000000000000 v7-2-173
-+b5c1cb6f8d565b4fa5b714660e8a0d7f8d8f7a5e v7.2.174
-+b5c1cb6f8d565b4fa5b714660e8a0d7f8d8f7a5e v7-2-174
-+0000000000000000000000000000000000000000 v7-2-174
-+6ed4a82fcfc6f1c354906dfaa5e13a192b3246a9 v7.2.175
-+6ed4a82fcfc6f1c354906dfaa5e13a192b3246a9 v7-2-175
-+0000000000000000000000000000000000000000 v7-2-175
-+e8eeeff19eae568f4642cb9f368a1aec6c749a61 v7.2.176
-+e8eeeff19eae568f4642cb9f368a1aec6c749a61 v7-2-176
-+0000000000000000000000000000000000000000 v7-2-176
-+e5602d92da8ccb4822917b2df3e6099344bb4ed4 v7.2.177
-+e5602d92da8ccb4822917b2df3e6099344bb4ed4 v7-2-177
-+0000000000000000000000000000000000000000 v7-2-177
-+6605dca2960f5c597f981c60cd3009e98b173883 v7.2.178
-+6605dca2960f5c597f981c60cd3009e98b173883 v7-2-178
-+0000000000000000000000000000000000000000 v7-2-178
-+c8b87fa14d277702b7ca6b9ba18470c3d64ad83f v7.2.179
-+c8b87fa14d277702b7ca6b9ba18470c3d64ad83f v7-2-179
-+0000000000000000000000000000000000000000 v7-2-179
-+c8f343a465a271cec752fce3efdf5fa8476d3c96 v7.2.180
-+c8f343a465a271cec752fce3efdf5fa8476d3c96 v7-2-180
-+0000000000000000000000000000000000000000 v7-2-180
-+3dd986bfef63bd08894294a0828a1bca737320e1 v7.2.181
-+3dd986bfef63bd08894294a0828a1bca737320e1 v7-2-181
-+0000000000000000000000000000000000000000 v7-2-181
-+605f5c2f77bace46037afea6841f7876af85a4b4 v7.2.182
-+605f5c2f77bace46037afea6841f7876af85a4b4 v7-2-182
-+0000000000000000000000000000000000000000 v7-2-182
-+11472bbcdb6e2effe1c248d09b4d7089fa7a26d2 v7.2.183
-+11472bbcdb6e2effe1c248d09b4d7089fa7a26d2 v7-2-183
-+0000000000000000000000000000000000000000 v7-2-183
-+fc89a4f98a8b2e51dcdd380a7eede9dbc5cd1282 v7.2.184
-+fc89a4f98a8b2e51dcdd380a7eede9dbc5cd1282 v7-2-184
-+0000000000000000000000000000000000000000 v7-2-184
-+ae2251be41f935706f7e634a832ff5ff8a91d023 v7.2.185
-+ae2251be41f935706f7e634a832ff5ff8a91d023 v7-2-185
-+0000000000000000000000000000000000000000 v7-2-185
-+c7537662746d8bae8bcdf8502a23a573a54d3855 v7.2.186
-+c7537662746d8bae8bcdf8502a23a573a54d3855 v7-2-186
-+0000000000000000000000000000000000000000 v7-2-186
-+2928a6b338c3f434723520a12fa378895d4b24cf v7.2.187
-+2928a6b338c3f434723520a12fa378895d4b24cf v7-2-187
-+0000000000000000000000000000000000000000 v7-2-187
-+7a4ad3fb109d42f37f82664390f128dc9b7e44bd v7.2.188
-+7a4ad3fb109d42f37f82664390f128dc9b7e44bd v7-2-188
-+0000000000000000000000000000000000000000 v7-2-188
-+04613e770ec0bd536f04c0fb6d80b76e1af1d6e4 v7.2.189
-+04613e770ec0bd536f04c0fb6d80b76e1af1d6e4 v7-2-189
-+0000000000000000000000000000000000000000 v7-2-189
-+a75120dc3e2691218f3144bbc24369283d74eb53 v7.2.190
-+a75120dc3e2691218f3144bbc24369283d74eb53 v7-2-190
-+0000000000000000000000000000000000000000 v7-2-190
-+afb740b5dfabffdc759d3428254c944bd4badeab v7.2.191
-+afb740b5dfabffdc759d3428254c944bd4badeab v7-2-191
-+0000000000000000000000000000000000000000 v7-2-191
-+f637471a3607a43bab09a2b61913201a5100e636 v7.2.192
-+f637471a3607a43bab09a2b61913201a5100e636 v7-2-192
-+0000000000000000000000000000000000000000 v7-2-192
-+d8b9701a3b7bb58e3f7f2c72145a0dfa33501f31 v7.2.193
-+d8b9701a3b7bb58e3f7f2c72145a0dfa33501f31 v7-2-193
-+0000000000000000000000000000000000000000 v7-2-193
-+044d5e9b1292f694e73ae929eeceaa9685fa0580 v7.2.194
-+044d5e9b1292f694e73ae929eeceaa9685fa0580 v7-2-194
-+0000000000000000000000000000000000000000 v7-2-194
-+430f555d7d152cfa5b7dc43b8b8b0dfa0d520520 v7.2.195
-+430f555d7d152cfa5b7dc43b8b8b0dfa0d520520 v7-2-195
-+0000000000000000000000000000000000000000 v7-2-195
-+d92ac5a199fe88f1630678f81e0b47d5f3f1a921 v7.2.196
-+d92ac5a199fe88f1630678f81e0b47d5f3f1a921 v7-2-196
-+0000000000000000000000000000000000000000 v7-2-196
-+d608343d25e6ce4b1e6435720c48762501b0fc7e v7.2.197
-+d608343d25e6ce4b1e6435720c48762501b0fc7e v7-2-197
-+0000000000000000000000000000000000000000 v7-2-197
-+1a8b518bb993e00f546c4cef8bae9b51f91fe0d7 v7.2.198
-+1a8b518bb993e00f546c4cef8bae9b51f91fe0d7 v7-2-198
-+0000000000000000000000000000000000000000 v7-2-198
-+5d1ca05fa8ffd87bf59d26121e6cff5f91e9afd4 v7.2.199
-+5d1ca05fa8ffd87bf59d26121e6cff5f91e9afd4 v7-2-199
-+0000000000000000000000000000000000000000 v7-2-199
-+4c02214d1465ac2b014a9a1096927ad04eb710e8 v7.2.200
-+4c02214d1465ac2b014a9a1096927ad04eb710e8 v7-2-200
-+0000000000000000000000000000000000000000 v7-2-200
-+062104a823df0f5a225b327b00a3766e41e4610f v7.2.201
-+062104a823df0f5a225b327b00a3766e41e4610f v7-2-201
-+0000000000000000000000000000000000000000 v7-2-201
-+1a00e831244b1e509286ea35a586c6c43dcdaaaa v7.2.202
-+1a00e831244b1e509286ea35a586c6c43dcdaaaa v7-2-202
-+0000000000000000000000000000000000000000 v7-2-202
-+ff9ecf14efe3e2373f2b28fc3e32db4fe19e5ee1 v7.2.203
-+ff9ecf14efe3e2373f2b28fc3e32db4fe19e5ee1 v7-2-203
-+0000000000000000000000000000000000000000 v7-2-203
-+9bc164a2c8143f6019d0b13a2aee4be89da3a9fe v7.2.204
-+9bc164a2c8143f6019d0b13a2aee4be89da3a9fe v7-2-204
-+0000000000000000000000000000000000000000 v7-2-204
-+15e847397be75c6b0590505a9e201c793d070eee v7.2.205
-+15e847397be75c6b0590505a9e201c793d070eee v7-2-205
-+0000000000000000000000000000000000000000 v7-2-205
-+9edc96495747bd354e68dfd76b6ca525d39e715c v7.2.206
-+9edc96495747bd354e68dfd76b6ca525d39e715c v7-2-206
-+0000000000000000000000000000000000000000 v7-2-206
-+1287e2bbeb405c10201d4caa6b2dab284f84efbf v7.2.207
-+1287e2bbeb405c10201d4caa6b2dab284f84efbf v7-2-207
-+0000000000000000000000000000000000000000 v7-2-207
-+afbe4a4c884ceacc349264075afe26e93bc75f07 v7.2.208
-+afbe4a4c884ceacc349264075afe26e93bc75f07 v7-2-208
-+0000000000000000000000000000000000000000 v7-2-208
-+fcf44bf1218f63d94e1807c05f470a4eb87e61a3 v7.2.209
-+fcf44bf1218f63d94e1807c05f470a4eb87e61a3 v7-2-209
-+0000000000000000000000000000000000000000 v7-2-209
-+bddda5d8caa1c6bf174c5e202d3b08a51dbd54a7 v7.2.210
-+bddda5d8caa1c6bf174c5e202d3b08a51dbd54a7 v7-2-210
-+0000000000000000000000000000000000000000 v7-2-210
-+28641f0ed9deb579934416e6161260d4d218f394 v7.2.211
-+28641f0ed9deb579934416e6161260d4d218f394 v7-2-211
-+0000000000000000000000000000000000000000 v7-2-211
-+a7c4842a0be340d06de659940f9396f969bdae77 v7.2.212
-+a7c4842a0be340d06de659940f9396f969bdae77 v7-2-212
-+0000000000000000000000000000000000000000 v7-2-212
-+70a5e723eea2c648aa82f7c8f28a2a5dd5429132 v7.2.213
-+70a5e723eea2c648aa82f7c8f28a2a5dd5429132 v7-2-213
-+0000000000000000000000000000000000000000 v7-2-213
-+802898d3afd12da41c305c495b121e41ed880659 v7.2.214
-+802898d3afd12da41c305c495b121e41ed880659 v7-2-214
-+0000000000000000000000000000000000000000 v7-2-214
-+eac2556d46208785a173d44b4efff339a7e2fab8 v7.2.215
-+eac2556d46208785a173d44b4efff339a7e2fab8 v7-2-215
-+0000000000000000000000000000000000000000 v7-2-215
-+6e9c10c63e25ce9212c5d629c9fdb60b67e6658a v7.2.216
-+6e9c10c63e25ce9212c5d629c9fdb60b67e6658a v7-2-216
-+0000000000000000000000000000000000000000 v7-2-216
-+3dfff6a80088c921b391d493c6c1231e4e64a656 v7.2.217
-+3dfff6a80088c921b391d493c6c1231e4e64a656 v7-2-217
-+0000000000000000000000000000000000000000 v7-2-217
-+f9c55e12835e88f072c46b20ac9dac25a46ca839 v7.2.218
-+f9c55e12835e88f072c46b20ac9dac25a46ca839 v7-2-218
-+0000000000000000000000000000000000000000 v7-2-218
-+e65e50609469f1c5d98ab7396803fb697a78bc17 v7.2.219
-+e65e50609469f1c5d98ab7396803fb697a78bc17 v7-2-219
-+0000000000000000000000000000000000000000 v7-2-219
-+3eb34a777f49f7f656b32c8db829fd0b153abe23 v7.2.220
-+3eb34a777f49f7f656b32c8db829fd0b153abe23 v7-2-220
-+0000000000000000000000000000000000000000 v7-2-220
-+75a69023117c516ca184ed479727f105af12cc39 v7.2.221
-+75a69023117c516ca184ed479727f105af12cc39 v7-2-221
-+0000000000000000000000000000000000000000 v7-2-221
-+cdfc3897c8950aa84c84c1a05158afd32ba71d06 v7.2.222
-+cdfc3897c8950aa84c84c1a05158afd32ba71d06 v7-2-222
-+0000000000000000000000000000000000000000 v7-2-222
-+43d337097e4ceffd268685809aa1e8e0f2a2dbec v7.2.223
-+43d337097e4ceffd268685809aa1e8e0f2a2dbec v7-2-223
-+0000000000000000000000000000000000000000 v7-2-223
-+f798c90439866d3d29eb0fa460d51e4de26f27d8 v7.2.224
-+f798c90439866d3d29eb0fa460d51e4de26f27d8 v7-2-224
-+0000000000000000000000000000000000000000 v7-2-224
-+7caa503b63a9b193f3b9e016a0a466ff8065f2f0 v7.2.225
-+7caa503b63a9b193f3b9e016a0a466ff8065f2f0 v7-2-225
-+0000000000000000000000000000000000000000 v7-2-225
-+9230c45fdde65ac15a42c39d851c68b248fd6836 v7.2.226
-+9230c45fdde65ac15a42c39d851c68b248fd6836 v7-2-226
-+0000000000000000000000000000000000000000 v7-2-226
-+89d1e8ed6c1d6d9a672880fc73df97486b2d5966 v7.2.227
-+89d1e8ed6c1d6d9a672880fc73df97486b2d5966 v7-2-227
-+0000000000000000000000000000000000000000 v7-2-227
-+3f661e42f262e7839e2f04c50a447c53f6c4214c v7.2.228
-+3f661e42f262e7839e2f04c50a447c53f6c4214c v7-2-228
-+0000000000000000000000000000000000000000 v7-2-228
-+f339305875fa7cd21cb4d42619f5b9789a027eb2 v7.2.229
-+f339305875fa7cd21cb4d42619f5b9789a027eb2 v7-2-229
-+0000000000000000000000000000000000000000 v7-2-229
-+dfdaac31aa5df021b444bc2ba64307709d863c63 v7.2.230
-+dfdaac31aa5df021b444bc2ba64307709d863c63 v7-2-230
-+0000000000000000000000000000000000000000 v7-2-230
-+80e5b1da667656a146cad7a749ac9fd2afb659bb v7.2.231
-+80e5b1da667656a146cad7a749ac9fd2afb659bb v7-2-231
-+0000000000000000000000000000000000000000 v7-2-231
-+5bd06a91c65c06847fb0d618c71736d7c73e95d2 v7.2.232
-+5bd06a91c65c06847fb0d618c71736d7c73e95d2 v7-2-232
-+0000000000000000000000000000000000000000 v7-2-232
-+85a99ba3eb5ab45127c996c4e7b4dea2e7a76c54 v7.2.233
-+85a99ba3eb5ab45127c996c4e7b4dea2e7a76c54 v7-2-233
-+0000000000000000000000000000000000000000 v7-2-233
-+d92bab35a16720d2b4e3a2b836fd68df0ee00aca v7.2.234
-+d92bab35a16720d2b4e3a2b836fd68df0ee00aca v7-2-234
-+0000000000000000000000000000000000000000 v7-2-234
-+5ed9395c1864269b18ffad462291eb37c92792f0 v7.2.235
-+5ed9395c1864269b18ffad462291eb37c92792f0 v7-2-235
-+0000000000000000000000000000000000000000 v7-2-235
-+41d8447a84570ca22fe07277a2f8e9db694f66f0 v7.2.236
-+41d8447a84570ca22fe07277a2f8e9db694f66f0 v7-2-236
-+0000000000000000000000000000000000000000 v7-2-236
-+e753954c86e2ce32648d9b12c3c135c22748f75f v7.2.237
-+e753954c86e2ce32648d9b12c3c135c22748f75f v7-2-237
-+0000000000000000000000000000000000000000 v7-2-237
-+d92358c7d6216ff56093067384eb7d96ae47696d v7.2.238
-+d92358c7d6216ff56093067384eb7d96ae47696d v7-2-238
-+0000000000000000000000000000000000000000 v7-2-238
-+fe26299d6f7015c324bef3829e9ecdf7d08526df v7.2.239
-+fe26299d6f7015c324bef3829e9ecdf7d08526df v7-2-239
-+0000000000000000000000000000000000000000 v7-2-239
-+96276cc11d8e68ee320e0f61e20406dcb7a0b995 v7.2.240
-+96276cc11d8e68ee320e0f61e20406dcb7a0b995 v7-2-240
-+0000000000000000000000000000000000000000 v7-2-240
-+40a8e388692b53d36104e9c9b6ed351c01707308 v7.2.241
-+40a8e388692b53d36104e9c9b6ed351c01707308 v7-2-241
-+0000000000000000000000000000000000000000 v7-2-241
-+9d6a886aceb23fcaf8f64f9cf1ebf3f83d14b2da v7.2.242
-+9d6a886aceb23fcaf8f64f9cf1ebf3f83d14b2da v7-2-242
-+0000000000000000000000000000000000000000 v7-2-242
-+a9f561ffbc53a7097873cce7e8a8e1615ac0c38a v7.2.243
-+a9f561ffbc53a7097873cce7e8a8e1615ac0c38a v7-2-243
-+0000000000000000000000000000000000000000 v7-2-243
-+ce6bc4bf2b87f2303bf47fe64ebdd470711973d0 v7.2.244
-+ce6bc4bf2b87f2303bf47fe64ebdd470711973d0 v7-2-244
-+0000000000000000000000000000000000000000 v7-2-244
-+7ff9f75f9c59f7b600ada6ac4b3234398df5f38f v7.2.245
-+7ff9f75f9c59f7b600ada6ac4b3234398df5f38f v7-2-245
-+0000000000000000000000000000000000000000 v7-2-245
-+1ee00a062acbd04360de8b754e834f7ef6025328 v7.2.246
-+1ee00a062acbd04360de8b754e834f7ef6025328 v7-2-246
-+0000000000000000000000000000000000000000 v7-2-246
-+1c64bf25bbcd49a83cc08dd60a6c3e5785266790 v7.2.247
-+1c64bf25bbcd49a83cc08dd60a6c3e5785266790 v7-2-247
-+0000000000000000000000000000000000000000 v7-2-247
-+f234c87ac7e9807004cdc559cf68aa5e04850f5e v7.2.248
-+f234c87ac7e9807004cdc559cf68aa5e04850f5e v7-2-248
-+0000000000000000000000000000000000000000 v7-2-248
-+6ddd55ac6ce50b94713303278888da04d21f489f v7.2.249
-+6ddd55ac6ce50b94713303278888da04d21f489f v7-2-249
-+0000000000000000000000000000000000000000 v7-2-249
-+378e33d47ab09cbb564a2aa6e975659a7f742a67 v7.2.250
-+378e33d47ab09cbb564a2aa6e975659a7f742a67 v7-2-250
-+0000000000000000000000000000000000000000 v7-2-250
-+a3552c04f4e193d981013fa4c077e49d729abb6f v7.2.251
-+a3552c04f4e193d981013fa4c077e49d729abb6f v7-2-251
-+0000000000000000000000000000000000000000 v7-2-251
-+3f1b2e6496debe5ee3068d1916ea15926d5a0f99 v7.2.252
-+3f1b2e6496debe5ee3068d1916ea15926d5a0f99 v7-2-252
-+0000000000000000000000000000000000000000 v7-2-252
-+5d2f6d04c82f900b01c18a7bcf2287a42cf09ffb v7.2.253
-+5d2f6d04c82f900b01c18a7bcf2287a42cf09ffb v7-2-253
-+0000000000000000000000000000000000000000 v7-2-253
-+7317e0e2775877fa0b817e20d29de9eba1a4f95d v7.2.254
-+7317e0e2775877fa0b817e20d29de9eba1a4f95d v7-2-254
-+0000000000000000000000000000000000000000 v7-2-254
-+c51a4f9936751df0e9bbdc454727bced532da3c5 v7.2.255
-+c51a4f9936751df0e9bbdc454727bced532da3c5 v7-2-255
-+0000000000000000000000000000000000000000 v7-2-255
-+26876d0f15e9294aa4fcbfc43260a5f2a703e313 v7.2.256
-+26876d0f15e9294aa4fcbfc43260a5f2a703e313 v7-2-256
-+0000000000000000000000000000000000000000 v7-2-256
-+3c838658fc357dc48e457bdbc1f5a63ae5a73d19 v7.2.257
-+3c838658fc357dc48e457bdbc1f5a63ae5a73d19 v7-2-257
-+0000000000000000000000000000000000000000 v7-2-257
-+0a1d45e2d8e30fc0aef25d5fd7505840d1e0e836 v7.2.258
-+0a1d45e2d8e30fc0aef25d5fd7505840d1e0e836 v7-2-258
-+0000000000000000000000000000000000000000 v7-2-258
-+ba2ac6b5bfb9679edffd08edef9cd0db1237ea12 v7.2.259
-+ba2ac6b5bfb9679edffd08edef9cd0db1237ea12 v7-2-259
-+0000000000000000000000000000000000000000 v7-2-259
-+9edb5759494281d90ae0f312b2ac32c30f51ca50 v7.2.260
-+9edb5759494281d90ae0f312b2ac32c30f51ca50 v7-2-260
-+0000000000000000000000000000000000000000 v7-2-260
-+7d2641e6af75b3cfb4dc29e7c88812dee6c003ae v7.2.261
-+7d2641e6af75b3cfb4dc29e7c88812dee6c003ae v7-2-261
-+0000000000000000000000000000000000000000 v7-2-261
-+8d1db3e3ac5f3f33dcf5f68ea132502082e787db v7.2.262
-+8d1db3e3ac5f3f33dcf5f68ea132502082e787db v7-2-262
-+0000000000000000000000000000000000000000 v7-2-262
-+43a60ac87145f10d827e08b02c8241b359697740 v7.2.263
-+43a60ac87145f10d827e08b02c8241b359697740 v7-2-263
-+0000000000000000000000000000000000000000 v7-2-263
-+4f3857aa17853ab6c36005520ae723af92f50b9e v7.2.264
-+4f3857aa17853ab6c36005520ae723af92f50b9e v7-2-264
-+0000000000000000000000000000000000000000 v7-2-264
-+eb27e3e2df706466ccf9bd00e407d2d3419a81e7 v7.2.265
-+eb27e3e2df706466ccf9bd00e407d2d3419a81e7 v7-2-265
-+0000000000000000000000000000000000000000 v7-2-265
-+2e915ea7110f0dc0507a733e4330ec6cc91e53ff v7.2.266
-+2e915ea7110f0dc0507a733e4330ec6cc91e53ff v7-2-266
-+0000000000000000000000000000000000000000 v7-2-266
-+7bcd81b96e2abb28ffb000145c917bd05e88e5c5 v7.2.267
-+7bcd81b96e2abb28ffb000145c917bd05e88e5c5 v7-2-267
-+0000000000000000000000000000000000000000 v7-2-267
-+11c6bda3b53abb2c98ed9221ba89880eeef7514f v7.2.268
-+11c6bda3b53abb2c98ed9221ba89880eeef7514f v7-2-268
-+0000000000000000000000000000000000000000 v7-2-268
-+82f866f19e91a19ae44e7dbe5eb8747e98acfd85 v7.2.269
-+82f866f19e91a19ae44e7dbe5eb8747e98acfd85 v7-2-269
-+0000000000000000000000000000000000000000 v7-2-269
-+1e52efdc900cab1dd64f6a987bbe5117fa1f9748 v7.2.270
-+1e52efdc900cab1dd64f6a987bbe5117fa1f9748 v7-2-270
-+0000000000000000000000000000000000000000 v7-2-270
-+813a407a63af8773c585b0baae4d22296503ac03 v7.2.271
-+813a407a63af8773c585b0baae4d22296503ac03 v7-2-271
-+0000000000000000000000000000000000000000 v7-2-271
-+e12f574898a9b21e39af38cd57e50ca87ccdea81 v7.2.272
-+e12f574898a9b21e39af38cd57e50ca87ccdea81 v7-2-272
-+0000000000000000000000000000000000000000 v7-2-272
-+27060fe297d0ce872dfa3bc20416f7189b9fbc59 v7.2.273
-+27060fe297d0ce872dfa3bc20416f7189b9fbc59 v7-2-273
-+0000000000000000000000000000000000000000 v7-2-273
-+f018c759e4ed5e1a851c1353c118883efab6a155 v7.2.274
-+f018c759e4ed5e1a851c1353c118883efab6a155 v7-2-274
-+0000000000000000000000000000000000000000 v7-2-274
-+7e0c8a18c915a4c7dccf01be813488e27d03fdc5 v7.2.275
-+7e0c8a18c915a4c7dccf01be813488e27d03fdc5 v7-2-275
-+0000000000000000000000000000000000000000 v7-2-275
-+fd24e02210c9c05b4035ebc717f25ad64d20470a v7.2.276
-+fd24e02210c9c05b4035ebc717f25ad64d20470a v7-2-276
-+0000000000000000000000000000000000000000 v7-2-276
-+5e0c164fc1c25fdfcef07fc03c6634216e6ac066 v7.2.277
-+5e0c164fc1c25fdfcef07fc03c6634216e6ac066 v7-2-277
-+0000000000000000000000000000000000000000 v7-2-277
-+31df87b80e562b6a83b97e2610f539afc94bc440 v7.2.278
-+31df87b80e562b6a83b97e2610f539afc94bc440 v7-2-278
-+0000000000000000000000000000000000000000 v7-2-278
-+b1b09b68d7069755425a2c1849f517f3f9e760d9 v7.2.279
-+b1b09b68d7069755425a2c1849f517f3f9e760d9 v7-2-279
-+0000000000000000000000000000000000000000 v7-2-279
-+f54dab7cebabe6aa275dd6a379b42a15c365af0a v7.2.280
-+f54dab7cebabe6aa275dd6a379b42a15c365af0a v7-2-280
-+0000000000000000000000000000000000000000 v7-2-280
-+b57babddb32b2df9f04b636154a26c51f78d73a2 v7.2.281
-+b57babddb32b2df9f04b636154a26c51f78d73a2 v7-2-281
-+0000000000000000000000000000000000000000 v7-2-281
-+d225695aa7945c27e1eed207e3e683b16824ea87 v7.2.282
-+d225695aa7945c27e1eed207e3e683b16824ea87 v7-2-282
-+0000000000000000000000000000000000000000 v7-2-282
-+75b3f9cc19da44ef65c962deb7a6049c305f49d4 v7.2.283
-+75b3f9cc19da44ef65c962deb7a6049c305f49d4 v7-2-283
-+0000000000000000000000000000000000000000 v7-2-283
-+613517f0b72a1600d58abeb8c44df9b3de1ac997 v7.2.284
-+613517f0b72a1600d58abeb8c44df9b3de1ac997 v7-2-284
-+0000000000000000000000000000000000000000 v7-2-284
-+e5145ff9c9b0dd7b29154c2ffd220988737c99f7 v7.2.285
-+e5145ff9c9b0dd7b29154c2ffd220988737c99f7 v7-2-285
-+0000000000000000000000000000000000000000 v7-2-285
-+1fbbe04a950f9ed82b53ddf67d8e034224fc98ad v7.2.286
-+1fbbe04a950f9ed82b53ddf67d8e034224fc98ad v7-2-286
-+0000000000000000000000000000000000000000 v7-2-286
-+bce687811199a7866c7728b09f00406ac1294745 v7.2.287
-+bce687811199a7866c7728b09f00406ac1294745 v7-2-287
-+0000000000000000000000000000000000000000 v7-2-287
-+5c6a3e894d43ed024662462cf5c6f77feb743132 v7.2.288
-+5c6a3e894d43ed024662462cf5c6f77feb743132 v7-2-288
-+0000000000000000000000000000000000000000 v7-2-288
-+ada3271481ceab448c69588c5cf837c2dbc91987 v7.2.289
-+ada3271481ceab448c69588c5cf837c2dbc91987 v7-2-289
-+0000000000000000000000000000000000000000 v7-2-289
-+4869457735a9133c39202f797a6694301c41abc5 v7.2.290
-+4869457735a9133c39202f797a6694301c41abc5 v7-2-290
-+0000000000000000000000000000000000000000 v7-2-290
-+439f44b874a731461a187dc720edc0c663ab47b2 v7.2.291
-+439f44b874a731461a187dc720edc0c663ab47b2 v7-2-291
-+0000000000000000000000000000000000000000 v7-2-291
-+92809ecb9a476994296e51001486b3934561fc87 v7.2.292
-+92809ecb9a476994296e51001486b3934561fc87 v7-2-292
-+0000000000000000000000000000000000000000 v7-2-292
-+077c15286de8e37250ed1337a448c740c86ee740 v7.2.293
-+077c15286de8e37250ed1337a448c740c86ee740 v7-2-293
-+0000000000000000000000000000000000000000 v7-2-293
-+1f53050b38688e127c4ea67251ab2730002541bd v7.2.294
-+1f53050b38688e127c4ea67251ab2730002541bd v7-2-294
-+0000000000000000000000000000000000000000 v7-2-294
-+6ba0265d1f1b70b8a4a2b3337b18ded763f58f09 v7.2.295
-+6ba0265d1f1b70b8a4a2b3337b18ded763f58f09 v7-2-295
-+0000000000000000000000000000000000000000 v7-2-295
-+fff7028d50c8a44a6285ab23b451d975764b8bd5 v7.2.296
-+fff7028d50c8a44a6285ab23b451d975764b8bd5 v7-2-296
-+0000000000000000000000000000000000000000 v7-2-296
-+91fff9db214e21eeaacd20da86b22629ba6d92cf v7.2.297
-+91fff9db214e21eeaacd20da86b22629ba6d92cf v7-2-297
-+0000000000000000000000000000000000000000 v7-2-297
-+98cdf5c477ec3c3ce8851a517ca3021aeda6573a v7.2.298
-+98cdf5c477ec3c3ce8851a517ca3021aeda6573a v7-2-298
-+0000000000000000000000000000000000000000 v7-2-298
-+071166147fc55311bb86bc9367aca005c4a1447c v7.2.299
-+071166147fc55311bb86bc9367aca005c4a1447c v7-2-299
-+0000000000000000000000000000000000000000 v7-2-299
-+5d5cad78a8380735abb8ca0e7d3ffb11e9eb98e6 v7.2.300
-+5d5cad78a8380735abb8ca0e7d3ffb11e9eb98e6 v7-2-300
-+0000000000000000000000000000000000000000 v7-2-300
-+9e554211caf55e33249908747d9259ac77f10b72 v7.2.301
-+9e554211caf55e33249908747d9259ac77f10b72 v7-2-301
-+0000000000000000000000000000000000000000 v7-2-301
-+20c18291deb21dcc69b6ceb3c11c309a92396fb4 v7.2.302
-+20c18291deb21dcc69b6ceb3c11c309a92396fb4 v7-2-302
-+0000000000000000000000000000000000000000 v7-2-302
-+78e032bb32605c1437e30f7ec3215ad4c0772dd5 v7.2.303
-+78e032bb32605c1437e30f7ec3215ad4c0772dd5 v7-2-303
-+0000000000000000000000000000000000000000 v7-2-303
-+b8ab4ba6b11018e468362bbadf077654f9cb4be3 v7.2.304
-+b8ab4ba6b11018e468362bbadf077654f9cb4be3 v7-2-304
-+0000000000000000000000000000000000000000 v7-2-304
-+f13a0227fb8844e591b6526e4393c8f93dadda29 v7.2.305
-+f13a0227fb8844e591b6526e4393c8f93dadda29 v7-2-305
-+0000000000000000000000000000000000000000 v7-2-305
-+c5a806b29372c033c3b616083c86159a8719635c v7.2.306
-+c5a806b29372c033c3b616083c86159a8719635c v7-2-306
-+0000000000000000000000000000000000000000 v7-2-306
-+bec979a53f47ff6866d390eff6c4ddd4d5ce8a8b v7.2.307
-+bec979a53f47ff6866d390eff6c4ddd4d5ce8a8b v7-2-307
-+0000000000000000000000000000000000000000 v7-2-307
-+a3a4be6bdcdd0f43aea2aa09288e8f515a2c2f05 v7.2.308
-+a3a4be6bdcdd0f43aea2aa09288e8f515a2c2f05 v7-2-308
-+0000000000000000000000000000000000000000 v7-2-308
-+b99303b1483f26763f0c4b6c9d244763ad32d476 v7.2.309
-+b99303b1483f26763f0c4b6c9d244763ad32d476 v7-2-309
-+0000000000000000000000000000000000000000 v7-2-309
-+82885ffcad10aaf6d11170dc45d2721ee222c37c v7.2.310
-+82885ffcad10aaf6d11170dc45d2721ee222c37c v7-2-310
-+0000000000000000000000000000000000000000 v7-2-310
-+79b395ba0ea5e2bc7d27ace528d84d47aa1f5a66 v7.2.311
-+79b395ba0ea5e2bc7d27ace528d84d47aa1f5a66 v7-2-311
-+0000000000000000000000000000000000000000 v7-2-311
-+89189f7aaad9c28435aa5cbd4db359ae54d0769e v7.2.312
-+89189f7aaad9c28435aa5cbd4db359ae54d0769e v7-2-312
-+0000000000000000000000000000000000000000 v7-2-312
-+03c191181749e422b375fbb8cd0763dede7d9beb v7.2.313
-+03c191181749e422b375fbb8cd0763dede7d9beb v7-2-313
-+0000000000000000000000000000000000000000 v7-2-313
-+9cbe94fd5c8f1ca388ccd2be94f17caa33ef093d v7.2.314
-+9cbe94fd5c8f1ca388ccd2be94f17caa33ef093d v7-2-314
-+0000000000000000000000000000000000000000 v7-2-314
-+c58b9479e304ff055b0404d9d73a51da4e9bf7e5 v7.2.315
-+c58b9479e304ff055b0404d9d73a51da4e9bf7e5 v7-2-315
-+0000000000000000000000000000000000000000 v7-2-315
-+966289a3dd7ea565980bb03abc9b52d88378f96c v7.2.316
-+966289a3dd7ea565980bb03abc9b52d88378f96c v7-2-316
-+0000000000000000000000000000000000000000 v7-2-316
-+710da9abc3c1191eec6633477eea663fada04939 v7.2.317
-+710da9abc3c1191eec6633477eea663fada04939 v7-2-317
-+0000000000000000000000000000000000000000 v7-2-317
-+e0e0d1ae601197ad22eaad3b721407a2d0cd6294 v7.2.318
-+e0e0d1ae601197ad22eaad3b721407a2d0cd6294 v7-2-318
-+0000000000000000000000000000000000000000 v7-2-318
-+430793c2a2315e1d0ed2de460071eb83a4f9c97f v7.2.319
-+430793c2a2315e1d0ed2de460071eb83a4f9c97f v7-2-319
-+0000000000000000000000000000000000000000 v7-2-319
-+db3ca1048f7f800fec81696d29ff8a7a3027a64d v7.2.320
-+db3ca1048f7f800fec81696d29ff8a7a3027a64d v7-2-320
-+0000000000000000000000000000000000000000 v7-2-320
-+451bed7e9572b45d2bc98bb5c6680e7bdf4a3fc3 v7.2.321
-+451bed7e9572b45d2bc98bb5c6680e7bdf4a3fc3 v7-2-321
-+0000000000000000000000000000000000000000 v7-2-321
-+d06a461924a3f92575d81c2d1c0c3a74cd0a2929 v7.2.322
-+d06a461924a3f92575d81c2d1c0c3a74cd0a2929 v7-2-322
-+0000000000000000000000000000000000000000 v7-2-322
-+d3571ca62cd6a9138b0aaa4673b09dec78e540e1 v7.2.323
-+d3571ca62cd6a9138b0aaa4673b09dec78e540e1 v7-2-323
-+0000000000000000000000000000000000000000 v7-2-323
-+4c41f0da2a2e35b42334d091130440d1b1479e7b v7.2.324
-+4c41f0da2a2e35b42334d091130440d1b1479e7b v7-2-324
-+0000000000000000000000000000000000000000 v7-2-324
-+be1d64f82db26bf7892605332aea6126d6343e47 v7.2.325
-+be1d64f82db26bf7892605332aea6126d6343e47 v7-2-325
-+0000000000000000000000000000000000000000 v7-2-325
-+66b1822ba176a2f7d7e2878b2907af6d86e5b5c8 v7.2.326
-+66b1822ba176a2f7d7e2878b2907af6d86e5b5c8 v7-2-326
-+0000000000000000000000000000000000000000 v7-2-326
-+07de57cbcb25d63bf515b67de654dd89004888fa v7.2.327
-+07de57cbcb25d63bf515b67de654dd89004888fa v7-2-327
-+0000000000000000000000000000000000000000 v7-2-327
-+5c6fa259c9236cfacc66dfeade89414479b5aa58 v7.2.328
-+5c6fa259c9236cfacc66dfeade89414479b5aa58 v7-2-328
-+0000000000000000000000000000000000000000 v7-2-328
-+70c67b1bb1f1aeddc1dea55438e11ae6f9ca3d14 v7.2.329
-+70c67b1bb1f1aeddc1dea55438e11ae6f9ca3d14 v7-2-329
-+0000000000000000000000000000000000000000 v7-2-329
-+d5867fd6b2b72d8095795f4db9aea88035e49e5c v7.2.330
-+d5867fd6b2b72d8095795f4db9aea88035e49e5c v7-2-330
-+0000000000000000000000000000000000000000 v7-2-330
-+e77e3c11f5076d6eae8a67bd2f531f72d33eed7e v7.2.331
-+e77e3c11f5076d6eae8a67bd2f531f72d33eed7e v7-2-331
-+0000000000000000000000000000000000000000 v7-2-331
-+d433f43849ba1dd0006dbc4d794cda3502fc24af v7.2.332
-+d433f43849ba1dd0006dbc4d794cda3502fc24af v7-2-332
-+0000000000000000000000000000000000000000 v7-2-332
-+85da0376313011aa957a9132df2686c9aba079d0 v7.2.333
-+85da0376313011aa957a9132df2686c9aba079d0 v7-2-333
-+0000000000000000000000000000000000000000 v7-2-333
-+351bf13db8071317d7add1e55a50ae284ff53a4f v7.2.334
-+351bf13db8071317d7add1e55a50ae284ff53a4f v7-2-334
-+0000000000000000000000000000000000000000 v7-2-334
-+23d366df193868572eacd04e1a32bc2283a30e56 v7.2.335
-+23d366df193868572eacd04e1a32bc2283a30e56 v7-2-335
-+0000000000000000000000000000000000000000 v7-2-335
-+afcf9db31561c7fe2b62b346aca751bf7bb31bc3 v7.2.336
-+afcf9db31561c7fe2b62b346aca751bf7bb31bc3 v7-2-336
-+0000000000000000000000000000000000000000 v7-2-336
-+ef2890033e88391e92eba7d1ade8a43e9e200abc v7.2.337
-+ef2890033e88391e92eba7d1ade8a43e9e200abc v7-2-337
-+0000000000000000000000000000000000000000 v7-2-337
-+057029bf347002408541ec73da1373ae64002a3f v7.2.338
-+057029bf347002408541ec73da1373ae64002a3f v7-2-338
-+0000000000000000000000000000000000000000 v7-2-338
-+94f44da44d2e0874a562918005789418793bb507 v7.2.339
-+94f44da44d2e0874a562918005789418793bb507 v7-2-339
-+0000000000000000000000000000000000000000 v7-2-339
-+79b8d69a4588b93516410e519bb9459242f46d81 v7.2.340
-+79b8d69a4588b93516410e519bb9459242f46d81 v7-2-340
-+0000000000000000000000000000000000000000 v7-2-340
-+4aa4510d548c9fff9d8317977e3801a68fe2aaba v7.2.341
-+4aa4510d548c9fff9d8317977e3801a68fe2aaba v7-2-341
-+0000000000000000000000000000000000000000 v7-2-341
-+e9e3355861ba8785dba619e2358a239a9443a580 v7.2.342
-+e9e3355861ba8785dba619e2358a239a9443a580 v7-2-342
-+0000000000000000000000000000000000000000 v7-2-342
-+f815aad6c05549bfa36f193dc57b1f03d646bb79 v7.2.343
-+f815aad6c05549bfa36f193dc57b1f03d646bb79 v7-2-343
-+0000000000000000000000000000000000000000 v7-2-343
-+fb1222c880fc037f9b76580423c5a57c74acba28 v7.2.344
-+fb1222c880fc037f9b76580423c5a57c74acba28 v7-2-344
-+0000000000000000000000000000000000000000 v7-2-344
-+1da25369227bead09cf603ebfa93ebe1d206c871 v7.2.345
-+1da25369227bead09cf603ebfa93ebe1d206c871 v7-2-345
-+0000000000000000000000000000000000000000 v7-2-345
-+2f6e519726f19c2f6cb58e9cd75e827eaafa0ab3 v7.2.346
-+2f6e519726f19c2f6cb58e9cd75e827eaafa0ab3 v7-2-346
-+0000000000000000000000000000000000000000 v7-2-346
-+dae4cd29a0b7d899201c2e6a10f0441e7173bcfd v7.2.347
-+dae4cd29a0b7d899201c2e6a10f0441e7173bcfd v7-2-347
-+0000000000000000000000000000000000000000 v7-2-347
-+1378bc45ebe5754c0d3ec64d37810eaad3a544f3 v7.2.348
-+1378bc45ebe5754c0d3ec64d37810eaad3a544f3 v7-2-348
-+0000000000000000000000000000000000000000 v7-2-348
-+f398e0cc5b7a032f327aa2f33b71c3bb6a22d46b v7.2.349
-+f398e0cc5b7a032f327aa2f33b71c3bb6a22d46b v7-2-349
-+0000000000000000000000000000000000000000 v7-2-349
-+9b78bb3794ba4dba44ab3eab9ab2984797e839d6 v7.2.350
-+9b78bb3794ba4dba44ab3eab9ab2984797e839d6 v7-2-350
-+0000000000000000000000000000000000000000 v7-2-350
-+2bd96108392ec08b6c384893939968d94bab4dbb v7.2.351
-+2bd96108392ec08b6c384893939968d94bab4dbb v7-2-351
-+0000000000000000000000000000000000000000 v7-2-351
-+8e2d14a3e7d2860527d39f0b662beade84db9d23 v7.2.352
-+8e2d14a3e7d2860527d39f0b662beade84db9d23 v7-2-352
-+0000000000000000000000000000000000000000 v7-2-352
-+98a2a6e6b966668c810986b6ddd4820bc09db426 v7.2.353
-+98a2a6e6b966668c810986b6ddd4820bc09db426 v7-2-353
-+0000000000000000000000000000000000000000 v7-2-353
-+63613d8d7e4dff96ba2f34be50fa4b002f56cff6 v7.2.354
-+63613d8d7e4dff96ba2f34be50fa4b002f56cff6 v7-2-354
-+0000000000000000000000000000000000000000 v7-2-354
-+4483ee552619492639c69f4345d6554b7bcbef2b v7.2.355
-+4483ee552619492639c69f4345d6554b7bcbef2b v7-2-355
-+0000000000000000000000000000000000000000 v7-2-355
-+8a0a8f10b43e02d44ff26d608cd80fb61ce4773d v7.2.356
-+8a0a8f10b43e02d44ff26d608cd80fb61ce4773d v7-2-356
-+0000000000000000000000000000000000000000 v7-2-356
-+5bedef935ce38062e866c72aec633d38d95dfbf2 v7.2.357
-+5bedef935ce38062e866c72aec633d38d95dfbf2 v7-2-357
-+0000000000000000000000000000000000000000 v7-2-357
-+1bb06e6512a2fc961eaf9a8e7a749247c408e7f6 v7.2.358
-+1bb06e6512a2fc961eaf9a8e7a749247c408e7f6 v7-2-358
-+0000000000000000000000000000000000000000 v7-2-358
-+903fcd726d9058a0b0c14a85cadf31aae3ad27a2 v7.2.359
-+903fcd726d9058a0b0c14a85cadf31aae3ad27a2 v7-2-359
-+0000000000000000000000000000000000000000 v7-2-359
-+1c7a66d820e4dc9b0a9f696ed6e7a59cd9a20e19 v7.2.360
-+1c7a66d820e4dc9b0a9f696ed6e7a59cd9a20e19 v7-2-360
-+0000000000000000000000000000000000000000 v7-2-360
-+d8983769c9ddbffc13ab427a5e44693070d7788a v7.2.361
-+d8983769c9ddbffc13ab427a5e44693070d7788a v7-2-361
-+0000000000000000000000000000000000000000 v7-2-361
-+d7ce3adb8dda9d7acf8aef39cda0b936ce3f3d15 v7.2.362
-+d7ce3adb8dda9d7acf8aef39cda0b936ce3f3d15 v7-2-362
-+0000000000000000000000000000000000000000 v7-2-362
-+5abd3e3c0085de46b37ac9bcee90be8160dccafe v7.2.363
-+5abd3e3c0085de46b37ac9bcee90be8160dccafe v7-2-363
-+0000000000000000000000000000000000000000 v7-2-363
-+fa7e62dd58d779149c96570bc8943f1a1b035e3b v7.2.364
-+fa7e62dd58d779149c96570bc8943f1a1b035e3b v7-2-364
-+0000000000000000000000000000000000000000 v7-2-364
-+7b0e89b77216baf928145ce14741650806004c31 v7.2.365
-+7b0e89b77216baf928145ce14741650806004c31 v7-2-365
-+0000000000000000000000000000000000000000 v7-2-365
-+8ca3c9ad0bee0c265345decd180d971197e36194 v7.2.366
-+8ca3c9ad0bee0c265345decd180d971197e36194 v7-2-366
-+0000000000000000000000000000000000000000 v7-2-366
-+24eb7921b8f004c8c462297cf53afad8f5578243 v7.2.367
-+24eb7921b8f004c8c462297cf53afad8f5578243 v7-2-367
-+0000000000000000000000000000000000000000 v7-2-367
-+4bac7ed34007ad41b7870888c739c1b4a129cfc3 v7.2.368
-+4bac7ed34007ad41b7870888c739c1b4a129cfc3 v7-2-368
-+0000000000000000000000000000000000000000 v7-2-368
-+5a84b6388a5589d6f3b53a1aa6f8fcc369989a0e v7.2.369
-+5a84b6388a5589d6f3b53a1aa6f8fcc369989a0e v7-2-369
-+0000000000000000000000000000000000000000 v7-2-369
-+c11845a465ae63ea7f9942484988dd4e441c891f v7.2.370
-+c11845a465ae63ea7f9942484988dd4e441c891f v7-2-370
-+0000000000000000000000000000000000000000 v7-2-370
-+3112fcc8923830fd9060c76d1ec9c75c59487d59 v7.2.371
-+3112fcc8923830fd9060c76d1ec9c75c59487d59 v7-2-371
-+0000000000000000000000000000000000000000 v7-2-371
-+4ec11bb387a559fb6168fdae70e7d0ad78e15c3a v7.2.372
-+4ec11bb387a559fb6168fdae70e7d0ad78e15c3a v7-2-372
-+0000000000000000000000000000000000000000 v7-2-372
-+fd8864aeb52aa72333573d62f0a9913b0d3e8c8d v7.2.373
-+fd8864aeb52aa72333573d62f0a9913b0d3e8c8d v7-2-373
-+0000000000000000000000000000000000000000 v7-2-373
-+53d475dff0e363bfeb31d6d171337cb19c309098 v7.2.374
-+53d475dff0e363bfeb31d6d171337cb19c309098 v7-2-374
-+0000000000000000000000000000000000000000 v7-2-374
-+95b659982b7c17ff93304a37f43be8dc508e20dd v7.2.375
-+95b659982b7c17ff93304a37f43be8dc508e20dd v7-2-375
-+0000000000000000000000000000000000000000 v7-2-375
-+98cc757f7e3dbff20ade108b82582d7a7d88ed33 v7.2.376
-+98cc757f7e3dbff20ade108b82582d7a7d88ed33 v7-2-376
-+0000000000000000000000000000000000000000 v7-2-376
-+0e4631bf94411717193870a5ad7d62945d06cadc v7.2.377
-+0e4631bf94411717193870a5ad7d62945d06cadc v7-2-377
-+0000000000000000000000000000000000000000 v7-2-377
-+e319a4fe6e32e0297f1be2c1a8c763f7f7b26cd7 v7.2.378
-+e319a4fe6e32e0297f1be2c1a8c763f7f7b26cd7 v7-2-378
-+0000000000000000000000000000000000000000 v7-2-378
-+8aa3cd045aefc5d324d820f2239ca1f533e9632f v7.2.379
-+8aa3cd045aefc5d324d820f2239ca1f533e9632f v7-2-379
-+0000000000000000000000000000000000000000 v7-2-379
-+6510d834609f78327cf78465d6849601bfe39108 v7.2.380
-+6510d834609f78327cf78465d6849601bfe39108 v7-2-380
-+0000000000000000000000000000000000000000 v7-2-380
-+8f72e3512b437d2390860bf9fb6605b778cb0346 v7.2.381
-+8f72e3512b437d2390860bf9fb6605b778cb0346 v7-2-381
-+0000000000000000000000000000000000000000 v7-2-381
-+c1f67ce5740adaa7e1e164d706f204252711d5df v7.2.382
-+c1f67ce5740adaa7e1e164d706f204252711d5df v7-2-382
-+0000000000000000000000000000000000000000 v7-2-382
-+7d121c69f540272878af6fafdf658443360a698b v7.2.383
-+7d121c69f540272878af6fafdf658443360a698b v7-2-383
-+0000000000000000000000000000000000000000 v7-2-383
-+8ae4de2d02af315b1c0abc2230c3ccd5a31f1013 v7.2.384
-+8ae4de2d02af315b1c0abc2230c3ccd5a31f1013 v7-2-384
-+0000000000000000000000000000000000000000 v7-2-384
-+907cf09fbb32d7b189d3372f3c4f1220f198a9d1 v7.2.385
-+907cf09fbb32d7b189d3372f3c4f1220f198a9d1 v7-2-385
-+0000000000000000000000000000000000000000 v7-2-385
-+89dc68c0ab6fd676ade26cca39e16b81896a5069 v7.2.386
-+89dc68c0ab6fd676ade26cca39e16b81896a5069 v7-2-386
-+0000000000000000000000000000000000000000 v7-2-386
-+09cc86b6665358a20d9faf54ce8eec45ca4fc5de v7.2.387
-+09cc86b6665358a20d9faf54ce8eec45ca4fc5de v7-2-387
-+0000000000000000000000000000000000000000 v7-2-387
-+8562c6804861cd26020e1a004edb1c1b218af9f2 v7.2.388
-+8562c6804861cd26020e1a004edb1c1b218af9f2 v7-2-388
-+0000000000000000000000000000000000000000 v7-2-388
-+15674e198164c10b08e138f4c18b58e76306d9be v7.2.389
-+15674e198164c10b08e138f4c18b58e76306d9be v7-2-389
-+0000000000000000000000000000000000000000 v7-2-389
-+4a4287c09953fff6a65f7324c5f223f7359c46f2 v7.2.390
-+4a4287c09953fff6a65f7324c5f223f7359c46f2 v7-2-390
-+0000000000000000000000000000000000000000 v7-2-390
-+3cdf2a653e005387c4deeceb7281d62fffd34687 v7.2.391
-+3cdf2a653e005387c4deeceb7281d62fffd34687 v7-2-391
-+0000000000000000000000000000000000000000 v7-2-391
-+6c3c2e464a9628bcbfe21317b8fd90ae27076735 v7.2.392
-+6c3c2e464a9628bcbfe21317b8fd90ae27076735 v7-2-392
-+0000000000000000000000000000000000000000 v7-2-392
-+0f552ca271c27681ed126261ce49e52ef144175e v7.2.393
-+0f552ca271c27681ed126261ce49e52ef144175e v7-2-393
-+0000000000000000000000000000000000000000 v7-2-393
-+aab202d244b6bb286a62508a432222d26d5d215e v7.2.394
-+aab202d244b6bb286a62508a432222d26d5d215e v7-2-394
-+0000000000000000000000000000000000000000 v7-2-394
-+6b5d641bcdd45e53c24e0b4e0b6085a696e336a8 v7.2.395
-+6b5d641bcdd45e53c24e0b4e0b6085a696e336a8 v7-2-395
-+0000000000000000000000000000000000000000 v7-2-395
-+85ad197907065fd92f29bf3dcc190779a20aba46 v7.2.396
-+85ad197907065fd92f29bf3dcc190779a20aba46 v7-2-396
-+0000000000000000000000000000000000000000 v7-2-396
-+5a97d0c03b593699d6e0bb2ea49073dca03153f8 v7.2.397
-+5a97d0c03b593699d6e0bb2ea49073dca03153f8 v7-2-397
-+0000000000000000000000000000000000000000 v7-2-397
-+5fd44cf99b6ddccdadcf70ff8351999e4bf5dc38 v7.2.398
-+5fd44cf99b6ddccdadcf70ff8351999e4bf5dc38 v7-2-398
-+0000000000000000000000000000000000000000 v7-2-398
-+2832243e801ec537589809059f65efb3b8a57f93 v7.2.399
-+2832243e801ec537589809059f65efb3b8a57f93 v7-2-399
-+0000000000000000000000000000000000000000 v7-2-399
-+4be6da0fa3d9978434273d3abc021d7e68455864 v7.2.400
-+4be6da0fa3d9978434273d3abc021d7e68455864 v7-2-400
-+0000000000000000000000000000000000000000 v7-2-400
-+63bf37c1e7a2c323b368df6e926b026139ec3144 v7.2.401
-+63bf37c1e7a2c323b368df6e926b026139ec3144 v7-2-401
-+0000000000000000000000000000000000000000 v7-2-401
-+11155435487064d64efb296f7c2966baae8d27e3 v7.2.402
-+11155435487064d64efb296f7c2966baae8d27e3 v7-2-402
-+0000000000000000000000000000000000000000 v7-2-402
-+20d9fc2f13a4132d6344fb6457040b02720774cf v7.2.403
-+20d9fc2f13a4132d6344fb6457040b02720774cf v7-2-403
-+0000000000000000000000000000000000000000 v7-2-403
-+476336a5ae9588c4a13721b5ec1cd792fa44ea2c v7.2.404
-+476336a5ae9588c4a13721b5ec1cd792fa44ea2c v7-2-404
-+0000000000000000000000000000000000000000 v7-2-404
-+b1706a94f9f9638cc0ecb624dd7519cc9beb6ca1 v7.2.405
-+b1706a94f9f9638cc0ecb624dd7519cc9beb6ca1 v7-2-405
-+0000000000000000000000000000000000000000 v7-2-405
-+dc8a5699253b833ec796460f9ac877d02ab7b165 v7.2.406
-+dc8a5699253b833ec796460f9ac877d02ab7b165 v7-2-406
-+0000000000000000000000000000000000000000 v7-2-406
-+b8744d1982d1fe26fc41d62b6e84fd315dd6c941 v7.2.407
-+b8744d1982d1fe26fc41d62b6e84fd315dd6c941 v7-2-407
-+0000000000000000000000000000000000000000 v7-2-407
-+e038754d419a3ab5ec25d014513bf8773cb9459c v7.2.408
-+e038754d419a3ab5ec25d014513bf8773cb9459c v7-2-408
-+0000000000000000000000000000000000000000 v7-2-408
-+4e22214f84640bdfbad591ec2da5eef9bc328dc5 v7.2.409
-+4e22214f84640bdfbad591ec2da5eef9bc328dc5 v7-2-409
-+0000000000000000000000000000000000000000 v7-2-409
-+a16af0072ea82b2dcd265d050b349850cf8f28b6 v7.2.410
-+a16af0072ea82b2dcd265d050b349850cf8f28b6 v7-2-410
-+0000000000000000000000000000000000000000 v7-2-410
-+24100651daa9d7140d33f298c987c9d42bd919bf v7.2.411
-+24100651daa9d7140d33f298c987c9d42bd919bf v7-2-411
-+0000000000000000000000000000000000000000 v7-2-411
-+279380a812add1307a2a20c444f2334b7a45106d v7.2.412
-+279380a812add1307a2a20c444f2334b7a45106d v7-2-412
-+0000000000000000000000000000000000000000 v7-2-412
-+8ef9da918a98e7f8fecb4d88914e4691a8da88b8 v7.2.413
-+8ef9da918a98e7f8fecb4d88914e4691a8da88b8 v7-2-413
-+0000000000000000000000000000000000000000 v7-2-413
-+89300f5e013c7d217d5f891113a57705cdeb017c v7.2.414
-+89300f5e013c7d217d5f891113a57705cdeb017c v7-2-414
-+0000000000000000000000000000000000000000 v7-2-414
-+2b273c71a14b7d0e64b6ae9bdcf60ef7e4d45aa8 v7.2.415
-+2b273c71a14b7d0e64b6ae9bdcf60ef7e4d45aa8 v7-2-415
-+0000000000000000000000000000000000000000 v7-2-415
-+e9c9f37be3066d64d7d87d1b314b2913d0d751f6 v7.2.416
-+e9c9f37be3066d64d7d87d1b314b2913d0d751f6 v7-2-416
-+0000000000000000000000000000000000000000 v7-2-416
-+7aee5e68548a7cd13c74e67439f8c3b8ae6327be v7.2.417
-+7aee5e68548a7cd13c74e67439f8c3b8ae6327be v7-2-417
-+0000000000000000000000000000000000000000 v7-2-417
-+431ebc9412a816440aaed887a3d318deb08c6407 v7.2.418
-+431ebc9412a816440aaed887a3d318deb08c6407 v7-2-418
-+0000000000000000000000000000000000000000 v7-2-418
-+dabcabce3f9d67ee2cd22246ea16769513982910 v7.2.419
-+dabcabce3f9d67ee2cd22246ea16769513982910 v7-2-419
-+0000000000000000000000000000000000000000 v7-2-419
-+78b9d5dce950b348235ee667f8573c6592920088 v7.2.420
-+78b9d5dce950b348235ee667f8573c6592920088 v7-2-420
-+0000000000000000000000000000000000000000 v7-2-420
-+35effbd07a25d1df122e795165d26ceb65510c3a v7.2.421
-+35effbd07a25d1df122e795165d26ceb65510c3a v7-2-421
-+0000000000000000000000000000000000000000 v7-2-421
-+12aba62fa7c6812ec46eb3be6759d82a4a651a93 v7.2.422
-+12aba62fa7c6812ec46eb3be6759d82a4a651a93 v7-2-422
-+0000000000000000000000000000000000000000 v7-2-422
-+e10d3c07344929c21377722bd3c66d3c54ef582e v7.2.423
-+e10d3c07344929c21377722bd3c66d3c54ef582e v7-2-423
-+0000000000000000000000000000000000000000 v7-2-423
-+c60d231453cfd59c8b313a894027cecc0a4315ec v7.2.424
-+c60d231453cfd59c8b313a894027cecc0a4315ec v7-2-424
-+0000000000000000000000000000000000000000 v7-2-424
-+79d111ea8ef64e7bab0a5e27b7d5903f10e45a43 v7.2.425
-+79d111ea8ef64e7bab0a5e27b7d5903f10e45a43 v7-2-425
-+0000000000000000000000000000000000000000 v7-2-425
-+2775dcd056031e0a7314da9a9e0b2cebbb089525 v7.2.426
-+2775dcd056031e0a7314da9a9e0b2cebbb089525 v7-2-426
-+0000000000000000000000000000000000000000 v7-2-426
-+de0e7ca61893d31a4a5ad8e129691650e31477c9 v7.2.427
-+de0e7ca61893d31a4a5ad8e129691650e31477c9 v7-2-427
-+0000000000000000000000000000000000000000 v7-2-427
-+c17a42da3920c34a75c17fe8696d2f04bf683f24 v7.2.428
-+c17a42da3920c34a75c17fe8696d2f04bf683f24 v7-2-428
-+0000000000000000000000000000000000000000 v7-2-428
-+2bd29808d1f640f027ab7a4a4f2b5b6a0e6c8e38 v7.2.429
-+2bd29808d1f640f027ab7a4a4f2b5b6a0e6c8e38 v7-2-429
-+0000000000000000000000000000000000000000 v7-2-429
-+99b225e0dbc1989ecae75200aaf0e5329e6bedac v7.2.430
-+99b225e0dbc1989ecae75200aaf0e5329e6bedac v7-2-430
-+0000000000000000000000000000000000000000 v7-2-430
-+4c8008ab94d8da38529991004a56e65547faed15 v7.2.431
-+4c8008ab94d8da38529991004a56e65547faed15 v7-2-431
-+0000000000000000000000000000000000000000 v7-2-431
-+4269a0673478b966f8d0e08b5681ea0cf2acd68d v7.2.432
-+4269a0673478b966f8d0e08b5681ea0cf2acd68d v7-2-432
-+0000000000000000000000000000000000000000 v7-2-432
-+ae22c450546cfc001c90ca17999318e053838c30 v7.2.433
-+ae22c450546cfc001c90ca17999318e053838c30 v7-2-433
-+0000000000000000000000000000000000000000 v7-2-433
-+7b875bfb39b871d5d40525d579e30358bab6be1a v7.2.434
-+7b875bfb39b871d5d40525d579e30358bab6be1a v7-2-434
-+0000000000000000000000000000000000000000 v7-2-434
-+cf8f86128f4c428af72c116cc53d92ad7c1e40e9 v7.2.435
-+cf8f86128f4c428af72c116cc53d92ad7c1e40e9 v7-2-435
-+0000000000000000000000000000000000000000 v7-2-435
-+e12b9d992389cc770eb72e16932313cd0905190f v7.2.436
-+e12b9d992389cc770eb72e16932313cd0905190f v7-2-436
-+0000000000000000000000000000000000000000 v7-2-436
-+ecb9c2b70b0f6e9918e75bf4e1ac887748a2313a v7.2.437
-+ecb9c2b70b0f6e9918e75bf4e1ac887748a2313a v7-2-437
-+0000000000000000000000000000000000000000 v7-2-437
-+d44112feb8153ffaa6ab8ec6442c5c4af0951728 v7.2.438
-+d44112feb8153ffaa6ab8ec6442c5c4af0951728 v7-2-438
-+0000000000000000000000000000000000000000 v7-2-438
-+ea7c2d89b76bf42eb0da3459e8813104d76bca02 v7.2.439
-+ea7c2d89b76bf42eb0da3459e8813104d76bca02 v7-2-439
-+0000000000000000000000000000000000000000 v7-2-439
-+cd6e6876308e4e0fb621431646ebeec4b49a2504 v7.2.440
-+cd6e6876308e4e0fb621431646ebeec4b49a2504 v7-2-440
-+0000000000000000000000000000000000000000 v7-2-440
-+f838615313cd5832efa624526a7575668fb40da9 v7.2.441
-+f838615313cd5832efa624526a7575668fb40da9 v7-2-441
-+0000000000000000000000000000000000000000 v7-2-441
-+b0ebf9d121ff99eb2e1697a35dca528e7ecb8f4c v7.2.442
-+b0ebf9d121ff99eb2e1697a35dca528e7ecb8f4c v7-2-442
-+0000000000000000000000000000000000000000 v7-2-442
-+0c1e413c32f1f3f8e28ebf8a030cedeeb664cd46 v7.2.443
-+0c1e413c32f1f3f8e28ebf8a030cedeeb664cd46 v7-2-443
-+0000000000000000000000000000000000000000 v7-2-443
-+dc8ee74574f80c7eabc90ff7a3973f882993cab5 v7.2.444
-+dc8ee74574f80c7eabc90ff7a3973f882993cab5 v7-2-444
-+0000000000000000000000000000000000000000 v7-2-444
-+cb94c42c0e1a1e00f643be8a96939e42c3afff81 v7.2.445
-+cb94c42c0e1a1e00f643be8a96939e42c3afff81 v7-2-445
-+0000000000000000000000000000000000000000 v7-2-445
-+b619655b31db9469f6fe41932daff7a566079097 v7.2.446
-+b619655b31db9469f6fe41932daff7a566079097 v7-2-446
-+0000000000000000000000000000000000000000 v7-2-446
-+ee53a39d58960b8726c53c76bef8d16159ed2b10 v7.3
-+ee53a39d58960b8726c53c76bef8d16159ed2b10 v7-3
-+0000000000000000000000000000000000000000 v7-3
-+f0915ae869cf7f143b7bb1a8c24b581f5e3a0909 v7.3.001
-+f0915ae869cf7f143b7bb1a8c24b581f5e3a0909 v7-3-001
-+0000000000000000000000000000000000000000 v7-3-001
-+fde086181841aa124af8a38b5c0bba132de3ea94 v7.3.002
-+fde086181841aa124af8a38b5c0bba132de3ea94 v7-3-002
-+0000000000000000000000000000000000000000 v7-3-002
-+2a8bf2ba504f422d53dac30da8b58d76e54b4428 v7.3.003
-+2a8bf2ba504f422d53dac30da8b58d76e54b4428 v7-3-003
-+0000000000000000000000000000000000000000 v7-3-003
-+766918de9e3a76816ebdee3b90cdb1f9f76bca6a v7.3.004
-+766918de9e3a76816ebdee3b90cdb1f9f76bca6a v7-3-004
-+0000000000000000000000000000000000000000 v7-3-004
-+1c00ea3641a8a1e58e70cd51ab831003bdb41d50 v7.3.005
-+1c00ea3641a8a1e58e70cd51ab831003bdb41d50 v7-3-005
-+0000000000000000000000000000000000000000 v7-3-005
-+06aa43dde5610dff598940ccde1dd25a617a1a52 v7.3.006
-+06aa43dde5610dff598940ccde1dd25a617a1a52 v7-3-006
-+0000000000000000000000000000000000000000 v7-3-006
-+2cdbc91795ca0d15343fe954ae2af71f830f9656 v7.3.007
-+2cdbc91795ca0d15343fe954ae2af71f830f9656 v7-3-007
-+0000000000000000000000000000000000000000 v7-3-007
-+7c2e6ba1d702579761d7ddc4020797bbc97805e3 v7.3.008
-+7c2e6ba1d702579761d7ddc4020797bbc97805e3 v7-3-008
-+0000000000000000000000000000000000000000 v7-3-008
-+f9bd6784f393aa771d497611b75a8623c20a8269 v7.3.009
-+f9bd6784f393aa771d497611b75a8623c20a8269 v7-3-009
-+0000000000000000000000000000000000000000 v7-3-009
-+03d49a7c83196a406cbd12f4898fc988731af927 v7.3.010
-+03d49a7c83196a406cbd12f4898fc988731af927 v7-3-010
-+0000000000000000000000000000000000000000 v7-3-010
-+538cd3220874d9a98abc7219e7be6666e49f853b v7.3.011
-+538cd3220874d9a98abc7219e7be6666e49f853b v7-3-011
-+0000000000000000000000000000000000000000 v7-3-011
-+5df74a812b7b20bd7e33634453c645be0eb8a2c4 v7.3.012
-+5df74a812b7b20bd7e33634453c645be0eb8a2c4 v7-3-012
-+0000000000000000000000000000000000000000 v7-3-012
-+d5681bd2661b3e75b506a7d6ffe8bd053e04608b v7.3.013
-+d5681bd2661b3e75b506a7d6ffe8bd053e04608b v7-3-013
-+0000000000000000000000000000000000000000 v7-3-013
-+b57f2617965fd682c6284a706a999b58f00bdc3c v7.3.014
-+b57f2617965fd682c6284a706a999b58f00bdc3c v7-3-014
-+0000000000000000000000000000000000000000 v7-3-014
-+88095f75d63b5a486f603cf28801df0118ed1218 v7.3.015
-+88095f75d63b5a486f603cf28801df0118ed1218 v7-3-015
-+0000000000000000000000000000000000000000 v7-3-015
-+2c5e70e2858fa46c7b80b022f217103b8c90e9e9 v7.3.016
-+2c5e70e2858fa46c7b80b022f217103b8c90e9e9 v7-3-016
-+0000000000000000000000000000000000000000 v7-3-016
-+103dea6545430092db1851d1b712a742af1a74f2 v7.3.017
-+103dea6545430092db1851d1b712a742af1a74f2 v7-3-017
-+0000000000000000000000000000000000000000 v7-3-017
-+56b638f2029e728f1fb20382a7184a8e4ebdce9f v7.3.018
-+56b638f2029e728f1fb20382a7184a8e4ebdce9f v7-3-018
-+0000000000000000000000000000000000000000 v7-3-018
-+bf9579ab26e59cda4bdebcd934c43b6fbded60ce v7.3.019
-+bf9579ab26e59cda4bdebcd934c43b6fbded60ce v7-3-019
-+0000000000000000000000000000000000000000 v7-3-019
-+c3b5d3fe94046702944964c32eea7522ecf92c4c v7.3.020
-+c3b5d3fe94046702944964c32eea7522ecf92c4c v7-3-020
-+0000000000000000000000000000000000000000 v7-3-020
-+10ce04af8c5b26e55cd2157408883d9ed79b9a3d v7.3.021
-+10ce04af8c5b26e55cd2157408883d9ed79b9a3d v7-3-021
-+0000000000000000000000000000000000000000 v7-3-021
-+8aa94f8080bdeb8908de30bbcf62945dabba1aa3 v7.3.022
-+8aa94f8080bdeb8908de30bbcf62945dabba1aa3 v7-3-022
-+0000000000000000000000000000000000000000 v7-3-022
-+d982226b7aaaff40647eaa5ad05e01538e90065b v7.3.023
-+d982226b7aaaff40647eaa5ad05e01538e90065b v7-3-023
-+0000000000000000000000000000000000000000 v7-3-023
-+1baac9d06c83400c474e6484dc20229187d27a64 v7.3.024
-+1baac9d06c83400c474e6484dc20229187d27a64 v7-3-024
-+0000000000000000000000000000000000000000 v7-3-024
-+71219f47ccd9551fc7d090e73afb83cc395232d8 v7.3.025
-+71219f47ccd9551fc7d090e73afb83cc395232d8 v7-3-025
-+0000000000000000000000000000000000000000 v7-3-025
-+ac0458d9b9dde727d1bf11e9e9221edc20b623a3 v7.3.026
-+ac0458d9b9dde727d1bf11e9e9221edc20b623a3 v7-3-026
-+0000000000000000000000000000000000000000 v7-3-026
-+6a85219723b98ddd686d1a80c481a545bcb535d8 v7.3.027
-+6a85219723b98ddd686d1a80c481a545bcb535d8 v7-3-027
-+0000000000000000000000000000000000000000 v7-3-027
-+a0b03b7e9168b7f7fd61b1563ffdd6d09ca54260 v7.3.028
-+a0b03b7e9168b7f7fd61b1563ffdd6d09ca54260 v7-3-028
-+0000000000000000000000000000000000000000 v7-3-028
-+94694351f592a56f8a379510eb6992ed0dbee821 v7.3.029
-+94694351f592a56f8a379510eb6992ed0dbee821 v7-3-029
-+0000000000000000000000000000000000000000 v7-3-029
-+2f57d93bdbf64461c4eaeaacdba26548a2abb9cf v7.3.030
-+2f57d93bdbf64461c4eaeaacdba26548a2abb9cf v7-3-030
-+0000000000000000000000000000000000000000 v7-3-030
-+758822790b43d2fc184878c3a50a12d71dda794e v7.3.031
-+758822790b43d2fc184878c3a50a12d71dda794e v7-3-031
-+0000000000000000000000000000000000000000 v7-3-031
-+6c05b5e5c1be4ee9b8f96334b7fba7afa832524e v7.3.032
-+6c05b5e5c1be4ee9b8f96334b7fba7afa832524e v7-3-032
-+0000000000000000000000000000000000000000 v7-3-032
-+5b154df6fcd89b4d24d34da63626cc01d9b5c0c2 v7.3.033
-+5b154df6fcd89b4d24d34da63626cc01d9b5c0c2 v7-3-033
-+0000000000000000000000000000000000000000 v7-3-033
-+fa5dee44df3fd23f96090d225dc11dbc4de7bf20 v7.3.034
-+fa5dee44df3fd23f96090d225dc11dbc4de7bf20 v7-3-034
-+0000000000000000000000000000000000000000 v7-3-034
-+8fdc1210333357780019fa8dbabc34f07d545775 v7.3.035
-+8fdc1210333357780019fa8dbabc34f07d545775 v7-3-035
-+0000000000000000000000000000000000000000 v7-3-035
-+56ecdb792c3353d9fc587a515fa4991e69363dd5 v7.3.036
-+56ecdb792c3353d9fc587a515fa4991e69363dd5 v7-3-036
-+0000000000000000000000000000000000000000 v7-3-036
-+c6fe65c000d27b9ddb0cbdffe43cf188b7a51f2e v7.3.037
-+c6fe65c000d27b9ddb0cbdffe43cf188b7a51f2e v7-3-037
-+0000000000000000000000000000000000000000 v7-3-037
-+73d947c20291fd857fba24ddf4725b9b831188eb v7.3.038
-+73d947c20291fd857fba24ddf4725b9b831188eb v7-3-038
-+0000000000000000000000000000000000000000 v7-3-038
-+f2927225367a3ac3fbe86d6d03ebb7a526072ed9 v7.3.039
-+f2927225367a3ac3fbe86d6d03ebb7a526072ed9 v7-3-039
-+0000000000000000000000000000000000000000 v7-3-039
-+fb60c9f35517660092b161abc1e4aa17a7d0ac05 v7.3.040
-+fb60c9f35517660092b161abc1e4aa17a7d0ac05 v7-3-040
-+0000000000000000000000000000000000000000 v7-3-040
-+6a80537ac7aa6d4c9011edf4db84a6aea85d2911 v7.3.041
-+6a80537ac7aa6d4c9011edf4db84a6aea85d2911 v7-3-041
-+0000000000000000000000000000000000000000 v7-3-041
-+5fbc411a611de301397bf4f8edf494fe07bcf6f8 v7.3.042
-+5fbc411a611de301397bf4f8edf494fe07bcf6f8 v7-3-042
-+0000000000000000000000000000000000000000 v7-3-042
-+baa5f81197c865fd8847f6af95fb1d48cea6aa65 v7.3.043
-+baa5f81197c865fd8847f6af95fb1d48cea6aa65 v7-3-043
-+0000000000000000000000000000000000000000 v7-3-043
-+b2cfe84c96ccbf87a7c765442f0e32c62fa112a9 v7.3.044
-+b2cfe84c96ccbf87a7c765442f0e32c62fa112a9 v7-3-044
-+0000000000000000000000000000000000000000 v7-3-044
-+bc3f88ca060d25cad633a20548ca38cc529fa0ca v7.3.045
-+bc3f88ca060d25cad633a20548ca38cc529fa0ca v7-3-045
-+0000000000000000000000000000000000000000 v7-3-045
-+bfd69bfb41491b83ac7a4b948c649eaec251c54d v7.3.046
-+bfd69bfb41491b83ac7a4b948c649eaec251c54d v7-3-046
-+0000000000000000000000000000000000000000 v7-3-046
-+df6b12c84b2359415cd987c016f5de135c680100 v7.3.047
-+df6b12c84b2359415cd987c016f5de135c680100 v7-3-047
-+0000000000000000000000000000000000000000 v7-3-047
-+fae6fb779a6be78f2609dac4fddb8da508735dc9 v7.3.048
-+fae6fb779a6be78f2609dac4fddb8da508735dc9 v7-3-048
-+0000000000000000000000000000000000000000 v7-3-048
-+5c4b2fc4f067cd04bed4fd0a13bdec7d26036d26 v7.3.049
-+5c4b2fc4f067cd04bed4fd0a13bdec7d26036d26 v7-3-049
-+0000000000000000000000000000000000000000 v7-3-049
-+1ccc1ace9e5b6c1223ba191ce20729a49f13970e v7.3.050
-+1ccc1ace9e5b6c1223ba191ce20729a49f13970e v7-3-050
-+0000000000000000000000000000000000000000 v7-3-050
-+0de47f0d731e32af52784171986734b735ac626f v7.3.051
-+0de47f0d731e32af52784171986734b735ac626f v7-3-051
-+0000000000000000000000000000000000000000 v7-3-051
-+f896a7dfd47d15f11ac663f132fa2c5aba91c829 v7.3.052
-+f896a7dfd47d15f11ac663f132fa2c5aba91c829 v7-3-052
-+0000000000000000000000000000000000000000 v7-3-052
-+c00efaa0af249c086557487d172edd6a1cfc0706 v7.3.053
-+c00efaa0af249c086557487d172edd6a1cfc0706 v7-3-053
-+0000000000000000000000000000000000000000 v7-3-053
-+7002404b17b15ea37887cb1dd5b5b95883cdd27f v7.3.054
-+7002404b17b15ea37887cb1dd5b5b95883cdd27f v7-3-054
-+0000000000000000000000000000000000000000 v7-3-054
-+fcb916bed51a5ae096a9f5f5f697a909b2062040 v7.3.055
-+fcb916bed51a5ae096a9f5f5f697a909b2062040 v7-3-055
-+0000000000000000000000000000000000000000 v7-3-055
-+1c4ec9ed71caf24dbec13f6d3d4adbb48bce9436 v7.3.056
-+1c4ec9ed71caf24dbec13f6d3d4adbb48bce9436 v7-3-056
-+0000000000000000000000000000000000000000 v7-3-056
-+6ee9d7fa5df6d00c892f7e93a63435de5c50e083 v7.3.057
-+6ee9d7fa5df6d00c892f7e93a63435de5c50e083 v7-3-057
-+0000000000000000000000000000000000000000 v7-3-057
-+37d62d968182826522e378b31b76cf0a8c7a3cb7 v7.3.058
-+37d62d968182826522e378b31b76cf0a8c7a3cb7 v7-3-058
-+0000000000000000000000000000000000000000 v7-3-058
-+75a89c7c204e0f478f480598cc3f2a8c45dee8b3 v7.3.059
-+75a89c7c204e0f478f480598cc3f2a8c45dee8b3 v7-3-059
-+0000000000000000000000000000000000000000 v7-3-059
-+73dd10c18ec4eb2cc0857417fb8cc20f63dd42e1 v7.3.060
-+73dd10c18ec4eb2cc0857417fb8cc20f63dd42e1 v7-3-060
-+0000000000000000000000000000000000000000 v7-3-060
-+266f9d9f5109421afcbc8169896b484ff7a19a8d v7.3.061
-+266f9d9f5109421afcbc8169896b484ff7a19a8d v7-3-061
-+0000000000000000000000000000000000000000 v7-3-061
-+b803b277688037509ad1b6d30466721396d8967f v7.3.062
-+b803b277688037509ad1b6d30466721396d8967f v7-3-062
-+0000000000000000000000000000000000000000 v7-3-062
-+e6372ac3ebe536aee65848e52e58fc817697b98e v7.3.063
-+e6372ac3ebe536aee65848e52e58fc817697b98e v7-3-063
-+0000000000000000000000000000000000000000 v7-3-063
-+e856f9cc2aee46628ecb83351489d4f41d66c6c6 v7.3.064
-+e856f9cc2aee46628ecb83351489d4f41d66c6c6 v7-3-064
-+0000000000000000000000000000000000000000 v7-3-064
-+a2271decbce54d46f62e7cc9a0c4e3ea3ae9080d v7.3.065
-+a2271decbce54d46f62e7cc9a0c4e3ea3ae9080d v7-3-065
-+0000000000000000000000000000000000000000 v7-3-065
-+ff3a304b4ac2f672e8cc3c60795f0c79c5b191b1 v7.3.066
-+ff3a304b4ac2f672e8cc3c60795f0c79c5b191b1 v7-3-066
-+0000000000000000000000000000000000000000 v7-3-066
-+dfd5dcc73daa3934ff1f47d6d53207de2f9034ed v7.3.067
-+dfd5dcc73daa3934ff1f47d6d53207de2f9034ed v7-3-067
-+0000000000000000000000000000000000000000 v7-3-067
-+656e652c6579a812d9f48a0e5e4d8ee47ebc1a35 v7.3.068
-+656e652c6579a812d9f48a0e5e4d8ee47ebc1a35 v7-3-068
-+0000000000000000000000000000000000000000 v7-3-068
-+b2789846ed3978ec3dd9a91b6e1ef2f4d054431b v7.3.069
-+b2789846ed3978ec3dd9a91b6e1ef2f4d054431b v7-3-069
-+0000000000000000000000000000000000000000 v7-3-069
-+ef3a3ec8940cb0c55d35d2e5fe924a09d6815f2c v7.3.070
-+ef3a3ec8940cb0c55d35d2e5fe924a09d6815f2c v7-3-070
-+0000000000000000000000000000000000000000 v7-3-070
-+b254cfdd740542f5778d787845134db3c7584335 v7.3.071
-+b254cfdd740542f5778d787845134db3c7584335 v7-3-071
-+0000000000000000000000000000000000000000 v7-3-071
-+b2a7d143abe2f572e713acda4a67ebce76511bc8 v7.3.072
-+b2a7d143abe2f572e713acda4a67ebce76511bc8 v7-3-072
-+0000000000000000000000000000000000000000 v7-3-072
-+ac04f392ba48436bc1b90d3d8b8d384fef4f8135 v7.3.073
-+ac04f392ba48436bc1b90d3d8b8d384fef4f8135 v7-3-073
-+0000000000000000000000000000000000000000 v7-3-073
-+2b475ed86e6491b20046d5c34fec8ea86988dade v7.3.074
-+2b475ed86e6491b20046d5c34fec8ea86988dade v7-3-074
-+0000000000000000000000000000000000000000 v7-3-074
-+d94c322508140c4cc0d36364d994f475aa84f8d0 v7.3.075
-+d94c322508140c4cc0d36364d994f475aa84f8d0 v7-3-075
-+0000000000000000000000000000000000000000 v7-3-075
-+4549e0e7fbb661089184c7b0ba1888cb6564ef2c v7.3.076
-+4549e0e7fbb661089184c7b0ba1888cb6564ef2c v7-3-076
-+0000000000000000000000000000000000000000 v7-3-076
-+2a9d26c95a2a9b2f1a279e04de22ee4c7298552c v7.3.077
-+2a9d26c95a2a9b2f1a279e04de22ee4c7298552c v7-3-077
-+0000000000000000000000000000000000000000 v7-3-077
-+b93a3fc3897b3e16e96b80e35dbd72aabf9cf37d v7.3.078
-+b93a3fc3897b3e16e96b80e35dbd72aabf9cf37d v7-3-078
-+0000000000000000000000000000000000000000 v7-3-078
-+4ac0c84d1c5038d0f6171c68d9c58ef0fefd4226 v7.3.079
-+4ac0c84d1c5038d0f6171c68d9c58ef0fefd4226 v7-3-079
-+0000000000000000000000000000000000000000 v7-3-079
-+e19ecdb13f34ca1ccb3dd3c382a08423c385e847 v7.3.080
-+e19ecdb13f34ca1ccb3dd3c382a08423c385e847 v7-3-080
-+0000000000000000000000000000000000000000 v7-3-080
-+a03f7551baccc60bedef5ef6a9f92ccdfe69a9a3 v7.3.081
-+a03f7551baccc60bedef5ef6a9f92ccdfe69a9a3 v7-3-081
-+0000000000000000000000000000000000000000 v7-3-081
-+fd3346e3ccc02a11f0c2fa9c2c7351b3cead3941 v7.3.082
-+fd3346e3ccc02a11f0c2fa9c2c7351b3cead3941 v7-3-082
-+0000000000000000000000000000000000000000 v7-3-082
-+033e7b49356c11b2d9cc45dec6dc3d695d7ef95a v7.3.083
-+033e7b49356c11b2d9cc45dec6dc3d695d7ef95a v7-3-083
-+0000000000000000000000000000000000000000 v7-3-083
-+18061514324fefb37ea7a7e7783985004ea0874d v7.3.084
-+18061514324fefb37ea7a7e7783985004ea0874d v7-3-084
-+0000000000000000000000000000000000000000 v7-3-084
-+1a0d346695fa3525a08a27174fbdf016afdbb9a9 v7.3.085
-+1a0d346695fa3525a08a27174fbdf016afdbb9a9 v7-3-085
-+0000000000000000000000000000000000000000 v7-3-085
-+a53e7d3fd741c68a30085fd9b22d260aec93396b v7.3.086
-+a53e7d3fd741c68a30085fd9b22d260aec93396b v7-3-086
-+0000000000000000000000000000000000000000 v7-3-086
-+bfade53bcafb7b6d297f23ce3ba9e6a72dcb7949 v7.3.087
-+bfade53bcafb7b6d297f23ce3ba9e6a72dcb7949 v7-3-087
-+0000000000000000000000000000000000000000 v7-3-087
-+ee50cd1a303271c6be6cf6121f50c0abb8772dbb v7.3.088
-+ee50cd1a303271c6be6cf6121f50c0abb8772dbb v7-3-088
-+0000000000000000000000000000000000000000 v7-3-088
-+28398206597f975583c9f8f212d336fc9f67953f v7.3.089
-+28398206597f975583c9f8f212d336fc9f67953f v7-3-089
-+0000000000000000000000000000000000000000 v7-3-089
-+6f4740f72d3d2018bfb19d4c8d8064e3682fd883 v7.3.090
-+6f4740f72d3d2018bfb19d4c8d8064e3682fd883 v7-3-090
-+0000000000000000000000000000000000000000 v7-3-090
-+6a2e4860134bf0e4b5edf382627809dc6cec309c v7.3.091
-+6a2e4860134bf0e4b5edf382627809dc6cec309c v7-3-091
-+0000000000000000000000000000000000000000 v7-3-091
-+5a1fe35a6eafb1c994955a34d8152996d53838e3 v7.3.092
-+5a1fe35a6eafb1c994955a34d8152996d53838e3 v7-3-092
-+0000000000000000000000000000000000000000 v7-3-092
-+f921368d43c3f0b9b32f52f881e7e58242489bb4 v7.3.093
-+f921368d43c3f0b9b32f52f881e7e58242489bb4 v7-3-093
-+0000000000000000000000000000000000000000 v7-3-093
-+f987220caa57c4d13b64fcfd24cb4bc6a156bb00 v7.3.094
-+f987220caa57c4d13b64fcfd24cb4bc6a156bb00 v7-3-094
-+0000000000000000000000000000000000000000 v7-3-094
-+8464d084fa7475830cdc53529cd20f7334c81232 v7.3.095
-+8464d084fa7475830cdc53529cd20f7334c81232 v7-3-095
-+0000000000000000000000000000000000000000 v7-3-095
-+fea3207b800d97b802892d8edabd1d688817249a v7.3.096
-+fea3207b800d97b802892d8edabd1d688817249a v7-3-096
-+0000000000000000000000000000000000000000 v7-3-096
-+faf4b09c396e8572e84eab84eeb60ea0f3785529 v7.3.097
-+faf4b09c396e8572e84eab84eeb60ea0f3785529 v7-3-097
-+0000000000000000000000000000000000000000 v7-3-097
-+763272b18e4ffe717ebb58827315badc09824e86 v7.3.098
-+763272b18e4ffe717ebb58827315badc09824e86 v7-3-098
-+0000000000000000000000000000000000000000 v7-3-098
-+27621abffed24f1e2849ea616f91f0a99747608f v7.3.099
-+27621abffed24f1e2849ea616f91f0a99747608f v7-3-099
-+0000000000000000000000000000000000000000 v7-3-099
-+35edf814f2230c2bfdf403073fdcf89094c8216a v7.3.100
-+35edf814f2230c2bfdf403073fdcf89094c8216a v7-3-100
-+0000000000000000000000000000000000000000 v7-3-100
-+0c7d6d01e0582b54f34ab66852116d559c39550c v7.3.101
-+0c7d6d01e0582b54f34ab66852116d559c39550c v7-3-101
-+0000000000000000000000000000000000000000 v7-3-101
-+951641b8784de5175cadf9fdbc361db2b6b45060 v7.3.102
-+951641b8784de5175cadf9fdbc361db2b6b45060 v7-3-102
-+0000000000000000000000000000000000000000 v7-3-102
-+862d920800b1a8a5ebca3e7db5dbe431982f7d0d v7.3.103
-+862d920800b1a8a5ebca3e7db5dbe431982f7d0d v7-3-103
-+0000000000000000000000000000000000000000 v7-3-103
-+7b44c70ee8ab87d5265ebec758a6f5ea9d5cfa75 v7.3.104
-+7b44c70ee8ab87d5265ebec758a6f5ea9d5cfa75 v7-3-104
-+0000000000000000000000000000000000000000 v7-3-104
-+ef7fdb3c6927725abb07731a46ab78404ad4c7e8 v7.3.105
-+ef7fdb3c6927725abb07731a46ab78404ad4c7e8 v7-3-105
-+0000000000000000000000000000000000000000 v7-3-105
-+f016c3708ae32436ab545762a1bfb8ebd31af975 v7.3.106
-+f016c3708ae32436ab545762a1bfb8ebd31af975 v7-3-106
-+0000000000000000000000000000000000000000 v7-3-106
-+26fb122355d4d6b04850f7608f1d82da8dbc51c7 v7.3.107
-+26fb122355d4d6b04850f7608f1d82da8dbc51c7 v7-3-107
-+0000000000000000000000000000000000000000 v7-3-107
-+3ea3dcbf2cd6e5ddb9d827c60ce999b2e4a5e755 v7.3.108
-+3ea3dcbf2cd6e5ddb9d827c60ce999b2e4a5e755 v7-3-108
-+0000000000000000000000000000000000000000 v7-3-108
-+0887e8a13e5f33db2f832a52654a0d1fa82f322f v7.3.109
-+0887e8a13e5f33db2f832a52654a0d1fa82f322f v7-3-109
-+0000000000000000000000000000000000000000 v7-3-109
-+42cafbf4b6e81160c26fc99148eb333aab5d2f96 v7.3.110
-+42cafbf4b6e81160c26fc99148eb333aab5d2f96 v7-3-110
-+0000000000000000000000000000000000000000 v7-3-110
-+0606065af0a02f79b43b4a89383b04c21e2f0be3 v7.3.111
-+0606065af0a02f79b43b4a89383b04c21e2f0be3 v7-3-111
-+0000000000000000000000000000000000000000 v7-3-111
-+fcea35e2a41fdc928cb92784a4405b4fd220f560 v7.3.112
-+fcea35e2a41fdc928cb92784a4405b4fd220f560 v7-3-112
-+0000000000000000000000000000000000000000 v7-3-112
-+b0605f2f9786c14e943a0ab440c16b444f2a9cac v7.3.113
-+b0605f2f9786c14e943a0ab440c16b444f2a9cac v7-3-113
-+0000000000000000000000000000000000000000 v7-3-113
-+a041f68d05909431f0a525eace55307214c33d43 v7.3.114
-+a041f68d05909431f0a525eace55307214c33d43 v7-3-114
-+0000000000000000000000000000000000000000 v7-3-114
-+6cc8a093e4a9b14df444effaef7274d2318d00d1 v7.3.115
-+6cc8a093e4a9b14df444effaef7274d2318d00d1 v7-3-115
-+0000000000000000000000000000000000000000 v7-3-115
-+bb3661a2eccc165bd5d2a87a8d4696f89431a459 v7.3.116
-+bb3661a2eccc165bd5d2a87a8d4696f89431a459 v7-3-116
-+0000000000000000000000000000000000000000 v7-3-116
-+7c46737918cb0adc9a51849b75b1c03da7bd77f3 v7.3.117
-+7c46737918cb0adc9a51849b75b1c03da7bd77f3 v7-3-117
-+0000000000000000000000000000000000000000 v7-3-117
-+6d80dbca8501a4152908713778ce03e0f45b93f3 v7.3.118
-+6d80dbca8501a4152908713778ce03e0f45b93f3 v7-3-118
-+0000000000000000000000000000000000000000 v7-3-118
-+77f3dd990b12aa963aa0a63f0db50f6443f3f41d v7.3.119
-+77f3dd990b12aa963aa0a63f0db50f6443f3f41d v7-3-119
-+0000000000000000000000000000000000000000 v7-3-119
-+47a0dcad7216bfe602a2ee241df60bfc41c04979 v7.3.120
-+47a0dcad7216bfe602a2ee241df60bfc41c04979 v7-3-120
-+0000000000000000000000000000000000000000 v7-3-120
-+a14db0b78c590d4bb8e1a190b80fbf3dfff89560 v7.3.121
-+a14db0b78c590d4bb8e1a190b80fbf3dfff89560 v7-3-121
-+0000000000000000000000000000000000000000 v7-3-121
-+58f47e17ba1565ec9c538c7f216cb9ea66e58a63 v7.3.122
-+58f47e17ba1565ec9c538c7f216cb9ea66e58a63 v7-3-122
-+0000000000000000000000000000000000000000 v7-3-122
-+34f62bcce014d9c0b275002a1001cd1582ffa121 v7.3.123
-+34f62bcce014d9c0b275002a1001cd1582ffa121 v7-3-123
-+0000000000000000000000000000000000000000 v7-3-123
-+cd3f52531f6c8f16e89e97f335f974fa25f4b498 v7.3.124
-+cd3f52531f6c8f16e89e97f335f974fa25f4b498 v7-3-124
-+0000000000000000000000000000000000000000 v7-3-124
-+e44523d45bf5e276817b7f1f8987f2a8ed3132b7 v7.3.125
-+e44523d45bf5e276817b7f1f8987f2a8ed3132b7 v7-3-125
-+0000000000000000000000000000000000000000 v7-3-125
-+2d9eebf2c48f0bd3b51e8ba085b97da871cd4184 v7.3.126
-+2d9eebf2c48f0bd3b51e8ba085b97da871cd4184 v7-3-126
-+0000000000000000000000000000000000000000 v7-3-126
-+0c39ff7a90a81c62f2718f71bf0a4d636a8ac69c v7.3.127
-+0c39ff7a90a81c62f2718f71bf0a4d636a8ac69c v7-3-127
-+0000000000000000000000000000000000000000 v7-3-127
-+43243f7ce351aecf1f41932a9d02d6723fe49e34 v7.3.128
-+43243f7ce351aecf1f41932a9d02d6723fe49e34 v7-3-128
-+0000000000000000000000000000000000000000 v7-3-128
-+d20d37ef86c8844da2c9c45b2d9fc8b6a2dc3f78 v7.3.129
-+d20d37ef86c8844da2c9c45b2d9fc8b6a2dc3f78 v7-3-129
-+0000000000000000000000000000000000000000 v7-3-129
-+464da5b48d277d1052e3c211000717947fa13da6 v7.3.130
-+464da5b48d277d1052e3c211000717947fa13da6 v7-3-130
-+0000000000000000000000000000000000000000 v7-3-130
-+f38283ce871c19cb82b1c4d364fbc3a242c057bd v7.3.131
-+f38283ce871c19cb82b1c4d364fbc3a242c057bd v7-3-131
-+0000000000000000000000000000000000000000 v7-3-131
-+0b4a515b125474db496caa0be22a28e8bd99c88e v7.3.132
-+0b4a515b125474db496caa0be22a28e8bd99c88e v7-3-132
-+0000000000000000000000000000000000000000 v7-3-132
-+f85fe1a05c2ae4c03994c9ea2eb87da590bb3214 v7.3.133
-+f85fe1a05c2ae4c03994c9ea2eb87da590bb3214 v7-3-133
-+0000000000000000000000000000000000000000 v7-3-133
-+31757405c0c5408f9c83dba9d83ea74b2bd680d5 v7.3.134
-+31757405c0c5408f9c83dba9d83ea74b2bd680d5 v7-3-134
-+0000000000000000000000000000000000000000 v7-3-134
-+0139403c8eb088d58773f7e76dc2a025719a8e8c v7.3.135
-+0139403c8eb088d58773f7e76dc2a025719a8e8c v7-3-135
-+0000000000000000000000000000000000000000 v7-3-135
-+3adc6dd2d122c76a211d88769227e447e4f8f821 v7.3.136
-+3adc6dd2d122c76a211d88769227e447e4f8f821 v7-3-136
-+0000000000000000000000000000000000000000 v7-3-136
-+417c04135ca2ec03b6357404b62761ca9453cdba v7.3.137
-+417c04135ca2ec03b6357404b62761ca9453cdba v7-3-137
-+0000000000000000000000000000000000000000 v7-3-137
-+ea399ac2c1b963b068beed88bfaff7620d345333 v7.3.138
-+ea399ac2c1b963b068beed88bfaff7620d345333 v7-3-138
-+0000000000000000000000000000000000000000 v7-3-138
-+2e72d84e89654b8a9445f11804ac22fa27616357 v7.3.139
-+2e72d84e89654b8a9445f11804ac22fa27616357 v7-3-139
-+0000000000000000000000000000000000000000 v7-3-139
-+96a7b564c2f39bd3f35658e5c3b2e2e6516926ee v7.3.140
-+96a7b564c2f39bd3f35658e5c3b2e2e6516926ee v7-3-140
-+0000000000000000000000000000000000000000 v7-3-140
-+0d201adaf9c5561dc4308c610364c3e4bfc0c234 v7.3.141
-+0d201adaf9c5561dc4308c610364c3e4bfc0c234 v7-3-141
-+0000000000000000000000000000000000000000 v7-3-141
-+62e8d93241cd15962f895da4788f21b514238b14 v7.3.142
-+62e8d93241cd15962f895da4788f21b514238b14 v7-3-142
-+0000000000000000000000000000000000000000 v7-3-142
-+afb476746692322523f167c218803317b87623e3 v7.3.143
-+afb476746692322523f167c218803317b87623e3 v7-3-143
-+0000000000000000000000000000000000000000 v7-3-143
-+322a5c8d392bd47ceebd24cd21dacf70409fcc91 v7.3.144
-+322a5c8d392bd47ceebd24cd21dacf70409fcc91 v7-3-144
-+0000000000000000000000000000000000000000 v7-3-144
-+329a9676040c3182f78e2014322125f8839b5cb6 v7.3.145
-+329a9676040c3182f78e2014322125f8839b5cb6 v7-3-145
-+0000000000000000000000000000000000000000 v7-3-145
-+2bd574a2ef1c0ad487a0673a5867b09cd332d176 v7.3.146
-+2bd574a2ef1c0ad487a0673a5867b09cd332d176 v7-3-146
-+0000000000000000000000000000000000000000 v7-3-146
-+55fe8407514f5387ad872a338d77f64a2ad4b5f5 v7.3.147
-+55fe8407514f5387ad872a338d77f64a2ad4b5f5 v7-3-147
-+0000000000000000000000000000000000000000 v7-3-147
-+d67916de812ad684718c02e3ff93455ce577be81 v7.3.148
-+d67916de812ad684718c02e3ff93455ce577be81 v7-3-148
-+0000000000000000000000000000000000000000 v7-3-148
-+7f937a04cdbafd7d179b200f75e988408f8caf3c v7.3.149
-+7f937a04cdbafd7d179b200f75e988408f8caf3c v7-3-149
-+0000000000000000000000000000000000000000 v7-3-149
-+6146c9859f6558d618e950fe702c11e41ca21105 v7.3.150
-+6146c9859f6558d618e950fe702c11e41ca21105 v7-3-150
-+0000000000000000000000000000000000000000 v7-3-150
-+f169a51f7eadf9a07ed95161143e6209387a4f34 v7.3.151
-+f169a51f7eadf9a07ed95161143e6209387a4f34 v7-3-151
-+0000000000000000000000000000000000000000 v7-3-151
-+0f7f66682a5563c76ab47e9976fd590d9423a013 v7.3.152
-+0f7f66682a5563c76ab47e9976fd590d9423a013 v7-3-152
-+0000000000000000000000000000000000000000 v7-3-152
-+d0cae598360945a425859bf8acf22923c29501f4 v7.3.153
-+d0cae598360945a425859bf8acf22923c29501f4 v7-3-153
-+0000000000000000000000000000000000000000 v7-3-153
-+d72d709f0e18c309069e42d3d7865d68db9e89d7 v7.3.154
-+d72d709f0e18c309069e42d3d7865d68db9e89d7 v7-3-154
-+0000000000000000000000000000000000000000 v7-3-154
-+5747cd65d62b613d5060254849ed4bc1e1e5d714 v7.3.155
-+5747cd65d62b613d5060254849ed4bc1e1e5d714 v7-3-155
-+0000000000000000000000000000000000000000 v7-3-155
-+7fb8cdb9cb25e1409abe45bba959f5f27608d713 v7.3.156
-+7fb8cdb9cb25e1409abe45bba959f5f27608d713 v7-3-156
-+0000000000000000000000000000000000000000 v7-3-156
-+9a98d8562637d4c90439125a14224a3403d8bee3 v7.3.157
-+9a98d8562637d4c90439125a14224a3403d8bee3 v7-3-157
-+0000000000000000000000000000000000000000 v7-3-157
-+b5f774f159274af375455f32d628881c027417d1 v7.3.158
-+b5f774f159274af375455f32d628881c027417d1 v7-3-158
-+0000000000000000000000000000000000000000 v7-3-158
-+415c55534d901aa4617bf584462faf0c7198e07e v7.3.159
-+415c55534d901aa4617bf584462faf0c7198e07e v7-3-159
-+0000000000000000000000000000000000000000 v7-3-159
-+c5e47b752f07a95534bbfa83f031a58af67054cb v7.3.160
-+c5e47b752f07a95534bbfa83f031a58af67054cb v7-3-160
-+0000000000000000000000000000000000000000 v7-3-160
-+25672ad7f377341ff1de9a0773d8cfcad1d37883 v7.3.161
-+25672ad7f377341ff1de9a0773d8cfcad1d37883 v7-3-161
-+0000000000000000000000000000000000000000 v7-3-161
-+18ad854f5dcd0ba1700c73b03677dbc88b9844c3 v7.3.162
-+18ad854f5dcd0ba1700c73b03677dbc88b9844c3 v7-3-162
-+0000000000000000000000000000000000000000 v7-3-162
-+e8f012b00187c5a957def85bb3c6f0430f20fed5 v7.3.163
-+e8f012b00187c5a957def85bb3c6f0430f20fed5 v7-3-163
-+0000000000000000000000000000000000000000 v7-3-163
-+cdefcbb70e8cdc1f7185f1023d3a4660d30a074b v7.3.164
-+cdefcbb70e8cdc1f7185f1023d3a4660d30a074b v7-3-164
-+0000000000000000000000000000000000000000 v7-3-164
-+e92a4b9b4484d1c07d930719ab1370fcaf94d3c5 v7.3.165
-+e92a4b9b4484d1c07d930719ab1370fcaf94d3c5 v7-3-165
-+0000000000000000000000000000000000000000 v7-3-165
-+5ddb68c2a845ad7941d1ae7533a81c12b106dffc v7.3.166
-+5ddb68c2a845ad7941d1ae7533a81c12b106dffc v7-3-166
-+0000000000000000000000000000000000000000 v7-3-166
-+0a0d7961b4fe83151b03d98ee904ea7038f64123 v7.3.167
-+0a0d7961b4fe83151b03d98ee904ea7038f64123 v7-3-167
-+0000000000000000000000000000000000000000 v7-3-167
-+930b171ce3fc9dbca3f9da6bf883faa725593c67 v7.3.168
-+930b171ce3fc9dbca3f9da6bf883faa725593c67 v7-3-168
-+0000000000000000000000000000000000000000 v7-3-168
-+5f45bacf31efef21f9b60543504d1832ded3e098 v7.3.169
-+5f45bacf31efef21f9b60543504d1832ded3e098 v7-3-169
-+0000000000000000000000000000000000000000 v7-3-169
-+64c3402df964791a7b8c925905423f83af83e930 v7.3.170
-+64c3402df964791a7b8c925905423f83af83e930 v7-3-170
-+0000000000000000000000000000000000000000 v7-3-170
-+1bd8af13fb434e4c99bb756052556f4d56cde200 v7.3.171
-+1bd8af13fb434e4c99bb756052556f4d56cde200 v7-3-171
-+0000000000000000000000000000000000000000 v7-3-171
-+ee48b3da9d53a487f3636df34cace6400d13f32c v7.3.172
-+ee48b3da9d53a487f3636df34cace6400d13f32c v7-3-172
-+0000000000000000000000000000000000000000 v7-3-172
-+133d089f247eb7156a6e8c49e0526f41cc082c3c v7.3.173
-+133d089f247eb7156a6e8c49e0526f41cc082c3c v7-3-173
-+0000000000000000000000000000000000000000 v7-3-173
-+820f12659c50890dbda80e7280086ae1176d1378 v7.3.174
-+820f12659c50890dbda80e7280086ae1176d1378 v7-3-174
-+0000000000000000000000000000000000000000 v7-3-174
-+537e0102c0f9cc2c0656c298ed1534ef30176eb8 v7.3.175
-+537e0102c0f9cc2c0656c298ed1534ef30176eb8 v7-3-175
-+0000000000000000000000000000000000000000 v7-3-175
-+94f42ae4e4e66483fb6cc7305c61820b004c6182 v7.3.176
-+94f42ae4e4e66483fb6cc7305c61820b004c6182 v7-3-176
-+0000000000000000000000000000000000000000 v7-3-176
-+66f2d62271fe77d4acdda5808bd0d3a45be3149c v7.3.177
-+66f2d62271fe77d4acdda5808bd0d3a45be3149c v7-3-177
-+0000000000000000000000000000000000000000 v7-3-177
-+ac639ca9f58f7c71551c19090473395d81a021b6 v7.3.178
-+ac639ca9f58f7c71551c19090473395d81a021b6 v7-3-178
-+0000000000000000000000000000000000000000 v7-3-178
-+11e62fb6f8154537f92be5f278c31e737247f781 v7.3.179
-+11e62fb6f8154537f92be5f278c31e737247f781 v7-3-179
-+0000000000000000000000000000000000000000 v7-3-179
-+ed47d18b39c6a672ad4f0caa2f2c3ee897e784a7 v7.3.180
-+ed47d18b39c6a672ad4f0caa2f2c3ee897e784a7 v7-3-180
-+0000000000000000000000000000000000000000 v7-3-180
-+5381eb5b1eb9c39797c435ad904bfcb71f1efb01 v7.3.181
-+5381eb5b1eb9c39797c435ad904bfcb71f1efb01 v7-3-181
-+0000000000000000000000000000000000000000 v7-3-181
-+21346361ce6c7e9afca2e475ceb62f6244197919 v7.3.182
-+21346361ce6c7e9afca2e475ceb62f6244197919 v7-3-182
-+0000000000000000000000000000000000000000 v7-3-182
-+e4403440e192d082af7dc8fe3e1a12d24f0e259c v7.3.183
-+e4403440e192d082af7dc8fe3e1a12d24f0e259c v7-3-183
-+0000000000000000000000000000000000000000 v7-3-183
-+b941cc96926a26b62d59f759a021ddb5b51823ed v7.3.184
-+b941cc96926a26b62d59f759a021ddb5b51823ed v7-3-184
-+0000000000000000000000000000000000000000 v7-3-184
-+9c8dffc62a41a143230f76376f9a3abf46ff3536 v7.3.185
-+9c8dffc62a41a143230f76376f9a3abf46ff3536 v7-3-185
-+0000000000000000000000000000000000000000 v7-3-185
-+3d1a3aa0240c7a9acdf3feb77b664798e3703463 v7.3.186
-+3d1a3aa0240c7a9acdf3feb77b664798e3703463 v7-3-186
-+0000000000000000000000000000000000000000 v7-3-186
-+8bd38abda3149cce7043da86e6093dbebecf63df v7.3.187
-+8bd38abda3149cce7043da86e6093dbebecf63df v7-3-187
-+0000000000000000000000000000000000000000 v7-3-187
-+f2e1c3a90a3bda6ce8977187b365745efd4e5c35 v7.3.188
-+f2e1c3a90a3bda6ce8977187b365745efd4e5c35 v7-3-188
-+0000000000000000000000000000000000000000 v7-3-188
-+71e1da07e1414740d1d0eed47a346cb3292a9e2e v7.3.189
-+71e1da07e1414740d1d0eed47a346cb3292a9e2e v7-3-189
-+0000000000000000000000000000000000000000 v7-3-189
-+30b7cde2194064040cb7d7e6485a5712b2fc9b40 v7.3.190
-+30b7cde2194064040cb7d7e6485a5712b2fc9b40 v7-3-190
-+0000000000000000000000000000000000000000 v7-3-190
-+107b03fdf1ad831e2697c22a04bd3eeaca08c291 v7.3.191
-+107b03fdf1ad831e2697c22a04bd3eeaca08c291 v7-3-191
-+0000000000000000000000000000000000000000 v7-3-191
-+8470ac4679c17b69aefb06989c6e8a267761988a v7.3.192
-+8470ac4679c17b69aefb06989c6e8a267761988a v7-3-192
-+0000000000000000000000000000000000000000 v7-3-192
-+e1c5f69de95b99112fae28c23ce6427ca251e50f v7.3.193
-+e1c5f69de95b99112fae28c23ce6427ca251e50f v7-3-193
-+0000000000000000000000000000000000000000 v7-3-193
-+664c1adcb909aca654c4fe9200364cc741068803 v7.3.194
-+664c1adcb909aca654c4fe9200364cc741068803 v7-3-194
-+0000000000000000000000000000000000000000 v7-3-194
-+8dbea5adc937ecddf8ca336856cd487e1b118b1a v7.3.195
-+8dbea5adc937ecddf8ca336856cd487e1b118b1a v7-3-195
-+0000000000000000000000000000000000000000 v7-3-195
-+d641f141f9376b3ecf2146e5d68c38bf0227c970 v7.3.196
-+d641f141f9376b3ecf2146e5d68c38bf0227c970 v7-3-196
-+0000000000000000000000000000000000000000 v7-3-196
-+45c536fe48db330c4ee8f1056befe702d9d19cfe v7.3.197
-+45c536fe48db330c4ee8f1056befe702d9d19cfe v7-3-197
-+0000000000000000000000000000000000000000 v7-3-197
-+b0190e93e601f9061a797689a1eb95a86805f769 v7.3.198
-+b0190e93e601f9061a797689a1eb95a86805f769 v7-3-198
-+0000000000000000000000000000000000000000 v7-3-198
-+c76efe33a3c1db5767cfa4f4bb433466cba6e351 v7.3.199
-+c76efe33a3c1db5767cfa4f4bb433466cba6e351 v7-3-199
-+0000000000000000000000000000000000000000 v7-3-199
-+41b17dd070295783af37698b1229a7052ab0549c v7.3.200
-+41b17dd070295783af37698b1229a7052ab0549c v7-3-200
-+0000000000000000000000000000000000000000 v7-3-200
-+78859ef2982bbc75dcfbc551e3d8a0ec5c9126eb v7.3.201
-+78859ef2982bbc75dcfbc551e3d8a0ec5c9126eb v7-3-201
-+0000000000000000000000000000000000000000 v7-3-201
-+f80e67bd627114cf7f16098ec4ed7d878816a46b v7.3.202
-+f80e67bd627114cf7f16098ec4ed7d878816a46b v7-3-202
-+0000000000000000000000000000000000000000 v7-3-202
-+ce1dce2af2a34aec196b7fbe29cf8c653b6ec6de v7.3.203
-+ce1dce2af2a34aec196b7fbe29cf8c653b6ec6de v7-3-203
-+0000000000000000000000000000000000000000 v7-3-203
-+e6ce47f06836721108394f0b921af076606cf715 v7.3.204
-+e6ce47f06836721108394f0b921af076606cf715 v7-3-204
-+0000000000000000000000000000000000000000 v7-3-204
-+8d8bd6307b1aa51fe2f592ce45d32abf0f6666d8 v7.3.205
-+8d8bd6307b1aa51fe2f592ce45d32abf0f6666d8 v7-3-205
-+0000000000000000000000000000000000000000 v7-3-205
-+46544d3ae7ecb245a2646ae5005a3d67ca380f88 v7.3.206
-+46544d3ae7ecb245a2646ae5005a3d67ca380f88 v7-3-206
-+0000000000000000000000000000000000000000 v7-3-206
-+d1445b72ddb7d8b4a44393756b00d21c81212db1 v7.3.207
-+d1445b72ddb7d8b4a44393756b00d21c81212db1 v7-3-207
-+0000000000000000000000000000000000000000 v7-3-207
-+205adc87d579512482c27f309c73d5fe8f612ff3 v7.3.208
-+205adc87d579512482c27f309c73d5fe8f612ff3 v7-3-208
-+0000000000000000000000000000000000000000 v7-3-208
-+82cd9f1e8d6b21ef4d59f27b39f041d5cddec19d v7.3.209
-+82cd9f1e8d6b21ef4d59f27b39f041d5cddec19d v7-3-209
-+0000000000000000000000000000000000000000 v7-3-209
-+eeb1ac4f66d1d69c0c75f1028655a81890cf65c2 v7.3.210
-+eeb1ac4f66d1d69c0c75f1028655a81890cf65c2 v7-3-210
-+0000000000000000000000000000000000000000 v7-3-210
-+c7d942260772003e21039f9891775b479311b40e v7.3.211
-+c7d942260772003e21039f9891775b479311b40e v7-3-211
-+0000000000000000000000000000000000000000 v7-3-211
-+6bbdb9c7a425b0bd90d5823eba9475b850a409fd v7.3.212
-+6bbdb9c7a425b0bd90d5823eba9475b850a409fd v7-3-212
-+0000000000000000000000000000000000000000 v7-3-212
-+493897f8bf9057aa0fee4c18d269558d32053cc7 v7.3.213
-+493897f8bf9057aa0fee4c18d269558d32053cc7 v7-3-213
-+0000000000000000000000000000000000000000 v7-3-213
-+d84a564f28c9e64c3c2a1689af0e0851bc7e5027 v7.3.214
-+d84a564f28c9e64c3c2a1689af0e0851bc7e5027 v7-3-214
-+0000000000000000000000000000000000000000 v7-3-214
-+b7523ef31e23f1a40cc3950b6ec75b39ad7f762d v7.3.215
-+b7523ef31e23f1a40cc3950b6ec75b39ad7f762d v7-3-215
-+0000000000000000000000000000000000000000 v7-3-215
-+eb6c704607025d89a0a5d3fd2769a694ac47e0af v7.3.216
-+eb6c704607025d89a0a5d3fd2769a694ac47e0af v7-3-216
-+0000000000000000000000000000000000000000 v7-3-216
-+15705b520c298738588a9a3b8d724c6d86d4cb8c v7.3.217
-+15705b520c298738588a9a3b8d724c6d86d4cb8c v7-3-217
-+0000000000000000000000000000000000000000 v7-3-217
-+cf89a1d3a0ddd21fe6b734fd72346468b808836f v7.3.218
-+cf89a1d3a0ddd21fe6b734fd72346468b808836f v7-3-218
-+0000000000000000000000000000000000000000 v7-3-218
-+acda456c788ae1b0b45b8c67a93edcccde594819 v7.3.219
-+acda456c788ae1b0b45b8c67a93edcccde594819 v7-3-219
-+0000000000000000000000000000000000000000 v7-3-219
-+fe9c7da98b5e2f92e4212e948e98f2d44bf06320 v7.3.220
-+fe9c7da98b5e2f92e4212e948e98f2d44bf06320 v7-3-220
-+0000000000000000000000000000000000000000 v7-3-220
-+fd4224d9ee09801ed1ad9341a72c4683e291bb76 v7.3.221
-+fd4224d9ee09801ed1ad9341a72c4683e291bb76 v7-3-221
-+0000000000000000000000000000000000000000 v7-3-221
-+c3b4b1c89d8ed62a2624bf9404fc79f60223bd81 v7.3.222
-+c3b4b1c89d8ed62a2624bf9404fc79f60223bd81 v7-3-222
-+0000000000000000000000000000000000000000 v7-3-222
-+4e21fd3cfc3084db66f65aef132cb6c5e076cb96 v7.3.223
-+4e21fd3cfc3084db66f65aef132cb6c5e076cb96 v7-3-223
-+0000000000000000000000000000000000000000 v7-3-223
-+69e0783ed0ef40f72ebeba41f8c98c9992f368c7 v7.3.224
-+69e0783ed0ef40f72ebeba41f8c98c9992f368c7 v7-3-224
-+0000000000000000000000000000000000000000 v7-3-224
-+c249d9aa60f759286f54781829c1e3da8680c4a7 v7.3.225
-+c249d9aa60f759286f54781829c1e3da8680c4a7 v7-3-225
-+0000000000000000000000000000000000000000 v7-3-225
-+8477b2cc2b81603408b3fb1a84cd65afb2aadc65 v7.3.226
-+8477b2cc2b81603408b3fb1a84cd65afb2aadc65 v7-3-226
-+0000000000000000000000000000000000000000 v7-3-226
-+b65a26a2aa095c739e90edb7b980154476529d35 v7.3.227
-+b65a26a2aa095c739e90edb7b980154476529d35 v7-3-227
-+0000000000000000000000000000000000000000 v7-3-227
-+c6df8554b39d009ed146baa48c0cfb351aa8379a v7.3.228
-+c6df8554b39d009ed146baa48c0cfb351aa8379a v7-3-228
-+0000000000000000000000000000000000000000 v7-3-228
-+07647a0545c9f0fad4e1e84062e0572a07d94659 v7.3.229
-+07647a0545c9f0fad4e1e84062e0572a07d94659 v7-3-229
-+0000000000000000000000000000000000000000 v7-3-229
-+70c8f54e7efbd7b59bbe6764d0fbfa1f1602273f v7.3.230
-+70c8f54e7efbd7b59bbe6764d0fbfa1f1602273f v7-3-230
-+0000000000000000000000000000000000000000 v7-3-230
-+455a4c85d04d04c732367f915d82c5b3c9a65b50 v7.3.231
-+455a4c85d04d04c732367f915d82c5b3c9a65b50 v7-3-231
-+0000000000000000000000000000000000000000 v7-3-231
-+b67d3a44262a97e7b3ae212fcffb36926b5f53f4 v7.3.232
-+b67d3a44262a97e7b3ae212fcffb36926b5f53f4 v7-3-232
-+0000000000000000000000000000000000000000 v7-3-232
-+69b90e43b728ec28939b0a536de32f818b7ee756 v7.3.233
-+69b90e43b728ec28939b0a536de32f818b7ee756 v7-3-233
-+0000000000000000000000000000000000000000 v7-3-233
-+7653420fdc454be197d59e420a1672909fac7b82 v7.3.234
-+7653420fdc454be197d59e420a1672909fac7b82 v7-3-234
-+0000000000000000000000000000000000000000 v7-3-234
-+441d364773dc53264b5f26042f8fc6f8b77c8044 v7.3.235
-+441d364773dc53264b5f26042f8fc6f8b77c8044 v7-3-235
-+0000000000000000000000000000000000000000 v7-3-235
-+c1733ef5b6e87dde521d0d85a1e5e62259854ac1 v7.3.236
-+c1733ef5b6e87dde521d0d85a1e5e62259854ac1 v7-3-236
-+0000000000000000000000000000000000000000 v7-3-236
-+e3bb93df6c34da672244bce5695c1426da139614 v7.3.237
-+e3bb93df6c34da672244bce5695c1426da139614 v7-3-237
-+0000000000000000000000000000000000000000 v7-3-237
-+f2c108f44f415c7cfe92862e791a01cc542ac378 v7.3.238
-+f2c108f44f415c7cfe92862e791a01cc542ac378 v7-3-238
-+0000000000000000000000000000000000000000 v7-3-238
-+0bef86c5c985218a9448fa16d935b913e67af8d5 v7.3.239
-+0bef86c5c985218a9448fa16d935b913e67af8d5 v7-3-239
-+0000000000000000000000000000000000000000 v7-3-239
-+bf283e37792b4b557a2b9081e4fdb0e10acb9655 v7.3.240
-+bf283e37792b4b557a2b9081e4fdb0e10acb9655 v7-3-240
-+0000000000000000000000000000000000000000 v7-3-240
-+0a650db0265381b540df8ca6bd716c4b2d47dfc9 v7.3.241
-+0a650db0265381b540df8ca6bd716c4b2d47dfc9 v7-3-241
-+0000000000000000000000000000000000000000 v7-3-241
-+3d96ddbeb3b0003de29b736f63b76675909f133c v7.3.242
-+3d96ddbeb3b0003de29b736f63b76675909f133c v7-3-242
-+0000000000000000000000000000000000000000 v7-3-242
-+512ddd87f1a817749c8362bd043682a7bbd87014 v7.3.243
-+512ddd87f1a817749c8362bd043682a7bbd87014 v7-3-243
-+0000000000000000000000000000000000000000 v7-3-243
-+be6b6509636242cd7e6fab9a4b8772e97fc9a0db v7.3.244
-+be6b6509636242cd7e6fab9a4b8772e97fc9a0db v7-3-244
-+0000000000000000000000000000000000000000 v7-3-244
-+52512eddb876f64399e98d12643233a87c9f2823 v7.3.245
-+52512eddb876f64399e98d12643233a87c9f2823 v7-3-245
-+0000000000000000000000000000000000000000 v7-3-245
-+3f1a4ed36d1b520a1ad5aa6cbf50d68bc8b9c7a5 v7.3.246
-+3f1a4ed36d1b520a1ad5aa6cbf50d68bc8b9c7a5 v7-3-246
-+0000000000000000000000000000000000000000 v7-3-246
-+7fe2c092913e84e6717782da1f1a220069eebbe7 v7.3.247
-+7fe2c092913e84e6717782da1f1a220069eebbe7 v7-3-247
-+0000000000000000000000000000000000000000 v7-3-247
-+57a7998e0fa8854a7a8c3946df1d4c9b1ee220e5 v7.3.248
-+57a7998e0fa8854a7a8c3946df1d4c9b1ee220e5 v7-3-248
-+0000000000000000000000000000000000000000 v7-3-248
-+9f71f5a526aff4f1e0eefe1068d9534aee427afa v7.3.249
-+9f71f5a526aff4f1e0eefe1068d9534aee427afa v7-3-249
-+0000000000000000000000000000000000000000 v7-3-249
-+f909f4f0f38c71594266b3595d31ce04d4ebe3ec v7.3.250
-+f909f4f0f38c71594266b3595d31ce04d4ebe3ec v7-3-250
-+0000000000000000000000000000000000000000 v7-3-250
-+fe6ad3fd85322b394824a5c495a78061a747b074 v7.3.251
-+fe6ad3fd85322b394824a5c495a78061a747b074 v7-3-251
-+0000000000000000000000000000000000000000 v7-3-251
-+0b4289bcf8364854dd5f94c42d0252504103e5b9 v7.3.252
-+0b4289bcf8364854dd5f94c42d0252504103e5b9 v7-3-252
-+0000000000000000000000000000000000000000 v7-3-252
-+c21429d7768cd4b834a086dd47881d01bca74e8c v7.3.253
-+c21429d7768cd4b834a086dd47881d01bca74e8c v7-3-253
-+0000000000000000000000000000000000000000 v7-3-253
-+1eb805225de7750c03af7b0f7ac2f5dd18d032be v7.3.254
-+1eb805225de7750c03af7b0f7ac2f5dd18d032be v7-3-254
-+0000000000000000000000000000000000000000 v7-3-254
-+aa998de9f9592426c17396b60c5db9170a234024 v7.3.255
-+aa998de9f9592426c17396b60c5db9170a234024 v7-3-255
-+0000000000000000000000000000000000000000 v7-3-255
-+c296c225736e4489706c62c95752a0c4788be1d3 v7.3.256
-+c296c225736e4489706c62c95752a0c4788be1d3 v7-3-256
-+0000000000000000000000000000000000000000 v7-3-256
-+1fad9c73d77a0030586704cccab1b1a7aba8b58b v7.3.257
-+1fad9c73d77a0030586704cccab1b1a7aba8b58b v7-3-257
-+0000000000000000000000000000000000000000 v7-3-257
-+bdc3335bd72eea207b28fcf8af90a73c855c8847 v7.3.258
-+bdc3335bd72eea207b28fcf8af90a73c855c8847 v7-3-258
-+0000000000000000000000000000000000000000 v7-3-258
-+59130cd78dfc73bd04f22d201b8f7c0772d98e79 v7.3.259
-+59130cd78dfc73bd04f22d201b8f7c0772d98e79 v7-3-259
-+0000000000000000000000000000000000000000 v7-3-259
-+cb4682b959098e486977eb4b5969c9eb07d2798e v7.3.260
-+cb4682b959098e486977eb4b5969c9eb07d2798e v7-3-260
-+0000000000000000000000000000000000000000 v7-3-260
-+410d42e3d4da09284394456186143d595e9b2efc v7.3.261
-+410d42e3d4da09284394456186143d595e9b2efc v7-3-261
-+0000000000000000000000000000000000000000 v7-3-261
-+847733973bfdd716bfafc364a4102e76f88e7fe8 v7.3.262
-+847733973bfdd716bfafc364a4102e76f88e7fe8 v7-3-262
-+0000000000000000000000000000000000000000 v7-3-262
-+a56259157c935b4e78e9f5f4dfb1436e3461eefb v7.3.263
-+a56259157c935b4e78e9f5f4dfb1436e3461eefb v7-3-263
-+0000000000000000000000000000000000000000 v7-3-263
-+aa40bddeea9a44c6c6b4ffa32c1ef373df437a16 v7.3.264
-+aa40bddeea9a44c6c6b4ffa32c1ef373df437a16 v7-3-264
-+0000000000000000000000000000000000000000 v7-3-264
-+eff686fb8de66a26367f5e6430d34729f1a0e336 v7.3.265
-+eff686fb8de66a26367f5e6430d34729f1a0e336 v7-3-265
-+0000000000000000000000000000000000000000 v7-3-265
-+25be7c9dda549e4cfa1eb57937dc2b38b3d1e997 v7.3.266
-+25be7c9dda549e4cfa1eb57937dc2b38b3d1e997 v7-3-266
-+0000000000000000000000000000000000000000 v7-3-266
-+ad404f2a4bfa5374e97f29335f41b7ef34cd6bfa v7.3.267
-+ad404f2a4bfa5374e97f29335f41b7ef34cd6bfa v7-3-267
-+0000000000000000000000000000000000000000 v7-3-267
-+ee17ee712512451a54046d6bcd3ddb9f70cb5cdf v7.3.268
-+ee17ee712512451a54046d6bcd3ddb9f70cb5cdf v7-3-268
-+0000000000000000000000000000000000000000 v7-3-268
-+7f4f5ca70dbde4e31c2de494b982bfb9bd71ed75 v7.3.269
-+7f4f5ca70dbde4e31c2de494b982bfb9bd71ed75 v7-3-269
-+0000000000000000000000000000000000000000 v7-3-269
-+b9182da84c7eeda221e5219ef4361cca201b3b41 v7.3.270
-+b9182da84c7eeda221e5219ef4361cca201b3b41 v7-3-270
-+0000000000000000000000000000000000000000 v7-3-270
-+32a52f06f33b9e2d4817330099b410c1fcf64db2 v7.3.271
-+32a52f06f33b9e2d4817330099b410c1fcf64db2 v7-3-271
-+0000000000000000000000000000000000000000 v7-3-271
-+02f5abca10aee570d5a9cf00928ffaa663daba66 v7.3.272
-+02f5abca10aee570d5a9cf00928ffaa663daba66 v7-3-272
-+0000000000000000000000000000000000000000 v7-3-272
-+7d4e5e31d8c10c767cdf774a2b13aedd2f95f096 v7.3.273
-+7d4e5e31d8c10c767cdf774a2b13aedd2f95f096 v7-3-273
-+0000000000000000000000000000000000000000 v7-3-273
-+1bb6776fa8c445e0b3f9dd2ed14fdf2a56f5873e v7.3.274
-+1bb6776fa8c445e0b3f9dd2ed14fdf2a56f5873e v7-3-274
-+0000000000000000000000000000000000000000 v7-3-274
-+125c7bf52271461dfbf46cc33317eadc67aaf742 v7.3.275
-+125c7bf52271461dfbf46cc33317eadc67aaf742 v7-3-275
-+0000000000000000000000000000000000000000 v7-3-275
-+37a54a85413eae68932233e64a0ab88c99c9d811 v7.3.276
-+37a54a85413eae68932233e64a0ab88c99c9d811 v7-3-276
-+0000000000000000000000000000000000000000 v7-3-276
-+e5b17a5f651696ad4c523a21822692115d371250 v7.3.277
-+e5b17a5f651696ad4c523a21822692115d371250 v7-3-277
-+0000000000000000000000000000000000000000 v7-3-277
-+6622f28b7e87a93de6f1520945d1c5d2a1fc0dab v7.3.278
-+6622f28b7e87a93de6f1520945d1c5d2a1fc0dab v7-3-278
-+0000000000000000000000000000000000000000 v7-3-278
-+342b176089678e86cde3e1afac4aaaa1e5153f99 v7.3.279
-+342b176089678e86cde3e1afac4aaaa1e5153f99 v7-3-279
-+0000000000000000000000000000000000000000 v7-3-279
-+58bba69b3371d9ff02b27fe24f044e229c8aa99a v7.3.280
-+58bba69b3371d9ff02b27fe24f044e229c8aa99a v7-3-280
-+0000000000000000000000000000000000000000 v7-3-280
-+45ead8a0bedeade57c320d72e9f710a703e61cf0 v7.3.281
-+45ead8a0bedeade57c320d72e9f710a703e61cf0 v7-3-281
-+0000000000000000000000000000000000000000 v7-3-281
-+92167bb91c95410a0550ff8c94370307bb7d9d80 v7.3.282
-+92167bb91c95410a0550ff8c94370307bb7d9d80 v7-3-282
-+0000000000000000000000000000000000000000 v7-3-282
-+47b6d37b60122f45eb147106b8da1322c1cdbc60 v7.3.283
-+47b6d37b60122f45eb147106b8da1322c1cdbc60 v7-3-283
-+0000000000000000000000000000000000000000 v7-3-283
-+27d43855b72312500e6fc2122e167a579a1f35f2 v7.3.284
-+27d43855b72312500e6fc2122e167a579a1f35f2 v7-3-284
-+0000000000000000000000000000000000000000 v7-3-284
-+6018c815e1205e7db9328fe6ed91b26b514465f3 v7.3.285
-+6018c815e1205e7db9328fe6ed91b26b514465f3 v7-3-285
-+0000000000000000000000000000000000000000 v7-3-285
-+3f822e54765c54a1112a953e3c37bb60185fd51c v7.3.286
-+3f822e54765c54a1112a953e3c37bb60185fd51c v7-3-286
-+0000000000000000000000000000000000000000 v7-3-286
-+07bc2ccfe5559035e785f22851365b3a31dec67e v7.3.287
-+07bc2ccfe5559035e785f22851365b3a31dec67e v7-3-287
-+0000000000000000000000000000000000000000 v7-3-287
-+e4f3fa1a474e677dce486ea07ee31270f92b2b4a v7.3.288
-+e4f3fa1a474e677dce486ea07ee31270f92b2b4a v7-3-288
-+0000000000000000000000000000000000000000 v7-3-288
-+44ffd0a8abcdba441216514cb711649eb1169876 v7.3.289
-+44ffd0a8abcdba441216514cb711649eb1169876 v7-3-289
-+0000000000000000000000000000000000000000 v7-3-289
-+df33dba4e553f8fa27ba467042f16315c613a00d v7.3.290
-+df33dba4e553f8fa27ba467042f16315c613a00d v7-3-290
-+0000000000000000000000000000000000000000 v7-3-290
-+e8ee4b4ebf41abb199ea9a9e9cc38f9b0c2f7192 v7.3.291
-+e8ee4b4ebf41abb199ea9a9e9cc38f9b0c2f7192 v7-3-291
-+0000000000000000000000000000000000000000 v7-3-291
-+b6af1c5dd22f08db2b9e52ae763f193ba82965ad v7.3.292
-+b6af1c5dd22f08db2b9e52ae763f193ba82965ad v7-3-292
-+0000000000000000000000000000000000000000 v7-3-292
-+6cd0d6413a2e03687aca8138b2843f1f2aac5b84 v7.3.293
-+6cd0d6413a2e03687aca8138b2843f1f2aac5b84 v7-3-293
-+0000000000000000000000000000000000000000 v7-3-293
-+dbd73fe939cf772a8b07c19230e5ee60aa0cfcc7 v7.3.294
-+dbd73fe939cf772a8b07c19230e5ee60aa0cfcc7 v7-3-294
-+0000000000000000000000000000000000000000 v7-3-294
-+0d8494c051131b6470fe8af67646e235bc63fcf7 v7.3.295
-+0d8494c051131b6470fe8af67646e235bc63fcf7 v7-3-295
-+0000000000000000000000000000000000000000 v7-3-295
-+c19c15a9e9bf2914b25748c0544936e84a5c77c0 v7.3.296
-+c19c15a9e9bf2914b25748c0544936e84a5c77c0 v7-3-296
-+0000000000000000000000000000000000000000 v7-3-296
-+22550986c713ce5f37f069f0c8f99a54dc4a421b v7.3.297
-+22550986c713ce5f37f069f0c8f99a54dc4a421b v7-3-297
-+0000000000000000000000000000000000000000 v7-3-297
-+43b1d031e3028248abcbd5099841d3aafda7f68d v7.3.298
-+43b1d031e3028248abcbd5099841d3aafda7f68d v7-3-298
-+0000000000000000000000000000000000000000 v7-3-298
-+eb4972982bfea006ead5b461f319744d5ecd58f5 v7.3.299
-+eb4972982bfea006ead5b461f319744d5ecd58f5 v7-3-299
-+0000000000000000000000000000000000000000 v7-3-299
-+2665b456ee59652c7b590dff0fa522ce337e0f16 v7.3.300
-+2665b456ee59652c7b590dff0fa522ce337e0f16 v7-3-300
-+0000000000000000000000000000000000000000 v7-3-300
-+4a70971530899e32058207cae683a69e7b8f85dc v7.3.301
-+4a70971530899e32058207cae683a69e7b8f85dc v7-3-301
-+0000000000000000000000000000000000000000 v7-3-301
-+61b2f26623104f75850b1568bf61663597fe7fb0 v7.3.302
-+61b2f26623104f75850b1568bf61663597fe7fb0 v7-3-302
-+0000000000000000000000000000000000000000 v7-3-302
-+d832d642f520d426f111b35102450617922547d3 v7.3.303
-+d832d642f520d426f111b35102450617922547d3 v7-3-303
-+0000000000000000000000000000000000000000 v7-3-303
-+b3a523ced6bd1173e4c17611559c173094830d43 v7.3.304
-+b3a523ced6bd1173e4c17611559c173094830d43 v7-3-304
-+0000000000000000000000000000000000000000 v7-3-304
-+0e06c025f66ffdfea20c8b73a995d23448b8dbfb v7.3.305
-+0e06c025f66ffdfea20c8b73a995d23448b8dbfb v7-3-305
-+0000000000000000000000000000000000000000 v7-3-305
-+0787bb5f387b79842d5c9353ae3541a992d1b9f1 v7.3.306
-+0787bb5f387b79842d5c9353ae3541a992d1b9f1 v7-3-306
-+0000000000000000000000000000000000000000 v7-3-306
-+880b7dd69331d1fefaf2d8735b118b39d546280c v7.3.307
-+880b7dd69331d1fefaf2d8735b118b39d546280c v7-3-307
-+0000000000000000000000000000000000000000 v7-3-307
-+61c5e1527bd857e724f8396c89d0687126390675 v7.3.308
-+61c5e1527bd857e724f8396c89d0687126390675 v7-3-308
-+0000000000000000000000000000000000000000 v7-3-308
-+6eae1b42c6684f3fcdb4d6cdbfb7dc1942d9b364 v7.3.309
-+6eae1b42c6684f3fcdb4d6cdbfb7dc1942d9b364 v7-3-309
-+0000000000000000000000000000000000000000 v7-3-309
-+51ce22ba89d11505e18aa585fbd7dcbb22097f9a v7.3.310
-+51ce22ba89d11505e18aa585fbd7dcbb22097f9a v7-3-310
-+0000000000000000000000000000000000000000 v7-3-310
-+2cbde6bcc6238f41506f87bf31ff7d90f632345a v7.3.311
-+2cbde6bcc6238f41506f87bf31ff7d90f632345a v7-3-311
-+0000000000000000000000000000000000000000 v7-3-311
-+0ed06069aaf32dbb2aa3827b23280b0028954ce7 v7.3.312
-+0ed06069aaf32dbb2aa3827b23280b0028954ce7 v7-3-312
-+0000000000000000000000000000000000000000 v7-3-312
-+dc60200a16b21c3e4157708bb825ea61b9e5bdc1 v7.3.313
-+dc60200a16b21c3e4157708bb825ea61b9e5bdc1 v7-3-313
-+0000000000000000000000000000000000000000 v7-3-313
-+6ab1b45cc95ed56105b2130dc9938bb8344ff903 v7.3.314
-+6ab1b45cc95ed56105b2130dc9938bb8344ff903 v7-3-314
-+0000000000000000000000000000000000000000 v7-3-314
-+3ecf9e91d88acdb5eaaf93cc15a18914b60e0eb3 v7.3.315
-+3ecf9e91d88acdb5eaaf93cc15a18914b60e0eb3 v7-3-315
-+0000000000000000000000000000000000000000 v7-3-315
-+33c140e4664d102c34ec3ec5a17318f75cf475d7 v7.3.316
-+33c140e4664d102c34ec3ec5a17318f75cf475d7 v7-3-316
-+0000000000000000000000000000000000000000 v7-3-316
-+92a181a1cec3fec52cde1b3d71f628a3a2dc53c6 v7.3.317
-+92a181a1cec3fec52cde1b3d71f628a3a2dc53c6 v7-3-317
-+0000000000000000000000000000000000000000 v7-3-317
-+d68f20a86a3ec75d927955be5d31983b6c37eb1d v7.3.318
-+d68f20a86a3ec75d927955be5d31983b6c37eb1d v7-3-318
-+0000000000000000000000000000000000000000 v7-3-318
-+dc7f2f9759208aa07bf136deca661fd080a1ee68 v7.3.319
-+dc7f2f9759208aa07bf136deca661fd080a1ee68 v7-3-319
-+0000000000000000000000000000000000000000 v7-3-319
-+738ea87c196431c452bd499c5a9849597ac938de v7.3.320
-+738ea87c196431c452bd499c5a9849597ac938de v7-3-320
-+0000000000000000000000000000000000000000 v7-3-320
-+fc0804089b2945bfe683f9bc9ee0238b8c64a46e v7.3.321
-+fc0804089b2945bfe683f9bc9ee0238b8c64a46e v7-3-321
-+0000000000000000000000000000000000000000 v7-3-321
-+38a7fd9043474dfb464c338ffd7f393361f5a6c1 v7.3.322
-+38a7fd9043474dfb464c338ffd7f393361f5a6c1 v7-3-322
-+0000000000000000000000000000000000000000 v7-3-322
-+3bdb646fc8a46ee5a5fe474dccdce098680d24d6 v7.3.323
-+3bdb646fc8a46ee5a5fe474dccdce098680d24d6 v7-3-323
-+0000000000000000000000000000000000000000 v7-3-323
-+f04619f1fc1663f4ab05798c410e4fa35a9dd863 v7.3.324
-+f04619f1fc1663f4ab05798c410e4fa35a9dd863 v7-3-324
-+0000000000000000000000000000000000000000 v7-3-324
-+8aca621c00910556d4f52bd650d6841d6059d6ec v7.3.325
-+8aca621c00910556d4f52bd650d6841d6059d6ec v7-3-325
-+0000000000000000000000000000000000000000 v7-3-325
-+d3758064ff9946d23aeccc9d2340686766647b84 v7.3.326
-+d3758064ff9946d23aeccc9d2340686766647b84 v7-3-326
-+0000000000000000000000000000000000000000 v7-3-326
-+9028c70adafd109ab294102f74dfb5005a20bbfb v7.3.327
-+9028c70adafd109ab294102f74dfb5005a20bbfb v7-3-327
-+0000000000000000000000000000000000000000 v7-3-327
-+5b53cea62e5d1be2a1a36ce685c15f99bb8a41ba v7.3.328
-+5b53cea62e5d1be2a1a36ce685c15f99bb8a41ba v7-3-328
-+0000000000000000000000000000000000000000 v7-3-328
-+ec901ddc84d5c66c5d0c1dcca093584598487f9f v7.3.329
-+ec901ddc84d5c66c5d0c1dcca093584598487f9f v7-3-329
-+0000000000000000000000000000000000000000 v7-3-329
-+abb03be99d661455fd3790cd25355459448fa432 v7.3.330
-+abb03be99d661455fd3790cd25355459448fa432 v7-3-330
-+0000000000000000000000000000000000000000 v7-3-330
-+4b8c614c1c914ce5d712368a75dbfea9b7e44e17 v7.3.331
-+4b8c614c1c914ce5d712368a75dbfea9b7e44e17 v7-3-331
-+0000000000000000000000000000000000000000 v7-3-331
-+0ecfe54a273f6bc440684aca4ebe5926a2dfc6e2 v7.3.332
-+0ecfe54a273f6bc440684aca4ebe5926a2dfc6e2 v7-3-332
-+0000000000000000000000000000000000000000 v7-3-332
-+992b24149a9ee0d6f417e40a7462891a9f62ec6a v7.3.333
-+992b24149a9ee0d6f417e40a7462891a9f62ec6a v7-3-333
-+0000000000000000000000000000000000000000 v7-3-333
-+fdc72363229865cc6fd2da9db66f1d6e683b87c0 v7.3.334
-+fdc72363229865cc6fd2da9db66f1d6e683b87c0 v7-3-334
-+0000000000000000000000000000000000000000 v7-3-334
-+dc3f90a73fb375092ea9d870ae48ff31b31a56ab v7.3.335
-+dc3f90a73fb375092ea9d870ae48ff31b31a56ab v7-3-335
-+0000000000000000000000000000000000000000 v7-3-335
-+52526aec4afb220a1271e9a645194c42d3b2a538 v7.3.336
-+52526aec4afb220a1271e9a645194c42d3b2a538 v7-3-336
-+0000000000000000000000000000000000000000 v7-3-336
-+176bfa951339a0a36366cbc8def41ae75f5034e0 v7.3.337
-+176bfa951339a0a36366cbc8def41ae75f5034e0 v7-3-337
-+0000000000000000000000000000000000000000 v7-3-337
-+7919a3d7333b99cece7d1a2657c89c18de78bf82 v7.3.338
-+7919a3d7333b99cece7d1a2657c89c18de78bf82 v7-3-338
-+0000000000000000000000000000000000000000 v7-3-338
-+b5a2b4c0c1cac1758990ea449bc1c552522f39a9 v7.3.339
-+b5a2b4c0c1cac1758990ea449bc1c552522f39a9 v7-3-339
-+0000000000000000000000000000000000000000 v7-3-339
-+49b08c9b9f5b72d930a1c02f00aa4128dc58532d v7.3.340
-+49b08c9b9f5b72d930a1c02f00aa4128dc58532d v7-3-340
-+0000000000000000000000000000000000000000 v7-3-340
-+6963603ec6dc2b47da9a7e951b2d0b3e024535eb v7.3.341
-+6963603ec6dc2b47da9a7e951b2d0b3e024535eb v7-3-341
-+0000000000000000000000000000000000000000 v7-3-341
-+314d9368069ec0458631ca150c202e7f724ad6d3 v7.3.342
-+314d9368069ec0458631ca150c202e7f724ad6d3 v7-3-342
-+0000000000000000000000000000000000000000 v7-3-342
-+98a05814f1b466c87611b810eeafe8e7d9c581b6 v7.3.343
-+98a05814f1b466c87611b810eeafe8e7d9c581b6 v7-3-343
-+0000000000000000000000000000000000000000 v7-3-343
-+7ba2f171cdaca18571b5e73dece426411c4f124a v7.3.344
-+7ba2f171cdaca18571b5e73dece426411c4f124a v7-3-344
-+0000000000000000000000000000000000000000 v7-3-344
-+35f098371af699aa7e614a6397a068119b54cabf v7.3.345
-+35f098371af699aa7e614a6397a068119b54cabf v7-3-345
-+0000000000000000000000000000000000000000 v7-3-345
-+af76a61a7f79ccd3bcf64e15c73f2a3ea0eb77da v7.3.346
-+af76a61a7f79ccd3bcf64e15c73f2a3ea0eb77da v7-3-346
-+0000000000000000000000000000000000000000 v7-3-346
-+72528c5eb87ea315a7c1a48f7734d1717c28820f v7.3.347
-+72528c5eb87ea315a7c1a48f7734d1717c28820f v7-3-347
-+0000000000000000000000000000000000000000 v7-3-347
-+4d4a328f199e4020457b4bf8f077622966bb3563 v7.3.348
-+4d4a328f199e4020457b4bf8f077622966bb3563 v7-3-348
-+0000000000000000000000000000000000000000 v7-3-348
-+075acc2dccaa621998ccb1d671a987090367d485 v7.3.349
-+075acc2dccaa621998ccb1d671a987090367d485 v7-3-349
-+0000000000000000000000000000000000000000 v7-3-349
-+07956eab189c0c776b79bc42235833d234480559 v7.3.350
-+07956eab189c0c776b79bc42235833d234480559 v7-3-350
-+0000000000000000000000000000000000000000 v7-3-350
-+ff69efc4bc55d83b5f2bb68aeede1d921e8f1036 v7.3.351
-+ff69efc4bc55d83b5f2bb68aeede1d921e8f1036 v7-3-351
-+0000000000000000000000000000000000000000 v7-3-351
-+ca65249eb34bc62e82d54f74e14271be7f7f8a44 v7.3.352
-+ca65249eb34bc62e82d54f74e14271be7f7f8a44 v7-3-352
-+0000000000000000000000000000000000000000 v7-3-352
-+12bb368fef2c8c5478f0f8905aac381a56a75fe0 v7.3.353
-+12bb368fef2c8c5478f0f8905aac381a56a75fe0 v7-3-353
-+0000000000000000000000000000000000000000 v7-3-353
-+6672b1645306ceab4348caaffec40990dc319b98 v7.3.354
-+6672b1645306ceab4348caaffec40990dc319b98 v7-3-354
-+0000000000000000000000000000000000000000 v7-3-354
-+d2f70593afeb432611cdb0ea2a0600c2869a20e0 v7.3.355
-+d2f70593afeb432611cdb0ea2a0600c2869a20e0 v7-3-355
-+0000000000000000000000000000000000000000 v7-3-355
-+c349a670716ab5e5f01b8121f3b7f07560ce0b8a v7.3.356
-+c349a670716ab5e5f01b8121f3b7f07560ce0b8a v7-3-356
-+0000000000000000000000000000000000000000 v7-3-356
-+e618700297e83c0d51efbb77a849ce5f0b19b507 v7.3.357
-+e618700297e83c0d51efbb77a849ce5f0b19b507 v7-3-357
-+0000000000000000000000000000000000000000 v7-3-357
-+97a52300ef2b496b6c8e2487973f134d9e0afba8 v7.3.358
-+97a52300ef2b496b6c8e2487973f134d9e0afba8 v7-3-358
-+0000000000000000000000000000000000000000 v7-3-358
-+b7f0f23bf90603f83854fd1aece09fcc64876a29 v7.3.359
-+b7f0f23bf90603f83854fd1aece09fcc64876a29 v7-3-359
-+0000000000000000000000000000000000000000 v7-3-359
-+28480c9006e6e6936aae05de1f3ca3eaf4d2f267 v7.3.360
-+28480c9006e6e6936aae05de1f3ca3eaf4d2f267 v7-3-360
-+0000000000000000000000000000000000000000 v7-3-360
-+e42252611e74c1df2063955d6086f59fb3e3247d v7.3.361
-+e42252611e74c1df2063955d6086f59fb3e3247d v7-3-361
-+0000000000000000000000000000000000000000 v7-3-361
-+074ddc768feadcb3164973c7f7be8bf78dbdd56e v7.3.362
-+074ddc768feadcb3164973c7f7be8bf78dbdd56e v7-3-362
-+0000000000000000000000000000000000000000 v7-3-362
-+c025592d7b1dd658955b9a6d2d159c04e83c31e0 v7.3.363
-+c025592d7b1dd658955b9a6d2d159c04e83c31e0 v7-3-363
-+0000000000000000000000000000000000000000 v7-3-363
-+b0bbaf1020f08fa6dbeb059e251127e27fab9ecc v7.3.364
-+b0bbaf1020f08fa6dbeb059e251127e27fab9ecc v7-3-364
-+0000000000000000000000000000000000000000 v7-3-364
-+54ef99c39139cad53db24bcdc18470394d76b40f v7.3.365
-+54ef99c39139cad53db24bcdc18470394d76b40f v7-3-365
-+0000000000000000000000000000000000000000 v7-3-365
-+436b42f3cba1896b65ad32e791d131a7c3978738 v7.3.366
-+436b42f3cba1896b65ad32e791d131a7c3978738 v7-3-366
-+0000000000000000000000000000000000000000 v7-3-366
-+972bd3fca5562b8752ae18313e8cb3e6fac207c5 v7.3.367
-+972bd3fca5562b8752ae18313e8cb3e6fac207c5 v7-3-367
-+0000000000000000000000000000000000000000 v7-3-367
-+4e9c5338f44c24d511a989b5ea50850a2b9110b6 v7.3.368
-+4e9c5338f44c24d511a989b5ea50850a2b9110b6 v7-3-368
-+0000000000000000000000000000000000000000 v7-3-368
-+0df9718c45b68c0aaa40934bb54b3217b0c24495 v7.3.369
-+0df9718c45b68c0aaa40934bb54b3217b0c24495 v7-3-369
-+0000000000000000000000000000000000000000 v7-3-369
-+3801e4811b0ecd56667fe89172ed37a84047307d v7.3.370
-+3801e4811b0ecd56667fe89172ed37a84047307d v7-3-370
-+0000000000000000000000000000000000000000 v7-3-370
-+e757e1127d210632cc920d9a0d2d2a3b89be7ffe v7.3.371
-+e757e1127d210632cc920d9a0d2d2a3b89be7ffe v7-3-371
-+0000000000000000000000000000000000000000 v7-3-371
-+6ff80dd02b51e9bd6d3c1b0167b81e295b0b4881 v7.3.372
-+6ff80dd02b51e9bd6d3c1b0167b81e295b0b4881 v7-3-372
-+0000000000000000000000000000000000000000 v7-3-372
-+a1d2f741d45c8731450db862e89eb4a650796fe9 v7.3.373
-+a1d2f741d45c8731450db862e89eb4a650796fe9 v7-3-373
-+0000000000000000000000000000000000000000 v7-3-373
-+0a9d7cf90f94945578b83883e2ade369ecfbfc6d v7.3.374
-+0a9d7cf90f94945578b83883e2ade369ecfbfc6d v7-3-374
-+0000000000000000000000000000000000000000 v7-3-374
-+767bb493e7d31273edc45f4cb6602784f639f516 v7.3.375
-+767bb493e7d31273edc45f4cb6602784f639f516 v7-3-375
-+0000000000000000000000000000000000000000 v7-3-375
-+1d7434010de186b02fd6a5c8eef3e28108a4a251 v7.3.376
-+1d7434010de186b02fd6a5c8eef3e28108a4a251 v7-3-376
-+0000000000000000000000000000000000000000 v7-3-376
-+cd145cc2f2c918b9fd77dc177f69805c77e31e41 v7.3.377
-+cd145cc2f2c918b9fd77dc177f69805c77e31e41 v7-3-377
-+0000000000000000000000000000000000000000 v7-3-377
-+a7517e84d9b8191092ff849e520558d61be01f71 v7.3.378
-+a7517e84d9b8191092ff849e520558d61be01f71 v7-3-378
-+0000000000000000000000000000000000000000 v7-3-378
-+0f193ef0f4298ed632b5e9dc88c7efefe093728b v7.3.379
-+0f193ef0f4298ed632b5e9dc88c7efefe093728b v7-3-379
-+0000000000000000000000000000000000000000 v7-3-379
-+534b3ef1cf1440a9e22c2efc7f2673017024f124 v7.3.380
-+534b3ef1cf1440a9e22c2efc7f2673017024f124 v7-3-380
-+0000000000000000000000000000000000000000 v7-3-380
-+6cc788692b2e8e043a3d7fff4e1efa2601ad39c7 v7.3.381
-+6cc788692b2e8e043a3d7fff4e1efa2601ad39c7 v7-3-381
-+0000000000000000000000000000000000000000 v7-3-381
-+2260435283f2ba0ac8d0b35e216b297605ef81db v7.3.382
-+2260435283f2ba0ac8d0b35e216b297605ef81db v7-3-382
-+0000000000000000000000000000000000000000 v7-3-382
-+f8d2ef4512f8d78c00a7aff24fb8f99aced6f2d6 v7.3.383
-+f8d2ef4512f8d78c00a7aff24fb8f99aced6f2d6 v7-3-383
-+0000000000000000000000000000000000000000 v7-3-383
-+e958eeffa0a7d0ed2021f2f4b61ed9e5daf3d9a5 v7.3.384
-+e958eeffa0a7d0ed2021f2f4b61ed9e5daf3d9a5 v7-3-384
-+0000000000000000000000000000000000000000 v7-3-384
-+910eb66c97684b3c0511789e7655dce2c7ba254a v7.3.385
-+910eb66c97684b3c0511789e7655dce2c7ba254a v7-3-385
-+0000000000000000000000000000000000000000 v7-3-385
-+1cedbee50ca65fc96eca2d360ddf886b3e7ad74f v7.3.386
-+1cedbee50ca65fc96eca2d360ddf886b3e7ad74f v7-3-386
-+0000000000000000000000000000000000000000 v7-3-386
-+ac16c62282ac0e961afa44b556fe850dd6c8e1aa v7.3.387
-+ac16c62282ac0e961afa44b556fe850dd6c8e1aa v7-3-387
-+0000000000000000000000000000000000000000 v7-3-387
-+683fab13904c115b4e1f8b9ecb902d192501245d v7.3.388
-+683fab13904c115b4e1f8b9ecb902d192501245d v7-3-388
-+0000000000000000000000000000000000000000 v7-3-388
-+c97c3272d7a67a2980ddc291f12f09c36568c54c v7.3.389
-+c97c3272d7a67a2980ddc291f12f09c36568c54c v7-3-389
-+0000000000000000000000000000000000000000 v7-3-389
-+48252b5fd17042ae95c6736073ba3c5b12820f2c v7.3.390
-+48252b5fd17042ae95c6736073ba3c5b12820f2c v7-3-390
-+0000000000000000000000000000000000000000 v7-3-390
-+819322e0e93e50c04fa79163f9b88085cbe7db8d v7.3.391
-+819322e0e93e50c04fa79163f9b88085cbe7db8d v7-3-391
-+0000000000000000000000000000000000000000 v7-3-391
-+c4898d6d73a2ffa55fc91f79f8e110260eda29cb v7.3.392
-+c4898d6d73a2ffa55fc91f79f8e110260eda29cb v7-3-392
-+0000000000000000000000000000000000000000 v7-3-392
-+e0248b732a5cf0c4e6d61253564f3f855d11a755 v7.3.393
-+e0248b732a5cf0c4e6d61253564f3f855d11a755 v7-3-393
-+0000000000000000000000000000000000000000 v7-3-393
-+927c7377cf49bbbf87d12863c2a2d462c9cf97a7 v7.3.394
-+927c7377cf49bbbf87d12863c2a2d462c9cf97a7 v7-3-394
-+0000000000000000000000000000000000000000 v7-3-394
-+80c529a5650f1d70342f18c681b69d7897495006 v7.3.395
-+80c529a5650f1d70342f18c681b69d7897495006 v7-3-395
-+0000000000000000000000000000000000000000 v7-3-395
-+2f075595590f498f1a9cfc42dfce24cd0d980e96 v7.3.396
-+2f075595590f498f1a9cfc42dfce24cd0d980e96 v7-3-396
-+0000000000000000000000000000000000000000 v7-3-396
-+75217982ea460e7bdfdd2517d8d4e4f0d0ebaef4 v7.3.397
-+75217982ea460e7bdfdd2517d8d4e4f0d0ebaef4 v7-3-397
-+0000000000000000000000000000000000000000 v7-3-397
-+9eb7fdfb5e63ad98f6feb81b03566fbdc5ebd895 v7.3.398
-+9eb7fdfb5e63ad98f6feb81b03566fbdc5ebd895 v7-3-398
-+0000000000000000000000000000000000000000 v7-3-398
-+ce6afdc00290520fb2d9677b44a0cbb70bc401e6 v7.3.399
-+ce6afdc00290520fb2d9677b44a0cbb70bc401e6 v7-3-399
-+0000000000000000000000000000000000000000 v7-3-399
-+320cc46d0eb022bfb24d1b636050becc83ac0014 v7.3.400
-+320cc46d0eb022bfb24d1b636050becc83ac0014 v7-3-400
-+0000000000000000000000000000000000000000 v7-3-400
-+1251e1ce94610b265d3c1f636d379a0504cf2ae5 v7.3.401
-+1251e1ce94610b265d3c1f636d379a0504cf2ae5 v7-3-401
-+0000000000000000000000000000000000000000 v7-3-401
-+4eda43e1fce06ef32d0a79721fa0a6850a72b4dc v7.3.402
-+4eda43e1fce06ef32d0a79721fa0a6850a72b4dc v7-3-402
-+0000000000000000000000000000000000000000 v7-3-402
-+5850b58276918de8edf19ece0bd258e179967af8 v7.3.403
-+5850b58276918de8edf19ece0bd258e179967af8 v7-3-403
-+0000000000000000000000000000000000000000 v7-3-403
-+8b928bc814a8d502f25a06ddfa66b0474b89a73f v7.3.404
-+8b928bc814a8d502f25a06ddfa66b0474b89a73f v7-3-404
-+0000000000000000000000000000000000000000 v7-3-404
-+c75a8d2404bd4f1297aafbb10ab1ae68ba678249 v7.3.405
-+c75a8d2404bd4f1297aafbb10ab1ae68ba678249 v7-3-405
-+0000000000000000000000000000000000000000 v7-3-405
-+fbb23bd517f8614f512cd81b253519cbf4548863 v7.3.406
-+fbb23bd517f8614f512cd81b253519cbf4548863 v7-3-406
-+0000000000000000000000000000000000000000 v7-3-406
-+55cebc7e5de078ef323a94ad79319c0ab33b09ef v7.3.407
-+55cebc7e5de078ef323a94ad79319c0ab33b09ef v7-3-407
-+0000000000000000000000000000000000000000 v7-3-407
-+1fec3c62f6e8065c2f7ea7422213e78b50032de6 v7.3.408
-+1fec3c62f6e8065c2f7ea7422213e78b50032de6 v7-3-408
-+0000000000000000000000000000000000000000 v7-3-408
-+7b59c2c032ca8a15425afb1b519c809abfd572f0 v7.3.409
-+7b59c2c032ca8a15425afb1b519c809abfd572f0 v7-3-409
-+0000000000000000000000000000000000000000 v7-3-409
-+5cf2a671d8ebdf46590b8fe349ad2b6f84eed868 v7.3.410
-+5cf2a671d8ebdf46590b8fe349ad2b6f84eed868 v7-3-410
-+0000000000000000000000000000000000000000 v7-3-410
-+8066fb7e356481b52019a52696072594d2590d4f v7.3.411
-+8066fb7e356481b52019a52696072594d2590d4f v7-3-411
-+0000000000000000000000000000000000000000 v7-3-411
-+aaee6093302281b70798ae4dc599145b95891908 v7.3.412
-+aaee6093302281b70798ae4dc599145b95891908 v7-3-412
-+0000000000000000000000000000000000000000 v7-3-412
-+821c8be2e9d604282481f50f7c5a1a210b9b1696 v7.3.413
-+821c8be2e9d604282481f50f7c5a1a210b9b1696 v7-3-413
-+0000000000000000000000000000000000000000 v7-3-413
-+c7861dd3b593a2011ae46dbe43d78f44cdf2d99f v7.3.414
-+c7861dd3b593a2011ae46dbe43d78f44cdf2d99f v7-3-414
-+0000000000000000000000000000000000000000 v7-3-414
-+e7e4dbac7ded5e048e289c7fd92c40e29f775758 v7.3.415
-+e7e4dbac7ded5e048e289c7fd92c40e29f775758 v7-3-415
-+0000000000000000000000000000000000000000 v7-3-415
-+22a626604672b37914ae929b0d5e11e3efb0d79f v7.3.416
-+22a626604672b37914ae929b0d5e11e3efb0d79f v7-3-416
-+0000000000000000000000000000000000000000 v7-3-416
-+63d3541d07339c65d602bac2bbc72d755b416ad8 v7.3.417
-+63d3541d07339c65d602bac2bbc72d755b416ad8 v7-3-417
-+0000000000000000000000000000000000000000 v7-3-417
-+4500a0ad2e0a24f54e5c4b4a3266456cd5ccb2eb v7.3.418
-+4500a0ad2e0a24f54e5c4b4a3266456cd5ccb2eb v7-3-418
-+0000000000000000000000000000000000000000 v7-3-418
-+f4574729f6df749668df181a9dc09030f37de2ad v7.3.419
-+f4574729f6df749668df181a9dc09030f37de2ad v7-3-419
-+0000000000000000000000000000000000000000 v7-3-419
-+ded8f5add04c9477c47098a66991f971324787f2 v7.3.420
-+ded8f5add04c9477c47098a66991f971324787f2 v7-3-420
-+0000000000000000000000000000000000000000 v7-3-420
-+076003f52582c2ec0b4851df539edf512945778c v7.3.421
-+076003f52582c2ec0b4851df539edf512945778c v7-3-421
-+0000000000000000000000000000000000000000 v7-3-421
-+60f6df978a413952e37d03b85a50ca858456b53b v7.3.422
-+60f6df978a413952e37d03b85a50ca858456b53b v7-3-422
-+0000000000000000000000000000000000000000 v7-3-422
-+b7811ab264bf31e0049e7a9b689a399ead6cbda6 v7.3.423
-+b7811ab264bf31e0049e7a9b689a399ead6cbda6 v7-3-423
-+0000000000000000000000000000000000000000 v7-3-423
-+2e4539dc2de7da0aed83286304d1afeb0a4cdb3d v7.3.424
-+2e4539dc2de7da0aed83286304d1afeb0a4cdb3d v7-3-424
-+0000000000000000000000000000000000000000 v7-3-424
-+7b17a38eb223b4b56327f019267c1156121f5c0f v7.3.425
-+7b17a38eb223b4b56327f019267c1156121f5c0f v7-3-425
-+0000000000000000000000000000000000000000 v7-3-425
-+c70c005f61fb08ca032b4eab533908cfc6e6f40a v7.3.426
-+c70c005f61fb08ca032b4eab533908cfc6e6f40a v7-3-426
-+0000000000000000000000000000000000000000 v7-3-426
-+45467d77047df9134a7694367bf97344441b1b3c v7.3.427
-+45467d77047df9134a7694367bf97344441b1b3c v7-3-427
-+0000000000000000000000000000000000000000 v7-3-427
-+d473f39aeadf6d022e520968db17257b42b52b61 v7.3.428
-+d473f39aeadf6d022e520968db17257b42b52b61 v7-3-428
-+0000000000000000000000000000000000000000 v7-3-428
-+c9366ca36f6feb95bd8e01dbed9973a404f5391e v7.3.429
-+c9366ca36f6feb95bd8e01dbed9973a404f5391e v7-3-429
-+0000000000000000000000000000000000000000 v7-3-429
-+a9f8dd20a49f9b8296a6ef6d9e17e3446c0974eb v7.3.430
-+a9f8dd20a49f9b8296a6ef6d9e17e3446c0974eb v7-3-430
-+0000000000000000000000000000000000000000 v7-3-430
-+a27fac494e709a3cb78399f5dbc5d807a1dc7a46 v7.3.431
-+a27fac494e709a3cb78399f5dbc5d807a1dc7a46 v7-3-431
-+0000000000000000000000000000000000000000 v7-3-431
-+81201fb337a58a58cbac43c2b89025c681361df7 v7.3.432
-+81201fb337a58a58cbac43c2b89025c681361df7 v7-3-432
-+0000000000000000000000000000000000000000 v7-3-432
-+8a731d7f0664b13176afb640ed0325949836962d v7.3.433
-+8a731d7f0664b13176afb640ed0325949836962d v7-3-433
-+0000000000000000000000000000000000000000 v7-3-433
-+636c2b1cdc8b6cc5279ac7d5986da1085484b98a v7.3.434
-+636c2b1cdc8b6cc5279ac7d5986da1085484b98a v7-3-434
-+0000000000000000000000000000000000000000 v7-3-434
-+afbf45d854965f9e557497ab9d4d9aca87e220fd v7.3.435
-+afbf45d854965f9e557497ab9d4d9aca87e220fd v7-3-435
-+0000000000000000000000000000000000000000 v7-3-435
-+2a6eb75275d94b864eba6d6135de650a903a4a7e v7.3.436
-+2a6eb75275d94b864eba6d6135de650a903a4a7e v7-3-436
-+0000000000000000000000000000000000000000 v7-3-436
-+539613ce999d3a938c602a6b6eb230fd0d77a1d1 v7.3.437
-+539613ce999d3a938c602a6b6eb230fd0d77a1d1 v7-3-437
-+0000000000000000000000000000000000000000 v7-3-437
-+bb67cd961fc3011d367357c215a0603dcc46ea40 v7.3.438
-+bb67cd961fc3011d367357c215a0603dcc46ea40 v7-3-438
-+0000000000000000000000000000000000000000 v7-3-438
-+dec4338a7da22b02e7c7cc65668d35db264d3400 v7.3.439
-+dec4338a7da22b02e7c7cc65668d35db264d3400 v7-3-439
-+0000000000000000000000000000000000000000 v7-3-439
-+e3cbb11f3555d5dbb1cbd3daac4a958a9e1f01ea v7.3.440
-+e3cbb11f3555d5dbb1cbd3daac4a958a9e1f01ea v7-3-440
-+0000000000000000000000000000000000000000 v7-3-440
-+af4ed13ca541f034e3241f2eda1abdb3b45d1770 v7.3.441
-+af4ed13ca541f034e3241f2eda1abdb3b45d1770 v7-3-441
-+0000000000000000000000000000000000000000 v7-3-441
-+198ec1fff71a44a35aa7a59b4952583a82a296fa v7.3.442
-+198ec1fff71a44a35aa7a59b4952583a82a296fa v7-3-442
-+0000000000000000000000000000000000000000 v7-3-442
-+de050fcc24cfb56a7dc07dd283cc1132d774e7b7 v7.3.443
-+de050fcc24cfb56a7dc07dd283cc1132d774e7b7 v7-3-443
-+0000000000000000000000000000000000000000 v7-3-443
-+72146e7f47fa647f19fe419f4c8602897880eed5 v7.3.444
-+72146e7f47fa647f19fe419f4c8602897880eed5 v7-3-444
-+0000000000000000000000000000000000000000 v7-3-444
-+397e7e49bb0b831f7260d3ad70f6b07175c44a0c v7.3.445
-+397e7e49bb0b831f7260d3ad70f6b07175c44a0c v7-3-445
-+0000000000000000000000000000000000000000 v7-3-445
-+20ca2e05ae20ece942490182691ed45746f64cb6 v7.3.446
-+20ca2e05ae20ece942490182691ed45746f64cb6 v7-3-446
-+0000000000000000000000000000000000000000 v7-3-446
-+6a03b0ea2e12d748c1e4199e3f428ee080760939 v7.3.447
-+6a03b0ea2e12d748c1e4199e3f428ee080760939 v7-3-447
-+0000000000000000000000000000000000000000 v7-3-447
-+756d712b3118b896b57ddb4f4c071135bc031607 v7.3.448
-+756d712b3118b896b57ddb4f4c071135bc031607 v7-3-448
-+0000000000000000000000000000000000000000 v7-3-448
-+9ccdc4a69d8ff7aab8abf89f9a3cc9dad12249dd v7.3.449
-+9ccdc4a69d8ff7aab8abf89f9a3cc9dad12249dd v7-3-449
-+0000000000000000000000000000000000000000 v7-3-449
-+3479ac596f6c4b38849d2e5235ad590378605eb8 v7.3.450
-+3479ac596f6c4b38849d2e5235ad590378605eb8 v7-3-450
-+0000000000000000000000000000000000000000 v7-3-450
-+045fdc5b6056a18579f28b40a4914f4a7cb8d4a3 v7.3.451
-+045fdc5b6056a18579f28b40a4914f4a7cb8d4a3 v7-3-451
-+0000000000000000000000000000000000000000 v7-3-451
-+f1cde9cf023e15cd1bc26ae720d6380fa5ceac7d v7.3.452
-+f1cde9cf023e15cd1bc26ae720d6380fa5ceac7d v7-3-452
-+0000000000000000000000000000000000000000 v7-3-452
-+791baa7b35e1b6244cdecd4a2feed933f78fd84f v7.3.453
-+791baa7b35e1b6244cdecd4a2feed933f78fd84f v7-3-453
-+0000000000000000000000000000000000000000 v7-3-453
-+1632640a24b42a9193eeb8f6e8150afaeee5ee35 v7.3.454
-+1632640a24b42a9193eeb8f6e8150afaeee5ee35 v7-3-454
-+0000000000000000000000000000000000000000 v7-3-454
-+e6392f2aed4c13170664b4ec13dd2d8b3ce968aa v7.3.455
-+e6392f2aed4c13170664b4ec13dd2d8b3ce968aa v7-3-455
-+0000000000000000000000000000000000000000 v7-3-455
-+07fd030f89be62aa11c4ea1a188ee2d8f4348677 v7.3.456
-+07fd030f89be62aa11c4ea1a188ee2d8f4348677 v7-3-456
-+0000000000000000000000000000000000000000 v7-3-456
-+4a2744311b3f3c8207189dee4ef405959a2e2446 v7.3.457
-+4a2744311b3f3c8207189dee4ef405959a2e2446 v7-3-457
-+0000000000000000000000000000000000000000 v7-3-457
-+da670fb71d30a1eefb07b19256f8c0d677807550 v7.3.458
-+da670fb71d30a1eefb07b19256f8c0d677807550 v7-3-458
-+0000000000000000000000000000000000000000 v7-3-458
-+cb2ae92ce106de532c53f8a16a82bc2bf6edacd2 v7.3.459
-+cb2ae92ce106de532c53f8a16a82bc2bf6edacd2 v7-3-459
-+0000000000000000000000000000000000000000 v7-3-459
-+981c7ad9dd48cac1b4030b97c2f0dc0b8fe82337 v7.3.460
-+981c7ad9dd48cac1b4030b97c2f0dc0b8fe82337 v7-3-460
-+0000000000000000000000000000000000000000 v7-3-460
-+de60f6fa3d8d77442a39ec13efef89f6ca76af03 v7.3.461
-+de60f6fa3d8d77442a39ec13efef89f6ca76af03 v7-3-461
-+0000000000000000000000000000000000000000 v7-3-461
-+70eff6af1158f9dc99118ba73e81f456015c3ebd v7.3.462
-+70eff6af1158f9dc99118ba73e81f456015c3ebd v7-3-462
-+0000000000000000000000000000000000000000 v7-3-462
-+8e0fe5a723adfb45c44978083db7aeac11e6d72b v7.3.463
-+8e0fe5a723adfb45c44978083db7aeac11e6d72b v7-3-463
-+0000000000000000000000000000000000000000 v7-3-463
-+43259e4542c76e950fecc86114c43065064d1b34 v7.3.464
-+43259e4542c76e950fecc86114c43065064d1b34 v7-3-464
-+0000000000000000000000000000000000000000 v7-3-464
-+d1096a4e96bdd5bfc0ce2f1aaddcbff1475c69ad v7.3.465
-+d1096a4e96bdd5bfc0ce2f1aaddcbff1475c69ad v7-3-465
-+0000000000000000000000000000000000000000 v7-3-465
-+df9c7798b5e2c022310cd12e199c9de8d866aa39 v7.3.466
-+df9c7798b5e2c022310cd12e199c9de8d866aa39 v7-3-466
-+0000000000000000000000000000000000000000 v7-3-466
-+276d58e9265cfee76c04bc5450681090900a16f4 v7.3.467
-+276d58e9265cfee76c04bc5450681090900a16f4 v7-3-467
-+0000000000000000000000000000000000000000 v7-3-467
-+38a1357304234dcea96f96019abf0f3e5ae290ab v7.3.468
-+38a1357304234dcea96f96019abf0f3e5ae290ab v7-3-468
-+0000000000000000000000000000000000000000 v7-3-468
-+e61c3b09ae86a8a448ad2d028df6fa6b9778666b v7.3.469
-+e61c3b09ae86a8a448ad2d028df6fa6b9778666b v7-3-469
-+0000000000000000000000000000000000000000 v7-3-469
-+636e4db6e2075bd22640cfc8229af62059f8ffe0 v7.3.470
-+636e4db6e2075bd22640cfc8229af62059f8ffe0 v7-3-470
-+0000000000000000000000000000000000000000 v7-3-470
-+3465a9e7758850684d18a9bb11ac033efdcd1755 v7.3.471
-+3465a9e7758850684d18a9bb11ac033efdcd1755 v7-3-471
-+0000000000000000000000000000000000000000 v7-3-471
-+8332129d9ae8f11f8ecb9f016e5292c6582bbb4e v7.3.472
-+8332129d9ae8f11f8ecb9f016e5292c6582bbb4e v7-3-472
-+0000000000000000000000000000000000000000 v7-3-472
-+7f1bce9c9b79d4ebbf798d6122612934d55d70d9 v7.3.473
-+7f1bce9c9b79d4ebbf798d6122612934d55d70d9 v7-3-473
-+0000000000000000000000000000000000000000 v7-3-473
-+7613c9ab083f3e9262be5a21fe086921b757da4c v7.3.474
-+7613c9ab083f3e9262be5a21fe086921b757da4c v7-3-474
-+0000000000000000000000000000000000000000 v7-3-474
-+36160830a5e8d0e3b4174aa7d98363623468b77c v7.3.475
-+36160830a5e8d0e3b4174aa7d98363623468b77c v7-3-475
-+0000000000000000000000000000000000000000 v7-3-475
-+fb2c5a51dac7f1dbce6a0f35808927ac206c7f47 v7.3.476
-+fb2c5a51dac7f1dbce6a0f35808927ac206c7f47 v7-3-476
-+0000000000000000000000000000000000000000 v7-3-476
-+62dc0d69ab11d5b5a67c6139a0dd3e2618d2c2a1 v7.3.477
-+62dc0d69ab11d5b5a67c6139a0dd3e2618d2c2a1 v7-3-477
-+0000000000000000000000000000000000000000 v7-3-477
-+754db405921292fc57dbdaa85e62af333dce5912 v7.3.478
-+754db405921292fc57dbdaa85e62af333dce5912 v7-3-478
-+0000000000000000000000000000000000000000 v7-3-478
-+3db4282d5e6bb74a5c1094f35a81472d5a98f313 v7.3.479
-+3db4282d5e6bb74a5c1094f35a81472d5a98f313 v7-3-479
-+0000000000000000000000000000000000000000 v7-3-479
-+b35844f3eb49bb84101fdb276e3e69b0b8f7813f v7.3.480
-+b35844f3eb49bb84101fdb276e3e69b0b8f7813f v7-3-480
-+0000000000000000000000000000000000000000 v7-3-480
-+8e21ac7f2d6e9f269b057939dda58d3a31beb894 v7.3.481
-+8e21ac7f2d6e9f269b057939dda58d3a31beb894 v7-3-481
-+0000000000000000000000000000000000000000 v7-3-481
-+3229335d0c4e6cd7e91e6e61d791d7dff7d3082d v7.3.482
-+3229335d0c4e6cd7e91e6e61d791d7dff7d3082d v7-3-482
-+0000000000000000000000000000000000000000 v7-3-482
-+19040069b8bf1818db44396a150acb54f47c3a96 v7.3.483
-+19040069b8bf1818db44396a150acb54f47c3a96 v7-3-483
-+0000000000000000000000000000000000000000 v7-3-483
-+00fa605e7d7ba7d522c627a93de6e2f5017d2884 v7.3.484
-+00fa605e7d7ba7d522c627a93de6e2f5017d2884 v7-3-484
-+0000000000000000000000000000000000000000 v7-3-484
-+94374e0b6267d8983a73a22166888c2282ee793d v7.3.485
-+94374e0b6267d8983a73a22166888c2282ee793d v7-3-485
-+0000000000000000000000000000000000000000 v7-3-485
-+08a37c57af479b54fa327bedc0ef31c42dd96f63 v7.3.486
-+08a37c57af479b54fa327bedc0ef31c42dd96f63 v7-3-486
-+0000000000000000000000000000000000000000 v7-3-486
-+21219ffc97903684349f1fcc843eb61838877874 v7.3.487
-+21219ffc97903684349f1fcc843eb61838877874 v7-3-487
-+0000000000000000000000000000000000000000 v7-3-487
-+8691bdcdbf66733c7ec1ef8161da1d4ef49dce66 v7.3.488
-+8691bdcdbf66733c7ec1ef8161da1d4ef49dce66 v7-3-488
-+0000000000000000000000000000000000000000 v7-3-488
-+c1a6e1745cb521f863e63670e6c22c1c682ab4b1 v7.3.489
-+c1a6e1745cb521f863e63670e6c22c1c682ab4b1 v7-3-489
-+0000000000000000000000000000000000000000 v7-3-489
-+b067b8b81be9c2839df75824da2e88da24b07b54 v7.3.490
-+b067b8b81be9c2839df75824da2e88da24b07b54 v7-3-490
-+0000000000000000000000000000000000000000 v7-3-490
-+e070b34fe35e6e8c40ec31a08196dd81353db4e5 v7.3.491
-+e070b34fe35e6e8c40ec31a08196dd81353db4e5 v7-3-491
-+0000000000000000000000000000000000000000 v7-3-491
-+214c7ec1c8f995664d5684da8cbeaaa86850468f v7.3.492
-+214c7ec1c8f995664d5684da8cbeaaa86850468f v7-3-492
-+0000000000000000000000000000000000000000 v7-3-492
-+bf5960ec253293b7240f59a7682f2e862dacd205 v7.3.493
-+bf5960ec253293b7240f59a7682f2e862dacd205 v7-3-493
-+0000000000000000000000000000000000000000 v7-3-493
-+5240610f277823478983e3f04abfbed4e85141cf v7.3.494
-+5240610f277823478983e3f04abfbed4e85141cf v7-3-494
-+0000000000000000000000000000000000000000 v7-3-494
-+27f6a22ff88eea07f24163fe470b7335f3c1b32b v7.3.495
-+27f6a22ff88eea07f24163fe470b7335f3c1b32b v7-3-495
-+0000000000000000000000000000000000000000 v7-3-495
-+3daba355b0c15ef66a9d2810ae7c7cc534dccf62 v7.3.496
-+3daba355b0c15ef66a9d2810ae7c7cc534dccf62 v7-3-496
-+0000000000000000000000000000000000000000 v7-3-496
-+e34c620007be9fd805556c43fe848de521f3b64c v7.3.497
-+e34c620007be9fd805556c43fe848de521f3b64c v7-3-497
-+0000000000000000000000000000000000000000 v7-3-497
-+b1a42d2522fb4ff627a0c381e994e2a598f7bbbb v7.3.498
-+b1a42d2522fb4ff627a0c381e994e2a598f7bbbb v7-3-498
-+0000000000000000000000000000000000000000 v7-3-498
-+4a2cb025b6417b00f2ced076eb79739e03acd7d4 v7.3.499
-+4a2cb025b6417b00f2ced076eb79739e03acd7d4 v7-3-499
-+0000000000000000000000000000000000000000 v7-3-499
-+b36640b2f671c006fe26b573fd42347227efbfa8 v7.3.500
-+b36640b2f671c006fe26b573fd42347227efbfa8 v7-3-500
-+0000000000000000000000000000000000000000 v7-3-500
-+d7b335626ddc7a61667cb3e23ecadfe399b676fb v7.3.501
-+d7b335626ddc7a61667cb3e23ecadfe399b676fb v7-3-501
-+0000000000000000000000000000000000000000 v7-3-501
-+1d1cce57421c78884cff2d3234d3759bc858d6fb v7.3.502
-+1d1cce57421c78884cff2d3234d3759bc858d6fb v7-3-502
-+0000000000000000000000000000000000000000 v7-3-502
-+65d036fd449e488303e78d2c6679a736551c39a6 v7.3.503
-+65d036fd449e488303e78d2c6679a736551c39a6 v7-3-503
-+0000000000000000000000000000000000000000 v7-3-503
-+17bfcb054cb770ac685acaa349165f210bdd36ca v7.3.504
-+17bfcb054cb770ac685acaa349165f210bdd36ca v7-3-504
-+0000000000000000000000000000000000000000 v7-3-504
-+fe7bf24804e195209bef4cd008f0bac7eec7fc60 v7.3.505
-+fe7bf24804e195209bef4cd008f0bac7eec7fc60 v7-3-505
-+0000000000000000000000000000000000000000 v7-3-505
-+982f84487daf102f1203977a09f2c6c76d1ed3d5 v7.3.506
-+982f84487daf102f1203977a09f2c6c76d1ed3d5 v7-3-506
-+0000000000000000000000000000000000000000 v7-3-506
-+f9a865d97614940f817b76642282d966781296e5 v7.3.507
-+f9a865d97614940f817b76642282d966781296e5 v7-3-507
-+0000000000000000000000000000000000000000 v7-3-507
-+2722f11ddc998ac7c578c68c0248b58468179418 v7.3.508
-+2722f11ddc998ac7c578c68c0248b58468179418 v7-3-508
-+0000000000000000000000000000000000000000 v7-3-508
-+8101253704f6504bed3f0209e9a6fcae3966c6e7 v7.3.509
-+8101253704f6504bed3f0209e9a6fcae3966c6e7 v7-3-509
-+0000000000000000000000000000000000000000 v7-3-509
-+53786601213cd9f86db8714f7b0e077b05e2704f v7.3.510
-+53786601213cd9f86db8714f7b0e077b05e2704f v7-3-510
-+0000000000000000000000000000000000000000 v7-3-510
-+b782e2f9e6892116ae5d068249b5198bbe0042c6 v7.3.511
-+b782e2f9e6892116ae5d068249b5198bbe0042c6 v7-3-511
-+0000000000000000000000000000000000000000 v7-3-511
-+454646820185cbe13e1f2e4f7533b984d3b07b18 v7.3.512
-+454646820185cbe13e1f2e4f7533b984d3b07b18 v7-3-512
-+0000000000000000000000000000000000000000 v7-3-512
-+75037f9bc97ad76bca58dbbc0ddac69cc7f5d9ac v7.3.513
-+75037f9bc97ad76bca58dbbc0ddac69cc7f5d9ac v7-3-513
-+0000000000000000000000000000000000000000 v7-3-513
-+7e4428115d2cea86fcfa980097c98c11380ae196 v7.3.514
-+7e4428115d2cea86fcfa980097c98c11380ae196 v7-3-514
-+0000000000000000000000000000000000000000 v7-3-514
-+6c318419e3310fb9658ee6ead6b4ea33def8cb6d v7.3.515
-+6c318419e3310fb9658ee6ead6b4ea33def8cb6d v7-3-515
-+0000000000000000000000000000000000000000 v7-3-515
-+02440d1fcc9aa953ebb7c0719405ccf2525f2777 v7.3.516
-+02440d1fcc9aa953ebb7c0719405ccf2525f2777 v7-3-516
-+0000000000000000000000000000000000000000 v7-3-516
-+9a1dba1f969ac4cb2477626cd79a7a6b0bea1894 v7.3.517
-+9a1dba1f969ac4cb2477626cd79a7a6b0bea1894 v7-3-517
-+0000000000000000000000000000000000000000 v7-3-517
-+ec4ab9d832b0f5308c861423d99253fa496b3a3b v7.3.518
-+ec4ab9d832b0f5308c861423d99253fa496b3a3b v7-3-518
-+0000000000000000000000000000000000000000 v7-3-518
-+ebec52bc2800b8e51e522425fdca5c252e6d4f8e v7.3.519
-+ebec52bc2800b8e51e522425fdca5c252e6d4f8e v7-3-519
-+0000000000000000000000000000000000000000 v7-3-519
-+7bafe52b6245761a242321352daca224e6b9df78 v7.3.520
-+7bafe52b6245761a242321352daca224e6b9df78 v7-3-520
-+0000000000000000000000000000000000000000 v7-3-520
-+b14842cf382bd3f99ca090c985609c6dead5f9e0 v7.3.521
-+b14842cf382bd3f99ca090c985609c6dead5f9e0 v7-3-521
-+0000000000000000000000000000000000000000 v7-3-521
-+e4899d2ff5d8e552ace52b7eafe02b2c5dcdb409 v7.3.522
-+e4899d2ff5d8e552ace52b7eafe02b2c5dcdb409 v7-3-522
-+0000000000000000000000000000000000000000 v7-3-522
-+d8ce4a2eb44e3e3d56db5e26d9982aeb48d7814b v7.3.523
-+d8ce4a2eb44e3e3d56db5e26d9982aeb48d7814b v7-3-523
-+0000000000000000000000000000000000000000 v7-3-523
-+ae1641c4fbcc8c25d27802d6048cb0767c4021d1 v7.3.524
-+ae1641c4fbcc8c25d27802d6048cb0767c4021d1 v7-3-524
-+0000000000000000000000000000000000000000 v7-3-524
-+ac2e00f917df566b81b9e33891b102cba5b390e0 v7.3.525
-+ac2e00f917df566b81b9e33891b102cba5b390e0 v7-3-525
-+0000000000000000000000000000000000000000 v7-3-525
-+257c2878e0fcabd5504dcfed910287374405440a v7.3.526
-+257c2878e0fcabd5504dcfed910287374405440a v7-3-526
-+0000000000000000000000000000000000000000 v7-3-526
-+a17918b76ca1296f63db0e81dea0e37b8b880150 v7.3.527
-+a17918b76ca1296f63db0e81dea0e37b8b880150 v7-3-527
-+0000000000000000000000000000000000000000 v7-3-527
-+fa17c8646feb4719639150f1c301ce6c1557afb7 v7.3.528
-+fa17c8646feb4719639150f1c301ce6c1557afb7 v7-3-528
-+0000000000000000000000000000000000000000 v7-3-528
-+d83218a156dd8258a5f2f3ae019c56f3e8851d48 v7.3.529
-+d83218a156dd8258a5f2f3ae019c56f3e8851d48 v7-3-529
-+0000000000000000000000000000000000000000 v7-3-529
-+81d5f3a3e27fff9188ae34c41b939fc88c9837de v7.3.530
-+81d5f3a3e27fff9188ae34c41b939fc88c9837de v7-3-530
-+0000000000000000000000000000000000000000 v7-3-530
-+c44f0f7424b98d321d90994198374628911623ce v7.3.531
-+c44f0f7424b98d321d90994198374628911623ce v7-3-531
-+0000000000000000000000000000000000000000 v7-3-531
-+9755d151c7492a5f1d0e77a2d3c9e414f20f3b4e v7.3.532
-+9755d151c7492a5f1d0e77a2d3c9e414f20f3b4e v7-3-532
-+0000000000000000000000000000000000000000 v7-3-532
-+74d51b51f3e69df7d3295255ee10391b3409055b v7.3.533
-+74d51b51f3e69df7d3295255ee10391b3409055b v7-3-533
-+0000000000000000000000000000000000000000 v7-3-533
-+65f905eb14cd373e205ff4c8a53027514e96d819 v7.3.534
-+65f905eb14cd373e205ff4c8a53027514e96d819 v7-3-534
-+0000000000000000000000000000000000000000 v7-3-534
-+f52d2ea0f81c20e6f026d74cec66b135d5470d2d v7.3.535
-+f52d2ea0f81c20e6f026d74cec66b135d5470d2d v7-3-535
-+0000000000000000000000000000000000000000 v7-3-535
-+a8897fd5d074d7baaba692013521304b13beb784 v7.3.536
-+a8897fd5d074d7baaba692013521304b13beb784 v7-3-536
-+0000000000000000000000000000000000000000 v7-3-536
-+96715c3a905faa1bbdc50b16b0f57671b4758e0c v7.3.537
-+96715c3a905faa1bbdc50b16b0f57671b4758e0c v7-3-537
-+0000000000000000000000000000000000000000 v7-3-537
-+bbf1fbbe4ab45442f8876790004805503e25f563 v7.3.538
-+bbf1fbbe4ab45442f8876790004805503e25f563 v7-3-538
-+0000000000000000000000000000000000000000 v7-3-538
-+7a710cf51d73cb3c3c76fcea34ee706443800c54 v7.3.539
-+7a710cf51d73cb3c3c76fcea34ee706443800c54 v7-3-539
-+0000000000000000000000000000000000000000 v7-3-539
-+af083cb521bcb69aae315654a3873c488dc58c43 v7.3.540
-+af083cb521bcb69aae315654a3873c488dc58c43 v7-3-540
-+0000000000000000000000000000000000000000 v7-3-540
-+5c1aaf9b4b1bc2d14d627fe22d414f3a2525c50b v7.3.541
-+5c1aaf9b4b1bc2d14d627fe22d414f3a2525c50b v7-3-541
-+0000000000000000000000000000000000000000 v7-3-541
-+8d1b63e6d3173625324f4adfe733efc8091f9422 v7.3.542
-+8d1b63e6d3173625324f4adfe733efc8091f9422 v7-3-542
-+0000000000000000000000000000000000000000 v7-3-542
-+ce7bd50bafa74f4da979f27c4e5fa9a47e69d739 v7.3.543
-+ce7bd50bafa74f4da979f27c4e5fa9a47e69d739 v7-3-543
-+0000000000000000000000000000000000000000 v7-3-543
-+09d0bda69df0c5eb505a02e37a978e92fbc89332 v7.3.544
-+09d0bda69df0c5eb505a02e37a978e92fbc89332 v7-3-544
-+0000000000000000000000000000000000000000 v7-3-544
-+e7ff3251dfa157284a48c5322783499d079e3eb0 v7.3.545
-+e7ff3251dfa157284a48c5322783499d079e3eb0 v7-3-545
-+0000000000000000000000000000000000000000 v7-3-545
-+0a364618c0e59fa777f526c99bee608bb5cf55ce v7.3.546
-+0a364618c0e59fa777f526c99bee608bb5cf55ce v7-3-546
-+0000000000000000000000000000000000000000 v7-3-546
-+4f4db5d661c4fae42f2d917c09549d58a2f4d05f v7.3.547
-+4f4db5d661c4fae42f2d917c09549d58a2f4d05f v7-3-547
-+0000000000000000000000000000000000000000 v7-3-547
-+8625e38066dbf6a4d5e2563fbe191c3910681d2e v7.3.548
-+8625e38066dbf6a4d5e2563fbe191c3910681d2e v7-3-548
-+0000000000000000000000000000000000000000 v7-3-548
-+c0c935956ac3b7c706043e5c7c0ba840636fb10f v7.3.549
-+c0c935956ac3b7c706043e5c7c0ba840636fb10f v7-3-549
-+0000000000000000000000000000000000000000 v7-3-549
-+297771eff080ed3bcfb2ade57c2dcab34bac5de8 v7.3.550
-+297771eff080ed3bcfb2ade57c2dcab34bac5de8 v7-3-550
-+0000000000000000000000000000000000000000 v7-3-550
-+e83c5dcea112a44f9a7b06042b52798e32d96541 v7.3.551
-+e83c5dcea112a44f9a7b06042b52798e32d96541 v7-3-551
-+0000000000000000000000000000000000000000 v7-3-551
-+443c50cd3e8811b58a4ca131ab21abd18aea9489 v7.3.552
-+443c50cd3e8811b58a4ca131ab21abd18aea9489 v7-3-552
-+0000000000000000000000000000000000000000 v7-3-552
-+583e46e4a56c40fa1a7336be85eaec93f6800edf v7.3.553
-+583e46e4a56c40fa1a7336be85eaec93f6800edf v7-3-553
-+0000000000000000000000000000000000000000 v7-3-553
-+a967a979c37f458bd4d164afb8a6192a5b4a6fde v7.3.554
-+a967a979c37f458bd4d164afb8a6192a5b4a6fde v7-3-554
-+0000000000000000000000000000000000000000 v7-3-554
-+8fb7bd9dfb2b26b43725c90e042d2089762466a6 v7.3.555
-+8fb7bd9dfb2b26b43725c90e042d2089762466a6 v7-3-555
-+0000000000000000000000000000000000000000 v7-3-555
-+b8924014a03991b79947d735a894e2c2e8f94980 v7.3.556
-+b8924014a03991b79947d735a894e2c2e8f94980 v7-3-556
-+0000000000000000000000000000000000000000 v7-3-556
-+a220dd97b5c7218558eaea27d301af2ed4f9ec2d v7.3.557
-+a220dd97b5c7218558eaea27d301af2ed4f9ec2d v7-3-557
-+0000000000000000000000000000000000000000 v7-3-557
-+34724dc5172bb81a9e670c5bd23edbe6a124fd28 v7.3.558
-+34724dc5172bb81a9e670c5bd23edbe6a124fd28 v7-3-558
-+0000000000000000000000000000000000000000 v7-3-558
-+74adc9f7e15b8c088abd04de35615cad6c83a811 v7.3.559
-+74adc9f7e15b8c088abd04de35615cad6c83a811 v7-3-559
-+0000000000000000000000000000000000000000 v7-3-559
-+0abd38ba64557c4a6d62575aaa3fc7ab6482d747 v7.3.560
-+0abd38ba64557c4a6d62575aaa3fc7ab6482d747 v7-3-560
-+0000000000000000000000000000000000000000 v7-3-560
-+a1de7928a7aba45240c85a2bc8d70adadc49e4dc v7.3.561
-+a1de7928a7aba45240c85a2bc8d70adadc49e4dc v7-3-561
-+0000000000000000000000000000000000000000 v7-3-561
-+b2763055bdf26e1f11bf8cfb0601fefbefb34e0d v7.3.562
-+b2763055bdf26e1f11bf8cfb0601fefbefb34e0d v7-3-562
-+0000000000000000000000000000000000000000 v7-3-562
-+02c86cdcf9a23f092400c7631e5906cb9053703b v7.3.563
-+02c86cdcf9a23f092400c7631e5906cb9053703b v7-3-563
-+0000000000000000000000000000000000000000 v7-3-563
-+683de93060968ed4e9dfb7992910c75f479471ec v7.3.564
-+683de93060968ed4e9dfb7992910c75f479471ec v7-3-564
-+0000000000000000000000000000000000000000 v7-3-564
-+5f811338b1186e1aef683d03fa05a8026d30e9f1 v7.3.565
-+5f811338b1186e1aef683d03fa05a8026d30e9f1 v7-3-565
-+0000000000000000000000000000000000000000 v7-3-565
-+18c6b1752d0baab043792d3f6267ec393f7a11e1 v7.3.566
-+18c6b1752d0baab043792d3f6267ec393f7a11e1 v7-3-566
-+0000000000000000000000000000000000000000 v7-3-566
-+f90bb88c261582fef85c16009f19168b38debd74 v7.3.567
-+f90bb88c261582fef85c16009f19168b38debd74 v7-3-567
-+0000000000000000000000000000000000000000 v7-3-567
-+3b5f541269e2d9e57b82ea1ec89c6747e2003434 v7.3.568
-+3b5f541269e2d9e57b82ea1ec89c6747e2003434 v7-3-568
-+0000000000000000000000000000000000000000 v7-3-568
-+c052f3b79b9948e7072580e7db42f90c92eb40af v7.3.569
-+c052f3b79b9948e7072580e7db42f90c92eb40af v7-3-569
-+0000000000000000000000000000000000000000 v7-3-569
-+4f1c511e71f851c4f1c14e950f95ebd6967c6ed1 v7.3.570
-+4f1c511e71f851c4f1c14e950f95ebd6967c6ed1 v7-3-570
-+0000000000000000000000000000000000000000 v7-3-570
-+43fd3896fab7be5ad01deed2960d37d91ba65691 v7.3.571
-+43fd3896fab7be5ad01deed2960d37d91ba65691 v7-3-571
-+0000000000000000000000000000000000000000 v7-3-571
-+3ae387af405f46e200fdf9bc204d0a251864abb9 v7.3.572
-+3ae387af405f46e200fdf9bc204d0a251864abb9 v7-3-572
-+0000000000000000000000000000000000000000 v7-3-572
-+802b1a1b275f5c8f95724d50d53642f221621d79 v7.3.573
-+802b1a1b275f5c8f95724d50d53642f221621d79 v7-3-573
-+0000000000000000000000000000000000000000 v7-3-573
-+3ac005f02cf015b3aa246482c6331bd61c08d91a v7.3.574
-+3ac005f02cf015b3aa246482c6331bd61c08d91a v7-3-574
-+0000000000000000000000000000000000000000 v7-3-574
-+79ae10bd056520fb6367247804af22e52d2de8b8 v7.3.575
-+79ae10bd056520fb6367247804af22e52d2de8b8 v7-3-575
-+0000000000000000000000000000000000000000 v7-3-575
-+7e3fedfc3d08d020e3ce047ec1a1cfd195af9ed7 v7.3.576
-+7e3fedfc3d08d020e3ce047ec1a1cfd195af9ed7 v7-3-576
-+0000000000000000000000000000000000000000 v7-3-576
-+286ba0251c0aff1a664a481846c1f4107fae0c11 v7.3.577
-+286ba0251c0aff1a664a481846c1f4107fae0c11 v7-3-577
-+0000000000000000000000000000000000000000 v7-3-577
-+0e9b2622c94a8edf906d6c44831c1cded7184d13 v7.3.578
-+0e9b2622c94a8edf906d6c44831c1cded7184d13 v7-3-578
-+0000000000000000000000000000000000000000 v7-3-578
-+80ed6aa7b9eb18058a0b105af2ecd7b213891be2 v7.3.579
-+80ed6aa7b9eb18058a0b105af2ecd7b213891be2 v7-3-579
-+0000000000000000000000000000000000000000 v7-3-579
-+f02b6ad168ae82ead0286b64627762ab2343ee96 v7.3.580
-+f02b6ad168ae82ead0286b64627762ab2343ee96 v7-3-580
-+0000000000000000000000000000000000000000 v7-3-580
-+96249a1803e28e6173faed53f8687334aa63360c v7.3.581
-+96249a1803e28e6173faed53f8687334aa63360c v7-3-581
-+0000000000000000000000000000000000000000 v7-3-581
-+d383bc2ba8112103389a44c2c747eaa1016da935 v7.3.582
-+d383bc2ba8112103389a44c2c747eaa1016da935 v7-3-582
-+0000000000000000000000000000000000000000 v7-3-582
-+a69b1d711ff9d8b227acff694c53310cf237933f v7.3.583
-+a69b1d711ff9d8b227acff694c53310cf237933f v7-3-583
-+0000000000000000000000000000000000000000 v7-3-583
-+2d107086903af80afee524549e57d3ba016b3f12 v7.3.584
-+2d107086903af80afee524549e57d3ba016b3f12 v7-3-584
-+0000000000000000000000000000000000000000 v7-3-584
-+d258a0c5c38a6a604b983b6499a0f02bc061c816 v7.3.585
-+d258a0c5c38a6a604b983b6499a0f02bc061c816 v7-3-585
-+0000000000000000000000000000000000000000 v7-3-585
-+8393a16069fb5f7b22ab766167b698e4dc129911 v7.3.586
-+8393a16069fb5f7b22ab766167b698e4dc129911 v7-3-586
-+0000000000000000000000000000000000000000 v7-3-586
-+a34fb0a077c9c26946727a25222e0a99dc08db0d v7.3.587
-+a34fb0a077c9c26946727a25222e0a99dc08db0d v7-3-587
-+0000000000000000000000000000000000000000 v7-3-587
-+e92cc285632dc29d932061970e43b53cdbb3460d v7.3.588
-+e92cc285632dc29d932061970e43b53cdbb3460d v7-3-588
-+0000000000000000000000000000000000000000 v7-3-588
-+e82937b753a8ca6705bf55dbf258f077746ec428 v7.3.589
-+e82937b753a8ca6705bf55dbf258f077746ec428 v7-3-589
-+0000000000000000000000000000000000000000 v7-3-589
-+bdf7f3e4c763f2a038c397af8eb6b8950e58db6b v7.3.590
-+bdf7f3e4c763f2a038c397af8eb6b8950e58db6b v7-3-590
-+0000000000000000000000000000000000000000 v7-3-590
-+e5b925ae56e36e86eb2ff059aa28d6a2dd332845 v7.3.591
-+e5b925ae56e36e86eb2ff059aa28d6a2dd332845 v7-3-591
-+0000000000000000000000000000000000000000 v7-3-591
-+0e06193d4bd7be03924dd9c6251a64c6c6adf78d v7.3.592
-+0e06193d4bd7be03924dd9c6251a64c6c6adf78d v7-3-592
-+0000000000000000000000000000000000000000 v7-3-592
-+46896c29edd74418c665af7c1ed685aa52a41e1a v7.3.593
-+46896c29edd74418c665af7c1ed685aa52a41e1a v7-3-593
-+0000000000000000000000000000000000000000 v7-3-593
-+5e7b500dbb7e9e964457d300b536aeba9771af6c v7.3.594
-+5e7b500dbb7e9e964457d300b536aeba9771af6c v7-3-594
-+0000000000000000000000000000000000000000 v7-3-594
-+928e7cef8836d13d4f2a17234e127b928ee63ff4 v7.3.595
-+928e7cef8836d13d4f2a17234e127b928ee63ff4 v7-3-595
-+0000000000000000000000000000000000000000 v7-3-595
-+5aad2c444a00a2309e6e373b6bcb5441669ba126 v7.3.596
-+5aad2c444a00a2309e6e373b6bcb5441669ba126 v7-3-596
-+0000000000000000000000000000000000000000 v7-3-596
-+b9aa7fb4a9281b87a651251f799e049409634757 v7.3.597
-+b9aa7fb4a9281b87a651251f799e049409634757 v7-3-597
-+0000000000000000000000000000000000000000 v7-3-597
-+f0747581607924c30530687fa88ebaa57602eb5f v7.3.598
-+f0747581607924c30530687fa88ebaa57602eb5f v7-3-598
-+0000000000000000000000000000000000000000 v7-3-598
-+b06578f1390fea339a2d9d18e12758ec1dbcc279 v7.3.599
-+b06578f1390fea339a2d9d18e12758ec1dbcc279 v7-3-599
-+0000000000000000000000000000000000000000 v7-3-599
-+8f98038a0bf34310a8224a569eacd539b7b8b649 v7.3.600
-+8f98038a0bf34310a8224a569eacd539b7b8b649 v7-3-600
-+0000000000000000000000000000000000000000 v7-3-600
-+c1780b4cb9955fc113c3c993c18c139e06425ef5 v7.3.601
-+c1780b4cb9955fc113c3c993c18c139e06425ef5 v7-3-601
-+0000000000000000000000000000000000000000 v7-3-601
-+5cacdf56c94b6fa1992f7e9c07c95bfe52bcccec v7.3.602
-+5cacdf56c94b6fa1992f7e9c07c95bfe52bcccec v7-3-602
-+0000000000000000000000000000000000000000 v7-3-602
-+085f14642fe828b1cbae5706ca87f2932cebeb75 v7.3.603
-+085f14642fe828b1cbae5706ca87f2932cebeb75 v7-3-603
-+0000000000000000000000000000000000000000 v7-3-603
-+acd91c9741a6d0185b7c63db412888de4f904118 v7.3.604
-+acd91c9741a6d0185b7c63db412888de4f904118 v7-3-604
-+0000000000000000000000000000000000000000 v7-3-604
-+4873d9c4ad3b7214d3ea8af9712a87ff69948380 v7.3.605
-+4873d9c4ad3b7214d3ea8af9712a87ff69948380 v7-3-605
-+0000000000000000000000000000000000000000 v7-3-605
-+c612d154bcdd642e4097ae88526a81ed7868c184 v7.3.606
-+c612d154bcdd642e4097ae88526a81ed7868c184 v7-3-606
-+0000000000000000000000000000000000000000 v7-3-606
-+002f2c5de317aaedb93bd2e506a295efe2d552ce v7.3.607
-+002f2c5de317aaedb93bd2e506a295efe2d552ce v7-3-607
-+0000000000000000000000000000000000000000 v7-3-607
-+d47e6222d1cde1caf08fa63104375f5750c25d90 v7.3.608
-+d47e6222d1cde1caf08fa63104375f5750c25d90 v7-3-608
-+0000000000000000000000000000000000000000 v7-3-608
-+d29aa05b7e311bc05491521f4059ca2b625c5550 v7.3.609
-+d29aa05b7e311bc05491521f4059ca2b625c5550 v7-3-609
-+0000000000000000000000000000000000000000 v7-3-609
-+9f48a54329975434d73ddfc19e33c343653d5c73 v7.3.610
-+9f48a54329975434d73ddfc19e33c343653d5c73 v7-3-610
-+0000000000000000000000000000000000000000 v7-3-610
-+e13f2f3568e1e21fbd223a1c0627605e2b670c53 v7.3.611
-+e13f2f3568e1e21fbd223a1c0627605e2b670c53 v7-3-611
-+0000000000000000000000000000000000000000 v7-3-611
-+2b4b6185054ff05fb6ee3ab1bcde47409bf2ebe0 v7.3.612
-+2b4b6185054ff05fb6ee3ab1bcde47409bf2ebe0 v7-3-612
-+0000000000000000000000000000000000000000 v7-3-612
-+c03b6363492b26c02b4f8a725a91849a1a5cf548 v7.3.613
-+c03b6363492b26c02b4f8a725a91849a1a5cf548 v7-3-613
-+0000000000000000000000000000000000000000 v7-3-613
-+2bb51730ef4bb0824658f7507edad165e194dd45 v7.3.614
-+2bb51730ef4bb0824658f7507edad165e194dd45 v7-3-614
-+0000000000000000000000000000000000000000 v7-3-614
-+169ccc471a8a947c046b7ff41023b9045beb3496 v7.3.615
-+169ccc471a8a947c046b7ff41023b9045beb3496 v7-3-615
-+0000000000000000000000000000000000000000 v7-3-615
-+baba6286c91e63dd42039206e3e0990fb0ac346f v7.3.616
-+baba6286c91e63dd42039206e3e0990fb0ac346f v7-3-616
-+0000000000000000000000000000000000000000 v7-3-616
-+73db39ca1877a07008310a2ec98a2220e50c52f1 v7.3.617
-+73db39ca1877a07008310a2ec98a2220e50c52f1 v7-3-617
-+0000000000000000000000000000000000000000 v7-3-617
-+0b1cb3f839c48daaccbb3abcbd5f1c394c57cb10 v7.3.618
-+0b1cb3f839c48daaccbb3abcbd5f1c394c57cb10 v7-3-618
-+0000000000000000000000000000000000000000 v7-3-618
-+27ecf0c87bd20140d9e85d4fd581332e0916191e v7.3.619
-+27ecf0c87bd20140d9e85d4fd581332e0916191e v7-3-619
-+0000000000000000000000000000000000000000 v7-3-619
-+a6ebae140d89f35876628cde44f0e7ee5a0ae1d2 v7.3.620
-+a6ebae140d89f35876628cde44f0e7ee5a0ae1d2 v7-3-620
-+0000000000000000000000000000000000000000 v7-3-620
-+ac13ea2b098d98e62408ec2d88026f690f68f940 v7.3.621
-+ac13ea2b098d98e62408ec2d88026f690f68f940 v7-3-621
-+0000000000000000000000000000000000000000 v7-3-621
-+52247eb615118965bb6a949307e9abfd378cd088 v7.3.622
-+52247eb615118965bb6a949307e9abfd378cd088 v7-3-622
-+0000000000000000000000000000000000000000 v7-3-622
-+a46a101bfddd4fcf30759f3847fa1e18546907f4 v7.3.623
-+a46a101bfddd4fcf30759f3847fa1e18546907f4 v7-3-623
-+0000000000000000000000000000000000000000 v7-3-623
-+06749e351b1c030acf50cf8c469f8973aff4a96a v7.3.624
-+06749e351b1c030acf50cf8c469f8973aff4a96a v7-3-624
-+0000000000000000000000000000000000000000 v7-3-624
-+f43ffd820a46bf47b3e55b56d3e5334302383757 v7.3.625
-+f43ffd820a46bf47b3e55b56d3e5334302383757 v7-3-625
-+0000000000000000000000000000000000000000 v7-3-625
-+956b1ed19282518e0287891d4e7b2b8a3f850402 v7.3.626
-+956b1ed19282518e0287891d4e7b2b8a3f850402 v7-3-626
-+0000000000000000000000000000000000000000 v7-3-626
-+dc65e6429d2c1b79719455d7303f3f95c5897965 v7.3.627
-+dc65e6429d2c1b79719455d7303f3f95c5897965 v7-3-627
-+0000000000000000000000000000000000000000 v7-3-627
-+1ed93878d6e224d46a7c125a82e52338b9bf0f6b v7.3.628
-+1ed93878d6e224d46a7c125a82e52338b9bf0f6b v7-3-628
-+0000000000000000000000000000000000000000 v7-3-628
-+7de7ef01288db1abc944293a28aac13ddd87879e v7.3.629
-+7de7ef01288db1abc944293a28aac13ddd87879e v7-3-629
-+0000000000000000000000000000000000000000 v7-3-629
-+3416ac23d0758528919aaffbe02cecc6420b8aac v7.3.630
-+3416ac23d0758528919aaffbe02cecc6420b8aac v7-3-630
-+0000000000000000000000000000000000000000 v7-3-630
-+99f076ca8d846d553aefd7e626ca938bcf93f259 v7.3.631
-+99f076ca8d846d553aefd7e626ca938bcf93f259 v7-3-631
-+0000000000000000000000000000000000000000 v7-3-631
-+44038a9777aaf0e6502e0eb57b8f7ccf31798ec4 v7.3.632
-+44038a9777aaf0e6502e0eb57b8f7ccf31798ec4 v7-3-632
-+0000000000000000000000000000000000000000 v7-3-632
-+ad5fbf3596e0a8ad15c260c5b529efc5ac689e13 v7.3.633
-+ad5fbf3596e0a8ad15c260c5b529efc5ac689e13 v7-3-633
-+0000000000000000000000000000000000000000 v7-3-633
-+b7eea24095073d55ac3c59664466b78a0525bebc v7.3.634
-+b7eea24095073d55ac3c59664466b78a0525bebc v7-3-634
-+0000000000000000000000000000000000000000 v7-3-634
-+f7f68f83fc335379bc9e3371c5118b8f81c8d5bc v7.3.635
-+f7f68f83fc335379bc9e3371c5118b8f81c8d5bc v7-3-635
-+0000000000000000000000000000000000000000 v7-3-635
-+616bc1ad4f12be0ef37fe67d2f6ed7535f20e515 v7.3.636
-+616bc1ad4f12be0ef37fe67d2f6ed7535f20e515 v7-3-636
-+0000000000000000000000000000000000000000 v7-3-636
-+3b62d8f36cdf709d4e0575d63486ebe57ce7150c v7.3.637
-+3b62d8f36cdf709d4e0575d63486ebe57ce7150c v7-3-637
-+0000000000000000000000000000000000000000 v7-3-637
-+c0256c4bd91ed7b806aab002e4a45e440dd00343 v7.3.638
-+c0256c4bd91ed7b806aab002e4a45e440dd00343 v7-3-638
-+0000000000000000000000000000000000000000 v7-3-638
-+1ec385a8faf4002fa300caf370ef2ac380d9702a v7.3.639
-+1ec385a8faf4002fa300caf370ef2ac380d9702a v7-3-639
-+0000000000000000000000000000000000000000 v7-3-639
-+c2c3577021ed4e354853d330e5fc60691d8750c5 v7.3.640
-+c2c3577021ed4e354853d330e5fc60691d8750c5 v7-3-640
-+0000000000000000000000000000000000000000 v7-3-640
-+c068389057c9a89fa351678b5f5776278971dabe v7.3.641
-+c068389057c9a89fa351678b5f5776278971dabe v7-3-641
-+0000000000000000000000000000000000000000 v7-3-641
-+79ac6744237ce5076a6d2e2b21198dfddc2cc9dd v7.3.642
-+79ac6744237ce5076a6d2e2b21198dfddc2cc9dd v7-3-642
-+0000000000000000000000000000000000000000 v7-3-642
-+fdac34e3afa5f0dea26dba5e96932e3b9a0be50a v7.3.643
-+fdac34e3afa5f0dea26dba5e96932e3b9a0be50a v7-3-643
-+0000000000000000000000000000000000000000 v7-3-643
-+fb7c028dcac7555fee78096813e3846d157cc91b v7.3.644
-+fb7c028dcac7555fee78096813e3846d157cc91b v7-3-644
-+0000000000000000000000000000000000000000 v7-3-644
-+1810ee914648ef3e16a8cf866299a32c4a9a00cb v7.3.645
-+1810ee914648ef3e16a8cf866299a32c4a9a00cb v7-3-645
-+0000000000000000000000000000000000000000 v7-3-645
-+e70485d3f81df4d72cb40d6fa4ad4218cf1e8392 v7.3.646
-+e70485d3f81df4d72cb40d6fa4ad4218cf1e8392 v7-3-646
-+0000000000000000000000000000000000000000 v7-3-646
-+29fe4e5c1db17a62b16a95fdda84f08cd05c27b5 v7.3.647
-+29fe4e5c1db17a62b16a95fdda84f08cd05c27b5 v7-3-647
-+0000000000000000000000000000000000000000 v7-3-647
-+76c099d45772a233982c39a29510d89eaa4d5a1c v7.3.648
-+76c099d45772a233982c39a29510d89eaa4d5a1c v7-3-648
-+0000000000000000000000000000000000000000 v7-3-648
-+063765c3cebbd6040dc091b8c1ba28739fef9118 v7.3.649
-+063765c3cebbd6040dc091b8c1ba28739fef9118 v7-3-649
-+0000000000000000000000000000000000000000 v7-3-649
-+a638ae0f1b0cc41d8d753d79503238f11215f3ea v7.3.650
-+a638ae0f1b0cc41d8d753d79503238f11215f3ea v7-3-650
-+0000000000000000000000000000000000000000 v7-3-650
-+ece544e85821a6118da55dad1538ea4c3625bd1c v7.3.651
-+ece544e85821a6118da55dad1538ea4c3625bd1c v7-3-651
-+0000000000000000000000000000000000000000 v7-3-651
-+5edf3c51aa93110e57fcd0428c30e5bed149df34 v7.3.652
-+5edf3c51aa93110e57fcd0428c30e5bed149df34 v7-3-652
-+0000000000000000000000000000000000000000 v7-3-652
-+fd0c7452fa51118d8f6557b34b4cc96e830ef6c7 v7.3.653
-+fd0c7452fa51118d8f6557b34b4cc96e830ef6c7 v7-3-653
-+0000000000000000000000000000000000000000 v7-3-653
-+73557eda70271b49015265b7147562b63a7a094d v7.3.654
-+73557eda70271b49015265b7147562b63a7a094d v7-3-654
-+0000000000000000000000000000000000000000 v7-3-654
-+0d3238b54963c4b1358a1f33221f75e067c1613f v7.3.655
-+0d3238b54963c4b1358a1f33221f75e067c1613f v7-3-655
-+0000000000000000000000000000000000000000 v7-3-655
-+a2f61b2b8e770bb8d233ce50c8c7508508578a8b v7.3.656
-+a2f61b2b8e770bb8d233ce50c8c7508508578a8b v7-3-656
-+0000000000000000000000000000000000000000 v7-3-656
-+3958b0e672d676a310d756bff1b9c629a7b0142f v7.3.657
-+3958b0e672d676a310d756bff1b9c629a7b0142f v7-3-657
-+0000000000000000000000000000000000000000 v7-3-657
-+15cdcb8ddcfb848c929cc37e239d5da8fe48a8d9 v7.3.658
-+15cdcb8ddcfb848c929cc37e239d5da8fe48a8d9 v7-3-658
-+0000000000000000000000000000000000000000 v7-3-658
-+e75da4a3225d48e59ee321411134cf9999348b7d v7.3.659
-+e75da4a3225d48e59ee321411134cf9999348b7d v7-3-659
-+0000000000000000000000000000000000000000 v7-3-659
-+8fdadfccd184b7de73811a3a18dc8815b7eb3434 v7.3.660
-+8fdadfccd184b7de73811a3a18dc8815b7eb3434 v7-3-660
-+0000000000000000000000000000000000000000 v7-3-660
-+5e909c379a1e87491bfa95ba1a37b39d0725933b v7.3.661
-+5e909c379a1e87491bfa95ba1a37b39d0725933b v7-3-661
-+0000000000000000000000000000000000000000 v7-3-661
-+87afa95a2992a31b1937def0e1db4a193b0ab32f v7.3.662
-+87afa95a2992a31b1937def0e1db4a193b0ab32f v7-3-662
-+0000000000000000000000000000000000000000 v7-3-662
-+2a200527131fac8f50487790ec201badbccdaf0e v7.3.663
-+2a200527131fac8f50487790ec201badbccdaf0e v7-3-663
-+0000000000000000000000000000000000000000 v7-3-663
-+f86619764a1e0338ef9e14c653a5909847304b8b v7.3.664
-+f86619764a1e0338ef9e14c653a5909847304b8b v7-3-664
-+0000000000000000000000000000000000000000 v7-3-664
-+35939e1e25ff5a3862b83248f8039971c81936d0 v7.3.665
-+35939e1e25ff5a3862b83248f8039971c81936d0 v7-3-665
-+0000000000000000000000000000000000000000 v7-3-665
-+1e22adc6176ec07f52102f383a9c3c414d43f9c2 v7.3.666
-+1e22adc6176ec07f52102f383a9c3c414d43f9c2 v7-3-666
-+0000000000000000000000000000000000000000 v7-3-666
-+cd36c0fed43e63a94d6e87b5c5c0b4d95628da27 v7.3.667
-+cd36c0fed43e63a94d6e87b5c5c0b4d95628da27 v7-3-667
-+0000000000000000000000000000000000000000 v7-3-667
-+dde6d0216a08a5554f3c351e519134c386d14232 v7.3.668
-+dde6d0216a08a5554f3c351e519134c386d14232 v7-3-668
-+0000000000000000000000000000000000000000 v7-3-668
-+2b3b7b48370848149c8b831b2b7aee9b7f4f88bb v7.3.669
-+2b3b7b48370848149c8b831b2b7aee9b7f4f88bb v7-3-669
-+0000000000000000000000000000000000000000 v7-3-669
-+2bf8c00741f7f07d9b58596764236a92eaeca862 v7.3.670
-+2bf8c00741f7f07d9b58596764236a92eaeca862 v7-3-670
-+0000000000000000000000000000000000000000 v7-3-670
-+530f5a9030315f984e096794938c61f9d3562e22 v7.3.671
-+530f5a9030315f984e096794938c61f9d3562e22 v7-3-671
-+0000000000000000000000000000000000000000 v7-3-671
-+fd6ef931aa77239804860b74ed2362b29c1a6d4a v7.3.672
-+fd6ef931aa77239804860b74ed2362b29c1a6d4a v7-3-672
-+0000000000000000000000000000000000000000 v7-3-672
-+ca1c025079b11c98363e11576d903af756a593fc v7.3.673
-+ca1c025079b11c98363e11576d903af756a593fc v7-3-673
-+0000000000000000000000000000000000000000 v7-3-673
-+4da6003f0f0eee0f3908f8627af6d13a94c10cc6 v7.3.674
-+4da6003f0f0eee0f3908f8627af6d13a94c10cc6 v7-3-674
-+0000000000000000000000000000000000000000 v7-3-674
-+9963f7a9b41b555a0660288dd94df44b6dee7c2e v7.3.675
-+9963f7a9b41b555a0660288dd94df44b6dee7c2e v7-3-675
-+0000000000000000000000000000000000000000 v7-3-675
-+5309996ddcedd7e2dcc8c46624348405290b8940 v7.3.676
-+5309996ddcedd7e2dcc8c46624348405290b8940 v7-3-676
-+0000000000000000000000000000000000000000 v7-3-676
-+8115f449a574bc146f75449161f1757aaa5bbb66 v7.3.677
-+8115f449a574bc146f75449161f1757aaa5bbb66 v7-3-677
-+0000000000000000000000000000000000000000 v7-3-677
-+de253f606048a2862a338190b071e5e3c7de7a41 v7.3.678
-+de253f606048a2862a338190b071e5e3c7de7a41 v7-3-678
-+0000000000000000000000000000000000000000 v7-3-678
-+dd0f25ede9a8322b5b638961835cc4743cd479a2 v7.3.679
-+dd0f25ede9a8322b5b638961835cc4743cd479a2 v7-3-679
-+0000000000000000000000000000000000000000 v7-3-679
-+52acec46b75ecf24d044982d4cc067ef7890e7d6 v7.3.680
-+52acec46b75ecf24d044982d4cc067ef7890e7d6 v7-3-680
-+0000000000000000000000000000000000000000 v7-3-680
-+a2fe24ec6a0d06d0af286b9fee9e307c33f27cca v7.3.681
-+a2fe24ec6a0d06d0af286b9fee9e307c33f27cca v7-3-681
-+0000000000000000000000000000000000000000 v7-3-681
-+8eb5b61161b4c56b378ec829e360204102d22db4 v7.3.682
-+8eb5b61161b4c56b378ec829e360204102d22db4 v7-3-682
-+0000000000000000000000000000000000000000 v7-3-682
-+0f5ee262963528ddccfa1f54b83696f939d21b53 v7.3.683
-+0f5ee262963528ddccfa1f54b83696f939d21b53 v7-3-683
-+0000000000000000000000000000000000000000 v7-3-683
-+1cc37b8cfaa1c670e442e2f9444feeb1820228bc v7.3.684
-+1cc37b8cfaa1c670e442e2f9444feeb1820228bc v7-3-684
-+0000000000000000000000000000000000000000 v7-3-684
-+34aa94a421b7a03a71013ddbb92937dbaf83b1aa v7.3.685
-+34aa94a421b7a03a71013ddbb92937dbaf83b1aa v7-3-685
-+0000000000000000000000000000000000000000 v7-3-685
-+ba9c9d0c4ff4cf56c3c5d2dec2da71decbbe9f6a v7.3.686
-+ba9c9d0c4ff4cf56c3c5d2dec2da71decbbe9f6a v7-3-686
-+0000000000000000000000000000000000000000 v7-3-686
-+0545dab1517f8ce2b8319c02572e4bb357567034 v7.3.687
-+0545dab1517f8ce2b8319c02572e4bb357567034 v7-3-687
-+0000000000000000000000000000000000000000 v7-3-687
-+2696da84d37093da0dea419878e4241385eb515b v7.3.688
-+2696da84d37093da0dea419878e4241385eb515b v7-3-688
-+0000000000000000000000000000000000000000 v7-3-688
-+3c072c1cb87372f3ebd345463abbc451e80143e2 v7.3.689
-+3c072c1cb87372f3ebd345463abbc451e80143e2 v7-3-689
-+0000000000000000000000000000000000000000 v7-3-689
-+caa0ca9ad06cb515b7e6d2e4410e03802b58e167 v7.3.690
-+caa0ca9ad06cb515b7e6d2e4410e03802b58e167 v7-3-690
-+0000000000000000000000000000000000000000 v7-3-690
-+7f10daa706bb6ed0c39f1d2905cd78368a98d19f v7.3.691
-+7f10daa706bb6ed0c39f1d2905cd78368a98d19f v7-3-691
-+0000000000000000000000000000000000000000 v7-3-691
-+337a4368fd2b68b9822b94e595d77b4d6773bfa4 v7.3.692
-+337a4368fd2b68b9822b94e595d77b4d6773bfa4 v7-3-692
-+0000000000000000000000000000000000000000 v7-3-692
-+fd96b3cc88ed71d4c4d24c6ac67c9d3a68ae6e6b v7.3.693
-+fd96b3cc88ed71d4c4d24c6ac67c9d3a68ae6e6b v7-3-693
-+0000000000000000000000000000000000000000 v7-3-693
-+8235ccf121bb241f8105d0ba6e1c92e9f8b04555 v7.3.694
-+8235ccf121bb241f8105d0ba6e1c92e9f8b04555 v7-3-694
-+0000000000000000000000000000000000000000 v7-3-694
-+cd6c420e31d6843fa1231e1cf7a3d9eff0ad4e07 v7.3.695
-+cd6c420e31d6843fa1231e1cf7a3d9eff0ad4e07 v7-3-695
-+0000000000000000000000000000000000000000 v7-3-695
-+447c688b82eb4a5eb7cd0e16521094b77160fd0f v7.3.696
-+447c688b82eb4a5eb7cd0e16521094b77160fd0f v7-3-696
-+0000000000000000000000000000000000000000 v7-3-696
-+7c72b5f7ada1f4a028315aa50f8739e0e83c2e74 v7.3.697
-+7c72b5f7ada1f4a028315aa50f8739e0e83c2e74 v7-3-697
-+0000000000000000000000000000000000000000 v7-3-697
-+b5b892472ecb1a10cce1709e41700b264b6485d2 v7.3.698
-+b5b892472ecb1a10cce1709e41700b264b6485d2 v7-3-698
-+0000000000000000000000000000000000000000 v7-3-698
-+4ffb6f9b58e0b51923fe6a71e6af158b6e3f7864 v7.3.699
-+4ffb6f9b58e0b51923fe6a71e6af158b6e3f7864 v7-3-699
-+0000000000000000000000000000000000000000 v7-3-699
-+c656847932d33b5d68394ae1ea3153dbdba4d3ff v7.3.700
-+c656847932d33b5d68394ae1ea3153dbdba4d3ff v7-3-700
-+0000000000000000000000000000000000000000 v7-3-700
-+48af8656094539f8f71dc51e0a6aa14d48ddffd0 v7.3.701
-+48af8656094539f8f71dc51e0a6aa14d48ddffd0 v7-3-701
-+0000000000000000000000000000000000000000 v7-3-701
-+916b5c11a13e9978c85f9742546e70d614116883 v7.3.702
-+916b5c11a13e9978c85f9742546e70d614116883 v7-3-702
-+0000000000000000000000000000000000000000 v7-3-702
-+f69321485951a3c9bd0e9e7484a1901b94cae726 v7.3.703
-+f69321485951a3c9bd0e9e7484a1901b94cae726 v7-3-703
-+0000000000000000000000000000000000000000 v7-3-703
-+be8ad9c9b973a4d87b9bcfee2b6a8de1f6d3e071 v7.3.704
-+be8ad9c9b973a4d87b9bcfee2b6a8de1f6d3e071 v7-3-704
-+0000000000000000000000000000000000000000 v7-3-704
-+0aa74f2f50a8333fd5544f5d4b383132be41704c v7.3.705
-+0aa74f2f50a8333fd5544f5d4b383132be41704c v7-3-705
-+0000000000000000000000000000000000000000 v7-3-705
-+d0ae72c2f5f94e2483ab0979eec652b1289679a8 v7.3.706
-+d0ae72c2f5f94e2483ab0979eec652b1289679a8 v7-3-706
-+0000000000000000000000000000000000000000 v7-3-706
-+d24d309c365fc5c6a9324a6183d7b927d9f5132f v7.3.707
-+d24d309c365fc5c6a9324a6183d7b927d9f5132f v7-3-707
-+0000000000000000000000000000000000000000 v7-3-707
-+64427849c1582299f2af389c6225eead529f0329 v7.3.708
-+64427849c1582299f2af389c6225eead529f0329 v7-3-708
-+0000000000000000000000000000000000000000 v7-3-708
-+fb7dec372910b61478abdd7f79871724153ebfdd v7.3.709
-+fb7dec372910b61478abdd7f79871724153ebfdd v7-3-709
-+0000000000000000000000000000000000000000 v7-3-709
-+906eb5c0ef129b6876fa9c6c5a13e44807f7a503 v7.3.710
-+906eb5c0ef129b6876fa9c6c5a13e44807f7a503 v7-3-710
-+0000000000000000000000000000000000000000 v7-3-710
-+2a7b2943be22c27edb3c0334423c1b17275f18fb v7.3.711
-+2a7b2943be22c27edb3c0334423c1b17275f18fb v7-3-711
-+0000000000000000000000000000000000000000 v7-3-711
-+557ef119999ea687ccb84eddca295755c24989da v7.3.712
-+557ef119999ea687ccb84eddca295755c24989da v7-3-712
-+0000000000000000000000000000000000000000 v7-3-712
-+f15769bce0b811fc840fd455035270288e8d744d v7.3.713
-+f15769bce0b811fc840fd455035270288e8d744d v7-3-713
-+0000000000000000000000000000000000000000 v7-3-713
-+9ea14f097855e0929f86c86d405725717efb044d v7.3.714
-+9ea14f097855e0929f86c86d405725717efb044d v7-3-714
-+0000000000000000000000000000000000000000 v7-3-714
-+4f0ddf4137eeb08753f2593a32b42a1dcb1e6f4c v7.3.715
-+4f0ddf4137eeb08753f2593a32b42a1dcb1e6f4c v7-3-715
-+0000000000000000000000000000000000000000 v7-3-715
-+eb268db98f321b93f5e7552920b6389f9dddfd3f v7.3.716
-+eb268db98f321b93f5e7552920b6389f9dddfd3f v7-3-716
-+0000000000000000000000000000000000000000 v7-3-716
-+6a76846b84eb0fe1220f8cfa19b1161145932d4d v7.3.717
-+6a76846b84eb0fe1220f8cfa19b1161145932d4d v7-3-717
-+0000000000000000000000000000000000000000 v7-3-717
-+18e95db59826aa9379e6e3ada5d3540cbae1e596 v7.3.718
-+18e95db59826aa9379e6e3ada5d3540cbae1e596 v7-3-718
-+0000000000000000000000000000000000000000 v7-3-718
-+e6d8b44065bc05741effbc0635c21506032d97b4 v7.3.719
-+e6d8b44065bc05741effbc0635c21506032d97b4 v7-3-719
-+0000000000000000000000000000000000000000 v7-3-719
-+9e119e0ade5d804f174a3b67ad5e0d0e7449739f v7.3.720
-+9e119e0ade5d804f174a3b67ad5e0d0e7449739f v7-3-720
-+0000000000000000000000000000000000000000 v7-3-720
-+b23f583e132e88ec98f2b449b7216642ba64a8a8 v7.3.721
-+b23f583e132e88ec98f2b449b7216642ba64a8a8 v7-3-721
-+0000000000000000000000000000000000000000 v7-3-721
-+de6968039340db04ec65164a3450a40773488e00 v7.3.722
-+de6968039340db04ec65164a3450a40773488e00 v7-3-722
-+0000000000000000000000000000000000000000 v7-3-722
-+ee138f29259e02f62fe8181073e7a063523e50b8 v7.3.723
-+ee138f29259e02f62fe8181073e7a063523e50b8 v7-3-723
-+0000000000000000000000000000000000000000 v7-3-723
-+6e5acfdf7a5a2b3fa27a529881af77c1e1b1c0f7 v7.3.724
-+6e5acfdf7a5a2b3fa27a529881af77c1e1b1c0f7 v7-3-724
-+0000000000000000000000000000000000000000 v7-3-724
-+f4aa43d952f5bacc752951c80495fd20c72ba90c v7.3.725
-+f4aa43d952f5bacc752951c80495fd20c72ba90c v7-3-725
-+0000000000000000000000000000000000000000 v7-3-725
-+5049eacbff0e9688af99eb67a408cae5919ff52c v7.3.726
-+5049eacbff0e9688af99eb67a408cae5919ff52c v7-3-726
-+0000000000000000000000000000000000000000 v7-3-726
-+d3c291efdb0b9f5cd286013b789eb1c91ae868ca v7.3.727
-+d3c291efdb0b9f5cd286013b789eb1c91ae868ca v7-3-727
-+0000000000000000000000000000000000000000 v7-3-727
-+233666f859339f425684af70dd008354776259af v7.3.728
-+233666f859339f425684af70dd008354776259af v7-3-728
-+0000000000000000000000000000000000000000 v7-3-728
-+d08f05285dd102d8f071ee42869416d25dd4e72d v7.3.729
-+d08f05285dd102d8f071ee42869416d25dd4e72d v7-3-729
-+0000000000000000000000000000000000000000 v7-3-729
-+37a4cacd20511ead4cf1a8ecb235276bc448fddf v7.3.730
-+37a4cacd20511ead4cf1a8ecb235276bc448fddf v7-3-730
-+0000000000000000000000000000000000000000 v7-3-730
-+778ff2e87806133faa8fcfefbd41cad2b601bdb6 v7.3.731
-+778ff2e87806133faa8fcfefbd41cad2b601bdb6 v7-3-731
-+0000000000000000000000000000000000000000 v7-3-731
-+fa8bf69d3866eaf31e6c8fed74862feea11a40b0 v7.3.732
-+fa8bf69d3866eaf31e6c8fed74862feea11a40b0 v7-3-732
-+0000000000000000000000000000000000000000 v7-3-732
-+509e55bd4a3feeb651ea173cefcbd933f723d8b6 v7.3.733
-+509e55bd4a3feeb651ea173cefcbd933f723d8b6 v7-3-733
-+0000000000000000000000000000000000000000 v7-3-733
-+fc8b4a06af9db05af800b1304599afd3e1229980 v7.3.734
-+fc8b4a06af9db05af800b1304599afd3e1229980 v7-3-734
-+0000000000000000000000000000000000000000 v7-3-734
-+d3158bf4dee9270477defcde85949ce58fa350e5 v7.3.735
-+d3158bf4dee9270477defcde85949ce58fa350e5 v7-3-735
-+0000000000000000000000000000000000000000 v7-3-735
-+b1536bbbda104edb11b0f5772e433d2b5388905e v7.3.736
-+b1536bbbda104edb11b0f5772e433d2b5388905e v7-3-736
-+0000000000000000000000000000000000000000 v7-3-736
-+1773d5aa6437b0f88029a192cdde2c510faf517d v7.3.737
-+1773d5aa6437b0f88029a192cdde2c510faf517d v7-3-737
-+0000000000000000000000000000000000000000 v7-3-737
-+eccae034465b9a44aa2389039ba06b25dc6ae7dc v7.3.738
-+eccae034465b9a44aa2389039ba06b25dc6ae7dc v7-3-738
-+0000000000000000000000000000000000000000 v7-3-738
-+e2d36f345a7f1131e085336e7b471f718fad6c9d v7.3.739
-+e2d36f345a7f1131e085336e7b471f718fad6c9d v7-3-739
-+0000000000000000000000000000000000000000 v7-3-739
-+2c12cd5c1381dd9691af5e7d3e1fe1f54c929ee1 v7.3.740
-+2c12cd5c1381dd9691af5e7d3e1fe1f54c929ee1 v7-3-740
-+0000000000000000000000000000000000000000 v7-3-740
-+6e1fe64cf4404d899232a880552cf52998934656 v7.3.741
-+6e1fe64cf4404d899232a880552cf52998934656 v7-3-741
-+0000000000000000000000000000000000000000 v7-3-741
-+4d1753f3e85c7fb6d9cde1a8aa9ded8d11cdcd01 v7.3.742
-+4d1753f3e85c7fb6d9cde1a8aa9ded8d11cdcd01 v7-3-742
-+0000000000000000000000000000000000000000 v7-3-742
-+67e3b2753a6ef97a94084b85f87873c309fea3d6 v7.3.743
-+67e3b2753a6ef97a94084b85f87873c309fea3d6 v7-3-743
-+0000000000000000000000000000000000000000 v7-3-743
-+26c8b3b49f743ca163a63463da08cc3822322bc2 v7.3.744
-+26c8b3b49f743ca163a63463da08cc3822322bc2 v7-3-744
-+0000000000000000000000000000000000000000 v7-3-744
-+aab4b29520e79134e33f2c641f1d960de2dcdc1e v7.3.745
-+aab4b29520e79134e33f2c641f1d960de2dcdc1e v7-3-745
-+0000000000000000000000000000000000000000 v7-3-745
-+4934eb2e22dc0bc03fd5d4f95706a69a1ddffb94 v7.3.746
-+4934eb2e22dc0bc03fd5d4f95706a69a1ddffb94 v7-3-746
-+0000000000000000000000000000000000000000 v7-3-746
-+cd59ba19985a3b3bd66dffdcf59b00427f844818 v7.3.747
-+cd59ba19985a3b3bd66dffdcf59b00427f844818 v7-3-747
-+0000000000000000000000000000000000000000 v7-3-747
-+56bb88c68f985365b0545a0370be59fcd97a4178 v7.3.748
-+56bb88c68f985365b0545a0370be59fcd97a4178 v7-3-748
-+0000000000000000000000000000000000000000 v7-3-748
-+3e22fe67fa6935d1156738a34e50bffdf62006c9 v7.3.749
-+3e22fe67fa6935d1156738a34e50bffdf62006c9 v7-3-749
-+0000000000000000000000000000000000000000 v7-3-749
-+5c36fe9f19a529fb6064b37b8e47e82cdeeb7ca8 v7.3.750
-+5c36fe9f19a529fb6064b37b8e47e82cdeeb7ca8 v7-3-750
-+0000000000000000000000000000000000000000 v7-3-750
-+d149f18b289fdf19363214e7805a0637307bd264 v7.3.751
-+d149f18b289fdf19363214e7805a0637307bd264 v7-3-751
-+0000000000000000000000000000000000000000 v7-3-751
-+ed936effb1f374004db15f092b8c8ab87631fdd4 v7.3.752
-+ed936effb1f374004db15f092b8c8ab87631fdd4 v7-3-752
-+0000000000000000000000000000000000000000 v7-3-752
-+c83cd3d01128204d6926550cbe1064daaf8dee8c v7.3.753
-+c83cd3d01128204d6926550cbe1064daaf8dee8c v7-3-753
-+0000000000000000000000000000000000000000 v7-3-753
-+beceb0a18c79b5b1bda4822b34cb2d62b2967d27 v7.3.754
-+beceb0a18c79b5b1bda4822b34cb2d62b2967d27 v7-3-754
-+0000000000000000000000000000000000000000 v7-3-754
-+d9b4cf53be2edbb872cc489aea32a4441b39eaf9 v7.3.755
-+d9b4cf53be2edbb872cc489aea32a4441b39eaf9 v7-3-755
-+0000000000000000000000000000000000000000 v7-3-755
-+706c87d16d40ecdf9c6fba45bc47b911d8e140cc v7.3.756
-+706c87d16d40ecdf9c6fba45bc47b911d8e140cc v7-3-756
-+0000000000000000000000000000000000000000 v7-3-756
-+65ef7c96d65fb2fbf660797608809f0ac5d0c4b7 v7.3.757
-+65ef7c96d65fb2fbf660797608809f0ac5d0c4b7 v7-3-757
-+0000000000000000000000000000000000000000 v7-3-757
-+9eb0d30510f7b02aa5f55f400bfab08d847ab447 v7.3.758
-+9eb0d30510f7b02aa5f55f400bfab08d847ab447 v7-3-758
-+0000000000000000000000000000000000000000 v7-3-758
-+25ea15fdfa5c7d5894a06814fe9411b75050ebff v7.3.759
-+25ea15fdfa5c7d5894a06814fe9411b75050ebff v7-3-759
-+0000000000000000000000000000000000000000 v7-3-759
-+8e54a32bcd56226647cfd3d8c5e142e3a98c0ca7 v7.3.760
-+8e54a32bcd56226647cfd3d8c5e142e3a98c0ca7 v7-3-760
-+0000000000000000000000000000000000000000 v7-3-760
-+6834d6aeae099d6bfdff5151aa2174cafc22647f v7.3.761
-+6834d6aeae099d6bfdff5151aa2174cafc22647f v7-3-761
-+0000000000000000000000000000000000000000 v7-3-761
-+699f8d8f096d4627f97e8d3bcf64b8634a484c26 v7.3.762
-+699f8d8f096d4627f97e8d3bcf64b8634a484c26 v7-3-762
-+0000000000000000000000000000000000000000 v7-3-762
-+b6148e4a9c397b5dd1716cdac2f96730bd0f353d v7.3.763
-+b6148e4a9c397b5dd1716cdac2f96730bd0f353d v7-3-763
-+0000000000000000000000000000000000000000 v7-3-763
-+b29e55d0ef01c506ec48c0c5782e669bb1d80f14 v7.3.764
-+b29e55d0ef01c506ec48c0c5782e669bb1d80f14 v7-3-764
-+0000000000000000000000000000000000000000 v7-3-764
-+915fb3d2dd8ffc322a5cc9e294d9bb7dfa8c5a83 v7.3.765
-+915fb3d2dd8ffc322a5cc9e294d9bb7dfa8c5a83 v7-3-765
-+0000000000000000000000000000000000000000 v7-3-765
-+b5103b7d9e1284ef9ffbc7d1170d9105c0769c4d v7.3.766
-+b5103b7d9e1284ef9ffbc7d1170d9105c0769c4d v7-3-766
-+0000000000000000000000000000000000000000 v7-3-766
-+be1cffa1e477c4a96bb54a3097d3369b23f32825 v7.3.767
-+be1cffa1e477c4a96bb54a3097d3369b23f32825 v7-3-767
-+0000000000000000000000000000000000000000 v7-3-767
-+9ea81cd9b1f50054629547ce2eccfac1fa00d096 v7.3.768
-+9ea81cd9b1f50054629547ce2eccfac1fa00d096 v7-3-768
-+0000000000000000000000000000000000000000 v7-3-768
-+d179a8eff9d7b0adc561f4a4dcfb0b7612c1f301 v7.3.769
-+d179a8eff9d7b0adc561f4a4dcfb0b7612c1f301 v7-3-769
-+0000000000000000000000000000000000000000 v7-3-769
-+da7a7ba36ed2a51f28e4d3f7e1fd550303e3ece8 v7.3.770
-+da7a7ba36ed2a51f28e4d3f7e1fd550303e3ece8 v7-3-770
-+0000000000000000000000000000000000000000 v7-3-770
-+3bd2c055319e086665af5e449498a4d5bf40f25e v7.3.771
-+3bd2c055319e086665af5e449498a4d5bf40f25e v7-3-771
-+0000000000000000000000000000000000000000 v7-3-771
-+d828cab6964f4249db54bff6df0fe02d0f290387 v7.3.772
-+d828cab6964f4249db54bff6df0fe02d0f290387 v7-3-772
-+0000000000000000000000000000000000000000 v7-3-772
-+3db9aee957f7eea6729e5bfd294e3a24d41c79e4 v7.3.773
-+3db9aee957f7eea6729e5bfd294e3a24d41c79e4 v7-3-773
-+0000000000000000000000000000000000000000 v7-3-773
-+a8f5876e498125f4916c5f7168823885c27dad8c v7.3.774
-+a8f5876e498125f4916c5f7168823885c27dad8c v7-3-774
-+0000000000000000000000000000000000000000 v7-3-774
-+a6e60677aea727622dde15d1306c61588b805500 v7.3.775
-+a6e60677aea727622dde15d1306c61588b805500 v7-3-775
-+0000000000000000000000000000000000000000 v7-3-775
-+80b041b994d156360992666110964e74f7473d3e v7.3.776
-+80b041b994d156360992666110964e74f7473d3e v7-3-776
-+0000000000000000000000000000000000000000 v7-3-776
-+9a1a4c486e6bb367c639c29c6120d5fb1fadcc38 v7.3.777
-+9a1a4c486e6bb367c639c29c6120d5fb1fadcc38 v7-3-777
-+0000000000000000000000000000000000000000 v7-3-777
-+562bbee33aa4f9896cb23ed6de8fbf60cac323e0 v7.3.778
-+562bbee33aa4f9896cb23ed6de8fbf60cac323e0 v7-3-778
-+0000000000000000000000000000000000000000 v7-3-778
-+2067ed78d37c331685ef8f293d6a23c372ca4b78 v7.3.779
-+2067ed78d37c331685ef8f293d6a23c372ca4b78 v7-3-779
-+0000000000000000000000000000000000000000 v7-3-779
-+42edc5dac33c92876d93f00f8ab8c1f6bb25d3fc v7.3.780
-+42edc5dac33c92876d93f00f8ab8c1f6bb25d3fc v7-3-780
-+0000000000000000000000000000000000000000 v7-3-780
-+29f29e86602e4a7f83d4572d2fe75b9b0de2752f v7.3.781
-+29f29e86602e4a7f83d4572d2fe75b9b0de2752f v7-3-781
-+0000000000000000000000000000000000000000 v7-3-781
-+0de969850c0687d2018e025f31e5cef9e9ce1444 v7.3.782
-+0de969850c0687d2018e025f31e5cef9e9ce1444 v7-3-782
-+0000000000000000000000000000000000000000 v7-3-782
-+a80af62d5e3b3614ff9e058f42647c99bffe7481 v7.3.783
-+a80af62d5e3b3614ff9e058f42647c99bffe7481 v7-3-783
-+0000000000000000000000000000000000000000 v7-3-783
-+fbadf0f6987790d98c3b3fd935fea0494743830a v7.3.784
-+fbadf0f6987790d98c3b3fd935fea0494743830a v7-3-784
-+0000000000000000000000000000000000000000 v7-3-784
-+be4baed0c933e1f1543ea175e2e36551ff6caa18 v7.3.785
-+be4baed0c933e1f1543ea175e2e36551ff6caa18 v7-3-785
-+0000000000000000000000000000000000000000 v7-3-785
-+8b3e88bab70215a18768fca5a90c6f07ac1aa5eb v7.3.786
-+8b3e88bab70215a18768fca5a90c6f07ac1aa5eb v7-3-786
-+0000000000000000000000000000000000000000 v7-3-786
-+e1b98967a985f4d1ad889c8e69b822d9126411ab v7.3.787
-+e1b98967a985f4d1ad889c8e69b822d9126411ab v7-3-787
-+0000000000000000000000000000000000000000 v7-3-787
-+386fc822dd002958fdade4329845013cbfaa3dab v7.3.788
-+386fc822dd002958fdade4329845013cbfaa3dab v7-3-788
-+0000000000000000000000000000000000000000 v7-3-788
-+43c15135926fb95fa82b01424677a9c37f4d0e46 v7.3.789
-+43c15135926fb95fa82b01424677a9c37f4d0e46 v7-3-789
-+0000000000000000000000000000000000000000 v7-3-789
-+8819ea6dcb72dcf61fd0d20f8ea1904a7546917f v7.3.790
-+8819ea6dcb72dcf61fd0d20f8ea1904a7546917f v7-3-790
-+0000000000000000000000000000000000000000 v7-3-790
-+16e8a09e8ab08d2226dc84b12b7e434bda6b4fa9 v7.3.791
-+16e8a09e8ab08d2226dc84b12b7e434bda6b4fa9 v7-3-791
-+0000000000000000000000000000000000000000 v7-3-791
-+7061704c2014e4563efa032672264a47b4b7b0d9 v7.3.792
-+7061704c2014e4563efa032672264a47b4b7b0d9 v7-3-792
-+0000000000000000000000000000000000000000 v7-3-792
-+fdbded463fdcc861630b3ea61b9654374847231a v7.3.793
-+fdbded463fdcc861630b3ea61b9654374847231a v7-3-793
-+0000000000000000000000000000000000000000 v7-3-793
-+9867f92c9b9fb082ee6daca816f859b53ed8e58b v7.3.794
-+9867f92c9b9fb082ee6daca816f859b53ed8e58b v7-3-794
-+0000000000000000000000000000000000000000 v7-3-794
-+17a312ba38a0b606cfd64d82ed2ebc844828085f v7.3.795
-+17a312ba38a0b606cfd64d82ed2ebc844828085f v7-3-795
-+0000000000000000000000000000000000000000 v7-3-795
-+2c12c4e2fae8db60fbdf58b34c8b73eacdc32665 v7.3.796
-+2c12c4e2fae8db60fbdf58b34c8b73eacdc32665 v7-3-796
-+0000000000000000000000000000000000000000 v7-3-796
-+0cbea05f19c73c01dbd0f04378a65ab7de6719e7 v7.3.797
-+0cbea05f19c73c01dbd0f04378a65ab7de6719e7 v7-3-797
-+0000000000000000000000000000000000000000 v7-3-797
-+cdaa688e3dddc442c1d39780b6ac0b5ac98c253e v7.3.798
-+cdaa688e3dddc442c1d39780b6ac0b5ac98c253e v7-3-798
-+0000000000000000000000000000000000000000 v7-3-798
-+5e9730de25e9b4fc2abe14b8d6b0968a9e59983a v7.3.799
-+5e9730de25e9b4fc2abe14b8d6b0968a9e59983a v7-3-799
-+0000000000000000000000000000000000000000 v7-3-799
-+c0cc0e0620dd935956a472e5b23369d1d78f5fb9 v7.3.800
-+c0cc0e0620dd935956a472e5b23369d1d78f5fb9 v7-3-800
-+0000000000000000000000000000000000000000 v7-3-800
-+48b54c590dc83b705f2e19f9aea1e9a69fe09720 v7.3.801
-+48b54c590dc83b705f2e19f9aea1e9a69fe09720 v7-3-801
-+0000000000000000000000000000000000000000 v7-3-801
-+cd5145d2408bb52217417af654f5664af269e19e v7.3.802
-+cd5145d2408bb52217417af654f5664af269e19e v7-3-802
-+0000000000000000000000000000000000000000 v7-3-802
-+77fa4dee43fcd1c0bacad9dc85b3deb39e0ba487 v7.3.803
-+77fa4dee43fcd1c0bacad9dc85b3deb39e0ba487 v7-3-803
-+0000000000000000000000000000000000000000 v7-3-803
-+2eb4b9ed2d42312eff32e845336aab748f7fe311 v7.3.804
-+2eb4b9ed2d42312eff32e845336aab748f7fe311 v7-3-804
-+0000000000000000000000000000000000000000 v7-3-804
-+dc30c01f995623e65ee6651a46b12ff062df8860 v7.3.805
-+dc30c01f995623e65ee6651a46b12ff062df8860 v7-3-805
-+0000000000000000000000000000000000000000 v7-3-805
-+f7e3f87ac9928df0079741258a3c6034ecc48806 v7.3.806
-+f7e3f87ac9928df0079741258a3c6034ecc48806 v7-3-806
-+0000000000000000000000000000000000000000 v7-3-806
-+1efc30385c417bb413f5199253edca2795f9da0e v7.3.807
-+1efc30385c417bb413f5199253edca2795f9da0e v7-3-807
-+0000000000000000000000000000000000000000 v7-3-807
-+3b2a771abb39f670269b0ee9c4041bf02c2d5b84 v7.3.808
-+3b2a771abb39f670269b0ee9c4041bf02c2d5b84 v7-3-808
-+0000000000000000000000000000000000000000 v7-3-808
-+918d7df425afb77261428968ae646efb95b15224 v7.3.809
-+918d7df425afb77261428968ae646efb95b15224 v7-3-809
-+0000000000000000000000000000000000000000 v7-3-809
-+8904ccd5ee85ff326a05530c02cc90e1260f768a v7.3.810
-+8904ccd5ee85ff326a05530c02cc90e1260f768a v7-3-810
-+0000000000000000000000000000000000000000 v7-3-810
-+ad21448af931b3923d9b76e4efdcf0e966c9d199 v7.3.811
-+ad21448af931b3923d9b76e4efdcf0e966c9d199 v7-3-811
-+0000000000000000000000000000000000000000 v7-3-811
-+4584e59860b8db6fc5870f0b8f0425f540ea90a7 v7.3.812
-+4584e59860b8db6fc5870f0b8f0425f540ea90a7 v7-3-812
-+0000000000000000000000000000000000000000 v7-3-812
-+4e6e012af15028dde0f55bd9bc676bbb14e481ff v7.3.813
-+4e6e012af15028dde0f55bd9bc676bbb14e481ff v7-3-813
-+0000000000000000000000000000000000000000 v7-3-813
-+d5b1d6177b374bbecfbd5c75fbce28e148eeecea v7.3.814
-+d5b1d6177b374bbecfbd5c75fbce28e148eeecea v7-3-814
-+0000000000000000000000000000000000000000 v7-3-814
-+448a6e7cf32e14a4adcbc4066743e2f058f7e1c0 v7.3.815
-+448a6e7cf32e14a4adcbc4066743e2f058f7e1c0 v7-3-815
-+0000000000000000000000000000000000000000 v7-3-815
-+2b340e5c5baaf66015f3367208d9bf22ce1dfc8e v7.3.816
-+2b340e5c5baaf66015f3367208d9bf22ce1dfc8e v7-3-816
-+0000000000000000000000000000000000000000 v7-3-816
-+01fa9313d4b560997234b94b2408e6bf64808afc v7.3.817
-+01fa9313d4b560997234b94b2408e6bf64808afc v7-3-817
-+0000000000000000000000000000000000000000 v7-3-817
-+ad7b6062a7f4041b736d45c5f045671d60eb782f v7.3.818
-+ad7b6062a7f4041b736d45c5f045671d60eb782f v7-3-818
-+0000000000000000000000000000000000000000 v7-3-818
-+36fd800b8c6c527c75bfe285d0ed0c3bc1cf45f7 v7.3.819
-+36fd800b8c6c527c75bfe285d0ed0c3bc1cf45f7 v7-3-819
-+0000000000000000000000000000000000000000 v7-3-819
-+688da4d486a019afa3565ffc553af6ee1a4e67d8 v7.3.820
-+688da4d486a019afa3565ffc553af6ee1a4e67d8 v7-3-820
-+0000000000000000000000000000000000000000 v7-3-820
-+4936ee89b4bcfaa33f74114bd07f20af382af14d v7.3.821
-+4936ee89b4bcfaa33f74114bd07f20af382af14d v7-3-821
-+0000000000000000000000000000000000000000 v7-3-821
-+2f7883063b19039840a4a73fa227f6f42b9e3281 v7.3.822
-+2f7883063b19039840a4a73fa227f6f42b9e3281 v7-3-822
-+0000000000000000000000000000000000000000 v7-3-822
-+db401e5e4c5d868b7848486c84521f047dc04b01 v7.3.823
-+db401e5e4c5d868b7848486c84521f047dc04b01 v7-3-823
-+0000000000000000000000000000000000000000 v7-3-823
-+f5ef9b9c18cd9345eca783fb0c6d4ed50e215cb8 v7.3.824
-+f5ef9b9c18cd9345eca783fb0c6d4ed50e215cb8 v7-3-824
-+0000000000000000000000000000000000000000 v7-3-824
-+6b1f3fc893cdb6d0a4fff5997cc8ff083940e727 v7.3.825
-+6b1f3fc893cdb6d0a4fff5997cc8ff083940e727 v7-3-825
-+0000000000000000000000000000000000000000 v7-3-825
-+646cb6b6ff2372c26cb9dc9ef1a0f8d562204950 v7.3.826
-+646cb6b6ff2372c26cb9dc9ef1a0f8d562204950 v7-3-826
-+0000000000000000000000000000000000000000 v7-3-826
-+5e17a12a3b1438a7ce044db02d9916ef36e404a9 v7.3.827
-+5e17a12a3b1438a7ce044db02d9916ef36e404a9 v7-3-827
-+0000000000000000000000000000000000000000 v7-3-827
-+13170a796134824375a42e77af4ff012ceed2b5a v7.3.828
-+13170a796134824375a42e77af4ff012ceed2b5a v7-3-828
-+0000000000000000000000000000000000000000 v7-3-828
-+7728d626ae038dedbf3347508238ef3ab4216a9e v7.3.829
-+7728d626ae038dedbf3347508238ef3ab4216a9e v7-3-829
-+0000000000000000000000000000000000000000 v7-3-829
-+454d35a4339251adf125de78a8a98d99105533eb v7.3.830
-+454d35a4339251adf125de78a8a98d99105533eb v7-3-830
-+0000000000000000000000000000000000000000 v7-3-830
-+cb185366f5c84852a7221ed6d9b274a7239ad06d v7.3.831
-+cb185366f5c84852a7221ed6d9b274a7239ad06d v7-3-831
-+0000000000000000000000000000000000000000 v7-3-831
-+670e576a58d19c2033877d26b4338873d8a7db12 v7.3.832
-+670e576a58d19c2033877d26b4338873d8a7db12 v7-3-832
-+0000000000000000000000000000000000000000 v7-3-832
-+b971097606032c6fceb961fd559121d5bd74a260 v7.3.833
-+b971097606032c6fceb961fd559121d5bd74a260 v7-3-833
-+0000000000000000000000000000000000000000 v7-3-833
-+3ac9d7d8274e669d10178c4d95eac55080ee0ea5 v7.3.834
-+3ac9d7d8274e669d10178c4d95eac55080ee0ea5 v7-3-834
-+0000000000000000000000000000000000000000 v7-3-834
-+d356b5ce84ceac41b036136807ebe887208fb6f0 v7.3.835
-+d356b5ce84ceac41b036136807ebe887208fb6f0 v7-3-835
-+0000000000000000000000000000000000000000 v7-3-835
-+ff193256398a81a520b44c67d661eee36c64ee95 v7.3.836
-+ff193256398a81a520b44c67d661eee36c64ee95 v7-3-836
-+0000000000000000000000000000000000000000 v7-3-836
-+14698f63de8db5b034939aa66b7076ab76bcd529 v7.3.837
-+14698f63de8db5b034939aa66b7076ab76bcd529 v7-3-837
-+0000000000000000000000000000000000000000 v7-3-837
-+1c819b05529cbbc39982513271499e0217382124 v7.3.838
-+1c819b05529cbbc39982513271499e0217382124 v7-3-838
-+0000000000000000000000000000000000000000 v7-3-838
-+2030aca407edf6c865114f459bf2d5d79adea390 v7.3.839
-+2030aca407edf6c865114f459bf2d5d79adea390 v7-3-839
-+0000000000000000000000000000000000000000 v7-3-839
-+1778d51fcbc37e819c305b860f98c949915d35eb v7.3.840
-+1778d51fcbc37e819c305b860f98c949915d35eb v7-3-840
-+0000000000000000000000000000000000000000 v7-3-840
-+b40e6a47ee53789e91b57c04d9ee7328fa9237d5 v7.3.841
-+b40e6a47ee53789e91b57c04d9ee7328fa9237d5 v7-3-841
-+0000000000000000000000000000000000000000 v7-3-841
-+78321dcaa8e263cdf408f7880530b7aea7401a49 v7.3.842
-+78321dcaa8e263cdf408f7880530b7aea7401a49 v7-3-842
-+0000000000000000000000000000000000000000 v7-3-842
-+f4960ddda07ce46a098d9106ac1b22fd0f6d0f0a v7.3.843
-+f4960ddda07ce46a098d9106ac1b22fd0f6d0f0a v7-3-843
-+0000000000000000000000000000000000000000 v7-3-843
-+eccc0e8a82fb632efdfa600db3f65f4ed3dff01b v7.3.844
-+eccc0e8a82fb632efdfa600db3f65f4ed3dff01b v7-3-844
-+0000000000000000000000000000000000000000 v7-3-844
-+171234e02b1e74a2482003d56e7110d37fb4a62b v7.3.845
-+171234e02b1e74a2482003d56e7110d37fb4a62b v7-3-845
-+0000000000000000000000000000000000000000 v7-3-845
-+b06bb07d906be3be689f90399effd2b3b2ac2ee3 v7.3.846
-+b06bb07d906be3be689f90399effd2b3b2ac2ee3 v7-3-846
-+0000000000000000000000000000000000000000 v7-3-846
-+4dd43d6b3df705a513be75db8a1b50a83f72088d v7.3.847
-+4dd43d6b3df705a513be75db8a1b50a83f72088d v7-3-847
-+0000000000000000000000000000000000000000 v7-3-847
-+e49b80f267dc3cde78de78026368dec3a20520f2 v7.3.848
-+e49b80f267dc3cde78de78026368dec3a20520f2 v7-3-848
-+0000000000000000000000000000000000000000 v7-3-848
-+dc77c2a14a05810bda7e53373d76b7f41341f44d v7.3.849
-+dc77c2a14a05810bda7e53373d76b7f41341f44d v7-3-849
-+0000000000000000000000000000000000000000 v7-3-849
-+07fef68eb0188adb3d750b92b78059cf41fc8c7c v7.3.850
-+07fef68eb0188adb3d750b92b78059cf41fc8c7c v7-3-850
-+0000000000000000000000000000000000000000 v7-3-850
-+dd669f296568a7525e02ab54b615bde20d37c466 v7.3.851
-+dd669f296568a7525e02ab54b615bde20d37c466 v7-3-851
-+0000000000000000000000000000000000000000 v7-3-851
-+3fd805ca2a6a6ef231f111c6a7b3cd512abaf537 v7.3.852
-+3fd805ca2a6a6ef231f111c6a7b3cd512abaf537 v7-3-852
-+0000000000000000000000000000000000000000 v7-3-852
-+eea32254940fb4cd61339650e10a808f4e702e62 v7.3.853
-+eea32254940fb4cd61339650e10a808f4e702e62 v7-3-853
-+0000000000000000000000000000000000000000 v7-3-853
-+14cdb6e4d5b88aaaf7e33eaee87efec5b1c1ebf5 v7.3.854
-+14cdb6e4d5b88aaaf7e33eaee87efec5b1c1ebf5 v7-3-854
-+0000000000000000000000000000000000000000 v7-3-854
-+6604853dd8227c7983dc1b10f804f6aa4b28578f v7.3.855
-+6604853dd8227c7983dc1b10f804f6aa4b28578f v7-3-855
-+0000000000000000000000000000000000000000 v7-3-855
-+fb533fb6c015f40a3b1301c0c876c35665b0d6ef v7.3.856
-+fb533fb6c015f40a3b1301c0c876c35665b0d6ef v7-3-856
-+0000000000000000000000000000000000000000 v7-3-856
-+4905e038b1057e133d0e72c48cf88580cdedf26b v7.3.857
-+4905e038b1057e133d0e72c48cf88580cdedf26b v7-3-857
-+0000000000000000000000000000000000000000 v7-3-857
-+0a3fab86f34d6bab27e0be69db4f39ffb664557a v7.3.858
-+0a3fab86f34d6bab27e0be69db4f39ffb664557a v7-3-858
-+0000000000000000000000000000000000000000 v7-3-858
-+ecf21be84def6033137d168e0a66500c29aeffec v7.3.859
-+ecf21be84def6033137d168e0a66500c29aeffec v7-3-859
-+0000000000000000000000000000000000000000 v7-3-859
-+6ce32844727d8d04e8dc91310d0a4118d81aa161 v7.3.860
-+6ce32844727d8d04e8dc91310d0a4118d81aa161 v7-3-860
-+0000000000000000000000000000000000000000 v7-3-860
-+6fe728bf165e9b6974ef47e86d98b0eb14ce21f3 v7.3.861
-+6fe728bf165e9b6974ef47e86d98b0eb14ce21f3 v7-3-861
-+0000000000000000000000000000000000000000 v7-3-861
-+dd4f3ceb5d86f8367d4cfd6fdc898e493c6d0aad v7.3.862
-+dd4f3ceb5d86f8367d4cfd6fdc898e493c6d0aad v7-3-862
-+0000000000000000000000000000000000000000 v7-3-862
-+5c0652f455c9f2ae72790a782fe5b5fd1a0e857c v7.3.863
-+5c0652f455c9f2ae72790a782fe5b5fd1a0e857c v7-3-863
-+0000000000000000000000000000000000000000 v7-3-863
-+a82ef37d38c09523bab204253b52e177dbbc0581 v7.3.864
-+a82ef37d38c09523bab204253b52e177dbbc0581 v7-3-864
-+0000000000000000000000000000000000000000 v7-3-864
-+94342b0605fb9111b7fd4a45a8bbc72992c4c255 v7.3.865
-+94342b0605fb9111b7fd4a45a8bbc72992c4c255 v7-3-865
-+0000000000000000000000000000000000000000 v7-3-865
-+90d72df431e54d677f03171cbe558434029c027e v7.3.866
-+90d72df431e54d677f03171cbe558434029c027e v7-3-866
-+0000000000000000000000000000000000000000 v7-3-866
-+0fcb050fd79d84ed190452e6387e42d320678fec v7.3.867
-+0fcb050fd79d84ed190452e6387e42d320678fec v7-3-867
-+0000000000000000000000000000000000000000 v7-3-867
-+b31989e2b05832d432557a32ed8901dce237dec2 v7.3.868
-+b31989e2b05832d432557a32ed8901dce237dec2 v7-3-868
-+0000000000000000000000000000000000000000 v7-3-868
-+23ce9a61bdc2a35892ec4e4fa22e8964d60dc6cd v7.3.869
-+23ce9a61bdc2a35892ec4e4fa22e8964d60dc6cd v7-3-869
-+0000000000000000000000000000000000000000 v7-3-869
-+26e59a39fdd965ffe83bd654b705540551c8e0c8 v7.3.870
-+26e59a39fdd965ffe83bd654b705540551c8e0c8 v7-3-870
-+0000000000000000000000000000000000000000 v7-3-870
-+d52c45b35fb0c3b77bbace6cec3deda8100fbb7a v7.3.871
-+d52c45b35fb0c3b77bbace6cec3deda8100fbb7a v7-3-871
-+0000000000000000000000000000000000000000 v7-3-871
-+edd0bc1f26bd019cfd328a0dc2c9a854607e4a41 v7.3.872
-+edd0bc1f26bd019cfd328a0dc2c9a854607e4a41 v7-3-872
-+0000000000000000000000000000000000000000 v7-3-872
-+7faeece39228fde0ac5c26a362a223d0dbe9bba5 v7.3.873
-+7faeece39228fde0ac5c26a362a223d0dbe9bba5 v7-3-873
-+0000000000000000000000000000000000000000 v7-3-873
-+4d0b39bcec207130e483ffa66b6f51f999d8e95b v7.3.874
-+4d0b39bcec207130e483ffa66b6f51f999d8e95b v7-3-874
-+0000000000000000000000000000000000000000 v7-3-874
-+beab15a2ef147b880bf7b5add269142b9af58317 v7.3.875
-+beab15a2ef147b880bf7b5add269142b9af58317 v7-3-875
-+0000000000000000000000000000000000000000 v7-3-875
-+787df0fc6539ff7886e9fabc85ea403096577440 v7.3.876
-+787df0fc6539ff7886e9fabc85ea403096577440 v7-3-876
-+0000000000000000000000000000000000000000 v7-3-876
-+96f478b812b14fb1a5710450a1174baa55c73409 v7.3.877
-+96f478b812b14fb1a5710450a1174baa55c73409 v7-3-877
-+0000000000000000000000000000000000000000 v7-3-877
-+97a5ce76cb7d5f635876bbddf35b421c0c76690c v7.3.878
-+97a5ce76cb7d5f635876bbddf35b421c0c76690c v7-3-878
-+0000000000000000000000000000000000000000 v7-3-878
-+79176b78969cf5d182b378ffb8e341e22f18775b v7.3.879
-+79176b78969cf5d182b378ffb8e341e22f18775b v7-3-879
-+0000000000000000000000000000000000000000 v7-3-879
-+9945fe0536a32496fe4842524199b5c24bb8b0d0 v7.3.880
-+9945fe0536a32496fe4842524199b5c24bb8b0d0 v7-3-880
-+0000000000000000000000000000000000000000 v7-3-880
-+d8acfc49d94e485f839d8e2534d302b91a98bf9d v7.3.881
-+d8acfc49d94e485f839d8e2534d302b91a98bf9d v7-3-881
-+0000000000000000000000000000000000000000 v7-3-881
-+8653c39b85ea93e052bb0cbda571e7298451eebe v7.3.882
-+8653c39b85ea93e052bb0cbda571e7298451eebe v7-3-882
-+0000000000000000000000000000000000000000 v7-3-882
-+76aa34cef80f5d22bbbcf60278c833fdadd70131 v7.3.883
-+76aa34cef80f5d22bbbcf60278c833fdadd70131 v7-3-883
-+0000000000000000000000000000000000000000 v7-3-883
-+22adc26aaa9f701267bd1ee4636592859ee2dc70 v7.3.884
-+22adc26aaa9f701267bd1ee4636592859ee2dc70 v7-3-884
-+0000000000000000000000000000000000000000 v7-3-884
-+c5eab656ec51dc2d40ef6e39194c74af868a4b5e v7.3.885
-+c5eab656ec51dc2d40ef6e39194c74af868a4b5e v7-3-885
-+0000000000000000000000000000000000000000 v7-3-885
-+902d6ab377ee2f011279b3aaebeb05d0f5c2bf80 v7.3.886
-+902d6ab377ee2f011279b3aaebeb05d0f5c2bf80 v7-3-886
-+0000000000000000000000000000000000000000 v7-3-886
-+015e53d9978721bbb9283a999c668c98ad2554a9 v7.3.887
-+015e53d9978721bbb9283a999c668c98ad2554a9 v7-3-887
-+0000000000000000000000000000000000000000 v7-3-887
-+b0b253898cf9ff8f5fbacf69de76b5640b1b6a55 v7.3.888
-+b0b253898cf9ff8f5fbacf69de76b5640b1b6a55 v7-3-888
-+0000000000000000000000000000000000000000 v7-3-888
-+cb0c694517a08f1f8f548f0771e874537a390dd4 v7.3.889
-+cb0c694517a08f1f8f548f0771e874537a390dd4 v7-3-889
-+0000000000000000000000000000000000000000 v7-3-889
-+89bdd6d575101291c66f9e701c456ee71085d147 v7.3.890
-+89bdd6d575101291c66f9e701c456ee71085d147 v7-3-890
-+0000000000000000000000000000000000000000 v7-3-890
-+1dc160bf2488fb1332250edaefcc9f1e320c8e57 v7.3.891
-+1dc160bf2488fb1332250edaefcc9f1e320c8e57 v7-3-891
-+0000000000000000000000000000000000000000 v7-3-891
-+6c2e8074ea2588f710adc669e7a15041f6e80adc v7.3.892
-+6c2e8074ea2588f710adc669e7a15041f6e80adc v7-3-892
-+0000000000000000000000000000000000000000 v7-3-892
-+dc3efb6d5a0821c79f939db8e3b77a714292195c v7.3.893
-+dc3efb6d5a0821c79f939db8e3b77a714292195c v7-3-893
-+0000000000000000000000000000000000000000 v7-3-893
-+52e946d654e0fe978609e0a23dde3c8998f2ce24 v7.3.894
-+52e946d654e0fe978609e0a23dde3c8998f2ce24 v7-3-894
-+0000000000000000000000000000000000000000 v7-3-894
-+11007e80829ca9d72813a9c60a2eded80a0c1855 v7.3.895
-+11007e80829ca9d72813a9c60a2eded80a0c1855 v7-3-895
-+0000000000000000000000000000000000000000 v7-3-895
-+af3a3680fc75f090e896d902f0b4c7a710c41d41 v7.3.896
-+af3a3680fc75f090e896d902f0b4c7a710c41d41 v7-3-896
-+0000000000000000000000000000000000000000 v7-3-896
-+5aa74a2f8f9de4a6c10bdebbef910d6750f2a980 v7.3.897
-+5aa74a2f8f9de4a6c10bdebbef910d6750f2a980 v7-3-897
-+0000000000000000000000000000000000000000 v7-3-897
-+aca1886102bdf19f755dc5eb1ac379f1f0680f6d v7.3.898
-+aca1886102bdf19f755dc5eb1ac379f1f0680f6d v7-3-898
-+0000000000000000000000000000000000000000 v7-3-898
-+bb3cfdb626077d9236447f40ee725b9a5d78216b v7.3.899
-+bb3cfdb626077d9236447f40ee725b9a5d78216b v7-3-899
-+0000000000000000000000000000000000000000 v7-3-899
-+b53fa3b431934de82d3bee329643bbe0856f651b v7.3.900
-+b53fa3b431934de82d3bee329643bbe0856f651b v7-3-900
-+0000000000000000000000000000000000000000 v7-3-900
-+790238e5a46c70f45232c0a54d0c73a6ca1d37dd v7.3.901
-+790238e5a46c70f45232c0a54d0c73a6ca1d37dd v7-3-901
-+0000000000000000000000000000000000000000 v7-3-901
-+b01e3cff92530f6c317e0cf2c0ba0fb4f97df883 v7.3.902
-+b01e3cff92530f6c317e0cf2c0ba0fb4f97df883 v7-3-902
-+0000000000000000000000000000000000000000 v7-3-902
-+166b3df562ead7b4f85a494fb8a6eef40affdf85 v7.3.903
-+166b3df562ead7b4f85a494fb8a6eef40affdf85 v7-3-903
-+0000000000000000000000000000000000000000 v7-3-903
-+bdab73bf24a8b361a42ffcf429c0aa705d4594e0 v7.3.904
-+bdab73bf24a8b361a42ffcf429c0aa705d4594e0 v7-3-904
-+0000000000000000000000000000000000000000 v7-3-904
-+8e1d1da398b378cf03c0910979cf475ddb2df7e3 v7.3.905
-+8e1d1da398b378cf03c0910979cf475ddb2df7e3 v7-3-905
-+0000000000000000000000000000000000000000 v7-3-905
-+ff1f3e42df08b2ebc39e3b1f2c80f4751bf16dbc v7.3.906
-+ff1f3e42df08b2ebc39e3b1f2c80f4751bf16dbc v7-3-906
-+0000000000000000000000000000000000000000 v7-3-906
-+9f3da1dea7c0944837e8d5a080eb59a24f6c9dd7 v7.3.907
-+9f3da1dea7c0944837e8d5a080eb59a24f6c9dd7 v7-3-907
-+0000000000000000000000000000000000000000 v7-3-907
-+4281875776fb2c3127d08a03c3600b58353c9796 v7.3.908
-+4281875776fb2c3127d08a03c3600b58353c9796 v7-3-908
-+0000000000000000000000000000000000000000 v7-3-908
-+b79f3c3a584c701e93acd1881a934c931634c39f v7.3.909
-+b79f3c3a584c701e93acd1881a934c931634c39f v7-3-909
-+0000000000000000000000000000000000000000 v7-3-909
-+d8d9c591c50fec51b64c12bd2f42d3550bd31d7d v7.3.910
-+d8d9c591c50fec51b64c12bd2f42d3550bd31d7d v7-3-910
-+0000000000000000000000000000000000000000 v7-3-910
-+f1eab4f77a6fe4b77508d86a68a6681195806607 v7.3.911
-+f1eab4f77a6fe4b77508d86a68a6681195806607 v7-3-911
-+0000000000000000000000000000000000000000 v7-3-911
-+62eadd7de409641de83ce61e1eb311e9116e06fa v7.3.912
-+62eadd7de409641de83ce61e1eb311e9116e06fa v7-3-912
-+0000000000000000000000000000000000000000 v7-3-912
-+0d3573091d42d4797f10cff1c4139557d384f899 v7.3.913
-+0d3573091d42d4797f10cff1c4139557d384f899 v7-3-913
-+0000000000000000000000000000000000000000 v7-3-913
-+9f642ac84df9303d34d0214da2ade28f78ecfb6c v7.3.914
-+9f642ac84df9303d34d0214da2ade28f78ecfb6c v7-3-914
-+0000000000000000000000000000000000000000 v7-3-914
-+d8053e6bf72a555ed34201c6edb55a23b4fc9965 v7.3.915
-+d8053e6bf72a555ed34201c6edb55a23b4fc9965 v7-3-915
-+0000000000000000000000000000000000000000 v7-3-915
-+f39af34195702c5587eff88dec51b40e327f418d v7.3.916
-+f39af34195702c5587eff88dec51b40e327f418d v7-3-916
-+0000000000000000000000000000000000000000 v7-3-916
-+3887b02953cec045611021e0adcd512b3d127692 v7.3.917
-+3887b02953cec045611021e0adcd512b3d127692 v7-3-917
-+0000000000000000000000000000000000000000 v7-3-917
-+6a8ffaf0585660badbb817f6a2f1cb583c9f1447 v7.3.918
-+6a8ffaf0585660badbb817f6a2f1cb583c9f1447 v7-3-918
-+0000000000000000000000000000000000000000 v7-3-918
-+12636b8248163628e7c8df68210dc17932440157 v7.3.919
-+12636b8248163628e7c8df68210dc17932440157 v7-3-919
-+0000000000000000000000000000000000000000 v7-3-919
-+923277a9cce4316d6b4cb3c6571dab538a6b0108 v7.3.920
-+923277a9cce4316d6b4cb3c6571dab538a6b0108 v7-3-920
-+0000000000000000000000000000000000000000 v7-3-920
-+97474f967eec7f24f09d20dbac65ec9bb660bb2e v7.3.921
-+97474f967eec7f24f09d20dbac65ec9bb660bb2e v7-3-921
-+0000000000000000000000000000000000000000 v7-3-921
-+1d56e5dfa08e68c9ef0645cabf076e401799e3bd v7.3.922
-+1d56e5dfa08e68c9ef0645cabf076e401799e3bd v7-3-922
-+0000000000000000000000000000000000000000 v7-3-922
-+6ecb80dc6521837e28bc58d27539767d6947037d v7.3.923
-+6ecb80dc6521837e28bc58d27539767d6947037d v7-3-923
-+0000000000000000000000000000000000000000 v7-3-923
-+7eaccdaa530431c15fb0e0803e5495074e883bb9 v7.3.924
-+7eaccdaa530431c15fb0e0803e5495074e883bb9 v7-3-924
-+0000000000000000000000000000000000000000 v7-3-924
-+04736b4030ecfa2c9e8d6046ea533718dc5d8ff0 v7.3.925
-+04736b4030ecfa2c9e8d6046ea533718dc5d8ff0 v7-3-925
-+0000000000000000000000000000000000000000 v7-3-925
-+c80838526eebf3374fc42febcf40cd911cc1523c v7.3.926
-+c80838526eebf3374fc42febcf40cd911cc1523c v7-3-926
-+0000000000000000000000000000000000000000 v7-3-926
-+d67e292af6f9d259d0893c8062f3896a8aac000f v7.3.927
-+d67e292af6f9d259d0893c8062f3896a8aac000f v7-3-927
-+0000000000000000000000000000000000000000 v7-3-927
-+6d45e6f974159e816a4300877296e9a0760ad113 v7.3.928
-+6d45e6f974159e816a4300877296e9a0760ad113 v7-3-928
-+0000000000000000000000000000000000000000 v7-3-928
-+94aa0d30a3ea6291daf7e6207810ec5282cc97a4 v7.3.929
-+94aa0d30a3ea6291daf7e6207810ec5282cc97a4 v7-3-929
-+0000000000000000000000000000000000000000 v7-3-929
-+d85196defe0da017ff6d547e36bcf40aecba9661 v7.3.930
-+d85196defe0da017ff6d547e36bcf40aecba9661 v7-3-930
-+0000000000000000000000000000000000000000 v7-3-930
-+fe0c7437ae8b0e05b57990549e1ddc71e456f18e v7.3.931
-+fe0c7437ae8b0e05b57990549e1ddc71e456f18e v7-3-931
-+0000000000000000000000000000000000000000 v7-3-931
-+b7f2d97ae2b7442c46c48ef36d9e33c3ddd34db7 v7.3.932
-+b7f2d97ae2b7442c46c48ef36d9e33c3ddd34db7 v7-3-932
-+0000000000000000000000000000000000000000 v7-3-932
-+c9820396afb971035e722ddce2058d5db2f0fc64 v7.3.933
-+c9820396afb971035e722ddce2058d5db2f0fc64 v7-3-933
-+0000000000000000000000000000000000000000 v7-3-933
-+000bb500208d54e17de26bd5cc5a18fae8d1729c v7.3.934
-+000bb500208d54e17de26bd5cc5a18fae8d1729c v7-3-934
-+0000000000000000000000000000000000000000 v7-3-934
-+c42e130ebf36515e574d89efbe98fe380ec7c694 v7.3.935
-+c42e130ebf36515e574d89efbe98fe380ec7c694 v7-3-935
-+0000000000000000000000000000000000000000 v7-3-935
-+e7361b2d8136f6468daedf1bec7390d77c5c5bb1 v7.3.936
-+e7361b2d8136f6468daedf1bec7390d77c5c5bb1 v7-3-936
-+0000000000000000000000000000000000000000 v7-3-936
-+8ec7323f417d998685afc26bbb4e466eb0204352 v7.3.937
-+8ec7323f417d998685afc26bbb4e466eb0204352 v7-3-937
-+0000000000000000000000000000000000000000 v7-3-937
-+a2f03b41dca7024da5e702d016ae52fe7f51594c v7.3.938
-+a2f03b41dca7024da5e702d016ae52fe7f51594c v7-3-938
-+0000000000000000000000000000000000000000 v7-3-938
-+48a22f36ff45659594ca865f502fe95691b2e332 v7.3.939
-+48a22f36ff45659594ca865f502fe95691b2e332 v7-3-939
-+0000000000000000000000000000000000000000 v7-3-939
-+e2db42528a5bf380bc7e92e41afc807b27f01c12 v7.3.940
-+e2db42528a5bf380bc7e92e41afc807b27f01c12 v7-3-940
-+0000000000000000000000000000000000000000 v7-3-940
-+da71e66dc1d4300cd792f0da77a5afd99d634c6c v7.3.941
-+da71e66dc1d4300cd792f0da77a5afd99d634c6c v7-3-941
-+0000000000000000000000000000000000000000 v7-3-941
-+358c10968c7fcb2599356b419473a3fd46edcb69 v7.3.942
-+358c10968c7fcb2599356b419473a3fd46edcb69 v7-3-942
-+0000000000000000000000000000000000000000 v7-3-942
-+736b8e18a3bced7e498a6b81e7189d78cf4671e0 v7.3.943
-+736b8e18a3bced7e498a6b81e7189d78cf4671e0 v7-3-943
-+0000000000000000000000000000000000000000 v7-3-943
-+71fa86c8fd4a1af0a27a880ea15e3a7b97334453 v7.3.944
-+71fa86c8fd4a1af0a27a880ea15e3a7b97334453 v7-3-944
-+0000000000000000000000000000000000000000 v7-3-944
-+80eea7a9d6b9c2e7e8ceb18d6a090387f7e1e9f5 v7.3.945
-+80eea7a9d6b9c2e7e8ceb18d6a090387f7e1e9f5 v7-3-945
-+0000000000000000000000000000000000000000 v7-3-945
-+11376842075637114ee3714ccbc2e0e8a432a4ac v7.3.946
-+11376842075637114ee3714ccbc2e0e8a432a4ac v7-3-946
-+0000000000000000000000000000000000000000 v7-3-946
-+a84f21892563be88839b4026bafba77f9e9a1fec v7.3.947
-+a84f21892563be88839b4026bafba77f9e9a1fec v7-3-947
-+0000000000000000000000000000000000000000 v7-3-947
-+a6f0544df95e5f783861d3c67d84bc5a28a315da v7.3.948
-+a6f0544df95e5f783861d3c67d84bc5a28a315da v7-3-948
-+0000000000000000000000000000000000000000 v7-3-948
-+cfd76908da252e03f46ea15cde44a3664e895fb0 v7.3.949
-+cfd76908da252e03f46ea15cde44a3664e895fb0 v7-3-949
-+0000000000000000000000000000000000000000 v7-3-949
-+d4816e7c33289b9c8aec739850133484c5c3e8fa v7.3.950
-+d4816e7c33289b9c8aec739850133484c5c3e8fa v7-3-950
-+0000000000000000000000000000000000000000 v7-3-950
-+907b1f035ee7cc61fec1463db85a9eaba4717120 v7.3.951
-+907b1f035ee7cc61fec1463db85a9eaba4717120 v7-3-951
-+0000000000000000000000000000000000000000 v7-3-951
-+2a166caf8709876053f9b32f4f88590a4fbc6899 v7.3.952
-+2a166caf8709876053f9b32f4f88590a4fbc6899 v7-3-952
-+0000000000000000000000000000000000000000 v7-3-952
-+7b789d337820088f09f6a8fb488efd418f702133 v7.3.953
-+7b789d337820088f09f6a8fb488efd418f702133 v7-3-953
-+0000000000000000000000000000000000000000 v7-3-953
-+1afdb7d21c14e15a1239d406205563dd702d7d24 v7.3.954
-+1afdb7d21c14e15a1239d406205563dd702d7d24 v7-3-954
-+0000000000000000000000000000000000000000 v7-3-954
-+fa90ebf2c8f36d98ef27b2668ac1e1c11db75bbe v7.3.955
-+fa90ebf2c8f36d98ef27b2668ac1e1c11db75bbe v7-3-955
-+0000000000000000000000000000000000000000 v7-3-955
-+0bbacb6a83bd678266a0a864e47f4e03927103fd v7.3.956
-+0bbacb6a83bd678266a0a864e47f4e03927103fd v7-3-956
-+0000000000000000000000000000000000000000 v7-3-956
-+c16602758d847665ed50138a562f1513ca5dedc8 v7.3.957
-+c16602758d847665ed50138a562f1513ca5dedc8 v7-3-957
-+0000000000000000000000000000000000000000 v7-3-957
-+58b74ab7f29df09e54bf76ac84697f04b9f4c163 v7.3.958
-+58b74ab7f29df09e54bf76ac84697f04b9f4c163 v7-3-958
-+0000000000000000000000000000000000000000 v7-3-958
-+ef6b11bb183da058edf52c86ce705726ccf72600 v7.3.959
-+ef6b11bb183da058edf52c86ce705726ccf72600 v7-3-959
-+0000000000000000000000000000000000000000 v7-3-959
-+e67522c4f56646bd6ef91ad63b152bcec96b2e05 v7.3.960
-+e67522c4f56646bd6ef91ad63b152bcec96b2e05 v7-3-960
-+0000000000000000000000000000000000000000 v7-3-960
-+d5177d5ece0c539680390448c8ce8d05a6d61201 v7.3.961
-+d5177d5ece0c539680390448c8ce8d05a6d61201 v7-3-961
-+0000000000000000000000000000000000000000 v7-3-961
-+0a94ac379769762200c427995551fa4325ec8f28 v7.3.962
-+0a94ac379769762200c427995551fa4325ec8f28 v7-3-962
-+0000000000000000000000000000000000000000 v7-3-962
-+7eafa576528e6921f337da5c1e3e2d0a9617993a v7.3.963
-+7eafa576528e6921f337da5c1e3e2d0a9617993a v7-3-963
-+0000000000000000000000000000000000000000 v7-3-963
-+7d81f4e967285d14c9e9901328d2c66911a9a2f2 v7.3.964
-+7d81f4e967285d14c9e9901328d2c66911a9a2f2 v7-3-964
-+0000000000000000000000000000000000000000 v7-3-964
-+8a3ca4adb5d8046f87aabcf30a2b7aefb8b9d46c v7.3.965
-+8a3ca4adb5d8046f87aabcf30a2b7aefb8b9d46c v7-3-965
-+0000000000000000000000000000000000000000 v7-3-965
-+9b800f0a757fcbedc2c6a1851353c3e5044d39b2 v7.3.966
-+9b800f0a757fcbedc2c6a1851353c3e5044d39b2 v7-3-966
-+0000000000000000000000000000000000000000 v7-3-966
-+20e30e31bd86390590e288516670b81caec6188c v7.3.967
-+20e30e31bd86390590e288516670b81caec6188c v7-3-967
-+0000000000000000000000000000000000000000 v7-3-967
-+dfbe53a54c790d63f8788c13a6a2d18198825605 v7.3.968
-+dfbe53a54c790d63f8788c13a6a2d18198825605 v7-3-968
-+0000000000000000000000000000000000000000 v7-3-968
-+137f9d41f50894cd25e5b47764af817dd84037cd v7.3.969
-+137f9d41f50894cd25e5b47764af817dd84037cd v7-3-969
-+0000000000000000000000000000000000000000 v7-3-969
-+ccecb03e5e8ba41db171a5535047f9a30b5d391d v7.3.970
-+ccecb03e5e8ba41db171a5535047f9a30b5d391d v7-3-970
-+0000000000000000000000000000000000000000 v7-3-970
-+8d6bb2338a583af5eb85589949065cfe46c42bd4 v7.3.971
-+8d6bb2338a583af5eb85589949065cfe46c42bd4 v7-3-971
-+0000000000000000000000000000000000000000 v7-3-971
-+ba53304245f033b6cf2f6088c09f45dc0d98c47c v7.3.972
-+ba53304245f033b6cf2f6088c09f45dc0d98c47c v7-3-972
-+0000000000000000000000000000000000000000 v7-3-972
-+09e1e574a52d38522a35af8741b3f8ce92336398 v7.3.973
-+09e1e574a52d38522a35af8741b3f8ce92336398 v7-3-973
-+0000000000000000000000000000000000000000 v7-3-973
-+92fec4b83be56a65ed81f25885717f6db7639854 v7.3.974
-+92fec4b83be56a65ed81f25885717f6db7639854 v7-3-974
-+0000000000000000000000000000000000000000 v7-3-974
-+44b89b025cdfb6a7371a036ef1b2dd93670b2a15 v7.3.975
-+44b89b025cdfb6a7371a036ef1b2dd93670b2a15 v7-3-975
-+0000000000000000000000000000000000000000 v7-3-975
-+015a8fabf90072ae0eadee5c013f7db00f83977c v7.3.976
-+015a8fabf90072ae0eadee5c013f7db00f83977c v7-3-976
-+0000000000000000000000000000000000000000 v7-3-976
-+21e13403140aec6f32a8f9b49dac02c37945ab11 v7.3.977
-+21e13403140aec6f32a8f9b49dac02c37945ab11 v7-3-977
-+0000000000000000000000000000000000000000 v7-3-977
-+fe8a0a6a1c2a2ca51c92275a9010999106505ed8 v7.3.978
-+fe8a0a6a1c2a2ca51c92275a9010999106505ed8 v7-3-978
-+0000000000000000000000000000000000000000 v7-3-978
-+a63361b9097952faa9c9eba2caebef09b9f8b62b v7.3.979
-+a63361b9097952faa9c9eba2caebef09b9f8b62b v7-3-979
-+0000000000000000000000000000000000000000 v7-3-979
-+c83656c9745a005df1aa7d6985787048a1884734 v7.3.980
-+c83656c9745a005df1aa7d6985787048a1884734 v7-3-980
-+0000000000000000000000000000000000000000 v7-3-980
-+4ff8fa416a0dd64046e0471933d09f7f19a4ea0f v7.3.981
-+4ff8fa416a0dd64046e0471933d09f7f19a4ea0f v7-3-981
-+0000000000000000000000000000000000000000 v7-3-981
-+dde1cf311be6edf32243f03fd8436bdf9798de93 v7.3.982
-+dde1cf311be6edf32243f03fd8436bdf9798de93 v7-3-982
-+0000000000000000000000000000000000000000 v7-3-982
-+ab5154170c3dfc0dd769243e1da53a865e1f69d7 v7.3.983
-+ab5154170c3dfc0dd769243e1da53a865e1f69d7 v7-3-983
-+0000000000000000000000000000000000000000 v7-3-983
-+94c5441984cc47971ac49435d184c13cd6d3014b v7.3.984
-+94c5441984cc47971ac49435d184c13cd6d3014b v7-3-984
-+0000000000000000000000000000000000000000 v7-3-984
-+0c940b6f282836186f428d201760c6f6b9b52fc6 v7.3.985
-+0c940b6f282836186f428d201760c6f6b9b52fc6 v7-3-985
-+0000000000000000000000000000000000000000 v7-3-985
-+3cc2dca142a0aed29befbe6d2944ed580d728545 v7.3.986
-+3cc2dca142a0aed29befbe6d2944ed580d728545 v7-3-986
-+0000000000000000000000000000000000000000 v7-3-986
-+032c9f916f257ed59f7c55a6c8113791d3def365 v7.3.987
-+032c9f916f257ed59f7c55a6c8113791d3def365 v7-3-987
-+0000000000000000000000000000000000000000 v7-3-987
-+035fb0d5e7ce67eaff19a6cadb37b57c0c25a36b v7.3.988
-+035fb0d5e7ce67eaff19a6cadb37b57c0c25a36b v7-3-988
-+0000000000000000000000000000000000000000 v7-3-988
-+cd005ab15ef3fce8f551c81ea10c93889f42d09d v7.3.989
-+cd005ab15ef3fce8f551c81ea10c93889f42d09d v7-3-989
-+0000000000000000000000000000000000000000 v7-3-989
-+9a1d78f828261181232734378f73d648148a42bc v7.3.990
-+9a1d78f828261181232734378f73d648148a42bc v7-3-990
-+0000000000000000000000000000000000000000 v7-3-990
-+8fe768bc1234fc817db3cda61ae9e9dabf4ae958 v7.3.991
-+8fe768bc1234fc817db3cda61ae9e9dabf4ae958 v7-3-991
-+0000000000000000000000000000000000000000 v7-3-991
-+89ea7593fc0cb9ec66cc04619217447715289a78 v7.3.992
-+89ea7593fc0cb9ec66cc04619217447715289a78 v7-3-992
-+0000000000000000000000000000000000000000 v7-3-992
-+dff1542e64f95a3fe10ea24f4007206d53880087 v7.3.993
-+dff1542e64f95a3fe10ea24f4007206d53880087 v7-3-993
-+0000000000000000000000000000000000000000 v7-3-993
-+f74611bfb1b77eb2ad42b6d74b3e3657cf3f0725 v7.3.994
-+f74611bfb1b77eb2ad42b6d74b3e3657cf3f0725 v7-3-994
-+0000000000000000000000000000000000000000 v7-3-994
-+6d517f6e5f0b031cdb386878d8d428f7f2cfc2a1 v7.3.995
-+6d517f6e5f0b031cdb386878d8d428f7f2cfc2a1 v7-3-995
-+0000000000000000000000000000000000000000 v7-3-995
-+ebd94eabfd8013a605d8efc7df64a970531fd5a8 v7.3.996
-+ebd94eabfd8013a605d8efc7df64a970531fd5a8 v7-3-996
-+0000000000000000000000000000000000000000 v7-3-996
-+ef02f32d8e53a7b3d7327ac79359a18070e4a101 v7.3.997
-+ef02f32d8e53a7b3d7327ac79359a18070e4a101 v7-3-997
-+0000000000000000000000000000000000000000 v7-3-997
-+47e6dec5ce3cbc8e833480b8300132d4bf5f035e v7.3.998
-+47e6dec5ce3cbc8e833480b8300132d4bf5f035e v7-3-998
-+0000000000000000000000000000000000000000 v7-3-998
-+e6e60d9da892296ad770b26a22f98bb72c4e1b7d v7.3.999
-+e6e60d9da892296ad770b26a22f98bb72c4e1b7d v7-3-999
-+0000000000000000000000000000000000000000 v7-3-999
-+d037b9cbdaaa0af2b383c93acd0fd87e8eb2b8f1 v7.3.1000
-+d037b9cbdaaa0af2b383c93acd0fd87e8eb2b8f1 v7-3-1000
-+0000000000000000000000000000000000000000 v7-3-1000
-+9dbbddb2ed10936c20048ad28a2dcb9fdb6cdd79 v7.3.1001
-+9dbbddb2ed10936c20048ad28a2dcb9fdb6cdd79 v7-3-1001
-+0000000000000000000000000000000000000000 v7-3-1001
-+b498224f5b417bc436c9b967978628703191c0d9 v7.3.1002
-+b498224f5b417bc436c9b967978628703191c0d9 v7-3-1002
-+0000000000000000000000000000000000000000 v7-3-1002
-+ce94a870b59bbaad92399eb782edc33a855e0b93 v7.3.1003
-+ce94a870b59bbaad92399eb782edc33a855e0b93 v7-3-1003
-+0000000000000000000000000000000000000000 v7-3-1003
-+cadb57fbb78165c81fe4718a355b5f73c641bb62 v7.3.1004
-+cadb57fbb78165c81fe4718a355b5f73c641bb62 v7-3-1004
-+0000000000000000000000000000000000000000 v7-3-1004
-+90e9917d4114461c5f7258c04e61de1dff2e1a74 v7.3.1005
-+90e9917d4114461c5f7258c04e61de1dff2e1a74 v7-3-1005
-+0000000000000000000000000000000000000000 v7-3-1005
-+9a2183bd829502597d52f22a1c27fec8399298fd v7.3.1006
-+9a2183bd829502597d52f22a1c27fec8399298fd v7-3-1006
-+0000000000000000000000000000000000000000 v7-3-1006
-+fba9c0f86f77942d47a5505b065e01a733e7f111 v7.3.1007
-+fba9c0f86f77942d47a5505b065e01a733e7f111 v7-3-1007
-+0000000000000000000000000000000000000000 v7-3-1007
-+8cb14f59a3275cb183f031e2aa1e29e230635d6f v7.3.1008
-+8cb14f59a3275cb183f031e2aa1e29e230635d6f v7-3-1008
-+0000000000000000000000000000000000000000 v7-3-1008
-+57393dc4b811a1283a77c759a09bc52ba78acb8d v7.3.1009
-+57393dc4b811a1283a77c759a09bc52ba78acb8d v7-3-1009
-+0000000000000000000000000000000000000000 v7-3-1009
-+36ddcf4cecbc96b9854af6956f371dea205a6890 v7.3.1010
-+36ddcf4cecbc96b9854af6956f371dea205a6890 v7-3-1010
-+0000000000000000000000000000000000000000 v7-3-1010
-+55bcaa1d2749f9dc22187bea848b002220cfe960 v7.3.1011
-+55bcaa1d2749f9dc22187bea848b002220cfe960 v7-3-1011
-+0000000000000000000000000000000000000000 v7-3-1011
-+432a6b8c7d933dee8faf25a342e857fa0a538eea v7.3.1012
-+432a6b8c7d933dee8faf25a342e857fa0a538eea v7-3-1012
-+0000000000000000000000000000000000000000 v7-3-1012
-+1be43c095affe8e945751a5cb4e21210f31c02ab v7.3.1013
-+1be43c095affe8e945751a5cb4e21210f31c02ab v7-3-1013
-+0000000000000000000000000000000000000000 v7-3-1013
-+6a2005efa02b4ae30fa4867db1463fd4a3689843 v7.3.1014
-+6a2005efa02b4ae30fa4867db1463fd4a3689843 v7-3-1014
-+0000000000000000000000000000000000000000 v7-3-1014
-+45f97c34953728cfe859cfe5212c241fab1da20f v7.3.1015
-+45f97c34953728cfe859cfe5212c241fab1da20f v7-3-1015
-+0000000000000000000000000000000000000000 v7-3-1015
-+5cc98a5898cf9ff0841c78acfe1056ae075a217a v7.3.1016
-+5cc98a5898cf9ff0841c78acfe1056ae075a217a v7-3-1016
-+0000000000000000000000000000000000000000 v7-3-1016
-+532c2e850256cced37b8864ee7042ef8240f135a v7.3.1017
-+532c2e850256cced37b8864ee7042ef8240f135a v7-3-1017
-+0000000000000000000000000000000000000000 v7-3-1017
-+80170d61a85cc03d66228c16c80cd8a4898a971e v7.3.1018
-+80170d61a85cc03d66228c16c80cd8a4898a971e v7-3-1018
-+0000000000000000000000000000000000000000 v7-3-1018
-+08ac4698095359c3a888b34074548435e9775973 v7.3.1019
-+08ac4698095359c3a888b34074548435e9775973 v7-3-1019
-+0000000000000000000000000000000000000000 v7-3-1019
-+f7944ce459ac77416617e0b2f8a91a9c8cb385b6 v7.3.1020
-+f7944ce459ac77416617e0b2f8a91a9c8cb385b6 v7-3-1020
-+0000000000000000000000000000000000000000 v7-3-1020
-+fc997f05cbc7b566df765c79452a541afaadccb8 v7.3.1021
-+fc997f05cbc7b566df765c79452a541afaadccb8 v7-3-1021
-+0000000000000000000000000000000000000000 v7-3-1021
-+849180347ac359fd52b92d70b545800126178eab v7.3.1022
-+849180347ac359fd52b92d70b545800126178eab v7-3-1022
-+0000000000000000000000000000000000000000 v7-3-1022
-+f0c37f5cf4eabb04044ccab4031cc4056c5a47a2 v7.3.1023
-+f0c37f5cf4eabb04044ccab4031cc4056c5a47a2 v7-3-1023
-+0000000000000000000000000000000000000000 v7-3-1023
-+7b835b2969af137f979b633977d59e13cc0960df v7.3.1024
-+7b835b2969af137f979b633977d59e13cc0960df v7-3-1024
-+0000000000000000000000000000000000000000 v7-3-1024
-+b2946c06d1b6d4e9d38fad1d4281e2d4db3523f3 v7.3.1025
-+b2946c06d1b6d4e9d38fad1d4281e2d4db3523f3 v7-3-1025
-+0000000000000000000000000000000000000000 v7-3-1025
-+888c12c899e552deb33b2e1e8ea3c8141352c3ce v7.3.1026
-+888c12c899e552deb33b2e1e8ea3c8141352c3ce v7-3-1026
-+0000000000000000000000000000000000000000 v7-3-1026
-+04086e29756318d7a7cfe3d35fd38ccf550ac366 v7.3.1027
-+04086e29756318d7a7cfe3d35fd38ccf550ac366 v7-3-1027
-+0000000000000000000000000000000000000000 v7-3-1027
-+4d81fdda8f35cf764744161118aeaec948b9fc90 v7.3.1028
-+4d81fdda8f35cf764744161118aeaec948b9fc90 v7-3-1028
-+0000000000000000000000000000000000000000 v7-3-1028
-+e7016af0cbf92a5562c01e95f2cec306b6465783 v7.3.1029
-+e7016af0cbf92a5562c01e95f2cec306b6465783 v7-3-1029
-+0000000000000000000000000000000000000000 v7-3-1029
-+d1f3c77159f9b69f229ee0f70fd98464b2546920 v7.3.1030
-+d1f3c77159f9b69f229ee0f70fd98464b2546920 v7-3-1030
-+0000000000000000000000000000000000000000 v7-3-1030
-+96c1a785009768720fcb16add8b9daf1290ce56d v7.3.1031
-+96c1a785009768720fcb16add8b9daf1290ce56d v7-3-1031
-+0000000000000000000000000000000000000000 v7-3-1031
-+f262fb02889d46743226a78363250e2e1ed7426b v7.3.1032
-+f262fb02889d46743226a78363250e2e1ed7426b v7-3-1032
-+0000000000000000000000000000000000000000 v7-3-1032
-+b2a8e3a66f8cc73c3942ef5cb9c0519df86203cd v7.3.1033
-+b2a8e3a66f8cc73c3942ef5cb9c0519df86203cd v7-3-1033
-+0000000000000000000000000000000000000000 v7-3-1033
-+37e444aeb33b2adf359f8736807f18ff5dc11019 v7.3.1034
-+37e444aeb33b2adf359f8736807f18ff5dc11019 v7-3-1034
-+0000000000000000000000000000000000000000 v7-3-1034
-+626e9ccb7c48b3fa7ff6d2ca5efe91bff39135dc v7.3.1035
-+626e9ccb7c48b3fa7ff6d2ca5efe91bff39135dc v7-3-1035
-+0000000000000000000000000000000000000000 v7-3-1035
-+b22bff1a6af81dd78f8e9ff0bcded471ab858245 v7.3.1036
-+b22bff1a6af81dd78f8e9ff0bcded471ab858245 v7-3-1036
-+0000000000000000000000000000000000000000 v7-3-1036
-+7a2be4a39423e4763ca164dc77fcfd4b27f91a8e v7.3.1037
-+7a2be4a39423e4763ca164dc77fcfd4b27f91a8e v7-3-1037
-+0000000000000000000000000000000000000000 v7-3-1037
-+6a73ac422c67d7ad4642ae9194cf9d4c832021d2 v7.3.1038
-+6a73ac422c67d7ad4642ae9194cf9d4c832021d2 v7-3-1038
-+0000000000000000000000000000000000000000 v7-3-1038
-+321cfbef943199e8e967f6354877ca8fc07e4551 v7.3.1039
-+321cfbef943199e8e967f6354877ca8fc07e4551 v7-3-1039
-+0000000000000000000000000000000000000000 v7-3-1039
-+b9f87487d93597f69f09ecab8cdca11bef6c09d0 v7.3.1040
-+b9f87487d93597f69f09ecab8cdca11bef6c09d0 v7-3-1040
-+0000000000000000000000000000000000000000 v7-3-1040
-+63c9b681c3dba1cfcd2df48085de2453c43855af v7.3.1041
-+63c9b681c3dba1cfcd2df48085de2453c43855af v7-3-1041
-+0000000000000000000000000000000000000000 v7-3-1041
-+fa39483a1363d533f9c7897d476bf0ebd1b8f44b v7.3.1042
-+fa39483a1363d533f9c7897d476bf0ebd1b8f44b v7-3-1042
-+0000000000000000000000000000000000000000 v7-3-1042
-+1e8952a5a726ddc1458ff40270cd5da16be3f272 v7.3.1043
-+1e8952a5a726ddc1458ff40270cd5da16be3f272 v7-3-1043
-+0000000000000000000000000000000000000000 v7-3-1043
-+0cf552b325b55d417079ad28dff4e27afec5a2ca v7.3.1044
-+0cf552b325b55d417079ad28dff4e27afec5a2ca v7-3-1044
-+0000000000000000000000000000000000000000 v7-3-1044
-+29b2be2bba0d369fef85af7aa3196f8b84cce35c v7.3.1045
-+29b2be2bba0d369fef85af7aa3196f8b84cce35c v7-3-1045
-+0000000000000000000000000000000000000000 v7-3-1045
-+00eecb2f8e3e9664ff00682d278a2b1e19cc4b09 v7.3.1046
-+00eecb2f8e3e9664ff00682d278a2b1e19cc4b09 v7-3-1046
-+0000000000000000000000000000000000000000 v7-3-1046
-+89bec74fd7936cc425b42f9e882f1f3864b1c95d v7.3.1047
-+89bec74fd7936cc425b42f9e882f1f3864b1c95d v7-3-1047
-+0000000000000000000000000000000000000000 v7-3-1047
-+19d406a8509d9755b05af7d5ea521925b01f0d76 v7.3.1048
-+19d406a8509d9755b05af7d5ea521925b01f0d76 v7-3-1048
-+0000000000000000000000000000000000000000 v7-3-1048
-+074491a83571596acb6aac6d371140e8f99fbc24 v7.3.1049
-+074491a83571596acb6aac6d371140e8f99fbc24 v7-3-1049
-+0000000000000000000000000000000000000000 v7-3-1049
-+38276cfe40b2069f94b159cc14b4ade47257c836 v7.3.1050
-+38276cfe40b2069f94b159cc14b4ade47257c836 v7-3-1050
-+0000000000000000000000000000000000000000 v7-3-1050
-+70600448f9e7f3bff3b8b0c2f2733662bac08ea8 v7.3.1051
-+70600448f9e7f3bff3b8b0c2f2733662bac08ea8 v7-3-1051
-+0000000000000000000000000000000000000000 v7-3-1051
-+12421d8a45d5597828b8343c31faa79f77d9c512 v7.3.1052
-+12421d8a45d5597828b8343c31faa79f77d9c512 v7-3-1052
-+0000000000000000000000000000000000000000 v7-3-1052
-+49f0fcd9762ce5057e4ac22417105b3ce43a35f3 v7.3.1053
-+49f0fcd9762ce5057e4ac22417105b3ce43a35f3 v7-3-1053
-+0000000000000000000000000000000000000000 v7-3-1053
-+219b2fcad60d27febcaf7251a91be331484b2c98 v7.3.1054
-+219b2fcad60d27febcaf7251a91be331484b2c98 v7-3-1054
-+0000000000000000000000000000000000000000 v7-3-1054
-+5679b8ddd8cc0eb004cbb61babb336c3af398c92 v7.3.1055
-+5679b8ddd8cc0eb004cbb61babb336c3af398c92 v7-3-1055
-+0000000000000000000000000000000000000000 v7-3-1055
-+21a99611149b0f1c200e001ec26b8b07c6e28c45 v7.3.1056
-+21a99611149b0f1c200e001ec26b8b07c6e28c45 v7-3-1056
-+0000000000000000000000000000000000000000 v7-3-1056
-+90beab957ba9ebeac150bc5a56cf6ad90f53336d v7.3.1057
-+90beab957ba9ebeac150bc5a56cf6ad90f53336d v7-3-1057
-+0000000000000000000000000000000000000000 v7-3-1057
-+66e615ce7f61948a2a4a8615d703a42d56763490 v7.3.1058
-+66e615ce7f61948a2a4a8615d703a42d56763490 v7-3-1058
-+0000000000000000000000000000000000000000 v7-3-1058
-+548b889fe3cfbf06ab50de373df5e65f52cb249c v7.3.1059
-+548b889fe3cfbf06ab50de373df5e65f52cb249c v7-3-1059
-+0000000000000000000000000000000000000000 v7-3-1059
-+cb5c1e37ad4d4811e5fe178f14c523b178da81ec v7.3.1060
-+cb5c1e37ad4d4811e5fe178f14c523b178da81ec v7-3-1060
-+0000000000000000000000000000000000000000 v7-3-1060
-+18ba89e06fab93e8cdf7ca8dfbb34b66ff9d61d1 v7.3.1061
-+18ba89e06fab93e8cdf7ca8dfbb34b66ff9d61d1 v7-3-1061
-+0000000000000000000000000000000000000000 v7-3-1061
-+e4e48d4ee0409509d56f7d654b77a35133283bc7 v7.3.1062
-+e4e48d4ee0409509d56f7d654b77a35133283bc7 v7-3-1062
-+0000000000000000000000000000000000000000 v7-3-1062
-+4157fef7b95074cac55977127964adfa883ec030 v7.3.1063
-+4157fef7b95074cac55977127964adfa883ec030 v7-3-1063
-+0000000000000000000000000000000000000000 v7-3-1063
-+3857d399ab41ee8af64c5307c27da64b01e0a233 v7.3.1064
-+3857d399ab41ee8af64c5307c27da64b01e0a233 v7-3-1064
-+0000000000000000000000000000000000000000 v7-3-1064
-+07c534fe9b6cdbfecfd100b7e01f894d6708de1b v7.3.1065
-+07c534fe9b6cdbfecfd100b7e01f894d6708de1b v7-3-1065
-+0000000000000000000000000000000000000000 v7-3-1065
-+4c46e1487c634997f4701d8e68ba9ab019f85227 v7.3.1066
-+4c46e1487c634997f4701d8e68ba9ab019f85227 v7-3-1066
-+0000000000000000000000000000000000000000 v7-3-1066
-+52a4f66ae1f5695426de21877b2954d11ad8a4f4 v7.3.1067
-+52a4f66ae1f5695426de21877b2954d11ad8a4f4 v7-3-1067
-+0000000000000000000000000000000000000000 v7-3-1067
-+59e6c2bd68e38244d2133fc8d76bfc9c7b082d9f v7.3.1068
-+59e6c2bd68e38244d2133fc8d76bfc9c7b082d9f v7-3-1068
-+0000000000000000000000000000000000000000 v7-3-1068
-+6ec3dada4ad3c7e2551191e598cfb6d37bedac36 v7.3.1069
-+6ec3dada4ad3c7e2551191e598cfb6d37bedac36 v7-3-1069
-+0000000000000000000000000000000000000000 v7-3-1069
-+c316a30a889217be4158fba900c85d9d44ad3a1b v7.3.1070
-+c316a30a889217be4158fba900c85d9d44ad3a1b v7-3-1070
-+0000000000000000000000000000000000000000 v7-3-1070
-+857f6c53f1172ed836d44f105f6832973369bef5 v7.3.1071
-+857f6c53f1172ed836d44f105f6832973369bef5 v7-3-1071
-+0000000000000000000000000000000000000000 v7-3-1071
-+9f502d8d5165a79b361ad6048e84c278e1397f88 v7.3.1072
-+9f502d8d5165a79b361ad6048e84c278e1397f88 v7-3-1072
-+0000000000000000000000000000000000000000 v7-3-1072
-+f10f63aaec5c08e6f3b1b3abdef6ce3eef1cff6f v7.3.1073
-+f10f63aaec5c08e6f3b1b3abdef6ce3eef1cff6f v7-3-1073
-+0000000000000000000000000000000000000000 v7-3-1073
-+b943fd24c351141113dba360bd1d1f02b38813f5 v7.3.1074
-+b943fd24c351141113dba360bd1d1f02b38813f5 v7-3-1074
-+0000000000000000000000000000000000000000 v7-3-1074
-+779ca415f8e142ab5ca74f95c8f732d1f00fb7dc v7.3.1075
-+779ca415f8e142ab5ca74f95c8f732d1f00fb7dc v7-3-1075
-+0000000000000000000000000000000000000000 v7-3-1075
-+93b7ed814bec8a9a0b43138be7500b948d48eb92 v7.3.1076
-+93b7ed814bec8a9a0b43138be7500b948d48eb92 v7-3-1076
-+0000000000000000000000000000000000000000 v7-3-1076
-+80b0081824fa3084d0e12f0b21f6e504b4e5e076 v7.3.1077
-+80b0081824fa3084d0e12f0b21f6e504b4e5e076 v7-3-1077
-+0000000000000000000000000000000000000000 v7-3-1077
-+0dce3d812e7acc74c39b3d87d8bb5b3a4dbee878 v7.3.1078
-+0dce3d812e7acc74c39b3d87d8bb5b3a4dbee878 v7-3-1078
-+0000000000000000000000000000000000000000 v7-3-1078
-+bce2051173f01564805158ff669255359953fcad v7.3.1079
-+bce2051173f01564805158ff669255359953fcad v7-3-1079
-+0000000000000000000000000000000000000000 v7-3-1079
-+7a35419393c36edcb710602edba31d5096d357d0 v7.3.1080
-+7a35419393c36edcb710602edba31d5096d357d0 v7-3-1080
-+0000000000000000000000000000000000000000 v7-3-1080
-+9e7ef781d494694a36e056631dbd2c4357ab1090 v7.3.1081
-+9e7ef781d494694a36e056631dbd2c4357ab1090 v7-3-1081
-+0000000000000000000000000000000000000000 v7-3-1081
-+2d15582e132f62aa37e5eea5e837b3824f148dd2 v7.3.1082
-+2d15582e132f62aa37e5eea5e837b3824f148dd2 v7-3-1082
-+0000000000000000000000000000000000000000 v7-3-1082
-+b3c59716e7001ab5127c259c9fd3552de0d36d53 v7.3.1083
-+b3c59716e7001ab5127c259c9fd3552de0d36d53 v7-3-1083
-+0000000000000000000000000000000000000000 v7-3-1083
-+05d57d7c2d5578f1d794151be9cbb5aef89d821e v7.3.1084
-+05d57d7c2d5578f1d794151be9cbb5aef89d821e v7-3-1084
-+0000000000000000000000000000000000000000 v7-3-1084
-+811a4c9b51d808cbd54dd0bab606d7cc1cc2e412 v7.3.1085
-+811a4c9b51d808cbd54dd0bab606d7cc1cc2e412 v7-3-1085
-+0000000000000000000000000000000000000000 v7-3-1085
-+c1622ff9ed8d984604a47ad0805d3fc528452bde v7.3.1086
-+c1622ff9ed8d984604a47ad0805d3fc528452bde v7-3-1086
-+0000000000000000000000000000000000000000 v7-3-1086
-+4d92b873acefb69e112fd73b642bfdf7979f1355 v7.3.1087
-+4d92b873acefb69e112fd73b642bfdf7979f1355 v7-3-1087
-+0000000000000000000000000000000000000000 v7-3-1087
-+2f51ee8825dbeb31713e635fd8d77ef77742ad64 v7.3.1088
-+2f51ee8825dbeb31713e635fd8d77ef77742ad64 v7-3-1088
-+0000000000000000000000000000000000000000 v7-3-1088
-+79522bb1712556183073b148e085d302967d7260 v7.3.1089
-+79522bb1712556183073b148e085d302967d7260 v7-3-1089
-+0000000000000000000000000000000000000000 v7-3-1089
-+8db697ae406a8ceb05f9fb8b45a70980904f230a v7.3.1090
-+8db697ae406a8ceb05f9fb8b45a70980904f230a v7-3-1090
-+0000000000000000000000000000000000000000 v7-3-1090
-+371cc0c44097772ac13e0e3cb59350c6be52257a v7.3.1091
-+371cc0c44097772ac13e0e3cb59350c6be52257a v7-3-1091
-+0000000000000000000000000000000000000000 v7-3-1091
-+9d97a0c045ef5c86652c7fae4d4cd5752bcb42d6 v7.3.1092
-+9d97a0c045ef5c86652c7fae4d4cd5752bcb42d6 v7-3-1092
-+0000000000000000000000000000000000000000 v7-3-1092
-+08fbb1ce1bc56e3884c5d35106df31a9cae1f954 v7.3.1093
-+08fbb1ce1bc56e3884c5d35106df31a9cae1f954 v7-3-1093
-+0000000000000000000000000000000000000000 v7-3-1093
-+efc4fb311d5d45f6320b9d17ed47d24748335bcb v7.3.1094
-+efc4fb311d5d45f6320b9d17ed47d24748335bcb v7-3-1094
-+0000000000000000000000000000000000000000 v7-3-1094
-+ed4e689bbea1c45a8aeb808b526dfd052470ef20 v7.3.1095
-+ed4e689bbea1c45a8aeb808b526dfd052470ef20 v7-3-1095
-+0000000000000000000000000000000000000000 v7-3-1095
-+2db0050523719e39f17f4bd855310bf5688155f5 v7.3.1096
-+2db0050523719e39f17f4bd855310bf5688155f5 v7-3-1096
-+0000000000000000000000000000000000000000 v7-3-1096
-+0c25fa1dfd97721cd4c92f4e7a9a524a24f3f43e v7.3.1097
-+0c25fa1dfd97721cd4c92f4e7a9a524a24f3f43e v7-3-1097
-+0000000000000000000000000000000000000000 v7-3-1097
-+26f2dbea7443f719c854c7a1fc35dbacdd129307 v7.3.1098
-+26f2dbea7443f719c854c7a1fc35dbacdd129307 v7-3-1098
-+0000000000000000000000000000000000000000 v7-3-1098
-+542af01979be709a4763eb8b9cc1cbcfaf584838 v7.3.1099
-+542af01979be709a4763eb8b9cc1cbcfaf584838 v7-3-1099
-+0000000000000000000000000000000000000000 v7-3-1099
-+bf917ee1fad22f643d7ef1a919b233f07fc1fb3c v7.3.1100
-+bf917ee1fad22f643d7ef1a919b233f07fc1fb3c v7-3-1100
-+0000000000000000000000000000000000000000 v7-3-1100
-+761e42cc79c2560af55ebec0ec1060f547e64577 v7.3.1101
-+761e42cc79c2560af55ebec0ec1060f547e64577 v7-3-1101
-+0000000000000000000000000000000000000000 v7-3-1101
-+1c5da99d1b708b7af2928e7bc0d9d57935872958 v7.3.1102
-+1c5da99d1b708b7af2928e7bc0d9d57935872958 v7-3-1102
-+0000000000000000000000000000000000000000 v7-3-1102
-+832bf8136d86dd17489d962cd2d7316d7edf5087 v7.3.1103
-+832bf8136d86dd17489d962cd2d7316d7edf5087 v7-3-1103
-+0000000000000000000000000000000000000000 v7-3-1103
-+fc4d7f02ea3ac731a9717438c72aba098b117e8e v7.3.1104
-+fc4d7f02ea3ac731a9717438c72aba098b117e8e v7-3-1104
-+0000000000000000000000000000000000000000 v7-3-1104
-+a804309e7327f0ece015aace3c855e7987f0ac3d v7.3.1105
-+a804309e7327f0ece015aace3c855e7987f0ac3d v7-3-1105
-+0000000000000000000000000000000000000000 v7-3-1105
-+ec72bb4a0fc2e7f0d517cb12f784770cea9cc19c v7.3.1106
-+ec72bb4a0fc2e7f0d517cb12f784770cea9cc19c v7-3-1106
-+0000000000000000000000000000000000000000 v7-3-1106
-+bd6bef0bd0fbeb79b440e429f5e077169388198c v7.3.1107
-+bd6bef0bd0fbeb79b440e429f5e077169388198c v7-3-1107
-+0000000000000000000000000000000000000000 v7-3-1107
-+3534e9b4fa42b392399d66d08a1dcdd230accba5 v7.3.1108
-+3534e9b4fa42b392399d66d08a1dcdd230accba5 v7-3-1108
-+0000000000000000000000000000000000000000 v7-3-1108
-+450e13fe16211217f32bc57c3827f439540398bf v7.3.1109
-+450e13fe16211217f32bc57c3827f439540398bf v7-3-1109
-+0000000000000000000000000000000000000000 v7-3-1109
-+3849c811cc0bccbe09a559e2be5fec7e810510cc v7.3.1110
-+3849c811cc0bccbe09a559e2be5fec7e810510cc v7-3-1110
-+0000000000000000000000000000000000000000 v7-3-1110
-+43de4ebbe7ad009199987337b864240ba19bfec6 v7.3.1111
-+43de4ebbe7ad009199987337b864240ba19bfec6 v7-3-1111
-+0000000000000000000000000000000000000000 v7-3-1111
-+749e2b2755d59eedd6fd28e7d9ec47523b722be7 v7.3.1112
-+749e2b2755d59eedd6fd28e7d9ec47523b722be7 v7-3-1112
-+0000000000000000000000000000000000000000 v7-3-1112
-+0798b096bab3efde994f0b50d6776ac72ca0f41c v7.3.1113
-+0798b096bab3efde994f0b50d6776ac72ca0f41c v7-3-1113
-+0000000000000000000000000000000000000000 v7-3-1113
-+532c31f9e92fd44526d02d26c503a15c1c1c78c2 v7.3.1114
-+532c31f9e92fd44526d02d26c503a15c1c1c78c2 v7-3-1114
-+0000000000000000000000000000000000000000 v7-3-1114
-+3f2319a953b3c2fc8cbe9ae9225080a5b30a638a v7.3.1115
-+3f2319a953b3c2fc8cbe9ae9225080a5b30a638a v7-3-1115
-+0000000000000000000000000000000000000000 v7-3-1115
-+66a9e8fa6f45ddd8dec5b98c193abc576330e4d4 v7.3.1116
-+66a9e8fa6f45ddd8dec5b98c193abc576330e4d4 v7-3-1116
-+0000000000000000000000000000000000000000 v7-3-1116
-+97560c16ca99a1341f31d88ed9f508d777647b5c v7.3.1117
-+97560c16ca99a1341f31d88ed9f508d777647b5c v7-3-1117
-+0000000000000000000000000000000000000000 v7-3-1117
-+6a706ca7a889d27ecd6b671e31dbe28ab6b66f28 v7.3.1118
-+6a706ca7a889d27ecd6b671e31dbe28ab6b66f28 v7-3-1118
-+0000000000000000000000000000000000000000 v7-3-1118
-+a62695305e031260557ff0cde6eca1db5ab9e3e9 v7.3.1119
-+a62695305e031260557ff0cde6eca1db5ab9e3e9 v7-3-1119
-+0000000000000000000000000000000000000000 v7-3-1119
-+d1376091d18b5a742ada87bf825d20e99ccbef19 v7.3.1120
-+d1376091d18b5a742ada87bf825d20e99ccbef19 v7-3-1120
-+0000000000000000000000000000000000000000 v7-3-1120
-+4b9503f0c7d3d75d772c2c0dbe19616da2480749 v7.3.1121
-+4b9503f0c7d3d75d772c2c0dbe19616da2480749 v7-3-1121
-+0000000000000000000000000000000000000000 v7-3-1121
-+7793e737ec8723a18d4c5468b33a895249ba4f02 v7.3.1122
-+7793e737ec8723a18d4c5468b33a895249ba4f02 v7-3-1122
-+0000000000000000000000000000000000000000 v7-3-1122
-+77ecab3bb2078fe525602172b35c2031c819ade3 v7.3.1123
-+77ecab3bb2078fe525602172b35c2031c819ade3 v7-3-1123
-+0000000000000000000000000000000000000000 v7-3-1123
-+be1e4acb30cab46ab439e45b9b6871a7aff23800 v7.3.1124
-+be1e4acb30cab46ab439e45b9b6871a7aff23800 v7-3-1124
-+0000000000000000000000000000000000000000 v7-3-1124
-+96f3348f9f119a996ae8826ef4d5a06c3f7e677f v7.3.1125
-+96f3348f9f119a996ae8826ef4d5a06c3f7e677f v7-3-1125
-+0000000000000000000000000000000000000000 v7-3-1125
-+b25a1b2e3175902e49a69e8d9ccc5c1cc43fbe3f v7.3.1126
-+b25a1b2e3175902e49a69e8d9ccc5c1cc43fbe3f v7-3-1126
-+0000000000000000000000000000000000000000 v7-3-1126
-+532a9855bd30d28cc14848ce5136658a273bc999 v7.3.1127
-+532a9855bd30d28cc14848ce5136658a273bc999 v7-3-1127
-+0000000000000000000000000000000000000000 v7-3-1127
-+47906f888725760ac704668b71057629e266e486 v7.3.1128
-+47906f888725760ac704668b71057629e266e486 v7-3-1128
-+0000000000000000000000000000000000000000 v7-3-1128
-+f824cb97eb922975cdc1025f3c2c62f1bdbcfdd6 v7.3.1129
-+f824cb97eb922975cdc1025f3c2c62f1bdbcfdd6 v7-3-1129
-+0000000000000000000000000000000000000000 v7-3-1129
-+ec24ff78a79c1851d8003780035d6c55f98dcceb v7.3.1130
-+ec24ff78a79c1851d8003780035d6c55f98dcceb v7-3-1130
-+0000000000000000000000000000000000000000 v7-3-1130
-+82e6588762e4aee5b0f0cd51d5c124ebfec6424d v7.3.1131
-+82e6588762e4aee5b0f0cd51d5c124ebfec6424d v7-3-1131
-+0000000000000000000000000000000000000000 v7-3-1131
-+b20dbf3a5370543ffaa1d6fc337df1969843477e v7.3.1132
-+b20dbf3a5370543ffaa1d6fc337df1969843477e v7-3-1132
-+0000000000000000000000000000000000000000 v7-3-1132
-+03375ccf28a27ed72f6cf347383aaacbd1a51e4d v7.3.1133
-+03375ccf28a27ed72f6cf347383aaacbd1a51e4d v7-3-1133
-+0000000000000000000000000000000000000000 v7-3-1133
-+531e598651fc6a7c28bc808d82c09ddc1759bf4f v7.3.1134
-+531e598651fc6a7c28bc808d82c09ddc1759bf4f v7-3-1134
-+0000000000000000000000000000000000000000 v7-3-1134
-+e4bc21965079eb6948d8e22ad96d145659852707 v7.3.1135
-+e4bc21965079eb6948d8e22ad96d145659852707 v7-3-1135
-+0000000000000000000000000000000000000000 v7-3-1135
-+343d09006056ff408f08850317b8e8caf056f5fe v7.3.1136
-+343d09006056ff408f08850317b8e8caf056f5fe v7-3-1136
-+0000000000000000000000000000000000000000 v7-3-1136
-+c02c7df9bdc91ae08ef626d4a8262fed47285c41 v7.3.1137
-+c02c7df9bdc91ae08ef626d4a8262fed47285c41 v7-3-1137
-+0000000000000000000000000000000000000000 v7-3-1137
-+47222d8b1e94c962f9daf6c2ff3f6c6ddcb71613 v7.3.1138
-+47222d8b1e94c962f9daf6c2ff3f6c6ddcb71613 v7-3-1138
-+0000000000000000000000000000000000000000 v7-3-1138
-+3b5a023a45434e825b8dbeed551cf7f4578243f6 v7.3.1139
-+3b5a023a45434e825b8dbeed551cf7f4578243f6 v7-3-1139
-+0000000000000000000000000000000000000000 v7-3-1139
-+7fde662e1db24077abbe26e6d78c286928f5c9b6 v7.3.1140
-+7fde662e1db24077abbe26e6d78c286928f5c9b6 v7-3-1140
-+0000000000000000000000000000000000000000 v7-3-1140
-+10673b3531ebcc18467d04bb806036cbee1b8e2b v7.3.1141
-+10673b3531ebcc18467d04bb806036cbee1b8e2b v7-3-1141
-+0000000000000000000000000000000000000000 v7-3-1141
-+65cef998f860b3745880622cba74135bfa249ae2 v7.3.1142
-+65cef998f860b3745880622cba74135bfa249ae2 v7-3-1142
-+0000000000000000000000000000000000000000 v7-3-1142
-+66e849c4558aca6c522026882159b41994d0c0c1 v7.3.1143
-+66e849c4558aca6c522026882159b41994d0c0c1 v7-3-1143
-+0000000000000000000000000000000000000000 v7-3-1143
-+8360a59aa04b8668e377a66d1fc46e9e52b35110 v7.3.1144
-+8360a59aa04b8668e377a66d1fc46e9e52b35110 v7-3-1144
-+0000000000000000000000000000000000000000 v7-3-1144
-+a30e3762957d61966152040315d160f860433576 v7.3.1145
-+a30e3762957d61966152040315d160f860433576 v7-3-1145
-+0000000000000000000000000000000000000000 v7-3-1145
-+e3f9e33fb28c367aac7b2270b6fd304fd755b6d4 v7.3.1146
-+e3f9e33fb28c367aac7b2270b6fd304fd755b6d4 v7-3-1146
-+0000000000000000000000000000000000000000 v7-3-1146
-+3cd3cc1e91193a0b45e6aff1373cd4802e595a16 v7.3.1147
-+3cd3cc1e91193a0b45e6aff1373cd4802e595a16 v7-3-1147
-+0000000000000000000000000000000000000000 v7-3-1147
-+220bdea4f57919c290d92b1f6c83a7252cd660b6 v7.3.1148
-+220bdea4f57919c290d92b1f6c83a7252cd660b6 v7-3-1148
-+0000000000000000000000000000000000000000 v7-3-1148
-+66803af09906a828b9f41d7ae0f7a379137eaf99 v7.3.1149
-+66803af09906a828b9f41d7ae0f7a379137eaf99 v7-3-1149
-+0000000000000000000000000000000000000000 v7-3-1149
-+3dbd251777de232c168d87650acda5fec408146c v7.3.1150
-+3dbd251777de232c168d87650acda5fec408146c v7-3-1150
-+0000000000000000000000000000000000000000 v7-3-1150
-+4d7e3df04256790855f7a6dc289f32ffc04da133 v7.3.1151
-+4d7e3df04256790855f7a6dc289f32ffc04da133 v7-3-1151
-+0000000000000000000000000000000000000000 v7-3-1151
-+9909e44879b9f80679fd05af19a423b2673b2301 v7.3.1152
-+9909e44879b9f80679fd05af19a423b2673b2301 v7-3-1152
-+0000000000000000000000000000000000000000 v7-3-1152
-+bc3f4804cf470cec5773d8842743efb760f69102 v7.3.1153
-+bc3f4804cf470cec5773d8842743efb760f69102 v7-3-1153
-+0000000000000000000000000000000000000000 v7-3-1153
-+6419ee8098c80f0418081c73b790b09c61f13c3a v7.3.1154
-+6419ee8098c80f0418081c73b790b09c61f13c3a v7-3-1154
-+0000000000000000000000000000000000000000 v7-3-1154
-+bf1e6326df1104cabc04b8490f9456dbda901fd2 v7.3.1155
-+bf1e6326df1104cabc04b8490f9456dbda901fd2 v7-3-1155
-+0000000000000000000000000000000000000000 v7-3-1155
-+8c4324e6f4779ee316361511ff783f6344750be9 v7.3.1156
-+8c4324e6f4779ee316361511ff783f6344750be9 v7-3-1156
-+0000000000000000000000000000000000000000 v7-3-1156
-+2f1ee97f5f23a5f9e1c572ed4afb50fb79ce7a35 v7.3.1157
-+2f1ee97f5f23a5f9e1c572ed4afb50fb79ce7a35 v7-3-1157
-+0000000000000000000000000000000000000000 v7-3-1157
-+46077370bc605815f5e41cbfc925120a913acbaa v7.3.1158
-+46077370bc605815f5e41cbfc925120a913acbaa v7-3-1158
-+0000000000000000000000000000000000000000 v7-3-1158
-+208a6c04e6b8221c1f5187391d86c5b57e61445b v7.3.1159
-+208a6c04e6b8221c1f5187391d86c5b57e61445b v7-3-1159
-+0000000000000000000000000000000000000000 v7-3-1159
-+60301d4d16827a961019d72a78e811f41326c680 v7.3.1160
-+60301d4d16827a961019d72a78e811f41326c680 v7-3-1160
-+0000000000000000000000000000000000000000 v7-3-1160
-+ff393592644960783e9a1c7c7959a8cbb0954673 v7.3.1161
-+ff393592644960783e9a1c7c7959a8cbb0954673 v7-3-1161
-+0000000000000000000000000000000000000000 v7-3-1161
-+b8eabb6a96871321bec8526fa04ba1ff1a96780e v7.3.1162
-+b8eabb6a96871321bec8526fa04ba1ff1a96780e v7-3-1162
-+0000000000000000000000000000000000000000 v7-3-1162
-+70b1178dec7919120632cdeee6056e38108356a7 v7.3.1163
-+70b1178dec7919120632cdeee6056e38108356a7 v7-3-1163
-+0000000000000000000000000000000000000000 v7-3-1163
-+4db0bf9f1b44d1f0d42a1863732dfaef73c9971d v7.3.1164
-+4db0bf9f1b44d1f0d42a1863732dfaef73c9971d v7-3-1164
-+0000000000000000000000000000000000000000 v7-3-1164
-+05b8436873d48055cbd24f043548092755d77be7 v7.3.1165
-+05b8436873d48055cbd24f043548092755d77be7 v7-3-1165
-+0000000000000000000000000000000000000000 v7-3-1165
-+d59ff2114733a526847ea38d093897f496f73ffc v7.3.1166
-+d59ff2114733a526847ea38d093897f496f73ffc v7-3-1166
-+0000000000000000000000000000000000000000 v7-3-1166
-+81dedcd648216d6b3fc6b967368fef23d8ee1154 v7.3.1167
-+81dedcd648216d6b3fc6b967368fef23d8ee1154 v7-3-1167
-+0000000000000000000000000000000000000000 v7-3-1167
-+ed47632fd1498d50e31ab5b30aac403de3db2496 v7.3.1168
-+ed47632fd1498d50e31ab5b30aac403de3db2496 v7-3-1168
-+0000000000000000000000000000000000000000 v7-3-1168
-+a83fb2bd8c8ea8865f460f7d82d8ebff8202cced v7.3.1169
-+a83fb2bd8c8ea8865f460f7d82d8ebff8202cced v7-3-1169
-+0000000000000000000000000000000000000000 v7-3-1169
-+14c2e63caec65cca0d315e82f90b5e1d84430487 v7.3.1170
-+14c2e63caec65cca0d315e82f90b5e1d84430487 v7-3-1170
-+0000000000000000000000000000000000000000 v7-3-1170
-+fc7f985df53745d157182585b01ee5dadb722a62 v7.3.1171
-+fc7f985df53745d157182585b01ee5dadb722a62 v7-3-1171
-+0000000000000000000000000000000000000000 v7-3-1171
-+96e154e825a7441274a615e7d7fdbe68e5534ee9 v7.3.1172
-+96e154e825a7441274a615e7d7fdbe68e5534ee9 v7-3-1172
-+0000000000000000000000000000000000000000 v7-3-1172
-+b584d361e7461c79728585f16f408984b0234fdd v7.3.1173
-+b584d361e7461c79728585f16f408984b0234fdd v7-3-1173
-+0000000000000000000000000000000000000000 v7-3-1173
-+52850ef928f85755f005267c1f02fe9e9f898c99 v7.3.1174
-+52850ef928f85755f005267c1f02fe9e9f898c99 v7-3-1174
-+0000000000000000000000000000000000000000 v7-3-1174
-+84a8d1ba81c393dcc3a45eb3b20fb6ac5f18df7b v7.3.1175
-+84a8d1ba81c393dcc3a45eb3b20fb6ac5f18df7b v7-3-1175
-+0000000000000000000000000000000000000000 v7-3-1175
-+e48cabe984537b06cfa945926844c4af96799331 v7.3.1176
-+e48cabe984537b06cfa945926844c4af96799331 v7-3-1176
-+0000000000000000000000000000000000000000 v7-3-1176
-+e79a20f07daa91051435208887cc31b245555046 v7.3.1177
-+e79a20f07daa91051435208887cc31b245555046 v7-3-1177
-+0000000000000000000000000000000000000000 v7-3-1177
-+c4d4f0fc12b9b8665d6859680155797be960c36f v7.3.1178
-+c4d4f0fc12b9b8665d6859680155797be960c36f v7-3-1178
-+0000000000000000000000000000000000000000 v7-3-1178
-+d84833983de7708de27774e3f01e7ffc8c03eec6 v7.3.1179
-+d84833983de7708de27774e3f01e7ffc8c03eec6 v7-3-1179
-+0000000000000000000000000000000000000000 v7-3-1179
-+04b8912a9c85e72728a2cd6a4f8e6aee82525b31 v7.3.1180
-+04b8912a9c85e72728a2cd6a4f8e6aee82525b31 v7-3-1180
-+0000000000000000000000000000000000000000 v7-3-1180
-+b7bb20390111b75616eb66558aa9517901eb0144 v7.3.1181
-+b7bb20390111b75616eb66558aa9517901eb0144 v7-3-1181
-+0000000000000000000000000000000000000000 v7-3-1181
-+fa98c2b030ed5ac8d8c8139405d20ad6c611c065 v7.3.1182
-+fa98c2b030ed5ac8d8c8139405d20ad6c611c065 v7-3-1182
-+0000000000000000000000000000000000000000 v7-3-1182
-+044d23a64c177549b4b5e3183642f3a5b286d14f v7.3.1183
-+044d23a64c177549b4b5e3183642f3a5b286d14f v7-3-1183
-+0000000000000000000000000000000000000000 v7-3-1183
-+9e36c6b1ebf4554a24bd879965f348b81ad5ca6a v7.3.1184
-+9e36c6b1ebf4554a24bd879965f348b81ad5ca6a v7-3-1184
-+0000000000000000000000000000000000000000 v7-3-1184
-+6d935f45c489b346f06aef5b1bdd87cb98b8400b v7.3.1185
-+6d935f45c489b346f06aef5b1bdd87cb98b8400b v7-3-1185
-+0000000000000000000000000000000000000000 v7-3-1185
-+7b8991e084f9bea2dde9ceef7a245254d656b6f9 v7.3.1186
-+7b8991e084f9bea2dde9ceef7a245254d656b6f9 v7-3-1186
-+0000000000000000000000000000000000000000 v7-3-1186
-+fefd8d33a7ea43f86d6e5a2ab30440140ada14f6 v7.3.1187
-+fefd8d33a7ea43f86d6e5a2ab30440140ada14f6 v7-3-1187
-+0000000000000000000000000000000000000000 v7-3-1187
-+6f7ed9b799a3db282f0fc076d8232752716a4e00 v7.3.1188
-+6f7ed9b799a3db282f0fc076d8232752716a4e00 v7-3-1188
-+0000000000000000000000000000000000000000 v7-3-1188
-+dc78a26f6f64bb1330b9027559ce0c8fe54ba1de v7.3.1189
-+dc78a26f6f64bb1330b9027559ce0c8fe54ba1de v7-3-1189
-+0000000000000000000000000000000000000000 v7-3-1189
-+25d64a4edc0b0f3f17330a7b12f3c1ca141ccfb3 v7.3.1190
-+25d64a4edc0b0f3f17330a7b12f3c1ca141ccfb3 v7-3-1190
-+0000000000000000000000000000000000000000 v7-3-1190
-+4c42efb4c0982d305ec9ee99bb3bddfaeec2cf87 v7.3.1191
-+4c42efb4c0982d305ec9ee99bb3bddfaeec2cf87 v7-3-1191
-+0000000000000000000000000000000000000000 v7-3-1191
-+07b9c48a30e973833ee70d38633934f6fc2177d8 v7.3.1192
-+07b9c48a30e973833ee70d38633934f6fc2177d8 v7-3-1192
-+0000000000000000000000000000000000000000 v7-3-1192
-+8b46c37c4b843039e5a543be98978e79ff6f3d31 v7.3.1193
-+8b46c37c4b843039e5a543be98978e79ff6f3d31 v7-3-1193
-+0000000000000000000000000000000000000000 v7-3-1193
-+91136a41f83f3716e7ccb4f2402216ea215a4acf v7.3.1194
-+91136a41f83f3716e7ccb4f2402216ea215a4acf v7-3-1194
-+0000000000000000000000000000000000000000 v7-3-1194
-+4837fd61be52d420c69fcde0621cd5ecc298d2b6 v7.3.1195
-+4837fd61be52d420c69fcde0621cd5ecc298d2b6 v7-3-1195
-+0000000000000000000000000000000000000000 v7-3-1195
-+56fbf60e94766a202ee71749eea19a862695c92f v7.3.1196
-+56fbf60e94766a202ee71749eea19a862695c92f v7-3-1196
-+0000000000000000000000000000000000000000 v7-3-1196
-+2fc1f3346bfb3229f35455101a5944e6785a02af v7.3.1197
-+2fc1f3346bfb3229f35455101a5944e6785a02af v7-3-1197
-+0000000000000000000000000000000000000000 v7-3-1197
-+517fa1a34c7cf1c8fb04d43976ad6c381f48cebd v7.3.1198
-+517fa1a34c7cf1c8fb04d43976ad6c381f48cebd v7-3-1198
-+0000000000000000000000000000000000000000 v7-3-1198
-+be2973afe77045bd749c63c46ea02f61efa55862 v7.3.1199
-+be2973afe77045bd749c63c46ea02f61efa55862 v7-3-1199
-+0000000000000000000000000000000000000000 v7-3-1199
-+2945fe016b936c9e3a89db48692495c83f1843a1 v7.3.1200
-+2945fe016b936c9e3a89db48692495c83f1843a1 v7-3-1200
-+0000000000000000000000000000000000000000 v7-3-1200
-+d8f65e6238fa2bac706f1a4868e8d38ad71ded64 v7.3.1201
-+d8f65e6238fa2bac706f1a4868e8d38ad71ded64 v7-3-1201
-+0000000000000000000000000000000000000000 v7-3-1201
-+1707ddb6f5aed99b69fff8a66dc3eb8ab40d7f46 v7.3.1202
-+1707ddb6f5aed99b69fff8a66dc3eb8ab40d7f46 v7-3-1202
-+0000000000000000000000000000000000000000 v7-3-1202
-+ba328b4a990ee460cc907ec59aabee8d872b7768 v7.3.1203
-+ba328b4a990ee460cc907ec59aabee8d872b7768 v7-3-1203
-+0000000000000000000000000000000000000000 v7-3-1203
-+0792cc5133ce1f37ad9e1d49804100b28d0a391b v7.3.1204
-+0792cc5133ce1f37ad9e1d49804100b28d0a391b v7-3-1204
-+0000000000000000000000000000000000000000 v7-3-1204
-+d02448031708fca0df590f46f850e33acc9f9651 v7.3.1205
-+d02448031708fca0df590f46f850e33acc9f9651 v7-3-1205
-+0000000000000000000000000000000000000000 v7-3-1205
-+8dd2769ab75c07d88feb49d1dd489a1282854217 v7.3.1206
-+8dd2769ab75c07d88feb49d1dd489a1282854217 v7-3-1206
-+0000000000000000000000000000000000000000 v7-3-1206
-+6ae32a64e153d7275058d965e0c1c12d106bc7de v7.3.1207
-+6ae32a64e153d7275058d965e0c1c12d106bc7de v7-3-1207
-+0000000000000000000000000000000000000000 v7-3-1207
-+784e342ddcaeb260ffaab5f0dd30ec5db832842e v7.3.1208
-+784e342ddcaeb260ffaab5f0dd30ec5db832842e v7-3-1208
-+0000000000000000000000000000000000000000 v7-3-1208
-+afb00cc8caacb8969705ffae0316bb9c01156e7f v7.3.1209
-+afb00cc8caacb8969705ffae0316bb9c01156e7f v7-3-1209
-+0000000000000000000000000000000000000000 v7-3-1209
-+7155782d94fb88e47e252b159dd677c31a3f14e8 v7.3.1210
-+7155782d94fb88e47e252b159dd677c31a3f14e8 v7-3-1210
-+0000000000000000000000000000000000000000 v7-3-1210
-+1cf02fbe6281c8efe63f866470b6c44d5835125c v7.3.1211
-+1cf02fbe6281c8efe63f866470b6c44d5835125c v7-3-1211
-+0000000000000000000000000000000000000000 v7-3-1211
-+81e623ff2e554695c372b7b06bd826c6298bb8b5 v7.3.1212
-+81e623ff2e554695c372b7b06bd826c6298bb8b5 v7-3-1212
-+0000000000000000000000000000000000000000 v7-3-1212
-+ae05437a744a3b6f87d6f3304a19e5256849bb1c v7.3.1213
-+ae05437a744a3b6f87d6f3304a19e5256849bb1c v7-3-1213
-+0000000000000000000000000000000000000000 v7-3-1213
-+bcb84438bb5bf27101b25ffb2c2267ab6ff0e946 v7.3.1214
-+bcb84438bb5bf27101b25ffb2c2267ab6ff0e946 v7-3-1214
-+0000000000000000000000000000000000000000 v7-3-1214
-+8bbd0ff486b3cfa711e0a7f305b4a0241bd5dd52 v7.3.1215
-+8bbd0ff486b3cfa711e0a7f305b4a0241bd5dd52 v7-3-1215
-+0000000000000000000000000000000000000000 v7-3-1215
-+b89aa3374b7fe64968421f4e20cf22cd3e95713b v7.3.1216
-+b89aa3374b7fe64968421f4e20cf22cd3e95713b v7-3-1216
-+0000000000000000000000000000000000000000 v7-3-1216
-+613651492c1905f62cbbcbfc616d7935234badab v7.3.1217
-+613651492c1905f62cbbcbfc616d7935234badab v7-3-1217
-+0000000000000000000000000000000000000000 v7-3-1217
-+d10ede931224a9818a98a58bd9382f77728ced1b v7.3.1218
-+d10ede931224a9818a98a58bd9382f77728ced1b v7-3-1218
-+0000000000000000000000000000000000000000 v7-3-1218
-+eb5c3508cd7da14f8d3337ca4dfabe4122ded20c v7.3.1219
-+eb5c3508cd7da14f8d3337ca4dfabe4122ded20c v7-3-1219
-+0000000000000000000000000000000000000000 v7-3-1219
-+ba7db05e1482457a36b19ed608f820275fafb9f7 v7.3.1220
-+ba7db05e1482457a36b19ed608f820275fafb9f7 v7-3-1220
-+0000000000000000000000000000000000000000 v7-3-1220
-+9f7b92f232d31450fd04ecec3e89b027c0f28b02 v7.3.1221
-+9f7b92f232d31450fd04ecec3e89b027c0f28b02 v7-3-1221
-+0000000000000000000000000000000000000000 v7-3-1221
-+07831d280e90a87ab9f42a9c96775ef2bc0cdedf v7.3.1222
-+07831d280e90a87ab9f42a9c96775ef2bc0cdedf v7-3-1222
-+0000000000000000000000000000000000000000 v7-3-1222
-+5cd32322154c1c5970194eb5300eec2ddb8ccc30 v7.3.1223
-+5cd32322154c1c5970194eb5300eec2ddb8ccc30 v7-3-1223
-+0000000000000000000000000000000000000000 v7-3-1223
-+0a379dea13c97df4ec2ba1487dd50c1e8ba0c912 v7.3.1224
-+0a379dea13c97df4ec2ba1487dd50c1e8ba0c912 v7-3-1224
-+0000000000000000000000000000000000000000 v7-3-1224
-+27b008d5b7ac5fab02c6934b87f258bc4715aed6 v7.3.1225
-+27b008d5b7ac5fab02c6934b87f258bc4715aed6 v7-3-1225
-+0000000000000000000000000000000000000000 v7-3-1225
-+b34d719b13cd9dd44485600e5cd939814b9b065f v7.3.1226
-+b34d719b13cd9dd44485600e5cd939814b9b065f v7-3-1226
-+0000000000000000000000000000000000000000 v7-3-1226
-+5cee875f30961cf1adadf386b7e2764ea8aeeb64 v7.3.1227
-+5cee875f30961cf1adadf386b7e2764ea8aeeb64 v7-3-1227
-+0000000000000000000000000000000000000000 v7-3-1227
-+620d9b59d4ed9deaac614c707c71257907b1dd21 v7.3.1228
-+620d9b59d4ed9deaac614c707c71257907b1dd21 v7-3-1228
-+0000000000000000000000000000000000000000 v7-3-1228
-+b6e693e1f9461e5020e4cafa1c6e1de24776e11b v7.3.1229
-+b6e693e1f9461e5020e4cafa1c6e1de24776e11b v7-3-1229
-+0000000000000000000000000000000000000000 v7-3-1229
-+f5c822e5a0eba6f490d0be9f6892de929295be87 v7.3.1230
-+f5c822e5a0eba6f490d0be9f6892de929295be87 v7-3-1230
-+0000000000000000000000000000000000000000 v7-3-1230
-+537bbfff0c5c0bc2307a85133f59f07b00c55e41 v7.3.1231
-+537bbfff0c5c0bc2307a85133f59f07b00c55e41 v7-3-1231
-+0000000000000000000000000000000000000000 v7-3-1231
-+a594ce86b5eade96cb84415b3b027abe611c2238 v7.3.1232
-+a594ce86b5eade96cb84415b3b027abe611c2238 v7-3-1232
-+0000000000000000000000000000000000000000 v7-3-1232
-+4ed713442c51625160cd0bca612d9a3417e4ba14 v7.3.1233
-+4ed713442c51625160cd0bca612d9a3417e4ba14 v7-3-1233
-+0000000000000000000000000000000000000000 v7-3-1233
-+f4969f8f66e974584e8e7815d0a262c5dca79638 v7.3.1234
-+f4969f8f66e974584e8e7815d0a262c5dca79638 v7-3-1234
-+0000000000000000000000000000000000000000 v7-3-1234
-+9ae0fe46777674504e0f372e68cfb8e0be81b2ee v7.3.1235
-+9ae0fe46777674504e0f372e68cfb8e0be81b2ee v7-3-1235
-+0000000000000000000000000000000000000000 v7-3-1235
-+39980afcf54aafdb9255424adf5808af45ab2242 v7.3.1236
-+39980afcf54aafdb9255424adf5808af45ab2242 v7-3-1236
-+0000000000000000000000000000000000000000 v7-3-1236
-+5b2c8f3b390632e1e57a3839f040146f6798a969 v7.3.1237
-+5b2c8f3b390632e1e57a3839f040146f6798a969 v7-3-1237
-+0000000000000000000000000000000000000000 v7-3-1237
-+048c69ebe8eecb218320030d9ea41fe4f6290848 v7.3.1238
-+048c69ebe8eecb218320030d9ea41fe4f6290848 v7-3-1238
-+0000000000000000000000000000000000000000 v7-3-1238
-+e130cc3d17af412971143b8420d6e7b1cbd13ff2 v7.3.1239
-+e130cc3d17af412971143b8420d6e7b1cbd13ff2 v7-3-1239
-+0000000000000000000000000000000000000000 v7-3-1239
-+bc9125136c69a4feecb4b68912fa04380f42b77f v7.3.1240
-+bc9125136c69a4feecb4b68912fa04380f42b77f v7-3-1240
-+0000000000000000000000000000000000000000 v7-3-1240
-+c8747604696795a300f6ff05091813d691f9a488 v7.3.1241
-+c8747604696795a300f6ff05091813d691f9a488 v7-3-1241
-+0000000000000000000000000000000000000000 v7-3-1241
-+b4a2eaf28b51327b4e56b4eacf4b5d72a52560f6 v7.3.1242
-+b4a2eaf28b51327b4e56b4eacf4b5d72a52560f6 v7-3-1242
-+0000000000000000000000000000000000000000 v7-3-1242
-+8a7d3a73adabaad5e9fe079acf6431982145c7d1 v7.3.1243
-+8a7d3a73adabaad5e9fe079acf6431982145c7d1 v7-3-1243
-+0000000000000000000000000000000000000000 v7-3-1243
-+b4a71dbdb78790ca423103ad5deb71b1df9b5b04 v7.3.1244
-+b4a71dbdb78790ca423103ad5deb71b1df9b5b04 v7-3-1244
-+0000000000000000000000000000000000000000 v7-3-1244
-+43329b2b5b79ed2e1017869ee2e0b1caeaf2f0f6 v7.3.1245
-+43329b2b5b79ed2e1017869ee2e0b1caeaf2f0f6 v7-3-1245
-+0000000000000000000000000000000000000000 v7-3-1245
-+a1b41dabc682ed8f8770a12c2d3a227eb348885b v7.3.1246
-+a1b41dabc682ed8f8770a12c2d3a227eb348885b v7-3-1246
-+0000000000000000000000000000000000000000 v7-3-1246
-+f451d60ab8ec56d02a7b5f2d5c16187566279886 v7.3.1247
-+f451d60ab8ec56d02a7b5f2d5c16187566279886 v7-3-1247
-+0000000000000000000000000000000000000000 v7-3-1247
-+3717d569027d8ec8b62e42e33f91333ac22ce6ba v7.3.1248
-+3717d569027d8ec8b62e42e33f91333ac22ce6ba v7-3-1248
-+0000000000000000000000000000000000000000 v7-3-1248
-+b614332f7df2f6f471bb4bd93767becd7844b90c v7.3.1249
-+b614332f7df2f6f471bb4bd93767becd7844b90c v7-3-1249
-+0000000000000000000000000000000000000000 v7-3-1249
-+6aecf486bb347ac6885afe36d62ddbbf2457f898 v7.3.1250
-+6aecf486bb347ac6885afe36d62ddbbf2457f898 v7-3-1250
-+0000000000000000000000000000000000000000 v7-3-1250
-+788f4802967766b7f3d6dce83cc027baef422f4a v7.3.1251
-+788f4802967766b7f3d6dce83cc027baef422f4a v7-3-1251
-+0000000000000000000000000000000000000000 v7-3-1251
-+875a0aeb301c3fb2be8a79f2d82e324d80caf4f3 v7.3.1252
-+875a0aeb301c3fb2be8a79f2d82e324d80caf4f3 v7-3-1252
-+0000000000000000000000000000000000000000 v7-3-1252
-+d6a7dea44a8667d834e463b8658cf85ea938112d v7.3.1253
-+d6a7dea44a8667d834e463b8658cf85ea938112d v7-3-1253
-+0000000000000000000000000000000000000000 v7-3-1253
-+5eff37e92f03771aee77a3688d79a73e5b6107e9 v7.3.1254
-+5eff37e92f03771aee77a3688d79a73e5b6107e9 v7-3-1254
-+0000000000000000000000000000000000000000 v7-3-1254
-+f8d307ebd74a4097f7083ea8117be0433f00c7ce v7.3.1255
-+f8d307ebd74a4097f7083ea8117be0433f00c7ce v7-3-1255
-+0000000000000000000000000000000000000000 v7-3-1255
-+322441058afca6a8aa52d34eda9fa307608354d3 v7.3.1256
-+322441058afca6a8aa52d34eda9fa307608354d3 v7-3-1256
-+0000000000000000000000000000000000000000 v7-3-1256
-+5751284311f37399cb7a66d99fe317de4ae86ea9 v7.3.1257
-+5751284311f37399cb7a66d99fe317de4ae86ea9 v7-3-1257
-+0000000000000000000000000000000000000000 v7-3-1257
-+c9e2ccc53f2e119e247da7fc9111b6b9c9385d93 v7.3.1258
-+c9e2ccc53f2e119e247da7fc9111b6b9c9385d93 v7-3-1258
-+0000000000000000000000000000000000000000 v7-3-1258
-+7ab94cb688bebd694109442be4dd6edb6ebe3c85 v7.3.1259
-+7ab94cb688bebd694109442be4dd6edb6ebe3c85 v7-3-1259
-+0000000000000000000000000000000000000000 v7-3-1259
-+7aa4e0822dec0840770d9f41052a772a887cd213 v7.3.1260
-+7aa4e0822dec0840770d9f41052a772a887cd213 v7-3-1260
-+0000000000000000000000000000000000000000 v7-3-1260
-+1cf89d38aa7628b55f1a45a5325adc83abe85dc2 v7.3.1261
-+1cf89d38aa7628b55f1a45a5325adc83abe85dc2 v7-3-1261
-+0000000000000000000000000000000000000000 v7-3-1261
-+5e0b6a9282df8b9435da372cad77482f1f5b20aa v7.3.1262
-+5e0b6a9282df8b9435da372cad77482f1f5b20aa v7-3-1262
-+0000000000000000000000000000000000000000 v7-3-1262
-+a02575cd564ade1019ea89db07c1c1d0c4b5418c v7.3.1263
-+a02575cd564ade1019ea89db07c1c1d0c4b5418c v7-3-1263
-+0000000000000000000000000000000000000000 v7-3-1263
-+558c815e1a38d7ac2fc61c4155aabf8e81a14034 v7.3.1264
-+558c815e1a38d7ac2fc61c4155aabf8e81a14034 v7-3-1264
-+0000000000000000000000000000000000000000 v7-3-1264
-+53c1b30632df47993bc00947078dd31a226c9a97 v7.3.1265
-+53c1b30632df47993bc00947078dd31a226c9a97 v7-3-1265
-+0000000000000000000000000000000000000000 v7-3-1265
-+bbe4bd64c68c64afaa6636e8c3e9a9a6241e91cb v7.3.1266
-+bbe4bd64c68c64afaa6636e8c3e9a9a6241e91cb v7-3-1266
-+0000000000000000000000000000000000000000 v7-3-1266
-+cabdcfe72dc398fd67bbbe02cff5e11e4dc2506e v7.3.1267
-+cabdcfe72dc398fd67bbbe02cff5e11e4dc2506e v7-3-1267
-+0000000000000000000000000000000000000000 v7-3-1267
-+72fcf674e545eb87bb4ea996df56e4eb7c04f6cc v7.3.1268
-+72fcf674e545eb87bb4ea996df56e4eb7c04f6cc v7-3-1268
-+0000000000000000000000000000000000000000 v7-3-1268
-+350239b0e9eb063d9f84dfa4bc7a2b47d78e9afb v7.3.1269
-+350239b0e9eb063d9f84dfa4bc7a2b47d78e9afb v7-3-1269
-+0000000000000000000000000000000000000000 v7-3-1269
-+35b6fc57a2868b235284d914820da0815e62d54b v7.3.1270
-+35b6fc57a2868b235284d914820da0815e62d54b v7-3-1270
-+0000000000000000000000000000000000000000 v7-3-1270
-+034abed357a1a2fabe624ed59ea49ebdec09d790 v7.3.1271
-+034abed357a1a2fabe624ed59ea49ebdec09d790 v7-3-1271
-+0000000000000000000000000000000000000000 v7-3-1271
-+a00cd1839ac4f3467e1e51e619b4c65ce4e0ee81 v7.3.1272
-+a00cd1839ac4f3467e1e51e619b4c65ce4e0ee81 v7-3-1272
-+0000000000000000000000000000000000000000 v7-3-1272
-+30910831e5b0f0eb28a8eea7412f5ec9f3533ab2 v7.3.1273
-+30910831e5b0f0eb28a8eea7412f5ec9f3533ab2 v7-3-1273
-+0000000000000000000000000000000000000000 v7-3-1273
-+761cef8f5d1d42e315fb85765ee90857981fec06 v7.3.1274
-+761cef8f5d1d42e315fb85765ee90857981fec06 v7-3-1274
-+0000000000000000000000000000000000000000 v7-3-1274
-+8875401008da99a39878478a293f833f68481ffc v7.3.1275
-+8875401008da99a39878478a293f833f68481ffc v7-3-1275
-+0000000000000000000000000000000000000000 v7-3-1275
-+d2f9f67924e77ec3d90164dd6ff2e50c5107faf0 v7.3.1276
-+d2f9f67924e77ec3d90164dd6ff2e50c5107faf0 v7-3-1276
-+0000000000000000000000000000000000000000 v7-3-1276
-+6a7ae677d6a1f116b685fa0f892052e20003eaad v7.3.1277
-+6a7ae677d6a1f116b685fa0f892052e20003eaad v7-3-1277
-+0000000000000000000000000000000000000000 v7-3-1277
-+cf52d2a8c05cd037c049abef0f58fd918146f3bb v7.3.1278
-+cf52d2a8c05cd037c049abef0f58fd918146f3bb v7-3-1278
-+0000000000000000000000000000000000000000 v7-3-1278
-+cca600e6092839efeb3795db863916959921bb0e v7.3.1279
-+cca600e6092839efeb3795db863916959921bb0e v7-3-1279
-+0000000000000000000000000000000000000000 v7-3-1279
-+1cacf785299e771ca463c493c8c870e395c09cd0 v7.3.1280
-+1cacf785299e771ca463c493c8c870e395c09cd0 v7-3-1280
-+0000000000000000000000000000000000000000 v7-3-1280
-+19ed30f7cef76224ef39ceadefb64387eb986342 v7.3.1281
-+19ed30f7cef76224ef39ceadefb64387eb986342 v7-3-1281
-+0000000000000000000000000000000000000000 v7-3-1281
-+22ac43fb6d30ad1097d0c7e8937b28efcb162137 v7.3.1282
-+22ac43fb6d30ad1097d0c7e8937b28efcb162137 v7-3-1282
-+0000000000000000000000000000000000000000 v7-3-1282
-+d6ceddc0be86e46a5a9a696e36c54b9d133f2203 v7.3.1283
-+d6ceddc0be86e46a5a9a696e36c54b9d133f2203 v7-3-1283
-+0000000000000000000000000000000000000000 v7-3-1283
-+7b20dc8041645778eeb2f7823a4c1c647f735d24 v7.3.1284
-+7b20dc8041645778eeb2f7823a4c1c647f735d24 v7-3-1284
-+0000000000000000000000000000000000000000 v7-3-1284
-+14e7a115d54d2c095f31ccda2d04fbcf775dacde v7.3.1285
-+14e7a115d54d2c095f31ccda2d04fbcf775dacde v7-3-1285
-+0000000000000000000000000000000000000000 v7-3-1285
-+6ddc1785c4ff3779c18f5c313da591a052388b2d v7.3.1286
-+6ddc1785c4ff3779c18f5c313da591a052388b2d v7-3-1286
-+0000000000000000000000000000000000000000 v7-3-1286
-+34c629c3b4bab5fc755e83869d929f8cb322bfcd v7.3.1287
-+34c629c3b4bab5fc755e83869d929f8cb322bfcd v7-3-1287
-+0000000000000000000000000000000000000000 v7-3-1287
-+8b7baf39a345aecf00a6116b5da211b51c6e3457 v7.3.1288
-+8b7baf39a345aecf00a6116b5da211b51c6e3457 v7-3-1288
-+0000000000000000000000000000000000000000 v7-3-1288
-+1ed945570d47e9a60694ed1ef3a5b208243657e9 v7.3.1289
-+1ed945570d47e9a60694ed1ef3a5b208243657e9 v7-3-1289
-+0000000000000000000000000000000000000000 v7-3-1289
-+08d4c11cdaed2c5d95e2c0be3b0df91d01f52b84 v7.3.1290
-+08d4c11cdaed2c5d95e2c0be3b0df91d01f52b84 v7-3-1290
-+0000000000000000000000000000000000000000 v7-3-1290
-+a6ddcab6a240d22f965c4961bb93ddfea6a74c73 v7.3.1291
-+a6ddcab6a240d22f965c4961bb93ddfea6a74c73 v7-3-1291
-+0000000000000000000000000000000000000000 v7-3-1291
-+cad8d29b0bc0356a49a455296e5e79eb6f38139d v7.3.1292
-+cad8d29b0bc0356a49a455296e5e79eb6f38139d v7-3-1292
-+0000000000000000000000000000000000000000 v7-3-1292
-+18b43970fb7a796ab740e65baa4ff2ba46f929a8 v7.3.1293
-+18b43970fb7a796ab740e65baa4ff2ba46f929a8 v7-3-1293
-+0000000000000000000000000000000000000000 v7-3-1293
-+11d0c6df1d7bdc399b34a8cc70f354d6ee908661 v7.3.1294
-+11d0c6df1d7bdc399b34a8cc70f354d6ee908661 v7-3-1294
-+0000000000000000000000000000000000000000 v7-3-1294
-+93cccad6a26b439728bf3c155ed5532001a2f2ab v7.3.1295
-+93cccad6a26b439728bf3c155ed5532001a2f2ab v7-3-1295
-+0000000000000000000000000000000000000000 v7-3-1295
-+c3a82208e143e4cd4a3b9d9b1716eb9d876bf462 v7.3.1296
-+c3a82208e143e4cd4a3b9d9b1716eb9d876bf462 v7-3-1296
-+0000000000000000000000000000000000000000 v7-3-1296
-+cb0a5c9c0f9bcc6c5a18ed97762206309d3e334c v7.3.1297
-+cb0a5c9c0f9bcc6c5a18ed97762206309d3e334c v7-3-1297
-+0000000000000000000000000000000000000000 v7-3-1297
-+dafd77a15d44cced4e405a9fcfe67fc48a02004a v7.3.1298
-+dafd77a15d44cced4e405a9fcfe67fc48a02004a v7-3-1298
-+0000000000000000000000000000000000000000 v7-3-1298
-+f063be86b6323f396e6d3a7be73e860e636eb51d v7.3.1299
-+f063be86b6323f396e6d3a7be73e860e636eb51d v7-3-1299
-+0000000000000000000000000000000000000000 v7-3-1299
-+56bc3698f8c6ac275a9a05b64ae056de619d226b v7.3.1300
-+56bc3698f8c6ac275a9a05b64ae056de619d226b v7-3-1300
-+0000000000000000000000000000000000000000 v7-3-1300
-+6cabac58f26fe9d8b608542d9fdbfed3fc437c90 v7.3.1301
-+6cabac58f26fe9d8b608542d9fdbfed3fc437c90 v7-3-1301
-+0000000000000000000000000000000000000000 v7-3-1301
-+5569d11ef585033ef40e4402cd6a52453e4d13d9 v7.3.1302
-+5569d11ef585033ef40e4402cd6a52453e4d13d9 v7-3-1302
-+0000000000000000000000000000000000000000 v7-3-1302
-+6e611380b4cf586f210de94d92a4f158b6900a5f v7.3.1303
-+6e611380b4cf586f210de94d92a4f158b6900a5f v7-3-1303
-+0000000000000000000000000000000000000000 v7-3-1303
-+46d6318d5b965b77278ea252b25209468214dd2d v7.3.1304
-+46d6318d5b965b77278ea252b25209468214dd2d v7-3-1304
-+0000000000000000000000000000000000000000 v7-3-1304
-+6f24376028af97c93b426cdbd46379795be7cdfd v7.3.1305
-+6f24376028af97c93b426cdbd46379795be7cdfd v7-3-1305
-+0000000000000000000000000000000000000000 v7-3-1305
-+71859e71b1f902c28b8842bc7092dd155b8c7f88 v7.3.1306
-+71859e71b1f902c28b8842bc7092dd155b8c7f88 v7-3-1306
-+0000000000000000000000000000000000000000 v7-3-1306
-+3dafc80e781b8d5ed12d6107a2c804067aeafd90 v7.3.1307
-+3dafc80e781b8d5ed12d6107a2c804067aeafd90 v7-3-1307
-+0000000000000000000000000000000000000000 v7-3-1307
-+71e066e10a4789eeb9553aa08f9ca8e7eec96532 v7.3.1308
-+71e066e10a4789eeb9553aa08f9ca8e7eec96532 v7-3-1308
-+0000000000000000000000000000000000000000 v7-3-1308
-+a686295448918b7066bc52e3fd9748e6702c2219 v7.3.1309
-+a686295448918b7066bc52e3fd9748e6702c2219 v7-3-1309
-+0000000000000000000000000000000000000000 v7-3-1309
-+b49784c49d537fabe083cc3f8cc460629bb6957f v7.3.1310
-+b49784c49d537fabe083cc3f8cc460629bb6957f v7-3-1310
-+0000000000000000000000000000000000000000 v7-3-1310
-+28e6f5f889683fe161b7bc260bd02b742157fc5b v7.3.1311
-+28e6f5f889683fe161b7bc260bd02b742157fc5b v7-3-1311
-+0000000000000000000000000000000000000000 v7-3-1311
-+80bab8b1a30db72b7eda880b0442ab0b0f4a1611 v7.3.1312
-+80bab8b1a30db72b7eda880b0442ab0b0f4a1611 v7-3-1312
-+0000000000000000000000000000000000000000 v7-3-1312
-+afbc9dd67cea81e73d64f7ecce47dfcd35d48865 v7.3.1313
-+afbc9dd67cea81e73d64f7ecce47dfcd35d48865 v7-3-1313
-+0000000000000000000000000000000000000000 v7-3-1313
-+29e57603bf6f3a2e3c178a63d332ed4d2eccfa82 v7.3.1314
-+29e57603bf6f3a2e3c178a63d332ed4d2eccfa82 v7-3-1314
-+0000000000000000000000000000000000000000 v7-3-1314
-+6ec6b7ff2d43842d04a8d653356d0ff3850707c0 v7.4a
-+6ec6b7ff2d43842d04a8d653356d0ff3850707c0 v7-4a
-+0000000000000000000000000000000000000000 v7-4a
-+0ddba00c204d855c0b3da30cb338d9bdb0ded847 v7.4a.001
-+0ddba00c204d855c0b3da30cb338d9bdb0ded847 v7-4a-001
-+0000000000000000000000000000000000000000 v7-4a-001
-+d0288faf3086e6ccd5046edc91f1baf21bf1babf v7.4a.002
-+d0288faf3086e6ccd5046edc91f1baf21bf1babf v7-4a-002
-+0000000000000000000000000000000000000000 v7-4a-002
-+b5abda4e7c4b8b04cb823c160c47097448823ba8 v7.4a.003
-+b5abda4e7c4b8b04cb823c160c47097448823ba8 v7-4a-003
-+0000000000000000000000000000000000000000 v7-4a-003
-+f72d49c406c48293e30d774303493e4c8d120bfb v7.4a.004
-+f72d49c406c48293e30d774303493e4c8d120bfb v7-4a-004
-+0000000000000000000000000000000000000000 v7-4a-004
-+7a6ce0c426fec6051523bb00e050b826fa664beb v7.4a.005
-+7a6ce0c426fec6051523bb00e050b826fa664beb v7-4a-005
-+0000000000000000000000000000000000000000 v7-4a-005
-+6b6e1786c7dfb2d1190373dfddc3cd33e5346e18 v7.4a.006
-+6b6e1786c7dfb2d1190373dfddc3cd33e5346e18 v7-4a-006
-+0000000000000000000000000000000000000000 v7-4a-006
-+c624928fbc49408ab932e5c79f5f79e53327d700 v7.4a.007
-+c624928fbc49408ab932e5c79f5f79e53327d700 v7-4a-007
-+0000000000000000000000000000000000000000 v7-4a-007
-+b3bd43ef012d975cafb7b2a4c41fb78486ee4cc0 v7.4a.008
-+b3bd43ef012d975cafb7b2a4c41fb78486ee4cc0 v7-4a-008
-+0000000000000000000000000000000000000000 v7-4a-008
-+467efeee8f9e2060891bc718e6aeffaf79eab43b v7.4a.009
-+467efeee8f9e2060891bc718e6aeffaf79eab43b v7-4a-009
-+0000000000000000000000000000000000000000 v7-4a-009
-+a4e08386a6aa29c5e58302f1650fa2ad3f03b76b v7.4a.010
-+a4e08386a6aa29c5e58302f1650fa2ad3f03b76b v7-4a-010
-+0000000000000000000000000000000000000000 v7-4a-010
-+ce587b26b8d6bec140af41712bb99c4c73c3bf99 v7.4a.011
-+ce587b26b8d6bec140af41712bb99c4c73c3bf99 v7-4a-011
-+0000000000000000000000000000000000000000 v7-4a-011
-+fca6ba0d2d66d38da8ae023e73944a69662c0d66 v7.4a.012
-+fca6ba0d2d66d38da8ae023e73944a69662c0d66 v7-4a-012
-+0000000000000000000000000000000000000000 v7-4a-012
-+42d592dbbec3706429e3f3f75c9c394db6b9c1bd v7.4a.013
-+42d592dbbec3706429e3f3f75c9c394db6b9c1bd v7-4a-013
-+0000000000000000000000000000000000000000 v7-4a-013
-+08eb573821869727e5951e6586207dfbe5fd982c v7.4a.014
-+08eb573821869727e5951e6586207dfbe5fd982c v7-4a-014
-+0000000000000000000000000000000000000000 v7-4a-014
-+7a1b782ec64ac55052755ed72ff023093b246d96 v7.4a.015
-+7a1b782ec64ac55052755ed72ff023093b246d96 v7-4a-015
-+0000000000000000000000000000000000000000 v7-4a-015
-+4104bed69ea561a105c3db590aa6c75be2a24836 v7.4a.016
-+4104bed69ea561a105c3db590aa6c75be2a24836 v7-4a-016
-+0000000000000000000000000000000000000000 v7-4a-016
-+4cbff53717d4920cb64d417c7a603b45519138f1 v7.4a.017
-+4cbff53717d4920cb64d417c7a603b45519138f1 v7-4a-017
-+0000000000000000000000000000000000000000 v7-4a-017
-+c6dd0c545e5ca25e0b45fc1dbd7d1cb20642830e v7.4a.018
-+c6dd0c545e5ca25e0b45fc1dbd7d1cb20642830e v7-4a-018
-+0000000000000000000000000000000000000000 v7-4a-018
-+bea5eb942011c09a6a8805e6b21079375462a710 v7.4a.019
-+bea5eb942011c09a6a8805e6b21079375462a710 v7-4a-019
-+0000000000000000000000000000000000000000 v7-4a-019
-+fa76be660fa914de79e3856caea8261cc7ab6c5b v7.4a.020
-+fa76be660fa914de79e3856caea8261cc7ab6c5b v7-4a-020
-+0000000000000000000000000000000000000000 v7-4a-020
-+fc6f4a653265f9e6b3dfa82faf067329dd5044a2 v7.4a.021
-+fc6f4a653265f9e6b3dfa82faf067329dd5044a2 v7-4a-021
-+0000000000000000000000000000000000000000 v7-4a-021
-+c28202427d71b4460122754884bb548f084c3d7a v7.4a.022
-+c28202427d71b4460122754884bb548f084c3d7a v7-4a-022
-+0000000000000000000000000000000000000000 v7-4a-022
-+45b2278e6f461689d068f138428e9f3fdb01615c v7.4a.023
-+45b2278e6f461689d068f138428e9f3fdb01615c v7-4a-023
-+0000000000000000000000000000000000000000 v7-4a-023
-+ba9a11fe25637103e1a77fefbbaed4ac2ff182f9 v7.4a.024
-+ba9a11fe25637103e1a77fefbbaed4ac2ff182f9 v7-4a-024
-+0000000000000000000000000000000000000000 v7-4a-024
-+1b89e3f916c59fbdfdbd31e4d8af8b22274275b2 v7.4a.025
-+1b89e3f916c59fbdfdbd31e4d8af8b22274275b2 v7-4a-025
-+0000000000000000000000000000000000000000 v7-4a-025
-+b3ff17862b4c9d06411bd3c854cfceb77d5b97b6 v7.4a.026
-+b3ff17862b4c9d06411bd3c854cfceb77d5b97b6 v7-4a-026
-+0000000000000000000000000000000000000000 v7-4a-026
-+8edba3805d787f50b51d7fd59899c5361c09a348 v7.4a.027
-+8edba3805d787f50b51d7fd59899c5361c09a348 v7-4a-027
-+0000000000000000000000000000000000000000 v7-4a-027
-+7aca84c0cd37ab4eceab8897e0297e2e318b8fff v7.4a.028
-+7aca84c0cd37ab4eceab8897e0297e2e318b8fff v7-4a-028
-+0000000000000000000000000000000000000000 v7-4a-028
-+2b58913e19a5a40d169f2aa1ef9530a78c375d2e v7.4a.029
-+2b58913e19a5a40d169f2aa1ef9530a78c375d2e v7-4a-029
-+0000000000000000000000000000000000000000 v7-4a-029
-+bc4fb031746594e4e84b36e64389e78454617a86 v7.4a.030
-+bc4fb031746594e4e84b36e64389e78454617a86 v7-4a-030
-+0000000000000000000000000000000000000000 v7-4a-030
-+839ebe7c1b2fb8150714fc48ec597d2e1f1c7557 v7.4a.031
-+839ebe7c1b2fb8150714fc48ec597d2e1f1c7557 v7-4a-031
-+0000000000000000000000000000000000000000 v7-4a-031
-+2741b46e96bfe6c06a5e9704bcad649655f7b50f v7.4a.032
-+2741b46e96bfe6c06a5e9704bcad649655f7b50f v7-4a-032
-+0000000000000000000000000000000000000000 v7-4a-032
-+fa024ce48542356206bf86bdc9286ecf0510ad49 v7.4a.033
-+fa024ce48542356206bf86bdc9286ecf0510ad49 v7-4a-033
-+0000000000000000000000000000000000000000 v7-4a-033
-+947edb6335d1e196c27e2e7e0e0a5ed8f6b78498 v7.4a.034
-+947edb6335d1e196c27e2e7e0e0a5ed8f6b78498 v7-4a-034
-+0000000000000000000000000000000000000000 v7-4a-034
-+4ceacc1b00548c0b21c0dc2628608515899df721 v7.4a.035
-+4ceacc1b00548c0b21c0dc2628608515899df721 v7-4a-035
-+0000000000000000000000000000000000000000 v7-4a-035
-+9982ec574beb1866536f0e8a0ace3073faa3bb97 v7.4a.036
-+9982ec574beb1866536f0e8a0ace3073faa3bb97 v7-4a-036
-+0000000000000000000000000000000000000000 v7-4a-036
-+91d478da863e0779c482c790cc96b14188f3ecaf v7.4a.037
-+91d478da863e0779c482c790cc96b14188f3ecaf v7-4a-037
-+0000000000000000000000000000000000000000 v7-4a-037
-+8f983df0299fb4f1c7359eb3b844ee93e8f7e8fb v7.4a.038
-+8f983df0299fb4f1c7359eb3b844ee93e8f7e8fb v7-4a-038
-+0000000000000000000000000000000000000000 v7-4a-038
-+a08fa2919f2b39be0416109d87a42fbb5880ac76 v7.4a.039
-+a08fa2919f2b39be0416109d87a42fbb5880ac76 v7-4a-039
-+0000000000000000000000000000000000000000 v7-4a-039
-+1261caf9bc5193d304140647c08ca5b52120ce52 v7.4a.040
-+1261caf9bc5193d304140647c08ca5b52120ce52 v7-4a-040
-+0000000000000000000000000000000000000000 v7-4a-040
-+74d2f3188cd0aaa0d3d7cd3df001d88b04f77f5c v7.4a.041
-+74d2f3188cd0aaa0d3d7cd3df001d88b04f77f5c v7-4a-041
-+0000000000000000000000000000000000000000 v7-4a-041
-+1899acc5aebd40f625b9fed7bc4c1b5f67e5bc3f v7.4a.042
-+1899acc5aebd40f625b9fed7bc4c1b5f67e5bc3f v7-4a-042
-+0000000000000000000000000000000000000000 v7-4a-042
-+6fa64615c8d38ecf464702b102538c09fe250813 v7.4a.043
-+6fa64615c8d38ecf464702b102538c09fe250813 v7-4a-043
-+0000000000000000000000000000000000000000 v7-4a-043
-+647596ab1ae2f4b36bfc20293adf4b3a43372818 v7.4a.044
-+647596ab1ae2f4b36bfc20293adf4b3a43372818 v7-4a-044
-+0000000000000000000000000000000000000000 v7-4a-044
-+da95a7f1d5a8413ae719188cec5b706b99db4a91 v7.4a.045
-+da95a7f1d5a8413ae719188cec5b706b99db4a91 v7-4a-045
-+0000000000000000000000000000000000000000 v7-4a-045
-+f0361e297d9ceb533a17530647b4482c3990df3c v7.4a.046
-+f0361e297d9ceb533a17530647b4482c3990df3c v7-4a-046
-+0000000000000000000000000000000000000000 v7-4a-046
-+8c6615a30951fb9f2d2b218e55626f5dfa3fa24e v7.4a.047
-+8c6615a30951fb9f2d2b218e55626f5dfa3fa24e v7-4a-047
-+0000000000000000000000000000000000000000 v7-4a-047
-+09c88160095d98a0b1403e9230c76e8adbb75d59 v7.4b.000
-+09c88160095d98a0b1403e9230c76e8adbb75d59 v7-4b-000
-+0000000000000000000000000000000000000000 v7-4b-000
-+47a09a572ea670d0498983eaa6ded5ab4f12fd15 v7.4b.001
-+47a09a572ea670d0498983eaa6ded5ab4f12fd15 v7-4b-001
-+0000000000000000000000000000000000000000 v7-4b-001
-+2e63b6c763f7af2ef11f751d3047847652dddfe0 v7.4b.002
-+2e63b6c763f7af2ef11f751d3047847652dddfe0 v7-4b-002
-+0000000000000000000000000000000000000000 v7-4b-002
-+ea876fe914833a69018c54d6927dbbdb42ce6ecc v7.4b.003
-+ea876fe914833a69018c54d6927dbbdb42ce6ecc v7-4b-003
-+0000000000000000000000000000000000000000 v7-4b-003
-+3c6e2b89875f39c8417021aa369695ec1ba762df v7.4b.004
-+3c6e2b89875f39c8417021aa369695ec1ba762df v7-4b-004
-+0000000000000000000000000000000000000000 v7-4b-004
-+e63e4b4be9236c2d811b5ec7bdd79e387ec8bac9 v7.4b.005
-+e63e4b4be9236c2d811b5ec7bdd79e387ec8bac9 v7-4b-005
-+0000000000000000000000000000000000000000 v7-4b-005
-+6b7ab6a4f31a54bceb4e7d6f0f9404b5a37bdad3 v7.4b.006
-+6b7ab6a4f31a54bceb4e7d6f0f9404b5a37bdad3 v7-4b-006
-+0000000000000000000000000000000000000000 v7-4b-006
-+b882d4b14e00af23444fd630aae3ac32214dd097 v7.4b.007
-+b882d4b14e00af23444fd630aae3ac32214dd097 v7-4b-007
-+0000000000000000000000000000000000000000 v7-4b-007
-+3059c799fcd997ea60a63ed10a2a09d73e3ed3cf v7.4b.008
-+3059c799fcd997ea60a63ed10a2a09d73e3ed3cf v7-4b-008
-+0000000000000000000000000000000000000000 v7-4b-008
-+cd971e951b0626c253059d8e25859032560920a6 v7.4b.009
-+cd971e951b0626c253059d8e25859032560920a6 v7-4b-009
-+0000000000000000000000000000000000000000 v7-4b-009
-+585b623a1aa3baea87a1584e6064612b2183d312 v7.4b.010
-+585b623a1aa3baea87a1584e6064612b2183d312 v7-4b-010
-+0000000000000000000000000000000000000000 v7-4b-010
-+7d1f89b2710305a00e6adac35a1fa6edd47982ba v7.4b.011
-+7d1f89b2710305a00e6adac35a1fa6edd47982ba v7-4b-011
-+0000000000000000000000000000000000000000 v7-4b-011
-+25f67b62afd8c58b6c661961cc762f00ee89e562 v7.4b.012
-+25f67b62afd8c58b6c661961cc762f00ee89e562 v7-4b-012
-+0000000000000000000000000000000000000000 v7-4b-012
-+1ed6fd19c36051da73f9987777002b331853f5ea v7.4b.013
-+1ed6fd19c36051da73f9987777002b331853f5ea v7-4b-013
-+0000000000000000000000000000000000000000 v7-4b-013
-+3ddec3d25bd178d4f90114bce9ce889f3889e6d2 v7.4b.014
-+3ddec3d25bd178d4f90114bce9ce889f3889e6d2 v7-4b-014
-+0000000000000000000000000000000000000000 v7-4b-014
-+d96f16667cc48d89c380fae29d86286b20040d5b v7.4b.015
-+d96f16667cc48d89c380fae29d86286b20040d5b v7-4b-015
-+0000000000000000000000000000000000000000 v7-4b-015
-+ba37e955913e85700677b89a720c6e5fc8d23cc3 v7.4b.016
-+ba37e955913e85700677b89a720c6e5fc8d23cc3 v7-4b-016
-+0000000000000000000000000000000000000000 v7-4b-016
-+8c42772f05438e9f06200bca731cf301097be8ea v7.4b.017
-+8c42772f05438e9f06200bca731cf301097be8ea v7-4b-017
-+0000000000000000000000000000000000000000 v7-4b-017
-+7ed1ec814dafe8109a2f34302174267d31bbc924 v7.4b.018
-+7ed1ec814dafe8109a2f34302174267d31bbc924 v7-4b-018
-+0000000000000000000000000000000000000000 v7-4b-018
-+74a211a0d3a3135dd67329cd981f5100f5e4d064 v7.4b.019
-+74a211a0d3a3135dd67329cd981f5100f5e4d064 v7-4b-019
-+0000000000000000000000000000000000000000 v7-4b-019
-+46cf49cc9289920704999a971f397eee1efdb3fc v7.4b.020
-+46cf49cc9289920704999a971f397eee1efdb3fc v7-4b-020
-+0000000000000000000000000000000000000000 v7-4b-020
-+059c8a4b103f6971276435127c7ad970a81b0b2c v7.4b.021
-+059c8a4b103f6971276435127c7ad970a81b0b2c v7-4b-021
-+0000000000000000000000000000000000000000 v7-4b-021
-+d5d6b78cff090e87d52924179e44131b5ba7436d v7.4b.022
-+d5d6b78cff090e87d52924179e44131b5ba7436d v7-4b-022
-+0000000000000000000000000000000000000000 v7-4b-022
-+359743c1f59af353454dd80a26d9f8c20ae6ee8e v7.4
-+359743c1f59af353454dd80a26d9f8c20ae6ee8e v7-4
-+0000000000000000000000000000000000000000 v7-4
-+3e9107b86b68d83bfa94e43afffbf17623afe55e v7.4.001
-+3e9107b86b68d83bfa94e43afffbf17623afe55e v7-4-001
-+0000000000000000000000000000000000000000 v7-4-001
-+e29f11399ccec9215cc8cfab1f9307dea0567d70 v7.4.002
-+e29f11399ccec9215cc8cfab1f9307dea0567d70 v7-4-002
-+0000000000000000000000000000000000000000 v7-4-002
-+560a6a2329503d483db019a88cacc3307e5c30b7 v7.4.003
-+560a6a2329503d483db019a88cacc3307e5c30b7 v7-4-003
-+0000000000000000000000000000000000000000 v7-4-003
-+f6247eaf4e1d556f782321890d725663f74babe6 v7.4.004
-+f6247eaf4e1d556f782321890d725663f74babe6 v7-4-004
-+0000000000000000000000000000000000000000 v7-4-004
-+3640cf4c0d4b6e5687bb7a31678fab70c88ed94b v7.4.005
-+3640cf4c0d4b6e5687bb7a31678fab70c88ed94b v7-4-005
-+0000000000000000000000000000000000000000 v7-4-005
-+2374a05efe20287d55bd824689a41becc7662505 v7.4.006
-+2374a05efe20287d55bd824689a41becc7662505 v7-4-006
-+0000000000000000000000000000000000000000 v7-4-006
-+4fe1dfc7014e57b4beb5a01c9e94357265d19a92 v7.4.007
-+4fe1dfc7014e57b4beb5a01c9e94357265d19a92 v7-4-007
-+0000000000000000000000000000000000000000 v7-4-007
-+b04bdb2c5fce70a278d26c477debb65a388da0ca v7.4.008
-+b04bdb2c5fce70a278d26c477debb65a388da0ca v7-4-008
-+0000000000000000000000000000000000000000 v7-4-008
-+8b5d80861c5e0403ea9f54ddddce2752a463c8a5 v7.4.009
-+8b5d80861c5e0403ea9f54ddddce2752a463c8a5 v7-4-009
-+0000000000000000000000000000000000000000 v7-4-009
-+bb358cc41d920983629ace62bcf26decbf06cab4 v7.4.010
-+bb358cc41d920983629ace62bcf26decbf06cab4 v7-4-010
-+0000000000000000000000000000000000000000 v7-4-010
-+54e66395831c1a58b4a9804e7884e505842157e8 v7.4.011
-+54e66395831c1a58b4a9804e7884e505842157e8 v7-4-011
-+0000000000000000000000000000000000000000 v7-4-011
-+8e28c23e482c5b3c8296d8022271822886793456 v7.4.012
-+8e28c23e482c5b3c8296d8022271822886793456 v7-4-012
-+0000000000000000000000000000000000000000 v7-4-012
-+07737d3aa81725672796cbc9a010d63414ab6fea v7.4.013
-+07737d3aa81725672796cbc9a010d63414ab6fea v7-4-013
-+0000000000000000000000000000000000000000 v7-4-013
-+9801d06e7b4ccdcd02cf40bee34eaaada0ca0409 v7.4.014
-+9801d06e7b4ccdcd02cf40bee34eaaada0ca0409 v7-4-014
-+0000000000000000000000000000000000000000 v7-4-014
-+a7478f9f2551e95bff138cd658f7a86ced804ab1 v7.4.015
-+a7478f9f2551e95bff138cd658f7a86ced804ab1 v7-4-015
-+0000000000000000000000000000000000000000 v7-4-015
-+8d5cd0ec3e7183a289f9bac41d3981307cdc1fac v7.4.016
-+8d5cd0ec3e7183a289f9bac41d3981307cdc1fac v7-4-016
-+0000000000000000000000000000000000000000 v7-4-016
-+c47c8cd5fe5c014c141d9fb3fa8935b268436a4e v7.4.017
-+c47c8cd5fe5c014c141d9fb3fa8935b268436a4e v7-4-017
-+0000000000000000000000000000000000000000 v7-4-017
-+460d5be9395ef3e05f4b1397ea98a5b54d825fc5 v7.4.018
-+460d5be9395ef3e05f4b1397ea98a5b54d825fc5 v7-4-018
-+0000000000000000000000000000000000000000 v7-4-018
-+d5eb32dc231cd870c562e7b0be96fa994b505d9f v7.4.019
-+d5eb32dc231cd870c562e7b0be96fa994b505d9f v7-4-019
-+0000000000000000000000000000000000000000 v7-4-019
-+c1ae5baa41f47bbf96be81e0158707a88af48b34 v7.4.020
-+c1ae5baa41f47bbf96be81e0158707a88af48b34 v7-4-020
-+0000000000000000000000000000000000000000 v7-4-020
-+c514693882b9f1c7be2e76a0307926df799da3ea v7.4.021
-+c514693882b9f1c7be2e76a0307926df799da3ea v7-4-021
-+0000000000000000000000000000000000000000 v7-4-021
-+965044860b7f4884657fcaa042853238c7b13e69 v7.4.022
-+965044860b7f4884657fcaa042853238c7b13e69 v7-4-022
-+0000000000000000000000000000000000000000 v7-4-022
-+09361f13580b075b6e87707c47165e8d45ee98a5 v7.4.023
-+09361f13580b075b6e87707c47165e8d45ee98a5 v7-4-023
-+0000000000000000000000000000000000000000 v7-4-023
-+00d61a47df66cad21b80c6a683164e8d19180045 v7.4.024
-+00d61a47df66cad21b80c6a683164e8d19180045 v7-4-024
-+0000000000000000000000000000000000000000 v7-4-024
-+9085d32d7424963013650805452ede5dad22211c v7.4.025
-+9085d32d7424963013650805452ede5dad22211c v7-4-025
-+0000000000000000000000000000000000000000 v7-4-025
-+6bbb2ae990c92f6858b86c047e16dd12183d4273 v7.4.026
-+6bbb2ae990c92f6858b86c047e16dd12183d4273 v7-4-026
-+0000000000000000000000000000000000000000 v7-4-026
-+73cc7272de5e0173b9578f715c4794a8b3803bce v7.4.027
-+73cc7272de5e0173b9578f715c4794a8b3803bce v7-4-027
-+0000000000000000000000000000000000000000 v7-4-027
-+923738744a60e5e0bd2d9990758a2169106807ca v7.4.028
-+923738744a60e5e0bd2d9990758a2169106807ca v7-4-028
-+0000000000000000000000000000000000000000 v7-4-028
-+2d3fbc68b3a84ad2bf4d58c77244043328e3fb81 v7.4.029
-+2d3fbc68b3a84ad2bf4d58c77244043328e3fb81 v7-4-029
-+0000000000000000000000000000000000000000 v7-4-029
-+0978e99043d2a9faedb1a3bad75b59121c270bde v7.4.030
-+0978e99043d2a9faedb1a3bad75b59121c270bde v7-4-030
-+0000000000000000000000000000000000000000 v7-4-030
-+b21b5dcdca2197fc86b9bde77bd6777f0e2d5175 v7.4.031
-+b21b5dcdca2197fc86b9bde77bd6777f0e2d5175 v7-4-031
-+0000000000000000000000000000000000000000 v7-4-031
-+71e92a1cb37db719d6406858a50ca3bdfc9881fb v7.4.032
-+71e92a1cb37db719d6406858a50ca3bdfc9881fb v7-4-032
-+0000000000000000000000000000000000000000 v7-4-032
-+91f6a28e010d49ae73c13c85dbb8b14c9e5edb36 v7.4.033
-+91f6a28e010d49ae73c13c85dbb8b14c9e5edb36 v7-4-033
-+0000000000000000000000000000000000000000 v7-4-033
-+22dfcd1494e4f7ea8ddc96e8dd895482e77e3b5a v7.4.034
-+22dfcd1494e4f7ea8ddc96e8dd895482e77e3b5a v7-4-034
-+0000000000000000000000000000000000000000 v7-4-034
-+5481f188dcbb7143596f2d470c7d674bf36efe64 v7.4.035
-+5481f188dcbb7143596f2d470c7d674bf36efe64 v7-4-035
-+0000000000000000000000000000000000000000 v7-4-035
-+90e2f0729a0df249931a2dbe5f4310ba6c91cab4 v7.4.036
-+90e2f0729a0df249931a2dbe5f4310ba6c91cab4 v7-4-036
-+0000000000000000000000000000000000000000 v7-4-036
-+c3d379c2a115b957d82eaa5f2215b688f36a22da v7.4.037
-+c3d379c2a115b957d82eaa5f2215b688f36a22da v7-4-037
-+0000000000000000000000000000000000000000 v7-4-037
-+6daa78b6b99a2ec07d20336db47c9f8165098062 v7.4.038
-+6daa78b6b99a2ec07d20336db47c9f8165098062 v7-4-038
-+0000000000000000000000000000000000000000 v7-4-038
-+4dfba3df303c51fe31efd1255338e9fcbedc5401 v7.4.039
-+4dfba3df303c51fe31efd1255338e9fcbedc5401 v7-4-039
-+0000000000000000000000000000000000000000 v7-4-039
-+8336fd924e057d8c797043430325379d9a3ae37b v7.4.040
-+8336fd924e057d8c797043430325379d9a3ae37b v7-4-040
-+0000000000000000000000000000000000000000 v7-4-040
-+408f2a1a953feef25a2c5c96352c82674655e797 v7.4.041
-+408f2a1a953feef25a2c5c96352c82674655e797 v7-4-041
-+0000000000000000000000000000000000000000 v7-4-041
-+70915ede509a737ac78c421f43c4447c9682ba41 v7.4.042
-+70915ede509a737ac78c421f43c4447c9682ba41 v7-4-042
-+0000000000000000000000000000000000000000 v7-4-042
-+6d11572e2c8b1117b90adf588ff1467b185c1b57 v7.4.043
-+6d11572e2c8b1117b90adf588ff1467b185c1b57 v7-4-043
-+0000000000000000000000000000000000000000 v7-4-043
-+c0e3990aed3f179ef006e6de1458e9818c9ab896 v7.4.044
-+c0e3990aed3f179ef006e6de1458e9818c9ab896 v7-4-044
-+0000000000000000000000000000000000000000 v7-4-044
-+8ced827b2e8ba49f9ae0da2033670fee83e7b55b v7.4.045
-+8ced827b2e8ba49f9ae0da2033670fee83e7b55b v7-4-045
-+0000000000000000000000000000000000000000 v7-4-045
-+68056d414f09fccb39219d7fde77fa06769ffa3b v7.4.046
-+68056d414f09fccb39219d7fde77fa06769ffa3b v7-4-046
-+0000000000000000000000000000000000000000 v7-4-046
-+c21b2f52f1dd003d860e3b574602ed3fdc2b4f1c v7.4.047
-+c21b2f52f1dd003d860e3b574602ed3fdc2b4f1c v7-4-047
-+0000000000000000000000000000000000000000 v7-4-047
-+31c9acfeda8f1b84d51a480c1efbb56f384e76b1 v7.4.048
-+31c9acfeda8f1b84d51a480c1efbb56f384e76b1 v7-4-048
-+0000000000000000000000000000000000000000 v7-4-048
-+15c1b8a20da6d650ee3ed0e73c2e3832093b60dd v7.4.049
-+15c1b8a20da6d650ee3ed0e73c2e3832093b60dd v7-4-049
-+0000000000000000000000000000000000000000 v7-4-049
-+eb33cadafcabfc9cb3fc0741e169e84cafec11f8 v7.4.050
-+eb33cadafcabfc9cb3fc0741e169e84cafec11f8 v7-4-050
-+0000000000000000000000000000000000000000 v7-4-050
-+e7a2f217a385e6aebfddc4d29182924ac017d262 v7.4.051
-+e7a2f217a385e6aebfddc4d29182924ac017d262 v7-4-051
-+0000000000000000000000000000000000000000 v7-4-051
-+b9c1c1f4cda9b82a2e703feec441d865b4722d56 v7.4.052
-+b9c1c1f4cda9b82a2e703feec441d865b4722d56 v7-4-052
-+0000000000000000000000000000000000000000 v7-4-052
-+733193bf24c3a80883c60964922c7cdc83662eb2 v7.4.053
-+733193bf24c3a80883c60964922c7cdc83662eb2 v7-4-053
-+0000000000000000000000000000000000000000 v7-4-053
-+7b760cda2bbf086ba975fd5a4bdc6190a0f08caf v7.4.054
-+7b760cda2bbf086ba975fd5a4bdc6190a0f08caf v7-4-054
-+0000000000000000000000000000000000000000 v7-4-054
-+38a755adc58063894c6695d702cc37f4910bad14 v7.4.055
-+38a755adc58063894c6695d702cc37f4910bad14 v7-4-055
-+0000000000000000000000000000000000000000 v7-4-055
-+8d83c219fc7b2ec8685ab9e0dd7d3067b7f9d1e9 v7.4.056
-+8d83c219fc7b2ec8685ab9e0dd7d3067b7f9d1e9 v7-4-056
-+0000000000000000000000000000000000000000 v7-4-056
-+3109053ce4e3d17ca6ecab06c0ea0f38581d2f41 v7.4.057
-+3109053ce4e3d17ca6ecab06c0ea0f38581d2f41 v7-4-057
-+0000000000000000000000000000000000000000 v7-4-057
-+fa8447ec582378ca8d2c0245bd4ac195876abf2b v7.4.058
-+fa8447ec582378ca8d2c0245bd4ac195876abf2b v7-4-058
-+0000000000000000000000000000000000000000 v7-4-058
-+2a72805a3038285c35f47dc0327a57cdabbdf09d v7.4.059
-+2a72805a3038285c35f47dc0327a57cdabbdf09d v7-4-059
-+0000000000000000000000000000000000000000 v7-4-059
-+46ca8fcee5257cc036ac928d91b2a490cf47a956 v7.4.060
-+46ca8fcee5257cc036ac928d91b2a490cf47a956 v7-4-060
-+0000000000000000000000000000000000000000 v7-4-060
-+739074bdceb85d16b9e70791d91a59c2b846ed8d v7.4.061
-+739074bdceb85d16b9e70791d91a59c2b846ed8d v7-4-061
-+0000000000000000000000000000000000000000 v7-4-061
-+d59a0b8e5584c6e093990abb1b1e640aff7620bd v7.4.062
-+d59a0b8e5584c6e093990abb1b1e640aff7620bd v7-4-062
-+0000000000000000000000000000000000000000 v7-4-062
-+9cedb4dfd4c830783ac65128dbbb118da2e3c638 v7.4.063
-+9cedb4dfd4c830783ac65128dbbb118da2e3c638 v7-4-063
-+0000000000000000000000000000000000000000 v7-4-063
-+d062239654688774d38e60ac42cec8ae1fd0f14b v7.4.064
-+d062239654688774d38e60ac42cec8ae1fd0f14b v7-4-064
-+0000000000000000000000000000000000000000 v7-4-064
-+7f341db39d5bee0a9259a14a65e19bc9efa65417 v7.4.065
-+7f341db39d5bee0a9259a14a65e19bc9efa65417 v7-4-065
-+0000000000000000000000000000000000000000 v7-4-065
-+38b948f534e4646bf879cb4d30151474e093d139 v7.4.066
-+38b948f534e4646bf879cb4d30151474e093d139 v7-4-066
-+0000000000000000000000000000000000000000 v7-4-066
-+86bf09a1b6d0275131caf7ffc51598608e7242de v7.4.067
-+86bf09a1b6d0275131caf7ffc51598608e7242de v7-4-067
-+0000000000000000000000000000000000000000 v7-4-067
-+efa40be729c2c94c1d8d0bf95000c4a7d2976dbc v7.4.068
-+efa40be729c2c94c1d8d0bf95000c4a7d2976dbc v7-4-068
-+0000000000000000000000000000000000000000 v7-4-068
-+878ed73c70706d68bc7175343e4deb24b11963c2 v7.4.069
-+878ed73c70706d68bc7175343e4deb24b11963c2 v7-4-069
-+0000000000000000000000000000000000000000 v7-4-069
-+e6f3f66028d448bb49ee2336cee60b13ced7cea9 v7.4.070
-+e6f3f66028d448bb49ee2336cee60b13ced7cea9 v7-4-070
-+0000000000000000000000000000000000000000 v7-4-070
-+faf7e86203b5d5c98bdd30dd92524e5062b2412a v7.4.071
-+faf7e86203b5d5c98bdd30dd92524e5062b2412a v7-4-071
-+0000000000000000000000000000000000000000 v7-4-071
-+d563839a9be0be6e85d93e366b4f7ffe705d8e3b v7.4.072
-+d563839a9be0be6e85d93e366b4f7ffe705d8e3b v7-4-072
-+0000000000000000000000000000000000000000 v7-4-072
-+d0595545e98a3b7b6fe1a96ab0106d8afd63c31e v7.4.073
-+d0595545e98a3b7b6fe1a96ab0106d8afd63c31e v7-4-073
-+0000000000000000000000000000000000000000 v7-4-073
-+9818311eeca0d76641879e95143f314e7295cc26 v7.4.074
-+9818311eeca0d76641879e95143f314e7295cc26 v7-4-074
-+0000000000000000000000000000000000000000 v7-4-074
-+829aa8c8449d85d0de3a29ac8ce647ec706efd02 v7.4.075
-+829aa8c8449d85d0de3a29ac8ce647ec706efd02 v7-4-075
-+0000000000000000000000000000000000000000 v7-4-075
-+8f0c264db1e76a65499f0846d961907d7ecade9e v7.4.076
-+8f0c264db1e76a65499f0846d961907d7ecade9e v7-4-076
-+0000000000000000000000000000000000000000 v7-4-076
-+53bc55e58fefee7a83a7a56fc7f05e0a4d36dd47 v7.4.077
-+53bc55e58fefee7a83a7a56fc7f05e0a4d36dd47 v7-4-077
-+0000000000000000000000000000000000000000 v7-4-077
-+5c3064feddd7c9bfef18d8067172335f101122c5 v7.4.078
-+5c3064feddd7c9bfef18d8067172335f101122c5 v7-4-078
-+0000000000000000000000000000000000000000 v7-4-078
-+6ae816249627b34aee618b49c4169b7ca1f54ff3 v7.4.079
-+6ae816249627b34aee618b49c4169b7ca1f54ff3 v7-4-079
-+0000000000000000000000000000000000000000 v7-4-079
-+c5166fa1046462d73891f0b395d6619e7ce96c82 v7.4.080
-+c5166fa1046462d73891f0b395d6619e7ce96c82 v7-4-080
-+0000000000000000000000000000000000000000 v7-4-080
-+42927712b3d997bdba9d8ff5a1199fe4652c5899 v7.4.081
-+42927712b3d997bdba9d8ff5a1199fe4652c5899 v7-4-081
-+0000000000000000000000000000000000000000 v7-4-081
-+9c777e2c702487bd0b5c48a22edc17c98b87e070 v7.4.082
-+9c777e2c702487bd0b5c48a22edc17c98b87e070 v7-4-082
-+0000000000000000000000000000000000000000 v7-4-082
-+6367a766027d3b60caff43c35d8d3597ad90f6c6 v7.4.083
-+6367a766027d3b60caff43c35d8d3597ad90f6c6 v7-4-083
-+0000000000000000000000000000000000000000 v7-4-083
-+a56f60cf683455bea96daf077458158041e4d6ba v7.4.084
-+a56f60cf683455bea96daf077458158041e4d6ba v7-4-084
-+0000000000000000000000000000000000000000 v7-4-084
-+70c3289803b3129f34ffc327b113dcf152222a56 v7.4.085
-+70c3289803b3129f34ffc327b113dcf152222a56 v7-4-085
-+0000000000000000000000000000000000000000 v7-4-085
-+60a5b7b82016da631dd7acc6121913d02c5677f8 v7.4.086
-+60a5b7b82016da631dd7acc6121913d02c5677f8 v7-4-086
-+0000000000000000000000000000000000000000 v7-4-086
-+9334c994be7bb5e16a1f9c6b67e1c4342a6a386c v7.4.087
-+9334c994be7bb5e16a1f9c6b67e1c4342a6a386c v7-4-087
-+0000000000000000000000000000000000000000 v7-4-087
-+853a76c7fdedefbc1dfdc2a4896d37a3806500e2 v7.4.088
-+853a76c7fdedefbc1dfdc2a4896d37a3806500e2 v7-4-088
-+0000000000000000000000000000000000000000 v7-4-088
-+6707c44cec61d76026d5dcdd6573fb41cb89d0bd v7.4.089
-+6707c44cec61d76026d5dcdd6573fb41cb89d0bd v7-4-089
-+0000000000000000000000000000000000000000 v7-4-089
-+31217cc48e7d8c9aca703688d3d04d8edbc85bba v7.4.090
-+31217cc48e7d8c9aca703688d3d04d8edbc85bba v7-4-090
-+0000000000000000000000000000000000000000 v7-4-090
-+9502d1caf90bf56f0125c99b7d17ba70944ebd85 v7.4.091
-+9502d1caf90bf56f0125c99b7d17ba70944ebd85 v7-4-091
-+0000000000000000000000000000000000000000 v7-4-091
-+1b4cb2c6b285265da4ffbe242af35a73e1b118e6 v7.4.092
-+1b4cb2c6b285265da4ffbe242af35a73e1b118e6 v7-4-092
-+0000000000000000000000000000000000000000 v7-4-092
-+33f3e277ceab43179c74093f68196bd370199dbc v7.4.093
-+33f3e277ceab43179c74093f68196bd370199dbc v7-4-093
-+0000000000000000000000000000000000000000 v7-4-093
-+68b5f8abca93dd035ba180aa673a5bbf035b89db v7.4.094
-+68b5f8abca93dd035ba180aa673a5bbf035b89db v7-4-094
-+0000000000000000000000000000000000000000 v7-4-094
-+acbe5414cb7f302f548bc1cbdc1ddb029dbf9094 v7.4.095
-+acbe5414cb7f302f548bc1cbdc1ddb029dbf9094 v7-4-095
-+0000000000000000000000000000000000000000 v7-4-095
-+645358801356c7b1c53a1d3b1543781a669a7733 v7.4.096
-+645358801356c7b1c53a1d3b1543781a669a7733 v7-4-096
-+0000000000000000000000000000000000000000 v7-4-096
-+93c8296281dd64e513d52db9f745965926df5cab v7.4.097
-+93c8296281dd64e513d52db9f745965926df5cab v7-4-097
-+0000000000000000000000000000000000000000 v7-4-097
-+79a8bac614c0c565617b404764f28675687ad442 v7.4.098
-+79a8bac614c0c565617b404764f28675687ad442 v7-4-098
-+0000000000000000000000000000000000000000 v7-4-098
-+8451f643a13eaf22e35a45e6bdd47c8d5b24c222 v7.4.099
-+8451f643a13eaf22e35a45e6bdd47c8d5b24c222 v7-4-099
-+0000000000000000000000000000000000000000 v7-4-099
-+5ad60cd88339c6217fbea8cf4f92dae04ac1c71d v7.4.100
-+5ad60cd88339c6217fbea8cf4f92dae04ac1c71d v7-4-100
-+0000000000000000000000000000000000000000 v7-4-100
-+ec5d11403c1952b2ed192f28afb6261d0867bb20 v7.4.101
-+ec5d11403c1952b2ed192f28afb6261d0867bb20 v7-4-101
-+0000000000000000000000000000000000000000 v7-4-101
-+9417f4de27a2a6acfa6b1660ac6ef2b5692e4554 v7.4.102
-+9417f4de27a2a6acfa6b1660ac6ef2b5692e4554 v7-4-102
-+0000000000000000000000000000000000000000 v7-4-102
-+4db151014f93b7512919e452e6b3f4184758db7b v7.4.103
-+4db151014f93b7512919e452e6b3f4184758db7b v7-4-103
-+0000000000000000000000000000000000000000 v7-4-103
-+dd7d1a86b311c11e9c03b7ca95c7b62206bbc7ab v7.4.104
-+dd7d1a86b311c11e9c03b7ca95c7b62206bbc7ab v7-4-104
-+0000000000000000000000000000000000000000 v7-4-104
-+eed95874f30e9d9dad577f2361f2dfed93c5db4d v7.4.105
-+eed95874f30e9d9dad577f2361f2dfed93c5db4d v7-4-105
-+0000000000000000000000000000000000000000 v7-4-105
-+de9a01851ebd1ce1d225b40c182b6f1e105863a7 v7.4.106
-+de9a01851ebd1ce1d225b40c182b6f1e105863a7 v7-4-106
-+0000000000000000000000000000000000000000 v7-4-106
-+064e2a080e2e158177acc017c318bc953fb7535b v7.4.107
-+064e2a080e2e158177acc017c318bc953fb7535b v7-4-107
-+0000000000000000000000000000000000000000 v7-4-107
-+fa31c5b82424373885d2fa55b4f8531ac21baacd v7.4.108
-+fa31c5b82424373885d2fa55b4f8531ac21baacd v7-4-108
-+0000000000000000000000000000000000000000 v7-4-108
-+1cdf517067743dc33ebb9c7af8844abd9d9c7863 v7.4.109
-+1cdf517067743dc33ebb9c7af8844abd9d9c7863 v7-4-109
-+0000000000000000000000000000000000000000 v7-4-109
-+6e54d1b3408ca745341b0b219c588c265fa52494 v7.4.110
-+6e54d1b3408ca745341b0b219c588c265fa52494 v7-4-110
-+0000000000000000000000000000000000000000 v7-4-110
-+3fbda56bb2008e2459951f3ad0258ff0500ba07c v7.4.111
-+3fbda56bb2008e2459951f3ad0258ff0500ba07c v7-4-111
-+0000000000000000000000000000000000000000 v7-4-111
-+af8217e4ed7e28b797c628f067ebfd4433c07326 v7.4.112
-+af8217e4ed7e28b797c628f067ebfd4433c07326 v7-4-112
-+0000000000000000000000000000000000000000 v7-4-112
-+0e21e2a38ec6df5c4fe37d639906f56f9f445b96 v7.4.113
-+0e21e2a38ec6df5c4fe37d639906f56f9f445b96 v7-4-113
-+0000000000000000000000000000000000000000 v7-4-113
-+6db758f82227989426560c19fdd234b154b54419 v7.4.114
-+6db758f82227989426560c19fdd234b154b54419 v7-4-114
-+0000000000000000000000000000000000000000 v7-4-114
-+e35c69ad482370b2685bf1360a63fb27ce8b3819 v7.4.115
-+e35c69ad482370b2685bf1360a63fb27ce8b3819 v7-4-115
-+0000000000000000000000000000000000000000 v7-4-115
-+40aff213baff00d43ea8c1b6a9734ccad63a3921 v7.4.116
-+40aff213baff00d43ea8c1b6a9734ccad63a3921 v7-4-116
-+0000000000000000000000000000000000000000 v7-4-116
-+805ad8488dc88a575b841589f36c278aaead4e52 v7.4.117
-+805ad8488dc88a575b841589f36c278aaead4e52 v7-4-117
-+0000000000000000000000000000000000000000 v7-4-117
-+62c720661f81c17348636956c1158639d59e1e9f v7.4.118
-+62c720661f81c17348636956c1158639d59e1e9f v7-4-118
-+0000000000000000000000000000000000000000 v7-4-118
-+2f99966971b0556bc302ec809712f5ba3f030028 v7.4.119
-+2f99966971b0556bc302ec809712f5ba3f030028 v7-4-119
-+0000000000000000000000000000000000000000 v7-4-119
-+ca0e43bbf8f9e409130d5d1ce29621edbcdff92a v7.4.120
-+ca0e43bbf8f9e409130d5d1ce29621edbcdff92a v7-4-120
-+0000000000000000000000000000000000000000 v7-4-120
-+4bf53c1ef37a5023e06f3c6b4f1c24857b4f52a6 v7.4.121
-+4bf53c1ef37a5023e06f3c6b4f1c24857b4f52a6 v7-4-121
-+0000000000000000000000000000000000000000 v7-4-121
-+270c62fe685ae943de64e1a4ab295dae6f4ccabe v7.4.122
-+270c62fe685ae943de64e1a4ab295dae6f4ccabe v7-4-122
-+0000000000000000000000000000000000000000 v7-4-122
-+32e50f85d2c7a56c600a2c36107e56fa9f2952cb v7.4.123
-+32e50f85d2c7a56c600a2c36107e56fa9f2952cb v7-4-123
-+0000000000000000000000000000000000000000 v7-4-123
-+9faba192ea90a32ee137aa42f5027b098931ddb2 v7.4.124
-+9faba192ea90a32ee137aa42f5027b098931ddb2 v7-4-124
-+0000000000000000000000000000000000000000 v7-4-124
-+45ef9d2096e82d6a56a58606b6811620a61cb1ba v7.4.125
-+45ef9d2096e82d6a56a58606b6811620a61cb1ba v7-4-125
-+0000000000000000000000000000000000000000 v7-4-125
-+b14554844756422a39c72e62b8c2391c2d5a2e17 v7.4.126
-+b14554844756422a39c72e62b8c2391c2d5a2e17 v7-4-126
-+0000000000000000000000000000000000000000 v7-4-126
-+6f5a7d3943007afc6bc03c445380776e18787f0c v7.4.127
-+6f5a7d3943007afc6bc03c445380776e18787f0c v7-4-127
-+0000000000000000000000000000000000000000 v7-4-127
-+4b92012f6b18f56664c268200fb54f1316495dc5 v7.4.128
-+4b92012f6b18f56664c268200fb54f1316495dc5 v7-4-128
-+0000000000000000000000000000000000000000 v7-4-128
-+1e28c0fad344549665c60c62374e6f511e5aec76 v7.4.129
-+1e28c0fad344549665c60c62374e6f511e5aec76 v7-4-129
-+0000000000000000000000000000000000000000 v7-4-129
-+cf722c09236098ae585840d62eca68dbf8065247 v7.4.130
-+cf722c09236098ae585840d62eca68dbf8065247 v7-4-130
-+0000000000000000000000000000000000000000 v7-4-130
-+4b23119cb58473ab70cf1a1204d4d3fad83881ec v7.4.131
-+4b23119cb58473ab70cf1a1204d4d3fad83881ec v7-4-131
-+0000000000000000000000000000000000000000 v7-4-131
-+1b09d6792520cbe1c94c20f6c833ad57316e75bb v7.4.132
-+1b09d6792520cbe1c94c20f6c833ad57316e75bb v7-4-132
-+0000000000000000000000000000000000000000 v7-4-132
-+6a28a9cf51537b81da7e9ec3f70fea55e393b345 v7.4.133
-+6a28a9cf51537b81da7e9ec3f70fea55e393b345 v7-4-133
-+0000000000000000000000000000000000000000 v7-4-133
-+0defb460a0ebbc954b0f22267cb06e9d210be43a v7.4.134
-+0defb460a0ebbc954b0f22267cb06e9d210be43a v7-4-134
-+0000000000000000000000000000000000000000 v7-4-134
-+1aeb7f4d6527369cf5f9101813ce8f10caf7a869 v7.4.135
-+1aeb7f4d6527369cf5f9101813ce8f10caf7a869 v7-4-135
-+0000000000000000000000000000000000000000 v7-4-135
-+3881cd916014605875de128226b83a24d18afe46 v7.4.136
-+3881cd916014605875de128226b83a24d18afe46 v7-4-136
-+0000000000000000000000000000000000000000 v7-4-136
-+6fdb1d6646b6b256623edb05f9dd770eeacaeb05 v7.4.137
-+6fdb1d6646b6b256623edb05f9dd770eeacaeb05 v7-4-137
-+0000000000000000000000000000000000000000 v7-4-137
-+6eb60041548ce42748cd8d7d49bdbf9dd164c967 v7.4.138
-+6eb60041548ce42748cd8d7d49bdbf9dd164c967 v7-4-138
-+0000000000000000000000000000000000000000 v7-4-138
-+c8c80c9d2e2237fedeadfb1c6856c53c7a5e90d2 v7.4.139
-+c8c80c9d2e2237fedeadfb1c6856c53c7a5e90d2 v7-4-139
-+0000000000000000000000000000000000000000 v7-4-139
-+505cf1943dc238c2383dcbc37a93fbb136e1f08b v7.4.140
-+505cf1943dc238c2383dcbc37a93fbb136e1f08b v7-4-140
-+0000000000000000000000000000000000000000 v7-4-140
-+2ca470c6096e3ec7cbbedeb1d0281056b088812b v7.4.141
-+2ca470c6096e3ec7cbbedeb1d0281056b088812b v7-4-141
-+0000000000000000000000000000000000000000 v7-4-141
-+735b70faac4a54ca9d8ebc2303ba28d5d18017e2 v7.4.142
-+735b70faac4a54ca9d8ebc2303ba28d5d18017e2 v7-4-142
-+0000000000000000000000000000000000000000 v7-4-142
-+d11f223f4c753889fa8f974f295c2a0a451c653c v7.4.143
-+d11f223f4c753889fa8f974f295c2a0a451c653c v7-4-143
-+0000000000000000000000000000000000000000 v7-4-143
-+bcf25cc08236c2adc27a4d7d556e11e8ea6ddce2 v7.4.144
-+bcf25cc08236c2adc27a4d7d556e11e8ea6ddce2 v7-4-144
-+0000000000000000000000000000000000000000 v7-4-144
-+1098b7b6e147cdd324ac665340540922c2cdceb3 v7.4.145
-+1098b7b6e147cdd324ac665340540922c2cdceb3 v7-4-145
-+0000000000000000000000000000000000000000 v7-4-145
-+ec93f50f1d93c4c279606117a9f3eb37301b051a v7.4.146
-+ec93f50f1d93c4c279606117a9f3eb37301b051a v7-4-146
-+0000000000000000000000000000000000000000 v7-4-146
-+d289f2167d702c87493d1934db863df29676e261 v7.4.147
-+d289f2167d702c87493d1934db863df29676e261 v7-4-147
-+0000000000000000000000000000000000000000 v7-4-147
-+8507bf8874d816a79411bc74df71fa58b557b71d v7.4.148
-+8507bf8874d816a79411bc74df71fa58b557b71d v7-4-148
-+0000000000000000000000000000000000000000 v7-4-148
-+b43363a7b4c71a7a4e20dc21f4906f4595785983 v7.4.149
-+b43363a7b4c71a7a4e20dc21f4906f4595785983 v7-4-149
-+0000000000000000000000000000000000000000 v7-4-149
-+15960ebc2ee8539a1f15f660d43df1a502c34829 v7.4.150
-+15960ebc2ee8539a1f15f660d43df1a502c34829 v7-4-150
-+0000000000000000000000000000000000000000 v7-4-150
-+ec02e1474bc2bbfd73349e7fedf62ae45f941ad9 v7.4.151
-+ec02e1474bc2bbfd73349e7fedf62ae45f941ad9 v7-4-151
-+0000000000000000000000000000000000000000 v7-4-151
-+2ace11abcfb59f6e88c3a40aa1d849d335cfd993 v7.4.152
-+2ace11abcfb59f6e88c3a40aa1d849d335cfd993 v7-4-152
-+0000000000000000000000000000000000000000 v7-4-152
-+30e300c0b2c1c069d953afb258dba39c50772463 v7.4.153
-+30e300c0b2c1c069d953afb258dba39c50772463 v7-4-153
-+0000000000000000000000000000000000000000 v7-4-153
-+71837ace77dfdd6c01e0a334314a7c6c713a095c v7.4.154
-+71837ace77dfdd6c01e0a334314a7c6c713a095c v7-4-154
-+0000000000000000000000000000000000000000 v7-4-154
-+fa53233519c693591ce60f9270cf259c07d6cc26 v7.4.155
-+fa53233519c693591ce60f9270cf259c07d6cc26 v7-4-155
-+0000000000000000000000000000000000000000 v7-4-155
-+05a5cb0d6b37eb7806eb902a72d8b00dde48bc1c v7.4.156
-+05a5cb0d6b37eb7806eb902a72d8b00dde48bc1c v7-4-156
-+0000000000000000000000000000000000000000 v7-4-156
-+be61f315eafe5cbadbd00bf7275e004fe09779db v7.4.157
-+be61f315eafe5cbadbd00bf7275e004fe09779db v7-4-157
-+0000000000000000000000000000000000000000 v7-4-157
-+d59544f3022ba0a35af174d1085a321de6d3b9b4 v7.4.158
-+d59544f3022ba0a35af174d1085a321de6d3b9b4 v7-4-158
-+0000000000000000000000000000000000000000 v7-4-158
-+a95a151402be5155cd89f8758e2e09ca95473ad1 v7.4.159
-+a95a151402be5155cd89f8758e2e09ca95473ad1 v7-4-159
-+0000000000000000000000000000000000000000 v7-4-159
-+f29febf858be9c7df896cc86ea89c3da8823b4fb v7.4.160
-+f29febf858be9c7df896cc86ea89c3da8823b4fb v7-4-160
-+0000000000000000000000000000000000000000 v7-4-160
-+91f3908748c29b0e8e759ac4cdafc95e536eab9a v7.4.161
-+91f3908748c29b0e8e759ac4cdafc95e536eab9a v7-4-161
-+0000000000000000000000000000000000000000 v7-4-161
-+477665b4105fa80e3655981790e55fc9babfeed5 v7.4.162
-+477665b4105fa80e3655981790e55fc9babfeed5 v7-4-162
-+0000000000000000000000000000000000000000 v7-4-162
-+7db84aadd37aaf9d59f8f15dd6783a4e28dcb63c v7.4.163
-+7db84aadd37aaf9d59f8f15dd6783a4e28dcb63c v7-4-163
-+0000000000000000000000000000000000000000 v7-4-163
-+a01819fb6e2b5c270dac492ab2fe923ea9301651 v7.4.164
-+a01819fb6e2b5c270dac492ab2fe923ea9301651 v7-4-164
-+0000000000000000000000000000000000000000 v7-4-164
-+c82339d8fdae0d43d51cde5216c979a5c9415bc4 v7.4.165
-+c82339d8fdae0d43d51cde5216c979a5c9415bc4 v7-4-165
-+0000000000000000000000000000000000000000 v7-4-165
-+5d03c374712128077ac4c342aad02120ed98df70 v7.4.166
-+5d03c374712128077ac4c342aad02120ed98df70 v7-4-166
-+0000000000000000000000000000000000000000 v7-4-166
-+22387c8eec43ea8b1b704cad49c8f7187e2fd579 v7.4.167
-+22387c8eec43ea8b1b704cad49c8f7187e2fd579 v7-4-167
-+0000000000000000000000000000000000000000 v7-4-167
-+e61a2b709f693eea9108d475b9bab5ed10ac675d v7.4.168
-+e61a2b709f693eea9108d475b9bab5ed10ac675d v7-4-168
-+0000000000000000000000000000000000000000 v7-4-168
-+4e3a9dd25d428e7c08ed401afc244972e27e08e6 v7.4.169
-+4e3a9dd25d428e7c08ed401afc244972e27e08e6 v7-4-169
-+0000000000000000000000000000000000000000 v7-4-169
-+8122eab8fcdbbdaac62dfbf7c6458cb3e6f46b04 v7.4.170
-+8122eab8fcdbbdaac62dfbf7c6458cb3e6f46b04 v7-4-170
-+0000000000000000000000000000000000000000 v7-4-170
-+beb037a6c2708f539d50840637f70eed0811d93c v7.4.171
-+beb037a6c2708f539d50840637f70eed0811d93c v7-4-171
-+0000000000000000000000000000000000000000 v7-4-171
-+391e10afccf6879dcfab8b28cb1587a13eb835c0 v7.4.172
-+391e10afccf6879dcfab8b28cb1587a13eb835c0 v7-4-172
-+0000000000000000000000000000000000000000 v7-4-172
-+233ad7b960d0fbeb224b383918113b25c74ebe35 v7.4.173
-+233ad7b960d0fbeb224b383918113b25c74ebe35 v7-4-173
-+0000000000000000000000000000000000000000 v7-4-173
-+f2c8d86c460d75fec17a0527a2fe93ac7220693e v7.4.174
-+f2c8d86c460d75fec17a0527a2fe93ac7220693e v7-4-174
-+0000000000000000000000000000000000000000 v7-4-174
-+6b69d8dde19e32909f4ee3a6337e6a2ecfbb6f72 v7.4.175
-+6b69d8dde19e32909f4ee3a6337e6a2ecfbb6f72 v7-4-175
-+0000000000000000000000000000000000000000 v7-4-175
-+ae228baaec2c5eda4cd948382c2bab498d1a34cc v7.4.176
-+ae228baaec2c5eda4cd948382c2bab498d1a34cc v7-4-176
-+0000000000000000000000000000000000000000 v7-4-176
-+df3b0b70d8c1d29817597f45d19bb72755f86bd1 v7.4.177
-+df3b0b70d8c1d29817597f45d19bb72755f86bd1 v7-4-177
-+0000000000000000000000000000000000000000 v7-4-177
-+647e6bb15aa3f864eaf447fe77e3e3ae7e37b134 v7.4.178
-+647e6bb15aa3f864eaf447fe77e3e3ae7e37b134 v7-4-178
-+0000000000000000000000000000000000000000 v7-4-178
-+d1c8c1d6403485ff0135f0cf5c1ef07272a07173 v7.4.179
-+d1c8c1d6403485ff0135f0cf5c1ef07272a07173 v7-4-179
-+0000000000000000000000000000000000000000 v7-4-179
-+b1b8b097539a001043d1f0aac4663d6ee358dee8 v7.4.180
-+b1b8b097539a001043d1f0aac4663d6ee358dee8 v7-4-180
-+0000000000000000000000000000000000000000 v7-4-180
-+cb5683bcde03796baa7e845fd9a2fcaec3383538 v7.4.181
-+cb5683bcde03796baa7e845fd9a2fcaec3383538 v7-4-181
-+0000000000000000000000000000000000000000 v7-4-181
-+708a6a5905217736a2a231e36ced82f9535c4954 v7.4.182
-+708a6a5905217736a2a231e36ced82f9535c4954 v7-4-182
-+0000000000000000000000000000000000000000 v7-4-182
-+1e2bfe4f3e903110f27cb6231f6642e721808837 v7.4.183
-+1e2bfe4f3e903110f27cb6231f6642e721808837 v7-4-183
-+0000000000000000000000000000000000000000 v7-4-183
-+9ac2fc63501d3eff92446c03b2822b30b169db5a v7.4.184
-+9ac2fc63501d3eff92446c03b2822b30b169db5a v7-4-184
-+0000000000000000000000000000000000000000 v7-4-184
-+b06e58f8dd3037f7f17145968d08432423ac8665 v7.4.185
-+b06e58f8dd3037f7f17145968d08432423ac8665 v7-4-185
-+0000000000000000000000000000000000000000 v7-4-185
-+4d12112c5efae071aecbeed1a7196f18950457b3 v7.4.186
-+4d12112c5efae071aecbeed1a7196f18950457b3 v7-4-186
-+0000000000000000000000000000000000000000 v7-4-186
-+a1c07956171a133583df42627d3498f935e59988 v7.4.187
-+a1c07956171a133583df42627d3498f935e59988 v7-4-187
-+0000000000000000000000000000000000000000 v7-4-187
-+136f05449f29388e9023f7934d6344bf4ca61d0f v7.4.188
-+136f05449f29388e9023f7934d6344bf4ca61d0f v7-4-188
-+0000000000000000000000000000000000000000 v7-4-188
-+0a9990bbd94a7dbdf20ca3f897cdf364c356d228 v7.4.189
-+0a9990bbd94a7dbdf20ca3f897cdf364c356d228 v7-4-189
-+0000000000000000000000000000000000000000 v7-4-189
-+6050f52d7cd8d6f79ed5ee8ef3efff332aca4932 v7.4.190
-+6050f52d7cd8d6f79ed5ee8ef3efff332aca4932 v7-4-190
-+0000000000000000000000000000000000000000 v7-4-190
-+40f18a1c1592c8b4047f6f2a413557f48a99c55f v7.4.191
-+40f18a1c1592c8b4047f6f2a413557f48a99c55f v7-4-191
-+0000000000000000000000000000000000000000 v7-4-191
-+04c4ef8c0a1b757494500e46400552b135135e94 v7.4.192
-+04c4ef8c0a1b757494500e46400552b135135e94 v7-4-192
-+0000000000000000000000000000000000000000 v7-4-192
-+a8650e2a0b5a5936f7d503429180df47df2aa775 v7.4.193
-+a8650e2a0b5a5936f7d503429180df47df2aa775 v7-4-193
-+0000000000000000000000000000000000000000 v7-4-193
-+767103b5bcb05171fc1be0d6f480e0aa39aff731 v7.4.194
-+767103b5bcb05171fc1be0d6f480e0aa39aff731 v7-4-194
-+0000000000000000000000000000000000000000 v7-4-194
-+c2e88a40d530b7999cd29218555515bcd282d661 v7.4.195
-+c2e88a40d530b7999cd29218555515bcd282d661 v7-4-195
-+0000000000000000000000000000000000000000 v7-4-195
-+1ed6acdbfef55e6e80aea55c8bc52d05f8458bbd v7.4.196
-+1ed6acdbfef55e6e80aea55c8bc52d05f8458bbd v7-4-196
-+0000000000000000000000000000000000000000 v7-4-196
-+47a673b20e493db91844999f74aa3724808ac624 v7.4.197
-+47a673b20e493db91844999f74aa3724808ac624 v7-4-197
-+0000000000000000000000000000000000000000 v7-4-197
-+705f398ce6f58016fae80c945a570721fc989117 v7.4.198
-+705f398ce6f58016fae80c945a570721fc989117 v7-4-198
-+0000000000000000000000000000000000000000 v7-4-198
-+54b1a90c937380195fad6a52408aa3b4eed6d8d1 v7.4.199
-+54b1a90c937380195fad6a52408aa3b4eed6d8d1 v7-4-199
-+0000000000000000000000000000000000000000 v7-4-199
-+0559091e6f09b5b96619513639ac14578a019612 v7.4.200
-+0559091e6f09b5b96619513639ac14578a019612 v7-4-200
-+0000000000000000000000000000000000000000 v7-4-200
-+06e5f65c34d8136c3a9d2219429b7eca35cb3a21 v7.4.201
-+06e5f65c34d8136c3a9d2219429b7eca35cb3a21 v7-4-201
-+0000000000000000000000000000000000000000 v7-4-201
-+22d7af9ff3e5e2b93fdbe8603df2f15155a5976b v7.4.202
-+22d7af9ff3e5e2b93fdbe8603df2f15155a5976b v7-4-202
-+0000000000000000000000000000000000000000 v7-4-202
-+fb24b025c7cf07db79a559a3091db42e02c1af86 v7.4.203
-+fb24b025c7cf07db79a559a3091db42e02c1af86 v7-4-203
-+0000000000000000000000000000000000000000 v7-4-203
-+f5120cbf16b9a9c6e0fbb599a6524e05ecf11393 v7.4.204
-+f5120cbf16b9a9c6e0fbb599a6524e05ecf11393 v7-4-204
-+0000000000000000000000000000000000000000 v7-4-204
-+0ace3a24c2a0153f0aaf9b619d3958e7f486705f v7.4.205
-+0ace3a24c2a0153f0aaf9b619d3958e7f486705f v7-4-205
-+0000000000000000000000000000000000000000 v7-4-205
-+7e826028d3999b6125b4741d45b22a2d0a520679 v7.4.206
-+7e826028d3999b6125b4741d45b22a2d0a520679 v7-4-206
-+0000000000000000000000000000000000000000 v7-4-206
-+2aa909427e44cd3aac7def024b66e41d0c9d0e0d v7.4.207
-+2aa909427e44cd3aac7def024b66e41d0c9d0e0d v7-4-207
-+0000000000000000000000000000000000000000 v7-4-207
-+9b5541e276aa56fd72c3bbba85a17ef023c54ba8 v7.4.208
-+9b5541e276aa56fd72c3bbba85a17ef023c54ba8 v7-4-208
-+0000000000000000000000000000000000000000 v7-4-208
-+bb402c49379de97fcd475fbbbbdc5ed41e5dff07 v7.4.209
-+bb402c49379de97fcd475fbbbbdc5ed41e5dff07 v7-4-209
-+0000000000000000000000000000000000000000 v7-4-209
-+420fd9cb86d51a92c4307a746557e81914c6d6c4 v7.4.210
-+420fd9cb86d51a92c4307a746557e81914c6d6c4 v7-4-210
-+0000000000000000000000000000000000000000 v7-4-210
-+e90bef2240c8d187da6e8d8fa5007ec5afc12284 v7.4.211
-+e90bef2240c8d187da6e8d8fa5007ec5afc12284 v7-4-211
-+0000000000000000000000000000000000000000 v7-4-211
-+50dbef5e774af6a998d1798569566429c38378b1 v7.4.212
-+50dbef5e774af6a998d1798569566429c38378b1 v7-4-212
-+0000000000000000000000000000000000000000 v7-4-212
-+e25a04c1c515e6eb32197291472f89bcadfabf89 v7.4.213
-+e25a04c1c515e6eb32197291472f89bcadfabf89 v7-4-213
-+0000000000000000000000000000000000000000 v7-4-213
-+fe02fdfbdec077d0dc501bca0c65c51e56e1bd11 v7.4.214
-+fe02fdfbdec077d0dc501bca0c65c51e56e1bd11 v7-4-214
-+0000000000000000000000000000000000000000 v7-4-214
-+f069a3a0f84451aa498c6c22d8f922d1e695e96d v7.4.215
-+f069a3a0f84451aa498c6c22d8f922d1e695e96d v7-4-215
-+0000000000000000000000000000000000000000 v7-4-215
-+bf1775553d3bf561e289bbf367d014915d09eaad v7.4.216
-+bf1775553d3bf561e289bbf367d014915d09eaad v7-4-216
-+0000000000000000000000000000000000000000 v7-4-216
-+2f225a17c26b26eab87cfb89142fc0f95726ee92 v7.4.217
-+2f225a17c26b26eab87cfb89142fc0f95726ee92 v7-4-217
-+0000000000000000000000000000000000000000 v7-4-217
-+ddc3f32a4b2191f829206322d46f0e9c7e365e22 v7.4.218
-+ddc3f32a4b2191f829206322d46f0e9c7e365e22 v7-4-218
-+0000000000000000000000000000000000000000 v7-4-218
-+37af1e6e91bb1e8ceb89d3ba1c49a04ffd889880 v7.4.219
-+37af1e6e91bb1e8ceb89d3ba1c49a04ffd889880 v7-4-219
-+0000000000000000000000000000000000000000 v7-4-219
-+1e272e318daaba51ec932be83a2481987a133429 v7.4.220
-+1e272e318daaba51ec932be83a2481987a133429 v7-4-220
-+0000000000000000000000000000000000000000 v7-4-220
-+a548aae15b3a27a56d814900049785c29c01a37a v7.4.221
-+a548aae15b3a27a56d814900049785c29c01a37a v7-4-221
-+0000000000000000000000000000000000000000 v7-4-221
-+9123b4d3ef05c7434b6f6cd011b63f63a9a4a539 v7.4.222
-+9123b4d3ef05c7434b6f6cd011b63f63a9a4a539 v7-4-222
-+0000000000000000000000000000000000000000 v7-4-222
-+4b78922d557c324de6b6a75515fb658235fa782c v7.4.223
-+4b78922d557c324de6b6a75515fb658235fa782c v7-4-223
-+0000000000000000000000000000000000000000 v7-4-223
-+092b8f61021b91024b127de3983d1afb74b64996 v7.4.224
-+092b8f61021b91024b127de3983d1afb74b64996 v7-4-224
-+0000000000000000000000000000000000000000 v7-4-224
-+eeb150c07647b3691d2696a3a4cdb96f6db5a63e v7.4.225
-+eeb150c07647b3691d2696a3a4cdb96f6db5a63e v7-4-225
-+0000000000000000000000000000000000000000 v7-4-225
-+b650f2db8f9604124c0ddfb14af0c04bd4ae0580 v7.4.226
-+b650f2db8f9604124c0ddfb14af0c04bd4ae0580 v7-4-226
-+0000000000000000000000000000000000000000 v7-4-226
-+b0a9df477096e4abe938f998476e84e77db42e0b v7.4.227
-+b0a9df477096e4abe938f998476e84e77db42e0b v7-4-227
-+0000000000000000000000000000000000000000 v7-4-227
-+3ee5808a293c7436e34a696a09ed29ce38750d9a v7.4.228
-+3ee5808a293c7436e34a696a09ed29ce38750d9a v7-4-228
-+0000000000000000000000000000000000000000 v7-4-228
-+839cca5ec18d560e3714065e54ed38b6e812aaf7 v7.4.229
-+839cca5ec18d560e3714065e54ed38b6e812aaf7 v7-4-229
-+0000000000000000000000000000000000000000 v7-4-229
-+57ecd7a8c0f052296b41b916eb1ae7f2a9a48b27 v7.4.230
-+57ecd7a8c0f052296b41b916eb1ae7f2a9a48b27 v7-4-230
-+0000000000000000000000000000000000000000 v7-4-230
-+0a295a3c9e473512ad3b006a0fb752ad43d19094 v7.4.231
-+0a295a3c9e473512ad3b006a0fb752ad43d19094 v7-4-231
-+0000000000000000000000000000000000000000 v7-4-231
-+845608965bd9d0b2755997a7be812746885ff105 v7.4.232
-+845608965bd9d0b2755997a7be812746885ff105 v7-4-232
-+0000000000000000000000000000000000000000 v7-4-232
-+22a1d5762ba3a75984e89dcc47a65498f63a6c2c v7.4.233
-+22a1d5762ba3a75984e89dcc47a65498f63a6c2c v7-4-233
-+0000000000000000000000000000000000000000 v7-4-233
-+d2286df8719d6e99c743e3bf6ac14d1f9debc84d v7.4.234
-+d2286df8719d6e99c743e3bf6ac14d1f9debc84d v7-4-234
-+0000000000000000000000000000000000000000 v7-4-234
-+5ab2946f7ce560985830fbc3c453bb0f7a01f385 v7.4.235
-+5ab2946f7ce560985830fbc3c453bb0f7a01f385 v7-4-235
-+0000000000000000000000000000000000000000 v7-4-235
-+a44087db72386d080e9da870d751daf498004be8 v7.4.236
-+a44087db72386d080e9da870d751daf498004be8 v7-4-236
-+0000000000000000000000000000000000000000 v7-4-236
-+71b165a378ad580818f6d497ecf0f8ad054a9683 v7.4.237
-+71b165a378ad580818f6d497ecf0f8ad054a9683 v7-4-237
-+0000000000000000000000000000000000000000 v7-4-237
-+410ef4f1a3d2f4a6ecad9aaa87dae645d1578a19 v7.4.238
-+410ef4f1a3d2f4a6ecad9aaa87dae645d1578a19 v7-4-238
-+0000000000000000000000000000000000000000 v7-4-238
-+98bfec9ea7608f312129475d4ca0ae6d1c6c232e v7.4.239
-+98bfec9ea7608f312129475d4ca0ae6d1c6c232e v7-4-239
-+0000000000000000000000000000000000000000 v7-4-239
-+8d1ba0a23588932d22ad37cbd87ae3bbd4bfeff8 v7.4.240
-+8d1ba0a23588932d22ad37cbd87ae3bbd4bfeff8 v7-4-240
-+0000000000000000000000000000000000000000 v7-4-240
-+a63d0cd691dc925283815d17d62f4e948d723a59 v7.4.241
-+a63d0cd691dc925283815d17d62f4e948d723a59 v7-4-241
-+0000000000000000000000000000000000000000 v7-4-241
-+f084024c0ddbba46aabfafa2996c3f7d13080ab6 v7.4.242
-+f084024c0ddbba46aabfafa2996c3f7d13080ab6 v7-4-242
-+0000000000000000000000000000000000000000 v7-4-242
-+9f8fa56f1906f4f634cd602a7a2b4f8631faf526 v7.4.243
-+9f8fa56f1906f4f634cd602a7a2b4f8631faf526 v7-4-243
-+0000000000000000000000000000000000000000 v7-4-243
-+da17c7de616e3829e4f59923ffa138a067928d9e v7.4.244
-+da17c7de616e3829e4f59923ffa138a067928d9e v7-4-244
-+0000000000000000000000000000000000000000 v7-4-244
-+80421d934ebde183ce545ab8d9eb3a4c2065c169 v7.4.245
-+80421d934ebde183ce545ab8d9eb3a4c2065c169 v7-4-245
-+0000000000000000000000000000000000000000 v7-4-245
-+2cbac5608217cdce725a0f04d397d4466a3322fe v7.4.246
-+2cbac5608217cdce725a0f04d397d4466a3322fe v7-4-246
-+0000000000000000000000000000000000000000 v7-4-246
-+76863b4b48a3684905527dcc688e5a8c4c5e23d9 v7.4.247
-+76863b4b48a3684905527dcc688e5a8c4c5e23d9 v7-4-247
-+0000000000000000000000000000000000000000 v7-4-247
-+e5f1f2ea0b4a4834791924880f78272ef52eb087 v7.4.248
-+e5f1f2ea0b4a4834791924880f78272ef52eb087 v7-4-248
-+0000000000000000000000000000000000000000 v7-4-248
-+0b9a66ea49f435536745be0e0a6154be7b607249 v7.4.249
-+0b9a66ea49f435536745be0e0a6154be7b607249 v7-4-249
-+0000000000000000000000000000000000000000 v7-4-249
-+a8f3f45896288bd7e0a27e0c28c3cc3457ccc507 v7.4.250
-+a8f3f45896288bd7e0a27e0c28c3cc3457ccc507 v7-4-250
-+0000000000000000000000000000000000000000 v7-4-250
-+29eb4c2a33ac701bfcd4d2e2bed7864eba876e0e v7.4.251
-+29eb4c2a33ac701bfcd4d2e2bed7864eba876e0e v7-4-251
-+0000000000000000000000000000000000000000 v7-4-251
-+a43a8262e1ceffc393625c53a1ffed9e6bcaba62 v7.4.252
-+a43a8262e1ceffc393625c53a1ffed9e6bcaba62 v7-4-252
-+0000000000000000000000000000000000000000 v7-4-252
-+4901a36479f200b2e6700ad91c26911d92deb886 v7.4.253
-+4901a36479f200b2e6700ad91c26911d92deb886 v7-4-253
-+0000000000000000000000000000000000000000 v7-4-253
-+251acc686ca41e4bccb037ef44cd7b486774d580 v7.4.254
-+251acc686ca41e4bccb037ef44cd7b486774d580 v7-4-254
-+0000000000000000000000000000000000000000 v7-4-254
-+5595506b985a198abae41ab0150ee50b8bf1686c v7.4.255
-+5595506b985a198abae41ab0150ee50b8bf1686c v7-4-255
-+0000000000000000000000000000000000000000 v7-4-255
-+afb542ea210cb9fc5fa8c5359bb4814370024b80 v7.4.256
-+afb542ea210cb9fc5fa8c5359bb4814370024b80 v7-4-256
-+0000000000000000000000000000000000000000 v7-4-256
-+17903ded5e9a9d49ca73b324657b944f2954d4fd v7.4.257
-+17903ded5e9a9d49ca73b324657b944f2954d4fd v7-4-257
-+0000000000000000000000000000000000000000 v7-4-257
-+e8ffd1e6c8dc62c604d34e879791404bd15cab33 v7.4.258
-+e8ffd1e6c8dc62c604d34e879791404bd15cab33 v7-4-258
-+0000000000000000000000000000000000000000 v7-4-258
-+e4cd5bb75029d2c1208f3e31ebde4e03b16e8123 v7.4.259
-+e4cd5bb75029d2c1208f3e31ebde4e03b16e8123 v7-4-259
-+0000000000000000000000000000000000000000 v7-4-259
-+6bc874e4789a0f912b4fd6b23afecf19d80b1605 v7.4.260
-+6bc874e4789a0f912b4fd6b23afecf19d80b1605 v7-4-260
-+0000000000000000000000000000000000000000 v7-4-260
-+43c6cd07c8defd8505acbe479c6970764c08e6f9 v7.4.261
-+43c6cd07c8defd8505acbe479c6970764c08e6f9 v7-4-261
-+0000000000000000000000000000000000000000 v7-4-261
-+0ea551fa607dc443b97c2fba97dc0c9cb0bcf303 v7.4.262
-+0ea551fa607dc443b97c2fba97dc0c9cb0bcf303 v7-4-262
-+0000000000000000000000000000000000000000 v7-4-262
-+af1bb39774f41c28eabd24d80cffc775695bc124 v7.4.263
-+af1bb39774f41c28eabd24d80cffc775695bc124 v7-4-263
-+0000000000000000000000000000000000000000 v7-4-263
-+00acac0af680c2d8c82db5258474b121a5908926 v7.4.264
-+00acac0af680c2d8c82db5258474b121a5908926 v7-4-264
-+0000000000000000000000000000000000000000 v7-4-264
-+8ec9d2196bee0c5108f2d2c196a660a7f4e5f29f v7.4.265
-+8ec9d2196bee0c5108f2d2c196a660a7f4e5f29f v7-4-265
-+0000000000000000000000000000000000000000 v7-4-265
-+8f84e906d454a95d3167678a745dde9de442b604 v7.4.266
-+8f84e906d454a95d3167678a745dde9de442b604 v7-4-266
-+0000000000000000000000000000000000000000 v7-4-266
-+75f222d67cea335efbe0274de6340dba174c1e7e v7.4.267
-+75f222d67cea335efbe0274de6340dba174c1e7e v7-4-267
-+0000000000000000000000000000000000000000 v7-4-267
-+1a5ed2626b26a982e307a206572121a557adf709 v7.4.268
-+1a5ed2626b26a982e307a206572121a557adf709 v7-4-268
-+0000000000000000000000000000000000000000 v7-4-268
-+81c26975e8f9dc7435353581346542409403f296 v7.4.269
-+81c26975e8f9dc7435353581346542409403f296 v7-4-269
-+0000000000000000000000000000000000000000 v7-4-269
-+c519c446c5488bfd48c93a03efae4ae3e0c1f162 v7.4.270
-+c519c446c5488bfd48c93a03efae4ae3e0c1f162 v7-4-270
-+0000000000000000000000000000000000000000 v7-4-270
-+88b0571de4327ba5127a483493bd7d46e6a9850e v7.4.271
-+88b0571de4327ba5127a483493bd7d46e6a9850e v7-4-271
-+0000000000000000000000000000000000000000 v7-4-271
-+00228400629e28384f7f52556c3c119ba0d0a44d v7.4.272
-+00228400629e28384f7f52556c3c119ba0d0a44d v7-4-272
-+0000000000000000000000000000000000000000 v7-4-272
-+747afb6a6de437131d9674e6b2bcc73d74863a89 v7.4.273
-+747afb6a6de437131d9674e6b2bcc73d74863a89 v7-4-273
-+0000000000000000000000000000000000000000 v7-4-273
-+1ee3fc5b40ae94c2a7fc5a62bca38d4f730f9bb2 v7.4.274
-+1ee3fc5b40ae94c2a7fc5a62bca38d4f730f9bb2 v7-4-274
-+0000000000000000000000000000000000000000 v7-4-274
-+8a3117a4887c1e12a1165c9719491f96753787d6 v7.4.275
-+8a3117a4887c1e12a1165c9719491f96753787d6 v7-4-275
-+0000000000000000000000000000000000000000 v7-4-275
-+a6b59ee633a355095e6473ec5e2a7d9088bfb853 v7.4.276
-+a6b59ee633a355095e6473ec5e2a7d9088bfb853 v7-4-276
-+0000000000000000000000000000000000000000 v7-4-276
-+373204662d82e894b27ee76bc3319bc62c91f6ae v7.4.277
-+373204662d82e894b27ee76bc3319bc62c91f6ae v7-4-277
-+0000000000000000000000000000000000000000 v7-4-277
-+b4ce0e1fb5a67d7d6b0bca8eaa3edc2e94a085d8 v7.4.278
-+b4ce0e1fb5a67d7d6b0bca8eaa3edc2e94a085d8 v7-4-278
-+0000000000000000000000000000000000000000 v7-4-278
-+8e9db1f27a0063df023cc05a760fce73255dad24 v7.4.279
-+8e9db1f27a0063df023cc05a760fce73255dad24 v7-4-279
-+0000000000000000000000000000000000000000 v7-4-279
-+daf7e98675cf395e1ef96f8040567affb2782a11 v7.4.280
-+daf7e98675cf395e1ef96f8040567affb2782a11 v7-4-280
-+0000000000000000000000000000000000000000 v7-4-280
-+24c90f1fec859b54cf2b854b98c4c9e614c46061 v7.4.281
-+24c90f1fec859b54cf2b854b98c4c9e614c46061 v7-4-281
-+0000000000000000000000000000000000000000 v7-4-281
-+6d0a1132dd71c7f55f7ed53fe99e97c79bfd05a4 v7.4.282
-+6d0a1132dd71c7f55f7ed53fe99e97c79bfd05a4 v7-4-282
-+0000000000000000000000000000000000000000 v7-4-282
-+aa99d04fa7e288a8580e3a5d4a9d6433a1572b48 v7.4.283
-+aa99d04fa7e288a8580e3a5d4a9d6433a1572b48 v7-4-283
-+0000000000000000000000000000000000000000 v7-4-283
-+3c35ca9666e88a8024af6dab585b8e79ab295f83 v7.4.284
-+3c35ca9666e88a8024af6dab585b8e79ab295f83 v7-4-284
-+0000000000000000000000000000000000000000 v7-4-284
-+5cb1828fd0056de3c166e71fbafc67a74c57d7b1 v7.4.285
-+5cb1828fd0056de3c166e71fbafc67a74c57d7b1 v7-4-285
-+0000000000000000000000000000000000000000 v7-4-285
-+be19015ef43cc17825929206790696c2e716035d v7.4.286
-+be19015ef43cc17825929206790696c2e716035d v7-4-286
-+0000000000000000000000000000000000000000 v7-4-286
-+66fe4908b649ba18426af6f69e8ccb01b487dcbd v7.4.287
-+66fe4908b649ba18426af6f69e8ccb01b487dcbd v7-4-287
-+0000000000000000000000000000000000000000 v7-4-287
-+7965cb6a435ae1ea331c7c2f8740d3d4c3625f3b v7.4.288
-+7965cb6a435ae1ea331c7c2f8740d3d4c3625f3b v7-4-288
-+0000000000000000000000000000000000000000 v7-4-288
-+99374096a76b96d1128f5e6aa1fa92b4ba70fee9 v7.4.289
-+99374096a76b96d1128f5e6aa1fa92b4ba70fee9 v7-4-289
-+0000000000000000000000000000000000000000 v7-4-289
-+b871734bf54ea185dbd2cc759d86dbfbe21cde26 v7.4.290
-+b871734bf54ea185dbd2cc759d86dbfbe21cde26 v7-4-290
-+0000000000000000000000000000000000000000 v7-4-290
-+b5972833add9de714f4651e26fd9ea63ec4a880c v7.4.291
-+b5972833add9de714f4651e26fd9ea63ec4a880c v7-4-291
-+0000000000000000000000000000000000000000 v7-4-291
-+60cdaa05a6ad31cef55eb6b3dc1f57ecac6fcf79 v7.4.292
-+60cdaa05a6ad31cef55eb6b3dc1f57ecac6fcf79 v7-4-292
-+0000000000000000000000000000000000000000 v7-4-292
-+10fc95f48546f438648b8357062e93c9c2c0a377 v7.4.293
-+10fc95f48546f438648b8357062e93c9c2c0a377 v7-4-293
-+0000000000000000000000000000000000000000 v7-4-293
-+fdea5ea9afd139ea59dee6bdb3f1675b8b882bdf v7.4.294
-+fdea5ea9afd139ea59dee6bdb3f1675b8b882bdf v7-4-294
-+0000000000000000000000000000000000000000 v7-4-294
-+662ae48e7e246a63d38c9f3165b15b62252edaee v7.4.295
-+662ae48e7e246a63d38c9f3165b15b62252edaee v7-4-295
-+0000000000000000000000000000000000000000 v7-4-295
-+53b87d790574b6d19034fb3390987c22fb928c58 v7.4.296
-+53b87d790574b6d19034fb3390987c22fb928c58 v7-4-296
-+0000000000000000000000000000000000000000 v7-4-296
-+81f5a056b2a582c8109da10cc538dc16a326a34d v7.4.297
-+81f5a056b2a582c8109da10cc538dc16a326a34d v7-4-297
-+0000000000000000000000000000000000000000 v7-4-297
-+156f891d520e93eab5d3ce02784660fb13a3b0d3 v7.4.298
-+156f891d520e93eab5d3ce02784660fb13a3b0d3 v7-4-298
-+0000000000000000000000000000000000000000 v7-4-298
-+daebf8ce66089c0c179fb436ceba359ef8d593d5 v7.4.299
-+daebf8ce66089c0c179fb436ceba359ef8d593d5 v7-4-299
-+0000000000000000000000000000000000000000 v7-4-299
-+1157079ca5f167bcf8746dfc52ea5a85e6c87a30 v7.4.300
-+1157079ca5f167bcf8746dfc52ea5a85e6c87a30 v7-4-300
-+0000000000000000000000000000000000000000 v7-4-300
-+8cb42aa3c4957a543e5dffe307475dbab969612f v7.4.301
-+8cb42aa3c4957a543e5dffe307475dbab969612f v7-4-301
-+0000000000000000000000000000000000000000 v7-4-301
-+df141c80ea3a1ffcbf82d05c1314675231fcfa75 v7.4.302
-+df141c80ea3a1ffcbf82d05c1314675231fcfa75 v7-4-302
-+0000000000000000000000000000000000000000 v7-4-302
-+463ef551e9f62b63ac3f85f1f297b668b14bcd09 v7.4.303
-+463ef551e9f62b63ac3f85f1f297b668b14bcd09 v7-4-303
-+0000000000000000000000000000000000000000 v7-4-303
-+fed2e0967f8133ba9a44b0701f151c8d88c4896a v7.4.304
-+fed2e0967f8133ba9a44b0701f151c8d88c4896a v7-4-304
-+0000000000000000000000000000000000000000 v7-4-304
-+63e7cc62402dffb180b40c04c63ceeb5f53957d7 v7.4.305
-+63e7cc62402dffb180b40c04c63ceeb5f53957d7 v7-4-305
-+0000000000000000000000000000000000000000 v7-4-305
-+05e1d8afcc5e375bf708ccc9810e2fd1a5a8a3cf v7.4.306
-+05e1d8afcc5e375bf708ccc9810e2fd1a5a8a3cf v7-4-306
-+0000000000000000000000000000000000000000 v7-4-306
-+06c10522d321d98874546b2a4d3b0ae145386f2e v7.4.307
-+06c10522d321d98874546b2a4d3b0ae145386f2e v7-4-307
-+0000000000000000000000000000000000000000 v7-4-307
-+e3d2b8d83bb30c428a051f50791e454fcbc080af v7.4.308
-+e3d2b8d83bb30c428a051f50791e454fcbc080af v7-4-308
-+0000000000000000000000000000000000000000 v7-4-308
-+88a6e9f33822d33b6c32db578750c6c178c63f50 v7.4.309
-+88a6e9f33822d33b6c32db578750c6c178c63f50 v7-4-309
-+0000000000000000000000000000000000000000 v7-4-309
-+ccac0aa34eeaf46dad4b831461a532fc3fe71096 v7.4.310
-+ccac0aa34eeaf46dad4b831461a532fc3fe71096 v7-4-310
-+0000000000000000000000000000000000000000 v7-4-310
-+f6f7543043246107075f0d3739c471d51b7226da v7.4.311
-+f6f7543043246107075f0d3739c471d51b7226da v7-4-311
-+0000000000000000000000000000000000000000 v7-4-311
-+66eead134d6800fd4cf2d5d4b135d300c933f09a v7.4.312
-+66eead134d6800fd4cf2d5d4b135d300c933f09a v7-4-312
-+0000000000000000000000000000000000000000 v7-4-312
-+332a5c2b2956d9b18d85268a724d01deea27ec83 v7.4.313
-+332a5c2b2956d9b18d85268a724d01deea27ec83 v7-4-313
-+0000000000000000000000000000000000000000 v7-4-313
-+4d7af1962d6ce61df65fdc5c86544a61951f9517 v7.4.314
-+4d7af1962d6ce61df65fdc5c86544a61951f9517 v7-4-314
-+0000000000000000000000000000000000000000 v7-4-314
-+646616b6ff4defcc7bef0b198b540f6d965a8126 v7.4.315
-+646616b6ff4defcc7bef0b198b540f6d965a8126 v7-4-315
-+0000000000000000000000000000000000000000 v7-4-315
-+0fc665889e8f0af532cb4e3be2f0ff0421bf2fbc v7.4.316
-+0fc665889e8f0af532cb4e3be2f0ff0421bf2fbc v7-4-316
-+0000000000000000000000000000000000000000 v7-4-316
-+8ffcb546d782121dfc9d88c7edc6f62421efce89 v7.4.317
-+8ffcb546d782121dfc9d88c7edc6f62421efce89 v7-4-317
-+0000000000000000000000000000000000000000 v7-4-317
-+5c47dacf397c1c65d2dfc237b3ff395c66ec3d4d v7.4.318
-+5c47dacf397c1c65d2dfc237b3ff395c66ec3d4d v7-4-318
-+0000000000000000000000000000000000000000 v7-4-318
-+a076237d1c3849535681e82946a9041ed5525d7f v7.4.319
-+a076237d1c3849535681e82946a9041ed5525d7f v7-4-319
-+0000000000000000000000000000000000000000 v7-4-319
-+f7bc601823e5c81e2ca412506a42eff9fd790ace v7.4.320
-+f7bc601823e5c81e2ca412506a42eff9fd790ace v7-4-320
-+0000000000000000000000000000000000000000 v7-4-320
-+c052937aae8ca5082f308b8ff0712c7eccdd30c8 v7.4.321
-+c052937aae8ca5082f308b8ff0712c7eccdd30c8 v7-4-321
-+0000000000000000000000000000000000000000 v7-4-321
-+fd96c55d683d76ece4ba01490d9796c13c988cdc v7.4.322
-+fd96c55d683d76ece4ba01490d9796c13c988cdc v7-4-322
-+0000000000000000000000000000000000000000 v7-4-322
-+238f5027830cad22e17a970483af9b160869cdf3 v7.4.323
-+238f5027830cad22e17a970483af9b160869cdf3 v7-4-323
-+0000000000000000000000000000000000000000 v7-4-323
-+c476e0ac8b406693c3877baffa0e97ff25e59b06 v7.4.324
-+c476e0ac8b406693c3877baffa0e97ff25e59b06 v7-4-324
-+0000000000000000000000000000000000000000 v7-4-324
-+1f288d2475488c3f44c7248e99019e2612580716 v7.4.325
-+1f288d2475488c3f44c7248e99019e2612580716 v7-4-325
-+0000000000000000000000000000000000000000 v7-4-325
-+1dbcb23ae7a8b68ddbc28b4feb794c4c1db12395 v7.4.326
-+1dbcb23ae7a8b68ddbc28b4feb794c4c1db12395 v7-4-326
-+0000000000000000000000000000000000000000 v7-4-326
-+99d8f2d72dcd4b850de81998cc9b1120c8165762 v7.4.327
-+99d8f2d72dcd4b850de81998cc9b1120c8165762 v7-4-327
-+0000000000000000000000000000000000000000 v7-4-327
-+01d9ffdd6e6ffb39faf946e13ec63bd7dc31e162 v7.4.328
-+01d9ffdd6e6ffb39faf946e13ec63bd7dc31e162 v7-4-328
-+0000000000000000000000000000000000000000 v7-4-328
-+018df65085f8990c1407442f8c783d4cee72a479 v7.4.329
-+018df65085f8990c1407442f8c783d4cee72a479 v7-4-329
-+0000000000000000000000000000000000000000 v7-4-329
-+f9fa2e506b9f07549cd91074835c5c553db7b3a7 v7.4.330
-+f9fa2e506b9f07549cd91074835c5c553db7b3a7 v7-4-330
-+0000000000000000000000000000000000000000 v7-4-330
-+6d984caa0409fd284722c44cb09a0a2b5360bd4f v7.4.331
-+6d984caa0409fd284722c44cb09a0a2b5360bd4f v7-4-331
-+0000000000000000000000000000000000000000 v7-4-331
-+8fed02d53b45848b0fff60de13d06858963cfb17 v7.4.332
-+8fed02d53b45848b0fff60de13d06858963cfb17 v7-4-332
-+0000000000000000000000000000000000000000 v7-4-332
-+8ae50e3ef8bf733c0869c01b5132d02feffc0955 v7.4.333
-+8ae50e3ef8bf733c0869c01b5132d02feffc0955 v7-4-333
-+0000000000000000000000000000000000000000 v7-4-333
-+03d260a8ea0c0c67f424c387dbe2af5754e5e589 v7.4.334
-+03d260a8ea0c0c67f424c387dbe2af5754e5e589 v7-4-334
-+0000000000000000000000000000000000000000 v7-4-334
-+8ad2ecd116021ad5c945426e8bb80d741392b780 v7.4.335
-+8ad2ecd116021ad5c945426e8bb80d741392b780 v7-4-335
-+0000000000000000000000000000000000000000 v7-4-335
-+a42ba1e5099290a86cac1a9ac490c49e82e4c2cf v7.4.336
-+a42ba1e5099290a86cac1a9ac490c49e82e4c2cf v7-4-336
-+0000000000000000000000000000000000000000 v7-4-336
-+0206ac84ff5fdce6d893c470e0909d2aed547a24 v7.4.337
-+0206ac84ff5fdce6d893c470e0909d2aed547a24 v7-4-337
-+0000000000000000000000000000000000000000 v7-4-337
-+ef83b423ebf7de11c1063c795dd2186a9b59b90f v7.4.338
-+ef83b423ebf7de11c1063c795dd2186a9b59b90f v7-4-338
-+0000000000000000000000000000000000000000 v7-4-338
-+fd7110d0c3bf4fea3cfa3d16da6c2a945d327c27 v7.4.339
-+fd7110d0c3bf4fea3cfa3d16da6c2a945d327c27 v7-4-339
-+0000000000000000000000000000000000000000 v7-4-339
-+03f95f5e311b84653df70fb3c08a9d92cf21b8f0 v7.4.340
-+03f95f5e311b84653df70fb3c08a9d92cf21b8f0 v7-4-340
-+0000000000000000000000000000000000000000 v7-4-340
-+adc4a84f72eb44dae657af713922a6e2c1f64ae3 v7.4.341
-+adc4a84f72eb44dae657af713922a6e2c1f64ae3 v7-4-341
-+0000000000000000000000000000000000000000 v7-4-341
-+8dcc6f142460b2d5eee119a174d441d46d95cd99 v7.4.342
-+8dcc6f142460b2d5eee119a174d441d46d95cd99 v7-4-342
-+0000000000000000000000000000000000000000 v7-4-342
-+539ce56d8f35fe2deb5c4f57335e1adf97ae4e74 v7.4.343
-+539ce56d8f35fe2deb5c4f57335e1adf97ae4e74 v7-4-343
-+0000000000000000000000000000000000000000 v7-4-343
-+ce284c205558d103326a4c3f22f181774690b3eb v7.4.344
-+ce284c205558d103326a4c3f22f181774690b3eb v7-4-344
-+0000000000000000000000000000000000000000 v7-4-344
-+ea2c5dfee1b04d216ebf992c5f46ecbdfee2854a v7.4.345
-+ea2c5dfee1b04d216ebf992c5f46ecbdfee2854a v7-4-345
-+0000000000000000000000000000000000000000 v7-4-345
-+3248c6e40aee01a7254d111dd846c6ec7889a804 v7.4.346
-+3248c6e40aee01a7254d111dd846c6ec7889a804 v7-4-346
-+0000000000000000000000000000000000000000 v7-4-346
-+a162d41f10e1c3c8673d86d8b0c58fdaf1bddeaf v7.4.347
-+a162d41f10e1c3c8673d86d8b0c58fdaf1bddeaf v7-4-347
-+0000000000000000000000000000000000000000 v7-4-347
-+0b7586868f6da0372af7510650240e22dc1e6e64 v7.4.348
-+0b7586868f6da0372af7510650240e22dc1e6e64 v7-4-348
-+0000000000000000000000000000000000000000 v7-4-348
-+79950dae1d7de8fc2cb0f8ddd087d403e2b9ce8e v7.4.349
-+79950dae1d7de8fc2cb0f8ddd087d403e2b9ce8e v7-4-349
-+0000000000000000000000000000000000000000 v7-4-349
-+ad005d0114c1d2d83490787ef7ea2a3c6e5e7b9e v7.4.350
-+ad005d0114c1d2d83490787ef7ea2a3c6e5e7b9e v7-4-350
-+0000000000000000000000000000000000000000 v7-4-350
-+f9ec944e4474c649faad642797ffd798a7102549 v7.4.351
-+f9ec944e4474c649faad642797ffd798a7102549 v7-4-351
-+0000000000000000000000000000000000000000 v7-4-351
-+b4962cf3a1c06a1f60f1d750df8fcf7035b00b99 v7.4.352
-+b4962cf3a1c06a1f60f1d750df8fcf7035b00b99 v7-4-352
-+0000000000000000000000000000000000000000 v7-4-352
-+d42a1d3b74d40f580359dbd139d2d0dfa7235252 v7.4.353
-+d42a1d3b74d40f580359dbd139d2d0dfa7235252 v7-4-353
-+0000000000000000000000000000000000000000 v7-4-353
-+5deaa4e9812d4b4ae59d8a3e70bf19983e07e6da v7.4.354
-+5deaa4e9812d4b4ae59d8a3e70bf19983e07e6da v7-4-354
-+0000000000000000000000000000000000000000 v7-4-354
-+9a4efda75b5ef0f496d6a29c0a4dfcc7c03412f9 v7.4.355
-+9a4efda75b5ef0f496d6a29c0a4dfcc7c03412f9 v7-4-355
-+0000000000000000000000000000000000000000 v7-4-355
-+34465a179ce21c827cab4c65a75e6b490600a96f v7.4.356
-+34465a179ce21c827cab4c65a75e6b490600a96f v7-4-356
-+0000000000000000000000000000000000000000 v7-4-356
-+4eedfc4911a1db9c4874689f6c652be0094838f2 v7.4.357
-+4eedfc4911a1db9c4874689f6c652be0094838f2 v7-4-357
-+0000000000000000000000000000000000000000 v7-4-357
-+771b97ba3b4768c77f2070423a93152d6977f012 v7.4.358
-+771b97ba3b4768c77f2070423a93152d6977f012 v7-4-358
-+0000000000000000000000000000000000000000 v7-4-358
-+182c7b987283a567121e9c43d831779d1c88645f v7.4.359
-+182c7b987283a567121e9c43d831779d1c88645f v7-4-359
-+0000000000000000000000000000000000000000 v7-4-359
-+761687c6808f4c9c80d33a919a6bb506dfe9f674 v7.4.360
-+761687c6808f4c9c80d33a919a6bb506dfe9f674 v7-4-360
-+0000000000000000000000000000000000000000 v7-4-360
-+a97e5b9dbc26800830e46cf3c1aa6efbfe258097 v7.4.361
-+a97e5b9dbc26800830e46cf3c1aa6efbfe258097 v7-4-361
-+0000000000000000000000000000000000000000 v7-4-361
-+7fa2bed947fde3514a700c96861a537d816d6fd4 v7.4.362
-+7fa2bed947fde3514a700c96861a537d816d6fd4 v7-4-362
-+0000000000000000000000000000000000000000 v7-4-362
-+ff3816167b73fde35017d364b1a820014cd42e76 v7.4.363
-+ff3816167b73fde35017d364b1a820014cd42e76 v7-4-363
-+0000000000000000000000000000000000000000 v7-4-363
-+7b324826757595b21b0410a7b6f00227d73c655f v7.4.364
-+7b324826757595b21b0410a7b6f00227d73c655f v7-4-364
-+0000000000000000000000000000000000000000 v7-4-364
-+4625fa27ba6f5b06294675b7f0d1bf8ae8f249fb v7.4.365
-+4625fa27ba6f5b06294675b7f0d1bf8ae8f249fb v7-4-365
-+0000000000000000000000000000000000000000 v7-4-365
-+ad775b58706587b6acfb0bb2c732e184efe4f778 v7.4.366
-+ad775b58706587b6acfb0bb2c732e184efe4f778 v7-4-366
-+0000000000000000000000000000000000000000 v7-4-366
-+bdbe2037066df6a463346be1768a56d98001fb36 v7.4.367
-+bdbe2037066df6a463346be1768a56d98001fb36 v7-4-367
-+0000000000000000000000000000000000000000 v7-4-367
-+021e16be3c026c9f883b2aba0b48469ecbae5d88 v7.4.368
-+021e16be3c026c9f883b2aba0b48469ecbae5d88 v7-4-368
-+0000000000000000000000000000000000000000 v7-4-368
-+72ee0db83788638c36bbcb076cabc2ba6c8cd4e7 v7.4.369
-+72ee0db83788638c36bbcb076cabc2ba6c8cd4e7 v7-4-369
-+0000000000000000000000000000000000000000 v7-4-369
-+50575818a97fa4777e52272f5ffc769179d76a8d v7.4.370
-+50575818a97fa4777e52272f5ffc769179d76a8d v7-4-370
-+0000000000000000000000000000000000000000 v7-4-370
-+d44f298c43c74555f4ea21b710d377133f948d61 v7.4.371
-+d44f298c43c74555f4ea21b710d377133f948d61 v7-4-371
-+0000000000000000000000000000000000000000 v7-4-371
-+a122efb555c4f08405051369310451a627ed524b v7.4.372
-+a122efb555c4f08405051369310451a627ed524b v7-4-372
-+0000000000000000000000000000000000000000 v7-4-372
-+353330c512a9488cf5c1a3f8b8a57fa8cdd83a7a v7.4.373
-+353330c512a9488cf5c1a3f8b8a57fa8cdd83a7a v7-4-373
-+0000000000000000000000000000000000000000 v7-4-373
-+f59c4bf0ac3b525f703cafba9a9cb0aeb3cc7745 v7.4.374
-+f59c4bf0ac3b525f703cafba9a9cb0aeb3cc7745 v7-4-374
-+0000000000000000000000000000000000000000 v7-4-374
-+5a5492d676ab1e8334aa86ec552e7e33ee8828e1 v7.4.375
-+5a5492d676ab1e8334aa86ec552e7e33ee8828e1 v7-4-375
-+0000000000000000000000000000000000000000 v7-4-375
-+c3bb76e5b2355c57d7f89997aa9e125e46afdea1 v7.4.376
-+c3bb76e5b2355c57d7f89997aa9e125e46afdea1 v7-4-376
-+0000000000000000000000000000000000000000 v7-4-376
-+255561411d7ae4b3c713bfb2e2f13c5f08ce0c61 v7.4.377
-+255561411d7ae4b3c713bfb2e2f13c5f08ce0c61 v7-4-377
-+0000000000000000000000000000000000000000 v7-4-377
-+75ae211df37d789c54f660ccddddd0e370aa67ae v7.4.378
-+75ae211df37d789c54f660ccddddd0e370aa67ae v7-4-378
-+0000000000000000000000000000000000000000 v7-4-378
-+16cfdf28be40ccbefaeb80ec574a098362a36a34 v7.4.379
-+16cfdf28be40ccbefaeb80ec574a098362a36a34 v7-4-379
-+0000000000000000000000000000000000000000 v7-4-379
-+7cfbad4a78bf306e5aaf84dc9c29b48e7d77c1ef v7.4.380
-+7cfbad4a78bf306e5aaf84dc9c29b48e7d77c1ef v7-4-380
-+0000000000000000000000000000000000000000 v7-4-380
-+0a3d958e346ee051667d3e541273b78fb1dfed9a v7.4.381
-+0a3d958e346ee051667d3e541273b78fb1dfed9a v7-4-381
-+0000000000000000000000000000000000000000 v7-4-381
-+dbd7dc1ea2e6bd0fc3c9ec7faec76382412d0129 v7.4.382
-+dbd7dc1ea2e6bd0fc3c9ec7faec76382412d0129 v7-4-382
-+0000000000000000000000000000000000000000 v7-4-382
-+2f02675bc4b051fff7be63f5107f659045a010e1 v7.4.383
-+2f02675bc4b051fff7be63f5107f659045a010e1 v7-4-383
-+0000000000000000000000000000000000000000 v7-4-383
-+6f88e2dafbf637f573372bb7d8957fe4f2fd0843 v7.4.384
-+6f88e2dafbf637f573372bb7d8957fe4f2fd0843 v7-4-384
-+0000000000000000000000000000000000000000 v7-4-384
-+6e24b97dde6930a62ade6bee725babf4a39bb0a4 v7.4.385
-+6e24b97dde6930a62ade6bee725babf4a39bb0a4 v7-4-385
-+0000000000000000000000000000000000000000 v7-4-385
-+09af7cb358f0bafd4b7437ff580f4cd7e15b74a1 v7.4.386
-+09af7cb358f0bafd4b7437ff580f4cd7e15b74a1 v7-4-386
-+0000000000000000000000000000000000000000 v7-4-386
-+975d96776111914f69c8a0b98ef7db3bbb83cd10 v7.4.387
-+975d96776111914f69c8a0b98ef7db3bbb83cd10 v7-4-387
-+0000000000000000000000000000000000000000 v7-4-387
-+76e7fb736c0e9d06b97ff95ee8baad1fb09d420b v7.4.388
-+76e7fb736c0e9d06b97ff95ee8baad1fb09d420b v7-4-388
-+0000000000000000000000000000000000000000 v7-4-388
-+3d206df5c8284f7d5f4a987ae9c7a508f289f008 v7.4.389
-+3d206df5c8284f7d5f4a987ae9c7a508f289f008 v7-4-389
-+0000000000000000000000000000000000000000 v7-4-389
-+d3a674f6c7370f70d6b66dcefb9e36d22d73c7b7 v7.4.390
-+d3a674f6c7370f70d6b66dcefb9e36d22d73c7b7 v7-4-390
-+0000000000000000000000000000000000000000 v7-4-390
-+f051e50a6a5feb0f0c6d209440d9d305b82f5836 v7.4.391
-+f051e50a6a5feb0f0c6d209440d9d305b82f5836 v7-4-391
-+0000000000000000000000000000000000000000 v7-4-391
-+589fd07888abc8a1208616c56b21898d3352fc5b v7.4.392
-+589fd07888abc8a1208616c56b21898d3352fc5b v7-4-392
-+0000000000000000000000000000000000000000 v7-4-392
-+1bff71d202621d97acc4ef21ce9f47b78f68bda3 v7.4.393
-+1bff71d202621d97acc4ef21ce9f47b78f68bda3 v7-4-393
-+0000000000000000000000000000000000000000 v7-4-393
-+d594c15521377493d5e23b03e4dbf5108df69acd v7.4.394
-+d594c15521377493d5e23b03e4dbf5108df69acd v7-4-394
-+0000000000000000000000000000000000000000 v7-4-394
-+65b0974c5bebf5d6b56e9abc90d86759d1c4f6d7 v7.4.395
-+65b0974c5bebf5d6b56e9abc90d86759d1c4f6d7 v7-4-395
-+0000000000000000000000000000000000000000 v7-4-395
-+7766142fc7d3e90c2e15a9c606efcd97331edef8 v7.4.396
-+7766142fc7d3e90c2e15a9c606efcd97331edef8 v7-4-396
-+0000000000000000000000000000000000000000 v7-4-396
-+8d361608fe86c534e51e4c7e583375642d34b7a4 v7.4.397
-+8d361608fe86c534e51e4c7e583375642d34b7a4 v7-4-397
-+0000000000000000000000000000000000000000 v7-4-397
-+f62b2e76dd809dc57cad9d0fd8f04a4f3a7193e9 v7.4.398
-+f62b2e76dd809dc57cad9d0fd8f04a4f3a7193e9 v7-4-398
-+0000000000000000000000000000000000000000 v7-4-398
-+18ac55444b37bcae8ea090f7b3abf4826c679bc3 v7.4.399
-+18ac55444b37bcae8ea090f7b3abf4826c679bc3 v7-4-399
-+0000000000000000000000000000000000000000 v7-4-399
-+50a658bf4cff030cbe6a97a53bb838b5976c2e1a v7.4.400
-+50a658bf4cff030cbe6a97a53bb838b5976c2e1a v7-4-400
-+0000000000000000000000000000000000000000 v7-4-400
-+ab71bb81b84e9a1cdf030b172f61d779ccda975c v7.4.401
-+ab71bb81b84e9a1cdf030b172f61d779ccda975c v7-4-401
-+0000000000000000000000000000000000000000 v7-4-401
-+3aa37ad2c4ed4d4f979e7c7e7d5d88586c6b74ba v7.4.402
-+3aa37ad2c4ed4d4f979e7c7e7d5d88586c6b74ba v7-4-402
-+0000000000000000000000000000000000000000 v7-4-402
-+86fb698a38d5c10f59928e57da94ce5b3e124a40 v7.4.403
-+86fb698a38d5c10f59928e57da94ce5b3e124a40 v7-4-403
-+0000000000000000000000000000000000000000 v7-4-403
-+0242c27e40e1ce913ec2b6540371d5ea5fceeac9 v7.4.404
-+0242c27e40e1ce913ec2b6540371d5ea5fceeac9 v7-4-404
-+0000000000000000000000000000000000000000 v7-4-404
-+4c25af735304ff17a27bb3ce21e7f7d3b304ff88 v7.4.405
-+4c25af735304ff17a27bb3ce21e7f7d3b304ff88 v7-4-405
-+0000000000000000000000000000000000000000 v7-4-405
-+1134bba900c17abcecdc414c6e30da22c17d32a5 v7.4.406
-+1134bba900c17abcecdc414c6e30da22c17d32a5 v7-4-406
-+0000000000000000000000000000000000000000 v7-4-406
-+3f92ef156c664fb8fea1f036a4a4c87af487ba6b v7.4.407
-+3f92ef156c664fb8fea1f036a4a4c87af487ba6b v7-4-407
-+0000000000000000000000000000000000000000 v7-4-407
-+cb3218a69c2f0949bbff5bcf9beeccc83ef2ef59 v7.4.408
-+cb3218a69c2f0949bbff5bcf9beeccc83ef2ef59 v7-4-408
-+0000000000000000000000000000000000000000 v7-4-408
-+de35e123e63c326be4a576f8e678ed9e63ed1f48 v7.4.409
-+de35e123e63c326be4a576f8e678ed9e63ed1f48 v7-4-409
-+0000000000000000000000000000000000000000 v7-4-409
-+2fd550c75256cc1ecf06a4afc6a856b305cf7a8a v7.4.410
-+2fd550c75256cc1ecf06a4afc6a856b305cf7a8a v7-4-410
-+0000000000000000000000000000000000000000 v7-4-410
-+d4e0c197e97968050596f4c441552383e31db63b v7.4.411
-+d4e0c197e97968050596f4c441552383e31db63b v7-4-411
-+0000000000000000000000000000000000000000 v7-4-411
-+4c845a1600d28db8edabd211e6d7a9cd03883ea6 v7.4.412
-+4c845a1600d28db8edabd211e6d7a9cd03883ea6 v7-4-412
-+0000000000000000000000000000000000000000 v7-4-412
-+121613e72e397db495f5e9b640b249aead5a61c1 v7.4.413
-+121613e72e397db495f5e9b640b249aead5a61c1 v7-4-413
-+0000000000000000000000000000000000000000 v7-4-413
-+67edf731a2403a8023440184872159ddc073093c v7.4.414
-+67edf731a2403a8023440184872159ddc073093c v7-4-414
-+0000000000000000000000000000000000000000 v7-4-414
-+353442863d8558dc89d35ef349b60ebb2e38de0e v7.4.415
-+353442863d8558dc89d35ef349b60ebb2e38de0e v7-4-415
-+0000000000000000000000000000000000000000 v7-4-415
-+735bd597a8ffcb00edff68b34a26573b8f3cad9a v7.4.416
-+735bd597a8ffcb00edff68b34a26573b8f3cad9a v7-4-416
-+0000000000000000000000000000000000000000 v7-4-416
-+e60327caf9095d5ec067a5ab47bf4a69c0f58580 v7.4.417
-+e60327caf9095d5ec067a5ab47bf4a69c0f58580 v7-4-417
-+0000000000000000000000000000000000000000 v7-4-417
-+00f58478e38b68faf783d8fe70c1439fe9dd732d v7.4.418
-+00f58478e38b68faf783d8fe70c1439fe9dd732d v7-4-418
-+0000000000000000000000000000000000000000 v7-4-418
-+0a42938f449cf306a429db373106d5e29d8d4312 v7.4.419
-+0a42938f449cf306a429db373106d5e29d8d4312 v7-4-419
-+0000000000000000000000000000000000000000 v7-4-419
-+93aa0340130912c69d4093fc626a3cbb0cc7ad68 v7.4.420
-+93aa0340130912c69d4093fc626a3cbb0cc7ad68 v7-4-420
-+0000000000000000000000000000000000000000 v7-4-420
-+3ee39fe2df7d60d6376b3429383c5c5e3f9bb3fe v7.4.421
-+3ee39fe2df7d60d6376b3429383c5c5e3f9bb3fe v7-4-421
-+0000000000000000000000000000000000000000 v7-4-421
-+69da1498ce89dd093935c0e5013e1df8060a4e80 v7.4.422
-+69da1498ce89dd093935c0e5013e1df8060a4e80 v7-4-422
-+0000000000000000000000000000000000000000 v7-4-422
-+96a4fa8e530c12137af235a9aaad57d578f9eebd v7.4.423
-+96a4fa8e530c12137af235a9aaad57d578f9eebd v7-4-423
-+0000000000000000000000000000000000000000 v7-4-423
-+85a1802ae810f0e840f8b5d8f2827b4199b39750 v7.4.424
-+85a1802ae810f0e840f8b5d8f2827b4199b39750 v7-4-424
-+0000000000000000000000000000000000000000 v7-4-424
-+2e804ebb3ee8cd59451f8f1c1be2f09ebce0d77a v7.4.425
-+2e804ebb3ee8cd59451f8f1c1be2f09ebce0d77a v7-4-425
-+0000000000000000000000000000000000000000 v7-4-425
-+7ab9a9cf2859ae4b7c00c4fff016fd5a0869450e v7.4.426
-+7ab9a9cf2859ae4b7c00c4fff016fd5a0869450e v7-4-426
-+0000000000000000000000000000000000000000 v7-4-426
-+fca35aa9380a9e3acecc78f85e05f26436e87ae1 v7.4.427
-+fca35aa9380a9e3acecc78f85e05f26436e87ae1 v7-4-427
-+0000000000000000000000000000000000000000 v7-4-427
-+1fe61f6d52079f44f61b3e03cf9b0c300f2890d9 v7.4.428
-+1fe61f6d52079f44f61b3e03cf9b0c300f2890d9 v7-4-428
-+0000000000000000000000000000000000000000 v7-4-428
-+e98e415ea3b8c743a5ab04ad9f498ab1b11ae8cf v7.4.429
-+e98e415ea3b8c743a5ab04ad9f498ab1b11ae8cf v7-4-429
-+0000000000000000000000000000000000000000 v7-4-429
-+f4e9c65a18d4a5753747f327ed55c10f05d8d91c v7.4.430
-+f4e9c65a18d4a5753747f327ed55c10f05d8d91c v7-4-430
-+0000000000000000000000000000000000000000 v7-4-430
-+5672a06e4bd84cae4194ff0584d487448bad8c38 v7.4.431
-+5672a06e4bd84cae4194ff0584d487448bad8c38 v7-4-431
-+0000000000000000000000000000000000000000 v7-4-431
-+59cd2b16f71846dec2e842491e509385beeda5e9 v7.4.432
-+59cd2b16f71846dec2e842491e509385beeda5e9 v7-4-432
-+0000000000000000000000000000000000000000 v7-4-432
-+dd3dac42cb9b5f95ad16d5e08220b0c7adf4b024 v7.4.433
-+dd3dac42cb9b5f95ad16d5e08220b0c7adf4b024 v7-4-433
-+0000000000000000000000000000000000000000 v7-4-433
-+4176c48c7dd51d0fcdb7403cbfb489a75b0d819d v7.4.434
-+4176c48c7dd51d0fcdb7403cbfb489a75b0d819d v7-4-434
-+0000000000000000000000000000000000000000 v7-4-434
-+b98af9af378eebe674052aa9a1b1956ad3f96487 v7.4.435
-+b98af9af378eebe674052aa9a1b1956ad3f96487 v7-4-435
-+0000000000000000000000000000000000000000 v7-4-435
-+52fa8300ce205a8f3c45b3b1874564b7768630ea v7.4.436
-+52fa8300ce205a8f3c45b3b1874564b7768630ea v7-4-436
-+0000000000000000000000000000000000000000 v7-4-436
-+8515b42f939cdf3a59fa6120e989d9f8fe6f4571 v7.4.437
-+8515b42f939cdf3a59fa6120e989d9f8fe6f4571 v7-4-437
-+0000000000000000000000000000000000000000 v7-4-437
-+db3b8fe8330ea2afabd6c4856be5c76ef86d4728 v7.4.438
-+db3b8fe8330ea2afabd6c4856be5c76ef86d4728 v7-4-438
-+0000000000000000000000000000000000000000 v7-4-438
-+07b28e96af8bace1af65bac661f22716781103fd v7.4.439
-+07b28e96af8bace1af65bac661f22716781103fd v7-4-439
-+0000000000000000000000000000000000000000 v7-4-439
-+1f578cd9a65779d2597e0135a5916db621d65734 v7.4.440
-+1f578cd9a65779d2597e0135a5916db621d65734 v7-4-440
-+0000000000000000000000000000000000000000 v7-4-440
-+e754b23b7d1c3825dc2c6028867d631520a8cdca v7.4.441
-+e754b23b7d1c3825dc2c6028867d631520a8cdca v7-4-441
-+0000000000000000000000000000000000000000 v7-4-441
-+8c3c067b4ae3cc02ce4411042df05f97df5bc316 v7.4.442
-+8c3c067b4ae3cc02ce4411042df05f97df5bc316 v7-4-442
-+0000000000000000000000000000000000000000 v7-4-442
-+f1ba154c3a12d06cd0f40edbfc675103eb2dd7ad v7.4.443
-+f1ba154c3a12d06cd0f40edbfc675103eb2dd7ad v7-4-443
-+0000000000000000000000000000000000000000 v7-4-443
-+d4cc9f48d5a40382e3e3d52dfe6e948745ee13b4 v7.4.444
-+d4cc9f48d5a40382e3e3d52dfe6e948745ee13b4 v7-4-444
-+0000000000000000000000000000000000000000 v7-4-444
-+1138726736fbdb92aa5259ca4b76573b8f4b3f79 v7.4.445
-+1138726736fbdb92aa5259ca4b76573b8f4b3f79 v7-4-445
-+0000000000000000000000000000000000000000 v7-4-445
-+63121fdd093ff71081725d5495337ea45d38daab v7.4.446
-+63121fdd093ff71081725d5495337ea45d38daab v7-4-446
-+0000000000000000000000000000000000000000 v7-4-446
-+0d2c821cdc2505879823a551baeeb8d3c61ce758 v7.4.447
-+0d2c821cdc2505879823a551baeeb8d3c61ce758 v7-4-447
-+0000000000000000000000000000000000000000 v7-4-447
-+2fd96725b0632cd9183581ce13d7b2cbd734d8d4 v7.4.448
-+2fd96725b0632cd9183581ce13d7b2cbd734d8d4 v7-4-448
-+0000000000000000000000000000000000000000 v7-4-448
-+cb5480096f1b9e8f44e9d742fa190a90d77e1c54 v7.4.449
-+cb5480096f1b9e8f44e9d742fa190a90d77e1c54 v7-4-449
-+0000000000000000000000000000000000000000 v7-4-449
-+7c9abc70ffc187f9bb60d968cb7e3cc5ed6d4231 v7.4.450
-+7c9abc70ffc187f9bb60d968cb7e3cc5ed6d4231 v7-4-450
-+0000000000000000000000000000000000000000 v7-4-450
-+ac6cfdc02695b31b07e9beb60fd704f74f4d4c81 v7.4.451
-+ac6cfdc02695b31b07e9beb60fd704f74f4d4c81 v7-4-451
-+0000000000000000000000000000000000000000 v7-4-451
-+78aad99db7627a19574d10415780ded69936d7d7 v7.4.452
-+78aad99db7627a19574d10415780ded69936d7d7 v7-4-452
-+0000000000000000000000000000000000000000 v7-4-452
-+c72eb8499a9d3f618de3528287d1de62025fdda4 v7.4.453
-+c72eb8499a9d3f618de3528287d1de62025fdda4 v7-4-453
-+0000000000000000000000000000000000000000 v7-4-453
-+0cdff7c268559f8f34eae073a013ece71b62b9e3 v7.4.454
-+0cdff7c268559f8f34eae073a013ece71b62b9e3 v7-4-454
-+0000000000000000000000000000000000000000 v7-4-454
-+ebc72764fa1e74758ae1ef9d3f49301f80fc3aa4 v7.4.455
-+ebc72764fa1e74758ae1ef9d3f49301f80fc3aa4 v7-4-455
-+0000000000000000000000000000000000000000 v7-4-455
-+54194bd6ed607aa0cec07d8a27d4794573eabba9 v7.4.456
-+54194bd6ed607aa0cec07d8a27d4794573eabba9 v7-4-456
-+0000000000000000000000000000000000000000 v7-4-456
-+96761b6789f61a8dee1551b7cea98e669fb90fb3 v7.4.457
-+96761b6789f61a8dee1551b7cea98e669fb90fb3 v7-4-457
-+0000000000000000000000000000000000000000 v7-4-457
-+fe1827921d50cb59ac680ea13e3f9103cd9db660 v7.4.458
-+fe1827921d50cb59ac680ea13e3f9103cd9db660 v7-4-458
-+0000000000000000000000000000000000000000 v7-4-458
-+7816c24ff8907c9f24a9e35992a4d5f3cc9dbc7e v7.4.459
-+7816c24ff8907c9f24a9e35992a4d5f3cc9dbc7e v7-4-459
-+0000000000000000000000000000000000000000 v7-4-459
-+d5eba03293a6193a1b462822800641b820252ce3 v7.4.460
-+d5eba03293a6193a1b462822800641b820252ce3 v7-4-460
-+0000000000000000000000000000000000000000 v7-4-460
-+4eba2bdb26f2be61bfdb1f635c0ed65f4bc35b0b v7.4.461
-+4eba2bdb26f2be61bfdb1f635c0ed65f4bc35b0b v7-4-461
-+0000000000000000000000000000000000000000 v7-4-461
-+c0d93d67572b2d4161d0c5a5ab09477d6447ff49 v7.4.462
-+c0d93d67572b2d4161d0c5a5ab09477d6447ff49 v7-4-462
-+0000000000000000000000000000000000000000 v7-4-462
-+6f80b9a773db0f3c69156f8768c8b6cfa4ad6785 v7.4.463
-+6f80b9a773db0f3c69156f8768c8b6cfa4ad6785 v7-4-463
-+0000000000000000000000000000000000000000 v7-4-463
-+74c65620c985f680eb1d7c1110f259cc37779ffa v7.4.464
-+74c65620c985f680eb1d7c1110f259cc37779ffa v7-4-464
-+0000000000000000000000000000000000000000 v7-4-464
-+452e8b2a0ab39fb0cc037382cc4842a6d6b2a3f2 v7.4.465
-+452e8b2a0ab39fb0cc037382cc4842a6d6b2a3f2 v7-4-465
-+0000000000000000000000000000000000000000 v7-4-465
-+521c49b6de9d6352331dd8ff63286f6673014616 v7.4.466
-+521c49b6de9d6352331dd8ff63286f6673014616 v7-4-466
-+0000000000000000000000000000000000000000 v7-4-466
-+0a4efa3d20197cdf0bfe93080abc7cd197878e9a v7.4.467
-+0a4efa3d20197cdf0bfe93080abc7cd197878e9a v7-4-467
-+0000000000000000000000000000000000000000 v7-4-467
-+4f7f236d773d21e46ffa6c38d8df110d11413dca v7.4.468
-+4f7f236d773d21e46ffa6c38d8df110d11413dca v7-4-468
-+0000000000000000000000000000000000000000 v7-4-468
-+a6f5a4ac4d4666282179339abe696d7689f8681b v7.4.469
-+a6f5a4ac4d4666282179339abe696d7689f8681b v7-4-469
-+0000000000000000000000000000000000000000 v7-4-469
-+9d5b8b015e5f32b84e0d74f21481b0cea2b84975 v7.4.470
-+9d5b8b015e5f32b84e0d74f21481b0cea2b84975 v7-4-470
-+0000000000000000000000000000000000000000 v7-4-470
-+3005da486a71dc1171b3c8fe075701ea5e4b5668 v7.4.471
-+3005da486a71dc1171b3c8fe075701ea5e4b5668 v7-4-471
-+0000000000000000000000000000000000000000 v7-4-471
-+af998690a8841d4df95cea0bed4246f2ba98e247 v7.4.472
-+af998690a8841d4df95cea0bed4246f2ba98e247 v7-4-472
-+0000000000000000000000000000000000000000 v7-4-472
-+1cdd5804b538d578d71c9d85fddf8805cb200663 v7.4.473
-+1cdd5804b538d578d71c9d85fddf8805cb200663 v7-4-473
-+0000000000000000000000000000000000000000 v7-4-473
-+7f2472960aa114ee650fbac399b4561f1d43251b v7.4.474
-+7f2472960aa114ee650fbac399b4561f1d43251b v7-4-474
-+0000000000000000000000000000000000000000 v7-4-474
-+0446fa17bd95cdb37cd0c14ada32818b43577597 v7.4.475
-+0446fa17bd95cdb37cd0c14ada32818b43577597 v7-4-475
-+0000000000000000000000000000000000000000 v7-4-475
-+4c29b75cae193c039f44ad438f772f8af19d2bb3 v7.4.476
-+4c29b75cae193c039f44ad438f772f8af19d2bb3 v7-4-476
-+0000000000000000000000000000000000000000 v7-4-476
-+f21a2f67bdbb7bb7c5c2352186757c3fd2471ce2 v7.4.477
-+f21a2f67bdbb7bb7c5c2352186757c3fd2471ce2 v7-4-477
-+0000000000000000000000000000000000000000 v7-4-477
-+fcb898dea2bc8b6e89172cb48ef26c56cb79cfdd v7.4.478
-+fcb898dea2bc8b6e89172cb48ef26c56cb79cfdd v7-4-478
-+0000000000000000000000000000000000000000 v7-4-478
-+e0f2ed0efb49d1d01b978f8a7f0db5cc8813cb1b v7.4.479
-+e0f2ed0efb49d1d01b978f8a7f0db5cc8813cb1b v7-4-479
-+0000000000000000000000000000000000000000 v7-4-479
-+e3149e2b415260e7a3d8c9d51ee56d185e6bb1d7 v7.4.480
-+e3149e2b415260e7a3d8c9d51ee56d185e6bb1d7 v7-4-480
-+0000000000000000000000000000000000000000 v7-4-480
-+15e88e3750e3b1458b0d38c2f16ed784e51a4f3b v7.4.481
-+15e88e3750e3b1458b0d38c2f16ed784e51a4f3b v7-4-481
-+0000000000000000000000000000000000000000 v7-4-481
-+488bb7c4ace08fc93dd5405e7146cc82e32bebf1 v7.4.482
-+488bb7c4ace08fc93dd5405e7146cc82e32bebf1 v7-4-482
-+0000000000000000000000000000000000000000 v7-4-482
-+3eb160c5b3a195855cbe21309e6b9b375de63803 v7.4.483
-+3eb160c5b3a195855cbe21309e6b9b375de63803 v7-4-483
-+0000000000000000000000000000000000000000 v7-4-483
-+76526e7100b0c61d9cfbe79edc855f6798363627 v7.4.484
-+76526e7100b0c61d9cfbe79edc855f6798363627 v7-4-484
-+0000000000000000000000000000000000000000 v7-4-484
-+7844d92941fdc10653ff5a6925346a02bb7f5404 v7.4.485
-+7844d92941fdc10653ff5a6925346a02bb7f5404 v7-4-485
-+0000000000000000000000000000000000000000 v7-4-485
-+b8caf7045e3d838849cde86f3eb0142e50482276 v7.4.486
-+b8caf7045e3d838849cde86f3eb0142e50482276 v7-4-486
-+0000000000000000000000000000000000000000 v7-4-486
-+1f9577e9ef1b22cf701b58d418a4ce00071405ed v7.4.487
-+1f9577e9ef1b22cf701b58d418a4ce00071405ed v7-4-487
-+0000000000000000000000000000000000000000 v7-4-487
-+3ec6e0ef4a67cb6030466bcd4d5d9f2fdd4f70b0 v7.4.488
-+3ec6e0ef4a67cb6030466bcd4d5d9f2fdd4f70b0 v7-4-488
-+0000000000000000000000000000000000000000 v7-4-488
-+31c78e59080674530e5a2d2c00c343a5cab76dd0 v7.4.489
-+31c78e59080674530e5a2d2c00c343a5cab76dd0 v7-4-489
-+0000000000000000000000000000000000000000 v7-4-489
-+df92c2b2a1795c8b0a43f2faf3a50b4b4a359773 v7.4.490
-+df92c2b2a1795c8b0a43f2faf3a50b4b4a359773 v7-4-490
-+0000000000000000000000000000000000000000 v7-4-490
-+5f54e1995751392b4cfa48d8b49f9fcf195bb239 v7.4.491
-+5f54e1995751392b4cfa48d8b49f9fcf195bb239 v7-4-491
-+0000000000000000000000000000000000000000 v7-4-491
-+5e998fc610d5b23ea55ef64c8f5291522ff3b4a5 v7.4.492
-+5e998fc610d5b23ea55ef64c8f5291522ff3b4a5 v7-4-492
-+0000000000000000000000000000000000000000 v7-4-492
-+a0daa5feaccbbed4b8d6db9c18f76ebe116c8e37 v7.4.493
-+a0daa5feaccbbed4b8d6db9c18f76ebe116c8e37 v7-4-493
-+0000000000000000000000000000000000000000 v7-4-493
-+85d8cde3b432ae627382e1f2222aa8368f5837b8 v7.4.494
-+85d8cde3b432ae627382e1f2222aa8368f5837b8 v7-4-494
-+0000000000000000000000000000000000000000 v7-4-494
-+0079791cbbeaaad9ff4391097c2f7896114d6022 v7.4.495
-+0079791cbbeaaad9ff4391097c2f7896114d6022 v7-4-495
-+0000000000000000000000000000000000000000 v7-4-495
-+112c80234ce3815b2c7d1c27ad21aa885d2776f3 v7.4.496
-+112c80234ce3815b2c7d1c27ad21aa885d2776f3 v7-4-496
-+0000000000000000000000000000000000000000 v7-4-496
-+adfbffe1e642d8779872ced560c13f3e62a39819 v7.4.497
-+adfbffe1e642d8779872ced560c13f3e62a39819 v7-4-497
-+0000000000000000000000000000000000000000 v7-4-497
-+24ee7a7a26b1ec8169bbb4656a99b3499e971b50 v7.4.498
-+24ee7a7a26b1ec8169bbb4656a99b3499e971b50 v7-4-498
-+0000000000000000000000000000000000000000 v7-4-498
-+65e72747fecab7c43c72a1562e4fef6b530e2db7 v7.4.499
-+65e72747fecab7c43c72a1562e4fef6b530e2db7 v7-4-499
-+0000000000000000000000000000000000000000 v7-4-499
-+fd4dc6581b0ee754af50afefcacc1e241a3f591c v7.4.500
-+fd4dc6581b0ee754af50afefcacc1e241a3f591c v7-4-500
-+0000000000000000000000000000000000000000 v7-4-500
-+0ed561752653050472279f14ec75144844b42bf8 v7.4.501
-+0ed561752653050472279f14ec75144844b42bf8 v7-4-501
-+0000000000000000000000000000000000000000 v7-4-501
-+7b28dc1d756e11bd7e25a19ffe272ac605613a40 v7.4.502
-+7b28dc1d756e11bd7e25a19ffe272ac605613a40 v7-4-502
-+0000000000000000000000000000000000000000 v7-4-502
-+094a87e76155fcbb43f7070eb605c2944192a7ff v7.4.503
-+094a87e76155fcbb43f7070eb605c2944192a7ff v7-4-503
-+0000000000000000000000000000000000000000 v7-4-503
-+edfa81ea17117e6db410db58cb2a26789aff50b5 v7.4.504
-+edfa81ea17117e6db410db58cb2a26789aff50b5 v7-4-504
-+0000000000000000000000000000000000000000 v7-4-504
-+9bc6ce142cc385bb3d516ac5c2429dbaa3b32886 v7.4.505
-+9bc6ce142cc385bb3d516ac5c2429dbaa3b32886 v7-4-505
-+0000000000000000000000000000000000000000 v7-4-505
-+79a667b879e70b81e21735997f5ce62372e37886 v7.4.506
-+79a667b879e70b81e21735997f5ce62372e37886 v7-4-506
-+0000000000000000000000000000000000000000 v7-4-506
-+5b2ff413125bf62b31d34efe1c816ebc05d8d7c2 v7.4.507
-+5b2ff413125bf62b31d34efe1c816ebc05d8d7c2 v7-4-507
-+0000000000000000000000000000000000000000 v7-4-507
-+65df2fba429b6eba6b25e1fa9422342c73afc64c v7.4.508
-+65df2fba429b6eba6b25e1fa9422342c73afc64c v7-4-508
-+0000000000000000000000000000000000000000 v7-4-508
-+60659773c73bc34f16340dba6f96f02f4664c7e7 v7.4.509
-+60659773c73bc34f16340dba6f96f02f4664c7e7 v7-4-509
-+0000000000000000000000000000000000000000 v7-4-509
-+05850b74218baa3daa2f5a8c40e14d07e9371825 v7.4.510
-+05850b74218baa3daa2f5a8c40e14d07e9371825 v7-4-510
-+0000000000000000000000000000000000000000 v7-4-510
-+7623d953d3bc2973e7a40f5a28c8f2d7d16f7891 v7.4.511
-+7623d953d3bc2973e7a40f5a28c8f2d7d16f7891 v7-4-511
-+0000000000000000000000000000000000000000 v7-4-511
-+9f9058aeba0d41d264c1ec1ef6ee4cee5aaa8ab6 v7.4.512
-+9f9058aeba0d41d264c1ec1ef6ee4cee5aaa8ab6 v7-4-512
-+0000000000000000000000000000000000000000 v7-4-512
-+6ad9facba57daad4c68b8d1cb3a8efe12d6ae4a9 v7.4.513
-+6ad9facba57daad4c68b8d1cb3a8efe12d6ae4a9 v7-4-513
-+0000000000000000000000000000000000000000 v7-4-513
-+e6c5ff35500d907cad9bfa1f6babdc08a4a90aa0 v7.4.514
-+e6c5ff35500d907cad9bfa1f6babdc08a4a90aa0 v7-4-514
-+0000000000000000000000000000000000000000 v7-4-514
-+387e636805243f4ade8da63fa7c115dec64aa56e v7.4.515
-+387e636805243f4ade8da63fa7c115dec64aa56e v7-4-515
-+0000000000000000000000000000000000000000 v7-4-515
-+81c9b19ee0fb867a8364f73bdcc865676220cb0b v7.4.516
-+81c9b19ee0fb867a8364f73bdcc865676220cb0b v7-4-516
-+0000000000000000000000000000000000000000 v7-4-516
-+93560d4bca68e9086539c273c4e3f7e792fc1739 v7.4.517
-+93560d4bca68e9086539c273c4e3f7e792fc1739 v7-4-517
-+0000000000000000000000000000000000000000 v7-4-517
-+383cb9ddb56115f95933c5b994e0cec64ee578a5 v7.4.518
-+383cb9ddb56115f95933c5b994e0cec64ee578a5 v7-4-518
-+0000000000000000000000000000000000000000 v7-4-518
-+27a36d1013a6dcf699ea9b2ade80d74329257dbd v7.4.519
-+27a36d1013a6dcf699ea9b2ade80d74329257dbd v7-4-519
-+0000000000000000000000000000000000000000 v7-4-519
-+392dad030b8dd123f95a2e3624727607f542b4ed v7.4.520
-+392dad030b8dd123f95a2e3624727607f542b4ed v7-4-520
-+0000000000000000000000000000000000000000 v7-4-520
-+39274bfbfba5ead4d25f5abc41c0692b27e60473 v7.4.521
-+39274bfbfba5ead4d25f5abc41c0692b27e60473 v7-4-521
-+0000000000000000000000000000000000000000 v7-4-521
-+870480df8275c1647530a23cbf778d888e1dc824 v7.4.522
-+870480df8275c1647530a23cbf778d888e1dc824 v7-4-522
-+0000000000000000000000000000000000000000 v7-4-522
-+9c9c70625444b29324a1e446eb23bb0c73547cab v7.4.523
-+9c9c70625444b29324a1e446eb23bb0c73547cab v7-4-523
-+0000000000000000000000000000000000000000 v7-4-523
-+762ab69c2d138af49de407022cb7e363024f6a16 v7.4.524
-+762ab69c2d138af49de407022cb7e363024f6a16 v7-4-524
-+0000000000000000000000000000000000000000 v7-4-524
-+2587209317b75d073c352c61f1e6cd9f8c26d7f5 v7.4.525
-+2587209317b75d073c352c61f1e6cd9f8c26d7f5 v7-4-525
-+0000000000000000000000000000000000000000 v7-4-525
-+230b52b9d35ec12f6a83368b3479dfb85158bcf9 v7.4.526
-+230b52b9d35ec12f6a83368b3479dfb85158bcf9 v7-4-526
-+0000000000000000000000000000000000000000 v7-4-526
-+2bb019eb60ca1d16e62e95bef16475756965022f v7.4.527
-+2bb019eb60ca1d16e62e95bef16475756965022f v7-4-527
-+0000000000000000000000000000000000000000 v7-4-527
-+5f49ac8426dfddcc6725fae872b642976e468c8a v7.4.528
-+5f49ac8426dfddcc6725fae872b642976e468c8a v7-4-528
-+0000000000000000000000000000000000000000 v7-4-528
-+72d5a533ec87c13e87e80273a1817b5ba19d313b v7.4.529
-+72d5a533ec87c13e87e80273a1817b5ba19d313b v7-4-529
-+0000000000000000000000000000000000000000 v7-4-529
-+5a76e36f07b160b44b4f4e637decbc914a243e6c v7.4.530
-+5a76e36f07b160b44b4f4e637decbc914a243e6c v7-4-530
-+0000000000000000000000000000000000000000 v7-4-530
-+2c0cddd0df8c8ca0c08027e7866f697ffd20d6fb v7.4.531
-+2c0cddd0df8c8ca0c08027e7866f697ffd20d6fb v7-4-531
-+0000000000000000000000000000000000000000 v7-4-531
-+7f48abe500e13554d14f5efae736da871a89ebae v7.4.532
-+7f48abe500e13554d14f5efae736da871a89ebae v7-4-532
-+0000000000000000000000000000000000000000 v7-4-532
-+18953e121be6993e8e87a7d6fd49321ecfc2dcab v7.4.533
-+18953e121be6993e8e87a7d6fd49321ecfc2dcab v7-4-533
-+0000000000000000000000000000000000000000 v7-4-533
-+ee28ddfc7b7c66b7c2a87ed95dd1d4cae7902a75 v7.4.534
-+ee28ddfc7b7c66b7c2a87ed95dd1d4cae7902a75 v7-4-534
-+0000000000000000000000000000000000000000 v7-4-534
-+83c5fd1b55bc6b2b49b4653cc98985b8dd3fc728 v7.4.535
-+83c5fd1b55bc6b2b49b4653cc98985b8dd3fc728 v7-4-535
-+0000000000000000000000000000000000000000 v7-4-535
-+d51d47bd77c2f042f9893d9c528a5f2fe75eb872 v7.4.536
-+d51d47bd77c2f042f9893d9c528a5f2fe75eb872 v7-4-536
-+0000000000000000000000000000000000000000 v7-4-536
-+01c668384bcc7fd0f8572a8de2dfc3b2ead7eff0 v7.4.537
-+01c668384bcc7fd0f8572a8de2dfc3b2ead7eff0 v7-4-537
-+0000000000000000000000000000000000000000 v7-4-537
-+3421b24e419c935f3914a4bf7eb6d3b1de3d618f v7.4.538
-+3421b24e419c935f3914a4bf7eb6d3b1de3d618f v7-4-538
-+0000000000000000000000000000000000000000 v7-4-538
-+77fe94082f5396c2e40f732b30c9d76984969694 v7.4.539
-+77fe94082f5396c2e40f732b30c9d76984969694 v7-4-539
-+0000000000000000000000000000000000000000 v7-4-539
-+93aca8cdd7b8cc1d9e921e243c7c2b6c7fd5f730 v7.4.540
-+93aca8cdd7b8cc1d9e921e243c7c2b6c7fd5f730 v7-4-540
-+0000000000000000000000000000000000000000 v7-4-540
-+9fbb9c60ab41765a0d9f02b0b6d48cabe7270f0e v7.4.541
-+9fbb9c60ab41765a0d9f02b0b6d48cabe7270f0e v7-4-541
-+0000000000000000000000000000000000000000 v7-4-541
-+de877dab1c3163a95ac8e7d3d6c3083a64e3c093 v7.4.542
-+de877dab1c3163a95ac8e7d3d6c3083a64e3c093 v7-4-542
-+0000000000000000000000000000000000000000 v7-4-542
-+f673842874b6aa9fdbf3f3d9fafc67fe4debcbf6 v7.4.543
-+f673842874b6aa9fdbf3f3d9fafc67fe4debcbf6 v7-4-543
-+0000000000000000000000000000000000000000 v7-4-543
-+89143424f604cd610f7e709ac683dc28a473e078 v7.4.544
-+89143424f604cd610f7e709ac683dc28a473e078 v7-4-544
-+0000000000000000000000000000000000000000 v7-4-544
-+d2239abd3edb1e3672916c15ea8df6a01d1b86c6 v7.4.545
-+d2239abd3edb1e3672916c15ea8df6a01d1b86c6 v7-4-545
-+0000000000000000000000000000000000000000 v7-4-545
-+84190359b9799b0ecb4d9e8e421471e14f659616 v7.4.546
-+84190359b9799b0ecb4d9e8e421471e14f659616 v7-4-546
-+0000000000000000000000000000000000000000 v7-4-546
-+19726451aabea7e3640c56703846991c35e59e98 v7.4.547
-+19726451aabea7e3640c56703846991c35e59e98 v7-4-547
-+0000000000000000000000000000000000000000 v7-4-547
-+26a20ce3532c5e3f47f12facc28a5477fedc9e31 v7.4.548
-+26a20ce3532c5e3f47f12facc28a5477fedc9e31 v7-4-548
-+0000000000000000000000000000000000000000 v7-4-548
-+1fd9f1d43660f9645d8dabfd14131371aa2f529f v7.4.549
-+1fd9f1d43660f9645d8dabfd14131371aa2f529f v7-4-549
-+0000000000000000000000000000000000000000 v7-4-549
-+7cda721eadb04f555a912b220c9047f504480bc6 v7.4.550
-+7cda721eadb04f555a912b220c9047f504480bc6 v7-4-550
-+0000000000000000000000000000000000000000 v7-4-550
-+eb0fb921e197c7b1294e1142479c982d1770eaa0 v7.4.551
-+eb0fb921e197c7b1294e1142479c982d1770eaa0 v7-4-551
-+0000000000000000000000000000000000000000 v7-4-551
-+c8d6dbdd11563d39c42f16a80f9c74bc68155f7a v7.4.552
-+c8d6dbdd11563d39c42f16a80f9c74bc68155f7a v7-4-552
-+0000000000000000000000000000000000000000 v7-4-552
-+e13f8073c9f9b8f2e80f32cf0c13073304a3f967 v7.4.553
-+e13f8073c9f9b8f2e80f32cf0c13073304a3f967 v7-4-553
-+0000000000000000000000000000000000000000 v7-4-553
-+7e4c22ecc679455fdf3e1eec6681d13d998bebe2 v7.4.554
-+7e4c22ecc679455fdf3e1eec6681d13d998bebe2 v7-4-554
-+0000000000000000000000000000000000000000 v7-4-554
-+c124393788693271b446ba24b55dca407e765bbe v7.4.555
-+c124393788693271b446ba24b55dca407e765bbe v7-4-555
-+0000000000000000000000000000000000000000 v7-4-555
-+a35752526cd050f35306bac3dc04ac4a34a9f309 v7.4.556
-+a35752526cd050f35306bac3dc04ac4a34a9f309 v7-4-556
-+0000000000000000000000000000000000000000 v7-4-556
-+fcd5a3207100a1f75d96ead301249c60b4f23d79 v7.4.557
-+fcd5a3207100a1f75d96ead301249c60b4f23d79 v7-4-557
-+0000000000000000000000000000000000000000 v7-4-557
-+48111d5fd8a8b133b32fa92137a56ae910915370 v7.4.558
-+48111d5fd8a8b133b32fa92137a56ae910915370 v7-4-558
-+0000000000000000000000000000000000000000 v7-4-558
-+29f5cfca338897412e3a7c819085c1fe36da2135 v7.4.559
-+29f5cfca338897412e3a7c819085c1fe36da2135 v7-4-559
-+0000000000000000000000000000000000000000 v7-4-559
-+86aacd619ac0ab9b6b6519cf132367b744adf8f0 v7.4.560
-+86aacd619ac0ab9b6b6519cf132367b744adf8f0 v7-4-560
-+0000000000000000000000000000000000000000 v7-4-560
-+82c6a3bddb23c7343fefc271b33960a20506ead5 v7.4.561
-+82c6a3bddb23c7343fefc271b33960a20506ead5 v7-4-561
-+0000000000000000000000000000000000000000 v7-4-561
-+b5df99582638f6f6cad794b7049453d7ff2c70b2 v7.4.562
-+b5df99582638f6f6cad794b7049453d7ff2c70b2 v7-4-562
-+0000000000000000000000000000000000000000 v7-4-562
-+9dc52b404c1b3f32d36df2841c4c8eddea6e4407 v7.4.563
-+9dc52b404c1b3f32d36df2841c4c8eddea6e4407 v7-4-563
-+0000000000000000000000000000000000000000 v7-4-563
-+9657929ee56251b52885cd0660941b0aab2af3ba v7.4.564
-+9657929ee56251b52885cd0660941b0aab2af3ba v7-4-564
-+0000000000000000000000000000000000000000 v7-4-564
-+22f95a018b13dc9d8a3246d990a1ea0b5b3a264d v7.4.565
-+22f95a018b13dc9d8a3246d990a1ea0b5b3a264d v7-4-565
-+0000000000000000000000000000000000000000 v7-4-565
-+a88d4dc02bf438ff9e6ee119be8188e342ea459e v7.4.566
-+a88d4dc02bf438ff9e6ee119be8188e342ea459e v7-4-566
-+0000000000000000000000000000000000000000 v7-4-566
-+0b245c8dbd19755e08b5248110a537a74ddb92c4 v7.4.567
-+0b245c8dbd19755e08b5248110a537a74ddb92c4 v7-4-567
-+0000000000000000000000000000000000000000 v7-4-567
-+747cbac7047bf8d003ff0672b25b60e0236fdb1b v7.4.568
-+747cbac7047bf8d003ff0672b25b60e0236fdb1b v7-4-568
-+0000000000000000000000000000000000000000 v7-4-568
-+ccb6962585f1ea5e7f872d79e59565e7a95234db v7.4.569
-+ccb6962585f1ea5e7f872d79e59565e7a95234db v7-4-569
-+0000000000000000000000000000000000000000 v7-4-569
-+816c584ff1740cd118d5a35fbea98ed28ed2e2e2 v7.4.570
-+816c584ff1740cd118d5a35fbea98ed28ed2e2e2 v7-4-570
-+0000000000000000000000000000000000000000 v7-4-570
-+97b2ff29ae3a213b5c72bd8ea3aa2442ef355e08 v7.4.571
-+97b2ff29ae3a213b5c72bd8ea3aa2442ef355e08 v7-4-571
-+0000000000000000000000000000000000000000 v7-4-571
-+cba15023c40371ed51ee0ed50fbdf23d6860f0ba v7.4.572
-+cba15023c40371ed51ee0ed50fbdf23d6860f0ba v7-4-572
-+0000000000000000000000000000000000000000 v7-4-572
-+8cfbc34ae4aa2b91b5b012b2e8dfe86327b449c9 v7.4.573
-+8cfbc34ae4aa2b91b5b012b2e8dfe86327b449c9 v7-4-573
-+0000000000000000000000000000000000000000 v7-4-573
-+45ff9dd354eaff958c0ba646134e1f5cd6e9186f v7.4.574
-+45ff9dd354eaff958c0ba646134e1f5cd6e9186f v7-4-574
-+0000000000000000000000000000000000000000 v7-4-574
-+fe0f33ac63af3c16a9920fe08bd3582aa0f02f50 v7.4.575
-+fe0f33ac63af3c16a9920fe08bd3582aa0f02f50 v7-4-575
-+0000000000000000000000000000000000000000 v7-4-575
-+749fc929da45d07efc5352dd8a0c00f8ed9f2163 v7.4.576
-+749fc929da45d07efc5352dd8a0c00f8ed9f2163 v7-4-576
-+0000000000000000000000000000000000000000 v7-4-576
-+bcf9d3a6007fff06d0521339f93dc870e5231eaa v7.4.577
-+bcf9d3a6007fff06d0521339f93dc870e5231eaa v7-4-577
-+0000000000000000000000000000000000000000 v7-4-577
-+b7b3afcae90e5b8e9f57ec3b172fed14f6912579 v7.4.578
-+b7b3afcae90e5b8e9f57ec3b172fed14f6912579 v7-4-578
-+0000000000000000000000000000000000000000 v7-4-578
-+134a7d55f9fa170c8c4591328eb550e70b756616 v7.4.579
-+134a7d55f9fa170c8c4591328eb550e70b756616 v7-4-579
-+0000000000000000000000000000000000000000 v7-4-579
-+a5a6f1467b1ea73697b3265d8f12805bd998c81e v7.4.580
-+a5a6f1467b1ea73697b3265d8f12805bd998c81e v7-4-580
-+0000000000000000000000000000000000000000 v7-4-580
-+e1874a4524f8c97efed78e215fd5ff91f3569351 v7.4.581
-+e1874a4524f8c97efed78e215fd5ff91f3569351 v7-4-581
-+0000000000000000000000000000000000000000 v7-4-581
-+dfd593d81818468ad60cad4fc66c561299f8d969 v7.4.582
-+dfd593d81818468ad60cad4fc66c561299f8d969 v7-4-582
-+0000000000000000000000000000000000000000 v7-4-582
-+f2978794e801bfe8a587865492302cc0a16783cc v7.4.583
-+f2978794e801bfe8a587865492302cc0a16783cc v7-4-583
-+0000000000000000000000000000000000000000 v7-4-583
-+79b3d83592c5ad63ce0c8d276d15f570e95dd941 v7.4.584
-+79b3d83592c5ad63ce0c8d276d15f570e95dd941 v7-4-584
-+0000000000000000000000000000000000000000 v7-4-584
-+1d3139ae6ce67d69ce8bc221bfc67dc1b47e95d9 v7.4.585
-+1d3139ae6ce67d69ce8bc221bfc67dc1b47e95d9 v7-4-585
-+0000000000000000000000000000000000000000 v7-4-585
-+667cb2eb17a52d9ac28a1b6f686935814e769ecd v7.4.586
-+667cb2eb17a52d9ac28a1b6f686935814e769ecd v7-4-586
-+0000000000000000000000000000000000000000 v7-4-586
-+70793fedd25a509568abbd4026565675e830b1ca v7.4.587
-+70793fedd25a509568abbd4026565675e830b1ca v7-4-587
-+0000000000000000000000000000000000000000 v7-4-587
-+a03e143b93587cf29c91121acdf66f6e5dc6e470 v7.4.588
-+a03e143b93587cf29c91121acdf66f6e5dc6e470 v7-4-588
-+0000000000000000000000000000000000000000 v7-4-588
-+8ff2d1b611bfeb17b594262cbf9313f819b4483a v7.4.589
-+8ff2d1b611bfeb17b594262cbf9313f819b4483a v7-4-589
-+0000000000000000000000000000000000000000 v7-4-589
-+5b8d26b85437ffa91cd586fa138aba80bba897a9 v7.4.590
-+5b8d26b85437ffa91cd586fa138aba80bba897a9 v7-4-590
-+0000000000000000000000000000000000000000 v7-4-590
-+7b8e3be930f39af3cdc1fe969a6de16f2d91e5d2 v7.4.591
-+7b8e3be930f39af3cdc1fe969a6de16f2d91e5d2 v7-4-591
-+0000000000000000000000000000000000000000 v7-4-591
-+005a6b65086666ed56531e4c8a531a3ee0cea638 v7.4.592
-+005a6b65086666ed56531e4c8a531a3ee0cea638 v7-4-592
-+0000000000000000000000000000000000000000 v7-4-592
-+bdc8e71633e45ebe5f1b59e4328fcf22a5866cb7 v7.4.593
-+bdc8e71633e45ebe5f1b59e4328fcf22a5866cb7 v7-4-593
-+0000000000000000000000000000000000000000 v7-4-593
-+f9d02ce2f745f75003ff570b2a596c755ccc86ba v7.4.594
-+f9d02ce2f745f75003ff570b2a596c755ccc86ba v7-4-594
-+0000000000000000000000000000000000000000 v7-4-594
-+d83436d119871584ddb012ecf0aa4d01030f65ee v7.4.595
-+d83436d119871584ddb012ecf0aa4d01030f65ee v7-4-595
-+0000000000000000000000000000000000000000 v7-4-595
-+6da912e32896c57227a0f297aa1d3312a653cf0a v7.4.596
-+6da912e32896c57227a0f297aa1d3312a653cf0a v7-4-596
-+0000000000000000000000000000000000000000 v7-4-596
-+c124a8f34ed1cf510d384b384db6f34be5d61a3e v7.4.597
-+c124a8f34ed1cf510d384b384db6f34be5d61a3e v7-4-597
-+0000000000000000000000000000000000000000 v7-4-597
-+b01ca71f93b293ba93489bc2320c12caf61bf289 v7.4.598
-+b01ca71f93b293ba93489bc2320c12caf61bf289 v7-4-598
-+0000000000000000000000000000000000000000 v7-4-598
-+1ef8ce97fc40b59d7218d7300685d40df63a407c v7.4.599
-+1ef8ce97fc40b59d7218d7300685d40df63a407c v7-4-599
-+0000000000000000000000000000000000000000 v7-4-599
-+436d6c9e57f2f6def73e86891cbf72a0328aa9bd v7.4.600
-+436d6c9e57f2f6def73e86891cbf72a0328aa9bd v7-4-600
-+0000000000000000000000000000000000000000 v7-4-600
-+2561531decf15c1a02f62a1b96ff778e12a5dcbc v7.4.601
-+2561531decf15c1a02f62a1b96ff778e12a5dcbc v7-4-601
-+0000000000000000000000000000000000000000 v7-4-601
-+4e31d9f7c896a346b2346fc4ff005b8b255172c9 v7.4.602
-+4e31d9f7c896a346b2346fc4ff005b8b255172c9 v7-4-602
-+0000000000000000000000000000000000000000 v7-4-602
-+0c8738124a7b9d6d1d3e18124ad97310e9618c92 v7.4.603
-+0c8738124a7b9d6d1d3e18124ad97310e9618c92 v7-4-603
-+0000000000000000000000000000000000000000 v7-4-603
-+f625b6302d048df7d9f9e738b773f91dd4bbd58e v7.4.604
-+f625b6302d048df7d9f9e738b773f91dd4bbd58e v7-4-604
-+0000000000000000000000000000000000000000 v7-4-604
-+c1ed973fb58faa650dcd4d25a98c669edb8ca0d4 v7.4.605
-+c1ed973fb58faa650dcd4d25a98c669edb8ca0d4 v7-4-605
-+0000000000000000000000000000000000000000 v7-4-605
-+22f164bd7e8ea7de1e4c2a41020dde971112b862 v7.4.606
-+22f164bd7e8ea7de1e4c2a41020dde971112b862 v7-4-606
-+0000000000000000000000000000000000000000 v7-4-606
-+52b89a52ffd4f2a925b42be1aa8041bc0c0dff31 v7.4.607
-+52b89a52ffd4f2a925b42be1aa8041bc0c0dff31 v7-4-607
-+0000000000000000000000000000000000000000 v7-4-607
-+6b86d256fd3360a5a0a8f89c3efeda4e961153c0 v7.4.608
-+6b86d256fd3360a5a0a8f89c3efeda4e961153c0 v7-4-608
-+0000000000000000000000000000000000000000 v7-4-608
-+38add5a3d617109be3be5e4c0d0b7a32ab2a2e00 v7.4.609
-+38add5a3d617109be3be5e4c0d0b7a32ab2a2e00 v7-4-609
-+0000000000000000000000000000000000000000 v7-4-609
-+d6473d6501fd0d1c9113590bf29a4195bf4337bb v7.4.610
-+d6473d6501fd0d1c9113590bf29a4195bf4337bb v7-4-610
-+0000000000000000000000000000000000000000 v7-4-610
-+7fa1a7359a56531ec52ba527b3c1c1a7c8b9464c v7.4.611
-+7fa1a7359a56531ec52ba527b3c1c1a7c8b9464c v7-4-611
-+0000000000000000000000000000000000000000 v7-4-611
-+75238dbe85432f4980aee44b25921880b3122f64 v7.4.612
-+75238dbe85432f4980aee44b25921880b3122f64 v7-4-612
-+0000000000000000000000000000000000000000 v7-4-612
-+ffba266e064d1b951bfc9531adc664aab60cded1 v7.4.613
-+ffba266e064d1b951bfc9531adc664aab60cded1 v7-4-613
-+0000000000000000000000000000000000000000 v7-4-613
-+a7e485b683d8df14c3fe0833c7b4928098914aa0 v7.4.614
-+a7e485b683d8df14c3fe0833c7b4928098914aa0 v7-4-614
-+0000000000000000000000000000000000000000 v7-4-614
-+7092ec5d5ef1f6f399d7e6b36c2cdd73bc1b3ac3 v7.4.615
-+7092ec5d5ef1f6f399d7e6b36c2cdd73bc1b3ac3 v7-4-615
-+0000000000000000000000000000000000000000 v7-4-615
-+a287b0e9e87b238bd72b5340cd8fa37807de7525 v7.4.616
-+a287b0e9e87b238bd72b5340cd8fa37807de7525 v7-4-616
-+0000000000000000000000000000000000000000 v7-4-616
-+05202d6ba0ef2b1430519fda8bdb59576b1b01a8 v7.4.617
-+05202d6ba0ef2b1430519fda8bdb59576b1b01a8 v7-4-617
-+0000000000000000000000000000000000000000 v7-4-617
-+d129b939a19065a0a5302077d2a9737ed2dc0bf0 v7.4.618
-+d129b939a19065a0a5302077d2a9737ed2dc0bf0 v7-4-618
-+0000000000000000000000000000000000000000 v7-4-618
-+9ac723b9f54dfbf2c1d05a26a129e94af6a1d72c v7.4.619
-+9ac723b9f54dfbf2c1d05a26a129e94af6a1d72c v7-4-619
-+0000000000000000000000000000000000000000 v7-4-619
-+1ffe91b5e51408d9f68ed8651bb3a85f68365ad1 v7.4.620
-+1ffe91b5e51408d9f68ed8651bb3a85f68365ad1 v7-4-620
-+0000000000000000000000000000000000000000 v7-4-620
-+f884a1140a0a143ad21b08166e2b72dd131b78c2 v7.4.621
-+f884a1140a0a143ad21b08166e2b72dd131b78c2 v7-4-621
-+0000000000000000000000000000000000000000 v7-4-621
-+599112d00aa96072d75b1d6a5bcd7123d055daa5 v7.4.622
-+599112d00aa96072d75b1d6a5bcd7123d055daa5 v7-4-622
-+0000000000000000000000000000000000000000 v7-4-622
-+3cca9b0cc1a0d31ac6c6a0b69544dee96ff280b4 v7.4.623
-+3cca9b0cc1a0d31ac6c6a0b69544dee96ff280b4 v7-4-623
-+0000000000000000000000000000000000000000 v7-4-623
-+f8f2a61e538d4094e29db47954516d572b2dcca4 v7.4.624
-+f8f2a61e538d4094e29db47954516d572b2dcca4 v7-4-624
-+0000000000000000000000000000000000000000 v7-4-624
-+4b1e3b3aa78abcdab840189d766f54ebdb2712fe v7.4.625
-+4b1e3b3aa78abcdab840189d766f54ebdb2712fe v7-4-625
-+0000000000000000000000000000000000000000 v7-4-625
-+68e0e6bb8250f9b595b517e7061e83796a4b3ec0 v7.4.626
-+68e0e6bb8250f9b595b517e7061e83796a4b3ec0 v7-4-626
-+0000000000000000000000000000000000000000 v7-4-626
-+c77ef1bf9623d0c7ebd7e011e6ce7a3a12b0bf41 v7.4.627
-+c77ef1bf9623d0c7ebd7e011e6ce7a3a12b0bf41 v7-4-627
-+0000000000000000000000000000000000000000 v7-4-627
-+6eecaf5a18ca95f0ff06dc2ac88015e6bb6f70ac v7.4.628
-+6eecaf5a18ca95f0ff06dc2ac88015e6bb6f70ac v7-4-628
-+0000000000000000000000000000000000000000 v7-4-628
-+f28c171348fbfe055c86a354b4d235e2786215d9 v7.4.629
-+f28c171348fbfe055c86a354b4d235e2786215d9 v7-4-629
-+0000000000000000000000000000000000000000 v7-4-629
-+a5ba0921efcb7d48a9ad5939f66953a43ddf359b v7.4.630
-+a5ba0921efcb7d48a9ad5939f66953a43ddf359b v7-4-630
-+0000000000000000000000000000000000000000 v7-4-630
-+86f00f7678eb312cb88b25da2df648f9c9199b5c v7.4.631
-+86f00f7678eb312cb88b25da2df648f9c9199b5c v7-4-631
-+0000000000000000000000000000000000000000 v7-4-631
-+cd7b5bbe49525c716f2b7eba4353b1f496134944 v7.4.632
-+cd7b5bbe49525c716f2b7eba4353b1f496134944 v7-4-632
-+0000000000000000000000000000000000000000 v7-4-632
-+03688be95994f55e68cce333a92b673ff31dda9c v7.4.633
-+03688be95994f55e68cce333a92b673ff31dda9c v7-4-633
-+0000000000000000000000000000000000000000 v7-4-633
-+290631797b76d126b51b83f04bce6218f0ed2dac v7.4.634
-+290631797b76d126b51b83f04bce6218f0ed2dac v7-4-634
-+0000000000000000000000000000000000000000 v7-4-634
-+a871b5070d59ef9ed1934b2951ef896b2c71b444 v7.4.635
-+a871b5070d59ef9ed1934b2951ef896b2c71b444 v7-4-635
-+0000000000000000000000000000000000000000 v7-4-635
-+578c16fbab6684cf2c690f78089f755f041568b3 v7.4.636
-+578c16fbab6684cf2c690f78089f755f041568b3 v7-4-636
-+0000000000000000000000000000000000000000 v7-4-636
-+a532340f39406fa50e8db45f769468bdeff1e982 v7.4.637
-+a532340f39406fa50e8db45f769468bdeff1e982 v7-4-637
-+0000000000000000000000000000000000000000 v7-4-637
-+199ce895e1629df83ef97d62ca70d38b7400adad v7.4.638
-+199ce895e1629df83ef97d62ca70d38b7400adad v7-4-638
-+0000000000000000000000000000000000000000 v7-4-638
-+43f444efe6a2de86f459e9dc164429a8d81c70e7 v7.4.639
-+43f444efe6a2de86f459e9dc164429a8d81c70e7 v7-4-639
-+0000000000000000000000000000000000000000 v7-4-639
-+34774748534375073253c4a683d0d3d8944494db v7.4.640
-+34774748534375073253c4a683d0d3d8944494db v7-4-640
-+0000000000000000000000000000000000000000 v7-4-640
-+e527af42e10868b90efc63e8b6356ea6bdd52dd4 v7.4.641
-+e527af42e10868b90efc63e8b6356ea6bdd52dd4 v7-4-641
-+0000000000000000000000000000000000000000 v7-4-641
-+75444015837a668050df729741711bd0a057d700 v7.4.642
-+75444015837a668050df729741711bd0a057d700 v7-4-642
-+0000000000000000000000000000000000000000 v7-4-642
-+050e6df85f99bf9e7a3cda67ef01b7c881ea0571 v7.4.643
-+050e6df85f99bf9e7a3cda67ef01b7c881ea0571 v7-4-643
-+0000000000000000000000000000000000000000 v7-4-643
-+a12d422ed16ca15ab8a05ebee4c1b49efc2c6c50 v7.4.644
-+a12d422ed16ca15ab8a05ebee4c1b49efc2c6c50 v7-4-644
-+0000000000000000000000000000000000000000 v7-4-644
-+342568f82d828caa08ac46f2e022aa51098f7de0 v7.4.645
-+342568f82d828caa08ac46f2e022aa51098f7de0 v7-4-645
-+0000000000000000000000000000000000000000 v7-4-645
-+ceda6d8af44749011c7fd65e96678fdb247777b1 v7.4.646
-+ceda6d8af44749011c7fd65e96678fdb247777b1 v7-4-646
-+0000000000000000000000000000000000000000 v7-4-646
-+4f9c3e62d4d4d3f50536c6baece990483969d597 v7.4.647
-+4f9c3e62d4d4d3f50536c6baece990483969d597 v7-4-647
-+0000000000000000000000000000000000000000 v7-4-647
-+0a859da6714bb2b34f4e7cc71c89d2b0724c60de v7.4.648
-+0a859da6714bb2b34f4e7cc71c89d2b0724c60de v7-4-648
-+0000000000000000000000000000000000000000 v7-4-648
-+8bee881c3ca5d72008268db5dde8e2940226f6bd v7.4.649
-+8bee881c3ca5d72008268db5dde8e2940226f6bd v7-4-649
-+0000000000000000000000000000000000000000 v7-4-649
-+7026d6f3367fca47d664a1b1ef1b302f5c0edc45 v7.4.650
-+7026d6f3367fca47d664a1b1ef1b302f5c0edc45 v7-4-650
-+0000000000000000000000000000000000000000 v7-4-650
-+2c7f279d419caab2b6329e0415322ebf4fa3f312 v7.4.651
-+2c7f279d419caab2b6329e0415322ebf4fa3f312 v7-4-651
-+0000000000000000000000000000000000000000 v7-4-651
-+6c94cedccda4569141ddf71005a4087b8df833dc v7.4.652
-+6c94cedccda4569141ddf71005a4087b8df833dc v7-4-652
-+0000000000000000000000000000000000000000 v7-4-652
-+41d50eba0c0f472b9d4399e01989679ad893ed2f v7.4.653
-+41d50eba0c0f472b9d4399e01989679ad893ed2f v7-4-653
-+0000000000000000000000000000000000000000 v7-4-653
-+6f1e4b7942c328173b1cb2b322314e028669a866 v7.4.654
-+6f1e4b7942c328173b1cb2b322314e028669a866 v7-4-654
-+0000000000000000000000000000000000000000 v7-4-654
-+950e24f26ef8cc460c66238efce9104eaf424f79 v7.4.655
-+950e24f26ef8cc460c66238efce9104eaf424f79 v7-4-655
-+0000000000000000000000000000000000000000 v7-4-655
-+056809de0b298e7f32a76ace0575088a639f3b24 v7.4.656
-+056809de0b298e7f32a76ace0575088a639f3b24 v7-4-656
-+0000000000000000000000000000000000000000 v7-4-656
-+9fda0c52db0b0aa8819370d6061c8af61a8a13a8 v7.4.657
-+9fda0c52db0b0aa8819370d6061c8af61a8a13a8 v7-4-657
-+0000000000000000000000000000000000000000 v7-4-657
-+9f74286c4404346bb69d10575eb5ac82cb635add v7.4.658
-+9f74286c4404346bb69d10575eb5ac82cb635add v7-4-658
-+0000000000000000000000000000000000000000 v7-4-658
-+5a12a68613670ddb7d3be0c693738400c61ef24b v7.4.659
-+5a12a68613670ddb7d3be0c693738400c61ef24b v7-4-659
-+0000000000000000000000000000000000000000 v7-4-659
-+476a12a96bb1e5ccc71b1c1010d529deca271617 v7.4.660
-+476a12a96bb1e5ccc71b1c1010d529deca271617 v7-4-660
-+0000000000000000000000000000000000000000 v7-4-660
-+21719d38d2ff265c7f55230df8529780280f2cf9 v7.4.661
-+21719d38d2ff265c7f55230df8529780280f2cf9 v7-4-661
-+0000000000000000000000000000000000000000 v7-4-661
-+24e0b6dd52e1b259559f142e8c04aa0a74128146 v7.4.662
-+24e0b6dd52e1b259559f142e8c04aa0a74128146 v7-4-662
-+0000000000000000000000000000000000000000 v7-4-662
-+77172f5bac73b69838da5b9161ef5574cf3b7189 v7.4.663
-+77172f5bac73b69838da5b9161ef5574cf3b7189 v7-4-663
-+0000000000000000000000000000000000000000 v7-4-663
-+27d9a4d8c1689123939b6c3114e8e60c9656f507 v7.4.664
-+27d9a4d8c1689123939b6c3114e8e60c9656f507 v7-4-664
-+0000000000000000000000000000000000000000 v7-4-664
-+80abb7288d39c917b875f6788246356f8f1da645 v7.4.665
-+80abb7288d39c917b875f6788246356f8f1da645 v7-4-665
-+0000000000000000000000000000000000000000 v7-4-665
-+781104cb0d069389b2db31a7553118f44e4f24c1 v7.4.666
-+781104cb0d069389b2db31a7553118f44e4f24c1 v7-4-666
-+0000000000000000000000000000000000000000 v7-4-666
-+fd495ad521dc55f76636b7dde74f59739512fa45 v7.4.667
-+fd495ad521dc55f76636b7dde74f59739512fa45 v7-4-667
-+0000000000000000000000000000000000000000 v7-4-667
-+c52bb45c675242c167626ad303fbc8fb8ecaf844 v7.4.668
-+c52bb45c675242c167626ad303fbc8fb8ecaf844 v7-4-668
-+0000000000000000000000000000000000000000 v7-4-668
-+97cc4ee3e095ce4e7178c41a39bac864ba6d2c7d v7.4.669
-+97cc4ee3e095ce4e7178c41a39bac864ba6d2c7d v7-4-669
-+0000000000000000000000000000000000000000 v7-4-669
-+c4cb95fb4c585d81adc794421f16f62a30f0fc30 v7.4.670
-+c4cb95fb4c585d81adc794421f16f62a30f0fc30 v7-4-670
-+0000000000000000000000000000000000000000 v7-4-670
-+8faab3792a924c58b592170980fc74244d7cf402 v7.4.671
-+8faab3792a924c58b592170980fc74244d7cf402 v7-4-671
-+0000000000000000000000000000000000000000 v7-4-671
-+6529590f6c436594c3ba177c61efd9b42b3cbc08 v7.4.672
-+6529590f6c436594c3ba177c61efd9b42b3cbc08 v7-4-672
-+0000000000000000000000000000000000000000 v7-4-672
-+67e7a819c8115a149d2e780fa1fa7d9fa96a6c02 v7.4.673
-+67e7a819c8115a149d2e780fa1fa7d9fa96a6c02 v7-4-673
-+0000000000000000000000000000000000000000 v7-4-673
-+f26c1d294156c092290595897694627867809199 v7.4.674
-+f26c1d294156c092290595897694627867809199 v7-4-674
-+0000000000000000000000000000000000000000 v7-4-674
-+d879db7c2f56d8c16d997c4b37cee38036d7a721 v7.4.675
-+d879db7c2f56d8c16d997c4b37cee38036d7a721 v7-4-675
-+0000000000000000000000000000000000000000 v7-4-675
-+692bc2c52002dcc3a6c0e809057d46792e70db29 v7.4.676
-+692bc2c52002dcc3a6c0e809057d46792e70db29 v7-4-676
-+0000000000000000000000000000000000000000 v7-4-676
-+c8ff693e9ebc074137d0566868561b13dc11fe0c v7.4.677
-+c8ff693e9ebc074137d0566868561b13dc11fe0c v7-4-677
-+0000000000000000000000000000000000000000 v7-4-677
-+b225e8fed8cc0e320527922e6abf1c7b8c6b83b6 v7.4.678
-+b225e8fed8cc0e320527922e6abf1c7b8c6b83b6 v7-4-678
-+0000000000000000000000000000000000000000 v7-4-678
-+43a07fa781552a64fe3e9be1bb504f8bac146a24 v7.4.679
-+43a07fa781552a64fe3e9be1bb504f8bac146a24 v7-4-679
-+0000000000000000000000000000000000000000 v7-4-679
-+c939d19bd86edd083bd690e2b6e1315877b098d7 v7.4.680
-+c939d19bd86edd083bd690e2b6e1315877b098d7 v7-4-680
-+0000000000000000000000000000000000000000 v7-4-680
-+dc96dd80aef84bbdf0537fbf9c9f5ab63a7ab649 v7.4.681
-+dc96dd80aef84bbdf0537fbf9c9f5ab63a7ab649 v7-4-681
-+0000000000000000000000000000000000000000 v7-4-681
-+f242cf1f98975b4840e5f4644c3c3e84d08d96eb v7.4.682
-+f242cf1f98975b4840e5f4644c3c3e84d08d96eb v7-4-682
-+0000000000000000000000000000000000000000 v7-4-682
-+6f55637de261d7e407502bd4d62557ec64aad2f9 v7.4.683
-+6f55637de261d7e407502bd4d62557ec64aad2f9 v7-4-683
-+0000000000000000000000000000000000000000 v7-4-683
-+7347229a646a04740b534994dde47f9e4918fd04 v7.4.684
-+7347229a646a04740b534994dde47f9e4918fd04 v7-4-684
-+0000000000000000000000000000000000000000 v7-4-684
-+eefee03a37fe758ef9509dd0b95af2c104ea1617 v7.4.685
-+eefee03a37fe758ef9509dd0b95af2c104ea1617 v7-4-685
-+0000000000000000000000000000000000000000 v7-4-685
-+bc62d1988bf20c5f5446769a5e82528d14feb7c7 v7.4.686
-+bc62d1988bf20c5f5446769a5e82528d14feb7c7 v7-4-686
-+0000000000000000000000000000000000000000 v7-4-686
-+7c5a0c69e1acb4624cf1b61edc7e4af0b769909c v7.4.687
-+7c5a0c69e1acb4624cf1b61edc7e4af0b769909c v7-4-687
-+0000000000000000000000000000000000000000 v7-4-687
-+e25417c299bb9fe39f76d50ceed799d9b0cbb954 v7.4.688
-+e25417c299bb9fe39f76d50ceed799d9b0cbb954 v7-4-688
-+0000000000000000000000000000000000000000 v7-4-688
-+7d40186f767a68cb5b7cc47b05745efe96b080e4 v7.4.689
-+7d40186f767a68cb5b7cc47b05745efe96b080e4 v7-4-689
-+0000000000000000000000000000000000000000 v7-4-689
-+5f6077b1073840149ab9e7fb1f0afe225edaab45 v7.4.690
-+5f6077b1073840149ab9e7fb1f0afe225edaab45 v7-4-690
-+0000000000000000000000000000000000000000 v7-4-690
-+f6021786b7755e586b366e0de0581354d4907210 v7.4.691
-+f6021786b7755e586b366e0de0581354d4907210 v7-4-691
-+0000000000000000000000000000000000000000 v7-4-691
-+9a07975061edaee1d985953fb5fcf96923a0b35f v7.4.692
-+9a07975061edaee1d985953fb5fcf96923a0b35f v7-4-692
-+0000000000000000000000000000000000000000 v7-4-692
-+f012247e8ec87225de6727adb4f56d3da5ee05e8 v7.4.693
-+f012247e8ec87225de6727adb4f56d3da5ee05e8 v7-4-693
-+0000000000000000000000000000000000000000 v7-4-693
-+cdddbd63bcfe74508af6c3a5a522032871244662 v7.4.694
-+cdddbd63bcfe74508af6c3a5a522032871244662 v7-4-694
-+0000000000000000000000000000000000000000 v7-4-694
-+7f9a158cf1d93f133353727fe6de72906902a76c v7.4.695
-+7f9a158cf1d93f133353727fe6de72906902a76c v7-4-695
-+0000000000000000000000000000000000000000 v7-4-695
-+4c4c8a53347b463804ad889f0b154ee0f884928f v7.4.696
-+4c4c8a53347b463804ad889f0b154ee0f884928f v7-4-696
-+0000000000000000000000000000000000000000 v7-4-696
-+57e81ce74c066995b3caf0c4bd06ba280fcfebf9 v7.4.697
-+57e81ce74c066995b3caf0c4bd06ba280fcfebf9 v7-4-697
-+0000000000000000000000000000000000000000 v7-4-697
-+f5b26298175342f7bf3cb1e2603a4136c7071d81 v7.4.698
-+f5b26298175342f7bf3cb1e2603a4136c7071d81 v7-4-698
-+0000000000000000000000000000000000000000 v7-4-698
-+c1aa837853ea140e1ba5b0eaeb4ae3f424e2e325 v7.4.699
-+c1aa837853ea140e1ba5b0eaeb4ae3f424e2e325 v7-4-699
-+0000000000000000000000000000000000000000 v7-4-699
-+b85fcd9b858d1f9b5dd04f652d692fa1afeb841d v7.4.700
-+b85fcd9b858d1f9b5dd04f652d692fa1afeb841d v7-4-700
-+0000000000000000000000000000000000000000 v7-4-700
-+b019669eee536e8d9a19dc0c2fc8d3ab46607f12 v7.4.701
-+b019669eee536e8d9a19dc0c2fc8d3ab46607f12 v7-4-701
-+0000000000000000000000000000000000000000 v7-4-701
-+203888fa7192572d8bc96ee115825311c867fc47 v7.4.702
-+203888fa7192572d8bc96ee115825311c867fc47 v7-4-702
-+0000000000000000000000000000000000000000 v7-4-702
-+e026e4f106a535956854f5847dbc555a8474d899 v7.4.703
-+e026e4f106a535956854f5847dbc555a8474d899 v7-4-703
-+0000000000000000000000000000000000000000 v7-4-703
-+ec46a5ca1b5169c35c416f8baa3d196cf2daeece v7.4.704
-+ec46a5ca1b5169c35c416f8baa3d196cf2daeece v7-4-704
-+0000000000000000000000000000000000000000 v7-4-704
-+d118a2c541d57499f7b75a10a0a9b61a86ad7cfb v7.4.705
-+d118a2c541d57499f7b75a10a0a9b61a86ad7cfb v7-4-705
-+0000000000000000000000000000000000000000 v7-4-705
-+fbcf54fc3a778036870bf6c804443d14ee079434 v7.4.706
-+fbcf54fc3a778036870bf6c804443d14ee079434 v7-4-706
-+0000000000000000000000000000000000000000 v7-4-706
-+63b2bc619d5a91d89c4f4c6ee438b6c8d59ac267 v7.4.707
-+63b2bc619d5a91d89c4f4c6ee438b6c8d59ac267 v7-4-707
-+0000000000000000000000000000000000000000 v7-4-707
-+eb4b705a5d6a82f14dbf90022d8993c5db29033c v7.4.708
-+eb4b705a5d6a82f14dbf90022d8993c5db29033c v7-4-708
-+0000000000000000000000000000000000000000 v7-4-708
-+c0bc9b60fb8aa73ec12e2c40852b0708bdc7fff8 v7.4.709
-+c0bc9b60fb8aa73ec12e2c40852b0708bdc7fff8 v7-4-709
-+0000000000000000000000000000000000000000 v7-4-709
-+a8962f0e0d349d2568799216739c4f50111e744c v7.4.710
-+a8962f0e0d349d2568799216739c4f50111e744c v7-4-710
-+0000000000000000000000000000000000000000 v7-4-710
-+64a32aca791911f33d8efd1cfa5368ae26113b8c v7.4.711
-+64a32aca791911f33d8efd1cfa5368ae26113b8c v7-4-711
-+0000000000000000000000000000000000000000 v7-4-711
-+f2a751a9ee727831e3f057f359ceab6ddc4ea183 v7.4.712
-+f2a751a9ee727831e3f057f359ceab6ddc4ea183 v7-4-712
-+0000000000000000000000000000000000000000 v7-4-712
-+56e121fd109b2fcd19121b3d3295f9dca75f8aac v7.4.713
-+56e121fd109b2fcd19121b3d3295f9dca75f8aac v7-4-713
-+0000000000000000000000000000000000000000 v7-4-713
-+de90405940be26a9315d54840c539b9391d16565 v7.4.714
-+de90405940be26a9315d54840c539b9391d16565 v7-4-714
-+0000000000000000000000000000000000000000 v7-4-714
-+5caf46fd6e246bec8a1286ab77faa598d567d988 v7.4.715
-+5caf46fd6e246bec8a1286ab77faa598d567d988 v7-4-715
-+0000000000000000000000000000000000000000 v7-4-715
-+874c953aca495c7b087a0d345cad1fb9d92a9539 v7.4.716
-+874c953aca495c7b087a0d345cad1fb9d92a9539 v7-4-716
-+0000000000000000000000000000000000000000 v7-4-716
-+1805e45ce4d67e0d326fbe952b87bd4086123844 v7.4.717
-+1805e45ce4d67e0d326fbe952b87bd4086123844 v7-4-717
-+0000000000000000000000000000000000000000 v7-4-717
-+e1d59836eecc0567709affcd971f47bb911e830a v7.4.718
-+e1d59836eecc0567709affcd971f47bb911e830a v7-4-718
-+0000000000000000000000000000000000000000 v7-4-718
-+adb3699fa30c39c39d7a659259fdbc99c4318277 v7.4.719
-+adb3699fa30c39c39d7a659259fdbc99c4318277 v7-4-719
-+0000000000000000000000000000000000000000 v7-4-719
-+56a735cff1a082a79e16f51d1bda7847ba02a1ab v7.4.720
-+56a735cff1a082a79e16f51d1bda7847ba02a1ab v7-4-720
-+0000000000000000000000000000000000000000 v7-4-720
-+45d3208c875400a62f47c57ee208a667faf6643b v7.4.721
-+45d3208c875400a62f47c57ee208a667faf6643b v7-4-721
-+0000000000000000000000000000000000000000 v7-4-721
-+47ebd4065059b6836f02338ae951c020f16afb0c v7.4.722
-+47ebd4065059b6836f02338ae951c020f16afb0c v7-4-722
-+0000000000000000000000000000000000000000 v7-4-722
-+8accadbf0cbd9eaa80173c9df96f84c123da036a v7.4.723
-+8accadbf0cbd9eaa80173c9df96f84c123da036a v7-4-723
-+0000000000000000000000000000000000000000 v7-4-723
-+81cb471657e0354e8abcc013fea4569a38ce9b17 v7.4.724
-+81cb471657e0354e8abcc013fea4569a38ce9b17 v7-4-724
-+0000000000000000000000000000000000000000 v7-4-724
-+399216850e36de4c7826e2b02a9a0cca10ea54c4 v7.4.725
-+399216850e36de4c7826e2b02a9a0cca10ea54c4 v7-4-725
-+0000000000000000000000000000000000000000 v7-4-725
-+932370264f0f67bc4d05bc8d34421d5dd83d0f75 v7.4.726
-+932370264f0f67bc4d05bc8d34421d5dd83d0f75 v7-4-726
-+0000000000000000000000000000000000000000 v7-4-726
-+cc3f3d35c54903e5f10bc3a0c66a6207a29acece v7.4.727
-+cc3f3d35c54903e5f10bc3a0c66a6207a29acece v7-4-727
-+0000000000000000000000000000000000000000 v7-4-727
-+ea0468670fbe9afd348ae39f53c2522601c19c14 v7.4.728
-+ea0468670fbe9afd348ae39f53c2522601c19c14 v7-4-728
-+0000000000000000000000000000000000000000 v7-4-728
-+f0e7dc5e7282179e6fccba3a11cfb9e2e17300a8 v7.4.729
-+f0e7dc5e7282179e6fccba3a11cfb9e2e17300a8 v7-4-729
-+0000000000000000000000000000000000000000 v7-4-729
-+cd47def2214a1a68780729a0033c4cbde8529461 v7.4.730
-+cd47def2214a1a68780729a0033c4cbde8529461 v7-4-730
-+0000000000000000000000000000000000000000 v7-4-730
-+5f24d6d5133386cdc5e4dcf781e4e49d78d75483 v7.4.731
-+5f24d6d5133386cdc5e4dcf781e4e49d78d75483 v7-4-731
-+0000000000000000000000000000000000000000 v7-4-731
-+cd7a7975f92cc43405307baa7b980b249c2c0ff1 v7.4.732
-+cd7a7975f92cc43405307baa7b980b249c2c0ff1 v7-4-732
-+0000000000000000000000000000000000000000 v7-4-732
-+095b538d58a673521eb4dbe0b819c63538ceef0c v7.4.733
-+095b538d58a673521eb4dbe0b819c63538ceef0c v7-4-733
-+0000000000000000000000000000000000000000 v7-4-733
-+bf3e6012dfbd3b404ae1d0e41ff90a9628380062 v7.4.734
-+bf3e6012dfbd3b404ae1d0e41ff90a9628380062 v7-4-734
-+0000000000000000000000000000000000000000 v7-4-734
-+734c89ddf7b37a2860b376d14404d7e1ca56a228 v7.4.735
-+734c89ddf7b37a2860b376d14404d7e1ca56a228 v7-4-735
-+0000000000000000000000000000000000000000 v7-4-735
-+70fdcdaf96a65db5fd2ef5d87ffa213f2397cb9b v7.4.736
-+70fdcdaf96a65db5fd2ef5d87ffa213f2397cb9b v7-4-736
-+0000000000000000000000000000000000000000 v7-4-736
-+1ccf9612841097ca6310564e713779bb1d2d1e91 v7.4.737
-+1ccf9612841097ca6310564e713779bb1d2d1e91 v7-4-737
-+0000000000000000000000000000000000000000 v7-4-737
-+8730db0c187bee6127daebab4467fafc65198f25 v7.4.738
-+8730db0c187bee6127daebab4467fafc65198f25 v7-4-738
-+0000000000000000000000000000000000000000 v7-4-738
-+541abe8d5f557fbb7fcdb4844d20b1b0634ea72c v7.4.739
-+541abe8d5f557fbb7fcdb4844d20b1b0634ea72c v7-4-739
-+0000000000000000000000000000000000000000 v7-4-739
-+0229cfffc5605b0cdbd87803aeb6d76053c14abb v7.4.740
-+0229cfffc5605b0cdbd87803aeb6d76053c14abb v7-4-740
-+0000000000000000000000000000000000000000 v7-4-740
-+0f1cc87630d8b91ea91825d53b64f48a759b58a1 v7.4.741
-+0f1cc87630d8b91ea91825d53b64f48a759b58a1 v7-4-741
-+0000000000000000000000000000000000000000 v7-4-741
-+50cdebea094fced0f3d05f5fbf93f47f71d6a715 v7.4.742
-+50cdebea094fced0f3d05f5fbf93f47f71d6a715 v7-4-742
-+0000000000000000000000000000000000000000 v7-4-742
-+ac13f3533571f689231f0d9d0b0672601eee9cad v7.4.743
-+ac13f3533571f689231f0d9d0b0672601eee9cad v7-4-743
-+0000000000000000000000000000000000000000 v7-4-743
-+18ec2c5a5ce7af451d37617062309f2b3960f73c v7.4.744
-+18ec2c5a5ce7af451d37617062309f2b3960f73c v7-4-744
-+0000000000000000000000000000000000000000 v7-4-744
-+f4e5704c5c43ca62a642c84bcec3f1f17a41fff6 v7.4.745
-+f4e5704c5c43ca62a642c84bcec3f1f17a41fff6 v7-4-745
-+0000000000000000000000000000000000000000 v7-4-745
-+b782813c73a61e98d881b481af7fb671585e404b v7.4.746
-+b782813c73a61e98d881b481af7fb671585e404b v7-4-746
-+0000000000000000000000000000000000000000 v7-4-746
-+d1a87b307a5033bdb3e79cad32fca3db3ae43224 v7.4.747
-+d1a87b307a5033bdb3e79cad32fca3db3ae43224 v7-4-747
-+0000000000000000000000000000000000000000 v7-4-747
-+566e193323cebc0beb02fc2bdda1b8209f30eb62 v7.4.748
-+566e193323cebc0beb02fc2bdda1b8209f30eb62 v7-4-748
-+0000000000000000000000000000000000000000 v7-4-748
-+e73d5ac8b16b59f5d26195308ab1822e3ddee5e4 v7.4.749
-+e73d5ac8b16b59f5d26195308ab1822e3ddee5e4 v7-4-749
-+0000000000000000000000000000000000000000 v7-4-749
-+809e3aa59c6f4c4ecff866b9c0d66bc765289604 v7.4.750
-+809e3aa59c6f4c4ecff866b9c0d66bc765289604 v7-4-750
-+0000000000000000000000000000000000000000 v7-4-750
-+db53fd1a7d5c6898bd86bfe203aac8b8d89d9307 v7.4.751
-+db53fd1a7d5c6898bd86bfe203aac8b8d89d9307 v7-4-751
-+0000000000000000000000000000000000000000 v7-4-751
-+c9a5d51c9161826fb57da3b6c8e5fcb03c45e1cf v7.4.752
-+c9a5d51c9161826fb57da3b6c8e5fcb03c45e1cf v7-4-752
-+0000000000000000000000000000000000000000 v7-4-752
-+8ebcd7f1ff5b64764b747831c5b903bf1c721774 v7.4.753
-+8ebcd7f1ff5b64764b747831c5b903bf1c721774 v7-4-753
-+0000000000000000000000000000000000000000 v7-4-753
-+9798a98a1583fec87694567028d969a5abdd7695 v7.4.754
-+9798a98a1583fec87694567028d969a5abdd7695 v7-4-754
-+0000000000000000000000000000000000000000 v7-4-754
-+66ab6ec256d159860a004b29ea4e6074740e5ea4 v7.4.755
-+66ab6ec256d159860a004b29ea4e6074740e5ea4 v7-4-755
-+0000000000000000000000000000000000000000 v7-4-755
-+64ff14cbb665a696a4e7eb66c47a9ffaec1d57bd v7.4.756
-+64ff14cbb665a696a4e7eb66c47a9ffaec1d57bd v7-4-756
-+0000000000000000000000000000000000000000 v7-4-756
-+a89cff862dda7668be7915bb9ca2d52c2f752aa5 v7.4.757
-+a89cff862dda7668be7915bb9ca2d52c2f752aa5 v7-4-757
-+0000000000000000000000000000000000000000 v7-4-757
-+4ece46045a5aa6167aef99fb4ea7c02f4e74e9d1 v7.4.758
-+4ece46045a5aa6167aef99fb4ea7c02f4e74e9d1 v7-4-758
-+0000000000000000000000000000000000000000 v7-4-758
-+02466bf84babd8917e717390906aa0ed20c3700b v7.4.759
-+02466bf84babd8917e717390906aa0ed20c3700b v7-4-759
-+0000000000000000000000000000000000000000 v7-4-759
-+bcc0909b379e89c7b45ac1eb9be4018bfe0577c9 v7.4.760
-+bcc0909b379e89c7b45ac1eb9be4018bfe0577c9 v7-4-760
-+0000000000000000000000000000000000000000 v7-4-760
-+7bd926109eea40d1366ac604b9b29b2c4ba84935 v7.4.761
-+7bd926109eea40d1366ac604b9b29b2c4ba84935 v7-4-761
-+0000000000000000000000000000000000000000 v7-4-761
-+ce209c5103a3dd3656076a926f8cf19be3019048 v7.4.762
-+ce209c5103a3dd3656076a926f8cf19be3019048 v7-4-762
-+0000000000000000000000000000000000000000 v7-4-762
-+2b7e36955265a2fc5bed4edf0faead3ae19218f5 v7.4.763
-+2b7e36955265a2fc5bed4edf0faead3ae19218f5 v7-4-763
-+0000000000000000000000000000000000000000 v7-4-763
-+9d41289b55126e08bcea87daf0ed5f1699524b57 v7.4.764
-+9d41289b55126e08bcea87daf0ed5f1699524b57 v7-4-764
-+0000000000000000000000000000000000000000 v7-4-764
-+f9876721bedc4f794d425bd015e4b0a65cb4d703 v7.4.765
-+f9876721bedc4f794d425bd015e4b0a65cb4d703 v7-4-765
-+0000000000000000000000000000000000000000 v7-4-765
-+31a14cb3a8e35da6f2bfeca5ced12e6420895a17 v7.4.766
-+31a14cb3a8e35da6f2bfeca5ced12e6420895a17 v7-4-766
-+0000000000000000000000000000000000000000 v7-4-766
-+63ac0cdf3b2822cc114dd201c4b5ef59d6395e86 v7.4.767
-+63ac0cdf3b2822cc114dd201c4b5ef59d6395e86 v7-4-767
-+0000000000000000000000000000000000000000 v7-4-767
-+d3a23af4bba127e0cc240bb967484781e646f412 v7.4.768
-+d3a23af4bba127e0cc240bb967484781e646f412 v7-4-768
-+0000000000000000000000000000000000000000 v7-4-768
-+cfd9a2befd67b56c5a618ee21affa88ed05c34ca v7.4.769
-+cfd9a2befd67b56c5a618ee21affa88ed05c34ca v7-4-769
-+0000000000000000000000000000000000000000 v7-4-769
-+2ce6b77a49de5b997f4b2264b3582983058438c9 v7.4.770
-+2ce6b77a49de5b997f4b2264b3582983058438c9 v7-4-770
-+0000000000000000000000000000000000000000 v7-4-770
-+dd923806ae3bebc810b87a0dd38e48aa30a50da1 v7.4.771
-+dd923806ae3bebc810b87a0dd38e48aa30a50da1 v7-4-771
-+0000000000000000000000000000000000000000 v7-4-771
-+d973e23c3bf81e4126c6ff3450d2847b1c4a89ee v7.4.772
-+d973e23c3bf81e4126c6ff3450d2847b1c4a89ee v7-4-772
-+0000000000000000000000000000000000000000 v7-4-772
-+5b1eefbf9a532f32a66fa13abbd671488aaafd5c v7.4.773
-+5b1eefbf9a532f32a66fa13abbd671488aaafd5c v7-4-773
-+0000000000000000000000000000000000000000 v7-4-773
-+676906c337681c90de19aa2ed71bffff5893f9c9 v7.4.774
-+676906c337681c90de19aa2ed71bffff5893f9c9 v7-4-774
-+0000000000000000000000000000000000000000 v7-4-774
-+e09a7ff8804653c1b784a41fc38e185e5f8ec1f7 v7.4.775
-+e09a7ff8804653c1b784a41fc38e185e5f8ec1f7 v7-4-775
-+0000000000000000000000000000000000000000 v7-4-775
-+94b17958585153641ad1e813fa144cad57c7170f v7.4.776
-+94b17958585153641ad1e813fa144cad57c7170f v7-4-776
-+0000000000000000000000000000000000000000 v7-4-776
-+228dc3f3f7114887bf5c870c75446681fa3a2bee v7.4.777
-+228dc3f3f7114887bf5c870c75446681fa3a2bee v7-4-777
-+0000000000000000000000000000000000000000 v7-4-777
-+dd094497f9fa237f3b1d7e673146d8128e3ee2d0 v7.4.778
-+dd094497f9fa237f3b1d7e673146d8128e3ee2d0 v7-4-778
-+0000000000000000000000000000000000000000 v7-4-778
-+1f78058351a6fcf079783b1f28b5b77d7d98e4d8 v7.4.779
-+1f78058351a6fcf079783b1f28b5b77d7d98e4d8 v7-4-779
-+0000000000000000000000000000000000000000 v7-4-779
-+9a13e3910e3d45c768a1e3d87a15a62b4cee439c v7.4.780
-+9a13e3910e3d45c768a1e3d87a15a62b4cee439c v7-4-780
-+0000000000000000000000000000000000000000 v7-4-780
-+30c9301f33ed76d0b76b9e22362f5e78e26786da v7.4.781
-+30c9301f33ed76d0b76b9e22362f5e78e26786da v7-4-781
-+0000000000000000000000000000000000000000 v7-4-781
-+58d9f967ae1a4dc16be4ca92f921976fbc3225ed v7.4.782
-+58d9f967ae1a4dc16be4ca92f921976fbc3225ed v7-4-782
-+0000000000000000000000000000000000000000 v7-4-782
-+e55929fca0cf6078c2c9791a7fcbd3a8b96884d4 v7.4.783
-+e55929fca0cf6078c2c9791a7fcbd3a8b96884d4 v7-4-783
-+0000000000000000000000000000000000000000 v7-4-783
-+f587f685701094fc9a90ec6b8b946b4a6abc013f v7.4.784
-+f587f685701094fc9a90ec6b8b946b4a6abc013f v7-4-784
-+0000000000000000000000000000000000000000 v7-4-784
-+62ba356c2d4e5836c86908d2ec65e53a6e335f27 v7.4.785
-+62ba356c2d4e5836c86908d2ec65e53a6e335f27 v7-4-785
-+0000000000000000000000000000000000000000 v7-4-785
-+4db70c94226b522a0beb6d54ae0a992bd47405ae v7.4.786
-+4db70c94226b522a0beb6d54ae0a992bd47405ae v7-4-786
-+0000000000000000000000000000000000000000 v7-4-786
-+c31bd9ca75d237eee7a3cfe92e464fc58b2d534b v7.4.787
-+c31bd9ca75d237eee7a3cfe92e464fc58b2d534b v7-4-787
-+0000000000000000000000000000000000000000 v7-4-787
-+ca0990adc2e3b10fe06a066144976adc8a769576 v7.4.788
-+ca0990adc2e3b10fe06a066144976adc8a769576 v7-4-788
-+0000000000000000000000000000000000000000 v7-4-788
-+b63f09edb493ab555e0ed78f1b045e365fd1f9c8 v7.4.789
-+b63f09edb493ab555e0ed78f1b045e365fd1f9c8 v7-4-789
-+0000000000000000000000000000000000000000 v7-4-789
-+d37e168dee2030187d77492b0a88c2467c87bf26 v7.4.790
-+d37e168dee2030187d77492b0a88c2467c87bf26 v7-4-790
-+0000000000000000000000000000000000000000 v7-4-790
-+957a3bb312fa105b9476ae029742eeb4b5f9b490 v7.4.791
-+957a3bb312fa105b9476ae029742eeb4b5f9b490 v7-4-791
-+0000000000000000000000000000000000000000 v7-4-791
-+1efa7c2b9368b7d550a382dbe8b5502bb14416d1 v7.4.792
-+1efa7c2b9368b7d550a382dbe8b5502bb14416d1 v7-4-792
-+0000000000000000000000000000000000000000 v7-4-792
-+1e621b31948bed78579a3312a907be76263f1204 v7.4.793
-+1e621b31948bed78579a3312a907be76263f1204 v7-4-793
-+0000000000000000000000000000000000000000 v7-4-793
-+98d1d53edc668ec036ea39d9ac6392263d0268f1 v7.4.794
-+98d1d53edc668ec036ea39d9ac6392263d0268f1 v7-4-794
-+0000000000000000000000000000000000000000 v7-4-794
-+a958ac497a8103f18065b7ae04c0a98c4c82edc6 v7.4.795
-+a958ac497a8103f18065b7ae04c0a98c4c82edc6 v7-4-795
-+0000000000000000000000000000000000000000 v7-4-795
-+d19e79d29bf99fe0483339e2793c7b81b3e55ed5 v7.4.796
-+d19e79d29bf99fe0483339e2793c7b81b3e55ed5 v7-4-796
-+0000000000000000000000000000000000000000 v7-4-796
-+87cb71d54e8ae31700862bea78ceb89b50741161 v7.4.797
-+87cb71d54e8ae31700862bea78ceb89b50741161 v7-4-797
-+0000000000000000000000000000000000000000 v7-4-797
-+c2b132add309bd2fca3b19432a2ceb0fcf6d237b v7.4.798
-+c2b132add309bd2fca3b19432a2ceb0fcf6d237b v7-4-798
-+0000000000000000000000000000000000000000 v7-4-798
-+4bf9538ff25e208503d313ef99e661124394fbd2 v7.4.799
-+4bf9538ff25e208503d313ef99e661124394fbd2 v7-4-799
-+0000000000000000000000000000000000000000 v7-4-799
-+86d43639de31ba99947cf9bfe0a3fd171ca7019e v7.4.800
-+86d43639de31ba99947cf9bfe0a3fd171ca7019e v7-4-800
-+0000000000000000000000000000000000000000 v7-4-800
-+20ed78fab428bee80800fe3492f5f589571352f6 v7.4.801
-+20ed78fab428bee80800fe3492f5f589571352f6 v7-4-801
-+0000000000000000000000000000000000000000 v7-4-801
-+417201526af3e5cca3f3b4a4bf3aac736521c803 v7.4.802
-+417201526af3e5cca3f3b4a4bf3aac736521c803 v7-4-802
-+0000000000000000000000000000000000000000 v7-4-802
-+e859731ea1cd074cc1e2d12c6047978cd6c1947c v7.4.803
-+e859731ea1cd074cc1e2d12c6047978cd6c1947c v7-4-803
-+0000000000000000000000000000000000000000 v7-4-803
-+7b35ee02b3c57a872f63550e80668f3b4dcf3e61 v7.4.804
-+7b35ee02b3c57a872f63550e80668f3b4dcf3e61 v7-4-804
-+0000000000000000000000000000000000000000 v7-4-804
-+7b5f9313f40b71a1e4047cd4cec10af303341a69 v7.4.805
-+7b5f9313f40b71a1e4047cd4cec10af303341a69 v7-4-805
-+0000000000000000000000000000000000000000 v7-4-805
-+b10995a2f7c3ff95a915e81ff595707d7b323f27 v7.4.806
-+b10995a2f7c3ff95a915e81ff595707d7b323f27 v7-4-806
-+0000000000000000000000000000000000000000 v7-4-806
-+a25618cbc68afd94422ce0f86993ec14ca533fc7 v7.4.807
-+a25618cbc68afd94422ce0f86993ec14ca533fc7 v7-4-807
-+0000000000000000000000000000000000000000 v7-4-807
-+f77d1f32c357890b723afadd2c83cd38314f08f0 v7.4.808
-+f77d1f32c357890b723afadd2c83cd38314f08f0 v7-4-808
-+0000000000000000000000000000000000000000 v7-4-808
-+c7d12c7eb2b67f23de39f8a2394f018a00e37671 v7.4.809
-+c7d12c7eb2b67f23de39f8a2394f018a00e37671 v7-4-809
-+0000000000000000000000000000000000000000 v7-4-809
-+a07c3f9cd6166c82d715e699dcdca5241ba5c8cf v7.4.810
-+a07c3f9cd6166c82d715e699dcdca5241ba5c8cf v7-4-810
-+0000000000000000000000000000000000000000 v7-4-810
-+1661dd8df5922d5e50a59de1fe95d96e2f9bfa0b v7.4.811
-+1661dd8df5922d5e50a59de1fe95d96e2f9bfa0b v7-4-811
-+0000000000000000000000000000000000000000 v7-4-811
-+c0a23e04c929b9eb6cf996d202e5ec51d0120528 v7.4.812
-+c0a23e04c929b9eb6cf996d202e5ec51d0120528 v7-4-812
-+0000000000000000000000000000000000000000 v7-4-812
-+814f1f569e4a2648097f63160e9b8762fef54c93 v7.4.813
-+814f1f569e4a2648097f63160e9b8762fef54c93 v7-4-813
-+0000000000000000000000000000000000000000 v7-4-813
-+dcc108222d704bbf6ac21cac3ad3b7324b2e45f1 v7.4.814
-+dcc108222d704bbf6ac21cac3ad3b7324b2e45f1 v7-4-814
-+0000000000000000000000000000000000000000 v7-4-814
-+fc099c55a36a2a6abacbb0542d94a4e9ebd40cfb v7.4.815
-+fc099c55a36a2a6abacbb0542d94a4e9ebd40cfb v7-4-815
-+0000000000000000000000000000000000000000 v7-4-815
-+cdd862e0f896d9ce315c12f002d362791d2b17ab v7.4.816
-+cdd862e0f896d9ce315c12f002d362791d2b17ab v7-4-816
-+0000000000000000000000000000000000000000 v7-4-816
-+dc1b678f0e4e484db118bcab780def3798a87c3e v7.4.817
-+dc1b678f0e4e484db118bcab780def3798a87c3e v7-4-817
-+0000000000000000000000000000000000000000 v7-4-817
-+27f8247d261963e59c2a2598c3cb03514557d305 v7.4.818
-+27f8247d261963e59c2a2598c3cb03514557d305 v7-4-818
-+0000000000000000000000000000000000000000 v7-4-818
-+bc269cf15ccd91867532970df2b493d3b1ad9d83 v7.4.819
-+bc269cf15ccd91867532970df2b493d3b1ad9d83 v7-4-819
-+0000000000000000000000000000000000000000 v7-4-819
-+bb44542231dc741cde6733a4c425fe0622027874 v7.4.820
-+bb44542231dc741cde6733a4c425fe0622027874 v7-4-820
-+0000000000000000000000000000000000000000 v7-4-820
-+5ea5bd9c18d212c63d6be727d4945cdb243026b4 v7.4.821
-+5ea5bd9c18d212c63d6be727d4945cdb243026b4 v7-4-821
-+0000000000000000000000000000000000000000 v7-4-821
-+286fd54c7ae38a47e80c4e0bacd9748fe2914883 v7.4.822
-+286fd54c7ae38a47e80c4e0bacd9748fe2914883 v7-4-822
-+0000000000000000000000000000000000000000 v7-4-822
-+6cde6404ff7c3aaf90a1d5b0b0d68f1ff9a1ff8e v7.4.823
-+6cde6404ff7c3aaf90a1d5b0b0d68f1ff9a1ff8e v7-4-823
-+0000000000000000000000000000000000000000 v7-4-823
-+962b3ae252a98b0ee205a2297c19b2417dd9717a v7.4.824
-+962b3ae252a98b0ee205a2297c19b2417dd9717a v7-4-824
-+0000000000000000000000000000000000000000 v7-4-824
-+0dbbdcf13e03bf40a177d267944430aea3985fa7 v7.4.825
-+0dbbdcf13e03bf40a177d267944430aea3985fa7 v7-4-825
-+0000000000000000000000000000000000000000 v7-4-825
-+db0328a2fa2a67e43cd7eeca0f95d1b96bcd6bbb v7.4.826
-+db0328a2fa2a67e43cd7eeca0f95d1b96bcd6bbb v7-4-826
-+0000000000000000000000000000000000000000 v7-4-826
-+47680d36e4846e9093ff6edcc96bf3ba8c69ac86 v7.4.827
-+47680d36e4846e9093ff6edcc96bf3ba8c69ac86 v7-4-827
-+0000000000000000000000000000000000000000 v7-4-827
-+8d513ddfe3ecc812ba37f4889da580443c715eff v7.4.828
-+320c97a73272277e2708fed77120730553a5a21d v7.4.829
-+e668b160ac68f94dd52331c97aeb2316e550a660 v7.4.830
-+5f00b8d7148f71a3a5e9d97b31dd92b230f185c9 v7.4.831
-+76042a56ab85f1e53cd49e5341756b1cd7403e08 v7.4.832
-+17a3fa77e94130e8af8d5d71ad8050146c1a05b5 v7.4.833
-+e8eccb9621f72b6b3d24f244126e04250bb57175 v7.4.834
-+7758d6245c3add25ca476c2a3212ad86f5fd72d0 v7.4.835
-+fd409a0800fd1cb6472293837c3109c00ac910c7 v7.4.836
-+2ebc20378f68f39b96ec6b3f1a57b55d71cc3638 v7.4.837
-+9ec3329823f96db275cc99b1057176c9ba7566d8 v7.4.838
-+3a1a6d6fb9b3a6223fceb052f75adbd77f254e26 v7.4.839
-+1ebd7608cfd97bd0baa706ae4b7d7f9e145b032e v7.4.840
-+64dc5b11ad330bb96e8223c60c538caadd2703ff v7.4.841
-+41ccc6f959547d07576e27754b6e4183369550be v7.4.842
-+6deb9d802fe4bb31a4b58ee227a7ed1e6c485e9f v7.4.843
-+5fc5c5bf22339cabd2db81c9e9133470610d83da v7.4.844
-+094c8ccdc279bc52e768a579e86b32a24e2b6822 v7.4.845
-+a55f35ed381bbe405bbfc1daf43d90be21ad71a4 v7.4.846
-+d92910c0c41566072c93bfbf8e48dc5863dd03d7 v7.4.847
-+05afb5be93bda6388da6418542e1dcc940e151e4 v7.4.848
-+c8efa41dd4514a10295e303bcf840f51f320ecd1 v7.4.849
-+6ad58a7e995b2bc498a870c05d8307eedbef9c59 v7.4.850
-+383d6f39669b4f8344aef8f710b8d833bf029b27 v7.4.851
-+1a34f5272977afe180e483c32c21b49586a66a78 v7.4.852
-+ad4c039349f693bdecd3cc0f6540e3bbc5f403c3 v7.4.853
-+1c039023af1c2fed2ea6b5e3f439071ad28364d3 v7.4.854
-+3825da0222311c84e07f15c737c937c84b5c0607 v7.4.855
-+8a58dde655a83b5e9d6aa0c707150e7a2ac924c7 v7.4.856
-+052043fc57ab5551bc2b90c564487e54e95b0785 v7.4.857
-+64e30831fa4253f18f1a781d25f5c2518f190deb v7.4.858
-+66137191901a980105d408717e782084ae9b8024 v7.4.859
-+00b9f0c048db9348d2957adad3fb7ea32102e250 v7.4.860
-+70b56e5eccb2ac53b91f818ce6ebe071cfd4074e v7.4.861
-+793ca14b5654f8938fd2c4ac4628844669c7202e v7.4.862
-+84d318257a4595012315fd7d54b41fcd78c9c386 v7.4.863
-+f4456e6864064b28e27a5d78e793eae4ae73bc2d v7.4.864
-+84efaf06f195b8f4bd8eee012cb9c01e60a40d57 v7.4.865
-+fa95595fbc5236d4318d653795078db4dfe6aa7f v7.4.866
-+57c354f0115cdeca2eb6de547ca5284ba0a10ab7 v7.4.867
-+83b3261352b3897bae4fb2f28d535710f6453c88 v7.4.868
-+ec89519dfeeaabb601e957a59248330374ea878b v7.4.869
-+9946e87686c8d506c24788485d12d05cebc37647 v7.4.870
-+6bc1695b7f11ec19d1c45b58c0f36771e9633d56 v7.4.871
-+a497a9868255ac7f2548939c21ed85cb8a755c3a v7.4.872
-+077ae8b63e155cacfef581b1b7177688f322b147 v7.4.873
-+52a7ba315f0339e613b89f768dc73515d3514a84 v7.4.874
-+e945a8e3553559afbc34fe1a60bd2fdfe3f4a3aa v7.4.875
-+aaf96b1aa605f746aad18a1c630cbb1af92f349d v7.4.876
-+cc5570ed684e35b8c9a3888488718f6182394cc5 v7.4.877
-+48ce650e8a277acc9dd54d852d430c1f2f0d8349 v7.4.878
-+9d4986f52df800acbc73b6578ade6ebfa833825a v7.4.879
-+41896b9720ccedffb45381bf05b90dffd75c9251 v7.4.880
-+d1e35ca56c73e00417b0b994e299d4f18d379e6a v7.4.881
-+4e8f07fc7ca375bcb2ab323821688823c36bf776 v7.4.882
-+fe6d525d12f4cac935c81d6b8853d5dbe3e92cf5 v7.4.883
-+7669c1269190368760ccc1527a1675164c565fb8 v7.4.884
-+339e657a6ed6bc400c729c93a2d8ad02f4fe7876 v7.4.885
-+46390681bd80f2e1fe061fc5e3b549d30e5390eb v7.4.886
-+cbdc02d71a18a29fcfd55945dbe3c5543042d492 v7.4.887
-+a01294e1c02f74242892815013f1cd1c1d06b232 v7.4.888
-+0b4e65cf84fbee4a7350f0fcb1a7c1eb8dcd7de0 v7.4.889
-+43ac8dc380c7f6a08296cc230514ea17ceb65d29 v7.4.890
-+accd3a0e9bf46bbfa2d7518d84e74309bc084467 v7.4.891
-+fe090e9cd10a236f1276b96bb4a23497a4b3b42e v7.4.892
-+d3c57e7f489a5c05e26b0281029517f3b88c2fac v7.4.893
-+fbec41e5651e87fa44b7b07d59359a14b2f9cead v7.4.894
-+0f2807c056874e7ab7c381f19d6ddbebdd17db8a v7.4.895
-+beb67ef38f8838c2e443ed58dc08b8e8e5563ba6 v7.4.896
-+ad57f5b5bd6c2515e038aeed53296ffb105398f8 v7.4.897
-+22f87d5e95330b2499253980640820ad116094be v7.4.898
-+c4d677c50b9b07232cf1d4295c94b45591ab1395 v7.4.899
-+f7d6cc6b78b56471ea27cf3e116a366a8445672c v7.4.900
-+ce8b286e89efffae829f71340d8518ff1d268ba3 v7.4.901
-+0a256475412fa1f5325362f8710602b648cb63cf v7.4.902
-+41885de3d5776fa6eec4925073336456237d1b37 v7.4.903
-+0b4387f570ecb8c6629eefcca7430fc09199c96b v7.4.904
-+692dac7183debcd347204ac360e03aa70aa9c25a v7.4.905
-+272f04b41f51f228c38ad7406fddda7ee611d79b v7.4.906
-+42717d048817a3f90c3cd4285b024dcb35890fc6 v7.4.907
-+b58e16f9119e414dcc14580aad994aa37972de65 v7.4.908
-+bc951043f655085985857d4b81ac9cf458eeab91 v7.4.909
-+de43f10a385092533c41572bf88e926d4a9c088b v7.4.910
-+5fad7bc0fe83aee33790d58640ef4957536dfb3b v7.4.911
-+c6a7305972febcc631601d820c447bf5604bcabe v7.4.912
-+2c00f6b312bf06d685c73a6b911b3cd59425f886 v7.4.913
-+08b50e436093668aa4522bb408fbbe8eca5fa845 v7.4.914
-+55c67e16e4fd4ddbad625bece4a239b85060de90 v7.4.915
-+e036defe034e0d1291351d324f8edede8c410369 v7.4.916
-+310925215e17e157fd941855286b62f0550f4758 v7.4.917
-+36dc8df8560f94a5e5e2efd2581c77f17a0bcfa7 v7.4.918
-+1931b890e7d78d74ecf961abd8eba0dda5e8a979 v7.4.919
-+4e86d5700260686ed8640ab95322c4b260f07a31 v7.4.920
-+42bf8902d4da3d93cf96c0deb2e9ab6088e0de59 v7.4.921
-+9b350a65138a05bb31c28ca61f1d9d889052be65 v7.4.922
-+ae360f1df2aaee901ac2cca3cb5763f1c0ca6512 v7.4.923
-+a4d10eec6356107d34d4ac2a3b17fa90ec4bc4b3 v7.4.924
-+9487ea11021430522afe5cc81eaf2f795a891505 v7.4.925
-+e45271250496026e15892b34562018e84568dd2e v7.4.926
-+2a95fa0a07b5158627e0ad2d3de23fe6ff4fe599 v7.4.927
-+89c6f7c6704abaeafeef87959e68fb36cab1246d v7.4.928
-+0c1278704b5c4508d2eeacfae27982a0208bbca5 v7.4.929
-+861a44fc518369b5b670cf7d4ff4c859a54c9eb6 v7.4.930
-+a69b5e4beefd3f8f80dbef8ed6ebd6be41589bb3 v7.4.931
-+dc7b1567d0574b7b256a58f745051404eb28657d v7.4.932
-+99476f1aaacd1cfb84ca7abb6bb7c382753db0e8 v7.4.933
-+1b591fcf2517c23fabf6165d3520ccaaa3746670 v7.4.934
-+b4b7b06c79512200b1a8330b7f129e8ada167c21 v7.4.935
-+79270eaac6dee1867bd6f9f6aff06429aa81f8e4 v7.4.936
-+7245d8635ac76cca646d1d0310a5dd8a669f36b9 v7.4.937
-+8ba562cb3e078592390c22669c92bfb08fa4e08e v7.4.938
-+fadf7fc3b666c7c61ec929f20d2265a89970aec3 v7.4.939
-+b1b86aa171cdda210cc330049fc85ea9fa2c91b6 v7.4.940
-+6ba7182fb7bdbc1287068ce3b29907393a29badd v7.4.941
-+271eaba22dca71bfda150539c1be55bc694083ee v7.4.942
-+271eaba22dca71bfda150539c1be55bc694083ee v7.4.942
-+5fb84b6f61a54d7b79a160dff52724e12889f1fb v7.4.942
-+5fb84b6f61a54d7b79a160dff52724e12889f1fb v7.4.942
-+33e8080d78638e953af1d8a41d4a3874b1c5583e v7.4.942
-+33e8080d78638e953af1d8a41d4a3874b1c5583e v7.4.942
-+73207eca53f5aa00133bfb880918710f2cc218d4 v7.4.942
-+4b4ac70f517353c890e1d871fe343a27cc9417a3 v7.4.943
-+6600871bb38c10a2837c53ee13cfd8df68a7a888 v7.4.944
-+b5e9810b389db730a131ee95654ad46a2e628b13 v7.4.945
-+2a4593702d5c4b936bd51ebfe33e9c021cf1723f v7.4.946
-+631cd8059bf4317b232f2d1e04ced6a0102c21a5 v7.4.947
-+a34232b17763ac329e55e3c735e1061b4ee82d94 v7.4.948
-+6fcadba9ec7a96dd0c599a30aeb2e53ee86c62e5 v7.4.949
-+32efe489afc5557521bdde41fc8849801fa4d8d7 v7.4.950
-+6ffc75d807bd056de7dae782196b42b46e35cb48 v7.4.951
-+979f8a595326dd076d85a77de0fbcf2ae1cf58af v7.4.952
-+6922fcadafe6012412842ed3a9963b2eb86dcbc0 v7.4.953
-+67c7a524b84f83ccae50aa7b96bc099e094941d8 v7.4.954
-+e31e803a29105fcf5fc4f2e1cb3575817cec581d v7.4.955
-+514f51fa1966bbd3e25b5fddd126e5136c6a4f9d v7.4.956
-+88f9d339026ba4848b86fe6adef62bfafc8e255b v7.4.957
-+372c785c04b69d0164139eae560784bb3c122646 v7.4.958
-+5d9e27621ffaf46c50725a6ee5dfe2a0dd75a6f1 v7.4.959
-+c412b0922c27c5729a7706b8181966b18571ab11 v7.4.960
-+743c258ca3abf62e51667577be4f2389afb72eaa v7.4.961
-+2062247be2d02618ea1e5fb9276a0ae0484f7077 v7.4.962
-+6170f4945b83e5edaec7c91227867c11f6aaee73 v7.4.963
-+de124c05fe4f7db1e7c6599776fbc5142f362e4c v7.4.964
-+cc484bbb73dc85c39fc434675b8f26f777b5d8ee v7.4.965
-+6f398bb76c290b3927274cd82451c4969c3fdd13 v7.4.966
-+a3b8a63c88ef9f90aee553bb31dc6bf1c669aa0f v7.4.967
-+d4e1c170513708795b5d7faae0c55251efba287d v7.4.968
-+6679f41bddea88bc5ecfb56b946acbed84a4f8ed v7.4.969
-+8ab712f2c3b8c5eda019561d8e1205b7257299da v7.4.970
-+38e4f3a246eb614c8cf8822c91c9b468d8196ee9 v7.4.971
-+6890f5a58109486c67cd9cff3d569aa634cfe5e5 v7.4.972
-+4c5f53a60543b230cfacafabc16f5f50ef3fa867 v7.4.973
-+96d5dd9e7bc9ed33a02960eef76fca47585dc588 v7.4.974
-+645abb8d8dafdc77b00012d3a294d252a4f50597 v7.4.975
-+b871e4bdb3194a7d424a89efd53b4c1372693caf v7.4.976
-+e88aee1842ba0b7756019765c40a0b8e3e08afdc v7.4.978
-+8977b399cf5552a761c40a27630cbce209c6003e v7.4.979
-+68f2cac6b0db9839b2221f4083cbd0fc4e9111e5 v7.4.977
-+5ac8ee7bf4ff4d03f30e3f2b5e05030711961c96 v7.4.980
-+ddab7ae8796d7ded5a413e318a3c1774833cb2fd v7.4.981
-+81dc9e30aad6cd33be9ffe8f643f0db440125ec8 v7.4.982
-+f0eb9aa9eb32f9c8e123cbcbeec3bac71666ad3d v7.4.983
-+6fbeef3b65e644b65989b061fec0f67c512664a6 v7.4.984
-+b20095ba6fc2b8f952e14507475f7e4a6b01578a v7.4.985
-+16c67ab8eafd1914d05674fa7488fe947a21c954 v7.4.986
-+fe2f6b92d8063d87c895f715eba8169ef5aa30f3 v7.4.987
-+eec1dc8ca160ac4fdf4b08a58710fe3de10d178d v7.4.988
-+adc796ba7dda23434ae8ab477cd8f7ed89cb9ecf v7.4.989
-+e396c6134266b3ab375ef86b407b293d0ed56c23 v7.4.990
-+6b057079a836d83c0d19f480d37235c5dd358d02 v7.4.991
-+7e367104f6b646a40cc584b6d255f0471482e258 v7.4.992
-+88843d12c82bd829d74aab97b05677e1fa4f56e0 v7.4.993
-+a6c23c3c5880b22ac68421827a7d2bf72bf007e9 v7.4.994
-+055a0b587a3ec71f9a2ba909db4dff0db8b13f3c v7.4.995
-+58958b8c98815940cae6f8606ee66990ddb32ead v7.4.996
-+160f4b03d8d04154660d779aa07917d1ef7b304b v7.4.997
-+702f694c9396329f25472103a9db86c162937ae2 v7.4.998
-+f7ed82d38e6d89dc6041eccf824e65c100c110cf v7.4.999
-+4761fed349edae4b67cfb33e58ef09091b9f5aec v7.4.1000
-+467b7c5115857cd9f6baca4dc50d0c0a2a8cfb24 v7.4.1001
-+377253525da55ecc80559074281226eae9e2a67a v7.4.1002
-+7ec544daecd544c9e39c90cd6c6bfdaeb8bf6a69 v7.4.1003
-+d45f2dbdac8dbbe6220df792567ad69171d7cba4 v7.4.1004
-+2c63e9ecf29d76f613bd426156e6550729d432fc v7.4.1005
-+fb61ce5915fc6cc8b4aa156017232a5329724c55 v7.4.1006
-+c97735aaef9f78fdaa5395a05e2eeb53e7f3fe25 v7.4.1007
-+1886f286343799bcbc94cbbadd2601442f7401de v7.4.1008
-+08e62c4fc17d4aa6ac0e8cf900f7a89e2288c8ce v7.4.1009
-+bc5de65e499a0c0fad7eb8522a450076b5aa88d6 v7.4.1010
-+d467ca80d3c1b542772127a187cf3c4909bb7cb2 v7.4.1011
-+cd69647bb839248213f6f019d4b74118dff0823c v7.4.1012
-+e7874551bb3401a6601d2271f4661e6e62746cf8 v7.4.1013
-+37092e334ef20c1a085279b20ffcf35845646e18 v7.4.1014
-+35af1e06696b43fc420459d96dbbad6293718144 v7.4.1015
-+c260e4df3a248011820373fb04610f3d34c8659a v7.4.1016
-+779a7c14c7956c6102ff3e0129ba5b1bc2fd45e2 v7.4.1017
-+a4838cba1f480f05cbd690385cb9b01cc7155c3f v7.4.1018
-+e2fe7a67b3a4a6a11c1b97fb836332d65c45fe44 v7.4.1019
-+b5d07f5e78badcaabfab9a7b7c6253799cf51182 v7.4.1020
-+a4b4cbf8d04473f38f44cdd581e88c86fd1276c0 v7.4.1021
-+388977454c1480ab87732be5036792e2d18d986c v7.4.1022
-+63a96fadf6792b2112184af10c1aaa3e0f703993 v7.4.1023
-+7017b495ca530172e4544140ce920c5d6ded6fc4 v7.4.1024
-+357b7bd8d6125c81cc5c2be482902cb8bb753751 v7.4.1025
-+e81526d6709fdbfcbef6719648fe6a9ba24c7ad2 v7.4.1026
-+ad432f8f68fb5ec6696579516df5978238847a79 v7.4.1027
-+e159dff12e40f3baf2b6d5a3341b0dea475dad88 v7.4.1028
-+b3eb1dfbc1fa85d153d55050da0f9b472df4b36f v7.4.1029
-+4ff843da79fdf9df77db6f75486cb89413b09927 v7.4.1030
-+2c5e813e885208a423b2b30d5de2fa52f5eab7ba v7.4.1031
-+e583db6c4fd47df99a523a8875c4d66306fc90fa v7.4.1032
-+1420ccc9f6100f0797b7fe93ad751d6d970b9887 v7.4.1033
-+eb7b199f3d01a216e63130d4c44542e01b729075 v7.4.1034
-+71e2aca45b81daf407b6ec0fb36b9584674b00f3 v7.4.1035
-+765110dd332c67f798a6c989fe8ffe1bd22e9224 v7.4.1036
-+15eefe1b0dadbbd57dfc7d9f10a2feadd3acb208 v7.4.1037
-+c79a52efcf2ff98caee95b2d594cc9877f3266ee v7.4.1038
-+ef60fac8f3eba2d3eb6c9a0944260683696734cd v7.4.1039
-+6b5ce5161d6df5892c0dff70d3d9cad4cabee68a v7.4.1040
-+dbfa0f9ab289efa74ff0085ef04dacbc6c4cbbcb v7.4.1041
-+a4916368155996f4f2273056ddf7f5f74557134d v7.4.1042
-+52d76b2f56c773401b43adaf921b8458521303b0 v7.4.1043
-+1fe988587423d83bb15fd90e5b773c8ab50cba36 v7.4.1044
-+8d09c2ce1825a31c648a40b820876042fc2e4065 v7.4.1045
-+6f14d7da2d8aa8f94d65d1c6fcf242191e3bb8a9 v7.4.1046
-+4a81ecde8701fb6019ff324fd3421b3494e041ca v7.4.1047
-+26d13d73837f4c1a8e2b0b957e861ef24df6aff7 v7.4.1048
-+b4419a42ac324ec39436a1594f844650529590e3 v7.4.1049
-+6d969668bfc8c39f9c6d43f76e87de0b64673af7 v7.4.1050
-+3fcd3d235f7bfdcebb9d8626b48596c2f15a9e04 v7.4.1051
-+ef568437e49aa10cf05e4ad52d6867238d02653d v7.4.1052
-+3e306ae760d0f98dcde62f692e34b30247757861 v7.4.1053
-+013f285f31a64b63725b6cf29059878051b0f8ae v7.4.1054
-+cfc0d60f6233f0b0220a12fa79145f6a82da576a v7.4.1055
-+a64793340689d0657962ca1f160e1c73895af666 v7.4.1056
-+9985800f116d1b93cd6076d87cac366a3dc5ecc3 v7.4.1057
-+37e061ec063c2234436b1490b8612cbf444ba0a7 v7.4.1058
-+cc0398578d2f9b7212081a57ae69a1de3b1d2c66 v7.4.1059
-+9d67399f49c65fd1498de9765a84a52bc457e116 v7.4.1060
-+98fede2c9574a406fb2ff934fceb932be0aab889 v7.4.1061
-+665330ac1d78280eb64298fe1e9deca09e9ad26a v7.4.1062
-+55cd9a99514d683f5cd5885a4f52bb230a4007f3 v7.4.1063
-+08c1f73efcde51b2b8bd7de7c6839dd946c15f42 v7.4.1064
-+53163e4d9e4f1229e5a3439cc4b5263a86925ae7 v7.4.1065
-+5d1b5fd708c6c4e9c1dbef11be15c1db1207c0be v7.4.1066
-+0acbe61244ac460a87ce4958cdea99757e1836ae v7.4.1067
-+0765665083beb8b09688347691219449747c1c11 v7.4.1068
-+30b74472ff815198c596d9b061729b7740beb9c5 v7.4.1069
-+c9fc24b7629385e94b7479146e610fc7c28d07a3 v7.4.1070
-+b910bb01832a215332cca92ca1e280be64a96df4 v7.4.1071
-+7df80e470272166df9e0aaa9b2a4cdb5f14bebe3 v7.4.1072
-+4c922651fd7888c0da0c440dc267beaed5921b0b v7.4.1073
-+567e027a3ea18f4206c2283cef119bc24f62693a v7.4.1074
-+b80fb2cfd62b1691aa4d0d914ba75e2f64b07ec3 v7.4.1075
-+f624d7671e0caacf13a9baf477689daa3058710f v7.4.1076
-+f0205ac9818fc950a1848bec9b139c394a4053ea v7.4.1077
-+5bbfac219f20e16aa8fda82042230d8783f178d6 v7.4.1078
-+9a4c9dccd603dd4a4d4245e729595de3cd42f9e1 v7.4.1079
-+fb84355cd972c3b4debc0af78a2730fa72f69534 v7.4.1080
-+f73876aa9a131022a6c0dbcb3d73f1028206a1ae v7.4.1081
-+aee06f1762e07fd533dcdab6cf295d0aed358fc8 v7.4.1082
-+1dd5b27a79b16f942a17c95d0b509df77551517b v7.4.1083
-+5274513d3f54b6b5b871a9ad8d4b469ad85a73fd v7.4.1084
-+4250ecde600902c4a65c39a67d4dc987b8ada67a v7.4.1085
-+992fe73d4ee6ed8e7c5721b23cc2426d4d0a720b v7.4.1086
-+b872724c37db3c1c9cbb798d8207213ca4a81678 v7.4.1087
-+e008ca0e2af28a868538878c5f1c0dbe8e7a0f7e v7.4.1088
-+fdae4c496775f6d07329b77fc3165779d91eed8c v7.4.1089
-+e9c8eacb676075fb7124b11fbcf23cc11076c284 v7.4.1090
-+e0acbccdf1fc5e179f97fef38cf2cfdd6debc181 v7.4.1091
-+9b7de205336d53bc81d6fb67cbe3684f3bc6e09c v7.4.1092
-+9fc996244059daec70b6bd9d97e30fae6720c9e6 v7.4.1093
-+0738fa9c4971876a78fdcf3f87ca754b741b1e15 v7.4.1094
-+4447dc38bc2205e76bc5a98f80a0b5f98fff7d55 v7.4.1095
-+87e607fb6853b9c24b4faa39484ef762d02f6551 v7.4.1096
-+99e93f72ff91224be7b0e2cca19b86efbf99cf18 v7.4.1097
-+1a528724f9d64d18dde3619aa2199d7bf302dbab v7.4.1098
-+fa59fafb6a9464b579504aa6c5abe6d5d0382f0d v7.4.1099
-+d3892f6c917e8ed6e4d8aa5026e4252906e55a6a v7.4.1101
-+8fc60af6dbf57e19daa8d3f8cd6a1b62f22e7d4d v7.4.1102
-+33b43ec0a00532a5c53c00244201f2807c1330a3 v7.4.1103
-+77a14f3bc18bcaef000e1b5eb99b3d6d1ebb65a1 v7.4.1104
-+9c420b8db435db3469d21d5656bc370c3dff160b v7.4.1105
-+4456fa2d22e80a74dfd9e49984a2c7845d78d6d6 v7.4.1106
-+228ff048db20e1bb71c76de365ddaa8057894c85 v7.4.1107
-+80bc36419c21195da8ec41d614d1d7a0fb78a4b8 v7.4.1108
-+6fed43c541c8b60aca7eec74e6c5bdebaaa3be15 v7.4.1109
-+503534e56ce1e9c88ec60fac2b75703d1fbcd4d8 v7.4.1110
-+2720952e9acb1bf923e129f3e033e8812e126db6 v7.4.1111
-+b4384c581806ae3ce822f4bb0639c3a6d382784b v7.4.1112
-+d9ec7d22494da286648808cb80ace31b80fc9872 v7.4.1113
-+befbed72da874d1449e31584b58e56b7479ffbf3 v7.4.1114
-+ad3e9ea845e790074c21025370852d2e0735a5c8 v7.4.1115
-+2a280b8e704022b7917239b55bbfe5f6ae4be196 v7.4.1116
-+1506f86b120fbc8c0b32437f09ba3fe3d937e502 v7.4.1117
-+81f94c1e2e4dcbf060ed786e06b66bd84bc4d24a v7.4.1118
-+0ecb62a66a7a40ed6e845969f6720e3876eb83cb v7.4.1119
-+b44fc33ef92ad1c5d450c8ac5dbc42bbba0f49c9 v7.4.1120
-+2b2e90fcd72b1d4f999e3b9dbd9d85ea7f2fbfc6 v7.4.1121
-+1529ae1c456aa13997dac5afc4a036cac5b4c3bb v7.4.1122
-+65b2d593c2037178fbe1977d423bf5625f137dc3 v7.4.1123
-+4d97a97495bb7d1ba66f01a631abcaabb6fe5e31 v7.4.1124
-+c7575b07de987efad4468005f2e0220f90b23271 v7.4.1125
-+d4370fef0175025571c350103e98667b6e2dec96 v7.4.1126
-+94f34dc2f254a77bd2f9ccc723257325e1957673 v7.4.1127
-+9c5e8254ea6b41d3e4d6811b8b6bc0563757a5e5 v7.4.1128
-+066ef357ea91a4254389e252664b451322691008 v7.4.1129
-+4d34891e98f4ac19113b38d744ebd9d894bd12b7 v7.4.1130
-+1fded31d9e04bd0bc3e25bf801ea7aac3c5023fb v7.4.1131
-+8edd1afaf6b70aab83771390395642f23a3f3fea v7.4.1132
-+21b0a39d13ed7d9d25fd352112dffbabbdf85c17 v7.4.1133
-+fd31843c7b58043a1362cd83bdf6c47de34c1328 v7.4.1134
-+da2eb24b83d2e6b399a3cf038b2bed217120f03b v7.4.1135
-+eb9cc96138a3368cb4ebcdc55bc851992a95048a v7.4.1136
-+85a7a945fb873cc9c12a434a27a2c40af773fbe5 v7.4.1137
-+c80284cfe1b8dc3209439bb87cf027f2e6aa1544 v7.4.1138
-+07cfa8fea697bcafeb22ea122d7d300511932745 v7.4.1139
-+ec434c82f72cc8f83c01bc168a13bd4b6dc85cee v7.4.1140
-+616460b73ee3f47454c7bac6817946e88f74b65e v7.4.1141
-+61354fabf8a27cabd9903240db733f96a127a8a5 v7.4.1142
-+20dc2763a3b989a105a140894493daaa05f883aa v7.4.1143
-+fd4175b669e21cff13c8d81ba9ac54d240c4d32d v7.4.1144
-+6157052a0e584991d7f3678196cf1090d09155c1 v7.4.1145
-+a865f9773cb2d298ca8ea5ed43e3c669f47ef037 v7.4.1146
-+f04e2b6feea276b19b52a6654e42a69a4dc36afe v7.4.1147
-+854302b82ff963b6b7ef4eb645e15deee647766a v7.4.1148
-+075810b0cb6c1bf068b1b6cfb44d0483b6ab76cd v7.4.1149
-+39251e981d1f3d8a628e9aaf5df1e55e8cdf1b22 v7.4.1150
-+1b9a1c10806b704e411a2f6dbee808ea8ec5b7ac v7.4.1151
-+1a595b2a4d5e5a20e04b95896c54edaebce5e9f2 v7.4.1152
-+bf58e9f8d52a079d310a5d688204a94f60edec6e v7.4.1153
-+bce3b5ddb39380d7c7520626a17871a31e890015 v7.4.1154
-+c29a7e38b8ac887f5a45b38db52722e835734ec1 v7.4.1155
-+9d79943791ea7e78589b51ae69adf83c49395ad4 v7.4.1156
-+6ebd8bdf41bc412518a7bc534a5ad5edb1d8a20b v7.4.1157
-+7c52f11e6df3e9eacce73bb49f12aabb78455b17 v7.4.1158
-+c4f8b1d48f207387dd9babf83e3f6dc2df941879 v7.4.1159
-+87f3f9536ecfb10300c1a717febfa448b8112ad5 v7.4.1160
-+f6311c32141189ce9cdd1d6abff7a8bd59cfe9ff v7.4.1161
-+e493c5dd85b3a260050bfa2e6ca4afecd32d6154 v7.4.1162
-+80ce794827c4033e8c3f3bdeabc218757a726960 v7.4.1163
-+4a4f1dd1abe86a1889ea1f8572aa42014a8a6d71 v7.4.1164
-+616769d423fcb69cf6d9f12eda97a20fcf0f7537 v7.4.1165
-+f2ddad8cbce768a52004566e77a62c4ed33277c9 v7.4.1166
-+598a96d35a0e34994564515e9ad100e041684752 v7.4.1167
-+00fc76e6bd995e56a934b3a8df1f24df1db99fb5 v7.4.1168
-+6069f43cea4eaac576a22d323b5e58c45a23dcb9 v7.4.1169
-+555da309a7de4b296c72b525a7b0e68052022eac v7.4.1170
-+e086f4ca46170ccb3851c3d7fc173c329284dcd1 v7.4.1171
-+3a1b60f5e89b78e8d1fc16964943fc9957a89f2d v7.4.1172
-+d6e62c7398391d55e461fdca5fd07eecc1eb18df v7.4.1173
-+15e67f90b9b262cc6413b476d8fd4105a39ae4d3 v7.4.1174
-+b21c2a9dcd7dd72f0acfdcb74eb4591588f9a2c8 v7.4.1175
-+34bfc34568307f9d9315d894dd546f2297091fa3 v7.4.1176
-+39be49fd70d9b871d6a70beb1389d70bbf446367 v7.4.1177
-+db58646580248c1fb8f2c9342aaa8ad9d4a08e7e v7.4.1178
-+26bb1a6abe25b1d1613edfe78a4c0a9120a32066 v7.4.1179
-+9c0d554a497e90be73be6f211a41697c044b934f v7.4.1180
-+3d8e4e0d71278854332d14365f29fa1b052d48a6 v7.4.1181
-+42c1a4e63d1239099c78427afe0cb9f9cc2c5f69 v7.4.1182
-+0677c5b880d11d020866034845500f900bf8f729 v7.4.1183
-+656db98806b30eed4f89ed3e5f57c2e646c87893 v7.4.1184
-+d30f4f9b102483b7dbdecfeb0c69e9e6c40d6e77 v7.4.1185
-+4e09a38129a35060809ce92f3115cdef7dffef7f v7.4.1186
-+e09af43f98f7bb10d6c691eb4996a192534991dd v7.4.1187
-+3a99194bd187590d623a4ffd6f0581a4f8af7cca v7.4.1188
-+29d4ee3f009a440ba9c9aac5a42536a7fcf0055e v7.4.1189
-+0ee0c7729f28702e78aa6b4c8b18200b9ad2b1b7 v7.4.1190
-+192ae655ac9181ce20ece4705e196a7e6d323e8e v7.4.1191
-+6f81cf49da14e6cdb4199138d6be7023270077d2 v7.4.1192
-+2981a37cec6150de385c7cbfd6fe9764d087e40c v7.4.1193
-+4f23088b47ea90bf92ae5e472695fddb32cf7a36 v7.4.1194
-+0d46cea25641de8aa2f4b04f871052caba1f3343 v7.4.1195
-+af3c41a3c53fc8d889b701d08345bf3492d688fc v7.4.1196
-+a1e71a01dbd6ce3735a8edf135afff1514838680 v7.4.1197
-+37c929c4a073931918086340a79c3a6e10f80946 v7.4.1198
-+0b6c37dd858de21f8290c1fb7eea8c1c876628ef v7.4.1199
-+1a5d34492798b121b868e1db115e4e67fe860444 v7.4.1200
-+4635a259ecc08a2526307fcee2de65cb97370066 v7.4.1201
-+7fda54504fee2c83decc5e7f35ef60a0106ae941 v7.4.1202
-+744c66477ba968aa6cf50b98d453a941c3798466 v7.4.1203
-+3a96dfb42c556b14335b23fa14b296a6e6b88178 v7.4.1204
-+83861277e6a3899778b58a4662aa805a92f25e16 v7.4.1205
-+f86adafb28d484729f4e9b59ddeb8d4bd4b1dca6 v7.4.1206
-+81794242a275aa138d422da2f6c6c43f3d422bd6 v7.4.1207
-+bcef391c101ca33e584bc55a6cdb192cf6d32584 v7.4.1208
-+7898da204b9810eadad58e6f8f6943c90b3005c2 v7.4.1209
-+41789f16d6b2c706d7204d57684ea2e07fced40e v7.4.1210
-+2a8d6b2dd92585c881a837f8cd79a53e264bf48d v7.4.1211
-+d621ab23fd199c574e57d9d3bc7ae91e7ec4b017 v7.4.1212
-+c079097365f35c3a4987e525afa2d40e25d2ceff v7.4.1213
-+4d7ce6c03fdad0f5debd6601cfb1f4307f45f6bb v7.4.1214
-+cfed0e9f0ca28558336e5776bb18457a12fd75b9 v7.4.1216
-+28f569c7dab9868cbde1a9703cc648369a6540cc v7.4.1217
-+cf744110897de695d71d277028cbdd0cdefb7090 v7.4.1218
-+6669966db9e95909325f6c3ea2caab6a31618e66 v7.4.1219
-+2f7ad0b859296917af69fea7c446cdeee56fe875 v7.4.1220
-+798673834babbce9221688609738224116ea8827 v7.4.1221
-+10f17a228661a2583730542423769de321315597 v7.4.1222
-+8818755d8326189043b07b231b131f6a612a0db0 v7.4.1223
-+b512d9cce1519aafefb542aa5a3d3f5b47eae816 v7.4.1224
-+226ed297307f19b33b90c769aea390c046b6179f v7.4.1225
-+e90a16795c74a60b7db939b5e2ebb8517b6265ef v7.4.1226
-+150576e6b984641fa5a9866e0727034a43c1ccdc v7.4.1227
-+d4fec9208e7e2dfdf8d547e4078a0f46a30634b6 v7.4.1228
-+6b0891de44a993e268985c3969f1fd9a4d26f15c v7.4.1229
-+30a9f5fc3508e60c66993b2977a59bedc94cd2ec v7.4.1230
-+17e6ff1a74f19914a9533fe324dc84ad7b29d553 v7.4.1231
-+fb5ba6fbc843f7a7ade52b0a87b561eee9fc84e8 v7.4.1232
-+4b9d4600166fad472dd6f1b8057697a03dc23aa4 v7.4.1233
-+2313f1a941535b2c284c52983788939654897a57 v7.4.1234
-+7fbd2de703a9df599456095ffbd7961d1e9c28ad v7.4.1235
-+895150cd3e6ffd43bd325984ec187cfe17387b7d v7.4.1236
-+e7afe45a202a0b55c63398cc2a84baec25cbbf68 v7.4.1237
-+98a96e0ca73be7fe46c6f0475dbd2e8c4463d4c0 v7.4.1238
-+6e6f829af13871a9c8e9e9ccff1d8027765ca99c v7.4.1239
-+a98b93736894e596c27611feeacce86ca5731b5f v7.4.1240
-+8e84273089d03c18c5d19888d1c2d9cfa60632a5 v7.4.1241
-+d14cf20b44dca2796e2d2f078d8fa9fdc10cb337 v7.4.1242
-+df2b8af14072797d157e2d072534c4b5249ef05e v7.4.1243
-+bff95e0d8885e0b5050e1404998c9d1904ba5849 v7.4.1244
-+43071dab7621b035b60c2b88a5ef7e6f07da3080 v7.4.1245
-+93c61501c2cfc028ef9f83e4abe3a3a4c6de1873 v7.4.1246
-+f12d6235a7539de38792ea79642c6be59b3d23fd v7.4.1247
-+14a5de0990a5f9b4824f3372ae2472027cf26553 v7.4.1248
-+ea1fd8d750a6883ecd7f796ad2c954564d96acc5 v7.4.1249
-+a343a738010e0dd632be30d7e2a02a955dc405ed v7.4.1250
-+e873010fb658e9ad8590c212e3b439bc027135a1 v7.4.1251
-+1c6ef9113556ff477d0b17844b9a28f123ee06c6 v7.4.1252
-+35973ce58c841bdd80ee158ca29d444a510c1702 v7.4.1253
-+54602dcac2076a7a765e5af7febf2f621c392bfa v7.4.1254
-+ce5a7a61386772904fc253d4b65a07b6ff75b2bd v7.4.1255
-+1ebc7be4dbbff9122d6410bca93e54dc8ca186ab v7.4.1256
-+14540239601d9a40d2ef8fe0f651f1eec4f391a2 v7.4.1257
-+b724dbb299d5ba8c7b4a7bb80955257486a10986 v7.4.1258
-+2a34dd90beba2c38ea1d8f653ba612862ba3cdcb v7.4.1259
-+e44240b5a6da81b87b27b881d17d570622ffe4a0 v7.4.1260
-+2679e636e86290d88801f6e93e138835a7a32f04 v7.4.1261
-+1f0743f4f88f6947af9d4fe12691c93d9354e6bc v7.4.1262
-+3f2e0b62003d46cef37efd254fa75c98fb82ca0d v7.4.1263
-+2e905dfc699969ec00ac3a36a98e4270a99cb21c v7.4.1264
-+dcc0bd6b1574f5e9e92b892aa64d3992a3337329 v7.4.1265
-+98644de08f1513a4c99381bd0c5b685fe4c8ec2f v7.4.1266
-+e875f0fbd9c0f6098ff044e7160c121022b06ce7 v7.4.1267
-+e72438a1117239182c307b6780f8a8e7cae16b6c v7.4.1268
-+b2922673917af8314639577c8f4fa1628318d847 v7.4.1269
-+3f7382858d4d6a1781c822403c5d049ac1dd14bd v7.4.1270
-+03e716299680dad63154fd19955b4329ea64fcbb v7.4.1271
-+a028a16110e2a5c954a75cf488ea3cc7213e6c2f v7.4.1272
-+a4de8e834b8fef4c0ef9a55a6e2d90d999f2c9f9 v7.4.1273
-+b74549818500459d8c9fa5280eeac41aad1138fc v7.4.1274
-+fc9ba91a653367e81eb92dcf10dfa789c02cbdcf v7.4.1275
-+a7e58c6e4e9ae3e05f23f3a74327ea09f1913ac3 v7.4.1276
-+d96e38f35e2d436001308279e0be54593faa6a25 v7.4.1277
-+646d5148fee29131a3a9ba136910ed660172363e v7.4.1278
-+45ea5ebf3a9850a54d5e5949380f9e26f83048dc v7.4.1279
-+0de25de30ba3772c787eda7d33bf91d2eec8d894 v7.4.1280
-+f91a24e334753d95ecd87f695474e3a3774aef30 v7.4.1281
-+00344cd730f666996f2489306c5378436fda5244 v7.4.1282
-+7224f5e9c36a4e5d94e2763c22c3845fcc181408 v7.4.1283
-+96fe78b32ad55bb56ac6505be71abd09c6872b05 v7.4.1284
-+22367b9f528a66382dcac5bd03cfb86f19cd89d1 v7.4.1285
-+5c30ba57aaeaae33bf6313ed0b480ce77f9f4a44 v7.4.1286
-+c166ff6797cb478ef29b506cc5c93f32006ef01c v7.4.1287
-+8e0d4cd8157a1111bda68784cf8bb62eec5c808f v7.4.1288
-+d3fed9a639db1ca79f9edf6e758c4cffd6d86c8b v7.4.1289
-+75de22db840d6f80e429ce180edbcb666f5f5798 v7.4.1290
-+0756eab66b713a987ce9511d53213c5e5285b9b3 v7.4.1291
-+d244f2e46d69937fd6bf7dce9cd57ab210aa597f v7.4.1292
-+c1c9ab17e197be811dbdda99e75f5febd14018b4 v7.4.1293
-+92ad477c6ab3289f2e78011f9f551d8267a234bb v7.4.1294
-+e5dbeb923ce69b744a681b64bd8ef887dea68ca9 v7.4.1295
-+94798af62c567f9ff45633c2ac1cbc7a909ebaac v7.4.1296
-+d65aa95725d3cee396e87917e98a8a6b1fde7546 v7.4.1297
-+ac78cba9e72b8e56e0911a6cc1c491b6fb4619e0 v7.4.1298
-+b2cfa3416ba067b7191ef364afde19a067a432b3 v7.4.1299
-+26f555e9aab1a993dc059ac650552e62079f6e3e v7.4.1300
-+dfae8bce5920e3e96a607e335b283c1d0a957c08 v7.4.1301
-+b421c7f2f1728285ddae4b7fca76090acbf0b868 v7.4.1302
-+c59a6552408436f347cb40008454a6a1b023d799 v7.4.1303
-+d685893d852eb368f05d265cbf7cc1ebff709aef v7.4.1304
-+b6b4f354df23557979ac90518127107cfaa4eec8 v7.4.1305
-+75e0831549f1fbc19fb8afc3789fa8db8519ba2f v7.4.1306
-+1f0f08c601b7413ac871674509d37e3090114b7d v7.4.1307
-+4fd171e5cedcaed8d5a402cd57bff2ab99695fb0 v7.4.1308
-+770dd91ad9f7d0b2eda796b5b720e192c1ced83e v7.4.1309
-+ece323e2b57fe86da0867e13b93329b367b0c54f v7.4.1310
-+a1b10634a28ae0ad0f6de437d2a64cfd64dfa5d1 v7.4.1311
-+f48041801aac444ec6dcc18701b8e0b0c6ddcbae v7.4.1312
-+9dea1571b352e3671932d1b9291be912e7ef8fcb v7.4.1313
-+72324c2e890a9745894c161dd0f7286d011bb626 v7.4.1314
-+c6443e78cf2decd7cdf3d81a0e91a5dc30fc88b8 v7.4.1315
-+167e22951df44a2894c1c54ce264e7fedc61c116 v7.4.1316
-+9f9b74579bdc8c2e16ca7ba02dd21df00db2a45a v7.4.1317
-+7c74cafac0a195787be3bf5ce67ce3c81d9c985a v7.4.1318
-+15253130abd816fd5d43e869078159d4316688d1 v7.4.1319
-+7e298e8c574136e36612526c1141e3726d9b196a v7.4.1320
-+774d53057a23131609c95e81733e6b44f3b59589 v7.4.1321
-+6db4b1c863ecb2ccb021cee93abdef3268d753aa v7.4.1322
-+e407d5bce2f53d5dda81c184ef35a6f8782ba598 v7.4.1323
-+19304db153bc5f5a166c471f9669d091fbaea6ac v7.4.1324
-+7fe3b9dc132bf7de09a686673f517eb8a2c09e9c v7.4.1325
-+1e853c5273d0c524af6088dc0c15430f7a44b32c v7.4.1326
-+1aa8ed4ee48bbc029a980f06173c087eecdd4485 v7.4.1327
-+9c6740f2204fd72691f6dec58cd27907c0f5a19c v7.4.1328
-+e4c3f6720b0313cbcead01ca681975a7965e307c v7.4.1329
-+38887bf423ba5fe29389d64f78f6aeb1d609a032 v7.4.1330
-+dc32c8026899ac3571432d410ad016b327156256 v7.4.1331
-+3b01272878513860c1ecad0119b8502e2b545e08 v7.4.1332
-+7676818d486b961b3ac2fd0cdfc6ed4b2a48970b v7.4.1333
-+b6cb94ad97a47b4e0fcfea46e666b3a9e394d8e9 v7.4.1334
-+0c7f5abe84b8bf402cf4c844226dd7f24002ca65 v7.4.1335
-+3ea56a74077ff3d757b1af72d62e3ac376965b3b v7.4.1336
-+04ed31f9ef70a662d7af246fe9531f8352432bb3 v7.4.1337
-+1b70dae3e79afc7b85156142290fbf965503c4d1 v7.4.1338
-+54cfe888c6275b0a5b548c0b618f94bd8164b75c v7.4.1339
-+d82fb42b611b2d8e34bfec092371496dca5e5d4f v7.4.1340
-+18a3f0f05244300314afe91c14a883f2b00f98a1 v7.4.1341
-+882ba5080c5ca54fd29801dff13a01fbbea79003 v7.4.1342
-+7bc924a34288b6c848a2129e7823bacc15fd18bc v7.4.1343
-+ae50910ce279ef86ee2945acf9d8bc074ab747a5 v7.4.1344
-+441298d72f3c339b98709dca25bb859df4ac3dbc v7.4.1345
-+1a03abdc4234281d004cded7d74f67d7aa82e9dc v7.4.1346
-+58505cbea7e5df7a6e6b694a18db47123cfae2ec v7.4.1347
-+50515f2e81d13a752ab95496bfbe7eaf5052020e v7.4.1348
-+d1974721ddc5cd75b358a4457105792e90a41508 v7.4.1349
-+a62ff5ff60c12d0eccfdb086f72d039a48128b60 v7.4.1350
-+4aea0b0aa714b3a6be585a80a2e1e94a7fa45a68 v7.4.1351
-+3c1bdf20c8b9f8405fe65ffb4df4faa7185de40f v7.4.1352
-+1f28be191fab6d777e080245b7de17d905192bb8 v7.4.1353
-+350f8040bd3778e73e1d64d50780655d422771e0 v7.4.1354
-+39532ee7dd433ee692c774bc4f1cc1ce7fe71f83 v7.4.1355
-+310dd635e8c9d923bce04417ccc5fbeddd4a60d0 v7.4.1356
-+0aa9cb77a8dd5bcd9b623e1edf492de88d8aad80 v7.4.1357
-+985cd591756068655075b8e0e214cd9ba930da51 v7.4.1358
-+3462f9cfedf8388d0be5d443c81024293029e271 v7.4.1359
-+f96536c291d88ac09916404533ae11c4a9a79bb2 v7.4.1360
-+8abef552ece7794df0e4f46ec5b8b731bf11aa46 v7.4.1361
-+9b2d25319c481470a11a1e439201ed756a73e45c v7.4.1362
-+f52504c10387c6129b1908c4c2a465d5361d3e43 v7.4.1363
-+563c923b1584dd865dabf4b454b03cf9476d6cf9 v7.4.1364
-+71aabce3142e23454b299739513f1ee745be5d4f v7.4.1365
-+efbb9916290c24967c28ee6259f3c92570b086d7 v7.4.1366
-+5dacbd22fefde9a3b28f416fc4e3c23dc088730e v7.4.1367
-+028e24e4c0f4d21dca49cd7be2fe7f2f9b0c0fb3 v7.4.1368
-+aa845d10c6fb8dd1bc258cb6c3d6001145b845af v7.4.1369
-+240deebfadde981c839e4f2de22c43f1fffa736d v7.4.1370
-+6ee6fb27dcea9c53b4c24a3ec381fdcacdd3feb9 v7.4.1371
-+74b44d06d3c7f5b15ecea941c5f1cfad928c92ab v7.4.1372
-+d0958e22d9ff9369382c2c078453531b1dc39869 v7.4.1373
-+e9caba58213bc56b6f72a4d036c3261a78ab3c5d v7.4.1374
-+d8a8e86f39ad9bc0d85165bc4346ef04147e12f7 v7.4.1375
-+973686665238573fc92ac3a0a0240cfcd77d96d7 v7.4.1376
-+454a30a7590e8f681cd6413f462be8d80d9f038e v7.4.1377
-+a0ffb1f3dedc65debb945c92fd4e5f974bb91f4b v7.4.1378
-+db5c79d93eeea857fa7d4b467119ab7963d6a200 v7.4.1379
-+f2286ff0c1026b641d44c35e2bed1434b98a852d v7.4.1380
-+477c1d8556985c3c92915ffc3a1199372cf4262e v7.4.1381
-+e77efd7a7dad1f3d307fb41d24b2ed7cade8a40e v7.4.1382
-+1e48ffa2d69738e2dd854e2d8de7afe8abf10347 v7.4.1383
-+95d59081580f5ea0c0befdd82415b1ceba32f29c v7.4.1384
-+1f81c571d0e7b806d7cd74ac043257cac0a59435 v7.4.1385
-+5fed86dac2107269527797d55220fa3c72054b10 v7.4.1386
-+9531717f0694e6750a01b7390c47d66c9d7aead1 v7.4.1387
-+a8e7b8328cb42085e738b9e2dffbbd3a48a6c983 v7.4.1388
-+fa2668601c7aa7474f64b4c3416fae44e39e63c1 v7.4.1389
-+265bcedffc15e459e0fa8a9f10e5a6b9e77c4279 v7.4.1390
-+cbb2f84da063f9d315212db322d47badbfa97844 v7.4.1391
-+7c21dd028e0fdd4b639671ea017548fcd0ac9d32 v7.4.1392
-+ee84450e604e099fd690194baed2d3e0bbbbd599 v7.4.1393
-+c16aa03d8db50924e90aecd6b054e2b636ee45b6 v7.4.1394
-+08d251a1c1786e4cc7b8618832650dda8e9b4dbf v7.4.1395
-+78f2e8c079737add6ae43e788a6131a4e85882e3 v7.4.1396
-+c11aaa31a0edda0d99ec61e964cea26412d7ceab v7.4.1397
-+b717dae2f26d397a081503621c3aaac204690b94 v7.4.1398
-+05b88224cea1dadcc4331c3b36fe4091353541f8 v7.4.1399
-+51b4fba718bf10d5456ff8c9b5875b79485a92f9 v7.4.1400
-+03af9acbefb00aa160270466ede8227e8ce67c8b v7.4.1401
-+3456e2ebebd4241a99c7e20779d85c9fb935aa01 v7.4.1402
-+ad9edad64d220ec01458ab35b73ad809012eed4f v7.4.1403
-+4f0677020a4395319191c9456e85f2357a93aa0f v7.4.1404
-+2baf64fead5e38e5fd55449532b3ec920c153ad5 v7.4.1405
-+cb0edf7bd0a4177c86d8c168db479411f2ff6b03 v7.4.1406
-+a0e552c51c347cd3ec4c9ae829ad02dd9b0cbf9e v7.4.1407
-+51ca0cee512ea1488c1680818b3d45ba0d9a05fe v7.4.1408
-+a777ff82652354daf6156b9eb176ba08c029cd79 v7.4.1409
-+dc72f4a463e4fd7ea1866b76c10ada1da7035d13 v7.4.1410
-+6d221d623c8e88d03c1edafb2dc885f3ac98f4ec v7.4.1411
-+d7e1526ae1b963460f23ef06e7a8e61b6ee90c16 v7.4.1412
-+60586ce747c405ae6a5f68cee393f566f02bdee8 v7.4.1413
-+1313d2e282dc285b04b9c5ca04a37a9460589877 v7.4.1414
-+acc8029e530fa9a042bfa9cfa8836fe1dd97e8d6 v7.4.1415
-+6ee794dc950ebd6bb05d741a50e660b5ff125c56 v7.4.1416
-+8dd8d96278a430ad62048a63124ce16d30910260 v7.4.1417
-+989ac3aed1ef2460f694defb0f7012ffbf854ca8 v7.4.1418
-+1b6a589a0efc982887cd1a3255f426ea96f9b7cf v7.4.1419
-+3556523480579db269e69be53937dd0571a168b6 v7.4.1420
-+c4ffdda8cdfd4efa43757316bff76427f490f096 v7.4.1421
-+99a70c3b902fa7f50dc56714b6deca90d3f1501d v7.4.1422
-+a412b466bedc333d742cf9ceabc735a157576cd8 v7.4.1423
-+96c0100f22f1ac033f1232bd8853dea13cf8c585 v7.4.1424
-+792bc43e69a70f5fffe0992ecfb758693e789790 v7.4.1425
-+108d30ed34ba6698409286e3a076218860b3918e v7.4.1426
-+553a4c8dd7961f5b01e53af4785c40fd893db6c6 v7.4.1427
-+770774e6601126d678b45bffb00d21145573d160 v7.4.1428
-+0c3210caefa6a957dd061e771eec8e5adf190f99 v7.4.1429
-+ff900e499f79ed7ade315db6ae59d07a8699633b v7.4.1430
-+fa1e3fa56104294f6b96b0105f246f457b4f350b v7.4.1431
-+738c2929d6adc577e37d2cbc01c794a7ea09c890 v7.4.1432
-+74b15ed0a259ddedb2f437f3f0069c8280ea1274 v7.4.1433
-+b8a56d4d83e0752dd1b0e46665f477293be4033f v7.4.1434
-+e05e28dcb590d9e2063913dfe66c701b195ca763 v7.4.1435
-+56dbae4b73c626c8d14dfa46a5475ebb395c2051 v7.4.1436
-+6ae3fb4fe7c136a17714ab9954ffc41881474101 v7.4.1437
-+ac0c43e7af20c69ffedac65fe9fdf3dd263e6121 v7.4.1438
-+367a7fed630b791517ac81d7c35c0dbc37df92bf v7.4.1439
-+18fd94bd4eb8e2128a123ea13112313bc7a1419e v7.4.1440
-+4929eca308b76732057cd2fec77328d7d9de4ea3 v7.4.1441
-+d2a215e8d5b499643434342bd185cf9e9d023e2e v7.4.1442
-+6a4c11fa1aa3e06aef7cb8a1ba46ed82585bcd19 v7.4.1443
-+097886a3379b24d6205c142a575ae557f64967e6 v7.4.1444
-+7fcf3f6020c149cdad94e65cec5649b1441a62bb v7.4.1445
-+c1f29c1a968ae3601ff49bf2acd8f650b75f99d0 v7.4.1446
-+aec8f8ce8e4cb9c2bbbf5942afc1dd28a1692b8a v7.4.1447
-+1001ec135d6ebc68eb2aec8593d24788e7249bdd v7.4.1448
-+4e057409f1d7051332d319f35ca45b16dc5e3514 v7.4.1449
-+058b9e4a291b563a8ddbbb9c042e986984f9f5e3 v7.4.1450
-+190d8084cb3ab72c8863140c185ad285bd0ab969 v7.4.1451
-+e2021d6feedaa6b7f630842e219292cc9be306fe v7.4.1452
-+cff44093ddb0b89c99a221bd0004d5a2028621b8 v7.4.1453
-+5e88bd55b7893fe6996ca40440022f2c91bd44c0 v7.4.1454
-+bec1dcfaa8be40ff20ff8e8e5926c5b0cecbe182 v7.4.1455
-+0a55dd3814104181acb0c486e28d29e579db7773 v7.4.1456
-+ec940c11f749ff73395da9f4f05ebef27ed7fd42 v7.4.1457
-+07713b8243ac28e7bb5fc6c4034edf47c370604b v7.4.1458
-+ad4b00bf2984cdc2b584ec3123c52a71127f504b v7.4.1459
-+d44ff1525ff03103bfabd3968d01317e29608175 v7.4.1460
-+3e54b31d50c7f2e034d5079fd1958fc40a959ccc v7.4.1461
-+c66e1f50c142838a60e650d7b5f008ba32d6b773 v7.4.1462
-+446558924b661f5776cfc71e5f683e60a8d95e78 v7.4.1463
-+2aa24f702b8d26c22a74721c97752c84bb476700 v7.4.1464
-+8fa75a4c39bd57e5c122e9c80f5b0733bdadc4d3 v7.4.1465
-+a0cff08e7aa36699f72c0390f0b3e2222aaf745a v7.4.1466
-+e70fa2e110eccd1aae5886ae91a86534febedea2 v7.4.1467
-+2c40b40c322018b7414576b55bc4afe79a7738cd v7.4.1468
-+b151c3f9be72f26d8812988ec1d10cc47a6f18f7 v7.4.1469
-+e0d576743e4f1772c72d2b5dd9fce4dd38ae1270 v7.4.1470
-+49d0e094cb936435020b7239b7c7e5aee755ef13 v7.4.1471
-+45740f83b3cebe7fb62258b3e71b4e3ee0628d07 v7.4.1472
-+a541dd5cfd3a257423b5f8773fc13ef11a8f02fd v7.4.1473
-+991d8fd4d84172200b761d77e7b8e168657d92df v7.4.1474
-+6099e81850457aff207e57f546da5dc81c3ee5d6 v7.4.1475
-+db2a07b710eddeaab23c0144222a219ac69e5cea v7.4.1476
-+cd7ea16d13008149b96348c0ee671f2931d5f02d v7.4.1477
-+ce791ff9e0da3e05e938ab34eab50b5ffdb85fde v7.4.1478
-+5d834058bf442e2ef1a054f9dcb33b02993566e9 v7.4.1479
-+e448f2a5d45b5143a834374ca28f3887ffac6416 v7.4.1480
-+52777ec8a3942015155ea49ecdc8d6b3082a4317 v7.4.1481
-+892d7dcf17ecd30f337590fd9b547817ba5ab3ba v7.4.1482
-+3dbe93a240d8ec560f210ba020f197e077801685 v7.4.1483
-+764dba33605cc23dcd0e56a4e406ba5ce61427a7 v7.4.1484
-+3b9a306724ece855a0d63930c310d5486e36b830 v7.4.1485
-+f5972de59001d96606099b3d5f9c0678a6304a17 v7.4.1486
-+2230c0da23bd585a4b99434a1136ef12b56ea7cf v7.4.1487
-+a7f94f0ba183998ece1ac430a00329589e1a91bd v7.4.1488
-+8137d5b642f37e84f2618f9f13fcda9f3c907ff3 v7.4.1489
-+1e58a938aafc5f1dbe1d0678c86fbdef50d124a3 v7.4.1490
-+7d1c42e3ce11c851aec2a79bd781734240c1775f v7.4.1491
-+eed1ca42f9aa8ba7e2cf14d022f2a4837919c321 v7.4.1492
-+8894d595b7867fc34b573bacf63b3bc8b9433280 v7.4.1493
-+5d926807c19c5f20608755692cde3794006b01dc v7.4.1494
-+2f1a63269250ba3ba088b94642531255fda36aaa v7.4.1495
-+05ec48deb353af31436af28c19987bd81654b1cc v7.4.1496
-+7ee2b87ba896e5b403ec61614c99f59db0711f4a v7.4.1497
-+8c888844de9c856ef1c41129bd3c023f63761aba v7.4.1498
-+1a6527cce6754f65854aeb0d8a942084a05719b7 v7.4.1499
-+89f38c77e11ebe4e6a484e41745b03c9479ab07f v7.4.1500
-+f6d21a33d489ec4d12ac1b657a84df191e308574 v7.4.1501
-+5d2c84be23b521717012450ac99011007983ba63 v7.4.1502
-+be45d4921f1f018ebae943a41cf1fa2d3689bff1 v7.4.1503
-+02ce040591c890535ef3dc9567bc16279cf1742a v7.4.1504
-+4e22d0e7bfb1bd42fef0c920188b0db410569af8 v7.4.1505
-+800423dbc2603769754082c3a44adc5dcccbb9e8 v7.4.1506
-+6af4329b559217dd42c81a75b9d18f5b62d519d7 v7.4.1507
-+a0e7d70707993cb6d591d1760ded7f56fb3a275e v7.4.1508
-+0e6fd2f802b387847b13b74b608ec4394842aeb5 v7.4.1509
-+541ca10b3bc7426b5734fc76ead53cbfb06526b3 v7.4.1510
-+768065c86a35516fcab2636597d2c7ae63fcd75f v7.4.1511
-+6c421014a0b3436c8e5e78fee089681de82a4232 v7.4.1512
-+dd2e2bd69d0e1ae6ef8b11853cf87311acf4de6c v7.4.1513
-+6f26b680c243ce53f03e4f163901e21cf9256b96 v7.4.1514
-+3d567b5839c51d9a2ce3d668f6427ff76e7f1cd4 v7.4.1515
-+c0b5c2b0a5eed6d9164038e0204579db0319b093 v7.4.1516
-+fed4e19bd884707a299a01248148739157fe3030 v7.4.1517
-+d0717262d80242e315f17f2ad1aac9f8536cc12f v7.4.1518
-+20533e3de373800231f2e5d41a0d282c93e8bf70 v7.4.1519
-+9fb171e8466d46f1d08f662f2dc694218be8a8a1 v7.4.1520
-+988ddc5742f5848cd37f8c9e5b5f01a83e228c84 v7.4.1521
-+508504ca52ac8fc574123e9f29fbb5be7bb20602 v7.4.1522
-+5927180d0b4d728c5557d7a94f253cecd5b318b8 v7.4.1523
-+86a327403fb09ef9991b87f111dc35d6a82334e0 v7.4.1524
-+42020d59a432e64d08752bb2aa0702f590089849 v7.4.1525
-+c1aae3a7927938975b1b55ef2c65fda3cc4c23ec v7.4.1526
-+ade1797aa6f4329edcbc25f8c1fb61bf116b3722 v7.4.1527
-+aec051e61547f7619c5b6a2c209cfda65f0ab073 v7.4.1528
-+c08c6d19db4df86a2398c8e505c39b1d6ca89a9c v7.4.1529
-+9f63e4506c404fd08bd7c1ebeef7a7e25e4868dc v7.4.1530
-+8924d7adbc228f734dabbc2819dde4cc50a25801 v7.4.1531
-+7376d36395f0f511bc8837447446f235f18b0ae4 v7.4.1532
-+675ec6cc90218001a4746cd1b414b8362f956405 v7.4.1533
-+ce789e3dc84d04e0ad9236700b8a8b9fa476eb59 v7.4.1534
-+76b9c2305531a448e6f34abdc4b4a13687b48137 v7.4.1535
-+daebcbd87bd3f1bfc9edb398d757d1f588a5b776 v7.4.1536
-+caed4b2d305f7b19bbc02b51bb4372fd596a9e09 v7.4.1537
-+8877ea0a27ec80527957c6ec340af671a10d5d45 v7.4.1538
-+42277980a76d8dc477e5209a3073ec1ad50f8ca3 v7.4.1539
-+1227dc21865b3cf46f228e46816ae319290ad0bb v7.4.1540
-+ee5cb2e9ed5a473bc60c7337d3fbb3812bc16469 v7.4.1541
-+0b31cc4b261e167071e37404e7769dbeb217fc4f v7.4.1542
-+c93c352717b3a4700d95457babcf6f70a48d8e54 v7.4.1543
-+13e5a1f02be41c46757786569cc4d787b27b8f91 v7.4.1544
-+9f5bd031530d829262abac038244bfa7f3057abb v7.4.1545
-+5104f96b6ecf747f40913bb5d1df5c2f7412255f v7.4.1546
-+260d01c1cd1764b477e7967c50e56d7ac308b4ad v7.4.1547
-+14ab6c6855819fc316225a36dd400556ec19bb02 v7.4.1548
-+24ac80377d86c123b6d22502a6fb70fec985998e v7.4.1549
-+b4350a4d1e01cc8accc9352685e65120ac2b813f v7.4.1550
-+721e8d6cb7b5c6a13dd1dba9c2b78ddc9614cf04 v7.4.1551
-+2f57bbe870ea8855c0604920083baced466e07e4 v7.4.1552
-+981cc3bef9f371cc35ed8245b365d0979a03af7b v7.4.1553
-+630300c7a26c7f80948ddcf6fa1ccbbf8526e74e v7.4.1554
-+66afe6d5a9de3beb50f73c3e501fd43d95712bfd v7.4.1555
-+3de84783c0291b3af4b2b4ed3c2d0cd10784ea58 v7.4.1556
-+485d4d8a97f6a68fbf8234632a8069414ba60438 v7.4.1557
-+09041d2fd7d0a3d86830dbdc3ab643a08340ca20 v7.4.1558
-+c337c813c64dc3ed64ec6b038816434ede27a2d3 v7.4.1559
-+fec8655cf1bfa9825419d12b3f40ad499bad18ca v7.4.1560
-+80cfe52ca3a204986e1cb3a5f1ed9555d6cc95b0 v7.4.1561
-+b4850f705181316a1fcdaa1c00f6a81f61d67cb6 v7.4.1562
-+996109e24f02c45f908a286115f7db6104df9483 v7.4.1563
-+24db3583c4963555571f928ca6195340404b7fc4 v7.4.1564
-+56d0eb96c25a187359685040de8d30c70010c1de v7.4.1565
-+96968d6bba3e17b4ccd057dcb5ac9860048fa828 v7.4.1566
-+7d3548ae729defe4975a8afd24c42b7f8f750467 v7.4.1567
-+f4dca52393178775018f03fd64be6f3c3d15f4e5 v7.4.1568
-+22aecf80378ee5bdbbdea04622243bcee4b873d2 v7.4.1569
-+f3c636c673f7de95a86532ee9f8e40d80dc8ac9a v7.4.1570
-+40b982c9858747013e82d7f4d9b5db01dd21337f v7.4.1571
-+8818bca7a824f6e2e792bcd92c0bc624072b9948 v7.4.1572
-+28e10c1bed22e09320883f0631aa0e020bdf48b6 v7.4.1573
-+17bbbca531be618d706bb082738d064f392aa171 v7.4.1574
-+debe6347024de198b0809703218c975144a53295 v7.4.1575
-+c76cb97073bde03943e397fe63e5c13027dcb9a9 v7.4.1576
-+b5209a4e5bafd8bdee01ca8b8dde2e7a1913c2d4 v7.4.1577
-+63dc856bd13d87a3f69131c1ce1d726d12dabc63 v7.4.1578
-+556817999955a38e6640f9a7ab55167185ff8604 v7.4.1579
-+fd454847836d6de1c1f9dc32b00709274646f322 v7.4.1580
-+537bbbd4e987f8208e4a0c33c3e3fe4385eeb6d4 v7.4.1581
-+ce37bbedcb653ebd256e4d522350c2d004f4f787 v7.4.1582
-+fb8d7086e99d1b3e4af4bde8fabf26aa7509bacd v7.4.1583
-+e32ab146b6c992774cc519fb37af73167313f6ad v7.4.1584
-+5bc958a928498980784d685ce529988a774e4ccd v7.4.1585
-+dc36cef103de366818e5061d326201eea2d84795 v7.4.1586
-+887b378f29d11fcb25a916ff8ea3177c1b45eef3 v7.4.1587
-+51de88bf954d6bca562c5bf7bd4d0b19d469b6ee v7.4.1588
-+ddb04cbe1e0c6c333328dce5fa538e88b01d0d80 v7.4.1589
-+46306a98407c48f1a228ad1d4af4a09f06d6bde2 v7.4.1590
-+bfa74b84c41c80982f76c5c77ee3d1cf0acf5da7 v7.4.1591
-+536b9b88d1ca372110ff50edc974add480aeb88c v7.4.1592
-+d762390fb27b9e2b17ae528817115dc6fafb49a2 v7.4.1593
-+40bb2619f5e295270a82c442de99db3c8096a5b0 v7.4.1594
-+f12689430f4bbbc02da125b378d3948b099c5fba v7.4.1595
-+3dacf96b4020b91b4176a82c6fa45493bf7121cd v7.4.1596
-+99aed8c33bbf5b3da8deb8e349debe54870725ee v7.4.1597
-+eab968bf3ce7ebb5a8e9ba9aaa76e696c9ab392f v7.4.1598
-+5c9603b1084d1b0f0349ac4089c0621d1abe286e v7.4.1599
-+6b9c960d68b3707b9422e2d961f3a07b23d5ad8a v7.4.1600
-+58e749232bd741b4c54748d090e71935796a0a41 v7.4.1601
-+d98fbc8dca8e4640ef179c748fc7b8ecda64e04b v7.4.1602
-+7c98c5d0298c821fdb2642af628da85ac3a7e06d v7.4.1603
-+54ac275e3fc430d5b86443d1c16bceda98e1fb69 v7.4.1604
-+e5f2e0f8af1099291e8a2675f19801c93be645d5 v7.4.1605
-+80d78e1ab78781aa686e05697c1a5807f49d496e v7.4.1606
-+3a38d465f7319bb0a927c07f86642be9012f041f v7.4.1607
-+ff41ece2e4b81b75368104a667d905c10e68ed2b v7.4.1608
-+91286ec46e9753efa608aa577e49a5f5f17c34e8 v7.4.1609
-+0af716a4f5d25b47b5c1ceb2c9139d429d8d28d0 v7.4.1610
-+24b43dd167eb9ef7d410e85078cdfb34b8ab50c9 v7.4.1611
-+f4819f0fc5add8bd4a55cea0fefcaa451875de69 v7.4.1612
-+59866aabe7372391228ab18e8b2528be92ef9197 v7.4.1613
-+ec78ecf15de7be04c4aa32e1c6050ac9f42a5757 v7.4.1614
-+8a106a24d128c3491587db1cb4b9e8a6d2b4ff46 v7.4.1615
-+d80edead9675f1fde3483da1cf497f8f0dea6f59 v7.4.1616
-+1eb302bf2475faecf15209480b7e7f6a6bb4a80c v7.4.1617
-+c70eea7a76775d17c7c0c9cdb561ae410eb9a863 v7.4.1618
-+72e2f387466f5efa3d849b1a9d1c5aa73e1ac1b1 v7.4.1619
-+a931160ffc41b5fe6d6bae0bf7bcf334e15beb8f v7.4.1620
-+b2a48aabe21feaf01d6a81c62bfe2f29f3847bb8 v7.4.1621
-+7a23461485513babc085f15824030fb2556bf160 v7.4.1622
-+8c80c21a1885e04204d2f6d02267c15d30ea8194 v7.4.1623
-+06848fe9c8161b3c2b88eb684481aa4c11b86c16 v7.4.1624
-+8f6bc562682976e5c07179540e7942b49abd7ea1 v7.4.1625
-+4a4d5815a974674719e59d3a653dab14a66d2ccf v7.4.1626
-+289765409225166a3adcd0878b5199de1c36a61d v7.4.1627
-+a4e7f4a62193c59c16a0d480cf9085b685b696c7 v7.4.1628
-+131e651fb3470927ded1585e8b48b67ea74ac757 v7.4.1629
-+4ce551bd5024078f70fddda1c594691f986d0112 v7.4.1630
-+6e567914f55adac4926cffeb2be735f10f2f791b v7.4.1631
-+92657771648f47ad5d3e326611fcc0fdfa3e5067 v7.4.1632
-+7ec1aa86dc808330c4fcd2b88758f9869283ec70 v7.4.1633
-+6a1becf4f2829f922b360b6bcc4636bdffafd4a4 v7.4.1634
-+683b3702970adff4c13d818c78feaab34c8cd2a8 v7.4.1635
-+f2e81ae5ab48a0e62606f78a4d0ee3f7be700cd7 v7.4.1636
-+869727342e43af0195cc1caef7e23e9eecf90265 v7.4.1637
-+13b0ed12a78a28724146b95a58de0af9b42636dd v7.4.1638
-+077706f01e80775be321450141b99e129c0b20da v7.4.1639
-+39d6e4f2f748b96d8344abe4c23794129f64c6cc v7.4.1640
-+8af6e33e4d4c7f63906f7ba3f14f6833f2a88316 v7.4.1641
-+f63892cfe28337a7cbff8d421b6c22408c930395 v7.4.1642
-+31f9fa8e153208fe5f5552ef5145f55cec908d24 v7.4.1643
-+af3cb5c068fdc6ce3997878be124cf7885a3a853 v7.4.1644
-+65130a9d3386b4dbb1eb3c0ba03c4f77c20b3dbe v7.4.1645
-+a5224eeb3546f6b1675b86bcaa2687f631b993cf v7.4.1646
-+4ce26276caeb1929deb2ff8bb1b0ccb99386857a v7.4.1647
-+f1840a7197711341d64afe5f5424a31750c42e1f v7.4.1648
-+9380c37723f804ca85f65a3a2eec99710e52def6 v7.4.1649
-+ecb57048c2a8e1d44c084242f128437ffedb396d v7.4.1650
-+e6d1608ca6011ceff9be6efeedb54521c988fcf2 v7.4.1651
-+4c5c08316979ad364d8bfc7c8512b2b793cc7971 v7.4.1652
-+b1ca6aa215b70836bbd84d96ed50345228991f10 v7.4.1653
-+c1ac169ee618b88e44ba54eb38f7640bd4b35da3 v7.4.1654
-+29765df3a86691328c35efe3afc1d5c9990f386f v7.4.1655
-+986f7c00d43d0508ccd2afb1d8202c388f770888 v7.4.1656
-+06bf71f13eb746c8e79c955f4ad3f428f4098113 v7.4.1657
-+e770986c855aa5edac39a18b684c538f914542e0 v7.4.1658
-+a35b596cd7ac5868e8e1a00308f476cafe04b4b5 v7.4.1659
-+03e5171c23e5340b2afb4766ed4f559ac5c3e19e v7.4.1660
-+ff9973bbbfcb8332c8bbef6762cc7bd7d4863351 v7.4.1661
-+4c38a4733578bb4c17efbd1160de9ea54ac869c1 v7.4.1662
-+65a5a18d3acf4394db5d233e4152641fe38a5b54 v7.4.1663
-+7f974075eb8fd748f96ec11debebc6c92624a3c1 v7.4.1664
-+df91c8263f04ba2733bc0481f9f4a64b9456ef8f v7.4.1665
-+7038ec89d1fd7892f8d9e6a93437cc03a6cd618f v7.4.1666
-+4fb37555e814fe97c07f38f33a11aec66c17932f v7.4.1667
-+cc2ef736764368576fc55f2679d2c08fade69b37 v7.4.1668
-+f8707ec9efe4a4e6f1fffd123d2caab9084c632e v7.4.1669
-+4b83af41f5dbbcdaab1769e7cd48bf4577f07afa v7.4.1670
-+3daf70d221688ad2dd85e56ef6aabe025b3215da v7.4.1671
-+3c8ddce4118e94936911cf4acd7b706649068163 v7.4.1672
-+7ac9d9e9889275698c55854c8428f7d291254d90 v7.4.1673
-+57cafbda13ad81e409d081231546960167e6843a v7.4.1674
-+08944b17c29c0d8cf0cc81297c4e73936a90b0a3 v7.4.1675
-+d5136647ce316b02871090da5ef60e59bf577a3b v7.4.1676
-+a345060d671aeef749267d99389028e3c2fbc65f v7.4.1677
-+26495bd795d223f37775af55c261aa55e78c375f v7.4.1678
-+65be74c1467bbe3c8c062261cbfc634e1abf44ef v7.4.1679
-+23b7f05a7f48a691aaec8dcc381ad8ca5c087816 v7.4.1680
-+1cb59cd2d3824dc6077f08eefa33e06b89699653 v7.4.1681
-+33f5732d893249d08bc4a63da733f1c356eef333 v7.4.1682
-+667da8443275e7db423fd0aaa3bbc1293a4961aa v7.4.1683
-+43b5ff7837ea3fa9b606e8d00dfc442752b90c00 v7.4.1684
-+dda254280bab0e1595af87889d81b23f8ef739fc v7.4.1685
-+fb764adba294689ab6e2e468e5969b52f28b64a2 v7.4.1686
-+176647a751d7fe37c73f3321a6ec6fd5ef79f2e2 v7.4.1687
-+f57949e1e9f1b9318955cdd31677c474e78f22a0 v7.4.1688
-+eaf11fa2fec8465a759a8786b2f3169c58a27b9b v7.4.1689
-+75446578a52fdcd232bca4ba942b5609a93b787e v7.4.1690
-+8fff73f17ff1841c6a73320af8ace120232f392b v7.4.1691
-+6b70b9cdebfc809fe3f2b915f52511b22d60a8b3 v7.4.1692
-+83d0b976d9b37bd961e1f6dfd37a6efe198fe637 v7.4.1693
-+b92938076e4003e6bd1802e956747f030ca2cce3 v7.4.1694
-+50d9fb580ffe4f8d3cebde7bdf8d74dd47302da0 v7.4.1695
-+b7eb7bbd71d0f76b3546de300f54e4590fa40019 v7.4.1696
-+a1132255e3e10c2950f39cfdd1cce4267da72008 v7.4.1697
-+0bab7b98e93055f906b4d83bcc8bb2c4cee4bf38 v7.4.1698
-+6d92bbe6c7de6eb439f465f374b4e3808cd0508b v7.4.1699
-+318eaa6fa973683e61404b6d982dc802ef6edbbf v7.4.1700
-+c154fbd3004f327b794c2eb0a525bf2d6cb08f1a v7.4.1701
-+a2c27f6aaf3a2192d0e55b8fa04509e5095b7cd9 v7.4.1702
-+6f41d68aa68ea526dc1b4b61b0a51dae3d547847 v7.4.1703
-+dc10bd23f9186d508cbdb2df92485cc15a2c02eb v7.4.1704
-+c1a5623cfc860d6e10014e7c65e7c60c2c440a4a v7.4.1705
-+e6c92db1e8b89e956c67f1f2fabff068ec479d95 v7.4.1706
-+9fa567d1355127b7723cc77bbe91fbf64d2b4b6a v7.4.1707
-+f196308a28133d4a9861aa643516b7c708bfdda7 v7.4.1708
-+87a6a0d65788583866944bc98cd8ca49cea4de20 v7.4.1709
-+210e767296d9c02e6d8d1e252f2d87601630a19b v7.4.1710
-+470ea7526cc65d00b05be69c72ec3dfd52801a90 v7.4.1711
-+9f40a379ff1edd9f11e8e4555b2e52699628f527 v7.4.1712
-+1b38596644ba589d4b561f868147019be1dc0c98 v7.4.1713
-+48b4c1c284fb974507143eeadd3464da822e27b0 v7.4.1714
-+b76195a1e38ec4be55599a5591dc5531bfa51648 v7.4.1715
-+df68de6b6f1cc22e70d04872634b5e70be8ab95f v7.4.1716
-+03250bc0c63aad58f86f10e3a423ae62fa9defe9 v7.4.1717
-+45fe799c96726641940e4f945310017fdbcb9bf1 v7.4.1718
-+e1b84109506ab265c7e8b8dacbab252bb7337ae1 v7.4.1719
-+be36707a661a6e2155a5713deccf620d344200e5 v7.4.1720
-+538d278d3db6e14b859777f94ac534a005be8e40 v7.4.1721
-+30988ffb7498cc7fee14e7434fb337a1297fa5b6 v7.4.1722
-+4d4de770f97011809239b5dd63f2aacceff2118d v7.4.1723
-+ccab37bb9ac979facb8ac0467aa7c8262d7bf6f8 v7.4.1724
-+50e40f322e78c7868b6555dfbbc13c8aa996ca3a v7.4.1725
-+cea5ff374062ee42e036ec64400be076dc12ab92 v7.4.1726
-+ed0b39dd7fd6ed43be15940727f29cfcf4c049f6 v7.4.1727
-+b7de875169e6134481a4ec0732d0ab692d75e685 v7.4.1728
-+54a380c7454788c5f39b391d5f158fda2a5c6e5f v7.4.1729
-+8bf855dea79e3408cdea13b2fe58c88564ca3075 v7.4.1730
-+8755d57debaa4b57af54a3f3f5a503c2c9f86887 v7.4.1731
-+d7ba3f9b9ba6d436aa0499df08c3fec543960fb7 v7.4.1732
-+d5d2e48666bd3351bad19d17e402dfb122509dcb v7.4.1733
-+7f29248d578905e9d4c03690b16a792a389580a0 v7.4.1734
-+a410390e340b2ae6bdb37a56590b825e509b0888 v7.4.1735
-+fe12294683d80893091d2ec0721880e814764679 v7.4.1736
-+b4dad96ade2913923a7413b8e2c32fb29629f491 v7.4.1737
-+9da3751688e9c04db254f61b31f895fef7f69b38 v7.4.1738
-+9200836eee15edd57c26e2a2d4202e9397870c4f v7.4.1739
-+5deb9e8f429258ec7d29599772c7fd3e46370cd2 v7.4.1740
-+6393ac6d70602f00fb6f3b835e3f56f20b13bc2a v7.4.1741
-+460c8cc144f084266f83caf79eeb12b08bfebcc9 v7.4.1742
-+caffda31048cfc28bc0cb8a1a2847f87436cb354 v7.4.1743
-+8cbf472483fa4ede04c6b8980be6693c69a6f0b8 v7.4.1744
-+d07e51166f0865aa1334d0f3c744fb5ba9414888 v7.4.1745
-+240ad5a78199f2b6d4d81dd00b9e5198b2562788 v7.4.1746
-+c3e7cc135754186303f819ca92816202eadb9191 v7.4.1747
-+face93b02af48d6f2c07eff114484f2fe436e9a5 v7.4.1748
-+fc69eed19ba746039196b1d80945aa6ea6a5f2d8 v7.4.1749
-+e6916e1683bbf42b81b0c65506d5943076de7faf v7.4.1750
-+a2aca019ba482b82c49f07b4a16b27a497feb4a5 v7.4.1751
-+25c2031e9f9fc4201f3d4f3b0cb47980fd36633a v7.4.1752
-+219d80fee92fffdba36c51bca007377187b4b1b9 v7.4.1753
-+da4f6e23837413b80b204dd2100503b5aea65a59 v7.4.1754
-+36cb3aff8c1c28ae6f02c27372fa8fb49ebca40e v7.4.1755
-+0e7b1897ceb36fd1e8df2964c971d261a5d2fac7 v7.4.1756
-+47036dcd83a43841b03b2b0ca4a3401364ed3c91 v7.4.1757
-+a3060addc3282139c81a3043bf9dcb9ec3d3d173 v7.4.1758
-+c07caeb90a3520b3b37618186a8c61a4b6827034 v7.4.1759
-+c44ab784f5e59556041bfde7d6ccb9bfec99f4e9 v7.4.1760
-+9b04f9e8d1d4f9943fce6a7896e528a0cbef8e59 v7.4.1761
-+ab4fe611d205a11c6a204cfcba225e56ae53dabb v7.4.1762
-+d9e671c5afe6f0334b0174fb51c3dcd2dc6acfb5 v7.4.1763
-+12392eb2923a53e7eef3b423809696f6bdcff319 v7.4.1765
-+ea3eb5a815b5729354a441e30b136f98b74af739 v7.4.1766
-+53e53aeb35ad256f1b3308da6fa3ed999f32ec5a v7.4.1767
-+90f7dc794aa0c6ec03e6876e13079a171dc95e4f v7.4.1768
-+df5f9284fcbaca576884db4345a3af606c96ba05 v7.4.1769
-+c83e2c1e7f2babe732361d1b494a9e648ec83597 v7.4.1770
-+138824071d4f2f4fd362f50e55adf34f9f060589 v7.4.1771
-+887bded0d8eae3e28fa01041c4c861321191cc7f v7.4.1772
-+9c097bfad6373441da8576bded0cb94273cf5f75 v7.4.1773
-+b3da1ec8d1562a680722dd118c031764c2d8a508 v7.4.1774
-+a1dac213df8b0db146ec113958ad403526514417 v7.4.1775
-+3b51b0aeb9a37160639fea313b7346b8db752fe5 v7.4.1776
-+5cbd81536f27583fd810c5f0916caf5677294a7e v7.4.1777
-+42eb58c9da929d27fe9e74f2026e775579c22ea9 v7.4.1778
-+42beb54724faeece49399d13a05fb8b7d11091ec v7.4.1779
-+e600e696c0a19ff5cdc2b465dfd7510caf0b0f19 v7.4.1780
-+42e85487c0f9a26290ec0b97db518442df51a9b6 v7.4.1781
-+2085167ab1b055c0f769fcd40616ea8c776882d3 v7.4.1782
-+3cf6704d6efc8d1c2b3b6a1e145037fefa0f1f4f v7.4.1783
-+90fd01ade690bf60cb9b645591baacb898ae78d5 v7.4.1784
-+f414db42d1679a3ae43524d2576e52566e894626 v7.4.1785
-+57b791947796cfb827365fad48a243c101ffde99 v7.4.1786
-+072556995a8e77affd9086b242ceea22db113656 v7.4.1787
-+c473a9393dc510508c51445fa11c5c3cb4ce5473 v7.4.1788
-+d5c6f1c5cd288f70ebcce54ece64203453f43a84 v7.4.1789
-+149d976650a1f105c0660e53bd6d39b013072f9a v7.4.1790
-+72a597e9e36d64bfc9f8e5a0b1783fbd1f233f7d v7.4.1791
-+22c29a515b53286129093a4fdfea2333d65b2bb5 v7.4.1792
-+42b228c8701be9724f21d235c29c25d300c2554b v7.4.1793
-+7b1200ea03a1df7b544eba81c22e5e2105915e7d v7.4.1794
-+2e3c6071db9700b6aec2eff8efe66d5866ef769a v7.4.1795
-+bb6ca6366085e818ad9eba4a39a3ad25a6dfe7ac v7.4.1796
-+8263edf411a7c949433caabff97ff39b5c3881c9 v7.4.1797
-+0bc1d66dfa2f438e3458a171b4dd8f0197c22bec v7.4.1798
-+773d627cac0b75c8f6763e88e305c3e790eb7088 v7.4.1799
-+f06767547415c16a3a31260d1d9c589954141f22 v7.4.1800
-+8208f5f58505951dbdead6fdd233dff75808c44b v7.4.1801
-+0536d1469b67b689cfe7e84745d4a556df0d19de v7.4.1802
-+08854bb267b2b6e0732fb6f24cb0a2763480f477 v7.4.1803
-+d07035f84f0dd99bcbd5f31acf727b1a40079674 v7.4.1804
-+0764ed56b18c5db583e4cc42f67716c9941fec34 v7.4.1805
-+21bd2230c5cd09ba694072713ec78166d75c1b37 v7.4.1806
-+5abf6f38cbbb9881b5f2cafb261f7dfb7c231132 v7.4.1807
-+057fb9d0191b7009a5754db4913b9aa365ab2f1b v7.4.1808
-+5bb5569bec6056b5a7d83e061d8af1f28ef95faa v7.4.1809
-+31bba6f25d8438100cc52ba4e7b11ff7e73e5766 v7.4.1810
-+3a6b66c02d6de68747c7679c861eb1920a2e0af5 v7.4.1811
-+f129fd3ebd98a1374bf19daf4284a6d47ceb54a7 v7.4.1812
-+19d2dfb3f5e2e0863e3613c13ec236715d8dda56 v7.4.1813
-+87c2e43a4a125d3e693e6e79ae55d164b3bdeb3d v7.4.1814
-+616793d0412bd732c61cfd8ab23b743c0fcdc5c9 v7.4.1815
-+0aa90b84118c4873f7e0563def7fa0418a5019c0 v7.4.1816
-+a86103d4b356cb298869899ee322524652329d1a v7.4.1817
-+c7bdd383275d96c6d656935d6e91c3c4ab57ca9c v7.4.1818
-+0a3bc9fdea20305521d01814689b5a37d8de6bd6 v7.4.1819
-+0bb25b026fc9195be052a4ca707035f7ef38381a v7.4.1820
-+f60bdac6cc2cb697323d3f6f3390e8eb085c6d34 v7.4.1821
-+3aab62b76363120abc2eb2b8d8d3318d8d9c035c v7.4.1822
-+a2441f2ff85d7191e6719283cd10a6d9289beabb v7.4.1823
-+2cd83c854073f005e09cb8e71689bf29997b3941 v7.4.1824
-+b2b915c1d311f2929332817e224fc2659d703aee v7.4.1825
-+69bb7b2300944455522db68b6a60e0f493a39942 v7.4.1826
-+d362e6df1debf33db37afce3395a3458859f8bd5 v7.4.1827
-+d4606ae170aa7f628b5a168f0dd1e51f76ca31be v7.4.1828
-+6bc0a492e8bafd1f09d52c8c387e0bcef726e5c0 v7.4.1829
-+294cfd18e9c7cfadf3d31c59428d21652c83b620 v7.4.1830
-+ad9322b525e12f9dc05404aa67ab21e689f30c2b v7.4.1831
-+634a8299bd2ce9c8df3bbef90ca6f84bbb933d55 v7.4.1832
-+0d52ddff8db435d1433e25e333bf8181c6805468 v7.4.1833
-+ddccff0480d247ed426130d8db017499da2b044a v7.4.1834
-+0e90f3e13d8807959b270be8171af26bbaa1e8a7 v7.4.1835
-+2242a576641781e0fdbeb88b98ea442ccf45867d v7.4.1836
-+97a9538c37ff26267ed7da2d06329274b010b788 v7.4.1837
-+d319453f62b35a9ffc4144a2ed92c90dca6c781c v7.4.1838
-+6d3888e2232c4c40bb4d79f886d3cca39107596b v7.4.1839
-+932f94b2d8c2f1194685f664a635375bf6ad395b v7.4.1840
-+f221aec7fccad5bf2c8563799734db50b3d74c95 v7.4.1841
-+0cc48b3cd8846d922e871ab59a38672519fa9356 v7.4.1842
-+39cc63e8df7cc2be053f0bae4e834d6590305afd v7.4.1843
-+7350959e53c37e9acfdd5f94334e045b9a958152 v7.4.1844
-+b430d4f2aa79cd6635065bba3997a6fa253ab345 v7.4.1845
-+bcc132f801094d4e0b9ef5d9d4207f8a566c0b6a v7.4.1846
-+1b41750311b644c28cbbd2345d42739ff59f5ef4 v7.4.1847
-+95fd0de7a8f16ddd27995c4212915fb765bc74c8 v7.4.1848
-+3507fde33e6e661060bb877c6c4ba7f8b8f32606 v7.4.1849
-+dec3b7b977c04b66365fc56a2b0a2514c099c375 v7.4.1850
-+35422e34815f762d657d853e061ea45d02ff4093 v7.4.1851
-+8b2d6447fb6a8468e3d45179be64a80f094a5bb8 v7.4.1852
-+ddca37101ffb1253a061243ee1ce12c9272a6773 v7.4.1853
-+d6662acfc3decb153887340e12a02737bb8365eb v7.4.1854
-+b9c1a397a8a662e9943c99edd4defa3e741b0035 v7.4.1855
-+3583c3433870e0c7e5814532c21de4c21e6a6ce6 v7.4.1856
-+053bc64433ece5c387b52e9b18560412a5cbdcbb v7.4.1857
-+18bbf31015c28d775607added90019e5df8ed594 v7.4.1858
-+d0f69d0bea7a1143ea293dd6c9801d0984e69ce6 v7.4.1859
-+c2fe86f2bda155996f570d56b632f73a9d4ab00f v7.4.1860
-+e4d7e6d1a0f1d6cd97804174b3ddf9af488101c1 v7.4.1861
-+e316b83892c10d451ab64497b05f7db35983e26e v7.4.1862
-+6b003ff07234bb5fade5274b406e0d91e7a77857 v7.4.1863
-+56c93626f6f381386380942e0d5245aac621652d v7.4.1864
-+731ee601de16dd77d4b827610603914e5f617517 v7.4.1865
-+062eb6d28b0c9b7de501f4d7eaf5ba32d470b850 v7.4.1866
-+9bbe6ec0e6dc054acce0d175cf62858f47ba3fe7 v7.4.1867
-+0ea97a753a2d6b5dde9e94275ff88c988fea9a90 v7.4.1868
-+20e7b99c33d4355a5d004873b3a243cb5242de1e v7.4.1869
-+b64c314a49905769805dbe4ca944477f994f515a v7.4.1870
-+d415c079f84ebce9c674f800933a20db68bc141f v7.4.1871
-+ee0564e3257d9aa9cd8fac1ecff7648627991039 v7.4.1872
-+5e18efdad32291fdb384ecfa1e56a4f2b458c034 v7.4.1873
-+07bc9dc5b3c9c77cd6e9493dce1ad09dc0252b09 v7.4.1874
-+988c8ab557bf18b8cb55daa72aa26449a0a91438 v7.4.1875
-+70d3337ff173eb43774c667145346f86965c1d3d v7.4.1876
-+fb1a19011fbe482188cdda34f072662bf245e2c8 v7.4.1877
-+4b55d8e162d407c6bee58ab519232bff95c0026e v7.4.1878
-+ce045e4d3244f52cd323c71192a06b56959a0166 v7.4.1879
-+0378a3bdf0fee8ddd4f30d7575c44e38a14881e6 v7.4.1880
-+543f068f37060de8018ea385312b489342918c18 v7.4.1881
-+847a709d04c1e065d52ef631963e477bf9573229 v7.4.1882
-+665d10cb3e6b9a1cfb3e8082a6df182adcd3147e v7.4.1883
-+692e156c7023e8e5db8a2c0a5a7f52faf93e25ee v7.4.1884
-+c096095ad9fbf312ccd75b56c96396c752f99d89 v7.4.1885
-+c19eb05b19df0136c70b0f9de119e6bb11c01c0f v7.4.1886
-+61e669c5da6f42cb0e1742a571e4deb3c17df569 v7.4.1887
-+f8f41f4e0acd91491dc9250b6cb1cf806aa0a7ce v7.4.1888
-+d2b9e454c73d9b5f7bf8a027e93952a2e7e6df7c v7.4.1889
-+bb86514cad1515d0d84fe6836b2ad5b7157b0f73 v7.4.1890
-+d2d44592467d319038ebc07fe05b086b1f3bd7db v7.4.1891
-+9495e43a800dfbe665ee7d68a93294deb758877a v7.4.1892
-+7363f5cc4cb8cab8d060a2662282c39cfbf2f850 v7.4.1893
-+17fa362f10beb2c6c8d81edf7237bf7122348e16 v7.4.1894
-+6c4d610fce0abf5b653ec4f3e3c45cf08812c486 v7.4.1895
-+b0b2bd8e52175e52bed50d81cbcb6360df1de7e7 v7.4.1896
-+ea504064c996ac35f614e52570883c118a13bcfd v7.4.1897
-+f7fb117883ba6fa58c6db7395b88b87e191afd68 v7.4.1898
-+a64e2a624fbe42e744cf40e5dedcfa323592b6e6 v7.4.1899
-+6e80397a592ca3343df8231dbf82e224ac9631fd v7.4.1900
-+9940e9b2a725fa31e6a2cac8f478be55d95232ba v7.4.1901
-+7d13d180a6aec3b139f0a6873d1c51c981c82d1e v7.4.1902
-+636cfa97200eb09f1a8cf489c2f0596b1f65deb7 v7.4.1903
-+f7e95dc00e5ab7949c0176404bce2a51b010d21a v7.4.1904
-+931bbf7b6ee3e31a1ac7b7e739461e1abb940b59 v7.4.1905
-+6ee88fa405b323377fe8615237d5bf74a8dfcc36 v7.4.1906
-+9c751c33dc0f0f669a63e0348d3bd903f8cca281 v7.4.1907
-+d82724272c614efd9fb1f043ef5315d77534ac82 v7.4.1908
-+c25898cc99c1cbf4210a67552ad9a4c37115e1c3 v7.4.1909
-+05e7d084c6c29b35ca3bfa563c6f49567c0d81a4 v7.4.1910
-+26c7bf23ec1d055c192113271b6a396437c49ee2 v7.4.1911
-+7e403edce82f249492c44190684f5f67f8c2176a v7.4.1912
-+ac8180818504276f973ffe76acd0331290e04f2b v7.4.1913
-+c9f2b70feac00908aba100d6282f4615d6b7a00d v7.4.1914
-+b0be59a89bdebea58993b0b0a934abc32b046620 v7.4.1915
-+78fc4c84476eabd102ab4e4b3a612d104575c48e v7.4.1916
-+a00e32b5bb39de0d7ec63769a2b5acc73b8e9d13 v7.4.1917
-+79cb08f0d81224fc13f9e96a48452ac4dabd5332 v7.4.1918
-+f5d9eb512f8b3dcc0b238f0e469b98a37dfefb51 v7.4.1919
-+083113d751fff7cb00e98dadd306247b830aab52 v7.4.1920
-+fd81f36cd5b61c657a04df2d8a3324631b9c1d9b v7.4.1921
-+97b0b568f8203804ed36f7086631a49a4215fe9d v7.4.1922
-+f92cfcd7fda26c0cc09138a7fe04f1a8c693f41b v7.4.1923
-+9f97a6290c634a25c05af8b51a186e408d3dd15b v7.4.1924
-+78712a2f687acf9a46d2dce2c796d6999ee8cc8f v7.4.1925
-+af25a1a875db89d800f4c226bcfe9e1a4f7bf5b3 v7.4.1926
-+29de7dda7a6afd1811b61282eb41317d33c60747 v7.4.1927
-+bff3cd5cf9226cd403872011d5e632d5edcf4b17 v7.4.1928
-+946b62bbd871750ef4e75b98bdbc5d09b1c3222d v7.4.1929
-+0a5adc97fac8206cb1bbce1030e0427d4f58c5f0 v7.4.1930
-+9c663cda189f1837e266c3ebc874dceeeebd38de v7.4.1931
-+8000f0a44744fbfe14ab58c7d0e8fed031cfd7cd v7.4.1932
-+c3805fb080a606ad4c87fb7e26d4ec6156794c9f v7.4.1933
-+1cc29584ef6dbccef8e385d043947756a2e2abea v7.4.1934
-+4981cd0802c75a6c4e72d09172d3d0d4b31199d8 v7.4.1935
-+eb52a2670c96aec8c8ee72d21e420a465138144f v7.4.1936
-+178252c6850ed6b8194e7d46da8ff11540c181c2 v7.4.1937
-+7a6f64de57d5663308f81b07d73de5155b7dfa80 v7.4.1938
-+c0760b25f31d5ae75ab1bd1aced66c7d81ff0ed8 v7.4.1939
-+1b4946fa3777e7da5fdb13ffb4b2b38a96d720f9 v7.4.1940
-+fa3f711851446b4fcccc86a96679f399c90b4fd6 v7.4.1941
-+b6472fd9f5ba5e73fbf81a7d79b18a0ad00d2cd6 v7.4.1942
-+f2e534fdbe65921512b497788e1a9d49199e7668 v7.4.1943
-+11a83cdeedf9675fcaf2015c38db18f3e7dc6dd7 v7.4.1944
-+cd9c4bbe1d033c4f001a17d7f9f374776f3a4fcc v7.4.1945
-+0c16a15107066a51e3b1d5139e0005d3f7bf3229 v7.4.1946
-+8cb76e38c346ee9f97455450a8f013d7255e1f13 v7.4.1947
-+a9b8f5613601559a475ab1ec26ee7a055b09e45e v7.4.1948
-+674f9e3ccd1a93bcd6e6c141772024086b80b5a2 v7.4.1949
-+52bda0e40ea294dcb6c9e5e3e83f7b2a8232d8e6 v7.4.1950
-+f23feeba754945cc158fbcc896244a9f89aba309 v7.4.1951
-+387cd517939fc5d5eea513012a4f73c42ff646a1 v7.4.1952
-+8ce61744ed943090e564536ff029b80d52f82160 v7.4.1953
-+96a248eddf5fac521f8d0a0a9382440bfc88c087 v7.4.1954
-+25c562442f8cb24a2f5fea54dff257667c4ba924 v7.4.1955
-+b24900b73f902263da0739705957890e232b4347 v7.4.1956
-+82cb3ed4781b34ac73f5a788529180d14fe05374 v7.4.1957
-+32e1dfae5664c4af976ea8e7e3712808fb5966f4 v7.4.1958
-+40c8a8b012b56aa2102ec49c7b4a8842f6819a21 v7.4.1959
-+f9524b76509597aa7bca7012b75f8370b2acaeda v7.4.1960
-+35b173e37dc68b072abdaef9f3435428d0251414 v7.4.1961
-+f089eb0a5fa4501611785602d1e8554b71792bf9 v7.4.1962
-+f9dda6450c760c0f7c129444b1f4cbefb5ce062f v7.4.1963
-+3830a92c12bf401c3503dc46b8e4ce6644962ff5 v7.4.1964
-+2465b6cda394f17c43ad5e5f26e204ae49f89fb0 v7.4.1965
-+ce5b79b005ecb9f67fb1864d40756ae97be31c41 v7.4.1966
-+3666915cac0baa2af2497f386bdf25718c03fd1e v7.4.1967
-+b88c573d8aa4089afdc3fdff8c5f2b99d599ad7a v7.4.1968
-+1f9172cbfef1ecf06a2e93e38a067ee0dd7ab6f1 v7.4.1969
-+5ec4fbfe38c55282a36ebf9dc10f64ccaaef2d51 v7.4.1970
-+b398e4e127516a6949afa39751c4749c878c99df v7.4.1971
-+c665cc3292e0c70060f37a8d6e135ef2199a6c80 v7.4.1972
-+2547ef4191230687afe88a31c6f1687bf535bd2e v7.4.1973
-+60db35a2082359b9b4a2d19585b25780382921e0 v7.4.1974
-+f094d40850141407c7d5487b5224026bf80043f9 v7.4.1975
-+32e34e574716979ae1ea9fa624f69d590d428a7d v7.4.1976
-+4c40631238e4ced220709515023db1ba74d7a5e9 v7.4.1977
-+c4aae9421aecc06c8cc51edfc26ef083a84e690b v7.4.1978
-+beab399e38838fc8f5feb8cbc82641bf9a8190bb v7.4.1979
-+e08e8b00fe481a306b6c8a3f12b34c7a8fb3f335 v7.4.1980
-+43b8570abbec749f2609b30e8867e4aa4e99be85 v7.4.1981
-+160cb082819e3ee4494d219dc7e903bb7e657357 v7.4.1982
-+9b048dced116e583e4a877dc53bf56976c896652 v7.4.1983
-+2ce9814053d8435fdbfc157b80ffd155482f772a v7.4.1984
-+6814811b90d517ec7388cb64c05469c9e71d5eb5 v7.4.1985
-+5a095f9e77edf7f1b5d970252732c9da63feba83 v7.4.1986
-+80333fcbaddfd5102de0ff81ea1f0c58b5a2b18e v7.4.1987
-+1003973c99df1b5bd2da39a73ab644b8a632ad7c v7.4.1988
-+cbf052ccb120566b865c7b4dd757559a547d0799 v7.4.1989
-+6d213bd46cc32447a7e34ed266c2765911a76df2 v7.4.1990
-+9f78f3f0c81f8d4d33020ce615f4918dde8e3132 v7.4.1991
-+f93704b11e434429448a986472e61a67f1dd9502 v7.4.1992
-+fd4e6d944f4a392622cd0cc4d91a3f4a58a003be v7.4.1993
-+d606560082e6195eafcd23f84a89f565dd76dabe v7.4.1994
-+0c7f47088e5565c2ebd8853ee12759220bad3ce3 v7.4.1995
-+e70fd2eb3ae1bb4df12892e6643d847babf94263 v7.4.1996
-+abb72f0b9e06f9796d5d44799f758b3c22ecf9b2 v7.4.1997
-+8f904a323b3f58632b3c019804ccd89ad3d0a0d0 v7.4.1998
-+f048e5a27253b52bd3d1690eef66a643ca8ce474 v7.4.1999
-+7897b1e4f3e71eaf1cc051826dce9eb51dc5d1ab v7.4.2000
-+73c0d07cc15eaa6082c44b97de58d225ef305317 v7.4.2001
-+4fe3772969cf9da3e856b02444d6b82ca712e205 v7.4.2002
-+e08c8502d7ce1ed33d31503d1a4c7179d21529c6 v7.4.2003
-+aaa6639b6f147786cb4b09c289c23898b568bd6d v7.4.2004
-+1227e52979f8fc7f634f43cd14bf686f4d0ee5c7 v7.4.2005
-+073aebdba121968dd2c8bc83d150326b0f9f4d37 v7.4.2006
-+6d5c24b8dc0e1c21c649dd00006ef817cce4feef v7.4.2007
-+9da0cb39cbee6f33d9f8442edf02e64f11a03678 v7.4.2008
-+60efea914fefbf7eac77d170442597bac8bad1ef v7.4.2009
-+374afcf9d11dd0dfe9b4905c7a9213acfb1e2139 v7.4.2010
-+cdffa812f9d1cfea65d8f7d94e8f3627870dff84 v7.4.2011
-+7384c0cfad1375ddf18a8af38160f899574055a5 v7.4.2012
-+203792348947f220da02c98da0fbdb607b9db4bc v7.4.2013
-+5fb484647e12293919079c8a9945b03fdd6ed9be v7.4.2014
-+38e2fc4ee4ef0eac43b0f075a0217616f437df17 v7.4.2015
-+2f2b96276941b63f4d611688b6d851d995492d6d v7.4.2016
-+bdac1019552f19c1c16f7ae6dc40c17602a58b1a v7.4.2017
-+4d8f7f8da90c7cbc72a302908f9f92b5e62253d1 v7.4.2018
-+045543df0c28d988933bb38ef4e3e390e447ea7d v7.4.2019
-+6149d1374ea092c7a75280810caac6aea9c0a1c4 v7.4.2020
-+7520696c14b0e1ced6f0dbc25f5e4a6ba7ffd183 v7.4.2021
-+d735119cc327b312ef414b3b2a5332279b2bbf36 v7.4.2022
-+c16e207dc465674bb6eccc8360caeab34137072a v7.4.2023
-+69ed2c9d34a69da40754a2b81c03200d6eb71e89 v7.4.2024
-+c5f40fc2e3e0ea5460e4e6cebc947737fa5e05da v7.4.2025
-+404de131cff93cae5027394787252edbbaadd7e8 v7.4.2026
-+9225961006a4124f58673b7fce978bbd947ab338 v7.4.2027
-+c086632cca2e534268592cc1c8bf009138c44340 v7.4.2028
-+d18d71ae21e504910546bddac9532826bcb3309c v7.4.2029
-+69102e8433700f4642ea34cb9551fe7748b7506f v7.4.2030
-+f0201deac2a24f32a3d4a2e022fb8db7c486c2d2 v7.4.2031
-+cb1b6a72d837f9a2ef213f44cfea88b08f3aa7be v7.4.2032
-+da98db362fef0b28278e6954003e0e48bdca7db3 v7.4.2033
-+5376c8008b3a79ecb446e3d7923a03333decab6c v7.4.2034
-+e61974ab3ed0c65e60b0554b5c84dc3a4b66b1a0 v7.4.2035
-+c2e904cc064f7025feb2854d80cefe9fb2d01379 v7.4.2036
-+b2459bef0c7e013daff063e6ba0b086efa1c6983 v7.4.2037
-+bb538c090668fa12f46fedfecb73025f702d8259 v7.4.2038
-+9f8f03a44886b5ae8b7bf83b7abfb14126bb0905 v7.4.2039
-+2faeec4787be09eb3aaf952323392a54beb0d720 v7.4.2040
-+820c8861d15ce913b68bc60df33551202bb0e88c v7.4.2041
-+9d1abad90d6ca6a77fd12f8395742afda1112b61 v7.4.2042
-+858bd3176f30261fd0f702ab3537d36cbc03ae3c v7.4.2043
-+e8b3db8e2d30037fd8b0c662f6f2b44cbf22bfdc v7.4.2044
-+581d5131629f3acbf9aec2c4dcb56aa7949e34b5 v7.4.2045
-+50697f3b49d62b3907ccdf5b30a1f6df9e829e8a v7.4.2046
-+340106787852f305c5730bb9fe462b3f86d4161a v7.4.2047
-+b2aada04d84eb5b933cd2156ea7f4d4b14c37662 v7.4.2048
-+26da1efa9e462dd52ea63f8f3f2acb356a6c7192 v7.4.2049
-+64a791c53418d5404ba6ebea77f5077378be26fb v7.4.2050
-+00ee8d8c2e0cd4446294c06b8a5608face5d4617 v7.4.2051
-+8e797fc5ab0c320c017c1348ad26f22078f602d1 v7.4.2052
-+271f3ae34835f9ac63e5cd20bce0fc6883b08113 v7.4.2053
-+49512aba8e321b367a3fa9af70e0619622214ed6 v7.4.2054
-+afaff1d283d3d2103fd2ecee807a872489474079 v7.4.2055
-+b591a350f190312f78944b5ff8a6251f6eadb923 v7.4.2056
-+1e68dfd7931b08c0c9e2311e35a3999243966d1c v7.4.2057
-+86af4a48c00a6a0f7942faa6eb1ba7cf9f961c00 v7.4.2058
-+b6a459b326f35fdf7332171cdbe72a4f69b582cb v7.4.2059
-+9ea5a5f6cba2958c0b1c2ae30e957c71d28d7f51 v7.4.2060
-+ccbd2e604e590127e30d809e98d71bccdb37596c v7.4.2061
-+5eaa708ab50dd17b685a25ec11f5975815a795ee v7.4.2063
-+9946c4c335986fbc28bd6e88f7e5a1550fe2560a v7.4.2064
-+7ee1c83e3ddfb32ac2f09225161c4ce5a1459462 v7.4.2065
-+e3b6a4a876841c38c191635cb75d86391b228da8 v7.4.2066
-+2fb7e008ac9b4bff46a8281d52271406cc94bb59 v7.4.2067
-+716382aaa0c0e40dcd9196839b698370296a3e53 v7.4.2068
-+b0c7061d64395976648e876722f357c399a7eeb8 v7.4.2069
-+1fdd97be3967a80bbcfd67f60c33fe50a060a72a v7.4.2070
-+05a56bbe34a160197ac9c5f0e1f8de77fc5b7a04 v7.4.2071
-+bf204ab1ce7df91f3d3f1fe306f5f9d62195fdfc v7.4.2072
-+201773c00b96f4320f6071f41e1abd5b44da1b91 v7.4.2073
-+8dced5ab461522ffbfd070a2fa1be8da7d4593de v7.4.2074
-+0190d5de215f6beffcfe2c4afb68ec3750212ee7 v7.4.2075
-+3ca0fd9709b197c4ee254f45f8604a518dde54da v7.4.2076
-+42a8a81decdfc7f4b5d67525ac39a06f74e2e30a v7.4.2077
-+9cc49b86f613f38fa99d2922bc431c57833e26de v7.4.2078
-+20e7be5d99ac2299ab98660f8bf6d710da2087ac v7.4.2079
-+846d4bad2df7c38edcd0663ef2ec87ec1dfcc3fb v7.4.2080
-+695186e11daa8bfb3738dd04136e01d5b815ef36 v7.4.2062
-+fa64afb99ddabf4866c11a7e294b6bea62f7125d v7.4.2081
-+8f1de7b711998c3d1b2122e55c59f19ebd742d72 v7.4.2082
-+0e7912e7064b3d408e0f470bea20e45c957bf03b v7.4.2083
-+d9d3ef70c8593627102ef39053796f0b63a65347 v7.4.2084
-+6144d9bfb0377d9c43aa6c12407b9cb1df580eb8 v7.4.2085
-+81ba6e4eb72bd57680a5bb1db11657f260e1af01 v7.4.2086
-+3539c9e51785997039d3cda023d710d3aba6ea24 v7.4.2087
-+b95d0a6a64ffa18088d5e9987e1452ccd0e250e1 v7.4.2088
-+d63b85fe3dc735453921d4b95e718d95318435b0 v7.4.2089
-+172131507c85eeea4b74eded1d42cda1733706ed v7.4.2090
-+fefd0551aa9df391596bd60efac4e965c8984fa0 v7.4.2091
-+0c098fb3994ca04fdf4176d21697a023e2aeb097 v7.4.2092
-+3e0ab13ddd1249e4ff88bbe90d84fb74c30bee95 v7.4.2093
-+86d470495333499056466747a001570717072cf5 v7.4.2094
-+ccbb8e393d807b10240f84a667c755efa762a36b v7.4.2095
-+af0d98d8836e3c826a8744326416aa9f7545d9bb v7.4.2096
-+bc0a6d9a9a07801741a2d013ce2cd63340ec9d2f v7.4.2097
-+8cc4dfadfd483e6faca51fdc94c62c36787811ee v7.4.2098
-+123d3c102035520ac79bc04dabf3e4e196464b01 v7.4.2099
-+847518911c0b6b19ab80e11060d1cc63bcba3437 v7.4.2100
-+fd9727ae3c49154c8fd6ecd96e58c67e1eeb7fdd v7.4.2101
-+fe665dae719729d4e2c67b41db29434b23149855 v7.4.2102
-+01c9630e80e0fd54377f265a65295bd8a42b4d55 v7.4.2103
-+f1920505bc16504f1302c2c66fdf328117c48437 v7.4.2104
-+d9e46b847c8b8f241979520ee17e598f586c85fe v7.4.2105
-+08df6ad72c56aa0403bd8a594928fc98a8dbd831 v7.4.2106
-+c7147f0fd29ad9174d5c53da5b2042a4a4371732 v7.4.2107
-+27d3250c6dd4197aac0533e479f7133e864aa1a6 v7.4.2108
-+b193bdb6ea25fe415afd53b1963d2115d20208d5 v7.4.2109
-+c27052511998467db88f4f5c871a96ac95e0bd63 v7.4.2110
-+284b4eb307fc0c62e3f35557395d2fbbb615e85b v7.4.2111
-+6255ff1ea0033e9f26f26e6f8dc1f4fd829abd11 v7.4.2112
-+adc7212951ee89f7f6fa2e1febe357114afd6c37 v7.4.2113
-+88e8bca71d75cc0ae066e2b8b6afb21d457cafca v7.4.2114
-+8c9e13109df85b4033c4f02bd5fc362a475b5034 v7.4.2115
-+1b8932823a021d8cb2356090185227898340ac70 v7.4.2116
-+a98607bb756cd12b5f15b8a539e5ffb69bd1e7de v7.4.2117
-+44151446672647d93d3c3773c3642382b1726bdc v7.4.2118
-+8c2553beff0f783bd523754903bda32f7a71a2b5 v7.4.2119
-+2ea935bdd1a191aebc1492e8899f01b511333db9 v7.4.2120
-+4a7a88404076cd7e8ecc6b36839f2fb4a09b04c4 v7.4.2121
-+02bed64bbd79030b096e6118a9c2cfcbe3dbb77a v7.4.2122
-+5e9f63a2ac5cc3007a927c90b3809ec6618f7318 v7.4.2123
-+103e79a0ad8debb89abadc7bab6859467fe1f419 v7.4.2124
-+a1b1405a33ca6965628e5e0d0f3e66562412d767 v7.4.2125
-+172855211978175ac8f21ac285cbb456d535bf1e v7.4.2126
-+1f33aece8e55577d024b763e68c315274c8c965b v7.4.2127
-+8c0871098dc9d0969287b4fa68c6236fb9591bd0 v7.4.2128
-+be4aaef2651cced0365a3b9405ad32697eadec5e v7.4.2129
-+cce76af1cc6a178010301171fcb32aa3d622a98c v7.4.2130
-+b74515b8f3d4c89f2b2fadd5592ba8fd842e2f9a v7.4.2131
-+058e5ea0400e480393247498e1b45d3d7d69aa5d v7.4.2132
-+dc2237f19ce22bf6aa03ad9ffae27960408fb212 v7.4.2133
-+6226de5f81379403adc6ada5a85ace71a003a6f0 v7.4.2134
-+219dbe63ad2ac8ad420d068b6886fe7680fc96ef v7.4.2135
-+79862f44c6471462c72de41fb12fd0b9e109c466 v7.4.2136
-+80ac9cf77c9b44e142452f05d6a1f6037f116366 v7.4.2137
-+4a4a71d67131d7395f02a2f0705887a293b55183 v7.4.2138
-+8436bb5134f51c5560c97e39a4796c372e215c60 v7.4.2139
-+02ba9b2f80e808ebf17cb191a7421a40f9f719a4 v7.4.2140
-+f85d94eee05b8ac60d594f24fd8c982baa40078c v7.4.2141
-+59565cdd726122f9c8479f4e9dea020c0295c3a3 v7.4.2142
-+8037eb704e936d54006e12e59b7ccac0c954bc4a v7.4.2143
-+6818e3c964733dd0b66380596e5f6b74a33727a6 v7.4.2144
-+4665d491a69e822bc9528a3ef8c02c92444a5e60 v7.4.2145
-+0b0b9864c811ac42308b466c76df4c13996e4341 v7.4.2146
-+6f538782225305daab0f5e0959993fbe8924e7c0 v7.4.2147
-+ab96eb561a7eb6c3329ff3801a2dc18564850d29 v7.4.2148
-+5440f3442841cd78e49158dabac299c431758fe6 v7.4.2149
-+0f4b76b2757a4c9a17b97810a7d42510beb91877 v7.4.2150
-+429be545637a9f8595698658205b55f3acc6d376 v7.4.2151
-+a990e7ed260b22fbf85a1c07c5b4ceaffd97267a v7.4.2152
-+00d753ea19a923ade64c5814e9c16f01656989b7 v7.4.2153
-+5534cfa2ec877d14864d3fad8003b12d67e07a0f v7.4.2154
-+96667173293ddd6f4c7ca9f78b7526ad8e733564 v7.4.2155
-+93dcc4329c749e5e5db58d476fbc2b86f8f302b0 v7.4.2156
-+e0b783389beabfd030aa87eb9f2e9ce69421abcb v7.4.2157
-+be9b5f8c3fd9857766e43e39c50666c4ee43229b v7.4.2158
-+b31da25b19c4b14f68b9a974a25f5b0ae437424f v7.4.2159
-+ba98d7ce0d748b91c8f9c4db892a8ecd3dd1d443 v7.4.2160
-+5602912113039d0f1a725bfac7bf856077469e02 v7.4.2161
-+5385e72e1ac22c25c859a56a11aa227972212852 v7.4.2162
-+2409d70388224977c1b6a6a88672fc7efb1850e8 v7.4.2163
-+4360b2b4612561a553c436edda7b0560ed7f4f87 v7.4.2164
-+103ad8a18ebcc66c5d5352e9048a9702b6979cbd v7.4.2165
-+d6a69f968249bf143674d80f1a823215d3695a95 v7.4.2166
-+60a06c3315242f9a3df77d4d13e57a3884b9e611 v7.4.2167
-+3089f1d99b9e3cf82f10409711fa2502bd9a36c7 v7.4.2168
-+3fdf6caf42f7e1e7a4334ccde187d2e4fa7fd43e v7.4.2169
-+34cc6a1013400b56919f1a2f9a3ad90b46222e48 v7.4.2170
-+711b42c1013b2c52b194527c1f92b98359345b6d v7.4.2171
-+fd32f719d34f9404173f20983bace1e219f2a629 v7.4.2172
-+1f1ed79598607a3bf650f68e37d0cf3062d21286 v7.4.2173
-+e34e4547f3d1af36261e2decf49563aa1c7b5a29 v7.4.2174
-+c470694733db8eb1ab98d8ca64a050930b7fc4ab v7.4.2175
-+4cb5ab124239f39a1289db550a257b231757b9e6 v7.4.2176
-+4ef933b816e784002633981a04473705edf5432f v7.4.2177
-+108b62925cb00bc7bbbaac61f51dc7f9b72bd550 v7.4.2178
-+0470742f7346cd6216275e16bf468dad22733f30 v7.4.2179
-+6a28d0c6f92929c21307a78adb2cd4219f4b5325 v7.4.2180
-+939a8f55aea050b3c25c68ba0024fe06c61f31c0 v7.4.2181
-+045937335095fd5fcc5ce7450b5f5adc554a818c v7.4.2182
-+74990ddf081305ad09dc6f5cef6a7d1197e4a2ea v7.4.2183
-+5c288e5e1493de5d0033193e729783ca64aa1984 v7.4.2184
-+6882920b42da211ca8f7c22ff36a3b36f1f6c756 v7.4.2185
-+a38dc0c523b8bd06f65f0a7a2302195cffabca42 v7.4.2186
-+0524e72c902352a91bfb7de6e27feb0bd9def16e v7.4.2187
-+f17ba1c9d209756780b95dcd2172681a4c9d291e v7.4.2188
-+e84e457866914d76e84a3096ff417d9d0ed33d23 v7.4.2189
-+6049c1f0139142a0d8abdc7f34ca88877f4f9017 v7.4.2190
-+568ea507b0cd0995840aa42c762f125812760223 v7.4.2191
-+80ace3687eec036cb191a58474ac2a72bd648b22 v7.4.2192
-+bc591685594a1576ba9dfbb6b6e0c1c6ec6da78c v7.4.2193
-+66f1cf5dd385ba5f47e58e92c49958d457948315 v7.4.2194
-+da7307987ed1d1edb11de12e19608822ae65b0f2 v7.4.2195
-+f8396c6e5709c3b18ba8d525d49eabd2c01476c7 v7.4.2196
-+9ce5941b77d306034b6202ca154d22eca36e3395 v7.4.2197
-+95ad2692dec053ebdf28e37c4d384a05961bb781 v7.4.2198
-+6642768336705a0972248efb4043fbb140e4b3cb v7.4.2199
-+67781bb0a61a55adea7ed2394daddbb2e838046e v7.4.2200
-+4eea48b76d03b5512a48ad4089c870dd102aa550 v7.4.2201
-+eed41404e383a13f1af716be901c4a3794fe6e7d v7.4.2202
-+12c5c26144328f58d92524e59bac1bd7dd2c3bbc v7.4.2203
-+3e96d9ed2ca1cd0fd79eb8da9e7b868f5319c63b v7.4.2204
-+74f67cb4f7e1ba548741eda7f68f97e73e28a5d1 v7.4.2205
-+cbe23f6769f9cf80b05657310fa64135c575db97 v7.4.2206
-+649a6a3fa71494fbd0fcafb86591f1f0c046c21d v7.4.2207
-+86f73f026a9acdddd32aa21ec15c6af7f197b61f v7.4.2208
-+989d44d35a6654ce72c604c236c12a8b0bab485c v7.4.2209
-+945b165fa8317e20d4ba915496f4abf2e031adb4 v7.4.2210
-+043b7a9579e601a8934dcb3e50d422a828911f6e v7.4.2211
-+42adbf172ecdb24b8fe3388039e7a0fba1ab4eb8 v7.4.2212
-+7da89d9c744be34573981fa86cd2cc9cd3ec07d4 v7.4.2213
-+5cd29e15f2f723e04e97bae9a121c9b5c7f4c86a v7.4.2214
-+4b53f6be10c00d670bb37a3ef8c4f22460b9de70 v7.4.2215
-+633a03b87eda01e71b4902b952dea72743f48e99 v7.4.2216
-+4e8b05fa12c664bd7e6cff2b64b7d6bf750ef390 v7.4.2217
-+de8de17a43d761cf8726b286464413773f8ce403 v7.4.2218
-+064effd222a3bbbb83450cb4b97fa92dafa23ea0 v7.4.2219
-+41c5d59e7e10cfc6592f6378e0d1d05f8032d2a9 v7.4.2220
-+b01afb4e8f66b9779a0dd7479aae46699f71a941 v7.4.2221
-+7b39615c0db1d0a0261acb55e5b98836319a8466 v7.4.2222
-+bff8a09016a59fb92e543653d8c1eb9c5f4f16a3 v7.4.2223
-+daecffbd0322a301f74a25a9f45ce875723bb278 v7.4.2224
-+5a667a3a3743c42a2ddebd094ee8cf26a3c486e5 v7.4.2225
-+24900147aa4475655cd6fa9b89138e9363f3a840 v7.4.2226
-+1ed0cab95f9a0b651de6a017b240c9a22f8b8b82 v7.4.2227
-+3ee84d270ea75d4ed3d8ab8ba035c3bab27c860c v7.4.2228
-+74e345d2878c8282eaa0134490cb2bde5230a394 v7.4.2229
-+bb00c661b3a4af133e91f65694a921abe6e116d0 v7.4.2230
-+4da1a38791009aabc577a156a1383a850186f5f7 v7.4.2231
-+8c0b13fe60dcf32938bba754d519c93d0ddb4fcc v7.4.2232
-+885e3c9c0e10feee2d5c6a820a2a162b6fab8314 v7.4.2233
-+adef2643c576265081bf26404664d07d31e64729 v7.4.2234
-+935e13935848e5ed2420392bc40d3e57b3413b0a v7.4.2235
-+3fba3e8326a7834d999ead1a6a531153c659221e v7.4.2236
-+e1a8b2601fe0f0971371bcae280920fbaae1d756 v7.4.2237
-+579abc260d85ecc491d0efe9be2c3563434972e6 v7.4.2238
-+05bfc3d37efb0930ae9060c5c0db548e7551ee54 v7.4.2239
-+7f38e72a9d6580ce89ae09aefd6711853711004b v7.4.2240
-+9772b04372f41f6f260402a2ed7a65205cf2fce5 v7.4.2241
-+88f9812ac47db6dd36bec4df33dd7190633f7f81 v7.4.2242
-+ccb6461b82dfc073562d4f63c4eb7a0b444b13b7 v7.4.2243
-+e975914c17e97a1559b037296c584f3cd6c7988c v7.4.2244
-+af161c1f530afcdfe850111b541c9e34c012e512 v7.4.2245
-+d63a89b526ea705d584670e2113cf55c916374aa v7.4.2246
-+80008b4e197ebdc4f39b0062fc5559895c514097 v7.4.2247
-+30be4b26a37ec042109c0e7b07b9d4b46df56070 v7.4.2248
-+d990a4394c9d1d0611d87aa42905bd8b8adf0a3f v7.4.2249
-+9560a2eb79687d8f1df7798344863654b3de312f v7.4.2250
-+f52b263fb3f035a4a6f5d9a09a01b6f1b8f496bb v7.4.2251
-+c0cd95d2e9f9a1be2ce687aeb1d32faa01b0fc17 v7.4.2252
-+b9fd9c50be2538fc34838abbab88468ca16eccfa v7.4.2253
-+f4e903ba38d862be393e515e1cc4b1440357800a v7.4.2254
-+580f57b075478027a41213ca8fddcec80f7474d5 v7.4.2255
-+b329e3ca0dcb6a95eae862acd419893059058b95 v7.4.2256
-+45098d7f72b6802624f4503f3535adf272c473f3 v7.4.2257
-+176e34b0d678373b59c61139ae53a78e7b4ff646 v7.4.2258
-+98b39d2eb895c42804ed6e52c05d5781f3292da9 v7.4.2259
-+01c3f981ce081366e6714797c32cdc9cf1ae6d62 v7.4.2260
-+e448370630b22f060fc30504b5951f8a75e2e78c v7.4.2261
-+baad324e9fbcedee64bdeff2b99e5dc0324a3855 v7.4.2262
-+b222552cf0c4f19839a6a07eaa697c5ac143ae18 v7.4.2263
-+e24aa20d815cc19c0cfa6a8678bb645d714e37b7 v7.4.2264
-+9c893592f9e6ba3f53720456bf5b66bd051bd100 v7.4.2265
-+9bef7b5d02cb2ea4a154c0f7d78005ee75af03e4 v7.4.2266
-+cafe247c949a2f4e4514d0b6c5729f4f117f4c0e v7.4.2267
-+6a1793d9c895c71ab19333c9963458433addf4c7 v7.4.2268
-+3e3b0ce24b6115f9a578cfc968b0f593bb6f62d3 v7.4.2269
-+ee8b8a670a5cdcc478456d6ce516ff92622f624a v7.4.2270
-+c2968473c8dc19597f5637ba79f67ac9b8959ae1 v7.4.2271
-+3063d1acd0c968248b0621f0552cc2043d86645e v7.4.2272
-+23328959987435e1fefc2648865eb15f438707b0 v7.4.2273
-+ff0b4216f02668d5d5b8606b8d2c0a041ece7ea3 v7.4.2274
-+4b4ba6589a98a92fe43c594445d9f183486ff100 v7.4.2275
-+a4d4ee212dab4b4feaf991318469aa0fbc4a5722 v7.4.2276
-+84a9ad350a053617c8f54f06fe1b85e19cb6e3dc v7.4.2277
-+306f72cd32c2db569bf63f5b3a6cc38f6e081590 v7.4.2278
-+942d40a92be67b0f40ace1b54c4652aedf70bb5c v7.4.2279
-+5ac2dd61ca8f5ac70d8b8f54856b3000d17e9363 v7.4.2280
-+f132b956e9b51e7aededfd7282ecb7a5441760ee v7.4.2281
-+782a8070c3a6dca950a8a1bfc3c59b69b2aac799 v7.4.2282
-+5fc4bec66c3348e882c52f64e6976a6c9f1e838c v7.4.2283
-+67d1f619bb26edc749f67033be0954e281aa54e3 v7.4.2284
-+068f397d0da401dfac57d8604867609c1f341c6f v7.4.2285
-+62b7fb15ff7ee13f61ad40e079897450c9b787c2 v7.4.2286
-+3b4b2ac811f0131ae90e3e85742db1a7a405ad61 v7.4.2287
-+f0b1cbf9467e7a3720a2181ad2e5bbc6f545ecf5 v7.4.2288
-+0b57c032e9b0595cf6dd0f6d0a0972242e4b5409 v7.4.2289
-+ab6320d743318c7a2cc1c4f4889f9054abe92697 v7.4.2290
-+7cf4e210cf3c105523b01feaf9245601ca4edc70 v7.4.2291
-+48f70e0c696a3747ea2d613c9625d867647e3857 v7.4.2292
-+4aead6a9b7a9bd009c5ee9ead6f7e7d4034de928 v7.4.2293
-+46e630ac4380cbb61b2a1877ca8e00aa5e44730c v7.4.2294
-+4a07f8de5efa62a3353333ff92ceba426681f68c v7.4.2295
-+efc8a434f38f4d38622f4341507615bdbe02c4ea v7.4.2296
-+c1ba49441c90391e0e31be747d74470a578cc121 v7.4.2297
-+d4b7232fc63a51b7cd8adea06cdff61cd3a18080 v7.4.2298
-+21f685af3fc115c1782b8df6db4dca9372b634e5 v7.4.2299
-+65e43481d7de95d4671b17e1faca79a8d6b60ede v7.4.2300
-+cf9e550f17f6993b4758c175289e7dab76e2de6b v7.4.2301
-+103d874ebb96a66779636bbdcf44bad73a0c25c4 v7.4.2302
-+793471c09a4b1ec7962004f926ca767f0e9564f3 v7.4.2303
-+dc1610dc910faaaf8755740904171ff1dad36537 v7.4.2304
-+c577c6a2e88b56598bfd2cff02391a5826907cab v7.4.2305
-+09c7df6f8dd3ee262db7bc68d3a8a53631a7ed0c v7.4.2306
-+c104f09ae2f49d688343b3e07c530f04cc137eb4 v7.4.2307
-+b249712263b80b77398f677bd823846765d2a715 v7.4.2308
-+bc30991c3e98a8b091013ea37c7f6a0399561374 v7.4.2309
-+32bd4001e398b7eb53f04ebd6578b3fe9fc03530 v7.4.2310
-+e836872c2a4cc9a87cff0ea1074a9aaeb707b68e v7.4.2311
-+7fc6103c66518dccc4414dc88d029983451cbc0c v7.4.2312
-+3e410e6e1986affa3e9509922c896c959cc033bc v7.4.2313
-+1de911ef1edf4dfc6e79d326ae97d76ae30a1912 v7.4.2314
-+5337340beea092f76b7bdd25e2e312252b9556ff v7.4.2315
-+68303019acc994c41e623b6be3235f7342f2be67 v7.4.2316
-+d7846e9fbf653eab1e4c425a901c1636363e7bcd v7.4.2317
-+61dc69646af69c6e3b045b20225d519b971b3b3e v7.4.2318
-+1eab38e5cfdf0944e2155154b9dfbfdb17a81ac0 v7.4.2319
-+72e4b7f904650787eb5fab4b3ee39de5ac2b3d8d v7.4.2320
-+26441931dad77a786a08e02320f83ac0509a3197 v7.4.2321
-+b80ad55d62d8bde8c16ec66789ddccbf39542097 v7.4.2322
-+b2dbe79639a2c8873037e676e74f3def9be88ccc v7.4.2323
-+58e6dd1d8be34e0e5ad19c9298abe9bdc405d646 v7.4.2324
-+7cb49e98d582834a0ced91d8a76371859b618098 v7.4.2325
-+cfb38b57d4077e8252d10948ee8b872dfbb18267 v7.4.2326
-+90b9898d05a6cc48f97d02a47e95dd45d84b35a7 v7.4.2327
-+aa2219afd1c25175f647cb9ee062ef94824811b7 v7.4.2328
-+a6068b90c873bc8b623b48aa6dd0fafde4b8175c v7.4.2329
-+5d77565e6222d795c34f9b78eaeb4a62f538c666 v7.4.2330
-+fb040c9d8ce9c0df6e011fca76a1a377e40ad956 v7.4.2331
-+3db463d4df255c365fb4241027932b7ff7412f7b v7.4.2332
-+f6942ed9e99811a5f70aa3237f00b24688b8ce65 v7.4.2333
-+a539e9e4e5349cb0fa43a39c79309e639901e0ed v7.4.2334
-+98ddc760e8d5a2a58ec433c865c9f6cf999a9df1 v7.4.2335
-+de20f2434807f4377616337c46bf15413883ef3f v7.4.2336
-+9a13895ee8d760f935c6bee3cb80091f771f38fd v7.4.2337
-+95e9be4bc490e822baeaab7a8a2dca87bbd24d74 v7.4.2338
-+13304dccb96ea2d2361ef53d622f1a4bed383e06 v7.4.2339
-+8bfcb960e6bda69c25666613859aa34558331f65 v7.4.2340
-+b67088aae933639e7d6c5d3c2fbf9272d438f994 v7.4.2341
-+a1c1607b1528c2064fc63518a88dbadb0c86f779 v7.4.2342
-+eb9a7296ae9fedc68cd8b6bfd030a81440d54bff v7.4.2343
-+65afd399ffa7a8c741ce328a659fc9e9b8737936 v7.4.2344
-+cd9823840f2eac5510359b8768a52430932166d6 v7.4.2345
-+0be17a56e65fc7ce2b101b109cccef5f3efbbf36 v7.4.2346
-+4647267906cccf3bafbbb7aaed814b2363f043ca v7.4.2347
-+f1ad88f3834ca51426fb3502a40a748b5175f301 v7.4.2348
-+dd0531938cb6b566886cf89ddc225b446d8f39e1 v7.4.2349
-+32dd27cceadddc4367dac43203e19b85d5446bd3 v7.4.2350
-+663ef672c4b9babade64bd6fa49bda194892e379 v7.4.2351
-+d58155e981f34911bf07132646e9ad6ada97531e v7.4.2352
-+520e0e732b8713a3142779721f8e0f4b184251da v7.4.2353
-+3c37899baa8d33faacae701a1358ff44b1f8b0b6 v7.4.2354
-+4acacf4081ce6d575a7ff7dd10ecd5a5ff70db0f v7.4.2355
-+ab45de65977b4fb9d80c34fc7463f47658b98a20 v7.4.2356
-+b17c825877553622c31ae6be908de380b63d8782 v7.4.2357
-+51888fb2599fe0b47be3ab1539d3fc191f02128a v7.4.2358
-+776d0aef1d804ad9d49461c9e13e100b02521edf v7.4.2359
-+9b86db26d0e86fb75b1622a2eb3dc85b81d0c72e v7.4.2360
-+40f6ce4fe30ef4c28275e055d3082f5206abe156 v7.4.2361
-+4669440016f2b9f86815215333b015dd6309608e v7.4.2362
-+18fdbe54b21f99738c856da9ccd1ccbc7d82f6d2 v7.4.2363
-+2392e065efeab98c283a0371cea0027b9053efb0 v7.4.2364
-+758f3d5a463d6e7122ccf6a7caa3b89fe23102e1 v7.4.2365
-+908a8eba3cfc4b0aabf645bc883223fbddc0c72e v7.4.2366
-+66658966ac2e2d885eb2d3805bf08fb24896c3c3 v7.4.2367
-+9f48eab77d62b6a45d79fcef3c366d06033f5306 v8.0.0000
-+b85c507b50f362847ec61712263e19382903b332 v8.0.0001
-+8335fdda6d4d5a4405a19cc1e9edab906436cc36 v8.0.0002
-+22e97a250277143dd390d304bd75785c739a3c25 v8.0.0003
-+9415453b7bbd453f021912621e80d15437b1cafb v8.0.0004
-+3bb89aba6064c8813fb25c6f58836fef746fb03f v8.0.0005
-+3e7f2754ff2495ca0a585b9bd2a122b45d19cee4 v8.0.0006
-+3a6b2d4c71d67ed751cd36480770008e57232c9f v8.0.0007
-+c41e1736ad47ca1dc730f3fea05321ceb8b50139 v8.0.0008
-+eeb0b205e90908bef08d2d7dde65eb5531a2ec48 v8.0.0009
-+fb1fde4fcff7dddab826718432ebd13131152023 v8.0.0010
-+94d6999443fb65220d9b65b4bdf52366df19745f v8.0.0011
-+7a4fb555c83a14a067ba654b5ffb579ca2b8220d v8.0.0012
-+19ced29f773a9f3ce0cf036259a41267aa90e2a7 v8.0.0013
-+cbee14cc4da656284cb0d10e404594ef0bc13b9f v8.0.0014
-+d709622a18c99d7ffd62209e058b435323aa0220 v8.0.0015
-+ad68516871580be7ae311b0b057d662e672415b6 v8.0.0016
-+197795e3530d09996d361f5a5d02c66659b4ef9f v8.0.0017
-+175b1116f96a08600622742ade16fe5c20aac458 v8.0.0018
-+a369d97995ffeb00df115cc0331a813984fa14d6 v8.0.0019
-+d76ccdacb41ef768daa5a8cdbcd4ccdea50b8365 v8.0.0020
-+d54d4a258b96e1aee8053ddad31a3b1f26749dbd v8.0.0021
-+920c73a27ddaf508908408cf1f515cc66346fbb4 v8.0.0022
-+bc442c2296a72cd0f5ceeae60f517ca9684a757c v8.0.0023
-+a92c4abb8c1f8c3ec337ce4635cf4ad14232c1da v8.0.0024
-+b2c1b7acf92a4c4a08b41ee86d7ae915ffb2683d v8.0.0025
-+2d0e6034743a6669dd28897e57b8044f24d92c3f v8.0.0026
-+a09db7a4afe0bfa4c35b7eab033441d9867001a0 v8.0.0027
-+d69ee8806ec993208ae429dc8fbc452cfecf2fed v8.0.0028
-+c036c0f636d591daf9dce2dc0cbcbd3d1aff80a2 v8.0.0029
-+e86f23a078ca332a9a2756d75fecb3d9f9aab693 v8.0.0030
-+c55a7232fb4874521329a4802519b1aa066e6e09 v8.0.0031
-+e5dddd764fef72827195c777e03bdb4f80f76f67 v8.0.0032
-+489eae19cad906a1582cbc0525c25d45ee276e8f v8.0.0033
-+6d8b2da002e914c498893b0ec9e4926f1dd5d8e8 v8.0.0034
-+154d5a2e7395c08ca4cea9b71e38ed5ca0476386 v8.0.0035
-+c5c15c818bda8a078c01acb648179d7a44ecb8eb v8.0.0036
-+92fa8e5ef2104c324825f25bbda88abc475777f8 v8.0.0037
-+146abb526e828a197b54ddd53619d992ed8a6a45 v8.0.0038
-+cd16ef948ad17e50a22fdba0988bcc7f8c4deeaf v8.0.0039
-+1c1fcf515607ed5a69fb9fa66b5274b1ab1addab v8.0.0040
-+af5b6efad23fce91cf7a60bb675d8663ea3d59bb v8.0.0041
-+d9bd03a0d70fccb322becc16b4d3f40a7cccbcab v8.0.0042
-+0bf1d211e4414f0022b3e0c85bc93df8c5eef45b v8.0.0043
-+d0b74b18e4b57ed0dfe43d1575856deb614aff7e v8.0.0044
-+c90f4cc9c3feda100c9bc7f61ed9e0f7816d796b v8.0.0045
-+7b2f95633e2857280fbaed2f437a4a09e6373a35 v8.0.0046
-+210af8588e8aecd646ebe92f1ad8c0a9c430e367 v8.0.0047
-+179794481db427c83edd8f3763ba8e6d8505817c v8.0.0048
-+f4798aebef670245ff09df384fb5a372c87a6ed3 v8.0.0049
-+88331ee68367189141e257041d2151517757c53f v8.0.0050
-+931422d27b694511f7ecad842372987cb192e9d5 v8.0.0051
-+694e3bb7a8ff5cf0d102465edf58654d243de538 v8.0.0052
-+c1cfdf43560ca706998c8497bf474d7f780d8d08 v8.0.0053
-+25cc0021a8d72d1d9eea0a63bf5436cbedb25787 v8.0.0054
-+6ab770e971523c96dbc69c08232a96b3f0cc2655 v8.0.0055
-+5adc318767bec6dea87cee7d64d46cca25590ba3 v8.0.0056
-+ecbd3412f2145e389c18d377b88d7573599e30bb v8.0.0057
-+7d10572eaba4eee80f4c98cc406bfcc849bbae41 v8.0.0058
-+299f1669c20e5c87de1d0f59b25aeb34c83360fb v8.0.0059
-+71ca6a16e818347544b57386274a01364ac795c0 v8.0.0060
-+4d98f501d1c55caeaee16479d6d2e14da8c8e66a v8.0.0061
-+086117f5fb712f631809cb4d92df1ff73552ec93 v8.0.0062
-+9d282593ba24c9a8e95c345650878a3b7ad4dc4d v8.0.0063
-+e8a6a3bbd212fcaf2a0dc01c9adad380f342b34f v8.0.0064
-+54249c31882a4bf7971124d2adbb78ea69dc46c8 v8.0.0065
-+ae0faad76f9a234b83774f14f6373547c441c89a v8.0.0066
-+e70ff5756201494878a575ebd4cc9668ad0a7385 v8.0.0067
-+d52d97bf675e31658836e14c03323eeecde7d613 v8.0.0068
-+cf988222b1503a594b4ff70acefe4ff75db0ad9e v8.0.0069
-+ed658942a71c644b5c1873dfe0857675d00ea1de v8.0.0070
-+72d92c31b9f7ad28738a94d213c46963ad59c805 v8.0.0071
-+9f88dba65a2d4c51c58aebe4bc0fa974ceaa0294 v8.0.0072
-+59d01e335858b443ee9c774deb394e3041c4bbcc v8.0.0073
-+66f1b5bf3fa644541c190824a2a8766cba9175ce v8.0.0074
-+147f45c283e19eedcfc2fe318a1ae095633cae8e v8.0.0075
-+471b87c3b67d695f7003f27a18ec973b5e4497fe v8.0.0076
-+0dd0c7fb10967cc00c7039b29802491756abe464 v8.0.0077
-+4e4e116e368953be30e55e02c561a7c2b4c07c22 v8.0.0078
-+4e5b307638cb4424cf3018876d7a0ebf3ba56269 v8.0.0079
-+2579df47c3b6d30668c8d324c4128e7bcac69d6b v8.0.0080
-+bd674706408a8565c5c98e095cb858c3914181dc v8.0.0081
-+2055d3722c5b67ad13f023ed0c01db1c7893d08b v8.0.0082
-+dd397210a2d36e23b0c218b8dbb4aae40506ab00 v8.0.0083
-+73e2a7abe2a35246736bfad2c68ed4c38c88e5df v8.0.0084
-+14a82c6433be091257f539b448aca43cd7e154fc v8.0.0085
-+b59df2194b017b2d7c7bae41f1af2f38ea55020d v8.0.0086
-+d3f0946b4a8058d2b96a4575878082ec04e5e12e v8.0.0087
-+6cdb0226d74ac0d497ca688e80bbf58e15286b5e v8.0.0088
-+6c8a4d21b873b368a4c9fdf987a6059802f7f8c0 v8.0.0089
-+957a1d560bda85c8ef2e62a19d6a8f906c5da750 v8.0.0090
-+1de5916d9403e8cce258eb37829f492d030153ca v8.0.0091
-+0bbbe99c8432dd706ce94eac4a4d6d0c6e532f3f v8.0.0092
-+2509ab8950550c11e414f66367a53e007f6e6a14 v8.0.0093
-+17165aabc731da21f3e5d82a4ffa81747a09bcb8 v8.0.0094
-+65646e5652df0577d90cf9f676a37a4fee428cfe v8.0.0095
-+65e0537a456071f279e258c75fb022bbc77d01a4 v8.0.0096
-+42911b23324582e3c21804b38a5cc8ea399d83e0 v8.0.0097
-+401dbd352fd6680b39cc26d67ca221a1d254495e v8.0.0098
-+783a75eca83a50bc7018a8cdc736eb70297e9a55 v8.0.0099
-+836577f4721e670909ed873667f617eca4b6bc85 v8.0.0100
-+dfad15fabd54f14af02f86857e31c6b18c8e4970 v8.0.0101
-+ef5474130b0e2adf97d6493cb752507bb42f0bd1 v8.0.0102
-+56cb9538386c44f9ddbf2ccc142349e4c85cec7c v8.0.0103
-+7a631c6b0a20128cde320b1573eab2a94c68f463 v8.0.0104
-+e664ee056a84cd0004a91788dcdd1ee8aa782d87 v8.0.0105
-+bc97f64c21c2f463b20b9d91330a36b361ba48f2 v8.0.0106
-+acfc83aca8ee209485e388844e2030d6fda1faf6 v8.0.0107
-+a963dce191cfefc58d0f21f88577a5b6f7ac03b6 v8.0.0108
-+37a441352da22d99fce1d8af5eec22a23baf8815 v8.0.0109
-+262f5bc3d38e34a96e34f52a9e3c51cd6b6656fc v8.0.0110
-+f3bb76ec4155efc31d4b79d5ae9cde6df7d862ac v8.0.0111
-+cb856404d0609c9ddefeb72b13e3ce2b183100f9 v8.0.0112
-+935bdb919a50e504a0f777f0fde1195ac13df9df v8.0.0113
-+f54e4c691de4aba60f68245d5c9657fc32284d61 v8.0.0114
-+70680eba19406d69a106fba013161a7f3b69ff09 v8.0.0115
-+2edda415c28a306b809caadd4af0aa5b65989807 v8.0.0116
-+cc04895a5c359c3aa70a8703ca103b4f4f95545a v8.0.0117
-+222b1432814e7dadee301e5f745095fd7ab60673 v8.0.0118
-+3fab458a54ad8f87cc673e9a4fc6fd9bdae428a1 v8.0.0119
-+f5c7c76897fa89a4ae1469798364f8dfeabf5653 v8.0.0120
-+536a7d49249c8fbb1dc4c0828b1d66d9bb0c45cb v8.0.0121
-+a57b2284de9348c243da35bca8bd1d0f32a293ed v8.0.0122
-+7fd589f46801b86ad35ed1b788c0df126d0c359d v8.0.0123
-+0d345265b1e2c9de75321f362865eaac193fde77 v8.0.0124
-+ce8ef728a12e9f54f54c70fd59ceaf4200ca4a68 v8.0.0125
-+34b50194f82da3a3f80f8802ce7fb5e2ad69bff2 v8.0.0126
-+2515541573611f82a333bf22d13622c4968b8cca v8.0.0127
-+232a0d1d8f24a89b035efae876afaa6469e72249 v8.0.0128
-+0a92ca179bbaf88def2337206d4237def5c84dc2 v8.0.0129
-+78b13f6d87d588ba2faffaa74070af90de1f6fff v8.0.0130
-+751851a84c41c4673a8da7d6a405e4df104ff451 v8.0.0131
-+ea1beefcd66431bdc20ecd52cd5273ca6c5c8dd5 v8.0.0132
-+dc9326b58c332b4d56bb570c322cc8022c82ea3d v8.0.0133
-+712acb0ad6a895fa1be7f911077cb14a21d37098 v8.0.0134
-+c7de1536780acbdd297e1e8475b21c647551aff4 v8.0.0135
-+99896ee0cac57d3f09d393a2fdf6c4a498d2d01d v8.0.0136
-+89200fa1d174b995c9c2f866e59102530caa842e v8.0.0137
-+8f2191b56d526caf58a7b812a88cbc55aad1d317 v8.0.0138
-+b2cd5a71f4bb8928cdfaf56749609e9e2e847711 v8.0.0139
-+1e700d72561dce87cf4f4ffa8d79da0eb3df7696 v8.0.0140
-+bd5bec6291ccbf28218a95301fec109a99d234cd v8.0.0141
-+e88ffb09ff386118a3c0e335d139c0097c726d99 v8.0.0142
-+cd36f3024b06a001f662e8753fe97a7e159fb86c v8.0.0143
-+e0ad6123213c887dd2443d080de1aed284dd5aa1 v8.0.0144
-+dfbe8f74806d989e07242a8345c209a2bccc0f22 v8.0.0145
-+675dfe47ab69b3a5b7ed1dcde9682c9ac65b9f76 v8.0.0146
-+1435e45ee6fafdc7005ae7f69bb98a6100a4f425 v8.0.0147
-+09bb1836cdb59ab25a0e40e863787b6bbe8f0077 v8.0.0148
-+de77fa90941446eff41e0d7c90c6f133a5273c2c v8.0.0149
-+4b152b5f414f5bc017499707abc7b1c4e5a3663c v8.0.0150
-+7232cd9f8a7cd17462809e8d5cbfd0ee768a6337 v8.0.0151
-+095c9abae4ffdebd41e49285a2c7e606697448fe v8.0.0152
-+06724e21d8c194a2300a65753cffa3773feaba1a v8.0.0153
-+3ea703795a4f02df28ac851fc525248781670fb2 v8.0.0154
-+ea5adbeccfc144f5d66beeecb5a593e2286b0038 v8.0.0155
-+80b50e43e382e62fd5e29e35eeb9b5635b3f4841 v8.0.0156
-+1c6db35e3527e9b5dd44a8b0a55d0e1c8630b9a1 v8.0.0157
-+6ddf322ff7cfd7b61684148e1a16c23df32b83e1 v8.0.0158
-+c7f671dfd735d5ed8a2a2b14cf1fba183d063596 v8.0.0159
-+ea7fbae33285cb773f277dfc870c932b96362e1d v8.0.0160
-+5c0a28604bd0f8cede59ba8c59403991eb5b82fc v8.0.0161
-+a3cef16bea27796327402497840bacae1210b9bd v8.0.0162
-+7babc70a7b9813dd7fb8574bbc6d94cc87bacd96 v8.0.0163
-+055b1633aed7dfdb2bc1b4a34a08d12a26a10cd2 v8.0.0164
-+c3cc8b2aab6afe48ae62065db2c008f459688895 v8.0.0165
-+f83b6a0b6148b6ac7e9ebc9f7c6301927ece7300 v8.0.0166
-+fff45421182b322d5307f691fba34fc42112506c v8.0.0167
-+018b7ecc58dbd1bf1afbd59b1dafdc7564acad77 v8.0.0168
-+4d8be28b591307e5636ce2223bfcca9852f87941 v8.0.0169
-+e025378406d10194e7c389d08d9806060759fd37 v8.0.0170
-+bac9cec298edcf0055d15130b9aa87814da4f165 v8.0.0171
-+ea0dadb041c98eca8ee89236dd2871f25d1686f5 v8.0.0172
-+82c2c450dad04ffd40d2503b193112c915309366 v8.0.0173
-+0bf064e7917a8aa4ee07a08bab7a27f5ebe9e541 v8.0.0174
-+b726d3ea70bc23cbeb62442f4520b4f559c8da6b v8.0.0175
-+3f777388b6adb7ac9a79119b9f627be163786aef v8.0.0176
-+01a5f64a7a20cce7f66a275429c71dc2b405e9b8 v8.0.0177
-+8f7b918da89fb99a1bfc27e50250c7aa91ecf5e1 v8.0.0178
-+688b97124d234976ebc5f4b22e35b48d135d1d93 v8.0.0179
-+dffda1f9b501ee042554e947cce7476b197b6c21 v8.0.0180
-+f91c0376f2c64a3becc88dd936dc68f34962b2f6 v8.0.0181
-+7230ee024c438516ff4c42a2911e0702c3de04fd v8.0.0182
-+98ee4f22da6e05e1c044afd6ae767942eec48d3a v8.0.0183
-+b0c9c1a050543d0cca567ff7b7464a2a1a62e364 v8.0.0184
-+234da476c4fde6fb2c402ac36f4403b8d7db1130 v8.0.0185
-+553f9b9502bcff7514e410cfaf3fd0542e135cbd v8.0.0186
-+dbaad101b1e1bdc5e73685a4b6b6abe2bae7b232 v8.0.0187
-+472bff31a20aea01329a8afdeb0119542fd3ae65 v8.0.0188
-+2748b23db6bb7aa0ce08949c08a55a53cc22bdc7 v8.0.0189
-+1b09db809d3f885029bf6481cf6bfcd829ab6d59 v8.0.0190
-+df1abc85b169f47789abb19c20b5080fc3d255a2 v8.0.0191
-+9279c939391ba4c75c6ece40011d430ca711766e v8.0.0192
-+e39300d3d2cf8b555fc00c1858337d972f989066 v8.0.0193
-+302aedeed8c981fab493114b989ce85aaf07312c v8.0.0194
-+6bff81438f27c9e666c657bc8b263b5b611f6a0a v8.0.0195
-+196757b230a2f7ca6f80c522bbea73e2f321409e v8.0.0196
-+de4aae86513400b37866bf002c7d09260c0187fe v8.0.0197
-+4ee16e5e2e26296627d7038b440e94589a348c81 v8.0.0198
-+2198b53b9ffe90eb7209b19fb9dfb3b29bf21bf2 v8.0.0199
-+bcacc849852a8670ef503876cf233bc391753395 v8.0.0200
-+5ac9d7920f11ed017d18b07f67207dec1dfc7475 v8.0.0201
-+fb9c28aca006f7dee0b71b554cef6f727480d072 v8.0.0203
-+16fc46021e518ad2f909226d0314ee638320e4f5 v8.0.0204
-+cbf17371627c868070e4fb0425f21d751a61bdde v8.0.0205
-+91444fa276ebb6578e8d8867920d2e171421db15 v8.0.0206
-+3db97def0f357ddd7c89e74aff892cb3adc674a7 v8.0.0208
-+21f983648487fc1fcc9065c73701e319b9643567 v8.0.0209
-+27be410d6d297c2be375da46e0c7f3c24c2b85fc v8.0.0210
-+c10f367d0dfc2440f86994309f1670294be18a5e v8.0.0211
-+2025bec9175fd253484eb2d860cc37ee4ad2dbe1 v8.0.0212
-+8cff35d5f5dc890f5b9006602524524c38d4f708 v8.0.0213
-+4f3decf25b7dced8ba9cc3e2430982b2eaea1e62 v8.0.0214
-+5ca7e3ec1263d6f033513148d896d7f2c0e5b335 v8.0.0215
-+bb4360d64eb2b4b41598330abe50606f20396b50 v8.0.0216
-+f0df81ef971aa2b2b39238d8efd416bd66be5fd8 v8.0.0217
-+4762bd300564b82be98f5c41d1d399284fbd2de4 v8.0.0218
-+77d66e9ac0ab1d96e0e31bde1645c1167a273848 v8.0.0219
-+715836a72361cf377af2016072ac04f861b6be9d v8.0.0220
-+bc1c7e799e6ebdd0f8641f4436c5cf8eed5cf91c v8.0.0221
-+94db9c08e2061a03843f020d5c45e5d860d336fa v8.0.0222
-+ed6f0353574539eabcae477f7b5d9a1fc34ff783 v8.0.0223
-+6a252c6afd5b955fe767ccc0e1c70b8a8c8580de v8.0.0224
-+bce3eccea39a8434e9855e39f15f97a3929146b4 v8.0.0225
-+0a6c66a06fdbfd7f691ddc11174b1daf21dbfe4a v8.0.0226
-+d6857a8dc07ed8c50de53c531ee4b054acf5803a v8.0.0227
-+b8c04c007d3934dd7669510e10f128d14d4afd5e v8.0.0228
-+c647f01d6dbd1c73e8e9cb2bee7b10bf6699b133 v8.0.0229
-+75c324ab1270af6a587d550c5e867900dc19946b v8.0.0230
-+d564e73ff9ee694ebbfdf150f32d4c7af0695d20 v8.0.0231
-+83a36d655a745452d6f8ae7317254bc4f162b1b3 v8.0.0232
-+23ada4caa13b11f213a1881fe51eb1c995f68f4d v8.0.0233
-+3d1872fbecc4a21af4a6def8deffe562c4a74e29 v8.0.0234
-+206ab11fa76e293eddfc7528d80ab17a72f8a668 v8.0.0235
-+d9aeddd9086b395350ca97609d225f9a5114d540 v8.0.0236
-+fa6c4825a1c449c603995d8e43729cabee970ba9 v8.0.0237
-+689e88afdd118c02979efab2bd2ba20461485eed v8.0.0238
-+a028413f6a2637d0c96ed738483b7e1998e5e79b v8.0.0239
-+09fa2d7dc055cf10412b457db3714910c6e49393 v8.0.0240
-+24a1fbd78b76da331b74bd94ff8694af08594f0f v8.0.0241
-+6736cb42572042c7517086af404d1464711d2af0 v8.0.0242
-+056e32b99e933dcec6465c53986c3eed3992a895 v8.0.0243
-+4940a195bd1f237910d82d181bf6ce2334a73f26 v8.0.0244
-+4aa22b40321f7755506abce632649cc058d28657 v8.0.0245
-+74f2182dc1d9ad2a04bcd0e713a925a19bda1934 v8.0.0246
-+319bafc99ee8f6537d938f71df28ede2ad9cf950 v8.0.0247
-+905ab712979c1948532f77c49cfdf12bee722a4f v8.0.0248
-+be61c545b5d114395a62e0836a7f01e7d38d07de v8.0.0249
-+44a1661f4cfaa091f12206458ff6ab8e9c122803 v8.0.0250
-+7598ce51bf2af6b5545e5da4e02b315657d3338a v8.0.0251
-+ae1c6bf22e5f30d7e84741383187485ddd439087 v8.0.0252
-+78927b31c73aa73c25bc9e6d11569e1b6d2f3eae v8.0.0253
-+8ba322dad776e92862d803fe902e39af87a486b6 v8.0.0254
-+44e9340dc604a1a53fcf7c8b51023e6149a53c4d v8.0.0255
-+390ad2cccd3fc3e492b69b79b0948f924f643745 v8.0.0256
-+91bade354a41a7dbf8f99b5738f15d37d7070385 v8.0.0257
-+52c96cc9a7948666c24f33dc78588e1c9412e66c v8.0.0258
-+380e706814da989004404102cfc3f6a025f67467 v8.0.0259
-+3f70b142e8da8490738796e06cf4f233feb80946 v8.0.0260
-+8779b4b2e9584fa03f7bb81e78e99d365407ce4f v8.0.0261
-+265268ea1adcb273d53d767703afd8f7bd502359 v8.0.0262
-+b8a79277269adeedb1ce1ac424bfb048e44ced31 v8.0.0263
-+a7789921b514d8f0edaf659eb55a46d5dc2ecf4c v8.0.0264
-+27b42717662bd4baad284835000497811349e5ab v8.0.0265
-+4961e7acdd8ce373f28d29449e11c29b01561fe3 v8.0.0266
-+2f735d1d19542eeaaed4766eb06b4f9fc8694387 v8.0.0267
-+6c3d42d18366dadc9c590a6780ffe49f43d20ebe v8.0.0268
-+4267f8904d479837344a7354d05635202855132c v8.0.0269
-+721af7a9b4b47db64e8467766981e3156b0375a8 v8.0.0270
-+ae0bbbbe2a38f7f225bd0c61ec83c5138b3b7bfe v8.0.0271
-+82792f199f9b80b4b135ebf7f205f8e821c205ff v8.0.0272
-+a8ce0dbbb1d0065dd3b49e9d69480dd6d9376838 v8.0.0273
-+dd93e5439ffd203f0d46e9eebfa304f1a54913a3 v8.0.0274
-+abc27e523e2a961557bd77ad750d2fe45c305599 v8.0.0275
-+bda1d67f83f3b0074640ce04a4e2dd0e32f4f948 v8.0.0276
-+d08655e2633afddc3dae2879a6167d9ad594aeb8 v8.0.0277
-+80b286d6d38d476b7b746861cd6a27827051a04e v8.0.0278
-+9b207314911825caae176136b96d168000b9ac58 v8.0.0279
-+c96534dd2b2f9292529b0d7ff847e05381bcd803 v8.0.0280
-+04eb70c77cf422ae84a420c0c1a604a60399d1e1 v8.0.0281
-+9938c90d1e6c7db5f7bb0a786d9d3817692d0b48 v8.0.0282
-+09926123316b4f50675ae6e8b5b2f2dd7b1811b4 v8.0.0283
-+214417c527b571fb8845cd8769e5f51246adc185 v8.0.0284
-+bfd636b8e259ceed4a91eadc2602c2b7c1a45537 v8.0.0285
-+4d34e72fe63d51ec39decab73fe2bac354dfac2c v8.0.0286
-+8afee415119d7672493c8298ce8a536087924ddf v8.0.0287
-+e1bddbed43cc684c04d6b1931b02424b96f620be v8.0.0288
-+8c117418aea96e661e4f876cb1dc90958d1832aa v8.0.0289
-+e7b8be5ecacd054ff52428115062809ad125f307 v8.0.0290
-+065da86ca6d25b2c46454ed1e9e53e2fa7d7cef9 v8.0.0291
-+750779134e67dc7d77ebe68adc24eeb65e88fbc9 v8.0.0292
-+82c43bca568e1ceb8b575a7cafee451467c6912b v8.0.0293
-+3adae5c1b1cda290b7659e7166b8e484a49b5030 v8.0.0294
-+4cb74eab17336ed0674cd100740f0c59c8d1f35d v8.0.0295
-+09eb5fd275e009e57393e47b42d7f30cdda539de v8.0.0296
-+f883a122439676beb76d94393d3a853bd915fbf5 v8.0.0297
-+cc8079703414ee8a4776354f81c897eedb600012 v8.0.0298
-+cd179d7d0b5dc665169fa98eb8fba164670fb515 v8.0.0299
-+d9e48fb5142ffcab3a1b29e19a20fc1d119d8f34 v8.0.0300
-+a7da553980eeec5bbae8800646e132502814faa9 v8.0.0301
-+4dea7c96fc82e550f414e2c57e76fab584f5af46 v8.0.0302
-+e366b968bf082ad7387b4d19417fb731247c23c9 v8.0.0303
-+8233f8f3f7ae2b19b9ee90c0bbce04dca50a78d0 v8.0.0304
-+e926c5a7f9bf25adbc65168183eca10b4d156428 v8.0.0305
-+d66e5446cc48e110c6e4db02a21ab7343a41278f v8.0.0306
-+c9da7f9137af09395750f84b00cf59daae2c5926 v8.0.0307
-+437cf0fe2138e20500f4e02bde80b7e8f134017f v8.0.0308
-+287049007bbccf7e1766e1c0df75573b28d7093c v8.0.0309
-+5c0415a8b96ef23ce6407fbf42bf27007d7853c3 v8.0.0310
-+678edb2542167667b21f548b18104ef1652db348 v8.0.0311
-+c31782d57569cb8958542984abc2ca74cb2dac2e v8.0.0312
-+881194ae47a1d727f7defac9cfd2618d682a4544 v8.0.0313
-+6ae12eba42b58a9c11810d995e23304af45f5dd7 v8.0.0314
-+256b1b96c2ad2e9464c79aa1b89890783f2e6c78 v8.0.0315
-+b760fa91f8b3435237641c8eda66f885052acf62 v8.0.0316
-+0beffabed3382eb1b94d0cc2d9bd07d1d5efbcf4 v8.0.0317
-+20d71d305d1cece4f650d0cfb79913f072f02c2b v8.0.0318
-+64ccb8029e06397433e3b756de215d8035ec998c v8.0.0319
-+7d82787b302027adff7eccf6a0d035dbb2532e8b v8.0.0320
-+9130644aec5c226c516b5666e4b96116bf293580 v8.0.0321
-+1a18c0f93ffa4aa5e7e886ff43914ecbbd284ccd v8.0.0322
-+9a5a4b36a1c1f0e1d30077b54d66327daa0f0eb1 v8.0.0323
-+f8ebfa168818babfc97c2c3a0814c12cdc18a2d4 v8.0.0324
-+c02cdc3703407fc642488159e96fa57b9e25fc7c v8.0.0325
-+fba4d2f224258969e4390cb37a6198abd1e181ba v8.0.0326
-+ac9f60f96babbe6cbdcf054f1414ea2e41a07d5c v8.0.0327
-+6d8283a8eab88733ef9a1223b157ec4d2877968f v8.0.0328
-+1fce74a5a628ce4ab8bcefe02303ed390ea143c3 v8.0.0329
-+8f6df2f6d2fc59de28a49fc639952727cfa9be0e v8.0.0330
-+cb71a5468acaba4fc080b2863b34f8c2d95b4574 v8.0.0331
-+310834b0256adb3aa008a69529dda0586ed09c30 v8.0.0332
-+40939b1714327f89d7969f7dac8a136904766d35 v8.0.0333
-+5780bd3a5a7e37c388e4832e0429a6a3bb509dc1 v8.0.0334
-+c9d057b7a0ab7a991c4115fc9f1cce016eb9ad05 v8.0.0335
-+fbed07965b6a1513215c013952544592c7fb943c v8.0.0336
-+d513b653f5d0d8a51b1e9015f16cac2059e9386f v8.0.0337
-+cc3f6ad092c2d0a87700f31eb795d3e49716437a v8.0.0338
-+9b4574d955714b5acfb0d48fa3f761edc792d608 v8.0.0339
-+b69194114994c553f2b6e816024296b0fe0b0301 v8.0.0340
-+c68775848f5f1eb308f5beb5362cdebc38b85e98 v8.0.0341
-+7fc1df5536c90b078b5ec3da41e4e75bb9dc3b54 v8.0.0342
-+6b6abffbdf59c6a8c5f95a49798a4a344c5260ab v8.0.0343
-+8bff367672a4f2cebeab3c48a1cfc830b5f60b60 v8.0.0344
-+fd1760f8c215256d5820cac4a0a35e0b65c1914d v8.0.0345
-+3b092435301983808d3ddd194115cc8e33d0d5ff v8.0.0346
-+503b28f0a9742b8e7e20af13f945f56025ef164a v8.0.0347
-+a0c2c6d51b1aedc86df4b7f565cc5117f7ae389c v8.0.0348
-+687833a3fadcd104feeb4ad711c9628d6b71b202 v8.0.0349
-+2cc7e86bdadad2154b20ea28023a797fb8ccca9b v8.0.0350
-+053d4ad16f37ce482fbd1b612dc336e8947ccaab v8.0.0351
-+7dab3a9cb933065b0594b34f499a6d6856036ab3 v8.0.0352
-+5b3e671ef6a23aced9534c67546e164cc9f01c53 v8.0.0353
-+126405b39964e902976c8064433a607ccac6583e v8.0.0354
-+141fe140976ca1c1309d03ad721b35d3e017eda3 v8.0.0355
-+32b299ae67527a3025fde78d99a1cd71b21879ff v8.0.0356
-+a516b6c279d9b72f38c0b3484e58e11ab9e49287 v8.0.0357
-+3b82ab325d5914b4f3ef3e2bb2a4f817065d511b v8.0.0358
-+a479b70645508ae3bdf82ff087fd7f0f05b642fc v8.0.0359
-+e05695e59f6df50605a73cf5d787fdb4f8823ddb v8.0.0360
-+4e2cdce4576c5d4bb49c20296b2fbc8698975f38 v8.0.0361
-+0fbba847496debf35b30b11f0d5eb4936f2acc54 v8.0.0362
-+67e37bdb58645d767b895dc301deae0e418c74fd v8.0.0363
-+2297aae8e127a441473d07f6f6553f1456fba3c2 v8.0.0364
-+835604f3c37aea177343a9af8d30240bc3d8a68a v8.0.0365
-+8ff62b4cffaedc9575a7ba3901c9228d6c8ee24e v8.0.0366
-+90af0c60d78dee45ce1afb4d0c56f5c08b8d004e v8.0.0367
-+e5896de85dcf7d7bbf77027a50dd6c10bdfee3da v8.0.0368
-+d7b78cbf85e41931fca917f3f1f4021fcceffff3 v8.0.0369
-+6da4287fd73577120366af8b95c8f8efe36714d7 v8.0.0370
-+bcbda8ae5549eb11dbe142f3d9539f1651ddf188 v8.0.0371
-+398ad090256dd560256be9e8717382ad25a1ca49 v8.0.0372
-+0cfcbb7046b69fe2a8b277edd5e62e58274ef4eb v8.0.0373
-+ab9f7bbe443900f60e28fbc4b6ab018708d5d0de v8.0.0374
-+488cda29455b13305c3f672be5bc9681d835e561 v8.0.0375
-+7d735b86f7645aaf9be9919255cb049acfbb3394 v8.0.0376
-+f97a72ad8ffa2713ba1260c8168eee46a5f95a8b v8.0.0377
-+f3d64d9e5d763362d9c585f9b8f05763b72b6175 v8.0.0378
-+5362b4b6042ca9e130dea2a47ea7f4f14b1a41b9 v8.0.0379
-+5e20c9f96cd58b5717d39d16276501b4333986dc v8.0.0380
-+c0d5e8ab1452b5e2981ada563ea223e1b115bf12 v8.0.0381
-+62bcadce6c821775312d4269a319c64b9767d281 v8.0.0382
-+b5de553d6062e7187b192f58e2d5a668dfb68aa8 v8.0.0383
-+f18a98681da1772df18bce2de6e1e238db91256f v8.0.0384
-+441ca654f65c90cb7065d99b67537e2f3f4b159a v8.0.0385
-+fdf42c56bb2e780dcf681963bfee86f4070f5957 v8.0.0386
-+2f041b367cd9a7de0507025b18a8b7f0e3fcf5ad v8.0.0387
-+2645a98217faee5ae7c1a2cf9bbdd8c975bc17c8 v8.0.0388
-+307f9ae2a7fbb493e40fd5e1aa9d55197ad25b50 v8.0.0389
-+35d4975a5bb588773c962fde166f6ff560d4bed4 v8.0.0390
-+f91d4c95b696f5f022bba18a496b4b84c243197f v8.0.0391
-+b3601a8eb67943d3aa0a54372b9c164aec462405 v8.0.0392
-+0ecd07cd2e43ad5c155d53160fa67bf6b5035563 v8.0.0393
-+c004e17fa36bcd02beda3b0b78ad58882e0a5b43 v8.0.0394
-+ae2de10e8398c7a8655e10de2c2cec6593ecafd4 v8.0.0395
-+fb2bcfa6a8de6323f6bd0a436cac6204cb9b87e6 v8.0.0396
-+4e7308525fe723c6f959e2db8e880610c8aee63a v8.0.0397
-+654fc5636b37b27891150fd94a4208456e1b96aa v8.0.0398
-+50f3e37bc2108c8dc7badea8f3615d59c0184352 v8.0.0399
-+ca8f2d24a79c06acd831ef10afe130c5abb9cfed v8.0.0400
-+973fa964cb91a6581fad9cc4601d38c0e7b67335 v8.0.0401
-+fa69f627269205953708c8ad3cd4f8a44aea2750 v8.0.0402
-+4df1647531a60d2a3e1257ecebb7b015d4df7f73 v8.0.0403
-+9d40a98f08349016e536a14c4f174efb2b67e02f v8.0.0404
-+516391d8865fd6b7a740fe8fe553709f736030ff v8.0.0405
-+8ae6d6052b1491bb5ba8fcedd3fa32856071df22 v8.0.0406
-+9861e4196c4373b662a8b128e1bc07684fb1ea40 v8.0.0407
-+c8b49300c6b7ab59528d12b93cd13dde51f4c2d7 v8.0.0408
-+fde2cdef6b973ff2807f53131e612f5f38742b07 v8.0.0409
-+5de2fb612f217770271125ade84dce34ffbeeba5 v8.0.0410
-+eb3a2ff3309a2dacab3dac615d8f1676132c9c89 v8.0.0411
-+d48f4eeb91ec7dd8e2f40fa173a4fbb716e9d23c v8.0.0412
-+860d023f0fc8e5b5a4d794b90d018d7f7a5fd13a v8.0.0413
-+622ed5a4925f799cc86fa8f4212dca22aac42bf3 v8.0.0414
-+975f54a391ece522e1ee2d9f482cd81f74380e33 v8.0.0415
-+576238eda5a4c6dd75b3f928dbb49a4cef2d3c87 v8.0.0416
-+679c12064dbc9990e693b8ff45be6c2a7749f4ae v8.0.0417
-+1448c8bd818fe3ea506f5a99383f8056ba2f9181 v8.0.0418
-+354593196e20c924b639e19ba456c7f1cdf30293 v8.0.0419
-+e71d3bdf3bc3d91f7f1f1912b41331ddf460b15c v8.0.0420
-+f5bd684e47a165a3eb503cd4aef12f655087e9d5 v8.0.0421
-+a99a1234625f2f4adfdde13c3f72344528a068ee v8.0.0422
-+814126a34c9d0c7b3f6aa6095ab93e56daa15c5e v8.0.0423
-+cc22b177dfe88b21dadcc619912f52812be37ad0 v8.0.0424
-+d2178a6cc9f38c8f9ce8fe3077a56c5e25ef7390 v8.0.0425
-+a8be0c7169b1b064d2cf699bddb775a098c7c413 v8.0.0426
-+746c1e1be45fe8bef33f04324551f5a5f9322737 v8.0.0427
-+50459aeb47735ceea4f8efe33d26f9aacef72a86 v8.0.0428
-+bbdb4f0134cba06f6b63c009d8cf0bcd6b44caab v8.0.0429
-+ae86651164d7fea40e80eac2b24cf8ba1d05a387 v8.0.0430
-+242e0617aa516d2e7190996c5f77153a3ac8c52c v8.0.0431
-+9266a68526763bbf5ffc242fe4cd7d8fdae3e132 v8.0.0432
-+ae45d497868fa2526ecf2a3bde4c43b9dfe1d795 v8.0.0433
-+e0694d4c4483ea858fda86b532fce1c53e399c15 v8.0.0434
-+5763281d212a258842de69861aada8c65931d1f1 v8.0.0435
-+d32c9d8fa01a7df61e020728ba3f5964981c77d6 v8.0.0436
-+613d9bcd7a5294b0d535b7827763c4c8916b70c1 v8.0.0437
-+c5027d19ef6113668505318a7afa3980491db30d v8.0.0438
-+3335c3c75611bcdf65e450f0d29414984bbcb4e2 v8.0.0439
-+7c7e496e625dab2ad4858baabeae070f57aea6a1 v8.0.0440
-+cde7933ad315dc8d268c269074ac2b80472e7ab7 v8.0.0441
-+0adcfcf22036e4f1a5130267f824a7a2ab62fba1 v8.0.0442
-+4618af3049fe6ef9f34114f5056dc8486790df75 v8.0.0443
-+081ed9efb5c07908287c56d82bc8144de945caae v8.0.0444
-+3b36da20ad7308c2f8846cdd35f7a9aa01d2ecc5 v8.0.0445
-+e2258e86d8e102261faee093d05ab603d0433289 v8.0.0446
-+d8a550329a97384c65404ab34def03f73f4ffe94 v8.0.0447
-+778c10516955353754e4dc43561d092433ac2060 v8.0.0448
-+9bfc9d7b07a7212aba4e24f1fd8a1b5f998a8b5a v8.0.0449
-+6f52cc87fe15ef308bc5b77062294d20eec28b25 v8.0.0450
-+506f5d8b7d8b6ab96ee41203fce9aa2e665e7cc1 v8.0.0451
-+f4ea50924c6dab7e6cb3be215b63527c359ef122 v8.0.0452
-+8d9ecf09183afbb55eafdcdb5d21dc22176ab23a v8.0.0453
-+d8e830e32be9bda729e171ab79d53311b90358b4 v8.0.0454
-+c4e4387bbd50d734b808d05d84e47a8d8f44e1f2 v8.0.0455
-+003e7ade488f3395a0893529b458607c0498231f v8.0.0456
-+6b26e044b6f5875f9ad0856ebd8e21e2ce3e8259 v8.0.0457
-+a54985a73ab27a63ac419b29bdd4bbc523185794 v8.0.0458
-+e85aa0e46ca543b01e1f2fa3589d2b57584bea21 v8.0.0459
-+6ce90f33373f3052ecfb3dc9c8cff2fd59b1468b v8.0.0460
-+87779062d706ac4805bc0e997c2f88ca695f5310 v8.0.0461
-+9f9409588102fc78bd06d2efc629253103d351a0 v8.0.0462
-+c780e3774dac76acd5ce4147d0e2e489cfbcd08c v8.0.0463
-+0895f142cac3265170e5d713a378e29d31ca587f v8.0.0464
-+80241603dd5085e1faa212ca90bea51101daba0b v8.0.0465
-+501f46f7644c4348f21bcbe45b74f8053010f846 v8.0.0466
-+404e98047f0b2204f7f5e9c00283e9271f40f080 v8.0.0467
-+f4d1fad4ac00c20df55ebe8855136e01ab95f9dd v8.0.0468
-+f0602688b8efd6c348c43fda82b202fe94c6afc2 v8.0.0469
-+260100346566d9c4f2ff48964c30fe079efe202b v8.0.0470
-+f4971739ea47b98ad5f89fc71fb9a63ca6912b7a v8.0.0471
-+7fc6afa998bec3afdc8e498940bcaab3267828e5 v8.0.0472
-+cc94b80016fd16437e82172960eabd222df85651 v8.0.0473
-+9836b701afd9a4a34c73b01f3a853dda3f6168d4 v8.0.0474
-+76fb679a310eb1c9093670c69193d3d9e279736e v8.0.0475
-+49fda934f7e8a392ecdebfb2622221aff9ab4faa v8.0.0476
-+13544aa85dc014e0893bdd9ae08e3fa4fdcc3005 v8.0.0477
-+1c4ebbae41d222e8cf1ac566ade973ca787dccf2 v8.0.0478
-+eb050472e4b4b5a3f84dd3cc46d4bada0b7f74d9 v8.0.0479
-+515db00c4676a2f2c66c716933e54322d4003a9f v8.0.0480
-+e74af2aca96ea5d1b401053aba325aa4f0d95fda v8.0.0481
-+445fd6be2009109d3440265c93e8b95139ad213a v8.0.0482
-+75ccc8a15a51fdc873f73e2cf01e7304710591f5 v8.0.0483
-+13c660bd07b2576346313839ecd189ad474a7ce8 v8.0.0484
-+7f355d8cd63454bb559f85325325560a9027ee10 v8.0.0485
-+e08ead1d269f5edc00a3e4c6065fc0f2d78dad23 v8.0.0486
-+87ef152072d4e681d7a0c51e27390b02c3e44b8c v8.0.0487
-+c3504890b37d1e85b7933234f8189c29b946b37b v8.0.0488
-+4db196820d3b41a460d9454a1dea116e58dee733 v8.0.0489
-+e6140f3d2be72bf5cc2972460fadfd9cd46c1da6 v8.0.0490
-+1083038c59ba80ad145875ac683fe57b251d75e2 v8.0.0491
-+71311d899b42689192603f8669eb447775e23d45 v8.0.0492
-+290f5f6a2bac713d64632b2af27c019340b0f17a v8.0.0493
-+2e4877acfe0aed38dbc16aba0499522d01094939 v8.0.0494
-+466657ab73406a1f90091e5f2a4dd1239b7c3f00 v8.0.0495
-+e53609585b7668923f58ceba461be8993bf0dc22 v8.0.0496
-+3fa27b97d263eec84d97ce2e7b35e93dea3c9453 v8.0.0497
-+ac36e139510f969af80a035453808215ea2dc5a3 v8.0.0498
-+d3415ec1cdafbcba5656de6a4a4665da9c96ad38 v8.0.0499
-+9bfae04699c38cac0a2c35400a1f46f79ffa2b5a v8.0.0500
-+a3ea65af63cf8fca1dd86f97f639f6dc9c304c91 v8.0.0501
-+a14090a30a3f9af57dcf5ef63bc160e2db733c87 v8.0.0502
-+8c153d400bf4ff29c8e039b35c764b47cefe7ae3 v8.0.0503
-+62c96fee518e715295728c4ced46ab2990a7f740 v8.0.0504
-+5b524c2286ceb610b1870ab2576806abc13aa167 v8.0.0505
-+06307d812ca72bec70f653fb3db028962c0a3bd8 v8.0.0506
-+9612b93820a4382710343a78bebf7ac3679eecae v8.0.0507
-+d9077ce382a8b64d19d98d8361a4e7879cf7ba90 v8.0.0508
-+166d1de0ba9d0000082abf23f227562882da86ac v8.0.0509
-+c12b80e3d323b5896f8c8756fcb9a364bf624f8b v8.0.0510
-+ca5550f66b27f183c6d0706c8ebe715186fac7c8 v8.0.0511
-+d7c1d5f7cf2a53c14da3d33303307372b9d88c62 v8.0.0512
-+918942a3b0ef9ae0708c6967443909d42cfc21d7 v8.0.0513
-+17ba19406c50dad27694051e2c6b5cf36439955a v8.0.0514
-+84f71a8a5f2c7b5e7ce8b7f9205b79fcf30f8f43 v8.0.0515
-+a7b7b21071c6ce1be69e9823ca002dfebb57f1e3 v8.0.0516
-+ae5f9f26f81c5bd63520efc4882efe77927064bb v8.0.0517
-+b25895ab67be87c6aad5d19b0a7c1d28eb891c35 v8.0.0518
-+588de97b40e7c321b8d701038a84807e99ac805c v8.0.0519
-+121d29004998ab6f38df6f421fe1550ef105e9f8 v8.0.0520
-+cd8dbed175a1338c226fc148f5b93087c71a01ef v8.0.0521
-+96d83cd2904a1ea8763809ff59a7c27bc09f4925 v8.0.0522
-+5c77ca0cf6a566e1404f07e8d6ea6059ca185b88 v8.0.0523
-+f26a535d9464825564a396fbdbbf4cbb59dab84b v8.0.0524
-+b19377368387a0d9d011fcd200902ea4c2b50e16 v8.0.0525
-+2e6a0ea76a0da4f6fce426f424b9ba4a60b6149a v8.0.0526
-+abc08a2461eae382e8181f1ecb1ef814f72fbf47 v8.0.0527
-+0b4adcfb7b25c039a384a6de1f3d9b58486ca979 v8.0.0528
-+e800e8149a5bd09eb7f9dbe6fdaae20bf98fa14a v8.0.0529
-+e0309111d97614de07529337a551adf1c136d50a v8.0.0530
-+783ec3826b0c4ca92f65bca8019377a9ed01ff72 v8.0.0531
-+cb2040d458764cda9bc4309637d44571f2d666ab v8.0.0532
-+d772bf077b3fa469658f6a7b3bc1eac95460fb29 v8.0.0533
-+2db80d94107d43c32ab93e96020a2fc36b4c2d80 v8.0.0534
-+4ae86195f559b624fb7cfc225b88f2ebe02e4a33 v8.0.0535
-+cc8ece2aa3893385cae02b1e40e19c5a7aca385a v8.0.0536
-+ef32a5c74515f8ecd83facd96fee5683aab5237e v8.0.0537
-+3bcdfad55b19d541be4c1d74b904049537ae13c7 v8.0.0538
-+6e1c19d3de0371ed68f1333359bddbdab4113b92 v8.0.0539
-+b254fd46ef627eaff94528ee9b9c424555d03c01 v8.0.0540
-+be499043ca7004ba18fe36753e3cd949d848628a v8.0.0541
-+327a04a762f6cdb1923700be47cde58324b9ab35 v8.0.0542
-+0c091a7c588cca4b008424681050ba972e88d6d2 v8.0.0543
-+e45c6e4d78afeb9c71c9f506b790b1f75a8a9237 v8.0.0544
-+2dc624388934c15e501d19a6db94357fddafed33 v8.0.0545
-+f57dce6b934bcf454b9f80442a11642a6a706a87 v8.0.0546
-+3e799a37ea22a55e30ecbd4b655d9687eb7b33f5 v8.0.0547
-+77f3b7316d8ba66232d0cfb4d465c06ea52eda35 v8.0.0548
-+9e899514e929beec3140bad2ab86f6d867531632 v8.0.0549
-+c7ba89661c3960f764d16a4378e8aa85a1532988 v8.0.0550
-+ff27a6a3a243144efa913738cd19bb39b1603ace v8.0.0551
-+fef09eb74832220dde6c208894db72e92a2a1110 v8.0.0552
-+bc8e3fd275bee00c6240475f06e128f335508509 v8.0.0553
-+f0fbebf19b80753819221d6e9b9f96979ffa87b4 v8.0.0554
-+2c655db9e0f6c819902c71d0a621bb47c345eafa v8.0.0555
-+98abcd1227dce0564324591974b5c3eae8c660fd v8.0.0556
-+049857c9b1c4c180901e7c34153d6b3e99ae5019 v8.0.0557
-+329653a02657e395b44b9d8ab553f4143812b9cb v8.0.0558
-+4e519116570765acb52bd47fa603bcedc1f759d6 v8.0.0559
-+10e51185826a5988b12a2b117fe97d9158f5a577 v8.0.0560
-+251f1833db7da77fcf8729ef0e49639ccc9ae0c6 v8.0.0561
-+129077fb57e6e51c4c984167ffba3d3ca9c0b7bc v8.0.0562
-+bd05d23bcfe15fcc7df73e5a1c1469b9299fc515 v8.0.0563
-+a6b9cdcde548e8c2344b8301a442591591b8e6eb v8.0.0564
-+83303ad9f1ff0619529732a3141a86305fafdac3 v8.0.0565
-+2c2b7f486fb075b2cc15a0a778725c2bec44aa9e v8.0.0566
-+0ef92445b4f6f5449cbaec239b67e12faa568039 v8.0.0567
-+b16bc115a270d5419d04d5ed1a64be266ca2f5b4 v8.0.0568
-+253e66dd14281153a65e024fed57c944fdbd9d5d v8.0.0569
-+e11d5966b82215031f583a4cc47dfd97d6e480c6 v8.0.0570
-+1074f58e1673bdd436d60c0bb867874c8eb0c177 v8.0.0571
-+889da86492215ce589d00d7573df08e584acf71a v8.0.0572
-+78d7b92bfb1d54c48c4f9176ca6bb3446c4cd275 v8.0.0573
-+2ed7a34ecc548fd63ce2b7b6defcd3bb562402da v8.0.0574
-+2334a8ae9ff6f272c31242fb2f5728a901967d0b v8.0.0575
-+3f399c28e4af94dfa5cb3c730d5b78726a6c1be6 v8.0.0576
-+b200e14e7836b29a17d5d50caa88778bb7973092 v8.0.0577
-+e2b34123c7dcca9bbe0235342e4be87ae545cc0e v8.0.0578
-+c3ebb7d533c62c7ddce7cc420eb6533fbcbf0860 v8.0.0579
-+73cfcf11d983beb6288c87c8ccc77bf96d40d7fd v8.0.0580
-+dc2800c3572b93b920858c64b5eec3d3b5d6a5b4 v8.0.0581
-+a2124e9bbb6a1ff6dc48cf80386bec31162dd96e v8.0.0582
-+e9924d19ee371464e6adc957c19e7f14023a457f v8.0.0583
-+30af33f4d353e1969563a0c460dd9a3e25885e13 v8.0.0584
-+fc1939947789db111520f48ee0809e61853a1901 v8.0.0585
-+74a40efb39ea652deb465b2e008bf80b2daf2849 v8.0.0586
-+b164223c0119fb50d0dc544d06df784264233a32 v8.0.0587
-+c9924ea60cc725de061e0c0724b4e0af810ac733 v8.0.0588
-+db21cc7b40f019daa477f45a9ab0d9bbbf525d51 v8.0.0589
-+84baca75b7f20882d0b18974d9628d95c2fa45b5 v8.0.0590
-+c95c5ddc3b0daab258430dec5aa42a61637cf838 v8.0.0591
-+32aed09938134d53aab31746d572811e4def8011 v8.0.0592
-+162bcd0debd736c1c1598d4521f0b428ca32e1f7 v8.0.0593
-+d1b6cf96882a63e8adb3696c8e2e1a78f56d4abf v8.0.0594
-+ad4b5693914026991fb91529a6affcea309fc6c8 v8.0.0595
-+328a9ee98fb2c7cb4f93374cfc04bc18ac80b47d v8.0.0596
-+3270f080bf0a4bfb8cb40b37ac74ec33c1ff689d v8.0.0597
-diff -Naur vim80.orig/Contents vim80/Contents
---- vim80.orig/Contents	2017-04-23 18:29:57.000000000 +0000
-+++ vim80/Contents	1970-01-01 00:00:00.000000000 +0000
-@@ -1,23 +0,0 @@
--Vim		Vi IMproved.  A clone of the UNIX text editor Vi.  Very useful
--		for editing programs and other plain ASCII text.  Full Vi
--		compatibility and includes all Ex commands.  Extra features
--		above Vi: Multilevel undo, multiple windows, syntax
--		highlighting, command line history, folding, improved command
--		line editing, command typeahead display, command to display
--		yank buffers, possibility to edit binary files, file name
--		stack, support for Manx QuickFix and other compiler's error
--		messages, shows current file name in window title, on-line
--		help, rectangular cut/paste, etc., etc., etc...
--
--		Version 8.0.  Also runs under UNIX, MS-Windows, Mac, etc.
--		vim80rt.tgz  contains the documentation and syntax files.
--		vim80bin.tgz contains the binaries.
--		vim80src.tgz contains the sources.
--		Author: Bram Moolenaar et al.
--
--
--Xxd		Hex dumper and reader.  Can be used to view files as hex, edit
--		them and write them back.  Can also be used to patch files.
--
--		Version 1.10 (1997 May 22)
--		Author: Juergen Weigert
-diff -Naur vim80.orig/Contents.info vim80/Contents.info
---- vim80.orig/Contents.info	2017-04-23 18:29:57.000000000 +0000
-+++ vim80/Contents.info	1970-01-01 00:00:00.000000000 +0000
-@@ -1 +0,0 @@
--ã@"ªø"« j"7X@ž~«ê©êšÿÿ×õP_ÿïþª¯ÿ×ÿU@_ÿïÿª ¯ÿ×ÿÕP_ÿïÿêš¯ÿ×ÿõT_ÿïÿúª¯ÿ×ÿýU_ÿïÿþª¯ÿ×ÿÿU@_ÿïÿÿÿà¯ÿ×ÿÿÿ}WÕQÿø|9ÿø(óÀ9ëÿ|óÀ8¯ÿÀ|£Ïçà|óÏ¹âê |óÅ9áÿø|óÏ¹àÿü|óÏ¹àþ|óÏ¹à;ÿ|óÅ9àÿ(óÏž ÿÀ|¡Oà|óÏ¹à@~«ê©êšÿÿ×õP_ÿïêš¯ðx@_øª< ¯üªUP_þ¯ÿ*§T_ÿÀ¯ÿÊ©åU_ÿàð¿ÿòªyU@ÿø< ÿÿÿÿÿÿ}WÕQÿø|9ÿø(óÀ9ÿø|óßÿ¯ÿÀ|£ÏU×ÿà|óÇUkª°|óÿõÿø|óÕZê¬|òÿýþ|òuVº«|à?ÿ_ÿ(À
-U®ªÀ|ÿ×ÿà|T
-:c/MuchMore
-\ No newline at end of file
-diff -Naur vim80.orig/README.txt.info vim80/README.txt.info
---- vim80.orig/README.txt.info	2017-04-23 18:29:57.000000000 +0000
-+++ vim80/README.txt.info	1970-01-01 00:00:00.000000000 +0000
-@@ -1 +0,0 @@
--ã\@&ç(&ô°j"BX@ž~«ê©êšÿÿ×õP_ÿïþª¯ÿ×ÿU@_ÿïÿª ¯ÿ×ÿÕP_ÿïÿêš¯ÿ×ÿõT_ÿïÿúª¯ÿ×ÿýU_ÿïÿþª¯ÿ×ÿÿU@_ÿïÿÿÿà¯ÿ×ÿÿÿ}WÕQÿø|9ÿø(óÀ9ëÿ|óÀ8¯ÿÀ|£Ïçà|óÏ¹âê |óÅ9áÿø|óÏ¹àÿü|óÏ¹àþ|óÏ¹à;ÿ|óÅ9àÿ(óÏž ÿÀ|¡Oà|óÏ¹à@~«ê©êšÿÿ×õP_ÿïêš¯ðx@_øª< ¯üªUP_þ¯ÿ*§T_ÿÀ¯ÿÊ©åU_ÿàð¿ÿòªyU@ÿø< ÿÿÿÿÿÿ}WÕQÿø|9ÿø(óÀ9ÿø|óßÿ¯ÿÀ|£ÏU×ÿà|óÇUkª°|óÿõÿø|óÕZê¬|òÿýþ|òuVº«|à?ÿ_ÿ(À
-U®ªÀ|ÿ×ÿà|T
-:c/MuchMore
-\ No newline at end of file
-diff -Naur vim80.orig/README_ami.txt vim80/README_ami.txt
---- vim80.orig/README_ami.txt	2017-04-23 18:29:57.000000000 +0000
-+++ vim80/README_ami.txt	1970-01-01 00:00:00.000000000 +0000
-@@ -1,32 +0,0 @@
--README_ami.txt for version 8.0 of Vim: Vi IMproved.
--
--This file explains the installation of Vim on Amiga systems.
--See README.txt for general information about Vim.
--
--
--Unpack the distributed files in the place where you want to keep them.  It is
--wise to have a "vim" directory to keep your vimrc file and any other files you
--change.  The distributed files go into a subdirectory.  This way you can
--easily upgrade to a new version.  For example:
--
--  dh0:editors/vim		contains your vimrc and modified files
--  dh0:editors/vim/vim54		contains the Vim version 5.4 distributed files
--  dh0:editors/vim/vim55		contains the Vim version 5.5 distributed files
--
--You would then unpack the archives like this:
--
--  cd dh0:editors
--  tar xf t:vim80bin.tar
--  tar xf t:vim80rt.tar
--
--Set the $VIM environment variable to point to the top directory of your Vim
--files.  For the above example:
--
--  set VIM=dh0:editors/vim
--
--Vim version 5.4 will look for your vimrc file in $VIM, and for the runtime
--files in $VIM/vim54.  See ":help $VIM" for more information.
--
--Make sure the Vim executable is in your search path.  Either copy the Vim
--executable to a directory that is in your search path, or (preferred) modify
--the search path to include the directory where the Vim executable is.
-diff -Naur vim80.orig/README_ami.txt.info vim80/README_ami.txt.info
---- vim80.orig/README_ami.txt.info	2017-04-23 18:29:57.000000000 +0000
-+++ vim80/README_ami.txt.info	1970-01-01 00:00:00.000000000 +0000
-@@ -1 +0,0 @@
--ãÆ@'R8'Sj"TÂ@x~«ê©êšÿÿ×õP_ÿïþª¯ÿ×ÿU@_ÿïÿª ¯ÿ×ÿÕP_ÿïÿêš¯ÿ×ÿõT_ÿïÿúª¯ÿ×ÿýU_ÿïÿþª¯ÿ×ÿÿU@_ÿïÿÿÿà¯ÿ×ÿÿÿ}WÕQÿø|9ÿø(óÀ9ëÿ|óÀ8¯ÿÀ|£Ïçà|óÏ¹âê |óÅ9áÿø|óÏ¹àÿü|óÏ¹àþ|óÏ¹à;ÿ|óÅ9àÿ(óÏž ÿÀ|¡Oà|óÏ¹à@X~«ê©êšÿÿ×õP_ÿïêš¯ðx@_øª< ¯üªUP_þ¯ÿ*§T_ÿÀ¯ÿÊ©åU_ÿàð¿ÿòªyU@ÿø< ÿÿÿÿÿÿ}WÕQÿø|9ÿø(óÀ9ÿø|óßÿ¯ÿÀ|£ÏU×ÿà|óÇUkª°|óÿõÿø|óÕZê¬|òÿýþ|òuVº«|à?ÿ_ÿ(À
-U®ªÀ|ÿ×ÿà|T
-:c/MuchMore
-\ No newline at end of file
-diff -Naur vim80.orig/README_amibin.txt vim80/README_amibin.txt
---- vim80.orig/README_amibin.txt	2017-04-23 18:29:57.000000000 +0000
-+++ vim80/README_amibin.txt	1970-01-01 00:00:00.000000000 +0000
-@@ -1,12 +0,0 @@
--README_amibin.txt for version 8.0 of Vim: Vi IMproved.
--
--See "README.txt" for general information about Vim.
--See "README_ami.txt" for installation instructions for the Amiga.
--These files are in the runtime archive (vim80rt.tgz).
--
--
--The Amiga "bin" archive contains the Vim executable for the Amiga.  It was
--compiled with "big" features.
--
--Postscript printing is not included to avoid requiring floating point
--computations.
-diff -Naur vim80.orig/README_amibin.txt.info vim80/README_amibin.txt.info
---- vim80.orig/README_amibin.txt.info	2017-04-23 18:29:57.000000000 +0000
-+++ vim80/README_amibin.txt.info	1970-01-01 00:00:00.000000000 +0000
-@@ -1 +0,0 @@
--ãN@'ð'­ j"eÀJ@ø~«ê©êšÿÿ×õP_ÿïþª¯ÿ×ÿU@_ÿïÿª ¯ÿ×ÿÕP_ÿïÿêš¯ÿ×ÿõT_ÿïÿúª¯ÿ×ÿýU_ÿïÿþª¯ÿ×ÿÿU@_ÿïÿÿÿà¯ÿ×ÿÿÿ}WÕQÿø|9ÿø(óÀ9ëÿ|óÀ8¯ÿÀ|£Ïçà|óÏ¹âê |óÅ9áÿø|óÏ¹àÿü|óÏ¹àþ|óÏ¹à;ÿ|óÅ9àÿ(óÏž ÿÀ|¡Oà|óÏ¹à@Ø~«ê©êšÿÿ×õP_ÿïêš¯ðx@_øª< ¯üªUP_þ¯ÿ*§T_ÿÀ¯ÿÊ©åU_ÿàð¿ÿòªyU@ÿø< ÿÿÿÿÿÿ}WÕQÿø|9ÿø(óÀ9ÿø|óßÿ¯ÿÀ|£ÏU×ÿà|óÇUkª°|óÿõÿø|óÕZê¬|òÿýþ|òuVº«|à?ÿ_ÿ(À
-U®ªÀ|ÿ×ÿà|T
-:c/MuchMore
-\ No newline at end of file
-diff -Naur vim80.orig/README_amisrc.txt vim80/README_amisrc.txt
---- vim80.orig/README_amisrc.txt	2017-04-23 18:29:57.000000000 +0000
-+++ vim80/README_amisrc.txt	1970-01-01 00:00:00.000000000 +0000
-@@ -1,11 +0,0 @@
--README_amisrc.txt for version 8.0 of Vim: Vi IMproved.
--
--See "README.txt" for general information about Vim.
--See "README_ami.txt" for installation instructions for the Amiga.
--These files are in the runtime archive (vim80rt.tgz).
--
--
--The Amiga source archive contains the files needed to compile Vim on the
--Amiga.
--
--See "src/INSTALLami.txt" for instructions on how to compile Vim on the Amiga.
-diff -Naur vim80.orig/README_amisrc.txt.info vim80/README_amisrc.txt.info
---- vim80.orig/README_amisrc.txt.info	2017-04-23 18:29:57.000000000 +0000
-+++ vim80/README_amisrc.txt.info	1970-01-01 00:00:00.000000000 +0000
-@@ -1 +0,0 @@
--ãß5@"­#Ñpj":Û*@x~«ê©êšÿÿ×õP_ÿïþª¯ÿ×ÿU@_ÿïÿª ¯ÿ×ÿÕP_ÿïÿêš¯ÿ×ÿõT_ÿïÿúª¯ÿ×ÿýU_ÿïÿþª¯ÿ×ÿÿU@_ÿïÿÿÿà¯ÿ×ÿÿÿ}WÕQÿø|9ÿø(óÀ9ëÿ|óÀ8¯ÿÀ|£Ïçà|óÏ¹âê |óÅ9áÿø|óÏ¹àÿü|óÏ¹àþ|óÏ¹à;ÿ|óÅ9àÿ(óÏž ÿÀ|¡Oà|óÏ¹à@X~«ê©êšÿÿ×õP_ÿïêš¯ðx@_øª< ¯üªUP_þ¯ÿ*§T_ÿÀ¯ÿÊ©åU_ÿàð¿ÿòªyU@ÿø< ÿÿÿÿÿÿ}WÕQÿø|9ÿø(óÀ9ÿø|óßÿ¯ÿÀ|£ÏU×ÿà|óÇUkª°|óÿõÿø|óÕZê¬|òÿýþ|òuVº«|à?ÿ_ÿ(À
-U®ªÀ|ÿ×ÿà|T
-:c/MuchMore
-\ No newline at end of file
-diff -Naur vim80.orig/README_bindos.txt vim80/README_bindos.txt
---- vim80.orig/README_bindos.txt	2017-04-23 18:29:57.000000000 +0000
-+++ vim80/README_bindos.txt	1970-01-01 00:00:00.000000000 +0000
-@@ -1,16 +0,0 @@
--README_bindos.txt for version 8.0 of Vim: Vi IMproved.
--
--See "README.txt" for general information about Vim.
--See "README_dos.txt" for installation instructions for MS-DOS and MS-Windows.
--These files are in the runtime archive (vim80rt.zip).
--
--
--There are several binary distributions of Vim for the PC.  You would normally
--pick only one of them, but it's also possible to install several.
--These ones are available (the version number may differ):
--	vim80w32.zip	Windows 95/98/NT/etc. console version
--	gvim80.zip	Windows 95/98/NT/etc. GUI version
--	gvim80ole.zip	Windows 95/98/NT/etc. GUI version with OLE
--
--You MUST also get the runtime archive (vim80rt.zip).
--The sources are also available (vim80src.zip).
-diff -Naur vim80.orig/README_dos.txt vim80/README_dos.txt
---- vim80.orig/README_dos.txt	2017-04-23 18:29:57.000000000 +0000
-+++ vim80/README_dos.txt	1970-01-01 00:00:00.000000000 +0000
-@@ -1,154 +0,0 @@
--README_dos.txt for version 8.0 of Vim: Vi IMproved.
--
--This file explains the installation of Vim on MS-DOS and MS-Windows systems.
--See "README.txt" for general information about Vim.
--
--There are two ways to install Vim:
--A. Use the self-installing .exe file.
--B. Unpack .zip files and run the install.exe program.
--
--
--A. Using the self-installing .exe
-----------------------------------
--
--This is mostly self-explaining.  Just follow the prompts and make the
--selections.  A few things to watch out for:
--
--- When an existing installation is detected, you are offered to first remove
--  this.  The uninstall program is then started while the install program waits
--  for it to complete.  Sometimes the windows overlap each other, which can be
--  confusing.  Be sure the complete the uninstalling before continuing the
--  installation.  Watch the taskbar for uninstall windows.
--
--- When selecting a directory to install Vim, use the same place where other
--  versions are located.  This makes it easier to find your _vimrc file.  For
--  example "C:\Program Files\vim" or "D:\vim".  A name ending in "vim" is
--  preferred.
--
--- After selecting the directory where to install Vim, clicking on "Next" will
--  start the installation.
--
--
--B. Using .zip files
---------------------
--
--These are the normal steps to install Vim from the .zip archives:
--
--1. Go to the directory where you want to put the Vim files.  Examples:
--	cd C:\
--	cd D:\editors
--   If you already have a "vim" directory, go to the directory in which it is
--   located.  Check the $VIM setting to see where it points to:
--	set VIM
--   For example, if you have
--	C:\vim\vim80
--   do
--	cd C:\
--   Binary and runtime Vim archives are normally unpacked in the same location,
--   on top of each other.
--
--2. Unpack the zip archives.  This will create a new directory "vim\vim80",
--   in which all the distributed Vim files are placed.  Since the directory
--   name includes the version number, it is unlikely that you overwrite
--   existing files.
--   Examples:
--	pkunzip -d gvim80.zip
--	unzip vim80w32.zip
--
--   You need to unpack the runtime archive and at least one of the binary
--   archives.  When using more than one binary version, be careful not to
--   overwrite one version with the other, the names of the executables
--   "vim.exe" and "gvim.exe" are the same.
--
--   After you unpacked the files, you can still move the whole directory tree
--   to another location.  That is where they will stay, the install program
--   won't move or copy the runtime files.
--
--   Only for the 32 bit DOS version on MS-DOS without DPMI support (trying to
--   run install.exe will produce an error message): Unpack the CSDPMI4B.ZIP
--   archive and follow the instructions in the documentation.
--
--3. Change to the new directory:
--	cd vim\vim80
--   Run the "install.exe" program.  It will ask you a number of questions about
--   how you would like to have your Vim setup.  Among these are:
--   - You can tell it to write a "_vimrc" file with your preferences in the
--     parent directory.
--   - It can also install an "Edit with Vim" entry in the Windows Explorer
--     popup menu.
--   - You can have it create batch files, so that you can run Vim from the
--     console or in a shell.  You can select one of the directories in your
--     $PATH.  If you skip this, you can add Vim to the search path manually:
--     The simplest is to add a line to your autoexec.bat.  Examples:
--	set path=%path%;C:\vim\vim80
--	set path=%path%;D:\editors\vim\vim80
--   - Create entries for Vim on the desktop and in the Start menu.
--
--That's it!
--
--
--Remarks:
--
--- If Vim can't find the runtime files, ":help" won't work and the GUI version
--  won't show a menubar.  Then you need to set the $VIM environment variable to
--  point to the top directory of your Vim files.  Example:
--    set VIM=C:\editors\vim
--  Vim version 8.0 will look for your vimrc file in $VIM, and for the runtime
--  files in $VIM/vim80.  See ":help $VIM" for more information.
--
--- To avoid confusion between distributed files of different versions and your
--  own modified vim scripts, it is recommended to use this directory layout:
--  ("C:\vim" is used here as the root, replace it with the path you use)
--  Your own files:
--	C:\vim\_vimrc			Your personal vimrc.
--	C:\vim\_viminfo			Dynamic info for 'viminfo'.
--	C:\vim\vimfiles\ftplugin\*.vim	Filetype plugins
--	C:\vim\...			Other files you made.
--  Distributed files:
--	C:\vim\vim80\vim.exe		The Vim version 8.0 executable.
--	C:\vim\vim80\doc\*.txt		The version 8.0 documentation files.
--	C:\vim\vim80\bugreport.vim	A Vim version 8.0 script.
--	C:\vim\vim80\...		Other version 8.0 distributed files.
--  In this case the $VIM environment variable would be set like this:
--	set VIM=C:\vim
--  Then $VIMRUNTIME will automatically be set to "$VIM\vim80".  Don't add
--  "vim80" to $VIM, that won't work.
--
--- You can put your Vim executable anywhere else.  If the executable is not
--  with the other Vim files, you should set $VIM. The simplest is to add a line
--  to your autoexec.bat.  Examples:
--	set VIM=c:\vim
--	set VIM=d:\editors\vim
--
--- If you have told the "install.exe" program to add the "Edit with Vim" menu
--  entry, you can remove it by running the "uninstal.exe".  See
--  ":help win32-popup-menu".
--
--- In Windows 95/98/NT you can create a shortcut to Vim.  This works for all
--  DOS and Win32 console versions.  For the console version this gives you the
--  opportunity to set defaults for the Console where Vim runs in.
--
--  1. On the desktop, click right to get a menu.  Select New/Shortcut.
--  2. In the dialog, enter Command line: "C:\command.com".  Click "Next".
--  3. Enter any name.  Click "Finish".
--     The new shortcut will appear on the desktop.
--  4. With the mouse pointer on the new shortcut, click right to get a menu.
--     Select Properties.
--  5. In the Program tab, change the "Cmdline" to add "/c" and the name of the
--     Vim executable.  Examples:
--	C:\command.com /c C:\vim\vim80\vim.exe
--	C:\command.com /c D:\editors\vim\vim80\vim.exe
--  6. Select the font, window size, etc. that you like.  If this isn't
--     possible, select "Advanced" in the Program tab, and deselect "MS-DOS
--     mode".
--  7. Click OK.
--
--  For gvim, you can use a normal shortcut on the desktop, and set the size of
--  the Window in your $VIM/_gvimrc:
--	set lines=30 columns=90
--
--
--For further information, type one of these inside Vim:
--	:help dos
--	:help msdos
--	:help win32
-diff -Naur vim80.orig/README_extra.txt vim80/README_extra.txt
---- vim80.orig/README_extra.txt	2017-04-23 18:29:57.000000000 +0000
-+++ vim80/README_extra.txt	1970-01-01 00:00:00.000000000 +0000
-@@ -1,51 +0,0 @@
--README_extra.txt for version 8.0 of Vim: Vi IMproved.
--
--These extra files of Vim are for special purposes.  This README explains what
--the files are for.  For general information about Vim, see the "README.txt"
--file.
--
--
--farsi/*			Files for the Farsi (persian) language.  If you don't
--			know what Farsi is, this is not for you.
--
--src/if_sniff.*		Interface to SNiFF.  If you don't know what SNiFF is,
--			this is not for you.
--
--src/os_amiga.*		Files for the Amiga port.
--
--src/gui_beos.*
--src/os_beos.*		Files for the BeOS port.
--
--src/os_msdos.*
--src/os_dos.*		Files for the MS-DOS port.
--
--src/gui_mac.*
--src/os_mac.*		Files for the Mac port.
--
--src/os_mint.8		Files for the Atari Mint port.
--
--src/os_os2*		Files for the OS/2 port.
--src/tee/*		Extra program for OS/2.
--
--src/os_vms*		Files for the VMS port.
--
--src/os_w32*
--src/os_win32.*		Files for the Win32 port.
--
--src/gui_w32.*		Files for the Win32 GUI.
--src/gui_w48.*		Files for the Win32 and Win16 GUI.
--src/Make_mvc.mak	MS Visual C++ makefile for the Win32 GUI.
--runtime/rgb.txt		File with color definitions for the Win32 GUI.
--
--src/if_ole.*		OLE automation interface, for MS Windows 95 and NT.
--
--src/VisVim/*		Integration of Win32 GUI with MS Visual Developer
--			Studio.
--
--src/GvimExt/*		DLL for the "Edit with Vim" context menu entry
--
--nsis/*			NSIS script to build the self-installing MS-Windows exe
--
--runtime/doc/*.man	Preprocessed manual pages.
--
--runtime/macros/file_select.vim	Vim script to browse directories (Unix only).
-diff -Naur vim80.orig/README_mac.txt vim80/README_mac.txt
---- vim80.orig/README_mac.txt	2017-04-23 18:29:57.000000000 +0000
-+++ vim80/README_mac.txt	1970-01-01 00:00:00.000000000 +0000
-@@ -1,28 +0,0 @@
--README_mac.txt for version 8.0 of Vim: Vi IMproved.
--
--This file explains the installation of Vim on Macintosh systems.
--See "README.txt" for general information about Vim.
--
--
--To build from sources, like on Unix
--
--1. Get the build tools: "clang" and "make".  These can be installed with the
--   "CommandLineTools" package.   If you don't have one, do
--	xcode-select --install
--   Just like for any software development with OS X.
--
--2. Get the source code.  Best is to use git (which you need to install first),
--   see http://www.vim.org/git.php
--   Or you can download and unpack the Unix tar archive, see
--   http://www.vim.org/download.php
--
--3. Go to the top directory of the source tree, do
--	make
--	sudo make install
--  A newly built vim will be installed under "/usr/local".
--
--
--If you can't manage to make this work, there is a fallback using Homebrew:
--
--1. Install Homebrew from http://brew.sh/
--2. Install latest Vim with:  brew install vim
-diff -Naur vim80.orig/README_ole.txt vim80/README_ole.txt
---- vim80.orig/README_ole.txt	2017-04-23 18:29:57.000000000 +0000
-+++ vim80/README_ole.txt	1970-01-01 00:00:00.000000000 +0000
-@@ -1,20 +0,0 @@
--README_ole.txt for version 8.0 of Vim: Vi IMproved.
--
--This archive contains gvim.exe with OLE interface and VisVim.
--This version of gvim.exe can also load a number of interface dynamically (you
--can optionally install the .dll files for each interface).
--It is only for MS-Windows 95/98/ME/NT/2000/XP.
--
--Also see the README_bindos.txt, README_dos.txt and README.txt files.
--
--Be careful not to overwrite the OLE gvim.exe with the non-OLE gvim.exe when
--unpacking another binary archive!  Check the output of ":version":
--	Win32s - "MS-Windows 16/32 bit GUI version"
--	 Win32 - "MS-Windows 32 bit GUI version"
--Win32 with OLE - "MS-Windows 32 bit GUI version with OLE support"
--
--For further information, type this inside Vim:
--	:help if_ole
--
--Furthermore, this archive contains VISVIM.DLL.  It can be used to integrate
--the OLE gvim with Microsoft Visual Developer Studio.  See VisVim/README.txt.
-diff -Naur vim80.orig/README_os2.txt vim80/README_os2.txt
---- vim80.orig/README_os2.txt	2017-04-23 18:29:57.000000000 +0000
-+++ vim80/README_os2.txt	1970-01-01 00:00:00.000000000 +0000
-@@ -1,5 +0,0 @@
--README_os2.txt for version 8.0 of Vim: Vi IMproved.
--
--This file used to explain the installation of Vim on OS/2 systems.
--However, support for OS/2 has been removed in patch 7.4.1008.
--See "README.txt" for general information about Vim.
-diff -Naur vim80.orig/README_os390.txt vim80/README_os390.txt
---- vim80.orig/README_os390.txt	2017-04-23 18:29:57.000000000 +0000
-+++ vim80/README_os390.txt	1970-01-01 00:00:00.000000000 +0000
-@@ -1,117 +0,0 @@
--README_zOS.txt for version 8.0 of Vim: Vi IMproved.
--
--This readme explains how to build Vim on z/OS.  Formerly called OS/390.
--See "README.txt" for general information about Vim.
--
--Most likely there are not many users out there using Vim on z/OS. So chances
--are good, that some bugs are still undiscovered.
--
--Getting the source to z/OS:
--==========================
--
--First get the source code in one big tar file and ftp it a binary to z/OS. If
--the tar file is initially compressed with gzip (tar.gz) or bzip2 (tar.bz2)
--uncompress it on your PC, as this tools are (most likely) not available on the
--mainframe.
--
--To reduce the size of the tar file you might compress it into a zip file. On
--z/OS Unix you might have the command "jar" from java to uncompress a zip. Use:
--        jar xvf <zip file name>
--
--Unpack the tar file on z/OS with 
--        pax -o from=ISO8859-1,to=IBM-1047 -rf vim.tar
--
--Note: The Vim source contains a few bitmaps etc which will be destroyed by
--this command, but these files are not needed on zOS (at least not for the
--console version).
--
--
--Compiling:
--==========
--
--Vim can be compiled with or without GUI support. For 7.4 only the compilation
--without GUI was tested. Below is a section about compiling with X11 but this
--is from an earlier version of Vim.
--
--Console only:
---------------
--
--If you build VIM without X11 support, compiling and building is nearly
--straightforward. 
--
--Change to the vim directory and do:
--
--    # Don't use c89!
--    # Allow intermixing of compiler options and files.
--
--    $ export CC=cc
--    $ export _CC_CCMODE=1
--    $./configure --with-features=big --without-x --enable-gui=no
--    $ cd src
--    $ make
--
--      There may be warnings:
--        - include files not found (libc, sys/param.h, ...)
--        - Redeclaration of ... differs from ...
--        -- just ignore them.
--
--    $ make test
--
--      This will produce lots of garbage on your screen (including error
--      messages). Don't worry.
--
--      If the test stops at one point in vim (might happen in test 11), just
--      press :q!
--
--      Expected test failures:
--        11: If you don't have gzip installed
--        24: test of backslash sequences in regexp are ASCII dependent
--        42: Multibyte is not supported on z/OS
--        55: ASCII<->EBCDIC sorting
--        57: ASCII<->EBCDIC sorting
--        58: Spell checking is not supported with EBCDIC
--        71: Blowfish encryption doesn't work
--
--    $ make install
--
--
--With X11:
-----------
--
--WARNING: This instruction was not tested with Vim 7.4 or later.
--
--There are two ways for building VIM with X11 support. The first way is simple
--and results in a big executable (~13 Mb), the second needs a few additional
--steps and results in a much smaller executable (~4.5 Mb). This examples assume
--you want Motif.
--
--  The easy way:
--    $ export CC=cc
--    $ export _CC_CCMODE=1
--    $ ./configure --enable-max-features --enable-gui=motif
--    $ cd src
--    $ make
--
--    With this VIM is linked statically with the X11 libraries.
--
--  The smarter way:
--    Make VIM as described above. Then create a file named 'link.sed' with the
--    following content (see src/link.390):
--
--	s/-lXext  *//g
--	s/-lXmu  *//g
--	s/-lXm	*/\/usr\/lib\/Xm.x /g
--	s/-lX11  */\/usr\/lib\/X11.x /g
--	s/-lXt	*//g
--	s/-lSM	*/\/usr\/lib\/SM.x /g
--	s/-lICE  */\/usr\/lib\/ICE.x /g
--
--    Then do:
--    $ rm vim
--    $ make
--
--    Now Vim is linked with the X11-DLLs.
--
--    See the Makefile and the file link.sh on how link.sed is used.
--
--
-diff -Naur vim80.orig/README_src.txt vim80/README_src.txt
---- vim80.orig/README_src.txt	2017-04-23 18:29:57.000000000 +0000
-+++ vim80/README_src.txt	1970-01-01 00:00:00.000000000 +0000
-@@ -1,8 +0,0 @@
--README_src.txt for version 8.0 of Vim: Vi IMproved.
--
--The source archive contains the files needed to compile Vim on Unix systems.
--It is packed for Unix systems (NL line separator).
--
--For more information, see the README.txt file that comes with the runtime
--archive (vim-8.0-rt.tar.gz).  To be able to run Vim you MUST get the runtime
--archive too!
-diff -Naur vim80.orig/README_srcdos.txt vim80/README_srcdos.txt
---- vim80.orig/README_srcdos.txt	2017-04-23 18:29:57.000000000 +0000
-+++ vim80/README_srcdos.txt	1970-01-01 00:00:00.000000000 +0000
-@@ -1,12 +0,0 @@
--README_srcdos.txt for version 8.0 of Vim: Vi IMproved.
--
--See "README.txt" for general information about Vim.
--See "README_dos.txt" for installation instructions for MS-DOS and MS-Windows.
--These files are in the runtime archive (vim80rt.zip).
--
--
--The DOS source archive contains the files needed to compile Vim on MS-DOS or
--MS-Windows.  It is packed for DOS systems, with CR-LF.  It also includes the
--VisVim sources.
--
--See "src/INSTALLpc.txt" for instructions on how to compile Vim on the PC.
-diff -Naur vim80.orig/README_unix.txt vim80/README_unix.txt
---- vim80.orig/README_unix.txt	2017-04-23 18:29:57.000000000 +0000
-+++ vim80/README_unix.txt	1970-01-01 00:00:00.000000000 +0000
-@@ -1,10 +0,0 @@
--README_unix.txt for version 8.0 of Vim: Vi IMproved.
--
--This file explains the installation of Vim on Unix systems.
--See "README.txt" for general information about Vim.
--
--
--When you use the source distribution, "make install" is used to install Vim.
--See the "INSTALL" file in the "src" directory.
--
--If you use a compiled package, follow the instructions for the package.
-diff -Naur vim80.orig/README_vms.txt vim80/README_vms.txt
---- vim80.orig/README_vms.txt	2017-04-23 18:29:57.000000000 +0000
-+++ vim80/README_vms.txt	1970-01-01 00:00:00.000000000 +0000
-@@ -1,48 +0,0 @@
--README_vms.txt for version 8.0 of Vim: Vi IMproved.
--
--This file explains the installation of Vim on VMS systems.
--See "README.txt" in the runtime archive for information about Vim.
--
--
--Most information can be found in the on-line documentation.  Use ":help vms"
--inside Vim.  Or get the runtime files and read runtime/doc/os_vms.txt to find
--out how to install and configure Vim with runtime files etc.
--
--To compile Vim yourself you need three archives:
--  vim-X.X-rt.tar.gz	runtime files
--  vim-X.X-src.tar.gz	source files
--  vim-X.X-extra.tar.gz	extra source files
--
--Compilation is recommended, in order to make sure that the correct
--libraries are used for your specific system.  Read about compiling in
--src/INSTALLvms.txt.
--
--To use the binary version, you need one of these archives:
--
--  vim-XX-exe-ia64-gui.zip       IA64 GUI/Motif executables
--  vim-XX-exe-ia64-gtk.zip       IA64 GUI/GTK executables
--  vim-XX-exe-ia64-term.zip      IA64 console executables
--  vim-XX-exe-axp-gui.zip	Alpha GUI/Motif executables
--  vim-XX-exe-axp-gtk.zip	Alpha GUI/GTK executables
--  vim-XX-exe-axp-term.zip       Alpha console executables
--  vim-XX-exe-vax-gui.zip	VAX GUI executables
--  vim-XX-exe-vax-term.zip       VAX console executables
--
--and of course
--  vim-XX-runtime.zip		runtime files
--
--The binary archives contain: vim.exe, ctags.exe, xxd.exe files,
--but there are also prepared "deploy ready" archives:
--
--vim-XX-ia64.zip			GUI and console executables with runtime and
--				help files for IA64 systems
--vim-XX-axp.zip			GUI and console executables with runtime and
--				help files for Alpha systems
--vim-XX-vax.zip			GUI and console executables with runtime and
--				help files for VAX systems
--
--GTK builds need LIBGTK library installed.
--
--These executables and up to date patches for OpenVMS system are downloadable
--from http://www.polarhome.com/vim/ or ftp://ftp.polarhome.com/pub/vim/
--
-diff -Naur vim80.orig/README_w32s.txt vim80/README_w32s.txt
---- vim80.orig/README_w32s.txt	2017-04-23 18:29:57.000000000 +0000
-+++ vim80/README_w32s.txt	1970-01-01 00:00:00.000000000 +0000
-@@ -1,15 +0,0 @@
--README_w32s.txt for version 8.0 of Vim: Vi IMproved.
--
--This archive contains the gvim.exe that was specifically compiled for use in
--the Win32s subsystem in MS-Windows 3.1 and 3.11.
--
--Also see the README_bindos.txt, README_dos.txt and README.txt files.
--
--Be careful not to overwrite the Win32s gvim.exe with the another gvim.exe when
--unpacking another binary archive!  Check the output of ":version":
--	Win32s - "MS-Windows 16/32 bit GUI version"
--	 Win32 - "MS-Windows 32 bit GUI version"
--Win32 with OLE - "MS-Windows 32 bit GUI version with OLE support"
--
--For further information, type this inside Vim:
--	:help win32s
-diff -Naur vim80.orig/READMEdir/Contents vim80/READMEdir/Contents
---- vim80.orig/READMEdir/Contents	1970-01-01 00:00:00.000000000 +0000
-+++ vim80/READMEdir/Contents	2017-05-15 23:29:16.931774798 +0000
-@@ -0,0 +1,23 @@
-+Vim		Vi IMproved.  A clone of the UNIX text editor Vi.  Very useful
-+		for editing programs and other plain ASCII text.  Full Vi
-+		compatibility and includes all Ex commands.  Extra features
-+		above Vi: Multilevel undo, multiple windows, syntax
-+		highlighting, command line history, folding, improved command
-+		line editing, command typeahead display, command to display
-+		yank buffers, possibility to edit binary files, file name
-+		stack, support for Manx QuickFix and other compiler's error
-+		messages, shows current file name in window title, on-line
-+		help, rectangular cut/paste, etc., etc., etc...
-+
-+		Version 8.0.  Also runs under UNIX, MS-Windows, Mac, etc.
-+		vim80rt.tgz  contains the documentation and syntax files.
-+		vim80bin.tgz contains the binaries.
-+		vim80src.tgz contains the sources.
-+		Author: Bram Moolenaar et al.
-+
-+
-+Xxd		Hex dumper and reader.  Can be used to view files as hex, edit
-+		them and write them back.  Can also be used to patch files.
-+
-+		Version 1.10 (1997 May 22)
-+		Author: Juergen Weigert
-diff -Naur vim80.orig/READMEdir/Contents.info vim80/READMEdir/Contents.info
---- vim80.orig/READMEdir/Contents.info	1970-01-01 00:00:00.000000000 +0000
-+++ vim80/READMEdir/Contents.info	2017-05-15 23:29:16.931774798 +0000
-@@ -0,0 +1 @@
-+ã@"ªø"« j"7X@ž~«ê©êšÿÿ×õP_ÿïþª¯ÿ×ÿU@_ÿïÿª ¯ÿ×ÿÕP_ÿïÿêš¯ÿ×ÿõT_ÿïÿúª¯ÿ×ÿýU_ÿïÿþª¯ÿ×ÿÿU@_ÿïÿÿÿà¯ÿ×ÿÿÿ}WÕQÿø|9ÿø(óÀ9ëÿ|óÀ8¯ÿÀ|£Ïçà|óÏ¹âê |óÅ9áÿø|óÏ¹àÿü|óÏ¹àþ|óÏ¹à;ÿ|óÅ9àÿ(óÏž ÿÀ|¡Oà|óÏ¹à@~«ê©êšÿÿ×õP_ÿïêš¯ðx@_øª< ¯üªUP_þ¯ÿ*§T_ÿÀ¯ÿÊ©åU_ÿàð¿ÿòªyU@ÿø< ÿÿÿÿÿÿ}WÕQÿø|9ÿø(óÀ9ÿø|óßÿ¯ÿÀ|£ÏU×ÿà|óÇUkª°|óÿõÿø|óÕZê¬|òÿýþ|òuVº«|à?ÿ_ÿ(À
-U®ªÀ|ÿ×ÿà|T
-:c/MuchMore
-\ No newline at end of file
-diff -Naur vim80.orig/READMEdir/README.txt.info vim80/READMEdir/README.txt.info
---- vim80.orig/READMEdir/README.txt.info	1970-01-01 00:00:00.000000000 +0000
-+++ vim80/READMEdir/README.txt.info	2017-05-15 23:29:16.931774798 +0000
-@@ -0,0 +1 @@
-+ã\@&ç(&ô°j"BX@ž~«ê©êšÿÿ×õP_ÿïþª¯ÿ×ÿU@_ÿïÿª ¯ÿ×ÿÕP_ÿïÿêš¯ÿ×ÿõT_ÿïÿúª¯ÿ×ÿýU_ÿïÿþª¯ÿ×ÿÿU@_ÿïÿÿÿà¯ÿ×ÿÿÿ}WÕQÿø|9ÿø(óÀ9ëÿ|óÀ8¯ÿÀ|£Ïçà|óÏ¹âê |óÅ9áÿø|óÏ¹àÿü|óÏ¹àþ|óÏ¹à;ÿ|óÅ9àÿ(óÏž ÿÀ|¡Oà|óÏ¹à@~«ê©êšÿÿ×õP_ÿïêš¯ðx@_øª< ¯üªUP_þ¯ÿ*§T_ÿÀ¯ÿÊ©åU_ÿàð¿ÿòªyU@ÿø< ÿÿÿÿÿÿ}WÕQÿø|9ÿø(óÀ9ÿø|óßÿ¯ÿÀ|£ÏU×ÿà|óÇUkª°|óÿõÿø|óÕZê¬|òÿýþ|òuVº«|à?ÿ_ÿ(À
-U®ªÀ|ÿ×ÿà|T
-:c/MuchMore
-\ No newline at end of file
-diff -Naur vim80.orig/READMEdir/README_ami.txt vim80/READMEdir/README_ami.txt
---- vim80.orig/READMEdir/README_ami.txt	1970-01-01 00:00:00.000000000 +0000
-+++ vim80/READMEdir/README_ami.txt	2017-05-15 23:29:16.931774798 +0000
-@@ -0,0 +1,32 @@
-+README_ami.txt for version 8.0 of Vim: Vi IMproved.
-+
-+This file explains the installation of Vim on Amiga systems.
-+See README.txt for general information about Vim.
-+
-+
-+Unpack the distributed files in the place where you want to keep them.  It is
-+wise to have a "vim" directory to keep your vimrc file and any other files you
-+change.  The distributed files go into a subdirectory.  This way you can
-+easily upgrade to a new version.  For example:
-+
-+  dh0:editors/vim		contains your vimrc and modified files
-+  dh0:editors/vim/vim54		contains the Vim version 5.4 distributed files
-+  dh0:editors/vim/vim55		contains the Vim version 5.5 distributed files
-+
-+You would then unpack the archives like this:
-+
-+  cd dh0:editors
-+  tar xf t:vim80bin.tar
-+  tar xf t:vim80rt.tar
-+
-+Set the $VIM environment variable to point to the top directory of your Vim
-+files.  For the above example:
-+
-+  set VIM=dh0:editors/vim
-+
-+Vim version 5.4 will look for your vimrc file in $VIM, and for the runtime
-+files in $VIM/vim54.  See ":help $VIM" for more information.
-+
-+Make sure the Vim executable is in your search path.  Either copy the Vim
-+executable to a directory that is in your search path, or (preferred) modify
-+the search path to include the directory where the Vim executable is.
-diff -Naur vim80.orig/READMEdir/README_ami.txt.info vim80/READMEdir/README_ami.txt.info
---- vim80.orig/READMEdir/README_ami.txt.info	1970-01-01 00:00:00.000000000 +0000
-+++ vim80/READMEdir/README_ami.txt.info	2017-05-15 23:29:16.932774812 +0000
-@@ -0,0 +1 @@
-+ãÆ@'R8'Sj"TÂ@x~«ê©êšÿÿ×õP_ÿïþª¯ÿ×ÿU@_ÿïÿª ¯ÿ×ÿÕP_ÿïÿêš¯ÿ×ÿõT_ÿïÿúª¯ÿ×ÿýU_ÿïÿþª¯ÿ×ÿÿU@_ÿïÿÿÿà¯ÿ×ÿÿÿ}WÕQÿø|9ÿø(óÀ9ëÿ|óÀ8¯ÿÀ|£Ïçà|óÏ¹âê |óÅ9áÿø|óÏ¹àÿü|óÏ¹àþ|óÏ¹à;ÿ|óÅ9àÿ(óÏž ÿÀ|¡Oà|óÏ¹à@X~«ê©êšÿÿ×õP_ÿïêš¯ðx@_øª< ¯üªUP_þ¯ÿ*§T_ÿÀ¯ÿÊ©åU_ÿàð¿ÿòªyU@ÿø< ÿÿÿÿÿÿ}WÕQÿø|9ÿø(óÀ9ÿø|óßÿ¯ÿÀ|£ÏU×ÿà|óÇUkª°|óÿõÿø|óÕZê¬|òÿýþ|òuVº«|à?ÿ_ÿ(À
-U®ªÀ|ÿ×ÿà|T
-:c/MuchMore
-\ No newline at end of file
-diff -Naur vim80.orig/READMEdir/README_amibin.txt vim80/READMEdir/README_amibin.txt
---- vim80.orig/READMEdir/README_amibin.txt	1970-01-01 00:00:00.000000000 +0000
-+++ vim80/READMEdir/README_amibin.txt	2017-05-15 23:29:16.932774812 +0000
-@@ -0,0 +1,12 @@
-+README_amibin.txt for version 8.0 of Vim: Vi IMproved.
-+
-+See "README.txt" for general information about Vim.
-+See "README_ami.txt" for installation instructions for the Amiga.
-+These files are in the runtime archive (vim80rt.tgz).
-+
-+
-+The Amiga "bin" archive contains the Vim executable for the Amiga.  It was
-+compiled with "big" features.
-+
-+Postscript printing is not included to avoid requiring floating point
-+computations.
-diff -Naur vim80.orig/READMEdir/README_amibin.txt.info vim80/READMEdir/README_amibin.txt.info
---- vim80.orig/READMEdir/README_amibin.txt.info	1970-01-01 00:00:00.000000000 +0000
-+++ vim80/READMEdir/README_amibin.txt.info	2017-05-15 23:29:16.932774812 +0000
-@@ -0,0 +1 @@
-+ãN@'ð'­ j"eÀJ@ø~«ê©êšÿÿ×õP_ÿïþª¯ÿ×ÿU@_ÿïÿª ¯ÿ×ÿÕP_ÿïÿêš¯ÿ×ÿõT_ÿïÿúª¯ÿ×ÿýU_ÿïÿþª¯ÿ×ÿÿU@_ÿïÿÿÿà¯ÿ×ÿÿÿ}WÕQÿø|9ÿø(óÀ9ëÿ|óÀ8¯ÿÀ|£Ïçà|óÏ¹âê |óÅ9áÿø|óÏ¹àÿü|óÏ¹àþ|óÏ¹à;ÿ|óÅ9àÿ(óÏž ÿÀ|¡Oà|óÏ¹à@Ø~«ê©êšÿÿ×õP_ÿïêš¯ðx@_øª< ¯üªUP_þ¯ÿ*§T_ÿÀ¯ÿÊ©åU_ÿàð¿ÿòªyU@ÿø< ÿÿÿÿÿÿ}WÕQÿø|9ÿø(óÀ9ÿø|óßÿ¯ÿÀ|£ÏU×ÿà|óÇUkª°|óÿõÿø|óÕZê¬|òÿýþ|òuVº«|à?ÿ_ÿ(À
-U®ªÀ|ÿ×ÿà|T
-:c/MuchMore
-\ No newline at end of file
-diff -Naur vim80.orig/READMEdir/README_amisrc.txt vim80/READMEdir/README_amisrc.txt
---- vim80.orig/READMEdir/README_amisrc.txt	1970-01-01 00:00:00.000000000 +0000
-+++ vim80/READMEdir/README_amisrc.txt	2017-05-15 23:29:16.934774840 +0000
-@@ -0,0 +1,11 @@
-+README_amisrc.txt for version 8.0 of Vim: Vi IMproved.
-+
-+See "README.txt" for general information about Vim.
-+See "README_ami.txt" for installation instructions for the Amiga.
-+These files are in the runtime archive (vim80rt.tgz).
-+
-+
-+The Amiga source archive contains the files needed to compile Vim on the
-+Amiga.
-+
-+See "src/INSTALLami.txt" for instructions on how to compile Vim on the Amiga.
-diff -Naur vim80.orig/READMEdir/README_amisrc.txt.info vim80/READMEdir/README_amisrc.txt.info
---- vim80.orig/READMEdir/README_amisrc.txt.info	1970-01-01 00:00:00.000000000 +0000
-+++ vim80/READMEdir/README_amisrc.txt.info	2017-05-15 23:29:16.934774840 +0000
-@@ -0,0 +1 @@
-+ãß5@"­#Ñpj":Û*@x~«ê©êšÿÿ×õP_ÿïþª¯ÿ×ÿU@_ÿïÿª ¯ÿ×ÿÕP_ÿïÿêš¯ÿ×ÿõT_ÿïÿúª¯ÿ×ÿýU_ÿïÿþª¯ÿ×ÿÿU@_ÿïÿÿÿà¯ÿ×ÿÿÿ}WÕQÿø|9ÿø(óÀ9ëÿ|óÀ8¯ÿÀ|£Ïçà|óÏ¹âê |óÅ9áÿø|óÏ¹àÿü|óÏ¹àþ|óÏ¹à;ÿ|óÅ9àÿ(óÏž ÿÀ|¡Oà|óÏ¹à@X~«ê©êšÿÿ×õP_ÿïêš¯ðx@_øª< ¯üªUP_þ¯ÿ*§T_ÿÀ¯ÿÊ©åU_ÿàð¿ÿòªyU@ÿø< ÿÿÿÿÿÿ}WÕQÿø|9ÿø(óÀ9ÿø|óßÿ¯ÿÀ|£ÏU×ÿà|óÇUkª°|óÿõÿø|óÕZê¬|òÿýþ|òuVº«|à?ÿ_ÿ(À
-U®ªÀ|ÿ×ÿà|T
-:c/MuchMore
-\ No newline at end of file
-diff -Naur vim80.orig/READMEdir/README_bindos.txt vim80/READMEdir/README_bindos.txt
---- vim80.orig/READMEdir/README_bindos.txt	1970-01-01 00:00:00.000000000 +0000
-+++ vim80/READMEdir/README_bindos.txt	2017-05-15 23:29:16.934774840 +0000
-@@ -0,0 +1,16 @@
-+README_bindos.txt for version 8.0 of Vim: Vi IMproved.
-+
-+See "README.txt" for general information about Vim.
-+See "README_dos.txt" for installation instructions for MS-DOS and MS-Windows.
-+These files are in the runtime archive (vim80rt.zip).
-+
-+
-+There are several binary distributions of Vim for the PC.  You would normally
-+pick only one of them, but it's also possible to install several.
-+These ones are available (the version number may differ):
-+	vim80w32.zip	Windows 95/98/NT/etc. console version
-+	gvim80.zip	Windows 95/98/NT/etc. GUI version
-+	gvim80ole.zip	Windows 95/98/NT/etc. GUI version with OLE
-+
-+You MUST also get the runtime archive (vim80rt.zip).
-+The sources are also available (vim80src.zip).
-diff -Naur vim80.orig/READMEdir/README_dos.txt vim80/READMEdir/README_dos.txt
---- vim80.orig/READMEdir/README_dos.txt	1970-01-01 00:00:00.000000000 +0000
-+++ vim80/READMEdir/README_dos.txt	2017-05-15 23:29:16.934774840 +0000
-@@ -0,0 +1,154 @@
-+README_dos.txt for version 8.0 of Vim: Vi IMproved.
-+
-+This file explains the installation of Vim on MS-DOS and MS-Windows systems.
-+See "README.txt" for general information about Vim.
-+
-+There are two ways to install Vim:
-+A. Use the self-installing .exe file.
-+B. Unpack .zip files and run the install.exe program.
-+
-+
-+A. Using the self-installing .exe
-+---------------------------------
-+
-+This is mostly self-explaining.  Just follow the prompts and make the
-+selections.  A few things to watch out for:
-+
-+- When an existing installation is detected, you are offered to first remove
-+  this.  The uninstall program is then started while the install program waits
-+  for it to complete.  Sometimes the windows overlap each other, which can be
-+  confusing.  Be sure the complete the uninstalling before continuing the
-+  installation.  Watch the taskbar for uninstall windows.
-+
-+- When selecting a directory to install Vim, use the same place where other
-+  versions are located.  This makes it easier to find your _vimrc file.  For
-+  example "C:\Program Files\vim" or "D:\vim".  A name ending in "vim" is
-+  preferred.
-+
-+- After selecting the directory where to install Vim, clicking on "Next" will
-+  start the installation.
-+
-+
-+B. Using .zip files
-+-------------------
-+
-+These are the normal steps to install Vim from the .zip archives:
-+
-+1. Go to the directory where you want to put the Vim files.  Examples:
-+	cd C:\
-+	cd D:\editors
-+   If you already have a "vim" directory, go to the directory in which it is
-+   located.  Check the $VIM setting to see where it points to:
-+	set VIM
-+   For example, if you have
-+	C:\vim\vim80
-+   do
-+	cd C:\
-+   Binary and runtime Vim archives are normally unpacked in the same location,
-+   on top of each other.
-+
-+2. Unpack the zip archives.  This will create a new directory "vim\vim80",
-+   in which all the distributed Vim files are placed.  Since the directory
-+   name includes the version number, it is unlikely that you overwrite
-+   existing files.
-+   Examples:
-+	pkunzip -d gvim80.zip
-+	unzip vim80w32.zip
-+
-+   You need to unpack the runtime archive and at least one of the binary
-+   archives.  When using more than one binary version, be careful not to
-+   overwrite one version with the other, the names of the executables
-+   "vim.exe" and "gvim.exe" are the same.
-+
-+   After you unpacked the files, you can still move the whole directory tree
-+   to another location.  That is where they will stay, the install program
-+   won't move or copy the runtime files.
-+
-+   Only for the 32 bit DOS version on MS-DOS without DPMI support (trying to
-+   run install.exe will produce an error message): Unpack the CSDPMI4B.ZIP
-+   archive and follow the instructions in the documentation.
-+
-+3. Change to the new directory:
-+	cd vim\vim80
-+   Run the "install.exe" program.  It will ask you a number of questions about
-+   how you would like to have your Vim setup.  Among these are:
-+   - You can tell it to write a "_vimrc" file with your preferences in the
-+     parent directory.
-+   - It can also install an "Edit with Vim" entry in the Windows Explorer
-+     popup menu.
-+   - You can have it create batch files, so that you can run Vim from the
-+     console or in a shell.  You can select one of the directories in your
-+     $PATH.  If you skip this, you can add Vim to the search path manually:
-+     The simplest is to add a line to your autoexec.bat.  Examples:
-+	set path=%path%;C:\vim\vim80
-+	set path=%path%;D:\editors\vim\vim80
-+   - Create entries for Vim on the desktop and in the Start menu.
-+
-+That's it!
-+
-+
-+Remarks:
-+
-+- If Vim can't find the runtime files, ":help" won't work and the GUI version
-+  won't show a menubar.  Then you need to set the $VIM environment variable to
-+  point to the top directory of your Vim files.  Example:
-+    set VIM=C:\editors\vim
-+  Vim version 8.0 will look for your vimrc file in $VIM, and for the runtime
-+  files in $VIM/vim80.  See ":help $VIM" for more information.
-+
-+- To avoid confusion between distributed files of different versions and your
-+  own modified vim scripts, it is recommended to use this directory layout:
-+  ("C:\vim" is used here as the root, replace it with the path you use)
-+  Your own files:
-+	C:\vim\_vimrc			Your personal vimrc.
-+	C:\vim\_viminfo			Dynamic info for 'viminfo'.
-+	C:\vim\vimfiles\ftplugin\*.vim	Filetype plugins
-+	C:\vim\...			Other files you made.
-+  Distributed files:
-+	C:\vim\vim80\vim.exe		The Vim version 8.0 executable.
-+	C:\vim\vim80\doc\*.txt		The version 8.0 documentation files.
-+	C:\vim\vim80\bugreport.vim	A Vim version 8.0 script.
-+	C:\vim\vim80\...		Other version 8.0 distributed files.
-+  In this case the $VIM environment variable would be set like this:
-+	set VIM=C:\vim
-+  Then $VIMRUNTIME will automatically be set to "$VIM\vim80".  Don't add
-+  "vim80" to $VIM, that won't work.
-+
-+- You can put your Vim executable anywhere else.  If the executable is not
-+  with the other Vim files, you should set $VIM. The simplest is to add a line
-+  to your autoexec.bat.  Examples:
-+	set VIM=c:\vim
-+	set VIM=d:\editors\vim
-+
-+- If you have told the "install.exe" program to add the "Edit with Vim" menu
-+  entry, you can remove it by running the "uninstal.exe".  See
-+  ":help win32-popup-menu".
-+
-+- In Windows 95/98/NT you can create a shortcut to Vim.  This works for all
-+  DOS and Win32 console versions.  For the console version this gives you the
-+  opportunity to set defaults for the Console where Vim runs in.
-+
-+  1. On the desktop, click right to get a menu.  Select New/Shortcut.
-+  2. In the dialog, enter Command line: "C:\command.com".  Click "Next".
-+  3. Enter any name.  Click "Finish".
-+     The new shortcut will appear on the desktop.
-+  4. With the mouse pointer on the new shortcut, click right to get a menu.
-+     Select Properties.
-+  5. In the Program tab, change the "Cmdline" to add "/c" and the name of the
-+     Vim executable.  Examples:
-+	C:\command.com /c C:\vim\vim80\vim.exe
-+	C:\command.com /c D:\editors\vim\vim80\vim.exe
-+  6. Select the font, window size, etc. that you like.  If this isn't
-+     possible, select "Advanced" in the Program tab, and deselect "MS-DOS
-+     mode".
-+  7. Click OK.
-+
-+  For gvim, you can use a normal shortcut on the desktop, and set the size of
-+  the Window in your $VIM/_gvimrc:
-+	set lines=30 columns=90
-+
-+
-+For further information, type one of these inside Vim:
-+	:help dos
-+	:help msdos
-+	:help win32
-diff -Naur vim80.orig/READMEdir/README_extra.txt vim80/READMEdir/README_extra.txt
---- vim80.orig/READMEdir/README_extra.txt	1970-01-01 00:00:00.000000000 +0000
-+++ vim80/READMEdir/README_extra.txt	2017-05-15 23:29:16.934774840 +0000
-@@ -0,0 +1,51 @@
-+README_extra.txt for version 8.0 of Vim: Vi IMproved.
-+
-+These extra files of Vim are for special purposes.  This README explains what
-+the files are for.  For general information about Vim, see the "README.txt"
-+file.
-+
-+
-+farsi/*			Files for the Farsi (persian) language.  If you don't
-+			know what Farsi is, this is not for you.
-+
-+src/if_sniff.*		Interface to SNiFF.  If you don't know what SNiFF is,
-+			this is not for you.
-+
-+src/os_amiga.*		Files for the Amiga port.
-+
-+src/gui_beos.*
-+src/os_beos.*		Files for the BeOS port.
-+
-+src/os_msdos.*
-+src/os_dos.*		Files for the MS-DOS port.
-+
-+src/gui_mac.*
-+src/os_mac.*		Files for the Mac port.
-+
-+src/os_mint.8		Files for the Atari Mint port.
-+
-+src/os_os2*		Files for the OS/2 port.
-+src/tee/*		Extra program for OS/2.
-+
-+src/os_vms*		Files for the VMS port.
-+
-+src/os_w32*
-+src/os_win32.*		Files for the Win32 port.
-+
-+src/gui_w32.*		Files for the Win32 GUI.
-+src/gui_w48.*		Files for the Win32 and Win16 GUI.
-+src/Make_mvc.mak	MS Visual C++ makefile for the Win32 GUI.
-+runtime/rgb.txt		File with color definitions for the Win32 GUI.
-+
-+src/if_ole.*		OLE automation interface, for MS Windows 95 and NT.
-+
-+src/VisVim/*		Integration of Win32 GUI with MS Visual Developer
-+			Studio.
-+
-+src/GvimExt/*		DLL for the "Edit with Vim" context menu entry
-+
-+nsis/*			NSIS script to build the self-installing MS-Windows exe
-+
-+runtime/doc/*.man	Preprocessed manual pages.
-+
-+runtime/macros/file_select.vim	Vim script to browse directories (Unix only).
-diff -Naur vim80.orig/READMEdir/README_mac.txt vim80/READMEdir/README_mac.txt
---- vim80.orig/READMEdir/README_mac.txt	1970-01-01 00:00:00.000000000 +0000
-+++ vim80/READMEdir/README_mac.txt	2017-05-15 23:29:16.935774854 +0000
-@@ -0,0 +1,28 @@
-+README_mac.txt for version 8.0 of Vim: Vi IMproved.
-+
-+This file explains the installation of Vim on Macintosh systems.
-+See "README.txt" for general information about Vim.
-+
-+
-+To build from sources, like on Unix
-+
-+1. Get the build tools: "clang" and "make".  These can be installed with the
-+   "CommandLineTools" package.   If you don't have one, do
-+	xcode-select --install
-+   Just like for any software development with OS X.
-+
-+2. Get the source code.  Best is to use git (which you need to install first),
-+   see http://www.vim.org/git.php
-+   Or you can download and unpack the Unix tar archive, see
-+   http://www.vim.org/download.php
-+
-+3. Go to the top directory of the source tree, do
-+	make
-+	sudo make install
-+  A newly built vim will be installed under "/usr/local".
-+
-+
-+If you can't manage to make this work, there is a fallback using Homebrew:
-+
-+1. Install Homebrew from http://brew.sh/
-+2. Install latest Vim with:  brew install vim
-diff -Naur vim80.orig/READMEdir/README_ole.txt vim80/READMEdir/README_ole.txt
---- vim80.orig/READMEdir/README_ole.txt	1970-01-01 00:00:00.000000000 +0000
-+++ vim80/READMEdir/README_ole.txt	2017-05-15 23:29:16.935774854 +0000
-@@ -0,0 +1,20 @@
-+README_ole.txt for version 8.0 of Vim: Vi IMproved.
-+
-+This archive contains gvim.exe with OLE interface and VisVim.
-+This version of gvim.exe can also load a number of interface dynamically (you
-+can optionally install the .dll files for each interface).
-+It is only for MS-Windows 95/98/ME/NT/2000/XP.
-+
-+Also see the README_bindos.txt, README_dos.txt and README.txt files.
-+
-+Be careful not to overwrite the OLE gvim.exe with the non-OLE gvim.exe when
-+unpacking another binary archive!  Check the output of ":version":
-+	Win32s - "MS-Windows 16/32 bit GUI version"
-+	 Win32 - "MS-Windows 32 bit GUI version"
-+Win32 with OLE - "MS-Windows 32 bit GUI version with OLE support"
-+
-+For further information, type this inside Vim:
-+	:help if_ole
-+
-+Furthermore, this archive contains VISVIM.DLL.  It can be used to integrate
-+the OLE gvim with Microsoft Visual Developer Studio.  See VisVim/README.txt.
-diff -Naur vim80.orig/READMEdir/README_os2.txt vim80/READMEdir/README_os2.txt
---- vim80.orig/READMEdir/README_os2.txt	1970-01-01 00:00:00.000000000 +0000
-+++ vim80/READMEdir/README_os2.txt	2017-05-15 23:29:16.935774854 +0000
-@@ -0,0 +1,5 @@
-+README_os2.txt for version 8.0 of Vim: Vi IMproved.
-+
-+This file used to explain the installation of Vim on OS/2 systems.
-+However, support for OS/2 has been removed in patch 7.4.1008.
-+See "README.txt" for general information about Vim.
-diff -Naur vim80.orig/READMEdir/README_os390.txt vim80/READMEdir/README_os390.txt
---- vim80.orig/READMEdir/README_os390.txt	1970-01-01 00:00:00.000000000 +0000
-+++ vim80/READMEdir/README_os390.txt	2017-05-15 23:29:16.937774882 +0000
-@@ -0,0 +1,117 @@
-+README_zOS.txt for version 8.0 of Vim: Vi IMproved.
-+
-+This readme explains how to build Vim on z/OS.  Formerly called OS/390.
-+See "README.txt" for general information about Vim.
-+
-+Most likely there are not many users out there using Vim on z/OS. So chances
-+are good, that some bugs are still undiscovered.
-+
-+Getting the source to z/OS:
-+==========================
-+
-+First get the source code in one big tar file and ftp it a binary to z/OS. If
-+the tar file is initially compressed with gzip (tar.gz) or bzip2 (tar.bz2)
-+uncompress it on your PC, as this tools are (most likely) not available on the
-+mainframe.
-+
-+To reduce the size of the tar file you might compress it into a zip file. On
-+z/OS Unix you might have the command "jar" from java to uncompress a zip. Use:
-+        jar xvf <zip file name>
-+
-+Unpack the tar file on z/OS with 
-+        pax -o from=ISO8859-1,to=IBM-1047 -rf vim.tar
-+
-+Note: The Vim source contains a few bitmaps etc which will be destroyed by
-+this command, but these files are not needed on zOS (at least not for the
-+console version).
-+
-+
-+Compiling:
-+==========
-+
-+Vim can be compiled with or without GUI support. For 7.4 only the compilation
-+without GUI was tested. Below is a section about compiling with X11 but this
-+is from an earlier version of Vim.
-+
-+Console only:
-+-------------
-+
-+If you build VIM without X11 support, compiling and building is nearly
-+straightforward. 
-+
-+Change to the vim directory and do:
-+
-+    # Don't use c89!
-+    # Allow intermixing of compiler options and files.
-+
-+    $ export CC=cc
-+    $ export _CC_CCMODE=1
-+    $./configure --with-features=big --without-x --enable-gui=no
-+    $ cd src
-+    $ make
-+
-+      There may be warnings:
-+        - include files not found (libc, sys/param.h, ...)
-+        - Redeclaration of ... differs from ...
-+        -- just ignore them.
-+
-+    $ make test
-+
-+      This will produce lots of garbage on your screen (including error
-+      messages). Don't worry.
-+
-+      If the test stops at one point in vim (might happen in test 11), just
-+      press :q!
-+
-+      Expected test failures:
-+        11: If you don't have gzip installed
-+        24: test of backslash sequences in regexp are ASCII dependent
-+        42: Multibyte is not supported on z/OS
-+        55: ASCII<->EBCDIC sorting
-+        57: ASCII<->EBCDIC sorting
-+        58: Spell checking is not supported with EBCDIC
-+        71: Blowfish encryption doesn't work
-+
-+    $ make install
-+
-+
-+With X11:
-+---------
-+
-+WARNING: This instruction was not tested with Vim 7.4 or later.
-+
-+There are two ways for building VIM with X11 support. The first way is simple
-+and results in a big executable (~13 Mb), the second needs a few additional
-+steps and results in a much smaller executable (~4.5 Mb). This examples assume
-+you want Motif.
-+
-+  The easy way:
-+    $ export CC=cc
-+    $ export _CC_CCMODE=1
-+    $ ./configure --enable-max-features --enable-gui=motif
-+    $ cd src
-+    $ make
-+
-+    With this VIM is linked statically with the X11 libraries.
-+
-+  The smarter way:
-+    Make VIM as described above. Then create a file named 'link.sed' with the
-+    following content (see src/link.390):
-+
-+	s/-lXext  *//g
-+	s/-lXmu  *//g
-+	s/-lXm	*/\/usr\/lib\/Xm.x /g
-+	s/-lX11  */\/usr\/lib\/X11.x /g
-+	s/-lXt	*//g
-+	s/-lSM	*/\/usr\/lib\/SM.x /g
-+	s/-lICE  */\/usr\/lib\/ICE.x /g
-+
-+    Then do:
-+    $ rm vim
-+    $ make
-+
-+    Now Vim is linked with the X11-DLLs.
-+
-+    See the Makefile and the file link.sh on how link.sed is used.
-+
-+
-diff -Naur vim80.orig/READMEdir/README_src.txt vim80/READMEdir/README_src.txt
---- vim80.orig/READMEdir/README_src.txt	1970-01-01 00:00:00.000000000 +0000
-+++ vim80/READMEdir/README_src.txt	2017-05-15 23:29:16.937774882 +0000
-@@ -0,0 +1,8 @@
-+README_src.txt for version 8.0 of Vim: Vi IMproved.
-+
-+The source archive contains the files needed to compile Vim on Unix systems.
-+It is packed for Unix systems (NL line separator).
-+
-+For more information, see the README.txt file that comes with the runtime
-+archive (vim-8.0-rt.tar.gz).  To be able to run Vim you MUST get the runtime
-+archive too!
-diff -Naur vim80.orig/READMEdir/README_srcdos.txt vim80/READMEdir/README_srcdos.txt
---- vim80.orig/READMEdir/README_srcdos.txt	1970-01-01 00:00:00.000000000 +0000
-+++ vim80/READMEdir/README_srcdos.txt	2017-05-15 23:29:16.937774882 +0000
-@@ -0,0 +1,12 @@
-+README_srcdos.txt for version 8.0 of Vim: Vi IMproved.
-+
-+See "README.txt" for general information about Vim.
-+See "README_dos.txt" for installation instructions for MS-DOS and MS-Windows.
-+These files are in the runtime archive (vim80rt.zip).
-+
-+
-+The DOS source archive contains the files needed to compile Vim on MS-DOS or
-+MS-Windows.  It is packed for DOS systems, with CR-LF.  It also includes the
-+VisVim sources.
-+
-+See "src/INSTALLpc.txt" for instructions on how to compile Vim on the PC.
-diff -Naur vim80.orig/READMEdir/README_unix.txt vim80/READMEdir/README_unix.txt
---- vim80.orig/READMEdir/README_unix.txt	1970-01-01 00:00:00.000000000 +0000
-+++ vim80/READMEdir/README_unix.txt	2017-05-15 23:29:16.938774896 +0000
-@@ -0,0 +1,10 @@
-+README_unix.txt for version 8.0 of Vim: Vi IMproved.
-+
-+This file explains the installation of Vim on Unix systems.
-+See "README.txt" for general information about Vim.
-+
-+
-+When you use the source distribution, "make install" is used to install Vim.
-+See the "INSTALL" file in the "src" directory.
-+
-+If you use a compiled package, follow the instructions for the package.
-diff -Naur vim80.orig/READMEdir/README_vms.txt vim80/READMEdir/README_vms.txt
---- vim80.orig/READMEdir/README_vms.txt	1970-01-01 00:00:00.000000000 +0000
-+++ vim80/READMEdir/README_vms.txt	2017-05-15 23:29:16.938774896 +0000
-@@ -0,0 +1,48 @@
-+README_vms.txt for version 8.0 of Vim: Vi IMproved.
-+
-+This file explains the installation of Vim on VMS systems.
-+See "README.txt" in the runtime archive for information about Vim.
-+
-+
-+Most information can be found in the on-line documentation.  Use ":help vms"
-+inside Vim.  Or get the runtime files and read runtime/doc/os_vms.txt to find
-+out how to install and configure Vim with runtime files etc.
-+
-+To compile Vim yourself you need three archives:
-+  vim-X.X-rt.tar.gz	runtime files
-+  vim-X.X-src.tar.gz	source files
-+  vim-X.X-extra.tar.gz	extra source files
-+
-+Compilation is recommended, in order to make sure that the correct
-+libraries are used for your specific system.  Read about compiling in
-+src/INSTALLvms.txt.
-+
-+To use the binary version, you need one of these archives:
-+
-+  vim-XX-exe-ia64-gui.zip       IA64 GUI/Motif executables
-+  vim-XX-exe-ia64-gtk.zip       IA64 GUI/GTK executables
-+  vim-XX-exe-ia64-term.zip      IA64 console executables
-+  vim-XX-exe-axp-gui.zip	Alpha GUI/Motif executables
-+  vim-XX-exe-axp-gtk.zip	Alpha GUI/GTK executables
-+  vim-XX-exe-axp-term.zip       Alpha console executables
-+  vim-XX-exe-vax-gui.zip	VAX GUI executables
-+  vim-XX-exe-vax-term.zip       VAX console executables
-+
-+and of course
-+  vim-XX-runtime.zip		runtime files
-+
-+The binary archives contain: vim.exe, ctags.exe, xxd.exe files,
-+but there are also prepared "deploy ready" archives:
-+
-+vim-XX-ia64.zip			GUI and console executables with runtime and
-+				help files for IA64 systems
-+vim-XX-axp.zip			GUI and console executables with runtime and
-+				help files for Alpha systems
-+vim-XX-vax.zip			GUI and console executables with runtime and
-+				help files for VAX systems
-+
-+GTK builds need LIBGTK library installed.
-+
-+These executables and up to date patches for OpenVMS system are downloadable
-+from http://www.polarhome.com/vim/ or ftp://ftp.polarhome.com/pub/vim/
-+
-diff -Naur vim80.orig/READMEdir/README_w32s.txt vim80/READMEdir/README_w32s.txt
---- vim80.orig/READMEdir/README_w32s.txt	1970-01-01 00:00:00.000000000 +0000
-+++ vim80/READMEdir/README_w32s.txt	2017-05-15 23:29:16.938774896 +0000
-@@ -0,0 +1,15 @@
-+README_w32s.txt for version 8.0 of Vim: Vi IMproved.
-+
-+This archive contains the gvim.exe that was specifically compiled for use in
-+the Win32s subsystem in MS-Windows 3.1 and 3.11.
-+
-+Also see the README_bindos.txt, README_dos.txt and README.txt files.
-+
-+Be careful not to overwrite the Win32s gvim.exe with the another gvim.exe when
-+unpacking another binary archive!  Check the output of ":version":
-+	Win32s - "MS-Windows 16/32 bit GUI version"
-+	 Win32 - "MS-Windows 32 bit GUI version"
-+Win32 with OLE - "MS-Windows 32 bit GUI version with OLE support"
-+
-+For further information, type this inside Vim:
-+	:help win32s
-diff -Naur vim80.orig/READMEdir/Vim.info vim80/READMEdir/Vim.info
---- vim80.orig/READMEdir/Vim.info	1970-01-01 00:00:00.000000000 +0000
-+++ vim80/READMEdir/Vim.info	2017-05-15 23:29:16.940774923 +0000
-@@ -0,0 +1 @@
-+ã
-0@!'Âàj! !h% @ žð<<ÿÿóÏÿÿð
-ó<
-ÿ
-ÿÀ<ðÿÿüüÀÿÿÀüÀÿÿðÀÿü?ÀÀÿðÿÀÀÿÀÿÀÀÿÿð<Àü?ÿüóÀðÿÿÿÏÀÀÿÿÿÏÀÀÿÿÿóÀ?ÿÿÿ<ÀÿÿÿüÀÿÿðÀÿÿðÀÿÿÿðÀ<
-
-
-<Àÿ
-Àü?<Àü<<<0À?ü<<<0Àÿðððððóÿð0ðð0?óÿÿÿÿðÿü?ðÀðÿÿóüÿÿÀüÀ
-ÿ00óÿÌð0Ïÿ0À0Ïüð0ÏóÀ<0ÏÏð0Ï<À0Ìð<0ÃÀ<ÿ0ÏóÿÀ?0üÏÿð?0ð?ÿð0<ÿÿÀ0ÿÿ0ÿü0ÿð0
-
-
-000ð0À000<ð0óÀÀICONX
-\ No newline at end of file
-diff -Naur vim80.orig/READMEdir/Xxd.info vim80/READMEdir/Xxd.info
---- vim80.orig/READMEdir/Xxd.info	1970-01-01 00:00:00.000000000 +0000
-+++ vim80/READMEdir/Xxd.info	2017-05-15 23:29:16.940774923 +0000
-@@ -0,0 +1 @@
-+ã²34'²ð'³j!!°®( 4žøpÀ``lÆa±°lààÀsSSS
-
-ÿÿÿÿÿðÿÿÿÿÿÿàI$I$€II É$ù$@IâI$€?I É$~I$@Hÿ$€ÿärI É$9ä@I
-I$€GI É$æ@I!ü	$€II É$¬$@I!¬I$€I¬I É$t$@I#vI$€CvI 4ÿÿÿÿÿÿàøp
-À{ãf
-Ça±ÀlàsSSS
-
-I$I$$II0I$ù$PIàI$$?I0I$~
-$PHÿI$$ÿàI0I$8$PI
-	$$GI0I$æ$PI!üI$$II0I$¬$PI!¬I$$I¬I0I$t$PI#vI$$CvI0ÿÿÿÿÿðJUNK
-\ No newline at end of file
-diff -Naur vim80.orig/READMEdir/runtime.info vim80/READMEdir/runtime.info
---- vim80.orig/READMEdir/runtime.info	1970-01-01 00:00:00.000000000 +0000
-+++ vim80/READMEdir/runtime.info	2017-05-15 23:29:16.942774951 +0000
-@@ -0,0 +1 @@
-+ãü4B
-#ã#ã0dj!Èø)(ÐhR
-lÿÿ'fb"
-\?ÿÿÿÿB
-x@?ÿÿÿÿÿÿÿÀ<À<ÿÿÿÿÿÿÿÀ<ÿÿÿÿÿÿÿÀ<ÿÿÿÿÿÿÿÀ<ÿÿÿÿÿÿÿÀ<ÿÿÿÿÿÿÿÀ=ÿÿÿÿÿÿÿÀ?ÿÿÿÿÿÿÿÀÿÿÿÿÿÿÿÀÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿïÿÿÿÿÿÿÿÏÿÿþÿÿÏÿÿü/ÿÏÿÿÿÕUWÿÏÿÿÿÿÿÿÿÏþÿÿÿÿÿÿÿÿB
-X@?ÿÿÿÿÿÿÿÀ?À¿Àÿÿÿÿÿÿ¿ÀÿÿÿÿÿÿÀÿÿÿÿÿÿ¿ÀÿÿÿÿÿÿÀÿÿÿÿÿÿÿÀÿÿÿÿÿÿÿÀÿÿÿÿÿÿÿÀÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ¿ÿÿÿÿÿþ¿ÿÿÿÿÿü¿ÿóÿüÿüO¿ÿàü¿ÿþªª¿ü¿ÿÿÿÿÿü ÿ
-\ No newline at end of file
-diff -Naur vim80.orig/READMEdir/src.info vim80/READMEdir/src.info
---- vim80.orig/READMEdir/src.info	1970-01-01 00:00:00.000000000 +0000
-+++ vim80/READMEdir/src.info	2017-05-15 23:29:16.942774951 +0000
-@@ -0,0 +1 @@
-+ã]4B
-#òø%ždj (Y)'·`
-¢mHÿÿ'xZ"Œ\?ÿÿÿÿB
-8@?ÿÿÿÿÿÿÿÀ<À<ÿÿÿÿÿÿÿÀ<ÿÿÿÿÿÿÿÀ<ÿÿÿÿÿÿÿÀ<ÿÿÿÿÿÿÿÀ<ÿÿÿÿÿÿÿÀ=ÿÿÿÿÿÿÿÀ?ÿÿÿÿÿÿÿÀÿÿÿÿÿÿÿÀÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿïÿÿÿÿÿÿÿÏÿÿþÿÿÏÿÿü/ÿÏÿÿÿÕUWÿÏÿÿÿÿÿÿÿÏþÿÿÿÿÿÿÿÿB
-@?ÿÿÿÿÿÿÿÀ?À¿Àÿÿÿÿÿÿ¿ÀÿÿÿÿÿÿÀÿÿÿÿÿÿ¿ÀÿÿÿÿÿÿÀÿÿÿÿÿÿÿÀÿÿÿÿÿÿÿÀÿÿÿÿÿÿÿÀÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ¿ÿÿÿÿÿþ¿ÿÿÿÿÿü¿ÿóÿüÿüO¿ÿàü¿ÿþªª¿ü¿ÿÿÿÿÿü ÿ
-\ No newline at end of file
-diff -Naur vim80.orig/READMEdir/vimdir.info vim80/READMEdir/vimdir.info
---- vim80.orig/READMEdir/vimdir.info	1970-01-01 00:00:00.000000000 +0000
-+++ vim80/READMEdir/vimdir.info	2017-05-15 23:29:16.943774965 +0000
-@@ -0,0 +1,2 @@
-+ãB
-""žd 'P'y
-+<enÿÿ'z"\?ÿÿÿÿB
-
-x@?ÿÿÿÿÿÿÿÀ<À<ÿÿÿÿÿÿÿÀ<ÿÿÿÿÿÿÿÀ<ÿÿÿÿÿÿÿÀ<ÿÿÿÿÿÿÿÀ<ÿÿÿÿÿÿÿÀ=ÿÿÿÿÿÿÿÀ?ÿÿÿÿÿÿÿÀÿÿÿÿÿÿÿÀÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿïÿÿÿÿÿÿÿÏÿÿþÿÿÏÿÿü/ÿÏÿÿÿÕUWÿÏÿÿÿÿÿÿÿÏþÿÿÿÿÿÿÿÿB
-X@?ÿÿÿÿÿÿÿÀ?À¿Àÿÿÿÿÿÿ¿ÀÿÿÿÿÿÿÀÿÿÿÿÿÿ¿ÀÿÿÿÿÿÿÀÿÿÿÿÿÿÿÀÿÿÿÿÿÿÿÀÿÿÿÿÿÿÿÀÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ¿ÿÿÿÿÿþ¿ÿÿÿÿÿü¿ÿóÿüÿüO¿ÿàü¿ÿþªª¿ü¿ÿÿÿÿÿü ÿ
-\ No newline at end of file
-diff -Naur vim80.orig/Vim.info vim80/Vim.info
---- vim80.orig/Vim.info	2017-04-23 18:29:57.000000000 +0000
-+++ vim80/Vim.info	1970-01-01 00:00:00.000000000 +0000
-@@ -1 +0,0 @@
--ã
-0@!'Âàj! !h% @ žð<<ÿÿóÏÿÿð
-ó<
-ÿ
-ÿÀ<ðÿÿüüÀÿÿÀüÀÿÿðÀÿü?ÀÀÿðÿÀÀÿÀÿÀÀÿÿð<Àü?ÿüóÀðÿÿÿÏÀÀÿÿÿÏÀÀÿÿÿóÀ?ÿÿÿ<ÀÿÿÿüÀÿÿðÀÿÿðÀÿÿÿðÀ<
-
-
-<Àÿ
-Àü?<Àü<<<0À?ü<<<0Àÿðððððóÿð0ðð0?óÿÿÿÿðÿü?ðÀðÿÿóüÿÿÀüÀ
-ÿ00óÿÌð0Ïÿ0À0Ïüð0ÏóÀ<0ÏÏð0Ï<À0Ìð<0ÃÀ<ÿ0ÏóÿÀ?0üÏÿð?0ð?ÿð0<ÿÿÀ0ÿÿ0ÿü0ÿð0
-
-
-000ð0À000<ð0óÀÀICONX
-\ No newline at end of file
-diff -Naur vim80.orig/Xxd.info vim80/Xxd.info
---- vim80.orig/Xxd.info	2017-04-23 18:29:57.000000000 +0000
-+++ vim80/Xxd.info	1970-01-01 00:00:00.000000000 +0000
-@@ -1 +0,0 @@
--ã²34'²ð'³j!!°®( 4žøpÀ``lÆa±°lààÀsSSS
-
-ÿÿÿÿÿðÿÿÿÿÿÿàI$I$€II É$ù$@IâI$€?I É$~I$@Hÿ$€ÿärI É$9ä@I
-I$€GI É$æ@I!ü	$€II É$¬$@I!¬I$€I¬I É$t$@I#vI$€CvI 4ÿÿÿÿÿÿàøp
-À{ãf
-Ça±ÀlàsSSS
-
-I$I$$II0I$ù$PIàI$$?I0I$~
-$PHÿI$$ÿàI0I$8$PI
-	$$GI0I$æ$PI!üI$$II0I$¬$PI!¬I$$I¬I0I$t$PI#vI$$CvI0ÿÿÿÿÿðJUNK
-\ No newline at end of file
-diff -Naur vim80.orig/runtime/doc/eval.txt vim80/runtime/doc/eval.txt
---- vim80.orig/runtime/doc/eval.txt	2017-04-22 19:15:38.000000000 +0000
-+++ vim80/runtime/doc/eval.txt	2017-05-15 23:29:17.099777138 +0000
-@@ -1,4 +1,4 @@
--*eval.txt*	For Vim version 8.0.  Last change: 2017 Apr 22
-+*eval.txt*	For Vim version 8.0.  Last change: 2017 Apr 29
- 
- 
- 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
-@@ -4584,6 +4584,7 @@
- 		If the optional {what} dictionary argument is supplied, then
- 		returns only the items listed in {what} as a dictionary. The
- 		following string items are supported in {what}:
-+			context	get the context stored with |setqflist()|
- 			nr	get information for this quickfix list; zero
- 				means the current quickfix list
- 			title	get the list title
-@@ -4595,6 +4596,7 @@
- 		returned.
- 
- 		The returned dictionary contains the following entries:
-+			context	context information stored with |setqflist()|
- 			nr	quickfix list number
- 			title	quickfix list title text
- 			winid	quickfix |window-ID| (if opened)
-@@ -5265,9 +5267,14 @@
- 		0 if "how" is not supported on the system.
- 		Note that even when the operation was executed, whether the
- 		job was actually stopped needs to be checked with
--		job_status().
--		The status of the job isn't checked, the operation will even
--		be done when Vim thinks the job isn't running.
-+		|job_status()|.
-+
-+		If the status of the job is "dead", the signal will not be
-+		sent.  This is to avoid to stop the wrong job (esp. on Unix,
-+		where process numbers are recycled).
-+
-+		When using "kill" Vim will assume the job will die and close
-+		the channel.
- 
- 		{only available when compiled with the |+job| feature}
- 
-@@ -6982,6 +6989,7 @@
- 		only the items listed in {what} are set. The first {list}
- 		argument is ignored.  The following items can be specified in
- 		{what}:
-+		    context	any Vim type can be stored as a context
- 		    nr		list number in the quickfix stack
- 		    title	quickfix list title text
- 		Unsupported keys in {what} are ignored.
-@@ -8497,8 +8505,8 @@
- localmap		Compiled with local mappings and abbr. |:map-local|
- lua			Compiled with Lua interface |Lua|.
- mac			Any Macintosh version of Vim, but not all OS X.
--macunix			Compiled for OS X, with darwin
--osx			Compiled for OS X, with or without darwin
-+macunix			Compiled for OS X, with |mac-darwin-feature|
-+osx			Compiled for OS X, with or w/o |mac-darwin-feature|
- menu			Compiled with support for |:menu|.
- mksession		Compiled with support for |:mksession|.
- modify_fname		Compiled with file name modifiers. |filename-modifiers|
-@@ -10675,18 +10683,19 @@
- 
- To execute a command only when the |+eval| feature is disabled requires a trick,
- as this example shows: >
--	if 1
--	  nnoremap : :"
--	endif
--	normal :set history=111<CR>
--	if 1
--	  nunmap :
--	endif
-+
-+	silent! while 0
-+	  set history=111
-+	silent! endwhile
-+
-+When the |+eval| feature is available the command is skipped because of the
-+"while 0".  Without the |+eval| feature the "while 0" is an error, which is
-+silently ignored, and the command is executed.
- 
- The "<CR>" here is a real CR character, type CTRL-V Enter to get it.
- 
- When the |+eval| feature is available the ":" is remapped to add a double
--quote, which has the effect of commenting-out the command.  without the
-+quote, which has the effect of commenting-out the command.  Without the
- |+eval| feature the nnoremap command is skipped and the command is executed.
- 
- ==============================================================================
-diff -Naur vim80.orig/runtime/doc/os_mac.txt vim80/runtime/doc/os_mac.txt
---- vim80.orig/runtime/doc/os_mac.txt	2017-03-22 21:15:56.000000000 +0000
-+++ vim80/runtime/doc/os_mac.txt	2017-05-15 23:29:17.158777960 +0000
-@@ -1,4 +1,4 @@
--*os_mac.txt*    For Vim version 8.0.  Last change: 2006 Apr 30
-+*os_mac.txt*    For Vim version 8.0.  Last change: 2017 Apr 28
- 
- 
- 		  VIM REFERENCE MANUAL    by Bram Moolenaar et al.
-@@ -18,6 +18,7 @@
- 5. Known Lack			|mac-lack|
- 6. Mac Bug Report		|mac-bug|
- 7. Compiling Vim		|mac-compile|
-+8. The darwin feature		|mac-darwin-feature|
- 
- There was a Mac port for version 3.0 of Vim.  Here are the first few lines
- from the old file:
-@@ -126,5 +127,55 @@
- 
- See the file "src/INSTALLmac.txt" that comes with the source files.
- 
-+==============================================================================
-+8. The Darwin Feature					*mac-darwin-feature*
-+
-+If you have a Mac that isn't very old, you will be running OS X, also called
-+Darwin.  The last pre-Darwin OS was Mac OS 9.  The darwin feature makes Vim
-+use Darwin-specific properties.
-+
-+What is accomplished with this feature is two-fold:
-+
-+- Make Vim interoperable with the system clipboard.
-+- Incorporate into Vim a converter module that bridges the gap between some
-+  character encodings specific to the platform and those known to Vim.
-+
-+Needless to say, both are not to be missed for any decent text editor to work
-+nicely with other applications running on the same desktop environment.
-+
-+As Vim is not an application dedicated only to macOS, we need an extra feature
-+to add in order for it to offer the same user experience that our users on
-+other platforms enjoy to people on macOS.
-+
-+For brevity, the feature is referred to as "darwin" to signify it one of the
-+Vim features that are specific to that particular platform.
-+
-+The feature is a configuration option.  Accordingly, whether it is enabled or
-+not is determined at build time; once it is selected to be enabled, it is
-+compiled in and hence cannot be disabled at runtime.
-+
-+The feature is enabled by default.  For most macOS users, that should be
-+sufficient unless they have specific needs mentioned briefly below.
-+
-+If you want to disable it, pass `--disable-darwin` to the configure script: >
-+
-+    ./configure --disable-darwin <other options>
-+
-+and then run `make` to build Vim.  The order of the options doesn't matter.
-+
-+To make sure at runtime whether or not the darwin feature is compiled in, you
-+can use `has('macunix')` which returns 1 if the feature is compiled in; 0
-+otherwise.
-+
-+Notable use cases where `--disable-darwin` is turned out to be useful are:
-+
-+- When you want to use |x11-selection| instead of the system clipboard.
-+- When you want to use |x11-clientserver|.
-+
-+Since both have to make use of X11 inter-client communication for them to work
-+properly, and since the communication mechanism can come into conflict with
-+the system clipboard, the darwin feature should be disabled to prevent Vim
-+from hanging at runtime.
-+
- 
-  vim:tw=78:ts=8:ft=help:norl:
-diff -Naur vim80.orig/runtime/doc/tags vim80/runtime/doc/tags
---- vim80.orig/runtime/doc/tags	2017-04-23 16:38:34.000000000 +0000
-+++ vim80/runtime/doc/tags	2017-05-15 23:29:17.203778587 +0000
-@@ -7180,6 +7180,7 @@
- mac	os_mac.txt	/*mac*
- mac-bug	os_mac.txt	/*mac-bug*
- mac-compile	os_mac.txt	/*mac-compile*
-+mac-darwin-feature	os_mac.txt	/*mac-darwin-feature*
- mac-faq	os_mac.txt	/*mac-faq*
- mac-filename	os_mac.txt	/*mac-filename*
- mac-lack	os_mac.txt	/*mac-lack*
-diff -Naur vim80.orig/runtime/doc/todo.txt vim80/runtime/doc/todo.txt
---- vim80.orig/runtime/doc/todo.txt	2017-04-23 16:47:37.000000000 +0000
-+++ vim80/runtime/doc/todo.txt	2017-05-15 23:29:17.216778769 +0000
-@@ -1,4 +1,4 @@
--*todo.txt*      For Vim version 8.0.  Last change: 2017 Apr 23
-+*todo.txt*      For Vim version 8.0.  Last change: 2017 Apr 28
- 
- 
- 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
-@@ -111,6 +111,9 @@
- - Difference between two engines: ".*\zs\/\@>\/" on text "///"
-   (Chris Paul, 2016 Nov 13)  New engine not greedy enough?
- 
-+With foldmethod=syntax and nofoldenable comment highlighting isn't removed.
-+(Marcin Szewczyk, 2017 Apr 26)
-+
- Running test_gui and test_gui_init with Motif sometimes kills the window
- manager.  Problem with Motif?
- 
-@@ -360,6 +363,10 @@
- Assume the system converts between the actual encoding of the filesystem to
- the system encoding (usually utf-8).
- 
-+Using ":tab drop file" does not trigger BufEnter or TabEnter events.
-+(Andy Stewart, 2017 Apr 27, #1660)
-+Autocommands blocked in do_arg_all().  Supposed to happen later?
-+
- 'hlsearch' interferes with a Conceal match. (Rom Grk, 2016 Aug 9)
- 
- Patch to add context information to quickfix/location list. (Yegappan
-diff -Naur vim80.orig/runtime/syntax/php.vim vim80/runtime/syntax/php.vim
---- vim80.orig/runtime/syntax/php.vim	2016-12-11 13:54:18.000000000 +0000
-+++ vim80/runtime/syntax/php.vim	2017-05-15 23:29:18.033790155 +0000
-@@ -1,7 +1,7 @@
- " Vim syntax file
- " Language: php PHP 3/4/5/7
- " Maintainer: Jason Woofenden <jason@jasonwoof.com>
--" Last Change: Dec 11, 2016
-+" Last Change: Apr 28, 2017
- " URL: https://jasonwoof.com/gitweb/?p=vim-syntax.git;a=blob;f=php.vim;hb=HEAD
- " Former Maintainers: Peter Hodge <toomuchphp-vim@yahoo.com>
- "         Debian VIM Maintainers <pkg-vim-maintainers@lists.alioth.debian.org>
-@@ -11,32 +11,28 @@
- "       colourscheme, because elflord's colours will better highlight the break-points
- "       (Statements) in your code.
- "
--" Options:  php_sql_query = 1  for SQL syntax highlighting inside strings
--"           php_htmlInStrings = 1  for HTML syntax highlighting inside strings
--"           php_baselib = 1  for highlighting baselib functions
--"           php_asp_tags = 1  for highlighting ASP-style short tags
--"           php_parent_error_close = 1  for highlighting parent error ] or )
--"           php_parent_error_open = 1  for skipping an php end tag, if there exists an open ( or [ without a closing one
--"           php_oldStyle = 1  for using old colorstyle
--"           php_noShortTags = 1  don't sync <? ?> as php
--"           php_folding = 1  for folding classes and functions
--"           php_folding = 2  for folding all { } regions
--"           php_sync_method = x
--"                             x=-1 to sync by search ( default )
--"                             x>0 to sync at least x lines backwards
--"                             x=0 to sync from start
--"
--"       Added by Peter Hodge On June 9, 2006:
--"           php_special_functions = 1|0 to highlight functions with abnormal behaviour
--"           php_alt_comparisons = 1|0 to highlight comparison operators in an alternate colour
--"           php_alt_assignByReference = 1|0 to highlight '= &' in an alternate colour
--"
--"           Note: these all default to 1 (On), so you would set them to '0' to turn them off.
--"                 E.g., in your .vimrc or _vimrc file:
--"                   let php_special_functions = 0
--"                   let php_alt_comparisons = 0
--"                   let php_alt_assignByReference = 0
--"                 Unletting these variables will revert back to their default (On).
-+" Options:
-+"    Set to anything to enable:
-+"       php_sql_query           SQL syntax highlighting inside strings
-+"       php_htmlInStrings       HTML syntax highlighting inside strings
-+"       php_baselib             highlighting baselib functions
-+"       php_asp_tags            highlighting ASP-style short tags
-+"       php_parent_error_close  highlighting parent error ] or )
-+"       php_parent_error_open   skipping an php end tag, if there exists
-+"                                 an open ( or [ without a closing one
-+"       php_oldStyle            use old colorstyle
-+"       php_noShortTags         don't sync <? ?> as php
-+"    Set to a specific value:
-+"       php_folding = 1         fold classes and functions
-+"       php_folding = 2         fold all { } regions
-+"       php_sync_method = x  where x is an integer:
-+"                         -1  sync by search ( default )
-+"                         >0  sync at least x lines backwards
-+"                         0   sync from start
-+"    Set to 0 to _disable_:      (Added by Peter Hodge On June 9, 2006)
-+"       php_special_functions = 0      highlight functions with abnormal behaviour
-+"       php_alt_comparisons = 0        comparison operators in an alternate colour
-+"       php_alt_assignByReference = 0  '= &' in an alternate colour
- "
- "
- " Note:
-diff -Naur vim80.orig/runtime.info vim80/runtime.info
---- vim80.orig/runtime.info	2017-04-23 18:29:57.000000000 +0000
-+++ vim80/runtime.info	1970-01-01 00:00:00.000000000 +0000
-@@ -1 +0,0 @@
--ãü4B
-#ã#ã0dj!Èø)(ÐhR
-lÿÿ'fb"
-\?ÿÿÿÿB
-x@?ÿÿÿÿÿÿÿÀ<À<ÿÿÿÿÿÿÿÀ<ÿÿÿÿÿÿÿÀ<ÿÿÿÿÿÿÿÀ<ÿÿÿÿÿÿÿÀ<ÿÿÿÿÿÿÿÀ=ÿÿÿÿÿÿÿÀ?ÿÿÿÿÿÿÿÀÿÿÿÿÿÿÿÀÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿïÿÿÿÿÿÿÿÏÿÿþÿÿÏÿÿü/ÿÏÿÿÿÕUWÿÏÿÿÿÿÿÿÿÏþÿÿÿÿÿÿÿÿB
-X@?ÿÿÿÿÿÿÿÀ?À¿Àÿÿÿÿÿÿ¿ÀÿÿÿÿÿÿÀÿÿÿÿÿÿ¿ÀÿÿÿÿÿÿÀÿÿÿÿÿÿÿÀÿÿÿÿÿÿÿÀÿÿÿÿÿÿÿÀÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ¿ÿÿÿÿÿþ¿ÿÿÿÿÿü¿ÿóÿüÿüO¿ÿàü¿ÿþªª¿ü¿ÿÿÿÿÿü ÿ
-\ No newline at end of file
-diff -Naur vim80.orig/src/Makefile vim80/src/Makefile
---- vim80.orig/src/Makefile	2017-04-21 20:47:19.000000000 +0000
-+++ vim80/src/Makefile	2017-05-15 23:29:18.276793542 +0000
-@@ -431,7 +431,7 @@
- # When you get an error for a missing "perl.exp" file, try creating an empty
- # one: "touch perl.exp".
- # This requires at least "normal" features, "tiny" and "small" don't work.
--CONF_OPT_PERL = --enable-perlinterp
-+#CONF_OPT_PERL = --enable-perlinterp
- #CONF_OPT_PERL = --enable-perlinterp=dynamic
- 
- # PYTHON
-@@ -445,9 +445,9 @@
- # dlopen(), dlsym(), dlclose(), i.e. pythonX.Y.so must be available
- # However, this may still cause problems, such as "import termios" failing.
- # Build two separate versions of Vim in that case.
--CONF_OPT_PYTHON = --enable-pythoninterp
-+#CONF_OPT_PYTHON = --enable-pythoninterp
- #CONF_OPT_PYTHON = --enable-pythoninterp=dynamic
--CONF_OPT_PYTHON3 = --enable-python3interp
-+#CONF_OPT_PYTHON3 = --enable-python3interp
- #CONF_OPT_PYTHON3 = --enable-python3interp=dynamic
- 
- # RUBY
-@@ -455,20 +455,20 @@
- # First one for static linking, second one for loading when used.
- # Note: you need the development package (e.g., ruby1.9.1-dev on Ubuntu).
- # This requires at least "normal" features, "tiny" and "small" don't work.
--CONF_OPT_RUBY = --enable-rubyinterp
-+#CONF_OPT_RUBY = --enable-rubyinterp
- #CONF_OPT_RUBY = --enable-rubyinterp=dynamic
- #CONF_OPT_RUBY = --enable-rubyinterp --with-ruby-command=ruby1.9.1
- 
- # TCL
- # Uncomment this when you want to include the Tcl interface.
- # First one is for static linking, second one for dynamic loading.
--CONF_OPT_TCL = --enable-tclinterp
-+#CONF_OPT_TCL = --enable-tclinterp
- #CONF_OPT_TCL = --enable-tclinterp=dynamic
- #CONF_OPT_TCL = --enable-tclinterp --with-tclsh=tclsh8.4
- 
- # CSCOPE
- # Uncomment this when you want to include the Cscope interface.
--CONF_OPT_CSCOPE = --enable-cscope
-+#CONF_OPT_CSCOPE = --enable-cscope
- 
- # WORKSHOP - Sun Visual Workshop interface.  Only works with Motif!
- #CONF_OPT_WORKSHOP = --enable-workshop
-@@ -528,7 +528,7 @@
- #CONF_OPT_FEAT = --with-features=small
- #CONF_OPT_FEAT = --with-features=normal
- #CONF_OPT_FEAT = --with-features=big
--CONF_OPT_FEAT = --with-features=huge
-+#CONF_OPT_FEAT = --with-features=huge
- 
- # COMPILED BY - For including a specific e-mail address for ":version".
- #CONF_OPT_COMPBY = "--with-compiledby=John Doe <JohnDoe@yahoo.com>"
-@@ -597,7 +597,7 @@
- #CFLAGS = -g -O2 '-DSTARTUPTIME="vimstartup"' -fno-strength-reduce -Wall -Wmissing-prototypes
- 
- # Use this with GCC to check for mistakes, unused arguments, etc.
--CFLAGS = -g -Wall -Wextra -Wshadow -Wmissing-prototypes -Wunreachable-code -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1
-+#CFLAGS = -g -Wall -Wextra -Wshadow -Wmissing-prototypes -Wunreachable-code -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1
- #CFLAGS = -g -O2 -Wall -Wextra -Wmissing-prototypes -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 -DU_DEBUG
- #PYTHON_CFLAGS_EXTRA = -Wno-missing-field-initializers
- #MZSCHEME_CFLAGS_EXTRA = -Wno-unreachable-code -Wno-unused-parameter
-@@ -679,7 +679,7 @@
- # Configuration is in the .ccmalloc or ~/.ccmalloc file.
- # Doesn't work very well, since memory linked to from global variables
- # (in libraries) is also marked as leaked memory.
--LEAK_CFLAGS = -DEXITFREE
-+#LEAK_CFLAGS = -DEXITFREE
- #LEAK_LIBS = -lccmalloc
- 
- # Uncomment this line to have Vim call abort() when an internal error is
-diff -Naur vim80.orig/src/auto/config.mk vim80/src/auto/config.mk
---- vim80.orig/src/auto/config.mk	2017-04-23 18:29:58.000000000 +0000
-+++ vim80/src/auto/config.mk	1970-01-01 00:00:00.000000000 +0000
-@@ -1,5 +0,0 @@
--the first target to make vim is: reconfig
--srcdir = .
--VIMNAME = vim
--EXNAME = ex
--VIEWNAME = view
-diff -Naur vim80.orig/src/auto/configure vim80/src/auto/configure
---- vim80.orig/src/auto/configure	2017-04-21 20:55:48.000000000 +0000
-+++ vim80/src/auto/configure	2017-05-15 23:29:18.311794030 +0000
-@@ -11506,16 +11506,15 @@
- 
- fi
- 
--if test "x$olibs" != "x$LIBS"; then
--  { $as_echo "$as_me:${as_lineno-$LINENO}: checking what tgetent() returns for an unknown terminal" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking what tgetent() returns for an unknown terminal" >&5
- $as_echo_n "checking what tgetent() returns for an unknown terminal... " >&6; }
- if ${vim_cv_tgent+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
- 
--      if test "$cross_compiling" = yes; then :
-+    if test "$cross_compiling" = yes; then :
- 
--	as_fn_error $? "failed to compile test program." "$LINENO" 5
-+      as_fn_error $? "failed to compile test program." "$LINENO" 5
- 
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -11535,11 +11534,11 @@
- _ACEOF
- if ac_fn_c_try_run "$LINENO"; then :
- 
--	vim_cv_tgent=zero
-+      vim_cv_tgent=zero
- 
- else
- 
--	vim_cv_tgent=non-zero
-+      vim_cv_tgent=non-zero
- 
- fi
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-@@ -11551,10 +11550,9 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vim_cv_tgent" >&5
- $as_echo "$vim_cv_tgent" >&6; }
- 
--  if test "x$vim_cv_tgent" = "xzero" ; then
--    $as_echo "#define TGETENT_ZERO_ERR 0" >>confdefs.h
-+if test "x$vim_cv_tgent" = "xzero" ; then
-+  $as_echo "#define TGETENT_ZERO_ERR 0" >>confdefs.h
- 
--  fi
- fi
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether termcap.h contains ospeed" >&5
-diff -Naur vim80.orig/src/buffer.c vim80/src/buffer.c
---- vim80.orig/src/buffer.c	2017-04-13 09:51:40.000000000 +0000
-+++ vim80/src/buffer.c	2017-05-15 23:29:18.319794141 +0000
-@@ -2999,7 +2999,7 @@
- 
- #if defined(FEAT_LISTCMDS) || defined(PROTO)
- /*
-- * List all known file names (for :files and :buffers command).
-+ * List all know file names (for :files and :buffers command).
-  */
-     void
- buflist_list(exarg_T *eap)
-diff -Naur vim80.orig/src/channel.c vim80/src/channel.c
---- vim80.orig/src/channel.c	2017-04-07 11:57:11.000000000 +0000
-+++ vim80/src/channel.c	2017-05-15 23:29:18.324794211 +0000
-@@ -2404,7 +2404,7 @@
- 		curbuf = curwin->w_buffer;
- 	    }
- 	}
--	redraw_buf_later(buffer, VALID);
-+	redraw_buf_and_status_later(buffer, VALID);
- 	channel_need_redraw = TRUE;
-     }
- 
-@@ -5148,12 +5148,17 @@
- 	    return 0;
- 	}
-     }
-+    if (job->jv_status == JOB_ENDED)
-+    {
-+	ch_log(job->jv_channel, "Job has already ended, job_stop() skipped");
-+	return 0;
-+    }
-     ch_logs(job->jv_channel, "Stopping job with '%s'", (char *)arg);
-     if (mch_stop_job(job, arg) == FAIL)
- 	return 0;
- 
--    /* Assume that "hup" does not kill the job. */
--    if (job->jv_channel != NULL && STRCMP(arg, "hup") != 0)
-+    /* Assume that only "kill" will kill the job. */
-+    if (job->jv_channel != NULL && STRCMP(arg, "kill") == 0)
- 	job->jv_channel->ch_job_killed = TRUE;
- 
-     /* We don't try freeing the job, obviously the caller still has a
-diff -Naur vim80.orig/src/configure.ac vim80/src/configure.ac
---- vim80.orig/src/configure.ac	2017-04-21 20:38:32.000000000 +0000
-+++ vim80/src/configure.ac	2017-05-15 23:29:18.332794322 +0000
-@@ -3355,10 +3355,9 @@
-   AC_DEFINE(TERMINFO)
- fi
- 
--if test "x$olibs" != "x$LIBS"; then
--  AC_CACHE_CHECK([what tgetent() returns for an unknown terminal], [vim_cv_tgent],
--    [
--      AC_RUN_IFELSE([AC_LANG_SOURCE([[
-+AC_CACHE_CHECK([what tgetent() returns for an unknown terminal], [vim_cv_tgent],
-+  [
-+    AC_RUN_IFELSE([AC_LANG_SOURCE([[
- #include "confdefs.h"
- #ifdef HAVE_TERMCAP_H
- # include <termcap.h>
-@@ -3369,18 +3368,17 @@
- #endif
- main()
- {char s[10000]; int res = tgetent(s, "thisterminaldoesnotexist"); exit(res != 0); }
--      ]])],[
--	vim_cv_tgent=zero
--      ],[
--	vim_cv_tgent=non-zero
--      ],[
--	AC_MSG_ERROR(failed to compile test program.)
--      ])
-+    ]])],[
-+      vim_cv_tgent=zero
-+    ],[
-+      vim_cv_tgent=non-zero
-+    ],[
-+      AC_MSG_ERROR(failed to compile test program.)
-     ])
--  
--  if test "x$vim_cv_tgent" = "xzero" ; then
--    AC_DEFINE(TGETENT_ZERO_ERR, 0)
--  fi
-+  ])
-+
-+if test "x$vim_cv_tgent" = "xzero" ; then
-+  AC_DEFINE(TGETENT_ZERO_ERR, 0)
- fi
- 
- AC_MSG_CHECKING(whether termcap.h contains ospeed)
-diff -Naur vim80.orig/src/crypt.c vim80/src/crypt.c
---- vim80.orig/src/crypt.c	2017-03-05 16:02:38.000000000 +0000
-+++ vim80/src/crypt.c	2017-05-15 23:29:18.335794365 +0000
-@@ -118,9 +118,6 @@
- 	NULL, NULL,
- 	crypt_blowfish_encode, crypt_blowfish_decode,
-     },
--
--    /* NOTE: when adding a new method, use some random bytes for the magic key,
--     * to avoid that a text file is recognized as encrypted. */
- };
- 
- #define CRYPT_MAGIC_LEN	12	/* cannot change */
-diff -Naur vim80.orig/src/dict.c vim80/src/dict.c
---- vim80.orig/src/dict.c	2017-03-14 21:09:48.000000000 +0000
-+++ vim80/src/dict.c	2017-05-15 23:29:18.336794378 +0000
-@@ -59,14 +59,24 @@
-     if (d == NULL)
- 	return FAIL;
- 
--    rettv->vval.v_dict = d;
--    rettv->v_type = VAR_DICT;
-+    rettv_dict_set(rettv, d);
-     rettv->v_lock = 0;
--    ++d->dv_refcount;
-     return OK;
- }
- 
- /*
-+ * Set a dictionary as the return value
-+ */
-+    void
-+rettv_dict_set(typval_T *rettv, dict_T *d)
-+{
-+    rettv->v_type = VAR_DICT;
-+    rettv->vval.v_dict = d;
-+    if (d != NULL)
-+	++d->dv_refcount;
-+}
-+
-+/*
-  * Free a Dictionary, including all non-container items it contains.
-  * Ignores the reference count.
-  */
-@@ -646,11 +656,7 @@
- 
-     *arg = skipwhite(*arg + 1);
-     if (evaluate)
--    {
--	rettv->v_type = VAR_DICT;
--	rettv->vval.v_dict = d;
--	++d->dv_refcount;
--    }
-+	rettv_dict_set(rettv, d);
- 
-     return OK;
- }
-diff -Naur vim80.orig/src/edit.c vim80/src/edit.c
---- vim80.orig/src/edit.c	2017-04-07 11:52:06.000000000 +0000
-+++ vim80/src/edit.c	2017-05-15 23:29:18.346794518 +0000
-@@ -96,6 +96,7 @@
- static compl_T    *compl_first_match = NULL;
- static compl_T    *compl_curr_match = NULL;
- static compl_T    *compl_shown_match = NULL;
-+static compl_T    *compl_old_match = NULL;
- 
- /* After using a cursor key <Enter> selects a match in the popup menu,
-  * otherwise it inserts a line break. */
-@@ -3431,6 +3432,7 @@
-     } while (compl_curr_match != NULL && compl_curr_match != compl_first_match);
-     compl_first_match = compl_curr_match = NULL;
-     compl_shown_match = NULL;
-+    compl_old_match = NULL;
- }
- 
-     static void
-@@ -4272,7 +4274,6 @@
-     char_u	*ptr;
-     char_u	*dict = NULL;
-     int		dict_f = 0;
--    compl_T	*old_match;
-     int		set_match_pos;
- 
-     if (!compl_started)
-@@ -4286,7 +4287,7 @@
- 	last_match_pos = first_match_pos = *ini;
-     }
- 
--    old_match = compl_curr_match;	/* remember the last current match */
-+    compl_old_match = compl_curr_match;	/* remember the last current match */
-     pos = (compl_direction == FORWARD) ? &last_match_pos : &first_match_pos;
-     /* For ^N/^P loop over all the flags/windows/buffers in 'complete' */
-     for (;;)
-@@ -4388,6 +4389,11 @@
- 	    }
- 	}
- 
-+	/* If complete() was called then compl_pattern has been reset.  The
-+	 * following won't work then, bail out. */
-+	if (compl_pattern == NULL)
-+	    break;
-+
- 	switch (type)
- 	{
- 	case -1:
-@@ -4621,7 +4627,7 @@
- 
- 	/* check if compl_curr_match has changed, (e.g. other type of
- 	 * expansion added something) */
--	if (type != 0 && compl_curr_match != old_match)
-+	if (type != 0 && compl_curr_match != compl_old_match)
- 	    found_new_match = OK;
- 
- 	/* break the loop for specialized modes (use 'complete' just for the
-@@ -4660,13 +4666,16 @@
- 	    || (ctrl_x_mode != 0 && !CTRL_X_MODE_LINE_OR_EVAL(ctrl_x_mode)))
- 	i = ins_compl_make_cyclic();
- 
--    /* If several matches were added (FORWARD) or the search failed and has
--     * just been made cyclic then we have to move compl_curr_match to the next
--     * or previous entry (if any) -- Acevedo */
--    compl_curr_match = compl_direction == FORWARD ? old_match->cp_next
--							 : old_match->cp_prev;
--    if (compl_curr_match == NULL)
--	compl_curr_match = old_match;
-+    if (compl_old_match != NULL)
-+    {
-+	/* If several matches were added (FORWARD) or the search failed and has
-+	 * just been made cyclic then we have to move compl_curr_match to the
-+	 * next or previous entry (if any) -- Acevedo */
-+	compl_curr_match = compl_direction == FORWARD ? compl_old_match->cp_next
-+						    : compl_old_match->cp_prev;
-+	if (compl_curr_match == NULL)
-+	    compl_curr_match = compl_old_match;
-+    }
-     return i;
- }
- 
-diff -Naur vim80.orig/src/eval.c vim80/src/eval.c
---- vim80.orig/src/eval.c	2017-04-07 14:09:29.000000000 +0000
-+++ vim80/src/eval.c	2017-05-15 23:29:18.349794559 +0000
-@@ -4665,9 +4665,7 @@
- 			item = item->li_next;
- 		    }
- 		    clear_tv(rettv);
--		    rettv->v_type = VAR_LIST;
--		    rettv->vval.v_list = l;
--		    ++l->lv_refcount;
-+		    rettv_list_set(rettv, l);
- 		}
- 		else
- 		{
-@@ -5327,6 +5325,10 @@
-     abort = abort || set_ref_in_timer(copyID);
- #endif
- 
-+#ifdef FEAT_QUICKFIX
-+    abort = abort || set_ref_in_quickfix(copyID);
-+#endif
-+
-     if (!abort)
-     {
- 	/*
-@@ -8482,9 +8484,7 @@
- 
- 		    if (opts != NULL)
- 		    {
--			rettv->v_type = VAR_DICT;
--			rettv->vval.v_dict = opts;
--			++opts->dv_refcount;
-+			rettv_dict_set(rettv, opts);
- 			done = TRUE;
- 		    }
- 		}
-diff -Naur vim80.orig/src/evalfunc.c vim80/src/evalfunc.c
---- vim80.orig/src/evalfunc.c	2017-04-09 13:00:17.000000000 +0000
-+++ vim80/src/evalfunc.c	2017-05-15 23:29:18.352794601 +0000
-@@ -3005,8 +3005,7 @@
- 	    && get_tv_number_chk(&argvars[2], &error)
- 	    && !error)
-     {
--	rettv->v_type = VAR_LIST;
--	rettv->vval.v_list = NULL;
-+	rettv_list_set(rettv, NULL);
-     }
- 
-     s = get_tv_string(&argvars[0]);
-@@ -3909,12 +3908,7 @@
- 		}
- 	    }
- 	    else if (STRCMP(what, "dict") == 0)
--	    {
--		rettv->v_type = VAR_DICT;
--		rettv->vval.v_dict = pt->pt_dict;
--		if (pt->pt_dict != NULL)
--		    ++pt->pt_dict->dv_refcount;
--	    }
-+		rettv_dict_set(rettv, pt->pt_dict);
- 	    else if (STRCMP(what, "args") == 0)
- 	    {
- 		rettv->v_type = VAR_LIST;
-@@ -4214,9 +4208,7 @@
- 
- 		if (opts != NULL)
- 		{
--		    rettv->v_type = VAR_DICT;
--		    rettv->vval.v_dict = opts;
--		    ++opts->dv_refcount;
-+		    rettv_dict_set(rettv, opts);
- 		    done = TRUE;
- 		}
- 	    }
-@@ -5372,8 +5364,7 @@
- 	{
- 	    if (get_tv_number_chk(&argvars[2], &error))
- 	    {
--		rettv->v_type = VAR_LIST;
--		rettv->vval.v_list = NULL;
-+		rettv_list_set(rettv, NULL);
- 	    }
- 	    if (argvars[3].v_type != VAR_UNKNOWN
- 				    && get_tv_number_chk(&argvars[3], &error))
-@@ -5429,8 +5420,7 @@
- 	{
- 	    if (get_tv_number_chk(&argvars[3], &error))
- 	    {
--		rettv->v_type = VAR_LIST;
--		rettv->vval.v_list = NULL;
-+		rettv_list_set(rettv, NULL);
- 	    }
- 	    if (argvars[4].v_type != VAR_UNKNOWN
- 				    && get_tv_number_chk(&argvars[4], &error))
-@@ -9152,9 +9142,7 @@
- 	    list_append(l, li);
- 	    li = ni;
- 	}
--	rettv->vval.v_list = l;
--	rettv->v_type = VAR_LIST;
--	++l->lv_refcount;
-+	rettv_list_set(rettv, l);
- 	l->lv_idx = l->lv_len - l->lv_idx - 1;
-     }
- }
-@@ -10742,9 +10730,7 @@
- 	     (char_u *)(sort ? N_("sort() argument") : N_("uniq() argument")),
- 									TRUE))
- 	    goto theend;
--	rettv->vval.v_list = l;
--	rettv->v_type = VAR_LIST;
--	++l->lv_refcount;
-+	rettv_list_set(rettv, l);
- 
- 	len = list_len(l);
- 	if (len <= 1)
-@@ -11832,8 +11818,7 @@
-     char_u	str[NUMBUFLEN];
- #endif
- 
--    rettv->v_type = VAR_LIST;
--    rettv->vval.v_list = NULL;
-+    rettv_list_set(rettv, NULL);
- 
- #if defined(FEAT_SYN_HL) && defined(FEAT_CONCEAL)
-     lnum = get_tv_lnum(argvars);		/* -1 on type error */
-@@ -11890,8 +11875,7 @@
-     int		id;
- #endif
- 
--    rettv->v_type = VAR_LIST;
--    rettv->vval.v_list = NULL;
-+    rettv_list_set(rettv, NULL);
- 
- #ifdef FEAT_SYN_HL
-     lnum = get_tv_lnum(argvars);		/* -1 on type error */
-@@ -12057,9 +12041,7 @@
- 	    list_append(list, li);
- 	}
- 
--	++list->lv_refcount;
--	rettv->v_type = VAR_LIST;
--	rettv->vval.v_list = list;
-+	rettv_list_set(rettv, list);
- 	list = NULL;
-     }
-     else
-@@ -12465,8 +12447,7 @@
-     static void
- f_test_null_dict(typval_T *argvars UNUSED, typval_T *rettv)
- {
--    rettv->v_type = VAR_DICT;
--    rettv->vval.v_dict = NULL;
-+    rettv_dict_set(rettv, NULL);
- }
- 
- #ifdef FEAT_JOB_CHANNEL
-@@ -12481,8 +12462,7 @@
-     static void
- f_test_null_list(typval_T *argvars UNUSED, typval_T *rettv)
- {
--    rettv->v_type = VAR_LIST;
--    rettv->vval.v_list = NULL;
-+    rettv_list_set(rettv, NULL);
- }
- 
-     static void
-diff -Naur vim80.orig/src/ex_getln.c vim80/src/ex_getln.c
---- vim80.orig/src/ex_getln.c	2017-04-07 12:59:33.000000000 +0000
-+++ vim80/src/ex_getln.c	2017-05-15 23:29:18.375794922 +0000
-@@ -3337,10 +3337,17 @@
-     void
- redrawcmdline(void)
- {
-+    redrawcmdline_ex(TRUE);
-+}
-+
-+    void
-+redrawcmdline_ex(int do_compute_cmdrow)
-+{
-     if (cmd_silent)
- 	return;
-     need_wait_return = FALSE;
--    compute_cmdrow();
-+    if (do_compute_cmdrow)
-+	compute_cmdrow();
-     redrawcmd();
-     cursorcmd();
- }
-diff -Naur vim80.orig/src/globals.h vim80/src/globals.h
---- vim80.orig/src/globals.h	2017-03-29 17:04:10.000000000 +0000
-+++ vim80/src/globals.h	2017-05-15 23:29:18.389795117 +0000
-@@ -97,6 +97,7 @@
- EXTERN int	redraw_cmdline INIT(= FALSE);	/* cmdline must be redrawn */
- EXTERN int	clear_cmdline INIT(= FALSE);	/* cmdline must be cleared */
- EXTERN int	mode_displayed INIT(= FALSE);	/* mode is being displayed */
-+EXTERN int	no_win_do_lines_ins INIT(= FALSE); /* don't insert lines */
- #if defined(FEAT_CRYPT) || defined(FEAT_EVAL)
- EXTERN int	cmdline_star INIT(= FALSE);	/* cmdline is crypted */
- #endif
-diff -Naur vim80.orig/src/gui_gtk_x11.c vim80/src/gui_gtk_x11.c
---- vim80.orig/src/gui_gtk_x11.c	2017-03-18 15:34:01.000000000 +0000
-+++ vim80/src/gui_gtk_x11.c	2017-05-15 23:29:18.408795382 +0000
-@@ -2846,7 +2846,7 @@
- 	/*
- 	 * Cannot handle "XLib-only" windows with gtk event routines, we'll
- 	 * have to change the "server" registration to that of the main window
--	 * If we have not registered a name yet, remember the window.
-+	 * If we have not registered a name yet, remember the window
- 	 */
- # if GTK_CHECK_VERSION(3,0,0)
- 	serverChangeRegisteredWindow(GDK_WINDOW_XDISPLAY(mainwin_win),
-diff -Naur vim80.orig/src/gui_w32.c vim80/src/gui_w32.c
---- vim80.orig/src/gui_w32.c	2017-04-22 13:13:30.000000000 +0000
-+++ vim80/src/gui_w32.c	2017-05-15 23:29:18.418795521 +0000
-@@ -2642,11 +2642,11 @@
-     }
-     if (fill_typebuf)
-     {
--	/* Put something in the typeahead buffer so that the message will get
-+	/* Put a NOP in the typeahead buffer so that the message will get
- 	 * processed. */
- 	key_name[0] = K_SPECIAL;
- 	key_name[1] = KS_EXTRA;
--	key_name[2] = KE_IGNORE;
-+	key_name[2] = KE_NOP;
- 	key_name[3] = NUL;
- 	typebuf_was_filled = TRUE;
- 	(void)ins_typebuf(key_name, REMAP_NONE, 0, TRUE, FALSE);
-diff -Naur vim80.orig/src/if_cscope.c vim80/src/if_cscope.c
---- vim80.orig/src/if_cscope.c	2017-03-21 20:51:38.000000000 +0000
-+++ vim80/src/if_cscope.c	2017-05-15 23:29:18.427795646 +0000
-@@ -2001,7 +2001,7 @@
-     char	*cstag_msg = _("Cscope tag: %s");
-     char	*csfmt_str = "%4d %6s  ";
- 
--    assert(num_matches > 0);
-+    assert (num_matches > 0);
- 
-     if ((tbuf = (char *)alloc((unsigned)strlen(matches[0]) + 1)) == NULL)
- 	return;
-diff -Naur vim80.orig/src/if_perl.xs vim80/src/if_perl.xs
---- vim80.orig/src/if_perl.xs	2017-03-12 17:10:38.000000000 +0000
-+++ vim80/src/if_perl.xs	2017-05-15 23:29:18.434795744 +0000
-@@ -1136,9 +1136,7 @@
- 		}
- 	    }
- 
--	    list->lv_refcount++;
--	    rettv->v_type	= VAR_LIST;
--	    rettv->vval.v_list	= list;
-+	    rettv_list_set(rettv, list);
- 	    break;
- 	}
- 	case SVt_PVHV:	/* dictionary */
-@@ -1192,9 +1190,7 @@
- 		}
- 	    }
- 
--	    dict->dv_refcount++;
--	    rettv->v_type	= VAR_DICT;
--	    rettv->vval.v_dict	= dict;
-+	    rettv_dict_set(rettv, dict);
- 	    break;
- 	}
- 	default:	/* not convertible */
-diff -Naur vim80.orig/src/list.c vim80/src/list.c
---- vim80.orig/src/list.c	2017-01-08 12:03:51.000000000 +0000
-+++ vim80/src/list.c	2017-05-15 23:29:18.459796093 +0000
-@@ -97,14 +97,24 @@
-     if (l == NULL)
- 	return FAIL;
- 
--    rettv->vval.v_list = l;
--    rettv->v_type = VAR_LIST;
-     rettv->v_lock = 0;
--    ++l->lv_refcount;
-+    rettv_list_set(rettv, l);
-     return OK;
- }
- 
- /*
-+ * Set a list as the return value
-+ */
-+    void
-+rettv_list_set(typval_T *rettv, list_T *l)
-+{
-+    rettv->v_type = VAR_LIST;
-+    rettv->vval.v_list = l;
-+    if (l != NULL)
-+	++l->lv_refcount;
-+}
-+
-+/*
-  * Unreference a list: decrement the reference count and free it when it
-  * becomes zero.
-  */
-@@ -875,11 +885,7 @@
- 
-     *arg = skipwhite(*arg + 1);
-     if (evaluate)
--    {
--	rettv->v_type = VAR_LIST;
--	rettv->vval.v_list = l;
--	++l->lv_refcount;
--    }
-+	rettv_list_set(rettv, l);
- 
-     return OK;
- }
-diff -Naur vim80.orig/src/proto/dict.pro vim80/src/proto/dict.pro
---- vim80.orig/src/proto/dict.pro	2016-11-06 15:56:35.000000000 +0000
-+++ vim80/src/proto/dict.pro	2017-05-15 23:29:18.660798894 +0000
-@@ -1,6 +1,7 @@
- /* dict.c */
- dict_T *dict_alloc(void);
- int rettv_dict_alloc(typval_T *rettv);
-+void rettv_dict_set(typval_T *rettv, dict_T *d);
- void dict_unref(dict_T *d);
- int dict_free_nonref(int copyID);
- void dict_free_items(int copyID);
-diff -Naur vim80.orig/src/proto/ex_getln.pro vim80/src/proto/ex_getln.pro
---- vim80.orig/src/proto/ex_getln.pro	2016-11-06 15:56:39.000000000 +0000
-+++ vim80/src/proto/ex_getln.pro	2017-05-15 23:29:18.668799005 +0000
-@@ -19,6 +19,7 @@
- void restore_cmdline_alloc(char_u *p);
- void cmdline_paste_str(char_u *s, int literally);
- void redrawcmdline(void);
-+void redrawcmdline_ex(int do_compute_cmdrow);
- void redrawcmd(void);
- void compute_cmdrow(void);
- void gotocmdline(int clr);
-diff -Naur vim80.orig/src/proto/list.pro vim80/src/proto/list.pro
---- vim80.orig/src/proto/list.pro	2016-11-06 15:56:46.000000000 +0000
-+++ vim80/src/proto/list.pro	2017-05-15 23:29:18.686799256 +0000
-@@ -4,6 +4,7 @@
- void list_fix_watch(list_T *l, listitem_T *item);
- list_T *list_alloc(void);
- int rettv_list_alloc(typval_T *rettv);
-+void rettv_list_set(typval_T *rettv, list_T *l);
- void list_unref(list_T *l);
- int list_free_nonref(int copyID);
- void list_free_items(int copyID);
-diff -Naur vim80.orig/src/proto/quickfix.pro vim80/src/proto/quickfix.pro
---- vim80.orig/src/proto/quickfix.pro	2017-03-05 16:10:37.000000000 +0000
-+++ vim80/src/proto/quickfix.pro	2017-05-15 23:29:18.702799479 +0000
-@@ -29,6 +29,7 @@
- int get_errorlist(win_T *wp, int qf_idx, list_T *list);
- int get_errorlist_properties(win_T *wp, dict_T *what, dict_T *retdict);
- int set_errorlist(win_T *wp, list_T *list, int action, char_u *title, dict_T *what);
-+int set_ref_in_quickfix(int copyID);
- void ex_cbuffer(exarg_T *eap);
- void ex_cexpr(exarg_T *eap);
- void ex_helpgrep(exarg_T *eap);
-diff -Naur vim80.orig/src/proto/screen.pro vim80/src/proto/screen.pro
---- vim80.orig/src/proto/screen.pro	2016-11-06 15:56:54.000000000 +0000
-+++ vim80/src/proto/screen.pro	2017-05-15 23:29:18.703799493 +0000
-@@ -5,11 +5,12 @@
- void redraw_all_later(int type);
- void redraw_curbuf_later(int type);
- void redraw_buf_later(buf_T *buf, int type);
-+void redraw_buf_and_status_later(buf_T *buf, int type);
- int redraw_asap(int type);
- void redraw_after_callback(void);
- void redrawWinline(linenr_T lnum, int invalid);
- void update_curbuf(int type);
--void update_screen(int type);
-+void update_screen(int type_arg);
- int conceal_cursor_line(win_T *wp);
- void conceal_check_cursur_line(void);
- void update_single_line(win_T *wp, linenr_T lnum);
-diff -Naur vim80.orig/src/quickfix.c vim80/src/quickfix.c
---- vim80.orig/src/quickfix.c	2017-04-23 15:07:07.000000000 +0000
-+++ vim80/src/quickfix.c	2017-05-15 23:29:18.716799674 +0000
-@@ -57,6 +57,7 @@
-     int		qf_nonevalid;	/* TRUE if not a single valid entry found */
-     char_u	*qf_title;	/* title derived from the command that created
- 				 * the error list */
-+    typval_T	*qf_ctx;	/* context set by setqflist/setloclist */
- } qf_list_T;
- 
- struct qf_info_S
-@@ -918,7 +919,7 @@
- 	    }
- 	    if (fmt_ptr->flags == '+' && !qi->qf_multiscan)	/* %+ */
- 	    {
--		if (linelen > fields->errmsglen)
-+		if (linelen >= fields->errmsglen)
- 		{
- 		    /* linelen + null terminator */
- 		    if ((fields->errmsg = vim_realloc(fields->errmsg,
-@@ -933,7 +934,7 @@
- 		if (regmatch.startp[i] == NULL || regmatch.endp[i] == NULL)
- 		    continue;
- 		len = (int)(regmatch.endp[i] - regmatch.startp[i]);
--		if (len > fields->errmsglen)
-+		if (len >= fields->errmsglen)
- 		{
- 		    /* len + null terminator */
- 		    if ((fields->errmsg = vim_realloc(fields->errmsg, len + 1))
-@@ -1016,7 +1017,7 @@
- 	fields->namebuf[0] = NUL;	/* no match found, remove file name */
- 	fields->lnum = 0;			/* don't jump to this line */
- 	fields->valid = FALSE;
--	if (linelen > fields->errmsglen)
-+	if (linelen >= fields->errmsglen)
- 	{
- 	    /* linelen + null terminator */
- 	    if ((fields->errmsg = vim_realloc(fields->errmsg,
-@@ -1596,6 +1597,14 @@
- 	    to_qfl->qf_title = vim_strsave(from_qfl->qf_title);
- 	else
- 	    to_qfl->qf_title = NULL;
-+	if (from_qfl->qf_ctx != NULL)
-+	{
-+	    to_qfl->qf_ctx = alloc_tv();
-+	    if (to_qfl->qf_ctx != NULL)
-+		copy_tv(from_qfl->qf_ctx, to_qfl->qf_ctx);
-+	}
-+	else
-+	    to_qfl->qf_ctx = NULL;
- 
- 	if (from_qfl->qf_count)
- 	{
-@@ -2749,6 +2758,8 @@
-     }
-     vim_free(qi->qf_lists[idx].qf_title);
-     qi->qf_lists[idx].qf_title = NULL;
-+    free_tv(qi->qf_lists[idx].qf_ctx);
-+    qi->qf_lists[idx].qf_ctx = NULL;
-     qi->qf_lists[idx].qf_index = 0;
-     qi->qf_lists[idx].qf_start = NULL;
-     qi->qf_lists[idx].qf_last = NULL;
-@@ -4629,6 +4640,7 @@
-     QF_GETLIST_ITEMS	= 0x2,
-     QF_GETLIST_NR	= 0x4,
-     QF_GETLIST_WINID	= 0x8,
-+    QF_GETLIST_CONTEXT	= 0x10,
-     QF_GETLIST_ALL	= 0xFF
- };
- 
-@@ -4681,6 +4693,9 @@
-     if (dict_find(what, (char_u *)"winid", -1) != NULL)
- 	flags |= QF_GETLIST_WINID;
- 
-+    if (dict_find(what, (char_u *)"context", -1) != NULL)
-+	flags |= QF_GETLIST_CONTEXT;
-+
-     if (flags & QF_GETLIST_TITLE)
-     {
- 	char_u	*t;
-@@ -4699,6 +4714,22 @@
- 	    status = dict_add_nr_str(retdict, "winid", win->w_id, NULL);
-     }
- 
-+    if ((status == OK) && (flags & QF_GETLIST_CONTEXT))
-+    {
-+	if (qi->qf_lists[qf_idx].qf_ctx != NULL)
-+	{
-+	    di = dictitem_alloc((char_u *)"context");
-+	    if (di != NULL)
-+	    {
-+		copy_tv(qi->qf_lists[qf_idx].qf_ctx, &di->di_tv);
-+		if (dict_add(retdict, di) == FAIL)
-+		    dictitem_free(di);
-+	    }
-+	}
-+	else
-+	    status = dict_add_nr_str(retdict, "context", 0L, (char_u *)"");
-+    }
-+
-     return status;
- }
- 
-@@ -4874,6 +4905,16 @@
- 	}
-     }
- 
-+    if ((di = dict_find(what, (char_u *)"context", -1)) != NULL)
-+    {
-+	typval_T	*ctx;
-+	free_tv(qi->qf_lists[qi->qf_curlist].qf_ctx);
-+	ctx =  alloc_tv();
-+	if (ctx != NULL)
-+	    copy_tv(&di->di_tv, ctx);
-+	qi->qf_lists[qi->qf_curlist].qf_ctx = ctx;
-+    }
-+
-     return retval;
- }
- 
-@@ -4981,6 +5022,52 @@
- 
-     return retval;
- }
-+
-+    static int
-+mark_quickfix_ctx(qf_info_T *qi, int copyID)
-+{
-+    int		i;
-+    int		abort = FALSE;
-+    typval_T	*ctx;
-+
-+    for (i = 0; i < LISTCOUNT && !abort; ++i)
-+    {
-+	ctx = qi->qf_lists[i].qf_ctx;
-+	if (ctx != NULL && ctx->v_type != VAR_NUMBER &&
-+		ctx->v_type != VAR_STRING && ctx->v_type != VAR_FLOAT)
-+	    abort = set_ref_in_item(ctx, copyID, NULL, NULL);
-+    }
-+
-+    return abort;
-+}
-+
-+/*
-+ * Mark the context of the quickfix list and the location lists (if present) as
-+ * "in use". So that garabage collection doesn't free the context.
-+ */
-+    int
-+set_ref_in_quickfix(int copyID)
-+{
-+    int		abort = FALSE;
-+    tabpage_T	*tp;
-+    win_T	*win;
-+
-+    abort = mark_quickfix_ctx(&ql_info, copyID);
-+    if (abort)
-+	return abort;
-+
-+    FOR_ALL_TAB_WINDOWS(tp, win)
-+    {
-+	if (win->w_llist != NULL)
-+	{
-+	    abort = mark_quickfix_ctx(win->w_llist, copyID);
-+	    if (abort)
-+		return abort;
-+	}
-+    }
-+
-+    return abort;
-+}
- #endif
- 
- /*
-diff -Naur vim80.orig/src/regexp_nfa.c vim80/src/regexp_nfa.c
---- vim80.orig/src/regexp_nfa.c	2017-03-29 15:21:00.000000000 +0000
-+++ vim80/src/regexp_nfa.c	2017-05-15 23:29:18.724799786 +0000
-@@ -5799,9 +5799,6 @@
- 		}
- #ifdef ENABLE_LOG
- 		fprintf(log_fd, "Match found:\n");
--		/* TODO: this avoids a crash but is not right */
--		if (t->state->c == NFA_END_INVISIBLE_NEG)
--		    m->norm.in_use = 0;
- 		log_subsexpr(m);
- #endif
- 		nfa_match = TRUE;
-diff -Naur vim80.orig/src/screen.c vim80/src/screen.c
---- vim80.orig/src/screen.c	2017-03-29 18:37:12.000000000 +0000
-+++ vim80/src/screen.c	2017-05-15 23:29:18.730799869 +0000
-@@ -265,6 +265,23 @@
-     }
- }
- 
-+    void
-+redraw_buf_and_status_later(buf_T *buf, int type)
-+{
-+    win_T	*wp;
-+
-+    FOR_ALL_WINDOWS(wp)
-+    {
-+	if (wp->w_buffer == buf)
-+	{
-+	    redraw_win_later(wp, type);
-+#ifdef FEAT_WINDOWS
-+	    wp->w_redr_status = TRUE;
-+#endif
-+	}
-+    }
-+}
-+
- /*
-  * Redraw as soon as possible.  When the command line is not scrolled redraw
-  * right away and restore what was on the command line.
-@@ -421,10 +438,29 @@
-     if (State == HITRETURN || State == ASKMORE)
- 	; /* do nothing */
-     else if (State & CMDLINE)
--	redrawcmdline();
-+    {
-+	/* Redrawing only works when the screen didn't scroll. */
-+	if (msg_scrolled == 0)
-+	{
-+	    update_screen(0);
-+	    compute_cmdrow();
-+	}
-+	else
-+	{
-+	    /* Redraw in the same position, so that the user can continue
-+	     * editing the command. */
-+	    compute_cmdrow();
-+	    if (cmdline_row > msg_scrolled)
-+		cmdline_row -= msg_scrolled;
-+	    else
-+		cmdline_row = 0;
-+	}
-+	redrawcmdline_ex(FALSE);
-+    }
-     else if (State & (NORMAL | INSERT))
-     {
--	update_screen(0);
-+	/* keep the command line if possible */
-+	update_screen(VALID_NO_UPDATE);
- 	setcursor();
-     }
-     cursor_on();
-@@ -476,7 +512,7 @@
- }
- 
- /*
-- * update all windows that are editing the current buffer
-+ * Update all windows that are editing the current buffer.
-  */
-     void
- update_curbuf(int type)
-@@ -490,8 +526,9 @@
-  * of stuff from Filemem to ScreenLines[], and update curwin->w_botline.
-  */
-     void
--update_screen(int type)
-+update_screen(int type_arg)
- {
-+    int		type = type_arg;
-     win_T	*wp;
-     static int	did_intro = FALSE;
- #if defined(FEAT_SEARCH_EXTRA) || defined(FEAT_CLIPBOARD)
-@@ -502,11 +539,18 @@
-     int		gui_cursor_col;
-     int		gui_cursor_row;
- #endif
-+    int		no_update = FALSE;
- 
-     /* Don't do anything if the screen structures are (not yet) valid. */
-     if (!screen_valid(TRUE))
- 	return;
- 
-+    if (type == VALID_NO_UPDATE)
-+    {
-+	no_update = TRUE;
-+	type = 0;
-+    }
-+
-     if (must_redraw)
-     {
- 	if (type < must_redraw)	    /* use maximal type */
-@@ -539,6 +583,8 @@
-     ++display_tick;	    /* let syntax code know we're in a next round of
- 			     * display updating */
- #endif
-+    if (no_update)
-+	++no_win_do_lines_ins;
- 
-     /*
-      * if the screen was scrolled up when displaying a message, scroll it down
-@@ -576,7 +622,8 @@
- 		    }
- 		}
- 	    }
--	    redraw_cmdline = TRUE;
-+	    if (!no_update)
-+		redraw_cmdline = TRUE;
- #ifdef FEAT_WINDOWS
- 	    redraw_tabline = TRUE;
- #endif
-@@ -748,6 +795,9 @@
-     if (clear_cmdline || redraw_cmdline)
- 	showmode();
- 
-+    if (no_update)
-+	--no_win_do_lines_ins;
-+
-     /* May put up an introductory message when not editing a file */
-     if (!did_intro)
- 	maybe_intro_message();
-@@ -9475,6 +9525,11 @@
-     if (!redrawing() || line_count <= 0)
- 	return FAIL;
- 
-+    /* When inserting lines would result in loss of command output, just redraw
-+     * the lines. */
-+    if (no_win_do_lines_ins && !del)
-+	return FAIL;
-+
-     /* only a few lines left: redraw is faster */
-     if (mayclear && Rows - line_count < 5
- #ifdef FEAT_WINDOWS
-@@ -9482,7 +9537,8 @@
- #endif
- 	    )
-     {
--	screenclear();	    /* will set wp->w_lines_valid to 0 */
-+	if (!no_win_do_lines_ins)
-+	    screenclear();	    /* will set wp->w_lines_valid to 0 */
- 	return FAIL;
-     }
- 
-@@ -9498,10 +9554,12 @@
-     }
- 
-     /*
--     * when scrolling, the message on the command line should be cleared,
-+     * When scrolling, the message on the command line should be cleared,
-      * otherwise it will stay there forever.
-+     * Don't do this when avoiding to insert lines.
-      */
--    clear_cmdline = TRUE;
-+    if (!no_win_do_lines_ins)
-+	clear_cmdline = TRUE;
- 
-     /*
-      * If the terminal can set a scroll region, use that.
-diff -Naur vim80.orig/src/testdir/test_channel.py vim80/src/testdir/test_channel.py
---- vim80.orig/src/testdir/test_channel.py	2017-02-06 19:31:27.000000000 +0000
-+++ vim80/src/testdir/test_channel.py	2017-05-15 23:29:18.868801793 +0000
-@@ -62,39 +62,6 @@
-                     if decoded[1] == 'hello!':
-                         # simply send back a string
-                         response = "got it"
--                    elif decoded[1] == 'malformed1':
--                        cmd = '["ex",":"]wrong!["ex","smi"]'
--                        print("sending: {0}".format(cmd))
--                        self.request.sendall(cmd.encode('utf-8'))
--                        response = "ok"
--                        # Need to wait for Vim to give up, otherwise it
--                        # sometimes fails on OS X.
--                        time.sleep(0.2)
--                    elif decoded[1] == 'malformed2':
--                        cmd = '"unterminated string'
--                        print("sending: {0}".format(cmd))
--                        self.request.sendall(cmd.encode('utf-8'))
--                        response = "ok"
--                        # Need to wait for Vim to give up, otherwise the double
--                        # quote in the "ok" response terminates the string.
--                        time.sleep(0.2)
--                    elif decoded[1] == 'malformed3':
--                        cmd = '["ex","missing ]"'
--                        print("sending: {0}".format(cmd))
--                        self.request.sendall(cmd.encode('utf-8'))
--                        response = "ok"
--                        # Need to wait for Vim to give up, otherwise the ]
--                        # in the "ok" response terminates the list.
--                        time.sleep(0.2)
--                    elif decoded[1] == 'split':
--                        cmd = '["ex","let '
--                        print("sending: {0}".format(cmd))
--                        self.request.sendall(cmd.encode('utf-8'))
--                        time.sleep(0.01)
--                        cmd = 'g:split = 123"]'
--                        print("sending: {0}".format(cmd))
--                        self.request.sendall(cmd.encode('utf-8'))
--                        response = "ok"
-                     elif decoded[1].startswith("echo "):
-                         # send back the argument
-                         response = decoded[1][5:]
-@@ -154,6 +121,39 @@
-                         print("sending: {0}".format(cmd))
-                         self.request.sendall(cmd.encode('utf-8'))
-                         response = "ok"
-+                    elif decoded[1] == 'malformed1':
-+                        cmd = '["ex",":"]wrong!["ex","smi"]'
-+                        print("sending: {0}".format(cmd))
-+                        self.request.sendall(cmd.encode('utf-8'))
-+                        response = "ok"
-+                        # Need to wait for Vim to give up, otherwise it
-+                        # sometimes fails on OS X.
-+                        time.sleep(0.2)
-+                    elif decoded[1] == 'malformed2':
-+                        cmd = '"unterminated string'
-+                        print("sending: {0}".format(cmd))
-+                        self.request.sendall(cmd.encode('utf-8'))
-+                        response = "ok"
-+                        # Need to wait for Vim to give up, otherwise the double
-+                        # quote in the "ok" response terminates the string.
-+                        time.sleep(0.2)
-+                    elif decoded[1] == 'malformed3':
-+                        cmd = '["ex","missing ]"'
-+                        print("sending: {0}".format(cmd))
-+                        self.request.sendall(cmd.encode('utf-8'))
-+                        response = "ok"
-+                        # Need to wait for Vim to give up, otherwise the ]
-+                        # in the "ok" response terminates the list.
-+                        time.sleep(0.2)
-+                    elif decoded[1] == 'split':
-+                        cmd = '["ex","let '
-+                        print("sending: {0}".format(cmd))
-+                        self.request.sendall(cmd.encode('utf-8'))
-+                        time.sleep(0.01)
-+                        cmd = 'g:split = 123"]'
-+                        print("sending: {0}".format(cmd))
-+                        self.request.sendall(cmd.encode('utf-8'))
-+                        response = "ok"
-                     elif decoded[1] == 'an expr':
-                         # Send an expr request.
-                         cmd = '["expr","setline(\\"$\\", [\\"one\\",\\"two\\",\\"three\\"])"]'
-diff -Naur vim80.orig/src/testdir/test_fold.vim vim80/src/testdir/test_fold.vim
---- vim80.orig/src/testdir/test_fold.vim	2017-04-23 15:17:28.000000000 +0000
-+++ vim80/src/testdir/test_fold.vim	2017-05-15 23:29:18.897802197 +0000
-@@ -278,7 +278,6 @@
-   call assert_equal(0, foldlevel(6))
-   call assert_equal(9, foldclosedend(7))
-   call assert_equal([-1, 2, 2, 2, 2, -1, 7, 7, 7, -1], map(range(1, line('$')), 'foldclosed(v:val)'))
--
-   %d
-   " Ensure moving around the edges still works.
-   call setline(1, PrepIndent("a") + repeat(["a"], 3) + ["\ta"])
-diff -Naur vim80.orig/src/testdir/test_popup.vim vim80/src/testdir/test_popup.vim
---- vim80.orig/src/testdir/test_popup.vim	2017-03-18 19:09:46.000000000 +0000
-+++ vim80/src/testdir/test_popup.vim	2017-05-15 23:29:18.921802532 +0000
-@@ -570,4 +570,47 @@
-   bwipe!
- endfunc
- 
-+fun MessCompleteMonths()
-+  for m in split("Jan Feb Mar Apr May Jun Jul Aug Sep")
-+    call complete_add(m)
-+    if complete_check()
-+      break
-+    endif
-+  endfor
-+  return []
-+endfun
-+
-+fun MessCompleteMore()
-+  call complete(1, split("Oct Nov Dec"))
-+  return []
-+endfun
-+
-+fun MessComplete(findstart, base)
-+  if a:findstart
-+    let line = getline('.')
-+    let start = col('.') - 1
-+    while start > 0 && line[start - 1] =~ '\a'
-+      let start -= 1
-+    endwhile
-+    return start
-+  else
-+    call MessCompleteMonths()
-+    call MessCompleteMore()
-+    return []
-+  endif
-+endf
-+
-+func Test_complete_func_mess()
-+  " Calling complete() after complete_add() in 'completefunc' is wrong, but it
-+  " should not crash.
-+  set completefunc=MessComplete
-+  new
-+  call setline(1, 'Ju')
-+  call feedkeys("A\<c-x>\<c-u>/\<esc>", 'tx')
-+  call assert_equal('Oct/Oct', getline(1))
-+  bwipe!
-+  set completefunc=
-+endfunc
-+
-+
- " vim: shiftwidth=2 sts=2 expandtab
-diff -Naur vim80.orig/src/testdir/test_quickfix.vim vim80/src/testdir/test_quickfix.vim
---- vim80.orig/src/testdir/test_quickfix.vim	2017-04-22 19:13:07.000000000 +0000
-+++ vim80/src/testdir/test_quickfix.vim	2017-05-15 23:29:18.924802573 +0000
-@@ -1772,6 +1772,38 @@
-     if a:cchar == 'l'
- 	call assert_equal({}, getloclist(99, {'title': 1}))
-     endif
-+
-+    " Context related tests
-+    call g:Xsetlist([], 'a', {'context':[1,2,3]})
-+    call test_garbagecollect_now()
-+    let d = g:Xgetlist({'context':1})
-+    call assert_equal([1,2,3], d.context)
-+    call g:Xsetlist([], 'a', {'context':{'color':'green'}})
-+    let d = g:Xgetlist({'context':1})
-+    call assert_equal({'color':'green'}, d.context)
-+    call g:Xsetlist([], 'a', {'context':"Context info"})
-+    let d = g:Xgetlist({'context':1})
-+    call assert_equal("Context info", d.context)
-+    call g:Xsetlist([], 'a', {'context':246})
-+    let d = g:Xgetlist({'context':1})
-+    call assert_equal(246, d.context)
-+    if a:cchar == 'l'
-+	" Test for copying context across two different location lists
-+	new | only
-+	let w1_id = win_getid()
-+	let l = [1]
-+	call setloclist(0, [], 'a', {'context':l})
-+	new
-+	let w2_id = win_getid()
-+	call add(l, 2)
-+	call assert_equal([1, 2], getloclist(w1_id, {'context':1}).context)
-+	call assert_equal([1, 2], getloclist(w2_id, {'context':1}).context)
-+	unlet! l
-+	call assert_equal([1, 2], getloclist(w2_id, {'context':1}).context)
-+	only
-+	call setloclist(0, [], 'f')
-+	call assert_equal({}, getloclist(0, {'context':1}))
-+    endif
- endfunc
- 
- func Test_qf_property()
-diff -Naur vim80.orig/src/testdir/test_vimscript.vim vim80/src/testdir/test_vimscript.vim
---- vim80.orig/src/testdir/test_vimscript.vim	2017-04-10 20:19:28.000000000 +0000
-+++ vim80/src/testdir/test_vimscript.vim	2017-05-15 23:29:18.940802796 +0000
-@@ -1,4 +1,4 @@
--" Test various aspects of the Vim script language.
-+" Test various aspects of the Vim language.
- " Most of this was formerly in test49.
- 
- "-------------------------------------------------------------------------------
-diff -Naur vim80.orig/src/version.c vim80/src/version.c
---- vim80.orig/src/version.c	2017-04-23 16:49:16.000000000 +0000
-+++ vim80/src/version.c	2017-05-15 23:29:18.952802964 +0000
-@@ -765,6 +765,28 @@
- static int included_patches[] =
- {   /* Add new patch number below this line */
- /**/
-+    597,
-+/**/
-+    596,
-+/**/
-+    595,
-+/**/
-+    594,
-+/**/
-+    593,
-+/**/
-+    592,
-+/**/
-+    591,
-+/**/
-+    590,
-+/**/
-+    589,
-+/**/
-+    588,
-+/**/
-+    587,
-+/**/
-     586,
- /**/
-     585,
-diff -Naur vim80.orig/src/vim.h vim80/src/vim.h
---- vim80.orig/src/vim.h	2017-03-19 19:55:40.000000000 +0000
-+++ vim80/src/vim.h	2017-05-15 23:29:18.955803005 +0000
-@@ -630,6 +630,8 @@
-  * flags for update_screen()
-  * The higher the value, the higher the priority
-  */
-+#define VALID_NO_UPDATE		 5  /* no new changes, keep the command line if
-+				       possible */
- #define VALID			10  /* buffer not changed, or changes marked
- 				       with b_mod_* */
- #define INVERTED		20  /* redisplay inverted part that changed */
-diff -Naur vim80.orig/src.info vim80/src.info
---- vim80.orig/src.info	2017-04-23 18:29:57.000000000 +0000
-+++ vim80/src.info	1970-01-01 00:00:00.000000000 +0000
-@@ -1 +0,0 @@
--ã]4B
-#òø%ždj (Y)'·`
-¢mHÿÿ'xZ"Œ\?ÿÿÿÿB
-8@?ÿÿÿÿÿÿÿÀ<À<ÿÿÿÿÿÿÿÀ<ÿÿÿÿÿÿÿÀ<ÿÿÿÿÿÿÿÀ<ÿÿÿÿÿÿÿÀ<ÿÿÿÿÿÿÿÀ=ÿÿÿÿÿÿÿÀ?ÿÿÿÿÿÿÿÀÿÿÿÿÿÿÿÀÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿïÿÿÿÿÿÿÿÏÿÿþÿÿÏÿÿü/ÿÏÿÿÿÕUWÿÏÿÿÿÿÿÿÿÏþÿÿÿÿÿÿÿÿB
-@?ÿÿÿÿÿÿÿÀ?À¿Àÿÿÿÿÿÿ¿ÀÿÿÿÿÿÿÀÿÿÿÿÿÿ¿ÀÿÿÿÿÿÿÀÿÿÿÿÿÿÿÀÿÿÿÿÿÿÿÀÿÿÿÿÿÿÿÀÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ¿ÿÿÿÿÿþ¿ÿÿÿÿÿü¿ÿóÿüÿüO¿ÿàü¿ÿþªª¿ü¿ÿÿÿÿÿü ÿ
-\ No newline at end of file
-diff -Naur vim80.orig/vimdir.info vim80/vimdir.info
---- vim80.orig/vimdir.info	2017-04-23 18:29:57.000000000 +0000
-+++ vim80/vimdir.info	1970-01-01 00:00:00.000000000 +0000
-@@ -1,2 +0,0 @@
--ãB
-""žd 'P'y
--<enÿÿ'z"\?ÿÿÿÿB
-
-x@?ÿÿÿÿÿÿÿÀ<À<ÿÿÿÿÿÿÿÀ<ÿÿÿÿÿÿÿÀ<ÿÿÿÿÿÿÿÀ<ÿÿÿÿÿÿÿÀ<ÿÿÿÿÿÿÿÀ=ÿÿÿÿÿÿÿÀ?ÿÿÿÿÿÿÿÀÿÿÿÿÿÿÿÀÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿïÿÿÿÿÿÿÿÏÿÿþÿÿÏÿÿü/ÿÏÿÿÿÕUWÿÏÿÿÿÿÿÿÿÏþÿÿÿÿÿÿÿÿB
-X@?ÿÿÿÿÿÿÿÀ?À¿Àÿÿÿÿÿÿ¿ÀÿÿÿÿÿÿÀÿÿÿÿÿÿ¿ÀÿÿÿÿÿÿÀÿÿÿÿÿÿÿÀÿÿÿÿÿÿÿÀÿÿÿÿÿÿÿÀÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ¿ÿÿÿÿÿþ¿ÿÿÿÿÿü¿ÿóÿüÿüO¿ÿàü¿ÿþªª¿ü¿ÿÿÿÿÿü ÿ
-\ No newline at end of file
Index: tches/yaboot-1.3.17-ofpath_path_prefix-1.patch
===================================================================
--- patches/yaboot-1.3.17-ofpath_path_prefix-1.patch	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,19 +1,0 @@
-Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
-Date: 2006-05-16
-Initial Package Version: 1.3.13
-Upstream Status: Not submitted, CLFS-specific
-Origin: copied from the other scripts in ybin directory
-Description: Allows ofpath to use PATH_PREFIX like the other scripts.
-
---- yaboot-1.3.13/ybin/ofpath.orig	2006-05-16 22:32:26.000000000 +0100
-+++ yaboot-1.3.13/ybin/ofpath	2006-05-16 22:33:13.000000000 +0100
-@@ -26,6 +26,9 @@
- ###############################################################################
- 
- PATH="/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin"
-+if [ -n "$PATH_PREFIX" ] ; then
-+    PATH="${PATH}:${PATH_PREFIX}/sbin:${PATH_PREFIX}/bin:${PATH_PREFIX}/usr/sbin:${PATH_PREFIX}/usr/bin:${PATH_PREFIX}/usr/local/sbin:${PATH_PREFIX}/usr/local/bin"
-+fi
- PRG="${0##*/}"
- VERSION=1.0.7
- DEBUG=0
Index: tches/yaboot-1.3.17-parted-1.patch
===================================================================
--- patches/yaboot-1.3.17-parted-1.patch	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,36 +1,0 @@
-Submitted By: William Harrington kb0iic at cross-lfs dot org 
-Date: 2013-10-20
-Initial Package Version: 1.3.10
-Upstream Status: Unknown
-Origin: https://bugzilla.redhat.com/show_bug.cgi?id=121361
-Description: Add parted support to yabootconfig.
-
---- yaboot-1.3.10/ybin/yabootconfig~	2004-04-20 16:20:13.619375616 -0400
-+++ yaboot-1.3.10/ybin/yabootconfig	2004-04-20 16:32:40.519829488 -0400
-@@ -160,6 +160,8 @@
- 	FDISK=mac-fdisk
-     elif (command -v pdisk > /dev/null 2>&1) ; then
- 	FDISK=pdisk
-+    elif (command -v parted > /dev/null 2>&1) ; then
-+	FDISK=parted
-     else
- 	echo 1>&2 "$PRG: Unable to locate mac-fdisk"
- 	return 1
-@@ -209,9 +211,16 @@
- 		BOOT="${DISK}${BOOT}"
- 	    fi
- 	    debug "BOOT after fixup: $BOOT\n"
--	else
-+	elif [ "$FDISK" = mac-fdisk ] ; then
- 	    BOOT="$(v=`$FDISK -l "$DISK" 2>/dev/null | grep '\<Apple_Bootstrap\>'` ; echo ${v%%[ ]*})"
- 	    debug "BOOT=$BOOT\n"
-+	else
-+	    BOOT="$(v=`$FDISK "$DISK" print 2>/dev/null | grep 'bootstrap'` ; echo ${v%%[ ]*})"
-+	    debug "BOOT before fixup: $BOOT\n"
-+	    if [ -n "$BOOT" ] ; then
-+		BOOT="${DISK}${BOOT}"
-+	    fi
-+	    debug "BOOT after fixup: $BOOT\n"
- 	fi
- 	if [ -z "$BOOT" ] ; then
- 	    echo 1>&2 "$PRG: Unable to locate bootstrap partition on $DISK..."
Index: tches/yaboot-1.3.17-stubfuncs-1.patch
===================================================================
--- patches/yaboot-1.3.17-stubfuncs-1.patch	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,208 +1,0 @@
-Submitted By: William Harrington kb0iic at cross-lfs dot org 
-Date: 2013-01-13
-Initial Package Version: 1.3.17
-Upstream Status: Unknown
-Origin: Gentoo x86 sys-boot yaboot files
-Description: Adds more stub functions for newer e2fsprogs.
-
-diff -Naur yaboot-1.3.17.orig/lib/malloc.c yaboot-1.3.17/lib/malloc.c
---- yaboot-1.3.17.orig/lib/malloc.c	2011-10-18 04:11:10.000000000 +0000
-+++ yaboot-1.3.17/lib/malloc.c	2013-01-13 13:32:27.392764935 +0000
-@@ -64,6 +64,15 @@
-     return caddr;
- }
- 
-+/* Calloc wrapper for malloc */
-+void *memset(void *s, int c, size_t n);
-+void *calloc(size_t nmemb, size_t size) {
-+	void *caddr;
-+	caddr = malloc(nmemb * size);
-+	memset(caddr, 0, nmemb * size);
-+	return caddr;
-+}
-+
- /* Do not fall back to the malloc above as posix_memalign is needed by
-  * external libraries not yaboot */
- int posix_memalign(void **memptr, size_t alignment, size_t size)
-diff -Naur yaboot-1.3.17.orig/lib/nonstd.c yaboot-1.3.17/lib/nonstd.c
---- yaboot-1.3.17.orig/lib/nonstd.c	2011-10-18 04:11:10.000000000 +0000
-+++ yaboot-1.3.17/lib/nonstd.c	2013-01-13 13:32:27.396764906 +0000
-@@ -65,3 +65,178 @@
- {
- 	return NULL;
- }
-+
-+// I tried to use prom functions for these...
-+int open(const char *pathname, int flags) {
-+	return (int) prom_open((char *)pathname);
-+}
-+
-+int open64(const char *pathname, int flags) {
-+	return (int) prom_open((char *)pathname);
-+}
-+
-+int __open64_2 (__const char *__path, int __oflag) {
-+	return (int) prom_open((char *)__path);
-+}
-+
-+int read(int fd, void *buf, size_t count) {
-+	return prom_read((void *)fd, buf, count);
-+}
-+
-+int write(int fd, void *buf, size_t count) {
-+	return prom_write((void *)fd, buf, count);
-+}
-+
-+int close(int fd) {
-+	prom_close((void *)fd);
-+	return 0;
-+}
-+
-+// No fsync, just assume we've sync'd
-+int fsync(int fd) {
-+	return 0;
-+}
-+
-+void exit(int status) {
-+	prom_exit();
-+}
-+
-+int __printf_chk(int flag, const char *format, ...) {
-+	va_list ap;
-+	va_start (ap, format);
-+	prom_vfprintf (prom_stdout, format, ap);
-+	va_end (ap);
-+
-+	return 0;
-+}
-+
-+int __sprintf_chk(char * str, int flag, size_t strlen, const char * format, ...) {
-+	va_list ap;
-+	va_start(ap, format);
-+	// No sprintf? :(
-+	va_end(ap);
-+	return 0;
-+
-+}
-+
-+int __fprintf_chk(FILE *stream, int flag, const char *format, ...) {
-+	va_list ap;
-+	va_start (ap, format);
-+	prom_vfprintf (prom_stdout, format, ap);
-+	va_end (ap);
-+
-+	return 0;
-+}
-+
-+void *memcpy(void *dest, const void *src, size_t n);
-+void *__memcpy_chk(void *dest, const void *src, size_t n, size_t destlen) {
-+	return memcpy(dest, src, n);
-+}
-+
-+// But these are all dummy functions
-+int __xstat64 (int __ver, const char *__filename, void *__stat_buf) {
-+	return 0;
-+}
-+
-+int stat64(const char *path, void *stat_buf) {
-+	return 0;
-+}
-+
-+int fstat64(int fildes, void *stat_buf) {
-+	return 0;
-+}
-+
-+int __fxstat64 (int __ver, int __filedesc, void *__stat_buf) {
-+	return 0;
-+}
-+
-+signed int random(void) {
-+	return 0;
-+}
-+
-+void srandom(unsigned int seed) {
-+	return;
-+}
-+
-+int rand(void) {
-+	return 0;
-+}
-+
-+void srand(unsigned int seed) {
-+	return;
-+}
-+
-+unsigned int sleep(unsigned int seconds) {
-+	return 0;
-+}
-+
-+int gettimeofday(void *tv, void *tz) {
-+	return 0;
-+}
-+
-+long sysconf(int name) {
-+	return 0;
-+}
-+
-+int getpagesize(void) {
-+	return 0;
-+}
-+
-+int gethostname(char *name, size_t len) {
-+	return 0;
-+}
-+
-+int getpid(void) {
-+	return 0;
-+}
-+
-+int getuid(void) {
-+	return 0;
-+}
-+
-+void qsort(void *base, size_t nmemb, size_t size, int(*compar)(const void *, const void *)) {
-+	return;
-+}
-+
-+int * __errno_location(void) {
-+	return 0;
-+}
-+
-+int lseek(int fd, int offset, int whence) {
-+	return prom_lseek ((void *)fd, whence + offset);
-+}
-+
-+int lseek64(int fd, int offset, int whence) {
-+	return prom_lseek ((void *)fd, whence + offset);
-+}
-+
-+size_t fwrite(const void *ptr, size_t size, size_t nmemb, void *stream) {
-+	return 0;
-+}
-+
-+int ioctl(int d, int request, ...) {
-+	return 0;
-+}
-+
-+int fallocate(int fd, int mode, unsigned int offset, unsigned int len) {
-+	return 0;
-+}
-+
-+int uname(void *buf) {
-+	return 0;
-+}
-+
-+int setrlimit(int resource, void *rlim) {
-+	return 0;
-+}
-+
-+unsigned long long int strtoull(const char *nptr, char **endptr, int base) {
-+	return 0;
-+}
-+
-+int getrlimit(int resource, void *rlim) {
-+	return 0;
-+}
-+
-+int stderr = 0;
-+int perror = 0;
Index: ripts/fetch/binutils.sh
===================================================================
--- scripts/fetch/binutils.sh	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,151 +1,0 @@
-#!/bin/bash
-# Create a Binutils Tarball
-
-# Get Version #
-#
-VERSION=$1
-
-# Check Input
-#
-if [ "${VERSION}" = "" ]; then
-  echo "$0 - Binutils_Version"
-  echo "This will Create a Tarball for Binutils Binutils_Version"
-  echo "Example $0 2.19.51"
-  exit 255
-fi
-
-# Clear out old Directory
-#
-rm -rf ~/tmp
-
-# Set Patch Directory
-#
-PATCH_DIR=$(pwd -P)/binutils
-
-# Get Current binutils from SVN
-#
-install -d ~/tmp
-cd ~/tmp
-echo "Pulling latest Binutils trunk from CVS..."
-cvs -z 9 -d :pserver:anoncvs@sourceware.org:/cvs/src export -rHEAD binutils
-
-# Set Patch Number
-#
-cd ~/tmp
-wget http://svn.cross-lfs.org/svn/repos/patches/binutils/ --no-remove-listing
-for num in $(seq 1 99); do
-  PATCH_NUM=$(cat index.html | grep "${VERSION}" | grep fixes-${num}.patch | cut -f2 -d'"' | cut -f1 -d'"'| cut -f4 -d- | cut -f1 -d. | tail -n 1)
-  if [ "${PATCH_NUM}" = "0" -a "${num}" = "1" ]; then
-    PATCH_NUM=$(expr ${PATCH_NUM} + 1)
-    break
-  fi
-  if [ "${PATCH_NUM}" != "${num}" ]; then
-    PATCH_NUM=$(expr ${num})
-    break
-  fi
-done
-rm -f index.html
-
-# Customize the version string, so we know it's patched
-#
-cd ~/tmp
-mv src binutils-${VERSION}
-DL_DATE=$(date +%Y%m%d)
-cd ~/tmp/binutils-${VERSION}
-sed -i "s:@PKGVERSION@:(GNU Binutils for Cross-LFS - Retrieved on ${DL_DATE}) :" bfd/Makefile.in
-
-# Remove Files not needed
-#
-cd ~/tmp/binutils-${VERSION}
-FILE_LIST=".cvsignore"
-for files in ${FILE_LIST}; do
-  REMOVE=$(find * -name ${files})
-  for file in $REMOVE; do
-    rm -f ${file}
-  done
-done
-
-# Create a copy of the Original Directory So We can do some Updates
-#
-cd ~/tmp
-cp -ar binutils-${VERSION} binutils-${VERSION}.orig
-
-# Apply Patches from directories
-#
-cd ~/tmp/binutils-${VERSION}
-if [ -e ${PATCH_DIR}/${VERSION} ]; then
-  PATCH_FILES=$(ls ${PATCH_DIR}/${VERSION}/*.patch)
-  if [ "${PATCH_FILES}" != "" ]; then
-    for pfile in ${PATCH_FILES}; do
-      echo "Applying - ${pfile}..."
-      for pvalue in $(seq 0 5); do
-        patch --dry-run -Np${pvalue} -i ${pfile} > /dev/null 2>&1
-        if [ "${?}" = "0" ]; then
-          PVALUE=${pvalue}
-          break
-        fi
-      done
-      if [ "${PVALUE}" != "" ]; then
-        patch -Np${PVALUE} -i ${pfile}
-      else
-        echo "Patch: ${pfile} Failed to Apply..."
-        exit 255
-      fi
-    done
-  fi
-fi
-
-# Cleanup Directory
-#
-for dir in $(find * -type d); do
-  cd ~/tmp/binutils-${VERSION}
-  for file in $(find . -name '*~'); do
-    rm -f ${file}
-  done
-  for file in $(find . -name '*.orig'); do
-    rm -f ${file}
-  done
-  for file in $(find . -name '*.rej'); do
-    rm -f ${file}
-  done
-done
-cd ~/tmp/binutils-${VERSION}
-rm -rf *.orig *~ *.rej
-
-# Create Patch
-#
-diff -Naur ~/tmp/binutils-${VERSION} ~/tmp/binutils-${VERSION}.orig >>  ~/public_html/binutils-${VERSION}-fixes-${PATCH_NUM}.patch
-if [ "$(cat ~/public_html/binutils-${VERSION}-fixes-${PATCH_NUM}.patch)" != "" ]; then
-  cd ~/tmp/binutils-${VERSION}
-  install -d ~/public_html/
-  echo "Submitted By: Jim Gifford (jim at cross-lfs dot org)" >  ~/public_html/binutils-${VERSION}-fixes-${PATCH_NUM}.patch
-  echo "Date: `date +%m-%d-%Y`" >>  ~/public_html/binutils-${VERSION}-fixes-${PATCH_NUM}.patch
-  echo "Initial Package Version: ${VERSION}" >>  ~/public_html/binutils-${VERSION}-fixes-${PATCH_NUM}.patch
-  echo "Origin: Upstream" >>  ~/public_html/binutils-${VERSION}-fixes-${PATCH_NUM}.patch
-  echo "Upstream Status: Applied" >>  ~/public_html/binutils-${VERSION}-fixes-${PATCH_NUM}.patch
-  echo "Description: These are fixes binutils-${VERSION}, and should be" >>  ~/public_html/binutils-${VERSION}-fixes-${PATCH_NUM}.patch
-  echo "             rechecked periodically." >>  ~/public_html/binutils-${VERSION}-fixes-${PATCH_NUM}.patch
-  echo "" >>  ~/public_html/binutils-${VERSION}-fixes-${PATCH_NUM}.patch
-  diff -Naur ~/tmp/binutils-${VERSION} ~/tmp/binutils-${VERSION}.orig >>  ~/public_html/binutils-${VERSION}-fixes-${PATCH_NUM}.patch
-  echo "Created  ~/public_html/binutils-${VERSION}-fixes-${PATCH_NUM}.patch."
-else
-  rm ~/public_html/binutils-${VERSION}-fixes-${PATCH_NUM}.patch
-fi
-
-# Remove Patched Copy
-#
-cd ~/tmp
-rm -rf binutils-${VERSION}
-mv binutils-${VERSION}.orig binutils-${VERSION}
-
-# Compress
-#
-cd ~/tmp
-install -d ~/packages
-echo "Creating Tarball for Binutils ${VERSION}...."
-tar cjf ~/packages/binutils-${VERSION}-${DL_DATE}.tar.bz2 binutils-${VERSION}
-
-# Clean up Directores
-#
-cd ~/tmp
-rm -rf binutils-${VERSION}
Index: ripts/fetch/eglibc.sh
===================================================================
--- scripts/fetch/eglibc.sh	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,203 +1,0 @@
-#!/bin/bash
-# Create a Eglibc Tarball
-
-# Get Version #
-#
-VERSION=$1
-SOURCEVERSION=$2
-
-# Check Input
-#
-if [ "${VERSION}" = "" -o "${SOURCEVERSION}" = "" ]; then
-  echo "$0 - Eglibc_Version"
-  echo "This will Create a Tarball for Eglibc Eglibc_Series Eglibc_Version"
-  echo "Example $0 2.19 2.19.1"
-  exit 255
-fi
-
-# Clear out old Directory
-#
-rm -rf ~/tmp
-
-# Set Patch Directory
-#
-PATCH_DIR=$(pwd -P)/eglibc
-
-# Get Current Eglibc from SVN
-#
-install -d ~/tmp
-cd ~/tmp
-FIXEDVERSION=$(echo ${VERSION} | sed -e 's/\./_/g')
-DL_REVISION=$(svn info svn://svn.eglibc.org/branches/eglibc-${FIXEDVERSION} | grep "Last Changed Rev" | cut -f2 -d: | sed -e 's/ //g')
-echo "Retreiving Revision #${DL_REVISION} from SVN eglibc-${SOURCEVERSION}..."
-svn export -r ${DL_REVISION} svn://svn.eglibc.org/branches/eglibc-${FIXEDVERSION} eglibc-${SOURCEVERSION}
-
-# Set Patch Number
-#
-cd ~/tmp
-wget http://svn.cross-lfs.org/svn/repos/patches/eglibc/ --no-remove-listing
-for num in $(seq 1 99); do
-  PATCH_NUM=$(cat index.html | grep "${SOURCEVERSION}" | grep fixes-${num}.patch | cut -f2 -d'"' | cut -f1 -d'"'| cut -f4 -d- | cut -f1 -d. | tail -n 1)
-  if [ "${PATCH_NUM}" = "0" -a "${num}" = "1" ]; then
-    PATCH_NUM=$(expr ${PATCH_NUM} + 1)
-    break
-  fi
-  if [ "${PATCH_NUM}" != "${num}" ]; then
-    PATCH_NUM=$(expr ${num})
-    break
-  fi
-done
-rm -f index.html
-
-# Customize the version string, so we know it's patched
-#
-install -d ~/tmp/eglibc-${SOURCEVERSION}
-cd ~/tmp/eglibc-${SOURCEVERSION}
-DL_DATE=$(date +%Y%m%d)
-echo "#define DL_DATE \"${DL_DATE}\"" >> libc/version.h
-echo "#define DL_REVISION \"${DL_REVISION}\"" >> libc/version.h
-sed -i "s@Compiled by GNU CC version@Built for Cross-LFS.\\\\n\\\\\nRetrieved on \"DL_DATE\".\\\\n\\\\\\nCompiled by GNU CC version@" libc/csu/version.c
-sed -i "s@Compiled by GNU CC version@Revision # \"DL_REVISION\".\\\\n\\\\\\nCompiled by GNU CC version@" libc/csu/version.c
-sed -i "s@static const char __libc_release@static const char __libc_dl_date[] = DL_DATE;\nstatic const char __libc_release@" libc/csu/version.c
-sed -i "s@static const char __libc_release@static const char __libc_dl_revision[] = DL_REVISION;\nstatic const char __libc_release@" libc/csu/version.c
-
-# Remove Files not needed
-#
-cd ~/tmp/eglibc-${SOURCEVERSION}
-FILE_LIST=".cvsignore"
-for files in ${FILE_LIST}; do
-  REMOVE=$(find * -name ${files})
-  for file in $REMOVE; do
-    rm -f ${file}
-  done
-done
-
-# Fix configuration files
-#
-cd ~/tmp/eglibc-${SOURCEVERSION}
-echo "Updating Glibc configure files..."
-find . -name configure -exec touch {} \;
-
-# Create a copy of the Original Directory So We can do some Updates
-#
-cd ~/tmp/eglibc-${SOURCEVERSION}
-cp -ar libc libc.orig
-
-# Change gcc to BUILD_CC in the following files
-#
-cd ~/tmp/eglibc-${SOURCEVERSION}/libc
-FIX_FILES="sunrpc/Makefile timezone/Makefile"
-for fix_file in ${FIX_FILES}; do
-  sed -i 's/gcc/\$\(BUILD_CC\)/g' ${fix_file}
-done
-
-# Make testsuite fixes
-#
-cd ~/tmp/eglibc-${SOURCEVERSION}/libc
-sed -i 's|@BASH@|/bin/bash|' elf/ldd.bash.in
-sed -i s/utf8/UTF-8/ libio/tst-fgetwc.c
-sed -i '/tst-fgetws-ENV/ a\
-tst-fgetwc-ENV = LOCPATH=$(common-objpfx)localedata' libio/Makefile
-
-# Apply Patches from directories
-#
-cd ~/tmp/eglibc-${SOURCEVERSION}/libc
-if [ -e ${PATCH_DIR}/${VERSION} ]; then
-  PATCH_FILES=$(ls ${PATCH_DIR}/${VERSION}/*.patch)
-  if [ "${PATCH_FILES}" != "" ]; then
-    for pfile in ${PATCH_FILES}; do
-      echo "Applying - ${pfile}..."
-      for pvalue in $(seq 0 5); do
-        patch --dry-run -Np${pvalue} -i ${pfile} > /dev/null 2>&1
-        if [ "${?}" = "0" ]; then
-          PVALUE=${pvalue}
-          break
-        fi
-      done
-      if [ "${PVALUE}" != "" ]; then
-        patch -Np${PVALUE} -i ${pfile}
-      else
-        echo "Patch: ${pfile} Failed to Apply..."
-        exit 255
-      fi
-    done
-  fi
-fi
-
-# Cleanup Directory
-#
-for dir in $(find * -type d); do
-  cd ~/tmp/eglibc-${SOURCEVERSION}/libc
-  for file in $(find . -name '*~'); do
-    rm -f ${file}
-  done
-  for file in $(find . -name '*.orig'); do
-    rm -f ${file}
-  done
-  for file in $(find . -name '*.rej'); do
-    rm -f ${file}
-  done
-done
-cd ~/tmp/eglibc-${SOURCEVERSION}/libc
-rm -rf *.orig *~ *.rej
-
-# Create Patch
-#
-cd ~/tmp/eglibc-${SOURCEVERSION}
-install -d ~/patches/
-diff -Naur libc.orig libc >> ~/patches/eglibc-${SOURCEVERSION}-fixes-${PATCH_NUM}.patch
-if [ -e ~/patches/eglibc-${SOURCEVERSION}-fixes-${PATCH_NUM}.patch ]; then
-  echo "Submitted By: Jim Gifford (jim at cross-lfs dot org)" > ~/patches/eglibc-${SOURCEVERSION}-fixes-${PATCH_NUM}.patch
-  echo "Date: `date +%m-%d-%Y`" >>  ~/patches/eglibc-${SOURCEVERSION}-fixes-${PATCH_NUM}.patch
-  echo "Initial Package Version: ${SOURCEVERSION}" >>  ~/patches/eglibc-${SOURCEVERSION}-fixes-${PATCH_NUM}.patch
-  echo "Origin: Upstream" >>  ~/patches/eglibc-${SOURCEVERSION}-fixes-${PATCH_NUM}.patch
-  echo "Upstream Status: Applied" >>  ~/patches/eglibc-${SOURCEVERSION}-fixes-${PATCH_NUM}.patch
-  echo "Description: These are fixes eglibc-${SOURCEVERSION}, and should be" >>  ~/patches/eglibc-${SOURCEVERSION}-fixes-${PATCH_NUM}.patch
-  echo "             rechecked periodically." >>  ~/patches/eglibc-${SOURCEVERSION}-fixes-${PATCH_NUM}.patch
-  echo "" >>  ~/patches/eglibc-${SOURCEVERSION}-fixes-${PATCH_NUM}.patch
-  diff -Naur libc.orig libc >>  ~/patches/eglibc-${SOURCEVERSION}-fixes-${PATCH_NUM}.patch
-  echo "Created  ~/patches/eglibc-${SOURCEVERSION}-fixes-${PATCH_NUM}.patch."
-else
-  rm -f ~/patches/eglibc-${SOURCEVERSION}-fixes-${PATCH_NUM}.patch
-fi
-
-# Remove Patched Copy
-#
-cd ~/tmp/eglibc-${SOURCEVERSION}
-rm -rf libc
-mv libc.orig libc
-
-# Compress
-#
-cd ~/tmp/eglibc-${SOURCEVERSION}
-install -d ~/packages
-echo "Creating Tarball for Eglibc Ports ${SOURCEVERSION}...."
-tar cjf ~/packages/eglibc-ports-${SOURCEVERSION}-${DL_DATE}-r${DL_REVISION}.tar.bz2 ports
-rm -rf ports
-echo "Creating Tarball for Eglibc Linuxthreads ${SOURCEVERSION}...."
-tar cjf ~/packages/eglibc-linuxthreads-${SOURCEVERSION}-${DL_DATE}-r${DL_REVISION}.tar.bz2 linuxthreads
-rm -rf linuxthreads
-echo "Creating Tarball for Eglibc LocaleDef ${SOURCEVERSION}...."
-tar cjf ~/packages/eglibc-localedef-${SOURCEVERSION}-${DL_DATE}-r${DL_REVISION}.tar.bz2 localedef
-rm -rf localedef
-mv libc eglibc-${SOURCEVERSION}
-echo "Creating Tarball for Eglibc ${SOURCEVERSION}...."
-tar cjf ~/packages/eglibc-${SOURCEVERSION}-${DL_DATE}-r${DL_REVISION}.tar.bz2 eglibc-${SOURCEVERSION}
-
-# Clean up Directores
-#
-cd ~/tmp
-rm -rf eglibc-${SOURCEVERSION}
-
-# Display Created Files
-#
-echo "Tarballs:"
-echo "~/packages/eglibc-${SOURCEVERSION}-${DL_DATE}-r${DL_REVISION}.tar.bz2"
-echo "~/packages/eglibc-ports-${SOURCEVERSION}-${DL_DATE}-r${DL_REVISION}.tar.bz2"
-echo "~/packages/eglibc-linuxthreads-${SOURCEVERSION}-${DL_DATE}-r${DL_REVISION}.tar.bz2"
-echo "~/packages/eglibc-localedef-${SOURCEVERSION}-${DL_DATE}-r${DL_REVISION}.tar.bz2"
-if [ -e ~/patches/eglibc-${SOURCEVERSION}-fixes-${PATCH_NUM}.patch ]; then
-  echo "Patches:"
-  echo "~/patches/eglibc-${SOURCEVERSION}-fixes-${PATCH_NUM}.patch"
-  echo
-fi
Index: ripts/fetch/eglibc/2.10.1/01-i586_check.patch
===================================================================
--- scripts/fetch/eglibc/2.10.1/01-i586_check.patch	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,31 +1,0 @@
-2007-09-13  H.J. Lu  <hongjiu.lu@intel.com>
-
-	* sysdeps/i386/i586/memcpy_chk.S: New file.
-	* sysdeps/i386/i586/mempcpy_chk.S: Likewise.
-	* sysdeps/i386/i586/memset_chk.S: Likewise.
-
-Index: sysdeps/i386/i586/memcpy_chk.S
-===================================================================
-RCS file: sysdeps/i386/i586/memcpy_chk.S
-diff -N sysdeps/i386/i586/memcpy_chk.S
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ sysdeps/i386/i586/memcpy_chk.S	13 Nov 2007 01:56:18 -0000	1.1
-@@ -0,0 +1 @@
-+#include <sysdeps/i386/i686/memcpy_chk.S>
-Index: sysdeps/i386/i586/mempcpy_chk.S
-===================================================================
-RCS file: sysdeps/i386/i586/mempcpy_chk.S
-diff -N sysdeps/i386/i586/mempcpy_chk.S
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ sysdeps/i386/i586/mempcpy_chk.S	13 Nov 2007 01:56:18 -0000	1.1
-@@ -0,0 +1 @@
-+#include <sysdeps/i386/i686/mempcpy_chk.S>
-Index: sysdeps/i386/i586/memset_chk.S
-===================================================================
-RCS file: sysdeps/i386/i586/memset_chk.S
-diff -N sysdeps/i386/i586/memset_chk.S
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ sysdeps/i386/i586/memset_chk.S	13 Nov 2007 01:56:18 -0000	1.1
-@@ -0,0 +1 @@
-+#include <sysdeps/i386/i686/memset_chk.S>
-
Index: ripts/fetch/eglibc/2.10.1/05-localedef_segfault
===================================================================
--- scripts/fetch/eglibc/2.10.1/05-localedef_segfault	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,55 +1,0 @@
-Description: Fixes Segfault when using localdef.
-             This problem is only noticed when using PaX
-             and some architectures besides x86.
-             See debian bug # 231438
-
-             Rediffed for 2.8 by Joe Ciccone
-             Rediffed for 2.9 by Joe Ciccone
-
-diff -Naur glibc-2.8.orig/locale/programs/3level.h glibc-2.8/locale/programs/3level.h
---- glibc-2.8.orig/locale/programs/3level.h	2007-07-15 20:54:59.000000000 -0400
-+++ glibc-2.8/locale/programs/3level.h	2008-09-20 12:09:34.000000000 -0400
-@@ -203,6 +203,42 @@
- 	}
-     }
- }
-+
-+/* GCC ATM seems to do a poor job with pointers to nested functions passed
-+   to inlined functions.  Help it a little bit with this hack.  */
-+#define wchead_table_iterate(tp, fn) \
-+do									      \
-+  {									      \
-+    struct wchead_table *t = (tp);					      \
-+    uint32_t index1;							      \
-+    for (index1 = 0; index1 < t->level1_size; index1++)			      \
-+      {									      \
-+	uint32_t lookup1 = t->level1[index1];				      \
-+	if (lookup1 != ((uint32_t) ~0))					      \
-+	  {								      \
-+	    uint32_t lookup1_shifted = lookup1 << t->q;			      \
-+	    uint32_t index2;						      \
-+	    for (index2 = 0; index2 < (1 << t->q); index2++)		      \
-+	      {								      \
-+		uint32_t lookup2 = t->level2[index2 + lookup1_shifted];	      \
-+		if (lookup2 != ((uint32_t) ~0))				      \
-+		  {							      \
-+		    uint32_t lookup2_shifted = lookup2 << t->p;		      \
-+		    uint32_t index3;					      \
-+		    for (index3 = 0; index3 < (1 << t->p); index3++)	      \
-+		      {							      \
-+			struct element_t *lookup3			      \
-+			  = t->level3[index3 + lookup2_shifted];	      \
-+			if (lookup3 != NULL)				      \
-+			  fn ((((index1 << t->q) + index2) << t->p) + index3, \
-+			      lookup3);					      \
-+		      }							      \
-+		  }							      \
-+	      }								      \
-+	  }								      \
-+      }									      \
-+  } while (0)
-+
- #endif
- 
- #ifndef NO_FINALIZE
-
Index: ripts/fetch/eglibc/2.10.1/10-ppc-atomic.patch
===================================================================
--- scripts/fetch/eglibc/2.10.1/10-ppc-atomic.patch	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,419 +1,0 @@
-Index: sysdeps/powerpc/bits/atomic.h
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/powerpc/bits/atomic.h,v
-retrieving revision 1.17
-diff -u -a -p -r1.17 atomic.h
---- sysdeps/powerpc/bits/atomic.h	26 Mar 2007 20:15:28 -0000	1.17
-+++ sysdeps/powerpc/bits/atomic.h	31 May 2008 08:50:56 -0000
-@@ -85,14 +85,14 @@ typedef uintmax_t uatomic_max_t;
-       __typeof (*(mem)) __tmp;						      \
-       __typeof (mem)  __memp = (mem);					      \
-       __asm __volatile (						      \
--		        "1:	lwarx	%0,0,%1" MUTEX_HINT_ACQ "\n"	      \
-+		        "1:	lwarx	%0,%y1" MUTEX_HINT_ACQ "\n"	      \
- 		        "	cmpw	%0,%2\n"			      \
- 		        "	bne	2f\n"				      \
--		        "	stwcx.	%3,0,%1\n"			      \
-+		        "	stwcx.	%3,%y1\n"			      \
- 		        "	bne-	1b\n"				      \
- 		        "2:	" __ARCH_ACQ_INSTR			      \
--		        : "=&r" (__tmp)					      \
--		        : "b" (__memp), "r" (oldval), "r" (newval)	      \
-+		        : "=&r" (__tmp), "+Z" (*__memp)			      \
-+		        : "r" (oldval), "r" (newval)			      \
- 		        : "cr0", "memory");				      \
-       __tmp;								      \
-   })
-@@ -102,14 +102,14 @@ typedef uintmax_t uatomic_max_t;
-       __typeof (*(mem)) __tmp;						      \
-       __typeof (mem)  __memp = (mem);					      \
-       __asm __volatile (__ARCH_REL_INSTR "\n"				      \
--		        "1:	lwarx	%0,0,%1" MUTEX_HINT_REL "\n"	      \
-+		        "1:	lwarx	%0,%y1" MUTEX_HINT_REL "\n"	      \
- 		        "	cmpw	%0,%2\n"			      \
- 		        "	bne	2f\n"				      \
--		        "	stwcx.	%3,0,%1\n"			      \
-+		        "	stwcx.	%3,%y1\n"			      \
- 		        "	bne-	1b\n"				      \
- 		        "2:	"					      \
--		        : "=&r" (__tmp)					      \
--		        : "b" (__memp), "r" (oldval), "r" (newval)	      \
-+		        : "=&r" (__tmp), "+Z" (__memp)			      \
-+		        : "r" (oldval), "r" (newval)			      \
- 		        : "cr0", "memory");				      \
-       __tmp;								      \
-   })
-@@ -118,12 +118,12 @@ typedef uintmax_t uatomic_max_t;
-   ({									      \
-     __typeof (*mem) __val;						      \
-     __asm __volatile (							      \
--		      "1:	lwarx	%0,0,%2" MUTEX_HINT_ACQ "\n"	      \
--		      "		stwcx.	%3,0,%2\n"			      \
-+		      "1:	lwarx	%0,%y1" MUTEX_HINT_ACQ "\n"	      \
-+		      "		stwcx.	%2,%y1\n"			      \
- 		      "		bne-	1b\n"				      \
- 		      "   " __ARCH_ACQ_INSTR				      \
--		      : "=&r" (__val), "=m" (*mem)			      \
--		      : "b" (mem), "r" (value), "m" (*mem)		      \
-+		      : "=&r" (__val), "+Z" (*mem)			      \
-+		      : "r" (value)					      \
- 		      : "cr0", "memory");				      \
-     __val;								      \
-   })
-@@ -132,11 +132,11 @@ typedef uintmax_t uatomic_max_t;
-   ({									      \
-     __typeof (*mem) __val;						      \
-     __asm __volatile (__ARCH_REL_INSTR "\n"				      \
--		      "1:	lwarx	%0,0,%2" MUTEX_HINT_REL "\n"	      \
--		      "		stwcx.	%3,0,%2\n"			      \
-+		      "1:	lwarx	%0,%y1" MUTEX_HINT_REL "\n"	      \
-+		      "		stwcx.	%2,%y1\n"			      \
- 		      "		bne-	1b"				      \
--		      : "=&r" (__val), "=m" (*mem)			      \
--		      : "b" (mem), "r" (value), "m" (*mem)		      \
-+		      : "=&r" (__val), "+Z" (*mem)			      \
-+		      : "r" (value)					      \
- 		      : "cr0", "memory");				      \
-     __val;								      \
-   })
-@@ -144,12 +144,12 @@ typedef uintmax_t uatomic_max_t;
- #define __arch_atomic_exchange_and_add_32(mem, value) \
-   ({									      \
-     __typeof (*mem) __val, __tmp;					      \
--    __asm __volatile ("1:	lwarx	%0,0,%3\n"			      \
--		      "		add	%1,%0,%4\n"			      \
--		      "		stwcx.	%1,0,%3\n"			      \
-+    __asm __volatile ("1:	lwarx	%0,%y2\n"			      \
-+		      "		add	%1,%0,%3\n"			      \
-+		      "		stwcx.	%1,%y2\n"			      \
- 		      "		bne-	1b"				      \
--		      : "=&b" (__val), "=&r" (__tmp), "=m" (*mem)	      \
--		      : "b" (mem), "r" (value), "m" (*mem)		      \
-+		      : "=&b" (__val), "=&r" (__tmp), "+Z" (*mem)	      \
-+		      : "r" (value)					      \
- 		      : "cr0", "memory");				      \
-     __val;								      \
-   })
-@@ -157,12 +157,12 @@ typedef uintmax_t uatomic_max_t;
- #define __arch_atomic_increment_val_32(mem) \
-   ({									      \
-     __typeof (*(mem)) __val;						      \
--    __asm __volatile ("1:	lwarx	%0,0,%2\n"			      \
-+    __asm __volatile ("1:	lwarx	%0,%y1\n"			      \
- 		      "		addi	%0,%0,1\n"			      \
--		      "		stwcx.	%0,0,%2\n"			      \
-+		      "		stwcx.	%0,%y1\n"			      \
- 		      "		bne-	1b"				      \
--		      : "=&b" (__val), "=m" (*mem)			      \
--		      : "b" (mem), "m" (*mem)				      \
-+		      : "=&b" (__val), "+Z" (*mem)			      \
-+		      :							      \
- 		      : "cr0", "memory");				      \
-     __val;								      \
-   })
-@@ -170,27 +170,27 @@ typedef uintmax_t uatomic_max_t;
- #define __arch_atomic_decrement_val_32(mem) \
-   ({									      \
-     __typeof (*(mem)) __val;						      \
--    __asm __volatile ("1:	lwarx	%0,0,%2\n"			      \
-+    __asm __volatile ("1:	lwarx	%0,%y1\n"			      \
- 		      "		subi	%0,%0,1\n"			      \
--		      "		stwcx.	%0,0,%2\n"			      \
-+		      "		stwcx.	%0,%y1\n"			      \
- 		      "		bne-	1b"				      \
--		      : "=&b" (__val), "=m" (*mem)			      \
--		      : "b" (mem), "m" (*mem)				      \
-+		      : "=&b" (__val), "+Z" (*mem)			      \
-+		      :							      \
- 		      : "cr0", "memory");				      \
-     __val;								      \
-   })
- 
- #define __arch_atomic_decrement_if_positive_32(mem) \
-   ({ int __val, __tmp;							      \
--     __asm __volatile ("1:	lwarx	%0,0,%3\n"			      \
-+     __asm __volatile ("1:	lwarx	%0,%y2\n"			      \
- 		       "	cmpwi	0,%0,0\n"			      \
- 		       "	addi	%1,%0,-1\n"			      \
- 		       "	ble	2f\n"				      \
--		       "	stwcx.	%1,0,%3\n"			      \
-+		       "	stwcx.	%1,%y2\n"			      \
- 		       "	bne-	1b\n"				      \
- 		       "2:	" __ARCH_ACQ_INSTR			      \
--		       : "=&b" (__val), "=&r" (__tmp), "=m" (*mem)	      \
--		       : "b" (mem), "m" (*mem)				      \
-+		       : "=&b" (__val), "=&r" (__tmp), "+Z" (*mem)	      \
-+		       :						      \
- 		       : "cr0", "memory");				      \
-      __val;								      \
-   })
-Index: sysdeps/powerpc/powerpc32/bits/atomic.h
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/powerpc/powerpc32/bits/atomic.h,v
-retrieving revision 1.6
-diff -u -a -p -r1.6 atomic.h
---- sysdeps/powerpc/powerpc32/bits/atomic.h	26 Mar 2007 20:15:45 -0000	1.6
-+++ sysdeps/powerpc/powerpc32/bits/atomic.h	31 May 2008 08:50:56 -0000
-@@ -44,14 +44,14 @@
- ({									      \
-   unsigned int __tmp;							      \
-   __asm __volatile (							      \
--		    "1:	lwarx	%0,0,%1" MUTEX_HINT_ACQ "\n"		      \
-+		    "1:	lwarx	%0,%y1" MUTEX_HINT_ACQ "\n"		      \
- 		    "	subf.	%0,%2,%0\n"				      \
- 		    "	bne	2f\n"					      \
--		    "	stwcx.	%3,0,%1\n"				      \
-+		    "	stwcx.	%3,%y1\n"				      \
- 		    "	bne-	1b\n"					      \
- 		    "2:	" __ARCH_ACQ_INSTR				      \
--		    : "=&r" (__tmp)					      \
--		    : "b" (mem), "r" (oldval), "r" (newval)		      \
-+		    : "=&r" (__tmp), "+Z" (*(mem))			      \
-+		    : "r" (oldval), "r" (newval)			      \
- 		    : "cr0", "memory");					      \
-   __tmp != 0;								      \
- })
-@@ -60,14 +60,14 @@
- ({									      \
-   unsigned int __tmp;							      \
-   __asm __volatile (__ARCH_REL_INSTR "\n"				      \
--		    "1:	lwarx	%0,0,%1" MUTEX_HINT_REL "\n"		      \
-+		    "1:	lwarx	%0,%y1" MUTEX_HINT_REL "\n"		      \
- 		    "	subf.	%0,%2,%0\n"				      \
- 		    "	bne	2f\n"					      \
--		    "	stwcx.	%3,0,%1\n"				      \
-+		    "	stwcx.	%3,%y1\n"				      \
- 		    "	bne-	1b\n"					      \
- 		    "2:	"						      \
--		    : "=&r" (__tmp)					      \
--		    : "b" (mem), "r" (oldval), "r" (newval)		      \
-+		    : "=&r" (__tmp), "+Z" (*(mem))			      \
-+		    : "r" (oldval), "r" (newval)			      \
- 		    : "cr0", "memory");					      \
-   __tmp != 0;								      \
- })
-Index: sysdeps/powerpc/powerpc64/bits/atomic.h
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/powerpc/powerpc64/bits/atomic.h,v
-retrieving revision 1.8
-diff -u -a -p -r1.8 atomic.h
---- sysdeps/powerpc/powerpc64/bits/atomic.h	26 Mar 2007 20:16:03 -0000	1.8
-+++ sysdeps/powerpc/powerpc64/bits/atomic.h	31 May 2008 08:50:56 -0000
-@@ -44,14 +44,14 @@
- ({									      \
-   unsigned int __tmp, __tmp2;						      \
-   __asm __volatile ("   clrldi  %1,%1,32\n"				      \
--		    "1:	lwarx	%0,0,%2" MUTEX_HINT_ACQ "\n"	 	      \
-+		    "1:	lwarx	%0,%y2" MUTEX_HINT_ACQ "\n"	 	      \
- 		    "	subf.	%0,%1,%0\n"				      \
- 		    "	bne	2f\n"					      \
--		    "	stwcx.	%4,0,%2\n"				      \
-+		    "	stwcx.	%4,%y2\n"				      \
- 		    "	bne-	1b\n"					      \
- 		    "2:	" __ARCH_ACQ_INSTR				      \
--		    : "=&r" (__tmp), "=r" (__tmp2)			      \
--		    : "b" (mem), "1" (oldval), "r" (newval)		      \
-+		    : "=&r" (__tmp), "=r" (__tmp2), "+Z" (*(mem))	      \
-+		    : "1" (oldval), "r" (newval)			      \
- 		    : "cr0", "memory");					      \
-   __tmp != 0;								      \
- })
-@@ -61,14 +61,14 @@
-   unsigned int __tmp, __tmp2;						      \
-   __asm __volatile (__ARCH_REL_INSTR "\n"				      \
- 		    "   clrldi  %1,%1,32\n"				      \
--		    "1:	lwarx	%0,0,%2" MUTEX_HINT_REL "\n"		      \
-+		    "1:	lwarx	%0,%y2" MUTEX_HINT_REL "\n"		      \
- 		    "	subf.	%0,%1,%0\n"				      \
- 		    "	bne	2f\n"					      \
--		    "	stwcx.	%4,0,%2\n"				      \
-+		    "	stwcx.	%4,%y2\n"				      \
- 		    "	bne-	1b\n"					      \
- 		    "2:	"						      \
--		    : "=&r" (__tmp), "=r" (__tmp2)			      \
--		    : "b" (mem), "1" (oldval), "r" (newval)		      \
-+		    : "=&r" (__tmp), "=r" (__tmp2), "+Z" (*(mem))	      \
-+		    : "1" (oldval), "r" (newval)			      \
- 		    : "cr0", "memory");					      \
-   __tmp != 0;								      \
- })
-@@ -82,14 +82,14 @@
- ({									      \
-   unsigned long	__tmp;							      \
-   __asm __volatile (							      \
--		    "1:	ldarx	%0,0,%1" MUTEX_HINT_ACQ "\n"		      \
-+		    "1:	ldarx	%0,%y1" MUTEX_HINT_ACQ "\n"		      \
- 		    "	subf.	%0,%2,%0\n"				      \
- 		    "	bne	2f\n"					      \
--		    "	stdcx.	%3,0,%1\n"				      \
-+		    "	stdcx.	%3,%y1\n"				      \
- 		    "	bne-	1b\n"					      \
- 		    "2:	" __ARCH_ACQ_INSTR				      \
--		    : "=&r" (__tmp)					      \
--		    : "b" (mem), "r" (oldval), "r" (newval)		      \
-+		    : "=&r" (__tmp), "+Z" (*(mem))			      \
-+		    : "r" (oldval), "r" (newval)			      \
- 		    : "cr0", "memory");					      \
-   __tmp != 0;								      \
- })
-@@ -98,14 +98,14 @@
- ({									      \
-   unsigned long	__tmp;							      \
-   __asm __volatile (__ARCH_REL_INSTR "\n"				      \
--		    "1:	ldarx	%0,0,%2" MUTEX_HINT_REL "\n"		      \
-+		    "1:	ldarx	%0,%y1" MUTEX_HINT_REL "\n"		      \
- 		    "	subf.	%0,%2,%0\n"				      \
- 		    "	bne	2f\n"					      \
--		    "	stdcx.	%3,0,%1\n"				      \
-+		    "	stdcx.	%3,%y1\n"				      \
- 		    "	bne-	1b\n"					      \
- 		    "2:	"						      \
--		    : "=&r" (__tmp)					      \
--		    : "b" (mem), "r" (oldval), "r" (newval)		      \
-+		    : "=&r" (__tmp), "+Z" (*(mem))			      \
-+		    : "r" (oldval), "r" (newval)			      \
- 		    : "cr0", "memory");					      \
-   __tmp != 0;								      \
- })
-@@ -115,14 +115,14 @@
-       __typeof (*(mem)) __tmp;						      \
-       __typeof (mem)  __memp = (mem);					      \
-       __asm __volatile (						      \
--		        "1:	ldarx	%0,0,%1" MUTEX_HINT_ACQ "\n"	      \
-+		        "1:	ldarx	%0,%y1" MUTEX_HINT_ACQ "\n"	      \
- 		        "	cmpd	%0,%2\n"			      \
- 		        "	bne	2f\n"				      \
--		        "	stdcx.	%3,0,%1\n"			      \
-+		        "	stdcx.	%3,%y1\n"			      \
- 		        "	bne-	1b\n"				      \
- 		        "2:	" __ARCH_ACQ_INSTR			      \
--		        : "=&r" (__tmp)					      \
--		        : "b" (__memp), "r" (oldval), "r" (newval)	      \
-+		        : "=&r" (__tmp), "+Z" (*__memp)			      \
-+		        : "r" (oldval), "r" (newval)			      \
- 		        : "cr0", "memory");				      \
-       __tmp;								      \
-   })
-@@ -132,14 +132,14 @@
-       __typeof (*(mem)) __tmp;						      \
-       __typeof (mem)  __memp = (mem);					      \
-       __asm __volatile (__ARCH_REL_INSTR "\n"				      \
--		        "1:	ldarx	%0,0,%1" MUTEX_HINT_REL "\n"	      \
-+		        "1:	ldarx	%0,%y1" MUTEX_HINT_REL "\n"	      \
- 		        "	cmpd	%0,%2\n"			      \
- 		        "	bne	2f\n"				      \
--		        "	stdcx.	%3,0,%1\n"			      \
-+		        "	stdcx.	%3,%y1\n"			      \
- 		        "	bne-	1b\n"				      \
- 		        "2:	"					      \
--		        : "=&r" (__tmp)					      \
--		        : "b" (__memp), "r" (oldval), "r" (newval)	      \
-+		        : "=&r" (__tmp), "+Z" (*__memp)			      \
-+		        : "r" (oldval), "r" (newval)			      \
- 		        : "cr0", "memory");				      \
-       __tmp;								      \
-   })
-@@ -148,12 +148,12 @@
-     ({									      \
-       __typeof (*mem) __val;						      \
-       __asm __volatile (__ARCH_REL_INSTR "\n"				      \
--			"1:	ldarx	%0,0,%2" MUTEX_HINT_ACQ "\n"	      \
--			"	stdcx.	%3,0,%2\n"			      \
-+			"1:	ldarx	%0,%y1" MUTEX_HINT_ACQ "\n"	      \
-+			"	stdcx.	%2,%y1\n"			      \
- 			"	bne-	1b\n"				      \
- 		  " " __ARCH_ACQ_INSTR					      \
--			: "=&r" (__val), "=m" (*mem)			      \
--			: "b" (mem), "r" (value), "m" (*mem)		      \
-+			: "=&r" (__val), "+Z" (*(mem))			      \
-+			: "r" (value)					      \
- 			: "cr0", "memory");				      \
-       __val;								      \
-     })
-@@ -162,11 +162,11 @@
-     ({									      \
-       __typeof (*mem) __val;						      \
-       __asm __volatile (__ARCH_REL_INSTR "\n"				      \
--			"1:	ldarx	%0,0,%2" MUTEX_HINT_REL "\n"	      \
--			"	stdcx.	%3,0,%2\n"			      \
-+			"1:	ldarx	%0,%y1" MUTEX_HINT_REL "\n"	      \
-+			"	stdcx.	%2,%y1\n"			      \
- 			"	bne-	1b"				      \
--			: "=&r" (__val), "=m" (*mem)			      \
--			: "b" (mem), "r" (value), "m" (*mem)		      \
-+			: "=&r" (__val), "+Z" (*(mem))			      \
-+			: "r" (value)					      \
- 			: "cr0", "memory");				      \
-       __val;								      \
-     })
-@@ -174,12 +174,12 @@
- #define __arch_atomic_exchange_and_add_64(mem, value) \
-     ({									      \
-       __typeof (*mem) __val, __tmp;					      \
--      __asm __volatile ("1:	ldarx	%0,0,%3\n"			      \
--			"	add	%1,%0,%4\n"			      \
--			"	stdcx.	%1,0,%3\n"			      \
-+      __asm __volatile ("1:	ldarx	%0,%y2\n"			      \
-+			"	add	%1,%0,%3\n"			      \
-+			"	stdcx.	%1,%y2\n"			      \
- 			"	bne-	1b"				      \
--			: "=&b" (__val), "=&r" (__tmp), "=m" (*mem)	      \
--			: "b" (mem), "r" (value), "m" (*mem)		      \
-+			: "=&b" (__val), "=&r" (__tmp), "+Z" (*(mem))	      \
-+			: "r" (value)					      \
- 			: "cr0", "memory");				      \
-       __val;								      \
-     })
-@@ -187,12 +187,12 @@
- #define __arch_atomic_increment_val_64(mem) \
-     ({									      \
-       __typeof (*(mem)) __val;						      \
--      __asm __volatile ("1:	ldarx	%0,0,%2\n"			      \
-+      __asm __volatile ("1:	ldarx	%0,%y1\n"			      \
- 			"	addi	%0,%0,1\n"			      \
--			"	stdcx.	%0,0,%2\n"			      \
-+			"	stdcx.	%0,%y1\n"			      \
- 			"	bne-	1b"				      \
--			: "=&b" (__val), "=m" (*mem)			      \
--			: "b" (mem), "m" (*mem)				      \
-+			: "=&b" (__val), "+Z" (*(mem))			      \
-+			:						      \
- 			: "cr0", "memory");				      \
-       __val;								      \
-     })
-@@ -200,27 +200,27 @@
- #define __arch_atomic_decrement_val_64(mem) \
-     ({									      \
-       __typeof (*(mem)) __val;						      \
--      __asm __volatile ("1:	ldarx	%0,0,%2\n"			      \
-+      __asm __volatile ("1:	ldarx	%0,%y1\n"			      \
- 			"	subi	%0,%0,1\n"			      \
--			"	stdcx.	%0,0,%2\n"			      \
-+			"	stdcx.	%0,%y1\n"			      \
- 			"	bne-	1b"				      \
--			: "=&b" (__val), "=m" (*mem)			      \
--			: "b" (mem), "m" (*mem)				      \
-+			: "=&b" (__val), "+Z" (*(mem))			      \
-+			:						      \
- 			: "cr0", "memory");				      \
-       __val;								      \
-     })
- 
- #define __arch_atomic_decrement_if_positive_64(mem) \
-   ({ int __val, __tmp;							      \
--     __asm __volatile ("1:	ldarx	%0,0,%3\n"			      \
-+     __asm __volatile ("1:	ldarx	%0,%y2\n"			      \
- 		       "	cmpdi	0,%0,0\n"			      \
- 		       "	addi	%1,%0,-1\n"			      \
- 		       "	ble	2f\n"				      \
--		       "	stdcx.	%1,0,%3\n"			      \
-+		       "	stdcx.	%1,%y2\n"			      \
- 		       "	bne-	1b\n"				      \
- 		       "2:	" __ARCH_ACQ_INSTR			      \
--		       : "=&b" (__val), "=&r" (__tmp), "=m" (*mem)	      \
--		       : "b" (mem), "m" (*mem)				      \
-+		       : "=&b" (__val), "=&r" (__tmp), "+Z" (*(mem))	      \
-+		       :						      \
- 		       : "cr0", "memory");				      \
-      __val;								      \
-   })
Index: ripts/fetch/eglibc/2.10.1/15-fnpatch.patch
===================================================================
--- scripts/fetch/eglibc/2.10.1/15-fnpatch.patch	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,54 +1,0 @@
-2005-04-12  Andreas Schwab  <schwab@suse.de>
-
-	* posix/fnmatch.c (fnmatch): If conversion to wide character
-	fails fall back to single byte matching.
-
-Index: posix/fnmatch.c
-===================================================================
---- posix/fnmatch.c.orig	2007-05-18 10:40:34.000000000 +0200
-+++ posix/fnmatch.c	2007-05-18 13:21:47.199478000 +0200
-@@ -327,6 +327,7 @@
- # if HANDLE_MULTIBYTE
-   if (__builtin_expect (MB_CUR_MAX, 1) != 1)
-     {
-+      const char *orig_pattern = pattern;
-       mbstate_t ps;
-       size_t n;
-       const char *p;
-@@ -378,10 +379,8 @@
- 	  wstring = (wchar_t *) alloca ((n + 1) * sizeof (wchar_t));
- 	  n = mbsrtowcs (wstring, &p, n + 1, &ps);
- 	  if (__builtin_expect (n == (size_t) -1, 0))
--	    /* Something wrong.
--	       XXX Do we have to set `errno' to something which mbsrtows hasn't
--	       already done?  */
--	    return -1;
-+	    /* Something wrong.  Fall back to single byte matching.  */
-+	    goto try_singlebyte;
- 	  if (p)
- 	    memset (&ps, '\0', sizeof (ps));
- 	}
-@@ -389,10 +388,8 @@
- 	{
- 	  n = mbsrtowcs (NULL, &string, 0, &ps);
- 	  if (__builtin_expect (n == (size_t) -1, 0))
--	    /* Something wrong.
--	       XXX Do we have to set `errno' to something which mbsrtows hasn't
--	       already done?  */
--	    return -1;
-+	    /* Something wrong.  Fall back to single byte matching.  */
-+	    goto try_singlebyte;
- 	  wstring = (wchar_t *) alloca ((n + 1) * sizeof (wchar_t));
- 	  assert (mbsinit (&ps));
- 	  (void) mbsrtowcs (wstring, &string, n + 1, &ps);
-@@ -400,6 +397,9 @@
- 
-       return internal_fnwmatch (wpattern, wstring, wstring + n,
- 				flags & FNM_PERIOD, flags, NULL);
-+
-+    try_singlebyte:
-+      pattern = orig_pattern;
-     }
- # endif  /* mbstate_t and mbsrtowcs or _LIBC.  */
- 
-
Index: ripts/fetch/eglibc/2.10.1/20-missing_header.patch
===================================================================
--- scripts/fetch/eglibc/2.10.1/20-missing_header.patch	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,17 +1,0 @@
-many ports hit this warning:
-../sysdeps/unix/sysv/linux/check_native.c:46: warning: implicit declaration of function 'memset'
-../sysdeps/unix/sysv/linux/check_native.c:46: warning: implicit declaration of function 'memset'
-
-snipped from suse
-
---- sysdeps/unix/sysv/linux/check_native.c
-+++ sysdeps/unix/sysv/linux/check_native.c
-@@ -23,6 +23,7 @@
- #include <stddef.h>
- #include <stdint.h>
- #include <stdlib.h>
-+#include <string.h>
- #include <time.h>
- #include <unistd.h>
- #include <net/if.h>
-
Index: ripts/fetch/eglibc/2.10.1/25-ldbl-nexttowardf.patch
===================================================================
--- scripts/fetch/eglibc/2.10.1/25-ldbl-nexttowardf.patch	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,65 +1,0 @@
-this change was made to generic __nexttowardf, but not the long double version
-
-2008-05-05  Aurelien Jarno  <aurelien@aurel32.net>
-
-	* sysdeps/ieee754/ldbl-128/s_nexttowardf.c: Include float.h.
-	(__nexttowardf): Use math_opt_barrier and
-	math_force_eval macros.  If FLT_EVAL_METHOD is not 0, force
-	x to float using asm.
-
----
- sysdeps/ieee754/ldbl-128/s_nexttowardf.c |   26 ++++++++++++++++----------
- 1 file changed, 16 insertions(+), 10 deletions(-)
-
---- a/sysdeps/ieee754/ldbl-128/s_nexttowardf.c
-+++ b/sysdeps/ieee754/ldbl-128/s_nexttowardf.c
-@@ -19,7 +19,8 @@
- #endif
- 
- #include "math.h"
--#include "math_private.h"
-+#include <math_private.h>
-+#include <float.h>
- 
- #ifdef __STDC__
- 	float __nexttowardf(float x, long double y)
-@@ -44,10 +45,12 @@
- 	   return x+y;
- 	if((long double) x==y) return y;	/* x=y, return y */
- 	if(ix==0) {				/* x == 0 */
--	    float x2;
-+	    float u;
- 	    SET_FLOAT_WORD(x,(u_int32_t)((hy>>32)&0x80000000)|1);/* return +-minsub*/
--	    x2 = x*x;
--	    if(x2==x) return x2; else return x;	/* raise underflow flag */
-+	    u = math_opt_barrier (x);
-+	    u = u * u;
-+	    math_force_eval (u);		/* raise underflow flag */
-+	    return x;
- 	}
- 	if(hx>=0) {				/* x > 0 */
- 	    if(hy<0||(ix>>23)>(iy>>48)-0x3f80
-@@ -67,13 +70,16 @@
- 	    }
- 	}
- 	hy = hx&0x7f800000;
--	if(hy>=0x7f800000) return x+x;	/* overflow  */
-+	if(hy>=0x7f800000) {
-+	  x = x+x;	/* overflow  */
-+	  if (FLT_EVAL_METHOD != 0)
-+	    /* Force conversion to float.  */
-+	    asm ("" : "+m"(x));
-+	  return x;
-+	}
- 	if(hy<0x00800000) {		/* underflow */
--	    float x2 = x*x;
--	    if(x2!=x) {		/* raise underflow flag */
--	        SET_FLOAT_WORD(x2,hx);
--		return x2;
--	    }
-+	    float u = x*x;
-+	    math_force_eval (u);	/* raise underflow flag */
- 	}
- 	SET_FLOAT_WORD(x,hx);
- 	return x;
-
Index: ripts/fetch/eglibc/2.10.1/30-fadvise64_64.patch
===================================================================
--- scripts/fetch/eglibc/2.10.1/30-fadvise64_64.patch	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,26 +1,0 @@
- sysdeps/unix/sysv/linux/posix_fadvise.c |   13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
---- a/sysdeps/unix/sysv/linux/posix_fadvise.c
-+++ b/sysdeps/unix/sysv/linux/posix_fadvise.c
-@@ -35,6 +35,19 @@
-     return INTERNAL_SYSCALL_ERRNO (ret, err);
-   return 0;
- #else
-+# ifdef __NR_fadvise64_64
-+  INTERNAL_SYSCALL_DECL (err);  
-+  int ret = INTERNAL_SYSCALL (fadvise64_64, err, 6, fd,
-+			      __LONG_LONG_PAIR ((long) (offset >> 31),
-+						(long) offset),
-+			      __LONG_LONG_PAIR ((long) (len >> 31),
-+						(long) len),
-+			      advise);
-+  if (INTERNAL_SYSCALL_ERROR_P (ret, err))
-+    return INTERNAL_SYSCALL_ERRNO (ret, err);
-+  return 0;
-+# else
-   return ENOSYS;
-+# endif
- #endif
- }
-
Index: ripts/fetch/eglibc/2.10.1/35-dynamic_resolv.patch
===================================================================
--- scripts/fetch/eglibc/2.10.1/35-dynamic_resolv.patch	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,37 +1,0 @@
-if /etc/resolv.conf is updated, then make sure applications
-already running get the updated information.
-
-http://bugs.gentoo.org/177416
-
---- libc/resolv/res_libc.c
-+++ libc/resolv/res_libc.c
-@@ -22,6 +22,7 @@
- #include <arpa/nameser.h>
- #include <resolv.h>
- #include <bits/libc-lock.h>
-+#include <sys/stat.h>
- 
- 
- /* The following bit is copied from res_data.c (where it is #ifdef'ed
-@@ -101,6 +102,20 @@
- __res_maybe_init (res_state resp, int preinit)
- {
- 	if (resp->options & RES_INIT) {
-+		static time_t last_mtime, last_check;
-+		time_t now;
-+		struct stat statbuf;
-+		
-+		time (&now);
-+		if (now != last_check) {
-+			last_check = now;
-+			if (stat (_PATH_RESCONF, &statbuf) == 0 && last_mtime != statbuf.st_mtime) {
-+				last_mtime = statbuf.st_mtime;
-+				atomicinclock (lock);
-+				atomicinc (__res_initstamp);
-+				atomicincunlock (lock);
-+			}
-+		}
- 		if (__res_initstamp != resp->_u._ext.initstamp) {
- 			if (resp->nscount > 0) {
- 				__res_nclose (resp);
-
Index: ripts/fetch/glibc.sh
===================================================================
--- scripts/fetch/glibc.sh	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,77 +1,0 @@
-#!/bin/bash
-# Written By: Joe Ciccone <jciccone at gmail dot com>
-
-# Usage, glibc.sh [cvs-tag] [tarball-version]
-# An example of a CVS tag would be HEAD or glibc-2_9
-# An example of a tarball version would be say the date, or 2.9, it will be
-#   inserted into the output tarball filename,
-#   eg, glibc-[tarball-version].tar.bz2
-
-CVStag=${1-HEAD}
-TARver=${2-$(date +%Y%m%d)}
-
-echo "Creating glibc-${TARver}.tar.bz2 and glibc-ports-${TARver}.tar.bz2 from the ${CVStag} CVS Tag."
-
-tmpdir="$(mktemp -d)"
-if test ! -d "${tmpdir}"; then
-  tmpdir="/tmp/glibc-XXXX"
-  mkdir -pv "${tmpdir}"
-fi
-
-if test ! -d "${tmpdir}"; then
-  echo "Failed to create temp directory: ${tmpdir}"
-  exit 1
-fi
-
-echo "Use \"anoncvs\" for the password."
-cvs -z 9 -d :pserver:anoncvs@sources.redhat.com:/cvs/glibc login
-if test $? -ne 0; then
-  echo "Failed to login to glibc cvs server."
-  rm -rf "${tmpdir}"
-  exit 1
-fi
-
-pushd "${tmpdir}"
-
-# Checkout from the cvs glibc
-cvs -z 9 -d :pserver:anoncvs@sources.redhat.com:/cvs/glibc co -r "${CVStag}" libc 
-mv libc "glibc-${TARver}"
-if test $? -ne 0; then
-  echo "Failed to check out libc, Leaving temp files in ${tmpdir}."
-  exit 1
-fi
-
-# Checkout from the cvs glibc
-cvs -z 9 -d :pserver:anoncvs@sources.redhat.com:/cvs/glibc co -r "${CVStag}" ports
-mv ports "glibc-ports-${TARver}"
-if test $? -ne 0; then
-  echo "Failed to check out libc, Leaving temp files in ${tmpdir}."
-  exit 1
-fi
-
-# If the timestamp of configure.in is newer than configure glibc will try to
-# reconfigure itself, this can cause some errors while cross-compiling.
-find "glibc-${TARver}" "glibc-ports-${TARver}" -name configure | xargs touch
-
-# Clean out CVS Files
-find "glibc-${TARver}" "glibc-ports-${TARver}" -name CVS -type d | xargs rm -rf
-find "glibc-${TARver}" "glibc-ports-${TARver}" -name .cvsignore | xargs rm -rf
-
-# Add a custom version string
-DATE_STAMP=$(date +%Y%m%d)
-echo "#define DL_DATE \"${DATE_STAMP}\"" >> libc/version.h
-sed -i "s@Compiled by GNU CC version@Built for Cross-LFS.\\\\n\\\\\nRetrieved on \"DL_DATE\".\\\\n\\\\\\nCompiled by GNU CC version@" libc/csu/version.c
-sed -i "s@static const char __libc_release@static const char __libc_dl_date[] = DL_DATE;\nstatic const char __libc_release@" libc/csu/version.c
-
-# Create tarballs
-echo "Creating Tarballs"
-tar cvjf "glibc-${TARver}.tar.bz2" "glibc-${TARver}"
-tar cvjf "glibc-ports-${TARver}.tar.bz2" "glibc-ports-${TARver}"
-
-# echo Pop back to the orig working directory and mv the tarballs over
-
-popd
-mv "${tmpdir}/glibc-${TARver}.tar.bz2" .
-mv "${tmpdir}/glibc-ports-${TARver}.tar.bz2" .
-
-rm -rf "${tmpdir}"
Index: ripts/patch/bash-patch.sh
===================================================================
--- scripts/patch/bash-patch.sh	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,137 +1,0 @@
-#!/bin/bash
-# Create a Bash Patch
-
-# Get Version #
-#
-VERSION=$1
-
-# Check Input
-#
-if [ "${VERSION}" = "" ]; then
-  echo "$0 - Bash_Version"
-  echo "This will Create a Patch for Bash Bash_Version"
-  exit 255
-fi
-
-# Get the # of Patches
-#
-install -d ~/tmp
-cd ~/tmp
-wget ftp://ftp.cwru.edu/pub/bash/bash-${VERSION}-patches/ --no-remove-listing
-VERSION2=$(echo ${VERSION} | sed -e 's/\.//g')
-FILES=$(cat index.html | grep "${VERSION2}" | cut -f2 -d'"' | cut -f4 -d. | cut -f3 -d- | tail -n 1)
-rm -f .listing
-rm -f index.html
-SKIPPATCH=""
-SKIPPED=""
-
-# Download BASH Source
-#
-if ! [ -e bash-${VERSION}.tar.gz ]; then
-  wget ftp://ftp.cwru.edu/pub/bash/bash-${VERSION}.tar.gz
-fi
-
-# Set Patch Number
-#
-cd ~/tmp
-wget http://svn.cross-lfs.org/svn/repos/patches/bash/ --no-remove-listing
-for num in $(seq 1 99); do
-  PATCH_NUM=$(cat index.html | grep "${VERSION}" | grep branch_update-${num}.patch | cut -f2 -d'"' | cut -f1 -d'"'| cut -f4 -d- | cut -f1 -d. | tail -n 1)
-  if [ "${PATCH_NUM}" = "0" -a "${num}" = "1" ]; then
-    PATCH_NUM=$(expr ${PATCH_NUM} + 1)
-    break
-  fi
-  if [ "${PATCH_NUM}" != "${num}" ]; then
-    PATCH_NUM=$(expr ${num})
-    break
-  fi
-done
-rm -f index.html
-
-# Cleanup Directory
-#
-cd ~/tmp
-rm -rf bash-${VERSION} bash-${VERSION}.orig
-tar xvf bash-${VERSION}.tar.gz
-cp -ar bash-${VERSION} bash-${VERSION}.orig
-
-# Download and Apply Patches
-#
-install -d ~/tmp/bash-${VERSION}-patches
-cd ~/tmp/bash-${VERSION}
-CURRENTDIR=$(pwd -P)
-PATCHURL=ftp://ftp.cwru.edu/pub/bash/bash-${VERSION}-patches
-COUNT=1
-while [ ${COUNT} -le ${FILES} ]; do
-  cd ~/tmp/bash-${VERSION}           
-  DLCOUNT="${COUNT}"
-  SKIPME=no
-  if [ "${COUNT}" -lt "100" ]; then
-    DLCOUNT="0${COUNT}"
-  fi
-  if [ "${COUNT}" -lt "10" ]; then
-    DLCOUNT="00${COUNT}"
-  fi
-  for skip in ${SKIPPATCH} ; do
-    if [ "${DLCOUNT}" = "$skip" ]; then
-      echo "Patch bash${VERSION2}-${DLCOUNT} skipped"
-      SKIPPED="${SKIPPED} ${DLCOUNT}"
-      SKIPME=yes
-    fi
-  done
-  if [ "${SKIPME}" != "yes" ]; then
-    if ! [ -e ${VERSION}.${DLCOUNT} ]; then
-      cd ~/tmp/bash-${VERSION}-patches
-      wget --quiet ${PATCHURL}/bash${VERSION2}-${DLCOUNT}
-    fi
-    cd ${CURRENTDIR}
-    patch --dry-run -s -f -Np0 -i ~/tmp/bash-${VERSION}-patches/bash${VERSION2}-${DLCOUNT}
-    if [ "$?" = "0" ]; then
-      echo "Patch bash${VERSION2}-${DLCOUNT} applied"
-      patch -s -Np0 -i ~/tmp/bash-${VERSION}-patches/bash${VERSION2}-${DLCOUNT}
-    else
-     echo "Patch bash${VERSION2}-${DLCOUNT} not applied"
-     rm -f ~/tmp/bash-${VERSION}-patches/bash${VERSION2}-${DLCOUNT}
-     SKIPPED="${SKIPPED} ${DLCOUNT}"
-    fi
-  fi
-  COUNT=`expr ${COUNT} + 1`
-done
-
-# Cleanup Directory
-#
-cd ~/tmp/bash-${VERSION}
-for dir in $(find * -type d); do
-  cd ~/tmp/bash-${VERSION}/${dir}
-  for file in $(find . -name '*~'); do
-    rm -f ${file}
-  done
-  for file in $(find . -name '*.orig'); do
-    rm -f ${file}
-  done
-done
-cd ~/tmp/bash-${VERSION}
-rm -f *~ *.orig
-
-# Create Patch
-#
-cd ~/tmp
-install -d ~/patches
-echo "Submitted By: Jim Gifford (jim at cross-lfs dot org)" > ~/patches/bash-${VERSION}-branch_update-${PATCH_NUM}.patch
-echo "Date: `date +%m-%d-%Y`" >> ~/patches/bash-${VERSION}-branch_update-${PATCH_NUM}.patch
-echo "Initial Package Version: ${VERSION}" >> ~/patches/bash-${VERSION}-branch_update-${PATCH_NUM}.patch
-echo "Origin: Upstream" >> ~/patches/bash-${VERSION}-branch_update-${PATCH_NUM}.patch
-echo "Upstream Status: Applied" >> ~/patches/bash-${VERSION}-branch_update-${PATCH_NUM}.patch
-echo "Description: Contains all upstream patches up to ${VERSION}-${FILES}" >> ~/patches/bash-${VERSION}-branch_update-${PATCH_NUM}.patch
-if [ -n "${SKIPPED}" ]; then
-  echo "             The following patches were skipped" >> ~/patches/bash-${VERSION}-branch_update-${PATCH_NUM}.patch
-  echo "            ${SKIPPED}" >> ~/patches/bash-${VERSION}-branch_update-${PATCH_NUM}.patch
-fi
-echo "" >> ~/patches/bash-${VERSION}-branch_update-${PATCH_NUM}.patch
-diff -Naur bash-${VERSION}.orig bash-${VERSION} >> ~/patches/bash-${VERSION}-branch_update-${PATCH_NUM}.patch
-echo "Created ~/patches/bash-${VERSION}-branch_update-${PATCH_NUM}.patch."
-
-# Cleanup Directory
-#
-cd ~/tmp
-rm -rf bash-${VERSION} bash-${VERSION}.orig
Index: ripts/patch/binutils-patch.sh
===================================================================
--- scripts/patch/binutils-patch.sh	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,196 +1,0 @@
-#!/bin/bash
-# Create a Binutils Patch
-
-# Get Version #
-#
-VERSION=$1
-SOURCEVERSION=$2
-
-# Check Input
-#
-if [ "${VERSION}" = "" -o "${SOURCEVERSION}" = "" ]; then
-  echo "$0 - Binutils_Version"
-  echo "This will Create a Patch for Binutils Binutils_Series Binutils_Version"
-  echo "Example $0 2.19 2.19.1"
-  exit 255
-fi
-
-# Set Patch Directory
-#
-PATCH_DIR=$(pwd -P)/binutils
- 
-# Download Binutils Source
-#
-install -d ~/tmp
-cd ~/tmp
-if ! [ -e binutils-${SOURCEVERSION}.tar.bz2  ]; then
-  wget ftp://ftp.gnu.org/gnu/binutils/binutils-${SOURCEVERSION}.tar.bz2
-fi
-
-# Set Patch Number
-#
-cd ~/tmp
-wget http://svn.cross-lfs.org/svn/repos/patches/binutils/ --no-remove-listing
-for num in $(seq 1 99); do
-  PATCH_NUM=$(cat index.html | grep "${VERSION}" | grep branch_update-${num}.patch | cut -f2 -d'"' | cut -f1 -d'"'| cut -f4 -d- | cut -f1 -d. | tail -n 1)
-  if [ "${PATCH_NUM}" = "0" -a "${num}" = "1" ]; then
-    PATCH_NUM=$(expr ${PATCH_NUM} + 1)
-    break
-  fi
-  if [ "${PATCH_NUM}" != "${num}" ]; then
-    PATCH_NUM=$(expr ${num})
-    break
-  fi
-done
-for num in $(seq 1 99); do
-  PATCH_NUM2=$(cat index.html | grep "${SOURCEVERSION}" | grep fixes-${num}.patch | cut -f2 -d'"' | cut -f1 -d'"'| cut -f4 -d- | cut -f1 -d. | tail -n 1)
-  if [ "${PATCH_NUM2}" = "0" -a "${num}" = "1" ]; then
-    PATCH_NUM2=$(expr ${PATCH_NUM2} + 1)
-    break
-  fi
-  if [ "${PATCH_NUM2}" != "${num}" ]; then
-    PATCH_NUM2=$(expr ${num})
-    break
-  fi
-done
-rm -f index.html
-
-# Cleanup Directory
-#
-cd ~/tmp
-rm -rf binutils-${SOURCEVERSION} binutils-${SOURCEVERSION}.orig
-tar xvf binutils-${SOURCEVERSION}.tar.bz2
-
-# Get Current Updates from CVS
-#
-cd ~/tmp
-mv binutils-${SOURCEVERSION} binutils-${SOURCEVERSION}.orig
-CURRENTDIR=$(pwd -P)
-FIXEDVERSION=$(echo ${VERSION} | sed -e 's/\./_/g')
-cvs -z 9 -d :pserver:anoncvs@sourceware.org:/cvs/src export -rbinutils-${FIXEDVERSION}-branch binutils
-mv src binutils-${SOURCEVERSION}
-
-# Cleanup
-#
-cd ~/tmp
-DIRS="binutils-${SOURCEVERSION} binutils-${SOURCEVERSION}.orig"
-for DIRECTORY in ${DIRS}; do
-  cd ~/tmp/${DIRECTORY}
-  FILE_LIST=".cvsignore *.gmo"
-  for files in ${FILE_LIST}; do
-    REMOVE=$(find * -name ${files})
-    for file in $REMOVE; do
-      rm -f ${file}
-    done
-  done
-
-  REMOVE=".cvsignore MAINTAINERS COPYING.LIBGLOSS COPYING.NEWLIB README-maintainer-mode depcomp
-    ChangeLog compile ltgcc.m4 lt~obsolete.m4 etc/ChangeLog etc/add-log.el etc/add-log.vi"
-  for file in $REMOVE; do
-    rm -f ${file}
-    done
-    cd ..
-done
-cd ~/tmp/binutils-${SOURCEVERSION}
-rm -f ~/tmp/binutils-${SOURCEVERSION}.orig/md5.sum
-
-# Make Binutils a Release
-#
-cd ~/tmp/binutils-${SOURCEVERSION}
-sed -i 's/# RELEASE=y/RELEASE=y/g' bfd/Makefile.am
-sed -i 's/# RELEASE=y/RELEASE=y/g' bfd/Makefile.in
-
-# Customize the version string, so we know it's patched
-#
-cd ~/tmp/binutils-${SOURCEVERSION}
-DATE_STAMP=$(date +%Y%m%d)
-cd ~/tmp/binutils-${SOURCEVERSION}
-sed -i "s:@PKGVERSION@:(GNU Binutils for Cross-LFS - Retrieved on ${DATE_STAMP}) :" bfd/Makefile.in
-
-# Create Patch
-#
-cd ~/tmp
-install -d ~/patches
-echo "Submitted By: Jim Gifford (jim at cross-lfs dot org)" > ~/patches/binutils-${SOURCEVERSION}-branch_update-${PATCH_NUM}.patch
-echo "Date: `date +%m-%d-%Y`" >>  ~/patches/binutils-${SOURCEVERSION}-branch_update-${PATCH_NUM}.patch
-echo "Initial Package Version: ${SOURCEVERSION}" >>  ~/patches/binutils-${SOURCEVERSION}-branch_update-${PATCH_NUM}.patch
-echo "Origin: Upstream" >>  ~/patches/binutils-${SOURCEVERSION}-branch_update-${PATCH_NUM}.patch
-echo "Upstream Status: Applied" >>  ~/patches/binutils-${SOURCEVERSION}-branch_update-${PATCH_NUM}.patch
-echo "Description: This is a branch update for binutils-${SOURCEVERSION}, and should be" >>  ~/patches/binutils-${SOURCEVERSION}-branch_update-${PATCH_NUM}.patch
-echo "             rechecked periodically." >>  ~/patches/binutils-${SOURCEVERSION}-branch_update-${PATCH_NUM}.patch
-echo "" >>  ~/patches/binutils-${SOURCEVERSION}-branch_update-${PATCH_NUM}.patch
-echo "This patch was created on ${DATE_STAMP}" >>  ~/patches/binutils-${SOURCEVERSION}-branch_update-${PATCH_NUM}.patch
-echo "" >>  ~/patches/binutils-${SOURCEVERSION}-branch_update-${PATCH_NUM}.patch
-diff -Naur binutils-${SOURCEVERSION}.orig binutils-${SOURCEVERSION} >>  ~/patches/binutils-${SOURCEVERSION}-branch_update-${PATCH_NUM}.patch
-echo "Created ~/patches/binutils-${SOURCEVERSION}-branch_update-${PATCH_NUM}.patch."
-
-# Cleanliness is the name of my game!
-#
-unset DATE_STAMP
-
-# Create a copy of the Original Directory So We can do some Updates
-#
-cd ~/tmp
-rm -rf binutils-${SOURCEVERSION}.orig
-cp -ar binutils-${SOURCEVERSION} binutils-${SOURCEVERSION}.orig
-
-# Make testsuite fixes
-#
-cd ~/tmp/binutils-${SOURCEVERSION}
-sed -i -e 's/getline/_getline/' libiberty/testsuite/test-demangle.c
-
-# Create fixes patch
-#
-if [ -e ${PATCH_DIR}/${SOURCEVERSION} ]; then
-
-  # Apply Patches from directories
-  #
-  cd ~/tmp/binutils-${SOURCEVERSION}
-  PATCH_FILES=$(ls ${PATCH_DIR}/${SOURCEVERSION}/*.patch)
-  if [ "${PATCH_FILES}" != "" ]; then
-    for pfile in ${PATCH_FILES}; do
-      echo "Applying - ${pfile}..."
-      for pvalue in $(seq 0 5); do
-        patch --dry-run -Np${pvalue} -i ${pfile} > /dev/null 2>&1
-        if [ "${?}" = "0" ]; then
-          PVALUE=${pvalue}
-          break
-        fi
-      done
-      if [ "${PVALUE}" != "" ]; then
-        patch -Np${PVALUE} -i ${pfile}
-      else
-        echo "Patch: ${pfile} Failed to Apply..."
-        exit 255
-      fi
-    done
-  fi
-fi
-
-# Cleanup Directory
-#
-cd ~/tmp/binutils-${SOURCEVERSION}
-rm -f $(find * -name "*~")
-rm -f $(find * -name "*.orig")
-rm -f $(find * -name "*.rej")
-rm -f *.orig *~ *.rej
-
-# Create Patch
-#
-cd ~/tmp
-install -d ~/patches
-echo "Submitted By: Jim Gifford (jim at cross-lfs dot org)" > ~/patches/binutils-${SOURCEVERSION}-fixes-${PATCH_NUM2}.patch
-echo "Date: `date +%m-%d-%Y`" >> ~/patches/binutils-${SOURCEVERSION}-fixes-${PATCH_NUM2}.patch
-echo "Initial Package Version: ${VERSION}" >> ~/patches/binutils-${SOURCEVERSION}-fixes-${PATCH_NUM2}.patch
-echo "Origin: Upstream" >> ~/patches/binutils-${SOURCEVERSION}-fixes-${PATCH_NUM2}.patch
-echo "Upstream Status: Applied" >> ~/patches/binutils-${SOURCEVERSION}-fixes-${PATCH_NUM2}.patch
-echo "Description: This Patch contains fixes for binutils-${SOURCEVERSION}, and should be" >> ~/patches/binutils-${SOURCEVERSION}-fixes-${PATCH_NUM2}.patch
-echo "             rechecked periodically." >> ~/patches/binutils-${SOURCEVERSION}-fixes-${PATCH_NUM2}.patch
-echo "" >> ~/patches/binutils-${SOURCEVERSION}-fixes-${PATCH_NUM2}.patch
-diff -Naur binutils-${SOURCEVERSION}.orig binutils-${SOURCEVERSION} >> ~/patches/binutils-${SOURCEVERSION}-fixes-${PATCH_NUM2}.patch
-echo "Created ~/patches/binutils-${SOURCEVERSION}-fixes-${PATCH_NUM2}.patch."
-
-# Cleanup Directory
-#
-cd ~/tmp
-rm -rf binutils-${SOURCEVERSION} binutils-${SOURCEVERSION}.orig
Index: ripts/patch/binutils/2.19.1/01-ppc64_pie.patch
===================================================================
--- scripts/patch/binutils/2.19.1/01-ppc64_pie.patch	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,17 +1,0 @@
---- bfd/elf64-ppc.c.jj	2004-09-27 16:46:06.000000000 -0400
-+++ bfd/elf64-ppc.c	2004-10-04 09:09:50.000000000 -0400
-@@ -9681,7 +9681,12 @@ ppc64_elf_relocate_section (bfd *output_
- 	      else if (!SYMBOL_REFERENCES_LOCAL (info, &h->elf)
- 		       && !is_opd
- 		       && r_type != R_PPC64_TOC)
--		outrel.r_info = ELF64_R_INFO (h->elf.dynindx, r_type);
-+		{
-+		  outrel.r_info = ELF64_R_INFO (h->elf.dynindx, r_type);
-+		  if (h->elf.dynindx == -1
-+		      && h->elf.root.type == bfd_link_hash_undefweak)
-+		  memset (&outrel, 0, sizeof outrel);
-+		}
- 	      else
- 		{
- 		  /* This symbol is local, or marked to become local,
-
Index: ripts/patch/binutils/2.19.1/05-strip_common.patch
===================================================================
--- scripts/patch/binutils/2.19.1/05-strip_common.patch	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,26 +1,0 @@
-http://sourceware.org/bugzilla/show_bug.cgi?id=9933
-
-2009-03-09  H.J. Lu  <hongjiu.lu@intel.com>
-
-	PR binutils/9933
-	* objcopy.c (filter_symbols): Properly handle common symbols
-	in relocatable file.
-
-===================================================================
-RCS file: /cvs/src/src/binutils/objcopy.c,v
-retrieving revision 1.125
-retrieving revision 1.126
-diff -u -r1.125 -r1.126
---- src/binutils/objcopy.c	2009/01/29 13:03:21	1.125
-+++ src/binutils/objcopy.c	2009/03/10 00:48:09	1.126
-@@ -1028,7 +1028,8 @@
- 	  used_in_reloc = TRUE;
- 	}
-       else if (relocatable			/* Relocatable file.  */
--	       && (flags & (BSF_GLOBAL | BSF_WEAK)) != 0)
-+	       && ((flags & (BSF_GLOBAL | BSF_WEAK)) != 0
-+		   || bfd_is_com_section (bfd_get_section (sym))))
- 	keep = TRUE;
-       else if (bfd_decode_symclass (sym) == 'I')
- 	/* Global symbols in $idata sections need to be retained
-
Index: ripts/patch/binutils/2.19.1/10-strip_symbol_table.patch
===================================================================
--- scripts/patch/binutils/2.19.1/10-strip_symbol_table.patch	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,99 +1,0 @@
-http://sourceware.org/bugzilla/show_bug.cgi?id=9945
-
-2009-03-13  H.J. Lu  <hongjiu.lu@intel.com>
-
-	PR binutils/9945
-	* elf.c (assign_section_numbers): Generate symbol table if there
-	is any relocation in output.
-	(_bfd_elf_compute_section_file_positions): Likewise.
-
-2009-03-13  H.J. Lu  <hongjiu.lu@intel.com>
-
-	PR binutils/9945
-	* objcopy.c (copy_object): Clear HAS_RELOC when stripping all.
-
-===================================================================
-RCS file: /cvs/src/src/bfd/elf.c,v
-retrieving revision 1.477
-retrieving revision 1.478
-diff -u -r1.477 -r1.478
---- src/bfd/elf.c	2009/02/25 14:39:35	1.477
-+++ src/bfd/elf.c	2009/03/13 13:39:56	1.478
-@@ -2774,6 +2774,7 @@
-   unsigned int section_number, secn;
-   Elf_Internal_Shdr **i_shdrp;
-   struct bfd_elf_section_data *d;
-+  bfd_boolean need_symtab;
- 
-   section_number = 1;
- 
-@@ -2829,7 +2830,11 @@
-   _bfd_elf_strtab_addref (elf_shstrtab (abfd), t->shstrtab_hdr.sh_name);
-   elf_elfheader (abfd)->e_shstrndx = t->shstrtab_section;
- 
--  if (bfd_get_symcount (abfd) > 0)
-+  need_symtab = (bfd_get_symcount (abfd) > 0
-+		|| (link_info == NULL
-+		    && ((abfd->flags & (EXEC_P | DYNAMIC | HAS_RELOC))
-+			== HAS_RELOC)));
-+  if (need_symtab)
-     {
-       t->symtab_section = section_number++;
-       _bfd_elf_strtab_addref (elf_shstrtab (abfd), t->symtab_hdr.sh_name);
-@@ -2868,7 +2873,7 @@
-   elf_elfsections (abfd) = i_shdrp;
- 
-   i_shdrp[t->shstrtab_section] = &t->shstrtab_hdr;
--  if (bfd_get_symcount (abfd) > 0)
-+  if (need_symtab)
-     {
-       i_shdrp[t->symtab_section] = &t->symtab_hdr;
-       if (elf_numsections (abfd) > (SHN_LORESERVE & 0xFFFF))
-@@ -3261,6 +3266,7 @@
-   bfd_boolean failed;
-   struct bfd_strtab_hash *strtab = NULL;
-   Elf_Internal_Shdr *shstrtab_hdr;
-+  bfd_boolean need_symtab;
- 
-   if (abfd->output_has_begun)
-     return TRUE;
-@@ -3285,7 +3291,11 @@
-     return FALSE;
- 
-   /* The backend linker builds symbol table information itself.  */
--  if (link_info == NULL && bfd_get_symcount (abfd) > 0)
-+  need_symtab = (link_info == NULL
-+		 && (bfd_get_symcount (abfd) > 0
-+		     || ((abfd->flags & (EXEC_P | DYNAMIC | HAS_RELOC))
-+			 == HAS_RELOC)));
-+  if (need_symtab)
-     {
-       /* Non-zero if doing a relocatable link.  */
-       int relocatable_p = ! (abfd->flags & (EXEC_P | DYNAMIC));
-@@ -3316,7 +3326,7 @@
-   if (!assign_file_positions_except_relocs (abfd, link_info))
-     return FALSE;
- 
--  if (link_info == NULL && bfd_get_symcount (abfd) > 0)
-+  if (need_symtab)
-     {
-       file_ptr off;
-       Elf_Internal_Shdr *hdr;
-===================================================================
-RCS file: /cvs/src/src/binutils/objcopy.c,v
-retrieving revision 1.126
-retrieving revision 1.127
-diff -u -r1.126 -r1.127
---- src/binutils/objcopy.c	2009/03/10 00:48:09	1.126
-+++ src/binutils/objcopy.c	2009/03/13 13:39:57	1.127
-@@ -1396,6 +1396,9 @@
-       flags &= ~bfd_flags_to_clear;
-       flags &= bfd_applicable_file_flags (obfd);
- 
-+      if (strip_symbols == STRIP_ALL)
-+	flags &= ~HAS_RELOC;
-+
-       if (!bfd_set_start_address (obfd, start)
- 	  || !bfd_set_file_flags (obfd, flags))
- 	{
-
Index: ripts/patch/binutils/2.19.1/15-orphan_section.patch
===================================================================
--- scripts/patch/binutils/2.19.1/15-orphan_section.patch	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,34 +1,0 @@
---- ../binutils-2.19.51.0.11.orig/ld/ldlang.c	2009-07-14 11:42:46.000000000 +0100
-+++ ld/ldlang.c	2009-07-14 11:55:01.000000000 +0100
-@@ -1615,10 +1615,12 @@ output_prev_sec_find (lang_output_sectio
-    idea is to skip over anything that might be inside a SECTIONS {}
-    statement in a script, before we find another output section
-    statement.  Assignments to "dot" before an output section statement
--   are assumed to belong to it.  An exception to this rule is made for
--   the first assignment to dot, otherwise we might put an orphan
--   before . = . + SIZEOF_HEADERS or similar assignments that set the
--   initial address.  */
-+   are assumed to belong to it, except in two cases;  The first
-+   assignment to dot, and assignments before non-alloc sections.
-+   Otherwise we might put an orphan before . = . + SIZEOF_HEADERS or
-+   similar assignments that set the initial address, or we might
-+   insert non-alloc note sections among assignments setting end of
-+   image symbols.  */
- 
- static lang_statement_union_type **
- insert_os_after (lang_output_section_statement_type *after)
-@@ -1662,7 +1664,12 @@ insert_os_after (lang_output_section_sta
- 	  continue;
- 	case lang_output_section_statement_enum:
- 	  if (assign != NULL)
--	    where = assign;
-+	    {
-+	      asection *s = (*where)->output_section_statement.bfd_section;
-+
-+	      if (s == NULL || (s->flags & SEC_ALLOC) != 0)
-+		where = assign;
-+	    }
- 	  break;
- 	case lang_input_statement_enum:
- 	case lang_address_statement_enum:
-
Index: ripts/patch/binutils/2.19.1/20-relaxed_ld_powerpc.patch
===================================================================
--- scripts/patch/binutils/2.19.1/20-relaxed_ld_powerpc.patch	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,50 +1,0 @@
-This aims to make life a little easier for people building large
-PowerPC binaries where the PLT is out of reach for 24-bit branches.
-
-	* emultempl/ppc32elf.em (ppc_before_allocation): Turn on
-	linker relaxation if it might be necessary.
-
-diff -Naur binutils-2.19.1.orig/ld/emultempl/ppc32elf.em binutils-2.19.1/ld/emultempl/ppc32elf.em
---- binutils-2.19.1.orig/ld/emultempl/ppc32elf.em	2008-02-15 01:03:02.000000000 -0800
-+++ binutils-2.19.1/ld/emultempl/ppc32elf.em	2009-07-19 20:22:20.000000000 -0700
-@@ -112,7 +112,40 @@
- 	    }
- 	}
-     }
-+
-   gld${EMULATION_NAME}_before_allocation ();
-+
-+  /* Turn on relaxation if executable sections have addresses that
-+     might make branches overflow.  */
-+  if (!command_line.relax)
-+    {
-+      bfd_vma low = (bfd_vma) -1;
-+      bfd_vma high = 0;
-+      asection *o;
-+
-+      /* Run lang_size_sections (if not already done).  */
-+      if (expld.phase != lang_mark_phase_enum)
-+	{
-+	  expld.phase = lang_mark_phase_enum;
-+	  expld.dataseg.phase = exp_dataseg_none;
-+	  one_lang_size_sections_pass (NULL, FALSE);
-+	  lang_reset_memory_regions ();
-+	}
-+
-+      for (o = link_info.output_bfd->sections; o != NULL; o = o->next)
-+	{
-+	  if ((o->flags & (SEC_ALLOC | SEC_CODE)) != (SEC_ALLOC | SEC_CODE))
-+	    continue;
-+	  if (o->size == 0)
-+	    continue;
-+	  if (low > o->vma)
-+	    low = o->vma;
-+	  if (high < o->vma + o->size - 1)
-+	    high = o->vma + o->size - 1;
-+	}
-+      if (high > low && high - low > (1 << 25) - 1)
-+	command_line.relax = TRUE;
-+    }
- }
- 
- EOF
Index: ripts/patch/binutils/2.19.1/25-build_id.patch
===================================================================
--- scripts/patch/binutils/2.19.1/25-build_id.patch	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,43 +1,0 @@
-Fix build-id patch to avoid memory corruption.  (BZ 501582)
-
-diff -rup ../binutils-2.19.51.0.11.orig/bfd/elfcode.h bfd/elfcode.h
---- ../binutils-2.19.51.0.11.orig/bfd/elfcode.h	2009-07-14 11:23:27.000000000 +0100
-+++ bfd/elfcode.h	2009-07-14 11:33:56.000000000 +0100
-@@ -1170,6 +1170,24 @@ elf_checksum_contents (bfd *abfd,
- 
-       if (i_shdr.contents)
- 	(*process) (i_shdr.contents, i_shdr.sh_size, arg);
-+      else
-+	{
-+	  asection *sec;
-+
-+	  sec = bfd_section_from_elf_index (abfd, count);
-+	  if (sec != NULL)
-+	    {
-+	      if (sec->contents == NULL)
-+		{
-+		  /* Force rereading from file.  */
-+		  sec->flags &= ~SEC_IN_MEMORY;
-+		  if (! bfd_malloc_and_get_section (abfd, sec, & sec->contents))
-+		    continue;
-+		}
-+	      if (sec->contents != NULL)
-+		(*process) (sec->contents, i_shdr.sh_size, arg);
-+	    }
-+	}
-     }
- 
-   return TRUE;
-diff -rup ../binutils-2.19.51.0.11.orig/bfd/section.c bfd/section.c
---- ../binutils-2.19.51.0.11.orig/bfd/section.c	2009-07-14 11:23:27.000000000 +0100
-+++ bfd/section.c	2009-07-14 11:33:26.000000000 +0100
-@@ -1477,7 +1477,7 @@ bfd_malloc_and_get_section (bfd *abfd, s
-   if (sz == 0)
-     return TRUE;
- 
--  p = bfd_malloc (sec->rawsize > sec->size ? sec->rawsize : sec->size);
-+  p = bfd_zmalloc (sec->rawsize > sec->size ? sec->rawsize : sec->size);
-   if (p == NULL)
-     return FALSE;
-   *buf = p;
-
Index: ripts/patch/gcc-patch.sh
===================================================================
--- scripts/patch/gcc-patch.sh	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,183 +1,0 @@
-#!/bin/bash
-# Create a GCC Patch
-
-# Get Version #
-#
-VERSION=$1
-
-# Check Input
-#
-if [ "${VERSION}" = "" ]; then
-  echo "$0 - GCC_Version"
-  echo "This will Create a Patch for GCC GCC_Version"
-  exit 255
-fi
-
-# Set Patch Directory
-#
-PATCH_DIR=$(pwd -P)/gcc
-
-# Download GCC Source
-#
-install -d ~/tmp
-cd ~/tmp
-if ! [ -e gcc-${VERSION}.tar.bz2  ]; then
-  wget ftp://gcc.gnu.org/pub/gcc/releases/gcc-${VERSION}/gcc-${VERSION}.tar.bz2
-fi
-
-# Set Patch Number
-#
-cd ~/tmp
-wget http://svn.cross-lfs.org/svn/repos/patches/gcc/ --no-remove-listing
-for num in $(seq 1 99); do
-  PATCH_NUM=$(cat index.html | grep "${VERSION}" | grep branch_update-${num}.patch | cut -f2 -d'"' | cut -f1 -d'"'| cut -f4 -d- | cut -f1 -d. | tail -n 1)
-  if [ "${PATCH_NUM}" = "0" -a "${num}" = "1" ]; then
-    PATCH_NUM=$(expr ${PATCH_NUM} + 1)
-    break
-  fi
-  if [ "${PATCH_NUM}" != "${num}" ]; then
-    PATCH_NUM=$(expr ${num})
-    break
-  fi
-done
-for num in $(seq 1 99); do
-  PATCH_NUM2=$(cat index.html | grep "${SOURCEVERSION}" | grep fixes-${num}.patch | cut -f2 -d'"' | cut -f1 -d'"'| cut -f4 -d- | cut -f1 -d. | tail -n 1)
-  if [ "${PATCH_NUM2}" = "0" -a "${num}" = "1" ]; then
-    PATCH_NUM2=$(expr ${PATCH_NUM2} + 1)
-    break
-  fi
-  if [ "${PATCH_NUM2}" != "${num}" ]; then
-    PATCH_NUM2=$(expr ${num})
-    break
-  fi
-done
-rm -f index.html
-
-# Cleanup Directory
-#
-cd ~/tmp
-rm -rf gcc-${VERSION} gcc-${VERSION}.orig
-tar xvf gcc-${VERSION}.tar.bz2
-mv gcc-${VERSION} gcc-${VERSION}.orig
-
-# Get Current Updates from SVN
-#
-cd ~/tmp
-NUM1=$(echo ${VERSION} | cut -f1 -d.)
-NUM2=$(echo ${VERSION} | cut -f2 -d.)
-FIXEDVERSION=$(echo -n "$NUM1" ; echo -n "_" ; echo -e "$NUM2")
-REVISION=$(svn info svn://gcc.gnu.org/svn/gcc/branches/gcc-${FIXEDVERSION}-branch | grep "Last Changed Rev" | cut -f2 -d: | sed -e 's/ //g')
-svn export svn://gcc.gnu.org/svn/gcc/branches/gcc-${FIXEDVERSION}-branch gcc-${VERSION}
-
-# Add a custom version string
-#
-cd ~/tmp
-DATE_STAMP=$(cat gcc-${VERSION}/gcc/DATESTAMP)
-echo "${VERSION}" > gcc-${VERSION}/gcc/BASE-VER
-sed -i "s:PKGVERSION:\"(GCC for Cross-LFS ${VERSION}.${DATE_STAMP}) \":" gcc-${VERSION}/gcc/version.c
-
-# Cleanup
-#
-cd ~/tmp
-DIRS="gcc-${VERSION} gcc-${VERSION}.orig"
-for DIRECTORY in ${DIRS}; do
-  cd ~/tmp/${DIRECTORY}
-  REMOVE="ABOUT-NLS COPYING COPYING.LIB MAINTAINERS Makefile.def
-    Makefile.in Makefile.tpl README README.SCO BUGS FAQ LAST_UPDATED
-    MD5SUMS NEWS bugs.html faq.html gcc/BASE-VER gcc/DEV-PHASE
-    gcc/f/BUGS gcc/f/NEWS gcc/gengtype-lex.c INSTALL/binaries.html
-    INSTALL/build.html INSTALL/configure.html INSTALL/download.html
-    INSTALL/finalinstall.html INSTALL/gfdl.html INSTALL/index.html
-    INSTALL/old.html INSTALL/prerequisites.html INSTALL/specific.html
-    INSTALL/test.html"
-  for file in ${REMOVE}; do
-    rm -f $file
-  done
-  for file in $(find . -name "ChangeLog*" | sed -e 's@./@@'); do
-    rm -fv ${file}
-  done
-  REMVOVE_DIRS="INSTALL"
-  for dir in ${REMOVE_DIRS}; do
-    rm -rfv ${dir}
-  done
-  rm -fv fastjar/*.{1,info} gcc/doc/*.{1,info,7} gcc/fortran/*.{1,info,7} gcc/po/*.{gmo,po}
-  rm -rf libcpp/po/*.{gmo,po} libgomp/*.{1,info,7} libjava/classpath/doc/*.{1,info}
- cd .. 
-done
-
-# Create Patch
-#
-cd ~/tmp
-install -d ~/patches
-echo "Submitted By: Jim Gifford (jim at cross-lfs dot org)" > ~/patches/gcc-${VERSION}-branch_update-${PATCH_NUM}.patch
-echo "Date: `date +%m-%d-%Y`" >> ~/patches/gcc-${VERSION}-branch_update-${PATCH_NUM}.patch
-echo "Initial Package Version: ${VERSION}" >> ~/patches/gcc-${VERSION}-branch_update-${PATCH_NUM}.patch
-echo "Origin: Upstream" >> ~/patches/gcc-${VERSION}-branch_update-${PATCH_NUM}.patch
-echo "Upstream Status: Applied" >> ~/patches/gcc-${VERSION}-branch_update-${PATCH_NUM}.patch
-echo "Description: This is a branch update for gcc-${VERSION}, and should be" >> ~/patches/gcc-${VERSION}-branch_update-${PATCH_NUM}.patch
-echo "             rechecked periodically." >> ~/patches/gcc-${VERSION}-branch_update-${PATCH_NUM}.patch
-echo "" >> ~/patches/gcc-${VERSION}-branch_update-${PATCH_NUM}.patch
-echo "This patch was made from Revision # ${REVISION}." >> ~/patches/gcc-${VERSION}-branch_update-${PATCH_NUM}.patch
-echo "" >> ~/patches/gcc-${VERSION}-branch_update-${PATCH_NUM}.patch
-diff -Naur gcc-${VERSION}.orig gcc-${VERSION} >> ~/patches/gcc-${VERSION}-branch_update-${PATCH_NUM}.patch
-echo "Created ~/patches/gcc-${VERSION}-branch_update-${PATCH_NUM}.patch."
-
-# Create Another Copy to create fixes patch
-#
-cd ~/tmp
-if [ -e ${PATCH_DIR}/${VERSION} ]; then
-  rm -rf gcc-${VERSION}.orig
-  cp -ar gcc-${VERSION} gcc-${VERSION}.orig
-
-  # Apply Patches from directories
-  #
-  cd ~/tmp/gcc-${VERSION}
-  PATCH_FILES=$(ls ${PATCH_DIR}/${VERSION}/*.patch)
-  if [ "${PATCH_FILES}" != "" ]; then
-    for pfile in ${PATCH_FILES}; do
-      echo "Applying - ${pfile}..."
-      for pvalue in $(seq 0 5); do
-        patch --dry-run -Np${pvalue} -i ${pfile} > /dev/null 2>&1
-        if [ "${?}" = "0" ]; then
-          PVALUE=${pvalue}
-          break
-        fi
-      done
-      if [ "${PVALUE}" != "" ]; then
-        patch -Np${PVALUE} -i ${pfile}
-      else
-        echo "Patch: ${pfile} Failed to Apply..."
-        exit 255
-      fi
-    done
-  fi
-
-  # Cleanup Directory
-  #
-  cd ~/tmp/gcc-${VERSION}
-  rm -f $(find * -name "*~")
-  rm -f $(find * -name "*.orig")
-  rm -f $(find * -name "*.rej")
-  rm -f *.orig *~ *.rej
-
-  # Create Patch
-  #
-  cd ~/tmp
-  install -d ~/patches
-  echo "Submitted By: Jim Gifford (jim at cross-lfs dot org)" > ~/patches/gcc-${VERSION}-fixes-${PATCH_NUM2}.patch
-  echo "Date: `date +%m-%d-%Y`" >> ~/patches/gcc-${VERSION}-fixes-${PATCH_NUM2}.patch
-  echo "Initial Package Version: ${VERSION}" >> ~/patches/gcc-${VERSION}-fixes-${PATCH_NUM2}.patch
-  echo "Origin: Upstream" >> ~/patches/gcc-${VERSION}-fixes-${PATCH_NUM2}.patch
-  echo "Upstream Status: Applied" >> ~/patches/gcc-${VERSION}-fixes-${PATCH_NUM2}.patch
-  echo "Description: This Patch contains fixes for gcc-${VERSION}, and should be" >> ~/patches/gcc-${VERSION}-fixes-${PATCH_NUM2}.patch
-  echo "             rechecked periodically. These patches are not for inclusion in the book" >> ~/patches/gcc-${VERSION}-fixes-${PATCH_NUM2}.patch
-  echo "             but for testing purposes only. " >> ~/patches/gcc-${VERSION}-fixes-${PATCH_NUM2}.patch
-  echo "" >> ~/patches/gcc-${VERSION}-fixes-${PATCH_NUM2}.patch
-  diff -Naur gcc-${VERSION}.orig gcc-${VERSION} >> ~/patches/gcc-${VERSION}-fixes-${PATCH_NUM2}.patch
-  echo "Created ~/patches/gcc-${VERSION}-fixes-${PATCH_NUM2}.patch."
-fi
-
-# Cleanup Directory
-#
-cd ~/tmp
-rm -rf gcc-${VERSION} gcc-${VERSION}.orig
Index: ripts/patch/gcc-specs-patch.sh
===================================================================
--- scripts/patch/gcc-specs-patch.sh	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,188 +1,0 @@
-#!/bin/bash
-# Create a GCC Specs Patch
-
-# Get Version #
-#
-VERSION=$1
-
-# Check Input
-#
-if [ "${VERSION}" = "" ]; then
-  echo "$0 - GCC_Version"
-  echo "This will Create a Patch for GCC Specs GCC_Version"
-  exit 255
-fi
-
-# Download GCC Source
-#
-cd ~/tmp
-if ! [ -e gcc-${VERSION}.tar.bz2  ]; then
-  wget ftp://gcc.gnu.org/pub/gcc/releases/gcc-${VERSION}/gcc-${VERSION}.tar.bz2
-fi
-
-# Cleanup Directory
-#
-cd ~/tmp
-rm -rf gcc-${VERSION} gcc-${VERSION}.orig
-tar xvf gcc-${VERSION}.tar.bz2
-cp -ar gcc-${VERSION} gcc-${VERSION}.orig
-
-# Modify the Data
-#
-cd ~/tmp/gcc-${VERSION}
-for file in $(find gcc/config -name "*.h"); do
-  if [ "$(echo ${file} | grep -c bsd)" = "0" ]; then
-    if [ "$(cat ${file} | grep -c DYNAMIC_LINKER)" != "0" ]; then
-      echo "Modifying ${file}..."
-      sed -i '/DYNAMIC_LINKER/s@"/lib@"/tools/lib@' ${file}
-    fi
-    if [ "$(cat ${file} | grep -c DYNAMIC_LINKER)" != "0" ]; then
-      echo "Modifying ${file}..."
-      sed -i '/-dynamic-linker/s@ /lib@ /tools/lib@' ${file}
-    fi
-    if [ "$(cat ${file} | grep -c LINK_SPEC)" != "0" ]; then
-      echo "Modifying ${file}..."
-      sed -i -e '/elf64_sparc -Y P,/s@/usr/lib64@/tools/lib64@' \
-        -e '/elf32_sparc -Y P,/s@/usr/lib@/tools/lib@' \
-        -e '/-dynamic-linker/s@ /lib@ /tools/lib@' ${file}
-    fi
-  fi
-done
-
-
-# Create Patch
-#
-cd ~/tmp
-install -d ~/patches
-echo "Submitted By: Jim Gifford (jim at cross-lfs dot org)" > ~/patches/gcc-${VERSION}-specs-x.patch
-echo "Date: `date +%m-%d-%Y`" >> ~/patches/gcc-${VERSION}-specs-x.patch
-echo "Initial Package Version: ${VERSION}" >> ~/patches/gcc-${VERSION}-specs-x.patch
-echo "Origin: Idea originally developed by Ryan Oliver and Greg Schafer for" >> ~/patches/gcc-${VERSION}-specs-x.patch
-echo "        the Pure LFS project." >> ~/patches/gcc-${VERSION}-specs-x.patch
-echo "Upstream Status: Not Applied" >> ~/patches/gcc-${VERSION}-specs-x.patch
-echo "Description: This patch modifies the location of the dynamic linker for gcc-${VERSION}." >> ~/patches/gcc-${VERSION}-specs-x.patch
-echo "" >> ~/patches/gcc-${VERSION}-specs-x.patch
-diff -Naur gcc-${VERSION}.orig gcc-${VERSION} >> ~/patches/gcc-${VERSION}-specs-x.patch
-
-# Cleanup Directory
-#
-cd ~/tmp
-rm -rf gcc-${VERSION} gcc-${VERSION}.orig
-tar xvf gcc-${VERSION}.tar.bz2
-cp -ar gcc-${VERSION} gcc-${VERSION}.orig
-
-# Modify the Data
-#
-cd ~/tmp/gcc-${VERSION}
-for file in $(find gcc/config -name "*.h"); do
-  if [ "$(echo ${file} | grep -c bsd)" = "0" ]; then
-    if [ "$(cat ${file} | grep -c DYNAMIC_LINKER)" != "0" ]; then
-      echo "Modifying ${file}..."
-      sed -i -e '/DYNAMIC_LINKER32/s@"/lib@"/tools/lib32@' \
-       -e '/DYNAMIC_LINKERN32/s@"/lib32@"/tools/lib64@' \
-       -e '/DYNAMIC_LINKER64/s@"/lib64@"/tools/lib@' \
-       -e '/DYNAMIC_LINKER/s@"/lib@"/tools/lib@' ${file}
-    fi
-    if [ "$(cat ${file} | grep -c DYNAMIC_LINKER)" != "0" ]; then
-      echo "Modifying ${file}..."
-      sed -i '/-dynamic-linker/s@ /lib@ /tools/lib@' ${file}
-    fi
-    if [ "$(cat ${file} | grep -c LINK_SPEC)" != "0" ]; then
-      echo "Modifying ${file}..."
-      sed -i -e '/elf64_sparc -Y P,/s@/usr/lib64@/tools/lib@' \
-        -e '/elf32_sparc -Y P,/s@/usr/lib@/tools/lib32@' \
-        -e '/-dynamic-linker/s@ /lib@ /tools/lib@' ${file}
-    fi
-  fi
-done
-
-for file in $(find gcc/config -name "t-linux*"); do
-  if [ "$(cat ${file} | grep -c MULTILIB_OSDIRNAMES)" != "0" ]; then
-    echo "Modifying ${file}..."
-    if [ "$(echo ${file} | grep -c mips)" != "0" ]; then
-      sed -i -e 's@MULTILIB_OSDIRNAMES = ../lib32 ../lib ../lib64@MULTILIB_OSDIRNAMES = ../lib64 ../lib32 ../lib@' \
-        -e 's@MULTILIB_OSDIRNAMES = ../lib32 ../lib ../lib64@MULTILIB_OSDIRNAMES = ../lib64 ../lib32 ../lib@' ${file}
-    else
-      sed -i -e 's@MULTILIB_OSDIRNAMES = ../lib64 ../lib@MULTILIB_OSDIRNAMES = ../lib ../lib32@' \
-        -e 's@MULTILIB_OSDIRNAMES.= ../lib64 .@MULTILIB_OSDIRNAMES\t= ../lib $@' ${file}
-    fi
-  fi
-done
-
-# Create Patch
-#
-cd ~/tmp
-install -d ~/patches
-echo "Submitted By: Jim Gifford (jim at cross-lfs dot org)" > ~/patches/gcc-${VERSION}-pure64_specs-x.patch
-echo "Date: `date +%m-%d-%Y`" >> ~/patches/gcc-${VERSION}-pure64_specs-x.patch
-echo "Initial Package Version: ${VERSION}" >> ~/patches/gcc-${VERSION}-pure64_specs-x.patch
-echo "Origin: Idea originally developed by Ryan Oliver and Greg Schafer for" >> ~/patches/gcc-${VERSION}-pure64_specs-x.patch
-echo "        the Pure LFS project." >> ~/patches/gcc-${VERSION}-pure64_specs-x.patch
-echo "Upstream Status: Not Applied" >> ~/patches/gcc-${VERSION}-pure64_specs-x.patch
-echo "Description: This patch modifies the location of the dynamic linker for gcc-${VERSION}." >> ~/patches/gcc-${VERSION}-pure64_specs-x.patch
-echo "" >> ~/patches/gcc-${VERSION}-pure64_specs-x.patch
-diff -Naur gcc-${VERSION}.orig gcc-${VERSION} >> ~/patches/gcc-${VERSION}-pure64_specs-x.patch
-
-# Cleanup Directory
-#
-cd ~/tmp
-rm -rf gcc-${VERSION} gcc-${VERSION}.orig
-tar xvf gcc-${VERSION}.tar.bz2
-cp -ar gcc-${VERSION} gcc-${VERSION}.orig
-CURRENTDIR=$(pwd -P)
-
-# Modify the Data
-#
-cd ~/tmp/gcc-${VERSION}
-for file in $(find gcc/config -name "*.h"); do
-  if [ "$(echo ${file} | grep -c bsd)" = "0" ]; then
-    if [ "$(cat ${file} | grep -c DYNAMIC_LINKER)" != "0" ]; then
-      echo "Modifying ${file}..."
-      sed -i -e '/DYNAMIC_LINKER32/s@"/lib@"/lib32@' \
-       -e '/DYNAMIC_LINKERN32/s@"/lib32@"/lib64@' \
-       -e '/DYNAMIC_LINKER64/s@"/lib64@"/lib@' \
-       -e '/DYNAMIC_LINKER/s@"/lib@"/lib@' ${file}
-    fi
-    if [ "$(cat ${file} | grep -c LINK_SPEC)" != "0" ]; then
-      echo "Modifying ${file}..."
-      sed -i -e '/elf64_sparc -Y P,/s@/usr/lib64@/usr/lib@' \
-        -e '/elf32_sparc -Y P,/s@/usr/lib@/usr/lib32@' ${file}
-    fi
-  fi
-done
-
-for file in $(find gcc/config -name "t-linux*"); do
-  if [ "$(cat ${file} | grep -c MULTILIB_OSDIRNAMES)" != "0" ]; then
-    echo "Modifying ${file}..."
-    if [ "$(echo ${file} | grep -c mips)" != "0" ]; then
-      sed -i -e 's@MULTILIB_OSDIRNAMES = ../lib32 ../lib ../lib64@MULTILIB_OSDIRNAMES = ../lib64 ../lib32 ../lib@' \
-        -e 's@MULTILIB_OSDIRNAMES = ../lib32 ../lib ../lib64@MULTILIB_OSDIRNAMES = ../lib64 ../lib32 ../lib@' ${file}
-    else
-      sed -i -e 's@MULTILIB_OSDIRNAMES = ../lib64 ../lib@MULTILIB_OSDIRNAMES = ../lib ../lib32@' \
-        -e 's@MULTILIB_OSDIRNAMES.= ../lib64 .@MULTILIB_OSDIRNAMES\t= ../lib $@' ${file}
-    fi
-  fi
-done
-
-# Create Patch
-#
-cd ~/tmp
-install -d ~/patches
-echo "Submitted By: Jim Gifford (jim at cross-lfs dot org)" > ~/patches/gcc-${VERSION}-pure64-x.patch
-echo "Date: `date +%m-%d-%Y`" >> ~/patches/gcc-${VERSION}-pure64-x.patch
-echo "Initial Package Version: ${VERSION}" >> ~/patches/gcc-${VERSION}-pure64-x.patch
-echo "Origin: Idea originally developed by Ryan Oliver and Greg Schafer for" >> ~/patches/gcc-${VERSION}-pure64-x.patch
-echo "        the Pure LFS project." >> ~/patches/gcc-${VERSION}-pure64-x.patch
-echo "Upstream Status: Not Applied" >> ~/patches/gcc-${VERSION}-pure64-x.patch
-echo "Description: This patch modifies the location of the dynamic linker for gcc-${VERSION}." >> ~/patches/gcc-${VERSION}-pure64-x.patch
-echo "" >> ~/patches/gcc-${VERSION}-pure64-x.patch
-diff -Naur gcc-${VERSION}.orig gcc-${VERSION} >> ~/patches/gcc-${VERSION}-pure64-x.patch
-
-echo "Created ~/patches/gcc-${VERSION}-specs-x.patch."
-echo "Created ~/patches/gcc-${VERSION}-pure64_specs-x.patch."
-echo "Created ~/patches/gcc-${VERSION}-pure64-x.patch."
-
-# Cleanup Directory
-#
-cd ~/tmp
-rm -rf gcc-${VERSION} gcc-${VERSION}.orig
Index: ripts/patch/gcc/4.4.0/01-cloog-fixes.patch
===================================================================
--- scripts/patch/gcc/4.4.0/01-cloog-fixes.patch	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,173 +1,0 @@
-2009-01-27  Jakub Jelinek  <jakub@redhat.com>
-
-	* Makefile.in (BACKENDLIBS): Link against -ldl instead of -lcloog -lppl.
-	(graphite.o): Force -O, remove -fkeep-inline-functions.
-	* graphite.c: Include <dlfcn.h>.  Reference libcloog and libppl symbols
-	through pointers in cloog_pointers variable.
-	(init_cloog_pointers): New function.
-	(gcc_type_for_iv_of_clast_loop): Rename stmt_for argument to stmt_fora.
-	(graphite_transform_loops): Call init_cloog_pointers.
-
-diff -Naur gcc-4.4.0.orig/gcc/graphite.c gcc-4.4.0/gcc/graphite.c
---- gcc-4.4.0.orig/gcc/graphite.c	2009-03-18 09:59:55.000000000 -0700
-+++ gcc-4.4.0/gcc/graphite.c	2009-07-14 09:26:53.000000000 -0700
-@@ -59,6 +59,110 @@
- #include "cloog/cloog.h"
- #include "graphite.h"
- 
-+#include <dlfcn.h>
-+#define DYNSYMS \
-+  DYNSYM (cloog_block_alloc); \
-+  DYNSYM (cloog_block_list_free); \
-+  DYNSYM (cloog_block_list_malloc); \
-+  DYNSYM (cloog_clast_create); \
-+  DYNSYM (cloog_clast_free); \
-+  DYNSYM (cloog_domain_free); \
-+  DYNSYM (cloog_domain_matrix2domain); \
-+  DYNSYM (cloog_initialize); \
-+  DYNSYM (cloog_loop_malloc); \
-+  DYNSYM (cloog_matrix_alloc); \
-+  DYNSYM (cloog_matrix_copy); \
-+  DYNSYM (cloog_matrix_free); \
-+  DYNSYM (cloog_matrix_print); \
-+  DYNSYM (cloog_names_malloc); \
-+  DYNSYM (cloog_names_scalarize); \
-+  DYNSYM (cloog_options_free); \
-+  DYNSYM (cloog_options_malloc); \
-+  DYNSYM (cloog_program_dump_cloog); \
-+  DYNSYM (cloog_program_extract_scalars); \
-+  DYNSYM (cloog_program_free); \
-+  DYNSYM (cloog_program_generate); \
-+  DYNSYM (cloog_program_malloc); \
-+  DYNSYM (cloog_program_print); \
-+  DYNSYM (cloog_program_scatter); \
-+  DYNSYM (cloog_statement_alloc); \
-+  DYNSYM (ppl_finalize); \
-+  DYNSYM (pprint); \
-+  DYNSYM (stmt_block); \
-+  DYNSYM (stmt_for); \
-+  DYNSYM (stmt_guard); \
-+  DYNSYM (stmt_root); \
-+  DYNSYM (stmt_user);
-+static struct
-+{
-+  bool inited;
-+  void *h;
-+#define DYNSYM(x) __typeof (x) *p_##x
-+  DYNSYMS
-+#undef DYNSYM
-+} cloog_pointers;
-+
-+#define cloog_block_alloc (*cloog_pointers.p_cloog_block_alloc)
-+#define cloog_block_list_free (*cloog_pointers.p_cloog_block_list_free)
-+#define cloog_block_list_malloc (*cloog_pointers.p_cloog_block_list_malloc)
-+#define cloog_clast_create (*cloog_pointers.p_cloog_clast_create)
-+#define cloog_clast_free (*cloog_pointers.p_cloog_clast_free)
-+#define cloog_domain_free (*cloog_pointers.p_cloog_domain_free)
-+#define cloog_domain_matrix2domain (*cloog_pointers.p_cloog_domain_matrix2domain)
-+#define cloog_initialize (*cloog_pointers.p_cloog_initialize)
-+#define cloog_loop_malloc (*cloog_pointers.p_cloog_loop_malloc)
-+#define cloog_matrix_alloc (*cloog_pointers.p_cloog_matrix_alloc)
-+#define cloog_matrix_copy (*cloog_pointers.p_cloog_matrix_copy)
-+#define cloog_matrix_free (*cloog_pointers.p_cloog_matrix_free)
-+#define cloog_matrix_print (*cloog_pointers.p_cloog_matrix_print)
-+#define cloog_names_malloc (*cloog_pointers.p_cloog_names_malloc)
-+#define cloog_names_scalarize (*cloog_pointers.p_cloog_names_scalarize)
-+#define cloog_options_free (*cloog_pointers.p_cloog_options_free)
-+#define cloog_options_malloc (*cloog_pointers.p_cloog_options_malloc)
-+#define cloog_program_dump_cloog (*cloog_pointers.p_cloog_program_dump_cloog)
-+#define cloog_program_extract_scalars (*cloog_pointers.p_cloog_program_extract_scalars)
-+#define cloog_program_free (*cloog_pointers.p_cloog_program_free)
-+#define cloog_program_generate (*cloog_pointers.p_cloog_program_generate)
-+#define cloog_program_malloc (*cloog_pointers.p_cloog_program_malloc)
-+#define cloog_program_print (*cloog_pointers.p_cloog_program_print)
-+#define cloog_program_scatter (*cloog_pointers.p_cloog_program_scatter)
-+#define cloog_statement_alloc (*cloog_pointers.p_cloog_statement_alloc)
-+#define ppl_finalize (*cloog_pointers.p_ppl_finalize)
-+#define pprint (*cloog_pointers.p_pprint)
-+#define stmt_block (*cloog_pointers.p_stmt_block)
-+#define stmt_for (*cloog_pointers.p_stmt_for)
-+#define stmt_guard (*cloog_pointers.p_stmt_guard)
-+#define stmt_root (*cloog_pointers.p_stmt_root)
-+#define stmt_user (*cloog_pointers.p_stmt_user)
-+
-+#define cloog_finalize (*cloog_pointers.p_ppl_finalize)
-+
-+static bool
-+init_cloog_pointers (void)
-+{
-+  void *h;
-+
-+  if (cloog_pointers.inited)
-+    return cloog_pointers.h != NULL;
-+  h = dlopen ("libcloog.so.0", RTLD_LAZY);
-+  cloog_pointers.h = h;
-+  if (h == NULL)
-+    return false;
-+#define DYNSYM(x) \
-+  do \
-+    { \
-+      union { __typeof (cloog_pointers.p_##x) p; void *q; } u; \
-+      u.q = dlsym (h, #x); \
-+      if (u.q == NULL) \
-+	return false; \
-+      cloog_pointers.p_##x = u.p; \
-+    } \
-+  while (0)
-+  DYNSYMS
-+#undef DYNSYM
-+  return true;
-+}
-+
- static VEC (scop_p, heap) *current_scops;
- 
- /* Converts a GMP constant V to a tree and returns it.  */
-@@ -4075,10 +4179,10 @@
-    STMT.  */
- 
- static tree
--gcc_type_for_iv_of_clast_loop (struct clast_for *stmt_for)
-+gcc_type_for_iv_of_clast_loop (struct clast_for *stmt_fora)
- {
--  struct clast_user_stmt *stmt = clast_get_body_of_loop ((struct clast_stmt *) stmt_for);
--  const char *cloog_iv = stmt_for->iterator;
-+  struct clast_user_stmt *stmt = clast_get_body_of_loop ((struct clast_stmt *) stmt_fora);
-+  const char *cloog_iv = stmt_fora->iterator;
-   CloogStatement *cs = stmt->statement;
-   graphite_bb_p gbb = (graphite_bb_p) cloog_statement_usr (cs);
- 
-@@ -6109,6 +6213,12 @@
-   if (number_of_loops () <= 1)
-     return;
- 
-+  if (!init_cloog_pointers ())
-+    {
-+      sorry ("Graphite loop optimizations cannot be used");
-+      return;
-+    }
-+
-   current_scops = VEC_alloc (scop_p, heap, 3);
-   recompute_all_dominators ();
- 
-diff -Naur gcc-4.4.0.orig/gcc/Makefile.in gcc-4.4.0/gcc/Makefile.in
---- gcc-4.4.0.orig/gcc/Makefile.in	2009-07-14 09:25:46.000000000 -0700
-+++ gcc-4.4.0/gcc/Makefile.in	2009-07-14 09:26:53.000000000 -0700
-@@ -914,7 +914,7 @@
- # How to link with both our special library facilities
- # and the system's installed libraries.
- LIBS = @LIBS@ $(CPPLIB) $(LIBINTL) $(LIBICONV) $(LIBIBERTY) $(LIBDECNUMBER)
--BACKENDLIBS = $(CLOOGLIBS) $(PPLLIBS) $(GMPLIBS)
-+BACKENDLIBS = $(GMPLIBS) $(if $(CLOOGLIBS),-ldl)
- # Any system libraries needed just for GNAT.
- SYSLIBS = @GNAT_LIBEXC@
- 
-@@ -3061,6 +3061,9 @@
- 	$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) \
- 		$(out_file) $(OUTPUT_OPTION)
- 
-+graphite.o : \
-+  ALL_CFLAGS := -O $(filter-out -fkeep-inline-functions, $(ALL_CFLAGS))
-+
- # Build auxiliary files that support ecoff format.
- mips-tfile: mips-tfile.o version.o $(LIBDEPS)
- 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ mips-tfile.o version.o $(LIBS)
Index: ripts/patch/gcc/4.4.0/05-java-fixes.patch
===================================================================
--- scripts/patch/gcc/4.4.0/05-java-fixes.patch	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,49 +1,0 @@
-Java can only be built as 1 ABI at the moment. So this switch will all
-the disabling of only the java multilib build
-
-diff -Naur gcc-4.4.0.orig/libjava/configure gcc-4.4.0/libjava/configure
---- gcc-4.4.0.orig/libjava/configure	2009-07-14 09:25:46.000000000 -0700
-+++ gcc-4.4.0/libjava/configure	2009-07-14 09:33:34.000000000 -0700
-@@ -1021,6 +1021,8 @@
-                           default=yes
-   --enable-java-maintainer-mode
-                           allow rebuilding of .class and .h files
-+  --enable-libjava-multilib
-+                          build libjava as multilib
-   --disable-dependency-tracking  speeds up one-time build
-   --enable-dependency-tracking   do not reject slow dependency extractors
-   --enable-maintainer-mode  enable make rules and dependencies not useful
-@@ -1973,6 +1975,16 @@
- fi
- 
- 
-+# Check whether --enable-libjava-multilib was given.
-+if test "${enable_libjava_multilib+set}" = set; then
-+  enableval=$enable_libjava_multilib;
-+fi
-+
-+if test "$enable_libjava_multilib" = no; then
-+  multilib=no
-+  ac_configure_args="$ac_configure_args --disable-multilib"
-+fi
-+
- # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
- 
- 
-diff -Naur gcc-4.4.0.orig/libjava/configure.ac gcc-4.4.0/libjava/configure.ac
---- gcc-4.4.0.orig/libjava/configure.ac	2009-07-14 09:25:46.000000000 -0700
-+++ gcc-4.4.0/libjava/configure.ac	2009-07-14 09:33:34.000000000 -0700
-@@ -139,6 +139,13 @@
- 	[allow rebuilding of .class and .h files]))
- AM_CONDITIONAL(JAVA_MAINTAINER_MODE, test "$enable_java_maintainer_mode" = yes)
- 
-+AC_ARG_ENABLE(libjava-multilib,
-+	AS_HELP_STRING([--enable-libjava-multilib], [build libjava as multilib]))
-+if test "$enable_libjava_multilib" = no; then
-+  multilib=no
-+  ac_configure_args="$ac_configure_args --disable-multilib"
-+fi
-+
- # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
- GCC_NO_EXECUTABLES
- 
Index: ripts/patch/gcc/4.4.0/10-libgomp_multilib-fixes.patch
===================================================================
--- scripts/patch/gcc/4.4.0/10-libgomp_multilib-fixes.patch	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,18 +1,0 @@
-2008-06-09  Jakub Jelinek  <jakub@redhat.com>
-
-	* omp.h.in (omp_nest_lock_t): Fix up for Linux multilibs.
-
-diff -Naur gcc-4.4.0.orig/libgomp/omp.h.in gcc-4.4.0/libgomp/omp.h.in
---- gcc-4.4.0.orig/libgomp/omp.h.in	2009-04-09 16:23:07.000000000 -0700
-+++ gcc-4.4.0/libgomp/omp.h.in	2009-07-14 09:41:08.000000000 -0700
-@@ -39,8 +39,8 @@
- 
- typedef struct
- {
--  unsigned char _x[@OMP_NEST_LOCK_SIZE@] 
--    __attribute__((__aligned__(@OMP_NEST_LOCK_ALIGN@)));
-+  unsigned char _x[8 + sizeof (void *)] 
-+    __attribute__((__aligned__(sizeof (void *))));
- } omp_nest_lock_t;
- #endif
- 
Index: ripts/patch/gcc/4.4.0/15-libtool-fixes.patch
===================================================================
--- scripts/patch/gcc/4.4.0/15-libtool-fixes.patch	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,29 +1,0 @@
-This patch works around rpath in GCC
-
-diff -Naur gcc-4.4.0.orig/ltmain.sh gcc-4.4.0/ltmain.sh
---- gcc-4.4.0.orig/ltmain.sh	2008-09-26 09:21:02.000000000 -0700
-+++ gcc-4.4.0/ltmain.sh	2009-07-14 10:03:39.000000000 -0700
-@@ -6886,6 +6886,7 @@
- 	  rpath="$finalize_rpath"
- 	  test "$mode" != relink && rpath="$compile_rpath$rpath"
- 	  for libdir in $rpath; do
-+	    case "$libdir" in /usr/lib|/usr/lib64|/usr/lib/../lib|/usr/lib/../lib64) continue;; esac
- 	    if test -n "$hardcode_libdir_flag_spec"; then
- 	      if test -n "$hardcode_libdir_separator"; then
- 		if test -z "$hardcode_libdirs"; then
-@@ -7575,6 +7576,7 @@
-       rpath=
-       hardcode_libdirs=
-       for libdir in $compile_rpath $finalize_rpath; do
-+	case "$libdir" in /usr/lib|/usr/lib64|/usr/lib/../lib|/usr/lib/../lib64) continue;; esac
- 	if test -n "$hardcode_libdir_flag_spec"; then
- 	  if test -n "$hardcode_libdir_separator"; then
- 	    if test -z "$hardcode_libdirs"; then
-@@ -7626,6 +7628,7 @@
-       rpath=
-       hardcode_libdirs=
-       for libdir in $finalize_rpath; do
-+	case "$libdir" in /usr/lib|/usr/lib64|/usr/lib/../lib|/usr/lib/../lib64) continue;; esac
- 	if test -n "$hardcode_libdir_flag_spec"; then
- 	  if test -n "$hardcode_libdir_separator"; then
- 	    if test -z "$hardcode_libdirs"; then
Index: ripts/patch/gcc/4.4.0/20-powerpc-biarch.patch
===================================================================
--- scripts/patch/gcc/4.4.0/20-powerpc-biarch.patch	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,24 +1,0 @@
-This patch works changes the biarch of PPC to the match other archs
-
-diff -Naur gcc-4.4.0.orig/gcc/config/rs6000/t-linux64 gcc-4.4.0/gcc/config/rs6000/t-linux64
---- gcc-4.4.0.orig/gcc/config/rs6000/t-linux64	2007-09-27 12:56:06.000000000 -0700
-+++ gcc-4.4.0/gcc/config/rs6000/t-linux64	2009-07-14 10:14:54.000000000 -0700
-@@ -14,13 +14,13 @@
- # it doesn't tell anything about the 32bit libraries on those systems.  Set
- # MULTILIB_OSDIRNAMES according to what is found on the target.
- 
--MULTILIB_OPTIONS        = m64/m32 msoft-float
-+MULTILIB_OPTIONS        = m64/m32
- MULTILIB_DIRNAMES       = 64 32 nof
- MULTILIB_EXTRA_OPTS     = fPIC mstrict-align
--MULTILIB_EXCEPTIONS     = m64/msoft-float
--MULTILIB_EXCLUSIONS     = m64/!m32/msoft-float
--MULTILIB_OSDIRNAMES	= ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) nof
--MULTILIB_MATCHES        = $(MULTILIB_MATCHES_FLOAT)
-+MULTILIB_EXCEPTIONS     =
-+MULTILIB_EXCLUSIONS     =
-+MULTILIB_OSDIRNAMES	= ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
-+MULTILIB_MATCHES        = 
- 
- softfp_wrap_start := '\#ifndef __powerpc64__'
- softfp_wrap_end := '\#endif'
Index: ripts/patch/gcc/4.4.0/25-hash-style.patch
===================================================================
--- scripts/patch/gcc/4.4.0/25-hash-style.patch	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,145 +1,0 @@
-2006-07-11  Jakub Jelinek  <jakub@redhat.com>
-
-	* config/i386/linux.h (LINK_SPEC): Add --hash-style=both.
-	* config/i386/linux64.h (LINK_SPEC): Likewise.
-	* config/rs6000/sysv4.h (LINK_OS_LINUX_SPEC): Likewise.
-	* config/rs6000/linux64.h (LINK_OS_LINUX_SPEC32,
-	LINK_OS_LINUX_SPEC64): Likewise.
-	* config/s390/linux.h (LINK_SPEC): Likewise.
-	* config/ia64/linux.h (LINK_SPEC): Likewise.
-	* config/sparc/linux.h (LINK_SPEC): Likewise.
-	* config/sparc/linux64.h (LINK_SPEC, LINK_ARCH32_SPEC,
-	LINK_ARCH64_SPEC): Likewise.
-	* config/alpha/linux-elf.h (LINK_SPEC): Likewise.
-
-diff -Naur gcc-4.4.0.orig/gcc/config/alpha/linux-elf.h gcc-4.4.0/gcc/config/alpha/linux-elf.h
---- gcc-4.4.0.orig/gcc/config/alpha/linux-elf.h	2007-08-02 03:49:31.000000000 -0700
-+++ gcc-4.4.0/gcc/config/alpha/linux-elf.h	2009-07-14 10:22:11.000000000 -0700
-@@ -39,7 +39,7 @@
- 
- #define ELF_DYNAMIC_LINKER	LINUX_DYNAMIC_LINKER
- 
--#define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax}		\
-+#define LINK_SPEC "-m elf64alpha --hash-style=both %{G*} %{relax:-relax}	\
-   %{O*:-O3} %{!O*:-O1}						\
-   %{shared:-shared}						\
-   %{!shared:							\
-diff -Naur gcc-4.4.0.orig/gcc/config/i386/linux64.h gcc-4.4.0/gcc/config/i386/linux64.h
---- gcc-4.4.0.orig/gcc/config/i386/linux64.h	2009-04-09 16:23:07.000000000 -0700
-+++ gcc-4.4.0/gcc/config/i386/linux64.h	2009-07-14 10:22:11.000000000 -0700
-@@ -75,7 +75,7 @@
- #endif
- 
- #undef	LINK_SPEC
--#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} \
-+#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} --hash-style=both \
-   %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
-diff -Naur gcc-4.4.0.orig/gcc/config/i386/linux.h gcc-4.4.0/gcc/config/i386/linux.h
---- gcc-4.4.0.orig/gcc/config/i386/linux.h	2009-07-14 09:25:45.000000000 -0700
-+++ gcc-4.4.0/gcc/config/i386/linux.h	2009-07-14 10:22:11.000000000 -0700
-@@ -113,7 +113,7 @@
-   { "dynamic_linker", LINUX_DYNAMIC_LINKER }
- 
- #undef	LINK_SPEC
--#define LINK_SPEC "-m %(link_emulation) %{shared:-shared} \
-+#define LINK_SPEC "-m %(link_emulation) --hash-style=both %{shared:-shared} \
-   %{!shared: \
-     %{!ibcs: \
-       %{!static: \
-diff -Naur gcc-4.4.0.orig/gcc/config/ia64/linux.h gcc-4.4.0/gcc/config/ia64/linux.h
---- gcc-4.4.0.orig/gcc/config/ia64/linux.h	2009-02-12 08:30:53.000000000 -0800
-+++ gcc-4.4.0/gcc/config/ia64/linux.h	2009-07-14 10:22:11.000000000 -0700
-@@ -40,7 +40,7 @@
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2"
- 
- #undef LINK_SPEC
--#define LINK_SPEC "\
-+#define LINK_SPEC "--hash-style=both \
-   %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
-diff -Naur gcc-4.4.0.orig/gcc/config/rs6000/linux64.h gcc-4.4.0/gcc/config/rs6000/linux64.h
---- gcc-4.4.0.orig/gcc/config/rs6000/linux64.h	2009-04-09 16:23:07.000000000 -0700
-+++ gcc-4.4.0/gcc/config/rs6000/linux64.h	2009-07-14 10:22:11.000000000 -0700
-@@ -357,11 +357,11 @@
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64)
- 
- 
--#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \
-   %{rdynamic:-export-dynamic} \
-   %{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER32 "}}}"
- 
--#define LINK_OS_LINUX_SPEC64 "-m elf64ppc %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC64 "-m elf64ppc --hash-style=both %{!shared: %{!static: \
-   %{rdynamic:-export-dynamic} \
-   %{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER64 "}}}"
- 
-diff -Naur gcc-4.4.0.orig/gcc/config/rs6000/sysv4.h gcc-4.4.0/gcc/config/rs6000/sysv4.h
---- gcc-4.4.0.orig/gcc/config/rs6000/sysv4.h	2009-04-09 16:23:07.000000000 -0700
-+++ gcc-4.4.0/gcc/config/rs6000/sysv4.h	2009-07-14 10:22:11.000000000 -0700
-@@ -911,7 +911,7 @@
- #define LINUX_DYNAMIC_LINKER \
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
- 
--#define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \
-   %{rdynamic:-export-dynamic} \
-   %{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER "}}}"
- 
-diff -Naur gcc-4.4.0.orig/gcc/config/s390/linux.h gcc-4.4.0/gcc/config/s390/linux.h
---- gcc-4.4.0.orig/gcc/config/s390/linux.h	2007-08-02 03:49:31.000000000 -0700
-+++ gcc-4.4.0/gcc/config/s390/linux.h	2009-07-14 10:22:11.000000000 -0700
-@@ -77,7 +77,7 @@
- 
- #undef  LINK_SPEC
- #define LINK_SPEC \
--  "%{m31:-m elf_s390}%{m64:-m elf64_s390} \
-+  "%{m31:-m elf_s390}%{m64:-m elf64_s390} --hash-style=both \
-    %{shared:-shared} \
-    %{!shared: \
-       %{static:-static} \
-diff -Naur gcc-4.4.0.orig/gcc/config/sparc/linux64.h gcc-4.4.0/gcc/config/sparc/linux64.h
---- gcc-4.4.0.orig/gcc/config/sparc/linux64.h	2009-02-20 07:20:38.000000000 -0800
-+++ gcc-4.4.0/gcc/config/sparc/linux64.h	2009-07-14 10:22:11.000000000 -0700
-@@ -121,7 +121,7 @@
-   { "link_arch_default", LINK_ARCH_DEFAULT_SPEC },	  \
-   { "link_arch",	 LINK_ARCH_SPEC },
- 
--#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/usr/lib %{shared:-shared} \
-+#define LINK_ARCH32_SPEC "-m elf32_sparc --hash-style=both -Y P,%R/usr/lib %{shared:-shared} \
-   %{!shared: \
-     %{!ibcs: \
-       %{!static: \
-@@ -130,7 +130,7 @@
-         %{static:-static}}} \
- "
- 
--#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
-+#define LINK_ARCH64_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \
-   %{!shared: \
-     %{!ibcs: \
-       %{!static: \
-@@ -211,7 +211,7 @@
- #else /* !SPARC_BI_ARCH */
- 
- #undef LINK_SPEC
--#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
-+#define LINK_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \
-   %{!shared: \
-     %{!ibcs: \
-       %{!static: \
-diff -Naur gcc-4.4.0.orig/gcc/config/sparc/linux.h gcc-4.4.0/gcc/config/sparc/linux.h
---- gcc-4.4.0.orig/gcc/config/sparc/linux.h	2009-02-20 07:20:38.000000000 -0800
-+++ gcc-4.4.0/gcc/config/sparc/linux.h	2009-07-14 10:22:11.000000000 -0700
-@@ -86,7 +86,7 @@
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
- 
- #undef  LINK_SPEC
--#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
-+#define LINK_SPEC "-m elf32_sparc --hash-style=both -Y P,/usr/lib %{shared:-shared} \
-   %{!mno-relax:%{!r:-relax}} \
-   %{!shared: \
-     %{!ibcs: \
Index: ripts/patch/gcc/4.4.0/30-note-gnu-stack.patch
===================================================================
--- scripts/patch/gcc/4.4.0/30-note-gnu-stack.patch	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,217 +1,0 @@
-# DP: Add .note.GNU-stack sections for gcc's crt files, libffi and boehm-gc
-# DP: Taken from FC.
-
-gcc/
-
-2004-09-20  Jakub Jelinek  <jakub@redhat.com>
-
-	* config/rs6000/ppc-asm.h: Add .note.GNU-stack section also
-	on ppc64-linux.
-
-	* config/ia64/lib1funcs.asm: Add .note.GNU-stack section on
-	ia64-linux.
-	* config/ia64/crtbegin.asm: Likewise.
-	* config/ia64/crtend.asm: Likewise.
-	* config/ia64/crti.asm: Likewise.
-	* config/ia64/crtn.asm: Likewise.
-
-2004-05-14  Jakub Jelinek  <jakub@redhat.com>
-
-	* config/ia64/linux.h (TARGET_ASM_FILE_END): Define.
-
-boehm-gc/
-
-2005-02-08  Jakub Jelinek  <jakub@redhat.com>
-
-	* ia64_save_regs_in_stack.s: Moved to...
-	* ia64_save_regs_in_stack.S: ... this.  Add .note.GNU-stack
-	on Linux.
-
-libffi/
-
-2007-05-11  Daniel Jacobowitz  <dan@debian.org>
-
-	* src/arm/sysv.S: Fix ARM comment marker.
-
-2005-02-08  Jakub Jelinek  <jakub@redhat.com>
-
-	* src/alpha/osf.S: Add .note.GNU-stack on Linux.
-	* src/s390/sysv.S: Likewise.
-	* src/powerpc/linux64.S: Likewise.
-	* src/powerpc/linux64_closure.S: Likewise.
-	* src/powerpc/ppc_closure.S: Likewise.
-	* src/powerpc/sysv.S: Likewise.
-	* src/x86/unix64.S: Likewise.
-	* src/x86/sysv.S: Likewise.
-	* src/sparc/v8.S: Likewise.
-	* src/sparc/v9.S: Likewise.
-	* src/m68k/sysv.S: Likewise.
-	* src/ia64/unix.S: Likewise.
-	* src/arm/sysv.S: Likewise.
-
-diff -Naur gcc-4.4.0.orig/boehm-gc/ia64_save_regs_in_stack.s gcc-4.4.0/boehm-gc/ia64_save_regs_in_stack.s
---- gcc-4.4.0.orig/boehm-gc/ia64_save_regs_in_stack.s	2001-10-14 21:57:59.000000000 -0700
-+++ gcc-4.4.0/boehm-gc/ia64_save_regs_in_stack.s	2009-07-14 10:45:25.000000000 -0700
-@@ -1,12 +0,0 @@
--        .text
--        .align 16
--        .global GC_save_regs_in_stack
--        .proc GC_save_regs_in_stack
--GC_save_regs_in_stack:
--        .body
--        flushrs
--        ;;
--        mov r8=ar.bsp
--        br.ret.sptk.few rp
--        .endp GC_save_regs_in_stack
--
-diff -Naur gcc-4.4.0.orig/boehm-gc/ia64_save_regs_in_stack.S gcc-4.4.0/boehm-gc/ia64_save_regs_in_stack.S
---- gcc-4.4.0.orig/boehm-gc/ia64_save_regs_in_stack.S	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.4.0/boehm-gc/ia64_save_regs_in_stack.S	2009-07-14 10:45:25.000000000 -0700
-@@ -0,0 +1,15 @@
-+        .text
-+        .align 16
-+        .global GC_save_regs_in_stack
-+        .proc GC_save_regs_in_stack
-+GC_save_regs_in_stack:
-+        .body
-+        flushrs
-+        ;;
-+        mov r8=ar.bsp
-+        br.ret.sptk.few rp
-+        .endp GC_save_regs_in_stack
-+
-+#ifdef __linux__
-+	.section .note.GNU-stack,"",@progbits
-+#endif
-diff -Naur gcc-4.4.0.orig/gcc/config/ia64/crtbegin.asm gcc-4.4.0/gcc/config/ia64/crtbegin.asm
---- gcc-4.4.0.orig/gcc/config/ia64/crtbegin.asm	2009-04-09 16:23:07.000000000 -0700
-+++ gcc-4.4.0/gcc/config/ia64/crtbegin.asm	2009-07-14 10:45:25.000000000 -0700
-@@ -252,3 +252,7 @@
- .weak __cxa_finalize
- #endif
- .weak _Jv_RegisterClasses
-+
-+#ifdef __linux__
-+.section .note.GNU-stack; .previous
-+#endif
-diff -Naur gcc-4.4.0.orig/gcc/config/ia64/crtend.asm gcc-4.4.0/gcc/config/ia64/crtend.asm
---- gcc-4.4.0.orig/gcc/config/ia64/crtend.asm	2009-04-09 16:23:07.000000000 -0700
-+++ gcc-4.4.0/gcc/config/ia64/crtend.asm	2009-07-14 10:45:25.000000000 -0700
-@@ -119,3 +119,7 @@
- 
- 	br.ret.sptk.many rp
- 	.endp __do_global_ctors_aux
-+
-+#ifdef __linux__
-+.section .note.GNU-stack; .previous
-+#endif
-diff -Naur gcc-4.4.0.orig/gcc/config/ia64/crti.asm gcc-4.4.0/gcc/config/ia64/crti.asm
---- gcc-4.4.0.orig/gcc/config/ia64/crti.asm	2009-04-09 16:23:07.000000000 -0700
-+++ gcc-4.4.0/gcc/config/ia64/crti.asm	2009-07-14 10:45:25.000000000 -0700
-@@ -51,3 +51,7 @@
- 	.body
- 
- # end of crti.asm
-+
-+#ifdef __linux__
-+.section .note.GNU-stack; .previous
-+#endif
-diff -Naur gcc-4.4.0.orig/gcc/config/ia64/crtn.asm gcc-4.4.0/gcc/config/ia64/crtn.asm
---- gcc-4.4.0.orig/gcc/config/ia64/crtn.asm	2009-04-09 16:23:07.000000000 -0700
-+++ gcc-4.4.0/gcc/config/ia64/crtn.asm	2009-07-14 10:45:25.000000000 -0700
-@@ -41,3 +41,7 @@
- 	br.ret.sptk.many b0
- 
- # end of crtn.asm
-+
-+#ifdef __linux__
-+.section .note.GNU-stack; .previous
-+#endif
-diff -Naur gcc-4.4.0.orig/gcc/config/ia64/lib1funcs.asm gcc-4.4.0/gcc/config/ia64/lib1funcs.asm
---- gcc-4.4.0.orig/gcc/config/ia64/lib1funcs.asm	2009-04-09 16:23:07.000000000 -0700
-+++ gcc-4.4.0/gcc/config/ia64/lib1funcs.asm	2009-07-14 10:45:25.000000000 -0700
-@@ -793,3 +793,7 @@
- 	.endp __floattitf
- #endif
- #endif
-+
-+#ifdef __linux__
-+.section .note.GNU-stack; .previous
-+#endif
-diff -Naur gcc-4.4.0.orig/gcc/config/ia64/linux.h gcc-4.4.0/gcc/config/ia64/linux.h
---- gcc-4.4.0.orig/gcc/config/ia64/linux.h	2009-02-12 08:30:53.000000000 -0800
-+++ gcc-4.4.0/gcc/config/ia64/linux.h	2009-07-14 10:45:25.000000000 -0700
-@@ -5,6 +5,8 @@
- 
- #define TARGET_VERSION fprintf (stderr, " (IA-64) Linux");
- 
-+#define TARGET_ASM_FILE_END file_end_indicate_exec_stack
-+
- /* This is for -profile to use -lc_p instead of -lc.  */
- #undef CC1_SPEC
- #define CC1_SPEC "%{profile:-p} %{G*}"
-diff -Naur gcc-4.4.0.orig/gcc/config/rs6000/ppc-asm.h gcc-4.4.0/gcc/config/rs6000/ppc-asm.h
---- gcc-4.4.0.orig/gcc/config/rs6000/ppc-asm.h	2008-10-13 08:44:26.000000000 -0700
-+++ gcc-4.4.0/gcc/config/rs6000/ppc-asm.h	2009-07-14 10:45:25.000000000 -0700
-@@ -172,7 +172,7 @@
- 	.size FUNC_NAME(name),GLUE(.L,name)-FUNC_NAME(name)
- #endif
- 
--#if defined __linux__ && !defined __powerpc64__
-+#if defined __linux__
- 	.section .note.GNU-stack
- 	.previous
- #endif
-diff -Naur gcc-4.4.0.orig/libffi/src/ia64/unix.S gcc-4.4.0/libffi/src/ia64/unix.S
---- gcc-4.4.0.orig/libffi/src/ia64/unix.S	2005-03-30 13:49:19.000000000 -0800
-+++ gcc-4.4.0/libffi/src/ia64/unix.S	2009-07-14 10:45:25.000000000 -0700
-@@ -553,3 +553,7 @@
- 	data8	@pcrel(.Lld_hfa_float)		// FFI_IA64_TYPE_HFA_FLOAT
- 	data8	@pcrel(.Lld_hfa_double)		// FFI_IA64_TYPE_HFA_DOUBLE
- 	data8	@pcrel(.Lld_hfa_ldouble)	// FFI_IA64_TYPE_HFA_LDOUBLE
-+
-+#if defined __ELF__ && defined __linux__
-+	.section	.note.GNU-stack,"",@progbits
-+#endif
-diff -Naur gcc-4.4.0.orig/libffi/src/powerpc/linux64_closure.S gcc-4.4.0/libffi/src/powerpc/linux64_closure.S
---- gcc-4.4.0.orig/libffi/src/powerpc/linux64_closure.S	2005-08-11 14:18:24.000000000 -0700
-+++ gcc-4.4.0/libffi/src/powerpc/linux64_closure.S	2009-07-14 10:45:25.000000000 -0700
-@@ -204,3 +204,7 @@
- 	.align 3
- .LEFDE1:
- #endif
-+
-+#if defined __ELF__ && defined __linux__
-+	.section	.note.GNU-stack,"",@progbits
-+#endif
-diff -Naur gcc-4.4.0.orig/libffi/src/powerpc/linux64.S gcc-4.4.0/libffi/src/powerpc/linux64.S
---- gcc-4.4.0.orig/libffi/src/powerpc/linux64.S	2007-11-16 15:24:53.000000000 -0800
-+++ gcc-4.4.0/libffi/src/powerpc/linux64.S	2009-07-14 10:45:25.000000000 -0700
-@@ -179,3 +179,7 @@
- 	.align 3
- .LEFDE1:
- #endif
-+
-+#if defined __ELF__ && defined __linux__
-+	.section	.note.GNU-stack,"",@progbits
-+#endif
-diff -Naur gcc-4.4.0.orig/src/boehm-gc/ia64_save_regs_in_stack.S gcc-4.4.0/src/boehm-gc/ia64_save_regs_in_stack.S
---- gcc-4.4.0.orig/src/boehm-gc/ia64_save_regs_in_stack.S	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.4.0/src/boehm-gc/ia64_save_regs_in_stack.S	2009-07-14 10:45:19.000000000 -0700
-@@ -0,0 +1,15 @@
-+        .text
-+        .align 16
-+        .global GC_save_regs_in_stack
-+        .proc GC_save_regs_in_stack
-+GC_save_regs_in_stack:
-+        .body
-+        flushrs
-+        ;;
-+        mov r8=ar.bsp
-+        br.ret.sptk.few rp
-+        .endp GC_save_regs_in_stack
-+
-+#ifdef __linux__
-+	.section .note.GNU-stack,"",@progbits
-+#endif
Index: ripts/patch/gcc/4.4.1/01-cloog-fixes.patch
===================================================================
--- scripts/patch/gcc/4.4.1/01-cloog-fixes.patch	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,173 +1,0 @@
-2009-01-27  Jakub Jelinek  <jakub@redhat.com>
-
-	* Makefile.in (BACKENDLIBS): Link against -ldl instead of -lcloog -lppl.
-	(graphite.o): Force -O, remove -fkeep-inline-functions.
-	* graphite.c: Include <dlfcn.h>.  Reference libcloog and libppl symbols
-	through pointers in cloog_pointers variable.
-	(init_cloog_pointers): New function.
-	(gcc_type_for_iv_of_clast_loop): Rename stmt_for argument to stmt_fora.
-	(graphite_transform_loops): Call init_cloog_pointers.
-
-diff -Naur gcc-4.4.0.orig/gcc/graphite.c gcc-4.4.0/gcc/graphite.c
---- gcc-4.4.0.orig/gcc/graphite.c	2009-03-18 09:59:55.000000000 -0700
-+++ gcc-4.4.0/gcc/graphite.c	2009-07-14 09:26:53.000000000 -0700
-@@ -59,6 +59,110 @@
- #include "cloog/cloog.h"
- #include "graphite.h"
- 
-+#include <dlfcn.h>
-+#define DYNSYMS \
-+  DYNSYM (cloog_block_alloc); \
-+  DYNSYM (cloog_block_list_free); \
-+  DYNSYM (cloog_block_list_malloc); \
-+  DYNSYM (cloog_clast_create); \
-+  DYNSYM (cloog_clast_free); \
-+  DYNSYM (cloog_domain_free); \
-+  DYNSYM (cloog_domain_matrix2domain); \
-+  DYNSYM (cloog_initialize); \
-+  DYNSYM (cloog_loop_malloc); \
-+  DYNSYM (cloog_matrix_alloc); \
-+  DYNSYM (cloog_matrix_copy); \
-+  DYNSYM (cloog_matrix_free); \
-+  DYNSYM (cloog_matrix_print); \
-+  DYNSYM (cloog_names_malloc); \
-+  DYNSYM (cloog_names_scalarize); \
-+  DYNSYM (cloog_options_free); \
-+  DYNSYM (cloog_options_malloc); \
-+  DYNSYM (cloog_program_dump_cloog); \
-+  DYNSYM (cloog_program_extract_scalars); \
-+  DYNSYM (cloog_program_free); \
-+  DYNSYM (cloog_program_generate); \
-+  DYNSYM (cloog_program_malloc); \
-+  DYNSYM (cloog_program_print); \
-+  DYNSYM (cloog_program_scatter); \
-+  DYNSYM (cloog_statement_alloc); \
-+  DYNSYM (ppl_finalize); \
-+  DYNSYM (pprint); \
-+  DYNSYM (stmt_block); \
-+  DYNSYM (stmt_for); \
-+  DYNSYM (stmt_guard); \
-+  DYNSYM (stmt_root); \
-+  DYNSYM (stmt_user);
-+static struct
-+{
-+  bool inited;
-+  void *h;
-+#define DYNSYM(x) __typeof (x) *p_##x
-+  DYNSYMS
-+#undef DYNSYM
-+} cloog_pointers;
-+
-+#define cloog_block_alloc (*cloog_pointers.p_cloog_block_alloc)
-+#define cloog_block_list_free (*cloog_pointers.p_cloog_block_list_free)
-+#define cloog_block_list_malloc (*cloog_pointers.p_cloog_block_list_malloc)
-+#define cloog_clast_create (*cloog_pointers.p_cloog_clast_create)
-+#define cloog_clast_free (*cloog_pointers.p_cloog_clast_free)
-+#define cloog_domain_free (*cloog_pointers.p_cloog_domain_free)
-+#define cloog_domain_matrix2domain (*cloog_pointers.p_cloog_domain_matrix2domain)
-+#define cloog_initialize (*cloog_pointers.p_cloog_initialize)
-+#define cloog_loop_malloc (*cloog_pointers.p_cloog_loop_malloc)
-+#define cloog_matrix_alloc (*cloog_pointers.p_cloog_matrix_alloc)
-+#define cloog_matrix_copy (*cloog_pointers.p_cloog_matrix_copy)
-+#define cloog_matrix_free (*cloog_pointers.p_cloog_matrix_free)
-+#define cloog_matrix_print (*cloog_pointers.p_cloog_matrix_print)
-+#define cloog_names_malloc (*cloog_pointers.p_cloog_names_malloc)
-+#define cloog_names_scalarize (*cloog_pointers.p_cloog_names_scalarize)
-+#define cloog_options_free (*cloog_pointers.p_cloog_options_free)
-+#define cloog_options_malloc (*cloog_pointers.p_cloog_options_malloc)
-+#define cloog_program_dump_cloog (*cloog_pointers.p_cloog_program_dump_cloog)
-+#define cloog_program_extract_scalars (*cloog_pointers.p_cloog_program_extract_scalars)
-+#define cloog_program_free (*cloog_pointers.p_cloog_program_free)
-+#define cloog_program_generate (*cloog_pointers.p_cloog_program_generate)
-+#define cloog_program_malloc (*cloog_pointers.p_cloog_program_malloc)
-+#define cloog_program_print (*cloog_pointers.p_cloog_program_print)
-+#define cloog_program_scatter (*cloog_pointers.p_cloog_program_scatter)
-+#define cloog_statement_alloc (*cloog_pointers.p_cloog_statement_alloc)
-+#define ppl_finalize (*cloog_pointers.p_ppl_finalize)
-+#define pprint (*cloog_pointers.p_pprint)
-+#define stmt_block (*cloog_pointers.p_stmt_block)
-+#define stmt_for (*cloog_pointers.p_stmt_for)
-+#define stmt_guard (*cloog_pointers.p_stmt_guard)
-+#define stmt_root (*cloog_pointers.p_stmt_root)
-+#define stmt_user (*cloog_pointers.p_stmt_user)
-+
-+#define cloog_finalize (*cloog_pointers.p_ppl_finalize)
-+
-+static bool
-+init_cloog_pointers (void)
-+{
-+  void *h;
-+
-+  if (cloog_pointers.inited)
-+    return cloog_pointers.h != NULL;
-+  h = dlopen ("libcloog.so.0", RTLD_LAZY);
-+  cloog_pointers.h = h;
-+  if (h == NULL)
-+    return false;
-+#define DYNSYM(x) \
-+  do \
-+    { \
-+      union { __typeof (cloog_pointers.p_##x) p; void *q; } u; \
-+      u.q = dlsym (h, #x); \
-+      if (u.q == NULL) \
-+	return false; \
-+      cloog_pointers.p_##x = u.p; \
-+    } \
-+  while (0)
-+  DYNSYMS
-+#undef DYNSYM
-+  return true;
-+}
-+
- static VEC (scop_p, heap) *current_scops;
- 
- /* Converts a GMP constant V to a tree and returns it.  */
-@@ -4075,10 +4179,10 @@
-    STMT.  */
- 
- static tree
--gcc_type_for_iv_of_clast_loop (struct clast_for *stmt_for)
-+gcc_type_for_iv_of_clast_loop (struct clast_for *stmt_fora)
- {
--  struct clast_user_stmt *stmt = clast_get_body_of_loop ((struct clast_stmt *) stmt_for);
--  const char *cloog_iv = stmt_for->iterator;
-+  struct clast_user_stmt *stmt = clast_get_body_of_loop ((struct clast_stmt *) stmt_fora);
-+  const char *cloog_iv = stmt_fora->iterator;
-   CloogStatement *cs = stmt->statement;
-   graphite_bb_p gbb = (graphite_bb_p) cloog_statement_usr (cs);
- 
-@@ -6109,6 +6213,12 @@
-   if (number_of_loops () <= 1)
-     return;
- 
-+  if (!init_cloog_pointers ())
-+    {
-+      sorry ("Graphite loop optimizations cannot be used");
-+      return;
-+    }
-+
-   current_scops = VEC_alloc (scop_p, heap, 3);
-   recompute_all_dominators ();
- 
-diff -Naur gcc-4.4.0.orig/gcc/Makefile.in gcc-4.4.0/gcc/Makefile.in
---- gcc-4.4.0.orig/gcc/Makefile.in	2009-07-14 09:25:46.000000000 -0700
-+++ gcc-4.4.0/gcc/Makefile.in	2009-07-14 09:26:53.000000000 -0700
-@@ -914,7 +914,7 @@
- # How to link with both our special library facilities
- # and the system's installed libraries.
- LIBS = @LIBS@ $(CPPLIB) $(LIBINTL) $(LIBICONV) $(LIBIBERTY) $(LIBDECNUMBER)
--BACKENDLIBS = $(CLOOGLIBS) $(PPLLIBS) $(GMPLIBS)
-+BACKENDLIBS = $(GMPLIBS) $(if $(CLOOGLIBS),-ldl)
- # Any system libraries needed just for GNAT.
- SYSLIBS = @GNAT_LIBEXC@
- 
-@@ -3061,6 +3061,9 @@
- 	$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) \
- 		$(out_file) $(OUTPUT_OPTION)
- 
-+graphite.o : \
-+  ALL_CFLAGS := -O $(filter-out -fkeep-inline-functions, $(ALL_CFLAGS))
-+
- # Build auxiliary files that support ecoff format.
- mips-tfile: mips-tfile.o version.o $(LIBDEPS)
- 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ mips-tfile.o version.o $(LIBS)
Index: ripts/patch/gcc/4.4.1/05-java-fixes.patch
===================================================================
--- scripts/patch/gcc/4.4.1/05-java-fixes.patch	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,49 +1,0 @@
-Java can only be built as 1 ABI at the moment. So this switch will all
-the disabling of only the java multilib build
-
-diff -Naur gcc-4.4.0.orig/libjava/configure gcc-4.4.0/libjava/configure
---- gcc-4.4.0.orig/libjava/configure	2009-07-14 09:25:46.000000000 -0700
-+++ gcc-4.4.0/libjava/configure	2009-07-14 09:33:34.000000000 -0700
-@@ -1021,6 +1021,8 @@
-                           default=yes
-   --enable-java-maintainer-mode
-                           allow rebuilding of .class and .h files
-+  --enable-libjava-multilib
-+                          build libjava as multilib
-   --disable-dependency-tracking  speeds up one-time build
-   --enable-dependency-tracking   do not reject slow dependency extractors
-   --enable-maintainer-mode  enable make rules and dependencies not useful
-@@ -1973,6 +1975,16 @@
- fi
- 
- 
-+# Check whether --enable-libjava-multilib was given.
-+if test "${enable_libjava_multilib+set}" = set; then
-+  enableval=$enable_libjava_multilib;
-+fi
-+
-+if test "$enable_libjava_multilib" = no; then
-+  multilib=no
-+  ac_configure_args="$ac_configure_args --disable-multilib"
-+fi
-+
- # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
- 
- 
-diff -Naur gcc-4.4.0.orig/libjava/configure.ac gcc-4.4.0/libjava/configure.ac
---- gcc-4.4.0.orig/libjava/configure.ac	2009-07-14 09:25:46.000000000 -0700
-+++ gcc-4.4.0/libjava/configure.ac	2009-07-14 09:33:34.000000000 -0700
-@@ -139,6 +139,13 @@
- 	[allow rebuilding of .class and .h files]))
- AM_CONDITIONAL(JAVA_MAINTAINER_MODE, test "$enable_java_maintainer_mode" = yes)
- 
-+AC_ARG_ENABLE(libjava-multilib,
-+	AS_HELP_STRING([--enable-libjava-multilib], [build libjava as multilib]))
-+if test "$enable_libjava_multilib" = no; then
-+  multilib=no
-+  ac_configure_args="$ac_configure_args --disable-multilib"
-+fi
-+
- # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
- GCC_NO_EXECUTABLES
- 
Index: ripts/patch/gcc/4.4.1/10-libgomp_multilib-fixes.patch
===================================================================
--- scripts/patch/gcc/4.4.1/10-libgomp_multilib-fixes.patch	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,18 +1,0 @@
-2008-06-09  Jakub Jelinek  <jakub@redhat.com>
-
-	* omp.h.in (omp_nest_lock_t): Fix up for Linux multilibs.
-
-diff -Naur gcc-4.4.0.orig/libgomp/omp.h.in gcc-4.4.0/libgomp/omp.h.in
---- gcc-4.4.0.orig/libgomp/omp.h.in	2009-04-09 16:23:07.000000000 -0700
-+++ gcc-4.4.0/libgomp/omp.h.in	2009-07-14 09:41:08.000000000 -0700
-@@ -39,8 +39,8 @@
- 
- typedef struct
- {
--  unsigned char _x[@OMP_NEST_LOCK_SIZE@] 
--    __attribute__((__aligned__(@OMP_NEST_LOCK_ALIGN@)));
-+  unsigned char _x[8 + sizeof (void *)] 
-+    __attribute__((__aligned__(sizeof (void *))));
- } omp_nest_lock_t;
- #endif
- 
Index: ripts/patch/gcc/4.4.1/15-libtool-fixes.patch
===================================================================
--- scripts/patch/gcc/4.4.1/15-libtool-fixes.patch	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,29 +1,0 @@
-This patch works around rpath in GCC
-
-diff -Naur gcc-4.4.0.orig/ltmain.sh gcc-4.4.0/ltmain.sh
---- gcc-4.4.0.orig/ltmain.sh	2008-09-26 09:21:02.000000000 -0700
-+++ gcc-4.4.0/ltmain.sh	2009-07-14 10:03:39.000000000 -0700
-@@ -6886,6 +6886,7 @@
- 	  rpath="$finalize_rpath"
- 	  test "$mode" != relink && rpath="$compile_rpath$rpath"
- 	  for libdir in $rpath; do
-+	    case "$libdir" in /usr/lib|/usr/lib64|/usr/lib/../lib|/usr/lib/../lib64) continue;; esac
- 	    if test -n "$hardcode_libdir_flag_spec"; then
- 	      if test -n "$hardcode_libdir_separator"; then
- 		if test -z "$hardcode_libdirs"; then
-@@ -7575,6 +7576,7 @@
-       rpath=
-       hardcode_libdirs=
-       for libdir in $compile_rpath $finalize_rpath; do
-+	case "$libdir" in /usr/lib|/usr/lib64|/usr/lib/../lib|/usr/lib/../lib64) continue;; esac
- 	if test -n "$hardcode_libdir_flag_spec"; then
- 	  if test -n "$hardcode_libdir_separator"; then
- 	    if test -z "$hardcode_libdirs"; then
-@@ -7626,6 +7628,7 @@
-       rpath=
-       hardcode_libdirs=
-       for libdir in $finalize_rpath; do
-+	case "$libdir" in /usr/lib|/usr/lib64|/usr/lib/../lib|/usr/lib/../lib64) continue;; esac
- 	if test -n "$hardcode_libdir_flag_spec"; then
- 	  if test -n "$hardcode_libdir_separator"; then
- 	    if test -z "$hardcode_libdirs"; then
Index: ripts/patch/gcc/4.4.1/20-powerpc-biarch.patch
===================================================================
--- scripts/patch/gcc/4.4.1/20-powerpc-biarch.patch	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,24 +1,0 @@
-This patch works changes the biarch of PPC to the match other archs
-
-diff -Naur gcc-4.4.0.orig/gcc/config/rs6000/t-linux64 gcc-4.4.0/gcc/config/rs6000/t-linux64
---- gcc-4.4.0.orig/gcc/config/rs6000/t-linux64	2007-09-27 12:56:06.000000000 -0700
-+++ gcc-4.4.0/gcc/config/rs6000/t-linux64	2009-07-14 10:14:54.000000000 -0700
-@@ -14,13 +14,13 @@
- # it doesn't tell anything about the 32bit libraries on those systems.  Set
- # MULTILIB_OSDIRNAMES according to what is found on the target.
- 
--MULTILIB_OPTIONS        = m64/m32 msoft-float
-+MULTILIB_OPTIONS        = m64/m32
- MULTILIB_DIRNAMES       = 64 32 nof
- MULTILIB_EXTRA_OPTS     = fPIC mstrict-align
--MULTILIB_EXCEPTIONS     = m64/msoft-float
--MULTILIB_EXCLUSIONS     = m64/!m32/msoft-float
--MULTILIB_OSDIRNAMES	= ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) nof
--MULTILIB_MATCHES        = $(MULTILIB_MATCHES_FLOAT)
-+MULTILIB_EXCEPTIONS     =
-+MULTILIB_EXCLUSIONS     =
-+MULTILIB_OSDIRNAMES	= ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
-+MULTILIB_MATCHES        = 
- 
- softfp_wrap_start := '\#ifndef __powerpc64__'
- softfp_wrap_end := '\#endif'
Index: ripts/patch/gcc/4.4.1/25-hash-style.patch
===================================================================
--- scripts/patch/gcc/4.4.1/25-hash-style.patch	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,145 +1,0 @@
-2006-07-11  Jakub Jelinek  <jakub@redhat.com>
-
-	* config/i386/linux.h (LINK_SPEC): Add --hash-style=both.
-	* config/i386/linux64.h (LINK_SPEC): Likewise.
-	* config/rs6000/sysv4.h (LINK_OS_LINUX_SPEC): Likewise.
-	* config/rs6000/linux64.h (LINK_OS_LINUX_SPEC32,
-	LINK_OS_LINUX_SPEC64): Likewise.
-	* config/s390/linux.h (LINK_SPEC): Likewise.
-	* config/ia64/linux.h (LINK_SPEC): Likewise.
-	* config/sparc/linux.h (LINK_SPEC): Likewise.
-	* config/sparc/linux64.h (LINK_SPEC, LINK_ARCH32_SPEC,
-	LINK_ARCH64_SPEC): Likewise.
-	* config/alpha/linux-elf.h (LINK_SPEC): Likewise.
-
-diff -Naur gcc-4.4.0.orig/gcc/config/alpha/linux-elf.h gcc-4.4.0/gcc/config/alpha/linux-elf.h
---- gcc-4.4.0.orig/gcc/config/alpha/linux-elf.h	2007-08-02 03:49:31.000000000 -0700
-+++ gcc-4.4.0/gcc/config/alpha/linux-elf.h	2009-07-14 10:22:11.000000000 -0700
-@@ -39,7 +39,7 @@
- 
- #define ELF_DYNAMIC_LINKER	LINUX_DYNAMIC_LINKER
- 
--#define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax}		\
-+#define LINK_SPEC "-m elf64alpha --hash-style=both %{G*} %{relax:-relax}	\
-   %{O*:-O3} %{!O*:-O1}						\
-   %{shared:-shared}						\
-   %{!shared:							\
-diff -Naur gcc-4.4.0.orig/gcc/config/i386/linux64.h gcc-4.4.0/gcc/config/i386/linux64.h
---- gcc-4.4.0.orig/gcc/config/i386/linux64.h	2009-04-09 16:23:07.000000000 -0700
-+++ gcc-4.4.0/gcc/config/i386/linux64.h	2009-07-14 10:22:11.000000000 -0700
-@@ -75,7 +75,7 @@
- #endif
- 
- #undef	LINK_SPEC
--#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} \
-+#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} --hash-style=both \
-   %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
-diff -Naur gcc-4.4.0.orig/gcc/config/i386/linux.h gcc-4.4.0/gcc/config/i386/linux.h
---- gcc-4.4.0.orig/gcc/config/i386/linux.h	2009-07-14 09:25:45.000000000 -0700
-+++ gcc-4.4.0/gcc/config/i386/linux.h	2009-07-14 10:22:11.000000000 -0700
-@@ -113,7 +113,7 @@
-   { "dynamic_linker", LINUX_DYNAMIC_LINKER }
- 
- #undef	LINK_SPEC
--#define LINK_SPEC "-m %(link_emulation) %{shared:-shared} \
-+#define LINK_SPEC "-m %(link_emulation) --hash-style=both %{shared:-shared} \
-   %{!shared: \
-     %{!ibcs: \
-       %{!static: \
-diff -Naur gcc-4.4.0.orig/gcc/config/ia64/linux.h gcc-4.4.0/gcc/config/ia64/linux.h
---- gcc-4.4.0.orig/gcc/config/ia64/linux.h	2009-02-12 08:30:53.000000000 -0800
-+++ gcc-4.4.0/gcc/config/ia64/linux.h	2009-07-14 10:22:11.000000000 -0700
-@@ -40,7 +40,7 @@
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2"
- 
- #undef LINK_SPEC
--#define LINK_SPEC "\
-+#define LINK_SPEC "--hash-style=both \
-   %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
-diff -Naur gcc-4.4.0.orig/gcc/config/rs6000/linux64.h gcc-4.4.0/gcc/config/rs6000/linux64.h
---- gcc-4.4.0.orig/gcc/config/rs6000/linux64.h	2009-04-09 16:23:07.000000000 -0700
-+++ gcc-4.4.0/gcc/config/rs6000/linux64.h	2009-07-14 10:22:11.000000000 -0700
-@@ -357,11 +357,11 @@
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64)
- 
- 
--#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \
-   %{rdynamic:-export-dynamic} \
-   %{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER32 "}}}"
- 
--#define LINK_OS_LINUX_SPEC64 "-m elf64ppc %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC64 "-m elf64ppc --hash-style=both %{!shared: %{!static: \
-   %{rdynamic:-export-dynamic} \
-   %{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER64 "}}}"
- 
-diff -Naur gcc-4.4.0.orig/gcc/config/rs6000/sysv4.h gcc-4.4.0/gcc/config/rs6000/sysv4.h
---- gcc-4.4.0.orig/gcc/config/rs6000/sysv4.h	2009-04-09 16:23:07.000000000 -0700
-+++ gcc-4.4.0/gcc/config/rs6000/sysv4.h	2009-07-14 10:22:11.000000000 -0700
-@@ -911,7 +911,7 @@
- #define LINUX_DYNAMIC_LINKER \
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
- 
--#define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \
-   %{rdynamic:-export-dynamic} \
-   %{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER "}}}"
- 
-diff -Naur gcc-4.4.0.orig/gcc/config/s390/linux.h gcc-4.4.0/gcc/config/s390/linux.h
---- gcc-4.4.0.orig/gcc/config/s390/linux.h	2007-08-02 03:49:31.000000000 -0700
-+++ gcc-4.4.0/gcc/config/s390/linux.h	2009-07-14 10:22:11.000000000 -0700
-@@ -77,7 +77,7 @@
- 
- #undef  LINK_SPEC
- #define LINK_SPEC \
--  "%{m31:-m elf_s390}%{m64:-m elf64_s390} \
-+  "%{m31:-m elf_s390}%{m64:-m elf64_s390} --hash-style=both \
-    %{shared:-shared} \
-    %{!shared: \
-       %{static:-static} \
-diff -Naur gcc-4.4.0.orig/gcc/config/sparc/linux64.h gcc-4.4.0/gcc/config/sparc/linux64.h
---- gcc-4.4.0.orig/gcc/config/sparc/linux64.h	2009-02-20 07:20:38.000000000 -0800
-+++ gcc-4.4.0/gcc/config/sparc/linux64.h	2009-07-14 10:22:11.000000000 -0700
-@@ -121,7 +121,7 @@
-   { "link_arch_default", LINK_ARCH_DEFAULT_SPEC },	  \
-   { "link_arch",	 LINK_ARCH_SPEC },
- 
--#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/usr/lib %{shared:-shared} \
-+#define LINK_ARCH32_SPEC "-m elf32_sparc --hash-style=both -Y P,%R/usr/lib %{shared:-shared} \
-   %{!shared: \
-     %{!ibcs: \
-       %{!static: \
-@@ -130,7 +130,7 @@
-         %{static:-static}}} \
- "
- 
--#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
-+#define LINK_ARCH64_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \
-   %{!shared: \
-     %{!ibcs: \
-       %{!static: \
-@@ -211,7 +211,7 @@
- #else /* !SPARC_BI_ARCH */
- 
- #undef LINK_SPEC
--#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
-+#define LINK_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \
-   %{!shared: \
-     %{!ibcs: \
-       %{!static: \
-diff -Naur gcc-4.4.0.orig/gcc/config/sparc/linux.h gcc-4.4.0/gcc/config/sparc/linux.h
---- gcc-4.4.0.orig/gcc/config/sparc/linux.h	2009-02-20 07:20:38.000000000 -0800
-+++ gcc-4.4.0/gcc/config/sparc/linux.h	2009-07-14 10:22:11.000000000 -0700
-@@ -86,7 +86,7 @@
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
- 
- #undef  LINK_SPEC
--#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
-+#define LINK_SPEC "-m elf32_sparc --hash-style=both -Y P,/usr/lib %{shared:-shared} \
-   %{!mno-relax:%{!r:-relax}} \
-   %{!shared: \
-     %{!ibcs: \
Index: ripts/patch/gcc/4.4.1/30-note-gnu-stack.patch
===================================================================
--- scripts/patch/gcc/4.4.1/30-note-gnu-stack.patch	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,217 +1,0 @@
-# DP: Add .note.GNU-stack sections for gcc's crt files, libffi and boehm-gc
-# DP: Taken from FC.
-
-gcc/
-
-2004-09-20  Jakub Jelinek  <jakub@redhat.com>
-
-	* config/rs6000/ppc-asm.h: Add .note.GNU-stack section also
-	on ppc64-linux.
-
-	* config/ia64/lib1funcs.asm: Add .note.GNU-stack section on
-	ia64-linux.
-	* config/ia64/crtbegin.asm: Likewise.
-	* config/ia64/crtend.asm: Likewise.
-	* config/ia64/crti.asm: Likewise.
-	* config/ia64/crtn.asm: Likewise.
-
-2004-05-14  Jakub Jelinek  <jakub@redhat.com>
-
-	* config/ia64/linux.h (TARGET_ASM_FILE_END): Define.
-
-boehm-gc/
-
-2005-02-08  Jakub Jelinek  <jakub@redhat.com>
-
-	* ia64_save_regs_in_stack.s: Moved to...
-	* ia64_save_regs_in_stack.S: ... this.  Add .note.GNU-stack
-	on Linux.
-
-libffi/
-
-2007-05-11  Daniel Jacobowitz  <dan@debian.org>
-
-	* src/arm/sysv.S: Fix ARM comment marker.
-
-2005-02-08  Jakub Jelinek  <jakub@redhat.com>
-
-	* src/alpha/osf.S: Add .note.GNU-stack on Linux.
-	* src/s390/sysv.S: Likewise.
-	* src/powerpc/linux64.S: Likewise.
-	* src/powerpc/linux64_closure.S: Likewise.
-	* src/powerpc/ppc_closure.S: Likewise.
-	* src/powerpc/sysv.S: Likewise.
-	* src/x86/unix64.S: Likewise.
-	* src/x86/sysv.S: Likewise.
-	* src/sparc/v8.S: Likewise.
-	* src/sparc/v9.S: Likewise.
-	* src/m68k/sysv.S: Likewise.
-	* src/ia64/unix.S: Likewise.
-	* src/arm/sysv.S: Likewise.
-
-diff -Naur gcc-4.4.0.orig/boehm-gc/ia64_save_regs_in_stack.s gcc-4.4.0/boehm-gc/ia64_save_regs_in_stack.s
---- gcc-4.4.0.orig/boehm-gc/ia64_save_regs_in_stack.s	2001-10-14 21:57:59.000000000 -0700
-+++ gcc-4.4.0/boehm-gc/ia64_save_regs_in_stack.s	2009-07-14 10:45:25.000000000 -0700
-@@ -1,12 +0,0 @@
--        .text
--        .align 16
--        .global GC_save_regs_in_stack
--        .proc GC_save_regs_in_stack
--GC_save_regs_in_stack:
--        .body
--        flushrs
--        ;;
--        mov r8=ar.bsp
--        br.ret.sptk.few rp
--        .endp GC_save_regs_in_stack
--
-diff -Naur gcc-4.4.0.orig/boehm-gc/ia64_save_regs_in_stack.S gcc-4.4.0/boehm-gc/ia64_save_regs_in_stack.S
---- gcc-4.4.0.orig/boehm-gc/ia64_save_regs_in_stack.S	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.4.0/boehm-gc/ia64_save_regs_in_stack.S	2009-07-14 10:45:25.000000000 -0700
-@@ -0,0 +1,15 @@
-+        .text
-+        .align 16
-+        .global GC_save_regs_in_stack
-+        .proc GC_save_regs_in_stack
-+GC_save_regs_in_stack:
-+        .body
-+        flushrs
-+        ;;
-+        mov r8=ar.bsp
-+        br.ret.sptk.few rp
-+        .endp GC_save_regs_in_stack
-+
-+#ifdef __linux__
-+	.section .note.GNU-stack,"",@progbits
-+#endif
-diff -Naur gcc-4.4.0.orig/gcc/config/ia64/crtbegin.asm gcc-4.4.0/gcc/config/ia64/crtbegin.asm
---- gcc-4.4.0.orig/gcc/config/ia64/crtbegin.asm	2009-04-09 16:23:07.000000000 -0700
-+++ gcc-4.4.0/gcc/config/ia64/crtbegin.asm	2009-07-14 10:45:25.000000000 -0700
-@@ -252,3 +252,7 @@
- .weak __cxa_finalize
- #endif
- .weak _Jv_RegisterClasses
-+
-+#ifdef __linux__
-+.section .note.GNU-stack; .previous
-+#endif
-diff -Naur gcc-4.4.0.orig/gcc/config/ia64/crtend.asm gcc-4.4.0/gcc/config/ia64/crtend.asm
---- gcc-4.4.0.orig/gcc/config/ia64/crtend.asm	2009-04-09 16:23:07.000000000 -0700
-+++ gcc-4.4.0/gcc/config/ia64/crtend.asm	2009-07-14 10:45:25.000000000 -0700
-@@ -119,3 +119,7 @@
- 
- 	br.ret.sptk.many rp
- 	.endp __do_global_ctors_aux
-+
-+#ifdef __linux__
-+.section .note.GNU-stack; .previous
-+#endif
-diff -Naur gcc-4.4.0.orig/gcc/config/ia64/crti.asm gcc-4.4.0/gcc/config/ia64/crti.asm
---- gcc-4.4.0.orig/gcc/config/ia64/crti.asm	2009-04-09 16:23:07.000000000 -0700
-+++ gcc-4.4.0/gcc/config/ia64/crti.asm	2009-07-14 10:45:25.000000000 -0700
-@@ -51,3 +51,7 @@
- 	.body
- 
- # end of crti.asm
-+
-+#ifdef __linux__
-+.section .note.GNU-stack; .previous
-+#endif
-diff -Naur gcc-4.4.0.orig/gcc/config/ia64/crtn.asm gcc-4.4.0/gcc/config/ia64/crtn.asm
---- gcc-4.4.0.orig/gcc/config/ia64/crtn.asm	2009-04-09 16:23:07.000000000 -0700
-+++ gcc-4.4.0/gcc/config/ia64/crtn.asm	2009-07-14 10:45:25.000000000 -0700
-@@ -41,3 +41,7 @@
- 	br.ret.sptk.many b0
- 
- # end of crtn.asm
-+
-+#ifdef __linux__
-+.section .note.GNU-stack; .previous
-+#endif
-diff -Naur gcc-4.4.0.orig/gcc/config/ia64/lib1funcs.asm gcc-4.4.0/gcc/config/ia64/lib1funcs.asm
---- gcc-4.4.0.orig/gcc/config/ia64/lib1funcs.asm	2009-04-09 16:23:07.000000000 -0700
-+++ gcc-4.4.0/gcc/config/ia64/lib1funcs.asm	2009-07-14 10:45:25.000000000 -0700
-@@ -793,3 +793,7 @@
- 	.endp __floattitf
- #endif
- #endif
-+
-+#ifdef __linux__
-+.section .note.GNU-stack; .previous
-+#endif
-diff -Naur gcc-4.4.0.orig/gcc/config/ia64/linux.h gcc-4.4.0/gcc/config/ia64/linux.h
---- gcc-4.4.0.orig/gcc/config/ia64/linux.h	2009-02-12 08:30:53.000000000 -0800
-+++ gcc-4.4.0/gcc/config/ia64/linux.h	2009-07-14 10:45:25.000000000 -0700
-@@ -5,6 +5,8 @@
- 
- #define TARGET_VERSION fprintf (stderr, " (IA-64) Linux");
- 
-+#define TARGET_ASM_FILE_END file_end_indicate_exec_stack
-+
- /* This is for -profile to use -lc_p instead of -lc.  */
- #undef CC1_SPEC
- #define CC1_SPEC "%{profile:-p} %{G*}"
-diff -Naur gcc-4.4.0.orig/gcc/config/rs6000/ppc-asm.h gcc-4.4.0/gcc/config/rs6000/ppc-asm.h
---- gcc-4.4.0.orig/gcc/config/rs6000/ppc-asm.h	2008-10-13 08:44:26.000000000 -0700
-+++ gcc-4.4.0/gcc/config/rs6000/ppc-asm.h	2009-07-14 10:45:25.000000000 -0700
-@@ -172,7 +172,7 @@
- 	.size FUNC_NAME(name),GLUE(.L,name)-FUNC_NAME(name)
- #endif
- 
--#if defined __linux__ && !defined __powerpc64__
-+#if defined __linux__
- 	.section .note.GNU-stack
- 	.previous
- #endif
-diff -Naur gcc-4.4.0.orig/libffi/src/ia64/unix.S gcc-4.4.0/libffi/src/ia64/unix.S
---- gcc-4.4.0.orig/libffi/src/ia64/unix.S	2005-03-30 13:49:19.000000000 -0800
-+++ gcc-4.4.0/libffi/src/ia64/unix.S	2009-07-14 10:45:25.000000000 -0700
-@@ -553,3 +553,7 @@
- 	data8	@pcrel(.Lld_hfa_float)		// FFI_IA64_TYPE_HFA_FLOAT
- 	data8	@pcrel(.Lld_hfa_double)		// FFI_IA64_TYPE_HFA_DOUBLE
- 	data8	@pcrel(.Lld_hfa_ldouble)	// FFI_IA64_TYPE_HFA_LDOUBLE
-+
-+#if defined __ELF__ && defined __linux__
-+	.section	.note.GNU-stack,"",@progbits
-+#endif
-diff -Naur gcc-4.4.0.orig/libffi/src/powerpc/linux64_closure.S gcc-4.4.0/libffi/src/powerpc/linux64_closure.S
---- gcc-4.4.0.orig/libffi/src/powerpc/linux64_closure.S	2005-08-11 14:18:24.000000000 -0700
-+++ gcc-4.4.0/libffi/src/powerpc/linux64_closure.S	2009-07-14 10:45:25.000000000 -0700
-@@ -204,3 +204,7 @@
- 	.align 3
- .LEFDE1:
- #endif
-+
-+#if defined __ELF__ && defined __linux__
-+	.section	.note.GNU-stack,"",@progbits
-+#endif
-diff -Naur gcc-4.4.0.orig/libffi/src/powerpc/linux64.S gcc-4.4.0/libffi/src/powerpc/linux64.S
---- gcc-4.4.0.orig/libffi/src/powerpc/linux64.S	2007-11-16 15:24:53.000000000 -0800
-+++ gcc-4.4.0/libffi/src/powerpc/linux64.S	2009-07-14 10:45:25.000000000 -0700
-@@ -179,3 +179,7 @@
- 	.align 3
- .LEFDE1:
- #endif
-+
-+#if defined __ELF__ && defined __linux__
-+	.section	.note.GNU-stack,"",@progbits
-+#endif
-diff -Naur gcc-4.4.0.orig/src/boehm-gc/ia64_save_regs_in_stack.S gcc-4.4.0/src/boehm-gc/ia64_save_regs_in_stack.S
---- gcc-4.4.0.orig/src/boehm-gc/ia64_save_regs_in_stack.S	1969-12-31 16:00:00.000000000 -0800
-+++ gcc-4.4.0/src/boehm-gc/ia64_save_regs_in_stack.S	2009-07-14 10:45:19.000000000 -0700
-@@ -0,0 +1,15 @@
-+        .text
-+        .align 16
-+        .global GC_save_regs_in_stack
-+        .proc GC_save_regs_in_stack
-+GC_save_regs_in_stack:
-+        .body
-+        flushrs
-+        ;;
-+        mov r8=ar.bsp
-+        br.ret.sptk.few rp
-+        .endp GC_save_regs_in_stack
-+
-+#ifdef __linux__
-+	.section .note.GNU-stack,"",@progbits
-+#endif
Index: ripts/patch/gcc/4.4.1/35-boemhm-ppc.patch
===================================================================
--- scripts/patch/gcc/4.4.1/35-boemhm-ppc.patch	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,73 +1,0 @@
-Fixes 
-In file included from /var/build_system/work/gcc-4.4.1/boehm-gc/include/private/gc_priv.h:98,
-                 from /var/build_system/work/gcc-4.4.1/boehm-gc/alloc.c:19:
-/var/build_system/work/gcc-4.4.1/boehm-gc/include/private/gc_locks.h: In function âGC_test_and_setâ:
-/var/build_system/work/gcc-4.4.1/boehm-gc/include/private/gc_locks.h:165: error: âasmâ operand has impossible constraints
-make[3]: *** [alloc.lo] Error 1
-make[3]: Leaving directory `/var/build_system/work/gcc-build/powerpc-unknown-linux-gnu/boehm-gc'
-make[2]: *** [all-recursive] Error 1
-
---- trunk/boehm-gc/include/private/gc_locks.h	2008/07/23 11:06:42	138078
-+++ trunk/boehm-gc/include/private/gc_locks.h	2009/07/23 16:05:37	150018
-@@ -139,49 +139,35 @@
- #      define GC_TEST_AND_SET_DEFINED
- #    endif
- #    if defined(POWERPC)
--#     if 0 /* CPP_WORDSZ == 64  totally broken to use int locks with ldarx */
--        inline static int GC_test_and_set(volatile unsigned int *addr) {
--          unsigned long oldval;
--          unsigned long temp = 1; /* locked value */
--
--          __asm__ __volatile__(
--               "1:\tldarx %0,0,%3\n"   /* load and reserve               */
--               "\tcmpdi %0, 0\n"       /* if load is                     */
--               "\tbne 2f\n"            /*   non-zero, return already set */
--               "\tstdcx. %2,0,%1\n"    /* else store conditional         */
--               "\tbne- 1b\n"           /* retry if lost reservation      */
--               "\tsync\n"              /* import barrier                 */
--               "2:\t\n"                /* oldval is zero if we set       */
--              : "=&r"(oldval), "=p"(addr)
--              : "r"(temp), "1"(addr)
--              : "cr0","memory");
--          return (int)oldval;
--        }
-+#     define GC_TEST_AND_SET_DEFINED
-+#     define GC_CLEAR_DEFINED
-+#     if (__GNUC__>4)||((__GNUC__==4)&&(__GNUC_MINOR__>=4))
-+#       define GC_test_and_set(addr) __sync_lock_test_and_set (addr, 1)
-+#       define GC_clear(addr) __sync_lock_release (addr)
- #     else
-         inline static int GC_test_and_set(volatile unsigned int *addr) {
-           int oldval;
-           int temp = 1; /* locked value */
- 
-           __asm__ __volatile__(
--               "1:\tlwarx %0,0,%3\n"   /* load and reserve               */
-+               "\n1:\n"
-+	       "\tlwarx %0,%y3\n"      /* load and reserve, 32-bits      */
-                "\tcmpwi %0, 0\n"       /* if load is                     */
-                "\tbne 2f\n"            /*   non-zero, return already set */
--               "\tstwcx. %2,0,%1\n"    /* else store conditional         */
-+               "\tstwcx. %2,%y3\n"     /* else store conditional         */
-                "\tbne- 1b\n"           /* retry if lost reservation      */
-                "\tsync\n"              /* import barrier                 */
-                "2:\t\n"                /* oldval is zero if we set       */
--              : "=&r"(oldval), "=p"(addr)
--              : "r"(temp), "1"(addr)
-+              : "=&r"(oldval), "=m"(addr)
-+              : "r"(temp), "Z"(addr)
-               : "cr0","memory");
-           return oldval;
-         }
--#     endif
--#     define GC_TEST_AND_SET_DEFINED
-       inline static void GC_clear(volatile unsigned int *addr) {
- 	__asm__ __volatile__("lwsync" : : : "memory");
-         *(addr) = 0;
-       }
--#     define GC_CLEAR_DEFINED
-+#    endif
- #    endif
- #    if defined(ALPHA) 
-         inline static int GC_test_and_set(volatile unsigned int * addr)
-
Index: ripts/patch/ncurses-patch.sh
===================================================================
--- scripts/patch/ncurses-patch.sh	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,70 +1,0 @@
-#!/bin/sh
-# Jonathan Norman
-
-# Ncurses branch update patch generator
-
-VERSION=$1
-
-# Check Input
-#
-if [ "${VERSION}" = "" ]; then
-  echo "$0 [ncurses_version]"
-  echo "This will Create a Patch for ncurses ncurses_Version"
-  exit 255
-fi
-
-TMP=~/tmp/ncurses-${VERSION}
-PATCHDIR=${TMP}/patches
-PATCHURL=ftp://invisible-island.net/ncurses/
-SERIES=$(echo ${VERSION} | sed -e 's/\.//g')
-CLFS_PATCHS=http://patches.cross-lfs.org/dev/
-
-# Figure out patch number
-UPDATE_NUM=0
-UPDATE_NUM=$(curl -ls http://patches.cross-lfs.org/dev/ | grep ncurses-${VERSION}-branch_update | cut -d . -f 3 | cut -d - -f 3-)
-UPDATE_NUM=$(expr ${UPDATE_NUM} + 1)
-
-# Download patches
-echo "Downloading patches for Ncurses ${VERSION}"
-FILES=$(curl -sl ftp://invisible-island.net/ncurses/${VERSION}/ | grep patch | grep -v bz2 | grep -v asc)
-mkdir -p $PATCHDIR
-cd $PATCHDIR
-for FILE in $FILES; do
-	curl -O -# $PATCHURL/$VERSION/$FILE
-done
-
-
-echo "Downloading source for Ncurses $VERSION"
-cd $TMP
-curl -sO ftp://invisible-island.net/ncurses/ncurses-${VERSION}.tar.gz
-tar -xvf ncurses-${VERSION}.tar.gz
-cp -R ncurses-${VERSION} ncurses-${VERSION}.orig
-
-echo -n "Generating Patch..."
-cd ncurses-${VERSION}
-
-gunzip -c $PATCHDIR/*.sh.gz | sh
-for PATCH in $(ls $PATCHDIR | grep patch.gz); do
-	gunzip -c $PATCHDIR/$PATCH | patch -Np1
-done
-
-cd $TMP
-
-DATE=$(ls $PATCHDIR | tail -n1 | cut -d- -f3 | cut -d. -f1);
-
-# Create patch
-echo "Submitted By: Jonathan Norman (jonathan at bluesquarelinux dot co dot uk)" > ncurses-${VERSION}-branch_update-$UPDATE_NUM.patch
-echo "Date: `date +%Y-%m-%d`" >> ncurses-${VERSION}-branch_update-$UPDATE_NUM.patch
-echo "Initial Package Version: ${VERSION}" >> ncurses-${VERSION}-branch_update-$UPDATE_NUM.patch
-echo "Origin: Upstream" >> ncurses-${VERSION}-branch_update-$UPDATE_NUM.patch
-echo "Upstream Status: Applied" >> ncurses-${VERSION}-branch_update-$UPDATE_NUM.patch
-echo "Description: Contains all upstream patches up to ${VERSION}-${DATE}" >> ncurses-${VERSION}-branch_update-$UPDATE_NUM.patch
-echo "" >> ncurses-${VERSION}-branch_update-$UPDATE_NUM.patch
-
-LC_ALL=C TZ=UTC0 diff -Naur ncurses-${VERSION}.orig ncurses-${VERSION} >> ncurses-${VERSION}-branch_update-$UPDATE_NUM.patch
-
-echo "Done"
-echo "Cleaning up"
-rm -rf ncurses-${VERSION} ncurses-${VERSION}.orig #ncurses-${VERSION}.tar.bz2
-
-echo "Created: $PWD/ncurses-${VERSION}-branch_update-$UPDATE_NUM.patch"
Index: ripts/patch/perl-patch.sh
===================================================================
--- scripts/patch/perl-patch.sh	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,90 +1,0 @@
-#!/bin/bash
-# Create a Perl Patch
-
-# Get Version #
-#
-VERSION=$1
-
-# Check Input
-#
-if [ "${VERSION}" = "" ]; then
-  echo "$0 - Perl_Version"
-  echo "This will Create a Patch for Perl Perl_Version"
-  exit 255
-fi
-
-# Download Perl Source
-#
-cd /usr/src
-if ! [ -e perl-${VERSION}.tar.bz2  ]; then
-  wget http://www.cpan.org/src/perl-${VERSION}.tar.bz2
-fi
-
-# Set Patch Number
-#
-cd /usr/src
-wget http://svn.cross-lfs.org/svn/repos/patches/perl/ --no-remove-listing
-for num in $(seq 1 99); do
-  PATCH_NUM=$(cat index.html | grep "${VERSION}" | grep branch_update-${num}.patch | cut -f2 -d'"' | cut -f1 -d'"'| cut -f4 -d- | cut -f1 -d. | tail -n 1)
-  if [ "${PATCH_NUM}" = "0" -a "${num}" = "1" ]; then
-    PATCH_NUM=$(expr ${PATCH_NUM} + 1)
-    break
-  fi
-  if [ "${PATCH_NUM}" != "${num}" ]; then
-    PATCH_NUM=$(expr ${num})
-    break
-  fi
-done
-rm -f index.html
-
-# Cleanup Directory
-#
-rm -rf perl-${VERSION} perl-${VERSION}.orig
-tar xvf perl-${VERSION}.tar.bz2
-mv perl-${VERSION} perl-${VERSION}.orig
-CURRENTDIR=$(pwd -P)
-
-# Get Current Updates from GIT
-#
-cd /usr/src
-mkdir perl.git
-cd perl.git
-git clone git://perl5.git.perl.org/perl.git
-
-# Cleanup
-#
-cd /usr/src/perl-${VERSION}
-REMOVE=".patch AUTHORS Changes*"
-for file in $REMOVE; do
-  cd /usr/src/perl-${VERSION}
-  rm -f ${file}
-  cd /usr/src/perl-${VERSION}.orig
-  rm -f ${file}
-done
-cd ..
-
-# Remove Directories
-#
-cd /usr/src/perl-${VERSION}
-REMOVE="os2 vms win32"
-for dir in $REMOVE; do
-  cd /usr/src/perl-${VERSION}
-  rm -rf ${dir}
-  cd /usr/src/perl-${VERSION}.orig
-  rm -rf ${dir}
-done
-cd ..
-
-# Create Patch
-#
-cd /usr/src
-echo "Submitted By: Jim Gifford (jim at cross-lfs dot org)" > perl-${VERSION}-branch_update-x.patch
-echo "Date: `date +%m-%d-%Y`" >> perl-${VERSION}-branch_update-x.patch
-echo "Initial Package Version: ${VERSION}" >> perl-${VERSION}-branch_update-x.patch
-echo "Origin: Upstream" >> perl-${VERSION}-branch_update-x.patch
-echo "Upstream Status: Applied" >> perl-${VERSION}-branch_update-x.patch
-echo "Description: This is a branch update for perl-${VERSION}, and should be" >> perl-${VERSION}-branch_update-x.patch
-echo "             rechecked periodically." >> perl-${VERSION}-branch_update-x.patch
-echo "" >> perl-${VERSION}-branch_update-x.patch
-diff -Naur perl-${VERSION}.orig perl-${VERSION} >> perl-${VERSION}-branch_update-x.patch
-echo "Created /usr/src/perl-${VERSION}-branch_update-x.patch."
Index: ripts/patch/readline-patch.sh
===================================================================
--- scripts/patch/readline-patch.sh	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,138 +1,0 @@
-#!/bin/bash
-# Create a Readline Patch
-
-# Get Version #
-#
-VERSION=$1
-
-# Check Input
-#
-if [ "${VERSION}" = "" ]; then
-  echo "$0 - Readline_Version"
-  echo "This will Create a Patch for Readline Readline_Version"
-  exit 255
-fi
-
-# Get the # of Patches
-#
-cd ~/tmp
-wget ftp://ftp.cwru.edu/pub/bash/readline-${VERSION}-patches/ --no-remove-listing
-VERSION2=$(echo ${VERSION} | sed -e 's/\.//g')
-FILES=$(cat index.html | grep "${VERSION2}" | cut -f2 -d'"' | cut -f4 -d. | cut -f3 -d- | tail -n 1)
-rm -f .listing
-rm -f index.html
-SKIPPATCH=""
-SKIPPED=""
-
-# Download Readline Source
-#
-cd ~/tmp
-if ! [ -e readline-${VERSION}.tar.gz ]; then
-  wget ftp://ftp.cwru.edu/pub/bash/readline-${VERSION}.tar.gz
-fi
-
-# Set Patch Number
-#
-cd ~/tmp
-wget http://svn.cross-lfs.org/svn/repos/patches/readline/ --no-remove-listing
-for num in $(seq 1 99); do
-  PATCH_NUM=$(cat index.html | grep "${VERSION}" | grep branch_update-${num}.patch | cut -f2 -d'"' | cut -f1 -d'"'| cut -f4 -d- | cut -f1 -d. | tail -n 1)
-  if [ "${PATCH_NUM}" = "0" -a "${num}" = "1" ]; then
-    PATCH_NUM=$(expr ${PATCH_NUM} + 1)
-    break
-  fi
-  if [ "${PATCH_NUM}" != "${num}" ]; then
-    PATCH_NUM=$(expr ${num})
-    break
-  fi
-done
-rm -f index.html
-
-# Cleanup Directory
-#
-cd ~/tmp
-rm -rf readline-${VERSION} readline-${VERSION}.orig
-tar xvf readline-${VERSION}.tar.gz
-cp -ar readline-${VERSION} readline-${VERSION}.orig
-
-# Download and Apply Patches
-#
-install -d ~/tmp/readline-${VERSION}-patches
-cd ~/tmp/readline-${VERSION}
-CURRENTDIR=$(pwd -P)
-PATCHURL=ftp://ftp.cwru.edu/pub/bash/readline-${VERSION}-patches
-mkdir /tmp/readline-${VERSION}
-COUNT=1
-while [ ${COUNT} -le ${FILES} ]; do
-  cd ~/tmp/readline-${VERSION}           
-  DLCOUNT="${COUNT}"
-  SKIPME=no
-  if [ "${COUNT}" -lt "100" ]; then
-    DLCOUNT="0${COUNT}"
-  fi
-  if [ "${COUNT}" -lt "10" ]; then
-    DLCOUNT="00${COUNT}"
-  fi
-  for skip in ${SKIPPATCH} ; do
-    if [ "${DLCOUNT}" = "$skip" ]; then
-      echo "Patch readline${VERSION2}-${DLCOUNT} skipped"
-      SKIPPED="${SKIPPED} ${DLCOUNT}"
-      SKIPME=yes
-    fi
-  done
-  if [ "${SKIPME}" != "yes" ]; then
-    if ! [ -e ${VERSION}.${DLCOUNT} ]; then
-      cd ~/tmp/readline-${VERSION}-patches
-      wget --quiet ${PATCHURL}/readline${VERSION2}-${DLCOUNT}
-    fi
-    cd ${CURRENTDIR}
-    patch --dry-run -s -f -Np0 -i ~/tmp/readline-${VERSION}-patches/readline${VERSION2}-${DLCOUNT}
-    if [ "$?" = "0" ]; then
-      echo "Patch readline${VERSION2}-${DLCOUNT} applied"
-      patch -s -Np0 -i ~/tmp/readline-${VERSION}-patches/readline${VERSION2}-${DLCOUNT}
-    else
-      echo "Patch readline${VERSION2}-${DLCOUNT} not applied"
-      rm -f ~/tmp/readline-${VERSION}-patches/readline${VERSION2}-${DLCOUNT}
-      SKIPPED="${SKIPPED} ${DLCOUNT}"
-     fi
-    fi
-    COUNT=`expr ${COUNT} + 1`
-done
-
-# Cleanup Directory
-#
-# Cleanup Directory
-#
-for dir in $(find * -type d); do
-  cd ~/tmp/readline-${VERSION}/${dir}
-  for file in $(find . -name '*~'); do
-    rm -f ${file}
-  done
-  for file in $(find . -name '*.orig'); do
-    rm -f ${file}
-  done
-done
-cd ~/tmp/readline-${VERSION}
-rm -f *~ *.orig
-
-# Create Patch
-#
-cd ~/tmp
-echo "Submitted By: Jim Gifford (jim at cross-lfs dot org)" > ~/patches/readline-${VERSION}-branch_update-${PATCH_NUM}.patch
-echo "Date: `date +%m-%d-%Y`" >> ~/patches/readline-${VERSION}-branch_update-${PATCH_NUM}.patch
-echo "Initial Package Version: ${VERSION}" >> ~/patches/readline-${VERSION}-branch_update-${PATCH_NUM}.patch
-echo "Origin: Upstream" >> ~/patches/readline-${VERSION}-branch_update-${PATCH_NUM}.patch
-echo "Upstream Status: Applied" >> ~/patches/readline-${VERSION}-branch_update-${PATCH_NUM}.patch
-echo "Description: Contains all upstream patches up to ${VERSION}-${FILES}" >> ~/patches/readline-${VERSION}-branch_update-${PATCH_NUM}.patch
-if [ -n "${SKIPPED}" ]; then
-  echo "            Thee following patches were skipped" >> ~/patches/readline-${VERSION}-branch_update-${PATCH_NUM}.patch
-  echo "            ${SKIPPED}" >> ~/patches/readline-${VERSION}-branch_update-${PATCH_NUM}.patch
-fi
-echo "" >> ~/patches/readline-${VERSION}-branch_update-${PATCH_NUM}.patch
-diff -Naur readline-${VERSION}.orig readline-${VERSION} >> ~/patches/readline-${VERSION}-branch_update-${PATCH_NUM}.patch
-echo "Created ~/patches/readline-${VERSION}-branch_update-${PATCH_NUM}.patch."
-
-# Cleanup Directory
-#
-cd ~/tmp
-rm -rf readline-${VERSION} readline-${VERSION}.orig
Index: ripts/patch/vim-patch.sh
===================================================================
--- scripts/patch/vim-patch.sh	(revision a4a0c7f1cd78df350da9e28b1d8f496702356e0f)
+++ 	(revision )
@@ -1,64 +1,0 @@
-#!/bin/sh
-# Jonathan Norman
-
-# Vim branch update patch generator
-
-VERSION=$1
-
-# Check Input
-#
-if [ "${VERSION}" = "" ]; then
-  echo "$0 [Vim_version]"
-  echo "This will Create a Patch for Vim Vim_Version"
-  exit 255
-fi
-
-TMP=~/tmp/vim-${VERSION}
-PATCHDIR=${TMP}/patches
-PATCHURL=ftp://ftp.vim.org/pub/vim/patches
-SERIES=$(echo ${VERSION} | sed -e 's/\.//g')
-CLFS_PATCHS=http://patches.cross-lfs.org/dev/
-
-# Figure out patch number
-UPDATE_NUM=$(curl -ls http://patches.cross-lfs.org/dev/ | grep vim-${VERSION} | cut -d . -f 3 | cut -d - -f 3-)
-UPDATE_NUM=$(expr ${UPDATE_NUM} + 1)
-
-# Download patches
-echo "Downloading patches for VIM ${VERSION}"
-PATCH_NUM=$(curl -s $PATCHURL/${VERSION}/ | grep " ${VERSION}." | cut -f 3- -d . | tail -n1)
-mkdir -p $PATCHDIR
-cd $PATCHDIR
-curl -O -# $PATCHURL/$VERSION/$VERSION.[001-$PATCH_NUM]
-
-echo "Downloading source for VIM $VERSION"
-cd $TMP
-curl -sO ftp://ftp.vim.org/pub/vim/unix/vim-${VERSION}.tar.bz2
-tar -xvf vim-${VERSION}.tar.bz2
-cp -R vim${SERIES} vim${SERIES}.orig
-
-echo -n "Generating Patch..."
-cd vim${SERIES}/src
-
-for PATCH in $(ls $PATCHDIR); do
-	patch -Np0 -i $PATCHDIR/$PATCH
-	# echo $PATCHDIR/$PATCH
-done
-
-cd $TMP
-
-# Create patch
-echo "Submitted By: Jonathan Norman (jonathan at bluesquarelinux dot co dot uk)" > vim-${VERSION}-branch_update-$UPDATE_NUM.patch
-echo "Date: `date +%Y-%m-%d`" >> vim-${VERSION}-branch_update-$UPDATE_NUM.patch
-echo "Initial Package Version: ${VERSION}" >> vim-${VERSION}-branch_update-$UPDATE_NUM.patch
-echo "Origin: Upstream" >> vim-${VERSION}-branch_update-$UPDATE_NUM.patch
-echo "Upstream Status: Applied" >> vim-${VERSION}-branch_update-$UPDATE_NUM.patch
-echo "Description: Contains all upstream patches up to ${VERSION}.${UPDATE_NUM}" >> vim-${VERSION}-branch_update-$UPDATE_NUM.patch
-echo "" >> vim-${VERSION}-branch_update-$UPDATE_NUM.patch
-
-LC_ALL=C TZ=UTC0 diff -Naur vim${SERIES}.orig vim${SERIES} >> vim-${VERSION}-branch_update-$UPDATE_NUM.patch
-
-echo "Done"
-echo "Cleaning up"
-rm -rf vim${SERIES} vim${SERIES}.orig #vim-${VERSION}.tar.bz2
-
-echo "Created: vim-${VERSION}-branch_update-$UPDATE_NUM.patch"
